diff --git a/.gitignore b/.gitignore
index 92e2728c3..d81178e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ Thumbs.db
 *.DS_Store
 *~
 .idea/
+api/
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/2fa.php b/2fa.php
new file mode 100644
index 000000000..a7e3dbb29
--- /dev/null
+++ b/2fa.php
@@ -0,0 +1,64 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+require_once('initialize.php');
+import('form.Form');
+import('ttUser');
+import('ttUserHelper');
+
+// Access checks.
+// ... anything to check?
+// 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');
+$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_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()) {
+    // 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();
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$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/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/README.md b/README.md
index d6a1d2d34..022c0c030 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,16 @@
 # 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.
+
+## 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
+[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
+* 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/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index a288ec0bf..6b6a68d84 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.
@@ -50,13 +26,16 @@ 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'.
+// 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'.
 //
-// define('APP_NAME', 'timetracker');
+// define('DIR_NAME', 'timetracker');
 //
-define('APP_NAME', '');
 
 
 // WEEKEND_START_DAY
@@ -67,9 +46,15 @@ define('APP_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);
 //
@@ -83,21 +68,27 @@ 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');
-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.
 //
-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'.
 // '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.
@@ -142,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');
@@ -151,8 +142,10 @@ 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.
+//  '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.
 
 
@@ -163,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:
@@ -172,12 +167,15 @@ 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.
+// 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:8080');
+
+
+// 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.
 
-// 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/WEB-INF/lib/Auth.class.php b/WEB-INF/lib/Auth.class.php
index ecb48340b..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 {
@@ -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/lib/DateAndTime.class.php b/WEB-INF/lib/DateAndTime.class.php
deleted file mode 100644
index 20f274265..000000000
--- a/WEB-INF/lib/DateAndTime.class.php
+++ /dev/null
@@ -1,347 +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);
-    $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/I18n.class.php b/WEB-INF/lib/I18n.class.php
index 7eb6228ff..bd4e9ffd3 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 {
@@ -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,25 @@ 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';
+  // get - keyExists determines if a key exists.
+  function keyExists($key) {
+    $value = $this->get($key);
+    return ($value !== null);
+  }
 
-    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),
+  // 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';
+    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 +86,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 +111,40 @@ function load($localName) {
           $this->keys[$kword] = $value;
         }
       }
-      return true;
+    }
+
+    // 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]);
+        // Escape single quotes and backslashes.
+        $value = addcslashes($value, "'\\");
+        $value = htmlspecialchars($value);
+
+        $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.
+  // This is a helper function for getBrowserLanguage below.
   function hasLang($lang)
   {
     $filename = RESOURCE_DIR . '/' . strtolower($lang) . '.lang.php';
@@ -146,7 +178,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 +193,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/lib/Period.class.php b/WEB-INF/lib/Period.class.php
deleted file mode 100644
index 2d2269e52..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/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 7f3495737..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:
 //
@@ -105,6 +81,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/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 1f2829442..79aba106b 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)
 {
@@ -164,19 +126,86 @@ 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;
+  }
+
   $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;
-    
+
+  // 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;    
 }
 
+// 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;
+}
+
+// ttValidTranslation is used to check user input for custom translation.
+function ttValidTranslation($val)
+{
+  $val = trim($val);
+  if (strlen($val) == 0)
+    return true;
+
+  // 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 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).
@@ -238,22 +267,102 @@ function ttValidFloat($val, $emptyValid = false)
   return true;    
 }
 
+// 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;
+
+  $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)
 {
+  if (is_null($val))
+    return false;
+
   $val = trim($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'.
-  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;
+  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 true;    
+  }
+  return false;
+}
+
+// ttValidDbDateFormatDate is used to check user input to validate a date in DB_DATEFORMAT.
+function ttValidDbDateFormatDate($val)
+{
+  if (is_null($val) || 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;
+
+  $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.
+function ttValidTime($val)
+{
+  if (is_null($val) || strlen($val) == 0)
+    return false;
+
+  // 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;
+
+  return true;
 }
 
 // ttValidInteger is used to check user input to validate an integer.
@@ -269,6 +378,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)
 {
@@ -324,7 +442,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;
@@ -367,6 +486,54 @@ function ttValidHolidays($val)
   return true;
 }
 
+// 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 *.
+  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).
@@ -381,6 +548,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;
@@ -406,26 +577,70 @@ function ttAccessAllowed($required_right)
   return false;
 }
 
-// ttStartsWith functions checks if a string starts with a given substring.
+// 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.
+    }
+  }
+  $target = defined('HTTP_TARGET') ? HTTP_TARGET : $_SERVER['HTTP_HOST'];
+  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 true;
+}
+
+// ttStartsWith function 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.
+// ttEndsWith function 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);
+}
+
+// ttContains function 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)
 {
   global $user;
-  $o_date = new DateAndTime(DB_DATEFORMAT, $date);
+  $o_date = new ttDate($date);
   return $o_date->toString($user->date_format);
 }
 
@@ -439,3 +654,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/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..358f8af5c 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		= "";
@@ -92,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]);
 	    	    }
@@ -106,13 +88,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);
+                            // 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);
         	}
@@ -140,8 +123,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);
+                                    // 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);
 	        	}
@@ -185,14 +169,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/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 447a45e02..7de81d876 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -23,251 +23,199 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
-import('DateAndTime');
+import('ttDate');
+import('ttTimeHelper');
 
 class Calendar extends FormElement {
-  var $holidays = array();
-  var $showHolidays = true;
-  var $weekStartDay = 0;
-  
-    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;";
-    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();
+  }
+
+  // Generates html code for Calendar control.
+  function getHtml() {
+    global $i18n; // Needed to print Today.
+    global $user;
+
+    $selectedDate = $this->value;
+
+    // Determine month and year for selected date.
+    $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 = 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.
+    $firstOfPreviousMonth = ttDate::dateFromUnixTimestamp($firstOfPreviousMonth2AM);
+
+    // Print calendar header.
+    $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">';
+    $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";
+    $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;
     }
 
-    function setStyle($style) { $this->style = $style; }
-    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
-     * @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();
+    // Print day headers.
+    $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 {
-        $thismonth = date("m");
-        $thisyear = date("Y");
+        $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);
+
+    $handleHolidays = $user->getHolidays() != null;
+    $handleNotCompleteDays = $user->isOptionEnabled('time_not_complete_days');
+    $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 ($handleHolidays && ttTimeHelper::isHoliday($date_to_check)) {
+            $cell_style = ' class="calendarDayHoliday"';
+            $link_style = ' class="calendarLinkHoliday"';
+          }
 
-      // next date, month, year
-      $next = mktime ( 2, 0, 0, $thismonth + 1, 1, $thisyear );
-      $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 );
-      $prevyear = date ( "Y", $prev );
-      $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.
-          '  <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: 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->mWeekDayShortNames[$weekdayNameIdx].'</td>';
-        } else {
-          $str .= '<td class="CalendarDayHeader">'.$this->mWeekDayShortNames[$weekdayNameIdx].'</td>';
-        }
-      }
-
-      $str .= "</tr>\n";
-
-      list($wkstart,$monthstart,$monthend,$start_date) = $this->_getWeekDayBefore( $thisyear, $thismonth );
-
-      $active_dates = $this->_getActiveDates($monthstart, $monthend);
-
-      for ( $i = $wkstart; $i<=$monthend;  $i=mktime(0,0,0,$thismonth,$start_date+=7,$thisyear) ) {
-        $str .= "<TR>\n";
-          for ( $j = 0; $j < 7; $j++ ) {
-            $date = mktime(0,0,0,$thismonth,$start_date+$j,$thisyear);
-            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($thisyear, $thismonth, $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))
-              $stl_cell = ' class="CalendarDaySelected"';
-
-
-            $str .= '<td'.$stl_cell.'>';
+          // Handle selected day.
+          if ($selectedDate == ttDate::dateFromUnixTimestamp($cellDate0am))
+            $cell_style = ' class="calendarDaySelected"';
 
+          $html .= '<td'.$cell_style.'>';
+          // Handle days with existing entries.
+          if ($active_dates) {
             // Entries exist.
-            if($active_dates) {
-              if( in_array(strftime(DB_DATEFORMAT, $date), $active_dates) )
-                $stl_link = ' class="CalendarLinkRecordsExist"';
+            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)
+                  $link_style = ' class="calendarLinkRecordsExist"';
+                else
+                  $link_style = ' class="calendarLinkNonCompleteDay"';
+              }
+              else
+                $link_style = ' class="calendarLinkRecordsExist"';
             }
-
-            $str .= "<a".$stl_link." href=\"?".$this->controlName."=".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."=".ttDate::dateFromUnixTimestamp($cellDate0am)."\" tabindex=\"-1\">".date("d",$cellDate0am)."</a>";
+          $html .= "</td>";
+        } else {
+          $html .= "<td>&nbsp;</td>";
         }
-        $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 .= "</table>\n";
-
-      $str .= "<input type=\"hidden\" name=\"$this->controlName\" 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 .= "}\n";
-      $str .= "adjustToday();\n";
-      $str .= "</script>\n";
-      
-      return $str;
+      $html .= "</tr>\n";
     }
 
-    function getHtml() {
-        return $this->toString();
-    }
+    // Finished printing calendar table.
 
-    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)
-      );
-    }
+    // Print Today link.
+    $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";
 
-    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";
-      $str .= ".CalendarDayHeaderWeekend {". $this->mDayHeaderWeekend ."}\n";
-      
-      $str .= ".CalendarLinkWeekend {color: #999999;}\n";
-      $str .= ".CalendarLinkHoliday {color: #999999;}\n";
-      $str .= ".CalendarLinkRecordsExist {color: #FF0000;}\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) {
+    // Add a hidden control for selected date.
+    $html .= "<input type=\"hidden\" name=\"$this->name\" value=\"$selectedDate\">\n";
+    $html .= "<!-- end of calendar -->\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) {
       
-      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/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/Combobox.class.php b/WEB-INF/lib/form/Combobox.class.php
index 88f0b50a9..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');
 	
@@ -47,6 +23,7 @@ class Combobox extends FormElement {
 
   function __construct($name) {
     $this->class = 'Combobox';
+    $this->css_class = 'dropdown-field';
     $this->name = $name;
   }
 
@@ -68,6 +45,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!="")
@@ -84,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/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index a197126fb..d349d5687 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -1,46 +1,20 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
+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();
   }
 
@@ -48,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');
@@ -63,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;
     }
@@ -406,10 +378,13 @@ function adjustiFrame(pickerDiv, iFrameDiv) {
       $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
       $html .= ">";
       
-      if (APP_NAME)
-      	$app_root = '/'.APP_NAME;
+      $dir_name = $app_root = '';
+      if (defined('DIR_NAME'))
+        $dir_name = trim(constant('DIR_NAME'), '/');
+      if (!empty($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/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/Form.class.php b/WEB-INF/lib/form/Form.class.php
index 1f77414b1..cee608fe5 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
@@ -53,12 +29,15 @@ 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']);
+        if (isset($params['placeholder'])) $el->setPLaceholder($params['placeholder']);
         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;
 
@@ -116,6 +95,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.
@@ -123,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/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php
index 0443e6c9a..16b8d76d1 100644
--- a/WEB-INF/lib/form/FormElement.class.php
+++ b/WEB-INF/lib/form/FormElement.class.php
@@ -1,54 +1,31 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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.
-  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 $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
+  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; }
@@ -80,9 +57,10 @@ 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; }
 
   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/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/MultipleSelectCombobox.class.php b/WEB-INF/lib/form/MultipleSelectCombobox.class.php
new file mode 100644
index 000000000..2c2cf0501
--- /dev/null
+++ b/WEB-INF/lib/form/MultipleSelectCombobox.class.php
@@ -0,0 +1,88 @@
+<?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))
+                  $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."\"";
+                        if (in_array($key, $selectedProjects)) $html .= " selected";
+			$html .= ">".htmlspecialchars($value)."</option>\n";
+		  }
+
+		$html .= "</select>";
+
+		return $html;
+	}
+}
diff --git a/WEB-INF/lib/form/PasswordField.class.php b/WEB-INF/lib/form/PasswordField.class.php
index 747a6ac45..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');
 
@@ -33,6 +9,7 @@ class PasswordField extends FormElement {
   function __construct($name)
   {
     $this->class = 'PasswordField';
+    $this->css_class = 'password-field';
     $this->name = $name;
   }
 
@@ -40,6 +17,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/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 7bcd78be8..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');
@@ -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';
@@ -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,16 +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\"";
     }
+
     if ($this->mWidth!="") $html .= " width=\"".$this->mWidth."\"";
     $html .= ">\n";
     
@@ -158,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/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 6b745a2af..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');
@@ -35,6 +35,7 @@ class TextField extends FormElement {
   function __construct($name)
   {
     $this->class = 'TextField';
+    $this->css_class = 'text-field';
     $this->name = $name;
   }
 
@@ -43,10 +44,12 @@ 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\"";
     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/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/libchart/classes/libchart.php b/WEB-INF/lib/libchart/classes/libchart.php
index f84210fbb..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 79d6cac40..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;
@@ -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..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 {
@@ -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..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 {
@@ -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..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;
@@ -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/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 9a48b49d0..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 {
@@ -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..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;
@@ -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..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 {
 		/**
@@ -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..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 {
 		/**
@@ -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..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 {
 		/**
@@ -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..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;
@@ -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..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 {
 		/**
@@ -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..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;
@@ -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..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 {
@@ -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..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 {
@@ -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..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 {
@@ -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..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 {
@@ -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..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;
@@ -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..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 {
@@ -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..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;
@@ -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/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/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/WEB-INF/lib/smarty/Autoloader.php b/WEB-INF/lib/smarty/Autoloader.php
new file mode 100644
index 000000000..da7e32abf
--- /dev/null
+++ b/WEB-INF/lib/smarty/Autoloader.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Smarty Autoloader
+ *
+ * @package Smarty
+ */
+
+
+if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
+	include __DIR__ . '/functions.php';
+}
+
+/**
+ * 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');
+
+    /**
+     * 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 : __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);
+    }
+
+    /**
+     * 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 = smarty_strtolower_ascii($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..5d2e3a4b4 100644
--- a/WEB-INF/lib/smarty/Smarty.class.php
+++ b/WEB-INF/lib/smarty/Smarty.class.php
@@ -1,815 +1,1406 @@
 <?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.
- * 
+ * 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 
- * @package Smarty
- * @version 3.0.7
- */
-
-/**
- * define shorthand directory separator constant
+ *
+ * @link      https://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
  */
-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', __DIR__ . 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);
-} 
-if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    define('SMARTY_RESOURCE_CHAR_SET', 'UTF-8');
-} 
-if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
-    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
-} 
+    /**
+     *
+     */
+    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DIRECTORY_SEPARATOR);
+}
+if (!defined('SMARTY_MBSTRING')) {
+    /**
+     *
+     */
+    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
+}
+
+/**
+ * Load helper functions
+ */
+if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
+    include __DIR__ . '/functions.php';
+}
+
+/**
+ * Load Smarty_Autoloader
+ */
+if (!class_exists('Smarty_Autoloader')) {
+    include __DIR__ . '/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 = '4.3.0';
+    /**
+     * 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;
+
+    /**
+     * 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_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
+
+    /**
+     * The date format to be used internally
+     * (accepts date() and strftime())
+     */
+    public static $_DATE_FORMAT = '%b %e, %Y';
+
+    /**
+     * 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;
-    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',
+    );
+
+    /**
+     * PHP7 Compatibility mode
+     * @var bool
+     */
+    private $isMutingUndefinedOrNullWarnings = false;
+
+    /**
+     * 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 = '';
+        }
+    }
+
+    /**
+     * 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|string 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);
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * 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(): void {
+        $this->isMutingUndefinedOrNullWarnings = true;
+    }
+
+    /**
+     * Indicates if PHP7 compatibility mode is set.
+     * @bool
+     */
+    public function isMutingUndefinedOrNullWarnings(): bool {
+        return $this->isMutingUndefinedOrNullWarnings;
+    }
+
+}
diff --git a/WEB-INF/lib/smarty/bootstrap.php b/WEB-INF/lib/smarty/bootstrap.php
new file mode 100644
index 000000000..a226ac04e
--- /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 __DIR__ . '/Autoloader.php';
+}
+Smarty_Autoloader::register(true);
diff --git a/WEB-INF/lib/smarty/debug.tpl b/WEB-INF/lib/smarty/debug.tpl
index 058c5b204..4f82a5820 100644
--- a/WEB-INF/lib/smarty/debug.tpl
+++ b/WEB-INF/lib/smarty/debug.tpl
@@ -1,133 +1,175 @@
 {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>
+    <html lang="en">
+    <head>
+        <title>Smarty Debug Console</title>
+        <style>
+            {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;
+            }
+
+            tr:nth-child(odd) {
+                background-color: #eeeeee;
+            }
+
+            tr:nth-child(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}
+                <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>
+            {/foreach}
+        </div>
+    {/if}
+
+    <h2>assigned template variables</h2>
+
+    <table id="table_assigned_vars">
+        {foreach $assigned_vars as $vars}
+            <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>
+         {/foreach}
+    </table>
+
+    <h2>assigned config file variables</h2>
+
+    <table id="table_config_vars">
+        {foreach $config_vars as $vars}
+            <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>
+            </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/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/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..fed090e4d 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   https://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..54795459c 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   https://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..793569991 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    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>
+ * @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..4a3e88196 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   https://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..a8e7a07d8 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    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>
+ * @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..71bc63864 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    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>
  * @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..3e4335340 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   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>
+ *
+ * @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..2223ff7ee 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    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>
  * @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..d9c571976 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    https://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,38 @@ 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;
-    $extra_attrs = '';
+    $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':
+                $$_key = $_value; // we'll handle conversion below
+                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 +140,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 +158,238 @@ 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;
-        } 
-    } 
+        }
+    }
+    // Note: date() is faster than strftime()
+    // Note: explode(date()) is faster than date() date() date()
 
-    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];
-    } 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];
-        } else {
-            $end_year = strftime('%Y') - $match[2];
-        } 
-    } 
-    if (preg_match('!^(\+|\-)\s*(\d+)$!', $start_year, $match)) {
-        if ($match[1] == '+') {
-            $start_year = strftime('%Y') + $match[2];
+    if (isset($time) && is_array($time)) {
+        if (isset($time[$prefix . 'Year'])) {
+            // $_REQUEST[$field_array] given
+            foreach ([
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ] as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName =
+                    isset($time[$prefix . $_elementName]) ? $time[$prefix . $_elementName] :
+                        date($_elementKey);
+            }
+        } elseif (isset($time[$field_array][$prefix . 'Year'])) {
+            // $_REQUEST given
+            foreach ([
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ] as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName = isset($time[$field_array][$prefix . $_elementName]) ?
+                    $time[$field_array][$prefix . $_elementName] : date($_elementKey);
+            }
         } 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;
-    if ($display_months) {
-        $field_separator_count++;
-        $month_names = array();
-        $month_values = array();
-        if (isset($month_empty)) {
-            $month_names[''] = $month_empty;
-            $month_values[''] = '';
-        } 
-        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]"';
+            // no date found, use NOW
+            [$_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 = null;
         } 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>';
-    } 
-
-    if ($display_days) {
-        $field_separator_count++;
-        $days = array();
-        if (isset($day_empty)) {
-            $days[''] = $day_empty;
-            $day_values[''] = '';
-        } 
-        for ($i = 1; $i <= 31; $i++) {
-            $days[] = sprintf($day_format, $i);
-            $day_values[] = sprintf($day_value_format, $i);
-        } 
+            [$_year, $_month, $_day] = explode('-', date('Y-m-d'));
+        }
+    } else {
+        $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));
+    }
 
-        $day_result .= '<select name=';
-        if (null !== $field_array) {
-            $day_result .= '"' . $field_array . '[' . $prefix . 'Day]"';
+    // 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 {
-            $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>';
-    } 
-
+            $$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) {
-        $field_separator_count++;
-        if (null !== $field_array) {
-            $year_name = $field_array . '[' . $prefix . 'Year]';
-        } else {
-            $year_name = $prefix . 'Year';
-        } 
+        $_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) {
-            $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 .= ' />';
+            $_html_years =
+                '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
+                $extra_attrs . ' />';
         } 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
+            $_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) {
+        $_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++) {
+            $_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) {
+        $_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++) {
+            $_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..256b56b1c 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   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>
+ *
+ * @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..17b0586e2 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    https://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..671ac0694 100644
--- a/WEB-INF/lib/smarty/plugins/function.mailto.php
+++ b/WEB-INF/lib/smarty/plugins/function.mailto.php
@@ -1,156 +1,142 @@
 <?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    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> 
- * @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)
 {
-    $extra = '';
+    static $_allowed_encoding = [
+        'javascript' => true,
+        'javascript_charcode' => true,
+        'hex' => true,
+        'none' => true
+    ];
 
-    if (empty($params['address'])) {
-        trigger_error("mailto: missing 'address' parameter",E_USER_WARNING);
+    $extra = '';
+    if (empty($params[ 'address' ])) {
+        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
         return;
     } else {
-        $address = $params['address'];
-    } 
+        $address = $params[ 'address' ];
+    }
+
+    $text = $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));
+                if (!empty($value)) {
+                    $mail_parms[] = $var . '=' . str_replace(['%40', '%2C'], ['@', ','], 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') {
-        $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+    $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') {
         $js_encode = '';
-        for ($x = 0; $x < strlen($string); $x++) {
-            $js_encode .= '%' . bin2hex($string[$x]);
-        } 
-
-        return '<script type="text/javascript">eval(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++) {
-            $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";
-
-        return $_ret;
-    } elseif ($encode == 'hex') {
+        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') {
+        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>';
+    } 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
+        return $string;
+    }
+}
diff --git a/WEB-INF/lib/smarty/plugins/function.math.php b/WEB-INF/lib/smarty/plugins/function.math.php
index cd90020a4..f9cf67fe7 100644
--- a/WEB-INF/lib/smarty/plugins/function.math.php
+++ b/WEB-INF/lib/smarty/plugins/function.math.php
@@ -1,83 +1,142 @@
 <?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   https://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,
+            'acos'   => true,
+            'acosh'   => true,
+            'cos'   => true,
+            'cosh'   => true,
+            'deg2rad'   => true,
+            'rad2deg'   => true,
+            'exp'   => true,
+            'floor' => true,
+            'log'   => true,
+            'log10' => true,
+            'max'   => true,
+            'min'   => true,
+            'pi'    => true,
+            'pow'   => true,
+            'rand'  => true,
+            'round' => true,
+            'asin'   => true,
+            'asinh'   => true,
+            'sin'   => true,
+            'sinh'   => true,
+            'sqrt'  => true,
+            'srand' => 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);
+    if (empty($params[ 'equation' ])) {
+        trigger_error("math: missing equation parameter", E_USER_WARNING);
         return;
     }
+    $equation = $params[ 'equation' ];
 
-    $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);
+    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.";");
+    eval("\$smarty_math_result = " . $equation . ";");
 
-    if (empty($params['format'])) {
-        if (empty($params['assign'])) {
+    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..2903d61d7 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
@@ -1,37 +1,147 @@
 <?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)
+{
+    $string = (string) $string;
+
+    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);
+}
 
-?>
\ No newline at end of file
+/**
+ * @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);
+}
+
+/**
+ * @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.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 3656c1c88..e3589fd07 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.date_format.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.date_format.php
@@ -1,61 +1,86 @@
 <?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   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
+ * @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);
+        }
+        // @ to suppress deprecation errors when running in PHP8.1 or higher.
+        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..11e44682e 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.escape.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.escape.php
@@ -1,91 +1,187 @@
 <?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   https://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 $is_loaded_1 = false;
+    static $is_loaded_2 = false;
+    if (!$char_set) {
+        $char_set = Smarty::$_CHARSET;
+    }
+
+    $string = (string)$string;
+
     switch ($esc_type) {
         case 'html':
-            return htmlspecialchars($string, ENT_QUOTES, $char_set);
-
+            return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+        // no break
         case 'htmlall':
-            return htmlentities($string, ENT_QUOTES, $char_set);
-
+            if (Smarty::$_MBSTRING) {
+                $string = mb_convert_encoding($string, 'UTF-8', $char_set);
+                return htmlentities($string, ENT_QUOTES, 'UTF-8', $double_encode);
+            }
+            // no MBString fallback
+            return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
+        // 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',
+                    '</' => '<\/',
+                    // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+                    '<!--' => '<\!--',
+                    '<s'   => '<\s',
+                    '<S'   => '<\S'
+                )
+            );
+        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:
+            trigger_error("escape: unsupported type: $esc_type - returning unmodified string", E_USER_NOTICE);
             return $string;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
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.mb_wordwrap.php b/WEB-INF/lib/smarty/plugins/modifier.mb_wordwrap.php
new file mode 100644
index 000000000..7c7bd875f
--- /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   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
+ * @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.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.regex_replace.php b/WEB-INF/lib/smarty/plugins/modifier.regex_replace.php
index 9f148800e..cd57cdf33 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   https://www.smarty.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..71a7c632a 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   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
+ *
+ * @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..251dbe71b 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   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
+ * @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..80dcdb531 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   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
+ * @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, intval($length / 2), Smarty::$_CHARSET) . $etc .
+                   mb_substr($string, -intval($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, intval($length / 2)) . $etc . substr($string, -intval($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..2c3a8b2a4 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   https://www.smarty.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..b5d97e276 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   https://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..332402968 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   https://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..30e36e5f0 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   https://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..cf2e50222 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   https://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..dffa7a986 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   https://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)===null||$tmp===\'\' ? ' . $param . ' ?? null : $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..602c3dbfc
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty escape modifier plugin
+ * Type:     modifier
+ * Name:     escape
+ * Purpose:  escape string for output
+ *
+ * @link   https://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)
+{
+    $compiler->template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_literal_compiler_param',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
+            )
+        )
+    );
+    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':
+                return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    var_export($double_encode, true) . ')';
+            // no break
+            case 'htmlall':
+                if (Smarty::$_MBSTRING) {
+                    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
+                return 'htmlentities((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    var_export($double_encode, true) . ')';
+            // no break
+            case 'url':
+                return 'rawurlencode((string)' . $params[ 0 ] . ')';
+            case 'urlpathinfo':
+                return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
+            case 'quotes':
+                // escape unescaped single quotes
+                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((string)' .
+                       $params[ 0 ] .
+                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S" ))';
+        }
+    } 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..636f0edf1 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   https://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..ac9cc39d7 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   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
+ *
  * @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.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.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.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.string_format.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.string_format.php
index de4054ec9..8df5632c5 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   https://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..51944bde6 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   https://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..bd866a61f 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   https://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) {
-        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
+    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((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.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..9e1f06d67
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
@@ -0,0 +1,52 @@
+<?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
+ * @param Smarty_Internal_TemplateCompilerBase $compiler
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_unescape($params, Smarty_Internal_TemplateCompilerBase $compiler)
+{
+    $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) . '\'';
+    }
+
+    switch ($esc_type) {
+        case 'entity':
+        case 'htmlall':
+            if (Smarty::$_MBSTRING) {
+                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_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $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..31a90a055 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   https://www.smarty.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..49cb40b0f 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   https://www.smarty.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..2f747ad5a 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 https://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..a204b092c 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,25 @@
 /**
  * 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)) {
+        $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
     }
     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..7e85f7aae 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,87 @@
 <?php
+/**
+ * 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 {
+            $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");
+            }
 
-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; 
-  }
-}
+            // 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)");
+            }
 
-?>
\ No newline at end of file
+            $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/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..db68f9bfd
--- /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_' . smarty_ucfirst_ascii($type);
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
+        }
+        // try plugins dir
+        $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();
+        }
+        // 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..4b1c0f6d8
--- /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)$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((string)$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..c77ae9e17 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,235 @@
 <?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)
     {
-        $_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;
-    } 
-} 
+        return $smarty->ext->_cacheResourceFile->clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+    }
 
-?>
\ No newline at end of file
+    /**
+     * 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)
+    {
+        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 {
+            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)
+    {
+        $cached->is_locked = true;
+        touch($cached->lock_id);
+    }
+
+    /**
+     * 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..cbaccd2b3 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 .= $compiler->cStyleComment(" {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 .= $compiler->cStyleComment(" {/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..969e22c1a 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 supports 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..edfe358be 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..b05a82b74 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,236 @@
 <?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);
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
+        }
+        unset($_attr[ 'nocache' ]);
+        $_name = trim($_attr[ 'name' ], '\'"');
 
-        if ($_attr['nocache'] === true) {
-        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        if (!preg_match('/^[a-zA-Z0-9_\x80-\xff]+$/', $_name)) {
+	        $compiler->trigger_template_error("Function name contains invalid characters: {$_name}", 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'] = '';
+
+        $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 .= $compiler->cStyleComment(" {$_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 .= $compiler->cStyleComment("/ {$_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 .= $compiler->cStyleComment(" {$_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 .= $compiler->cStyleComment("/ {$_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..bf62461bc 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 .= $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 .= $compiler->cStyleComment(" 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
deleted file mode 100644
index 19ee186bc..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
+++ /dev/null
@@ -1,90 +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
- */
-class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
-	// attribute definitions
-    public $required_attributes = array('file');
-   	public $shorttag_order = array('file');
-    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
-     */
-    public function compile($args, $compiler)
-    {
-    	if (!$compiler->smarty->allow_php_tag) {
-        	throw new SmartyException("{include_php} is deprecated, set allow_php_tag = true to enable");
-    	} 
-        $this->compiler = $compiler;
-        // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        $_output = '<?php '; 
-
-        $_smarty_tpl = $compiler->template; 
-        $_filepath = false;
-        eval('$_file = ' . $_attr['file'] . ';'); 
-        if (!isset($this->compiler->smarty->security_policy) && file_exists($_file)) {
-        	$_filepath = $_file;
-        } else {
-            if (isset($this->compiler->smarty->security_policy)) {
-                $_dir = $this->compiler->smarty->security_policy->trusted_dir;
-            } else {
-                $_dir = $this->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;
-                        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'])) {
-            // 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(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
-        } 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..29031d910 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 = 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..246350dc8
--- /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 ][ smarty_strtolower_ascii($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 = 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 ]) ? 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);
+        }
+        $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..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
@@ -1,69 +1,161 @@
 <?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)
+                            ) {
+                                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;
+                            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_print_expression.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
index 5a9c93191..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
@@ -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((string) {$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..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
@@ -1,99 +1,130 @@
 <?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 = 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);
+        }
+        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_' . smarty_ucfirst_ascii($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 = '$_' . smarty_strtoupper_ascii($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':
+                    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)';
+                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 "(defined('{$_index[1]}') ? constant('{$_index[1]}') : null)";
+                    } else {
+                        return "(defined({$_index[1]}) ? constant({$_index[1]}) : null)";
+                    }
+                // 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..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
@@ -1,106 +1,211 @@
 <?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 = 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);
+    }
+
     /**
      * 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..1b64185b8 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php
@@ -1,479 +1,272 @@
 <?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
-    public $template_class = 'Smarty_Internal_Template';
-
+abstract class Smarty_Internal_Data
+{
     /**
-     * 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)
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
      */
-    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 $_objType = 4;
+
     /**
-     * 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
+     * name of class used for templates
+     *
+     * @var string
      */
-    public function assignGlobal($varname, $value = null, $nocache = false)
-    {
-        if ($varname != '') {
-            Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
-        } 
-    } 
+    public $template_class = 'Smarty_Internal_Template';
+
     /**
-     * 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
+     * template variables
+     *
+     * @var Smarty_Variable[]
      */
-    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 $tpl_vars = array();
 
     /**
-     * wrapper function for Smarty 2 BC
-     * 
-     * @param string $tpl_var the template variable name
-     * @param mixed $ &$value the referenced value to assign
+     * parent template (if any)
+     *
+     * @var Smarty|Smarty_Internal_Template|Smarty_Data
      */
-    public function assign_by_ref($tpl_var, &$value)
-    {
-       	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);
-    } 
+    public $parent = null;
+
     /**
-     * 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
+     * configuration settings
+     *
+     * @var string[]
      */
-    public function append($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 != '') {
-                    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;
-                    } 
-                } 
-            } 
-        } 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;
-                    } 
-                } else {
-                    $this->tpl_vars[$tpl_var]->value[] = $value;
-                } 
-            } 
-        } 
-    } 
+    public $config_vars = array();
 
     /**
-     * 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
+     * extension handler
+     *
+     * @var Smarty_Internal_Extension_Handler
      */
-    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
-     */
-    public function append_by_ref($tpl_var, &$value, $merge = 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);
-    } 
+    public $ext = null;
+
     /**
-     * Returns a single or all template variables
-     * 
-     * @param string $varname variable name or null
-     * @return string variable value or or array of variables
+     * Smarty_Internal_Data constructor.
+     *
+     * Install extension handler
      */
-    function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
+    public function __construct()
     {
-        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;
-        } 
-    } 
+        $this->ext = new Smarty_Internal_Extension_Handler();
+        $this->ext->objType = $this->_objType;
+    }
 
     /**
-     * clear the given assigned template variable.
-     * 
-     * @param string $ |array $tpl_var the template variable(s) to clear
+     * 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 clearAssign($tpl_var)
+    public function assign($tpl_var, $value = null, $nocache = false)
     {
         if (is_array($tpl_var)) {
-            foreach ($tpl_var as $curr_var) {
-                unset($this->tpl_vars[$curr_var]);
-            } 
+            foreach ($tpl_var as $_key => $_val) {
+                $this->assign($_key, $_val, $nocache);
+            }
         } else {
-            unset($this->tpl_vars[$tpl_var]);
-        } 
-    } 
+            if ($tpl_var !== '') {
+                if ($this->_objType === 2) {
+                    /**
+                     *
+                     *
+                     * @var Smarty_Internal_Template $this
+                     */
+                    $this->_assignInScope($tpl_var, $value, $nocache);
+                } else {
+                    $this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
+                }
+            }
+        }
+        return $this;
+    }
 
     /**
-     * clear all the assigned template variables.
+     * appends values to template variables
+     *
+     * @api  Smarty::append()
+     * @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
+     * @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 clearAllAssign()
+    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
     {
-        $this->tpl_vars = array();
-    } 
+        return $this->ext->append->append($this, $tpl_var, $value, $merge, $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
+     * 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
      */
-    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 assignGlobal($varName, $value = null, $nocache = false)
+    {
+        return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
+    }
 
     /**
-     * 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
+     * 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 getVariable($_variable, $_ptr = null, $search_parents = true, $error_enable = true)
+    public function appendByRef($tpl_var, &$value, $merge = false)
     {
-        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;
-        } 
-    } 
+        return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
+    }
+
     /**
-     * gets  a config variable
-     * 
-     * @param string $variable the name of the config variable
-     * @return mixed the value of the config variable
+     * 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 getConfigVariable($_variable)
+    public function assignByRef($tpl_var, &$value, $nocache = false)
     {
-        $_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 . '"');
-        } else {
-			// force a notice
-			$x = $$_variable;
-            return null;
-        } 
-    } 
+        return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
+    }
 
     /**
-     * gets  a stream variable
-     * 
-     * @param string $variable the stream of the variable
-     * @return mixed the value of the stream variable
+     * Returns a single or all template variables
+     *
+     * @api  Smarty::getTemplateVars()
+     * @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
+     * @param bool                                                    $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
      */
-    public function getStreamVariable($variable)
+    public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
     {
-        $_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->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
+    }
 
     /**
-     * Returns a single or all config variables
-     * 
-     * @param string $varname variable name or null
-     * @return string variable value or or array of variables
+     * Follow the parent chain an merge template and config variables
+     *
+     * @param \Smarty_Internal_Data|null $data
      */
-    function getConfigVars($varname = null, $search_parents = true)
+    public function _mergeVars(Smarty_Internal_Data $data = null)
     {
- //   	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 '';
+        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 {
-            return $var_array;
-        } 
-    } 
+            $data = $this;
+        }
+        if (isset($this->parent)) {
+            $this->parent->_mergeVars($data);
+        }
+    }
 
     /**
-     * Deassigns a single or all config variables
-     * 
-     * @param string $varname variable name or null
+     * Return true if this instance is a Data obj
+     *
+     * @return bool
      */
-    function clearConfig($varname = null)
+    public function _isDataObj()
     {
-        if (isset($varname)) {
-            unset($this->config_vars[$varname]);
-            return;
-        } else {
-            $this->config_vars = array();
-            return;
-        } 
-    } 
-
-} 
+        return $this->_objType === 4;
+    }
 
-/**
- * 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
+     * Return true if this instance is a template obj
+     *
+     * @return bool
      */
-    public function __construct ($_parent = null, $smarty = null)
+    public function _isTplObj()
     {
-        $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->_objType === 2;
+    }
+
     /**
-     * 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)
+     * Return true if this instance is a Smarty obj
+     *
+     * @return bool
      */
-    public function __construct ($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
+    public function _isSmartyObj()
     {
-        $this->value = $value;
-        $this->nocache = $nocache;
-        $this->scope = $scope;
-    } 
+        return $this->_objType === 1;
+    }
 
-    public function __toString ()
+    /**
+     * Get Smarty object
+     *
+     * @return Smarty
+     */
+    public function _getSmartyObj()
     {
-        return $this->value;
-    } 
-} 
+        return $this->smarty;
+    }
 
-/**
- * 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)
+    /**
+     * Handle unknown class methods
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     */
+    public function __call($name, $args)
     {
-        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..570819d26 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(__DIR__ . '/../plugins') ? __DIR__ .
+                                                                           '/../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:' . __DIR__ . '/../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..c2b653ef4
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Smarty error handler to fix new error levels in PHP8 for backwards compatibility
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Simon Wisselink
+ *
+ */
+class Smarty_Internal_ErrorHandler
+{
+
+    /**
+     * Allows {$foo} where foo is unset.
+     * @var bool
+     */
+    public $allowUndefinedVars = true;
+
+    /**
+     * Allows {$foo.bar} where bar is unset and {$foo.bar1.bar2} where either bar1 or bar2 is unset.
+     * @var bool
+     */
+    public $allowUndefinedArrayKeys = true;
+
+    private $previousErrorHandler = null;
+
+    /**
+     * Enable error handler to intercept errors
+     */
+    public function activate() {
+        /*
+            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.
+        */
+        $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 https://php.net/set_error_handler
+     *
+     * @param integer $errno Error level
+     * @param         $errstr
+     * @param         $errfile
+     * @param         $errline
+     * @param         $errcontext
+     *
+     * @return bool
+     */
+    public function handleError($errno, $errstr, $errfile, $errline, $errcontext = [])
+    {
+        if ($this->allowUndefinedVars && $errstr == 'Attempt to read property "value" on null') {
+            return; // suppresses this error
+        }
+
+        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_extension_handler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
new file mode 100644
index 000000000..3ef040ab1
--- /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
+ */
+#[\AllowDynamicProperties]
+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 = $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;
+                                } 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('smarty_ucfirst_ascii', $_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..e207734e8
--- /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 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)
+     * @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..b5be69b54
--- /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 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
+     * @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..6fb0c8f3d
--- /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 https://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..b74d30580
--- /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 https://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..12b755c06
--- /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 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
+     *
+     * @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..df766eee8
--- /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 https://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..db0a49b00
--- /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 https://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..d1b730322
--- /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 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
+     *
+     * @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..c3174d2d0
--- /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 https://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 https://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..c684c0870
--- /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 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
+     *                                                                                     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..763bdf989
--- /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 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
+     * @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..0b3a071d3
--- /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 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
+     *
+     * @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..0d1335a8d
--- /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 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
+     *
+     * @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..0470785b1
--- /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 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
+     * @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..af788a24e
--- /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 https://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..6ddcaec94
--- /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 . smarty_strtolower_ascii($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 = 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) {
+                    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..381346c8f
--- /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..5608b3fd0
--- /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 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
+     * @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..76a69c6e5
--- /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 https://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..4cda5b056
--- /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 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
+     *
+     * @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..9719eb2b6
--- /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 https://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..8e6fe0521
--- /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 https://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..74c0ae908
--- /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 https://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..302657ae0
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerresource.php
@@ -0,0 +1,39 @@
+<?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 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                                           $resource_handler instance of Smarty_Resource
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, Smarty_Resource $resource_handler)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $smarty->registered_resources[ $name ] = $resource_handler;
+        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..e41e8dffc
--- /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 https://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..377397e97
--- /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 https://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..ebc9337d0
--- /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 https://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..77d619637
--- /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 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
+     *
+     * @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..2431d5c23
--- /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 https://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..bbb6a861d
--- /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 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
+     *
+     * @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..829c420fe
--- /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 = 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 ] 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;
+    }
+}
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..58116c811
--- /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
deleted file mode 100644
index 467da11a8..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_registered.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Resource Registered
- * 
- * Implements the registered resource for Smarty template
- * 
- * @package Smarty
- * @subpackage TemplateResources
- * @author Uwe Tews 
- */
- 
-/**
- * Smarty Internal Plugin Resource Registered
- */
-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;
-
-    /**
-     * Return flag if template source is existing
-     * 
-     * @return boolean true
-     */
-    public function isExisting($_template)
-    {
-        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;
-    } 
-
-    /**
-     * Get timestamp of template source
-     * 
-     * @param object $_template template object
-     * @return int  timestamp
-     */
-    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;
-    }
-     
-    /**
-     * Get timestamp of template source by type and name
-     * 
-     * @param object $_template template object
-     * @return int  timestamp
-     */
-    public function getTemplateTimestampTypeName($_resource_type, $_resource_name)
-    { 
-        // return timestamp
-        $time_stamp = false;
-        call_user_func_array($this->smarty->registered_resources[$_resource_type][0][1],
-            array($_resource_name, &$time_stamp, $this->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
-     */
-    public function getTemplateSource($_template)
-    { 
-        // 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));
-    } 
-
-    /**
-     * Get filepath to compiled template
-     * 
-     * @param object $_template template object
-     * @return boolean return false as compiled template is not stored
-     */
-    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
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..5f0203498 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       https://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..d0ca751e2
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
@@ -0,0 +1,103 @@
+<?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 = 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') . ')';
+        $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..7994aa048
--- /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..492d5eb25
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
@@ -0,0 +1,91 @@
+<?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);
+        $_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, 0777, 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}");
+        }
+        // set file permissions
+        @chmod($_filepath, 0666 & ~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..72d1d52e0 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
@@ -1,998 +1,741 @@
 <?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
+#[\AllowDynamicProperties]
+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)) {
+                $tpl->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..918362e91
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
@@ -0,0 +1,401 @@
+<?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 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
+     * @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 ($smarty->isMutingUndefinedOrNullWarnings()) {
+                $errorHandler = new Smarty_Internal_ErrorHandler();
+                $errorHandler->activate();
+            }
+
+            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($errorHandler)) {
+                $errorHandler->deactivate();
+            }
+
+            if (isset($_smarty_old_error_level)) {
+                error_reporting($_smarty_old_error_level);
+            }
+            return $result;
+        } catch (Throwable $e) {
+            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);
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::registerPlugin()
+     * @link https://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 https://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 https://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 https://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..d5c18d31a 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -1,435 +1,1749 @@
 <?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 = '';
+
+    /**
+     * 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(
+        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 ($this->smarty->debugging) {
+                if (!isset($this->smarty->_debug)) {
+                    $this->smarty->_debug = new Smarty_Internal_Debug();
+                }
+                $this->smarty->_debug->start_compile($this->template);
+            }
+            $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 compileTemplate($template)
+    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 = smarty_strtolower_ascii($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') {
+                        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('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))
+            ) {
+                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,
+            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;
+        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);
+
+    public function cStyleComment($string) {
+        return '/*' . str_replace('*/', '* /' , $string) . '*/';
+    }
+
+    /**
+     * 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..5ca482058 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php
@@ -1,176 +1,354 @@
 <?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
 {
+    /**
+     * 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;
+
+    /**
+     * 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);
+   }
 
+    /**
+     * 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;
+    }
 
+     
     private $_yy_state = 1;
     private $_yy_stack = array();
 
-    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()
     {
-        $this->_yy_state = array_pop($this->_yy_stack);
+       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;
+       $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)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) {
             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,
+                        ' 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,7 +361,7 @@ 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
@@ -199,277 +377,91 @@ function yylex1()
 
 
     const TEXT = 1;
-    function yy_r1_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILD;
-    }
-    function yy_r1_2($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
-    function yy_r1_3($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
-    }
-    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)
-    {
-
-  $this->strip = true;
-  return false;
-    }
-    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)
-    {
-
-  $this->strip = false;
-  return false;
-    }
-    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)
-    {
-
-   $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)
-    {
-
-  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_r1_14($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_r1_15($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_r1_16($yy_subpatterns)
+    public function yy_r1_1()
     {
 
-  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_r1_17($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r1_2()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r1_18($yy_subpatterns)
+       $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;
+         }
+    public function yy_r1_4()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r1_19($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r1_6()
     {
 
-  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)
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+        $this->yypushstate(self::LITERAL);
+         }
+    public function yy_r1_8()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-    function yy_r1_21($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+        $this->yypushstate(self::LITERAL);
+         }
+    public function yy_r1_10()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-    function yy_r1_22($yy_subpatterns)
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r1_12()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-    function yy_r1_23($yy_subpatterns)
-    {
+       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;
+         }
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
-    function yy_r1_26($yy_subpatterns)
+     
+    public function yylex2()
     {
-
-  $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)) {
+        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
         }
-        $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_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 SMARTY');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TAG');
                 }
                 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");
@@ -482,7 +474,7 @@ 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
@@ -497,425 +489,417 @@ function yylex2()
     } // end function
 
 
-    const SMARTY = 2;
-    function yy_r2_1($yy_subpatterns)
+    const TAG = 2;
+    public function yy_r2_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
-    }
-    function yy_r2_2($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_4()
     {
 
-  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)
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_6()
     {
 
-  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_r2_5($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_8()
     {
 
-  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)
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_10()
     {
 
-  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_r2_7($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_12()
     {
 
-  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)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-     $this->yypopstate();
-  }
-    }
-    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)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r2_11($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-     $this->yypopstate();
-    }
-    function yy_r2_12($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-    }
-    function yy_r2_13($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
-    function yy_r2_14($yy_subpatterns)
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_15()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TO;
-    }
-    function yy_r2_15($yy_subpatterns)
+         $this->yypopstate();
+         $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->taglineno = $this->line;
+         }
+    public function yy_r2_18()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
-    function yy_r2_16($yy_subpatterns)
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_20()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
-    }
-    function yy_r2_17($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
-    }
-    function yy_r2_18($yy_subpatterns)
+        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;
+        }
+         }
+    public function yy_r2_23()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
-    }
-    function yy_r2_19($yy_subpatterns)
+        $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_EQUALS;
-    }
-    function yy_r2_20($yy_subpatterns)
-    {
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
 
-  $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
-    }
-    function yy_r2_22($yy_subpatterns)
+     
+    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
+        }
+        
+        do {
+            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');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $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);
 
-  $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
-    }
-    function yy_r2_24($yy_subpatterns)
-    {
+    } // end function
 
-  $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
-    }
-    function yy_r2_26($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
-    }
-    function yy_r2_27($yy_subpatterns)
+    const TAGBODY = 3;
+    public function yy_r3_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
-    }
-    function yy_r2_28($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
+         }
+    public function yy_r3_2()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_MOD;
-    }
-    function yy_r2_29($yy_subpatterns)
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r3_4()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_NOT;
-    }
-    function yy_r2_30($yy_subpatterns)
+        $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_LAND;
-    }
-    function yy_r2_31($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+         }
+    public function yy_r3_6()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LOR;
-    }
-    function yy_r2_32($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+         }
+    public function yy_r3_7()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LXOR;
-    }
-    function yy_r2_33($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+         }
+    public function yy_r3_8()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
-    }
-    function yy_r2_34($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+         }
+    public function yy_r3_9()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
-    }
-    function yy_r2_35($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
+         }
+    public function yy_r3_10()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISODD;
-    }
-    function yy_r2_36($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
+         }
+    public function yy_r3_11()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
-    }
-    function yy_r2_37($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+         }
+    public function yy_r3_12()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
-    }
-    function yy_r2_38($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+         }
+    public function yy_r3_13()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
-    }
-    function yy_r2_39($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+         }
+    public function yy_r3_15()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
-    }
-    function yy_r2_40($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+         }
+    public function yy_r3_17()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
-    }
-    function yy_r2_41($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+         }
+    public function yy_r3_20()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
-    }
-    function yy_r2_42($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+         }
+    public function yy_r3_23()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
-    }
-    function yy_r2_43($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+         }
+    public function yy_r3_24()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
-    }
-    function yy_r2_47($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+         }
+    public function yy_r3_28()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OPENP;
-    }
-    function yy_r2_48($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+         }
+    public function yy_r3_29()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
-    }
-    function yy_r2_49($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+         }
+    public function yy_r3_30()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OPENB;
-    }
-    function yy_r2_50($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+         }
+    public function yy_r3_31()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
-    }
-    function yy_r2_51($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+         }
+    public function yy_r3_32()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_PTR; 
-    }
-    function yy_r2_52($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+         }
+    public function yy_r3_33()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_APTR;
-    }
-    function yy_r2_53($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+         }
+    public function yy_r3_34()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-    }
-    function yy_r2_54($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+         }
+    public function yy_r3_35()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
-    }
-    function yy_r2_55($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+         }
+    public function yy_r3_37()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-    }
-    function yy_r2_57($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+         }
+    public function yy_r3_39()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_MATH;
-    }
-    function yy_r2_59($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+         }
+    public function yy_r3_41()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
-    }
-    function yy_r2_60($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
+         }
+    public function yy_r3_42()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
-    }
-    function yy_r2_61($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
+         }
+    public function yy_r3_43()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-    }
-    function yy_r2_62($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+         }
+    public function yy_r3_44()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_COLON;
-    }
-    function yy_r2_63($yy_subpatterns)
+        // 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;
+        }
+         }
+    public function yy_r3_45()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_AT;
-    }
-    function yy_r2_64($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+         }
+    public function yy_r3_48()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_HATCH;
-    }
-    function yy_r2_65($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+         }
+    public function yy_r3_49()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-  $this->yypushstate(self::DOUBLEQUOTEDSTRING);
-    }
-    function yy_r2_66($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+         }
+    public function yy_r3_50()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-  $this->yypopstate();
-    }
-    function yy_r2_67($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->yypopstate();
+         }
+    public function yy_r3_51()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_VERT;
-    }
-    function yy_r2_68($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+         }
+    public function yy_r3_52()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOT;
-    }
-    function yy_r2_69($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+         }
+    public function yy_r3_53()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_COMMA;
-    }
-    function yy_r2_70($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+         }
+    public function yy_r3_54()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
-    }
-    function yy_r2_71($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+         }
+    public function yy_r3_55()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_QMARK;
-    }
-    function yy_r2_72($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+         }
+    public function yy_r3_56()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_HEX;
-    }
-    function yy_r2_73($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+         }
+    public function yy_r3_57()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ID;
-    }
-    function yy_r2_74($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+         }
+    public function yy_r3_58()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
-    }
-    function yy_r2_75($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+         }
+    public function yy_r3_59()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-    }
-    function yy_r2_76($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+         }
+    public function yy_r3_60()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
+        $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,
+                        ' 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,7 +912,7 @@ 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
@@ -943,104 +927,70 @@ function yylex3()
     } // end function
 
 
-    const LITERAL = 3;
-    function yy_r3_1($yy_subpatterns)
+    const LITERAL = 4;
+    public function yy_r4_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-  $this->yypushstate(self::LITERAL);
-    }
-    function yy_r3_2($yy_subpatterns)
+        $this->literal_cnt++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+         }
+    public function yy_r4_3()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-  $this->yypopstate();
-    }
-    function yy_r3_3($yy_subpatterns)
-    {
-
-  $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;
-    }
-    function yy_r3_6($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-    function yy_r3_7($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-    function yy_r3_8($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-    function yy_r3_11($yy_subpatterns)
-    {
-
-  $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
-    }
-
-
-    function yylex4()
-    {
-        $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 ($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;
+         }
+
+     
+    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");
+        }
+        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,
+                        ' 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,7 +1003,7 @@ 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
@@ -1068,115 +1018,78 @@ function yylex4()
     } // end function
 
 
-    const DOUBLEQUOTEDSTRING = 4;
-    function yy_r4_1($yy_subpatterns)
+    const DOUBLEQUOTEDSTRING = 5;
+    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;
-  }
-    }
-    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)
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    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;
-  }
-    }
-    function yy_r4_5($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r5_5()
     {
 
-  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)
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r5_7()
     {
 
-  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_r4_7($yy_subpatterns)
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r5_9()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r4_8($yy_subpatterns)
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r5_11()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r4_9($yy_subpatterns)
+        $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();
-    }
-    function yy_r4_10($yy_subpatterns)
+        $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->yypushstate(self::SMARTY);
-  $this->taglineno = $this->line;
-    }
-    function yy_r4_11($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $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;
-    }
-    function yy_r4_12($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+         }
+    public function yy_r5_16()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
-    function yy_r4_13($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r5_17()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
-    function yy_r4_17($yy_subpatterns)
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r5_22()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
-    function yy_r4_18($yy_subpatterns)
-    {
+        $to = $this->dataLength;
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
+  }
 
-}
-?>
\ No newline at end of file
+     
\ 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..a2dd0d6fb 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
 {
@@ -83,1399 +10,1332 @@ class TP_yyStackEntry
 };
 
 
-#line 12 "smarty_internal_templateparser.y"
-class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php"
+// 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>
+*/
+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 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;
+
+    /**
+     * @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;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
     private $internalError = false;
 
-    function __construct($lex, $compiler) {
+    /**
+     * {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();
+
+    /**
+     * 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->is_xml = false;
-				$this->asp_tags = (ini_get('asp_tags') != '0');
-				$this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
+        $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();
     }
 
-    public static function escape_start_tag($tag_text) {
-       $tag = preg_replace('/\A<\?(.*)\z/', '<<?php ?>?\1', $tag_text, -1 , $count); //Escape tag
-       return $tag;
+     /**
+     * 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));
     }
 
-    public static function escape_end_tag($tag_text) {
-       return '?<?php ?>>';
+    /**
+     * 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));
     }
 
-    
-#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_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_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,
+    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,
     );
-    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,
+    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 = -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_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 = -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,
+    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,
 );
-    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(),
+    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(),
 );
-    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,
+    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 = 121;
-    const YYSTACKDEPTH = 100;
-    const YYNSTATE = 383;
-    const YYNRULE = 199;
-    const YYERRORSYMBOL = 78;
+    const YYNOCODE = 109;
+    const YYSTACKDEPTH = 500;
+    const YYNSTATE = 326;
+    const YYNRULE = 186;
+    const YYERRORSYMBOL = 61;
     const YYERRSYMDT = 'yy0';
     const YYFALLBACK = 0;
-    static public $yyFallback = array(
+    public static $yyFallback = array(
     );
-    static function Trace($TraceFILE, $zTracePrompt)
+    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 $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',         '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',  
+    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',           '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',
+  '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',
     );
 
-    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 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',
     );
 
-    function tokenName($tokenType)
+    public function tokenName($tokenType)
     {
         if ($tokenType === 0) {
             return 'End of Input';
@@ -1483,50 +1343,59 @@ function tokenName($tokenType)
         if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
             return $this->yyTokenName[$tokenType];
         } else {
-            return "Unknown";
+            return 'Unknown';
         }
     }
 
-    static function yy_destructor($yymajor, $yypminor)
+    public static function yy_destructor($yymajor, $yypminor)
     {
         switch ($yymajor) {
             default:  break;   /* If no destructor action specified: do nothing */
         }
     }
 
-    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] .
+        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);
         $this->yyidx--;
+
         return $yymajor;
     }
 
-    function __destruct()
+    public function __destruct()
     {
         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)
     {
+        static $res3 = array();
+        static $res4 = array();
         $state = $this->yystack[$this->yyidx]->stateno;
         $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
+        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 +1405,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 +1413,24 @@ 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']);
+                        self::$yyRuleInfo[$yyruleno][0]);
                     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);
+                $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 +1438,10 @@ function yy_get_expected_tokens($token)
                         $this->yyidx++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $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,20 +1460,29 @@ 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;
-        }
+        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;
         do {
@@ -1606,7 +1491,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 +1499,32 @@ 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;
+                        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'];
+                        $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) {
@@ -1657,13 +1549,14 @@ function yy_is_expected_token($token)
         } while (true);
         $this->yyidx = $yyidx;
         $this->yystack = $stack;
+
         return true;
     }
 
-   function yy_find_shift_action($iLookAhead)
+   public function yy_find_shift_action($iLookAhead)
     {
         $stateno = $this->yystack[$this->yyidx]->stateno;
-     
+
         /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
         if (!isset(self::$yy_shift_ofst[$stateno])) {
             // no shift actions
@@ -1673,7 +1566,7 @@ function yy_find_shift_action($iLookAhead)
         if ($i === self::YY_SHIFT_USE_DFLT) {
             return self::$yy_default[$stateno];
         }
-        if ($iLookAhead == self::YYNOCODE) {
+        if ($iLookAhead === self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
@@ -1681,20 +1574,22 @@ function yy_find_shift_action($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] . " => " .
+                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];
         } else {
             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; */
 
@@ -1702,10 +1597,10 @@ function yy_find_reduce_action($stateno, $iLookAhead)
             return self::$yy_default[$stateno];
         }
         $i = self::$yy_reduce_ofst[$stateno];
-        if ($i == self::YY_REDUCE_USE_DFLT) {
+        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;
@@ -1717,389 +1612,377 @@ function yy_find_reduce_action($stateno, $iLookAhead)
         }
     }
 
-    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 73 "smarty_internal_templateparser.y"
+// line 220 "../smarty/lexer/smarty_internal_templateparser.y"
 
     $this->internalError = true;
-    $this->compiler->trigger_template_error("Stack overflow in template parser");
-#line 1731 "smarty_internal_templateparser.php"
+    $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",
+            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 ),
+    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 ),
     );
 
-    static public $yyReduceMap = array(
+    public static $yyReduceMap = array(
         0 => 0,
         1 => 1,
-        2 => 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,
-        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,
+        18 => 18,
         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,
+        20 => 20,
         24 => 24,
         25 => 25,
         26 => 26,
         27 => 27,
-        28 => 27,
-        30 => 27,
+        28 => 28,
         29 => 29,
+        30 => 30,
         31 => 31,
-        32 => 31,
-        33 => 33,
+        33 => 31,
+        32 => 32,
         34 => 34,
         35 => 35,
-        36 => 36,
         37 => 37,
         38 => 38,
         39 => 39,
         40 => 40,
-        42 => 40,
         41 => 41,
-        43 => 41,
+        42 => 42,
+        43 => 43,
         44 => 44,
         45 => 45,
         46 => 46,
-        66 => 46,
-        67 => 46,
-        164 => 46,
-        185 => 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 => 54,
+        54 => 53,
         55 => 55,
-        56 => 56,
-        57 => 57,
+        132 => 55,
         58 => 58,
-        59 => 59,
         60 => 60,
-        69 => 60,
-        152 => 60,
-        156 => 60,
         61 => 61,
-        153 => 61,
-        62 => 62,
+        62 => 61,
         63 => 63,
-        64 => 63,
-        65 => 65,
+        64 => 64,
+        67 => 67,
         68 => 68,
+        69 => 68,
         70 => 70,
         71 => 71,
-        72 => 71,
+        72 => 72,
         73 => 73,
+        74 => 74,
+        75 => 75,
         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,
+        78 => 78,
+        80 => 78,
+        81 => 78,
+        112 => 78,
+        79 => 79,
         84 => 84,
+        85 => 85,
         86 => 86,
         87 => 87,
-        88 => 88,
-        93 => 88,
         89 => 89,
-        92 => 89,
         90 => 90,
-        95 => 90,
-        91 => 91,
-        94 => 91,
-        97 => 97,
-        98 => 98,
+        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,
-        112 => 112,
+        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 => 123,
+        123 => 122,
+        125 => 122,
+        126 => 122,
         124 => 124,
-        125 => 125,
-        126 => 126,
-        127 => 127,
         128 => 128,
         129 => 129,
         130 => 130,
+        175 => 130,
         131 => 131,
-        134 => 131,
-        132 => 132,
         133 => 133,
+        134 => 134,
         135 => 135,
+        136 => 136,
         137 => 137,
         138 => 138,
         139 => 139,
@@ -2110,718 +1993,800 @@ function yy_shift($yyNewState, $yyMajor, $yypMinor)
         144 => 144,
         145 => 145,
         146 => 146,
-        147 => 147,
-        148 => 148,
         149 => 149,
         150 => 150,
-        151 => 151,
-        154 => 154,
-        155 => 155,
-        157 => 157,
+        152 => 152,
+        153 => 153,
+        156 => 156,
         158 => 158,
         159 => 159,
         160 => 160,
-        161 => 160,
+        161 => 161,
+        162 => 162,
+        163 => 163,
+        164 => 164,
         165 => 165,
         166 => 166,
         167 => 167,
-        168 => 168,
-        169 => 169,
+        168 => 167,
         170 => 170,
-        171 => 171,
         172 => 172,
         173 => 173,
-        174 => 174,
-        175 => 175,
         176 => 176,
         177 => 177,
         178 => 178,
         179 => 179,
+        182 => 179,
+        180 => 180,
+        183 => 180,
         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,
+        185 => 185,
     );
-#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 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));
       }
-#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"
+     $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());
+            }
+        }
+    }
+    }
+// 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 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 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 557 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r55(){
+    $this->_retvalue = '\''.$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 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 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 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 598 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r64(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->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 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 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 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 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 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 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 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 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 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 676 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r79(){
+    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// 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 701 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r85(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
+    }
+// line 705 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r86(){
+    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 710 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r87(){
+    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 727 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r89(){
+    $this->_retvalue = '('. $this->yystack[$this->yyidx + -1]->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 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 799 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r101(){
+    $this->_retvalue = $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 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 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 961 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r134(){
+    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->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 977 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r136(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// 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 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);
+    }
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// 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 & ',
+        );
+   $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+   $this->_retvalue = $scond[$op];
+    }
+// line 1185 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r167(){
+    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->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 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 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 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 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 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 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 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 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 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);
+    }
+// 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;
 
-    function yy_reduce($yyruleno)
+    public function yy_reduce($yyruleno)
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if (self::$yyTraceFILE && $yyruleno >= 0 
+        if ($this->yyTraceFILE && $yyruleno >= 0
               && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
-                self::$yyTracePrompt, $yyruleno,
+            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]}();
             $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);
         if ($yyact < self::YYNSTATE) {
-            if (!self::$yyTraceFILE && $yysize) {
+            if (!$this->yyTraceFILE && $yysize) {
                 $this->yyidx++;
                 $x = new TP_yyStackEntry;
                 $x->stateno = $yyact;
@@ -2831,52 +2796,47 @@ function yy_reduce($yyruleno)
             } 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()
+    public function yy_parse_failed()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
+        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)
+    public function yy_syntax_error($yymajor, $TOKEN)
     {
-#line 66 "smarty_internal_templateparser.y"
+// line 213 "../smarty/lexer/smarty_internal_templateparser.y"
 
     $this->internalError = true;
     $this->yymajor = $yymajor;
     $this->compiler->trigger_template_error();
-#line 2853 "smarty_internal_templateparser.php"
     }
 
-    function yy_accept()
+    public function yy_accept()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
         }
-#line 58 "smarty_internal_templateparser.y"
+// line 206 "../smarty/lexer/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"
     }
 
-    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;
@@ -2884,15 +2844,15 @@ 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]);
+
+        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 &&
@@ -2910,26 +2870,26 @@ 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]);
+                    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 &&
+                                 $yymx !== self::YYERRORSYMBOL &&
         ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
                               ){
                             $this->yy_pop_parser_stack();
@@ -2938,7 +2898,7 @@ function doParse($yymajor, $yytokenvalue)
                             $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 +2919,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..c8ffd4cc6
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
@@ -0,0 +1,605 @@
+<?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(__DIR__ . '/../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_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_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_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_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..3c43a9f46
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
@@ -0,0 +1,260 @@
+<?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 ];
+        }
+        // try sysplugins dir
+        if (isset(self::$sysplugins[ $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_' . smarty_ucfirst_ascii($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..191fa7c90
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
@@ -0,0 +1,104 @@
+<?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 . ':' . $this->generateSafeName($source->name);
+        $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($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_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..97cd0521d 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_security.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_security.php
@@ -1,229 +1,680 @@
 <?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 {
-    /**
-     * 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;
+#[\AllowDynamicProperties]
+class Smarty_Security
+{
 
     /**
      * 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', 'sizeof', '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;
+
     /**
-     * + flag if the {php} and {include_php} tag can be executed
+     * max template nesting level
+     *
+     * @var int
      */
-    public $allow_php_tag = false;
+    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();
+
+    /**
+     * Cache for $template_dir lookup
+     *
+     * @var array
+     */
+    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
+     *
+     * @return boolean                 true if class is trusted
      */
-    function isTrustedStaticClass($class_name, $compiler)
+    public function isTrustedStaticClass($class_name, $compiler)
     {
-        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
+        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 {
-            $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 
+            $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 modifier is trusted
+     * @deprecated
+     * @return boolean                 true if modifier is trusted
      */
-    function isTrustedModifier($modifier_name, $compiler)
+    public function isTrustedPhpModifier($modifier_name, $compiler)
     {
-        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
+        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 ("modifier '{$modifier_name}' not allowed by security setting");
-            return false;
-        } 
-    } 
+            $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 stream is trusted.
-     * 
-     * @param string $stream_name 
+     * Check if special $smarty variable is trusted.
+     *
+     * @param string $var_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 isTrustedSpecialSmartyVar($var_name, $compiler)
     {
-        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
             return true;
         } else {
-            throw new SmartyException ("stream '{$stream_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 directory of file resource is trusted.
-     * 
-     * @param string $filepath 
+     * Check if modifier plugin is trusted.
+     *
+     * @param string $modifier_name
      * @param object $compiler compiler object
-     * @return boolean true if directory is trusted
+     *
+     * @return boolean                 true if tag is trusted
      */
-    function isTrustedResourceDir($filepath)
+    public function isTrustedModifier($modifier_name, $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");
-        return false;
-    } 
-    
+        // 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 {
+            $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
-     */
-    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 bool
+     */
+    public function isTrustedConstant($const, $compiler)
+    {
+        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");
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Check if directory of file resource is trusted.
+     *
+     * @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");
+    }
+
+    /**
+     * 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..6a534228b
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_variable.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * class for the Smarty variable object
+ * This class defines the Smarty variable object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+#[\AllowDynamicProperties]
+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..0a0a32351
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Smarty compiler exception class
+ *
+ * @package Smarty
+ */
+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
+     */
+    public function __toString()
+    {
+        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
+    }
+
+    /**
+     * @param int $line
+     */
+    public function setLine($line)
+    {
+        $this->line = $line;
+    }
+
+    /**
+     * 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) . ' <-- ';
+    }
+}
diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 74d789d12..4a631d5e3 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']);
@@ -161,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']);
@@ -173,6 +151,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();
 
@@ -181,10 +161,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.
@@ -245,6 +226,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;
@@ -311,7 +293,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.
@@ -388,6 +370,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/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/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 31d35e3fd..6550f5fa2 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -1,33 +1,11 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
+import('ttFavReportHelper');
+import('ttReportHelper');
 
 // Definitions for chart types.
 define('CHART_PROJECTS', 1);
@@ -37,57 +15,168 @@
 // 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;
+    $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:
-        $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_PREVIOUS_MONTH:
+        $period = new ttPeriod(new ttDate($selected_date), INTERVAL_PREVIOUS_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;
     }
 
     $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 $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 $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 $userIdPart and l.group_id = $group_id and l.org_id = $org_id $q_period 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;
+  }
+
+
+  // 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(APP_DIR.'/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 l.status = 1 and l.user_id = $user_id $q_period group by 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 l.status = 1 and l.user_id = $user_id $q_period group by 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 l.status = 1 and l.user_id = $user_id $q_period group by 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 - 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.
       }
     }
 
@@ -135,6 +224,7 @@ 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;
diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 7105595d8..5c9dff349 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;
       }
     }
@@ -174,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 +173,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 +189,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);
@@ -213,6 +197,10 @@ static function insert($fields)
           return false;
       }
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return $last_id;
   }
 
@@ -230,7 +218,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;
@@ -255,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.
@@ -363,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/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/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/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
new file mode 100644
index 000000000..25dc4874a
--- /dev/null
+++ b/WEB-INF/lib/ttDate.class.php
@@ -0,0 +1,196 @@
+<?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.
+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
+
+  // 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, $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');
+    }
+
+    $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);
+  }
+
+
+  // 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 ($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;
+  }
+
+
+  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;
+  }
+
+
+  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; }
+  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));
+  }
+
+
+  // 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) {
+      $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/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/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 303ca5767..0992b786b 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 {
@@ -42,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;
@@ -74,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')) {
@@ -84,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'));
@@ -172,6 +146,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.
   //
@@ -263,6 +275,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/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 2707fd2b1..2b2470439 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.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('ttGroupHelper');
+import('ttDate');
 
 // Class ttFavReportHelper is used to help with favorite report related tasks.
 class ttFavReportHelper {
@@ -120,8 +97,8 @@ 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,".
-      " billable, approved, invoice, timesheet, paid_status, users, period, period_start,".
+      " (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,".
       " show_task, show_end, show_note, show_approved, show_work_units,".
@@ -130,10 +107,10 @@ 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['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'].", ".
@@ -162,13 +139,14 @@ 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']).", ".
       "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']).", ".
@@ -236,12 +214,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(
@@ -249,13 +227,14 @@ 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'),
       '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,
@@ -328,7 +307,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;
@@ -339,7 +318,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;
@@ -349,25 +328,44 @@ 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);
+          }
+        }
+
+        // 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']);
       $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']);
       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']);
@@ -423,7 +421,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;
@@ -432,7 +430,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;
@@ -440,7 +438,8 @@ static function loadReport(&$bean) {
           $custom_field_attrs[$checkbox_field_name] = null;
         }
       }
-      $attrs = array_merge($attrs, $custom_field_attrs);
+      if (isset($custom_field_attrs))
+        $attrs = array_merge($attrs, $custom_field_attrs);
       $bean->setAttributes($attrs);
     }
   }
@@ -462,6 +461,47 @@ 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;
+
+    // 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;
+    $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: 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.
@@ -496,6 +536,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) {
@@ -508,7 +549,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'))
@@ -524,9 +573,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.
@@ -535,12 +590,34 @@ 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] = (int)$checkbox_value;
+        }
+      }
+      // 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);
+          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;
         }
       }
-      // TODO: add project fields here.
     }
 
     // Adjust period_start and period_end to user date format.
@@ -566,7 +643,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)); 
@@ -578,7 +655,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));
@@ -589,7 +666,31 @@ static function makeReportSpec($bean) {
       }
     }
 
-    $reportSpec = implode(',', $reportSpecArray);
+    // 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';
+      }
+    }
+
+    // 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);
     return $reportSpec;
   }
 
diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 48105e417..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 {
@@ -137,11 +113,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 +148,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 +163,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;
@@ -220,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, '&');
 
@@ -245,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.
@@ -295,6 +273,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 +299,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 +315,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).
@@ -362,7 +340,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 +424,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 +440,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 +450,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/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 5e1885af9..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');
@@ -34,7 +10,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.
@@ -44,11 +20,9 @@ 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.
-  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.
@@ -57,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.
@@ -93,8 +68,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'];
@@ -114,10 +88,10 @@ 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');
-      $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
     }
 
     // Determine active user count in a separate query.
diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 843fe84f4..ecd4f80ac 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.
@@ -152,7 +128,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']."\"";
@@ -162,6 +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=\"".htmlspecialchars($group['custom_css'])."\"";
+    $group_part .= " custom_translation=\"".htmlspecialchars($group['custom_translation'])."\"";
     $group_part .= ">\n";
 
     // Write group info.
@@ -316,7 +293,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']."\"";
@@ -354,8 +331,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']."\"";
@@ -379,7 +356,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);
@@ -404,11 +381,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']."\"";
@@ -448,6 +425,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);
       }
@@ -464,7 +442,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";
@@ -484,11 +462,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']."\"";
@@ -582,14 +560,15 @@ 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']."\"";
         $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']."\"";
@@ -632,6 +611,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/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index af8d55345..81d1af696 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');
 
@@ -51,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')) {
@@ -97,7 +77,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 +93,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']);
@@ -229,6 +208,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;
     }
@@ -337,6 +317,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".
@@ -365,6 +347,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".
@@ -423,6 +407,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";
 
@@ -446,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']);
@@ -503,7 +487,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;
     }
@@ -694,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;
       }
@@ -780,4 +763,17 @@ static function deleteGroupFiles($group_id) {
     // By design, we ignore such errors.
     return true;
   }
+
+  // updateEntitiesModified updates the entities_modified 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/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 0afd0c9aa..44206fa0e 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -1,33 +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('ttClientHelper');
-import('DateAndTime');
+import('ttDate');
 
 // Class ttInvoiceHelper is used for help with invoices.
 class ttInvoiceHelper {
@@ -40,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".
@@ -65,7 +42,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;
       }
     }
@@ -182,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;
       }
@@ -249,12 +225,14 @@ 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 = '';
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     // Our query is different depending on tracking mode.
@@ -320,20 +298,21 @@ 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'];
 
-    $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 = '';
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     // Create a new invoice record.
diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index 8e5cb8aff..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.
@@ -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/ttOrgExportHelper.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
index 2dd54f1b3..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/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index ffb39beb4..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.
@@ -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/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 32a5c81f1..cc0ecf1d8 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.
@@ -114,7 +90,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'],
@@ -123,7 +98,9 @@ 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'],
+          'custom_translation' => $attrs['CUSTOM_TRANSLATION']));
 
         // Special handling for top group.
         if (!$this->org_id && $this->current_group_id) {
@@ -191,6 +168,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)
@@ -217,6 +195,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)
@@ -242,14 +221,13 @@ 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(
           '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 +263,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 +289,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 +308,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'],
@@ -372,7 +350,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;
@@ -387,7 +366,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 +381,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,14 +456,15 @@ 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'],
           'timesheet' => $attrs['TIMESHEET'],
           'paid_status' => $attrs['PAID_STATUS'],
+          'note_containing' => $attrs['NOTE_CONTAINING'],
           'users' => $user_list,
           'period' => $attrs['PERIOD'],
           'from' => $attrs['PERIOD_START'],
@@ -525,6 +505,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'));
@@ -703,9 +684,9 @@ 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, 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']);
@@ -721,7 +702,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']);
@@ -730,6 +710,8 @@ 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 .= ', '.$mdb2->quote($fields['custom_translation']);
     $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
     $values .= ')';
 
@@ -849,7 +831,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)
@@ -922,7 +903,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'];
 
@@ -1037,6 +1018,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'];
@@ -1073,7 +1055,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,".
@@ -1084,7 +1066,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'].", ".
@@ -1115,12 +1097,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'));
   }
@@ -1173,9 +1156,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/WEB-INF/lib/ttPeriod.class.php b/WEB-INF/lib/ttPeriod.class.php
new file mode 100644
index 000000000..0dcbf71c1
--- /dev/null
+++ b/WEB-INF/lib/ttPeriod.class.php
@@ -0,0 +1,85 @@
+<?php
+/* 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);
+define('INTERVAL_ALL_TIME', 5);
+define('INTERVAL_PREVIOUS_WEEK', 6);
+define('INTERVAL_PREVIOUS_MONTH', 7);
+define('INTERVAL_PREVIOUS_DAY', 8);
+
+class ttPeriod {
+  var $startDate; // ttDate object.
+  var $endDate;   // ttDate object.
+
+
+  function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
+
+    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_DAY:
+        $this->startDate->setFromUnixTimestamp($ttDateInstance->getTimestamp());
+        $this->endDate->setFromUnixTimestamp($ttDateInstance->getTimestamp());
+        break;
+
+      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;
+
+      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_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;
+
+      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_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;
+
+      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;
+      }
+    }
+
+  // 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) {
+    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/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 8ec8ccfee..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
 // +----------------------------------------------------------------------+
 
 
@@ -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/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index d456c3110..303289688 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');
@@ -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()) {
@@ -160,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();
@@ -210,9 +216,26 @@ 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;
+
+    // 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".
+      " 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;
+
+    return true;
   }
   
   // insert function inserts a new project into database.
@@ -263,6 +286,10 @@ static function insert($fields)
       }
     }
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return $last_id;
   } 
 
@@ -341,14 +368,26 @@ static function update($fields) {
         return false;
     }
     // End of updating tt_project_task_binds table.
-    
+
+    // If we are making the project inactive, unassign it from all clients.
+    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).
       ", 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/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 936bb4ffd..8afbf665b 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.
@@ -70,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'));
@@ -84,7 +55,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'));
@@ -98,11 +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.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');
@@ -133,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/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index fa7519a05..fb802f95e 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1,38 +1,14 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
-import('Period');
+import('ttDate');
+import('ttPeriod');
 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.
@@ -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;
     }
@@ -70,21 +46,25 @@ 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';
-    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';
-    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 ($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];
@@ -97,7 +77,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];
@@ -109,7 +89,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];
@@ -121,7 +101,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];
@@ -132,26 +112,56 @@ 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 = $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
       $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 ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($dateFormat));
+    if (isset($options['period']) && $options['period'])
+      $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";
+    $where = " where l.status = 1 and l.date >= '".$period->getStartDate()."' and l.date <= '".$period->getEndDate()."'".
+      $user_list_part.$dropdown_parts.$cf_text_parts.$note_containing_part;
     return $where;
   }
 
@@ -165,7 +175,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.
@@ -174,23 +184,27 @@ 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 ($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['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)) {
         $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.
     // 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];
@@ -203,7 +217,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];
@@ -214,26 +228,56 @@ 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 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'];
+        $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 = $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
       $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 ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($dateFormat));
+    if (isset($options['period']) && $options['period'])
+      $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)."'".
-      " $user_list_part $dropdown_parts $cf_text_parts";
+    $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate()."' and ei.date <= '".$period->getEndDate()."'".
+      $user_list_part.$dropdown_parts.$cf_text_parts.$note_containing_part;
     return $where;
   }
 
@@ -257,6 +301,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);
@@ -277,11 +322,11 @@ 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;
-        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");
@@ -302,11 +347,11 @@ 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;
-        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");
@@ -317,6 +362,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");
@@ -344,15 +405,23 @@ 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 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');
@@ -375,14 +444,13 @@ 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.
-    if ($custom_fields && $custom_fields->userFields) {
+    // 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'];
         $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.
@@ -396,6 +464,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'])
@@ -407,11 +495,11 @@ 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;
-        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.
@@ -465,11 +553,11 @@ 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;
-          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");
@@ -489,15 +577,31 @@ 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;
-          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.
           }
         }
       }
+      // 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.
@@ -511,11 +615,14 @@ 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 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');
@@ -537,13 +644,13 @@ 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) {
+      // 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'];
           $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.
@@ -557,6 +664,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)
@@ -583,6 +710,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'] : '';
@@ -591,7 +719,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';
@@ -604,6 +732,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'] != '')
@@ -611,6 +740,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']);
@@ -635,28 +768,32 @@ 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, ',');
+    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'];
+        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;
+      // 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.
   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;
@@ -665,31 +802,37 @@ 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();
 
     $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.
 
     // 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);
       $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);
@@ -702,18 +845,35 @@ 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);
-      if ($options['show_cost']) {
+      if (isset($options['show_cost']) && $options['show_cost']) {
         $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'],'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;
@@ -727,7 +887,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();
@@ -735,14 +895,15 @@ 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']) {
+    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
@@ -754,7 +915,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];
@@ -772,7 +933,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];
@@ -792,7 +953,27 @@ static function getTotals($options)
         }
       }
     }
-    if ($options['show_cost']) {
+    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)";
       } else {
@@ -801,7 +982,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)";
@@ -814,7 +995,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";
@@ -822,7 +1003,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];
@@ -842,6 +1023,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";
 
@@ -858,7 +1059,8 @@ static function getTotals($options)
 
     $val = $res->fetchRow();
     $total_time = ttTimeHelper::minutesToDuration($val['time'] / 60);
-    if ($options['show_cost']) {
+    $total_cost = $total_expenses = null;
+    if (isset($options['show_cost']) && $options['show_cost']) {
       $total_cost = $val['cost'];
       if (!$total_cost) $total_cost = '0.00';
       if ('.' != $decimalMark)
@@ -870,19 +1072,20 @@ static function getTotals($options)
     }
 
     $dateFormat = $user->getDateFormat();
-    if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($dateFormat));
+    if (isset($options['period']) && $options['period'])
+      $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));
     }
 
-    $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['units'] = $val['units'];
+    $totals['minutes'] = $val['time'] / 60;
+    $totals['units'] = isset($val['units']) ? $val['units'] : null;
     $totals['cost'] = $total_cost;
     $totals['expenses'] = $total_expenses;
 
@@ -1001,11 +1204,11 @@ 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);
-    if ($grouping)
-      $subtotals = ttReportHelper::getSubtotals($options);
+    $subtotals = $grouping ? ttReportHelper::getSubtotals($options) : array();
     $totals = ttReportHelper::getTotals($options);
 
     // Use custom fields plugin if it is enabled.
@@ -1037,6 +1240,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) {
@@ -1050,6 +1261,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++;
@@ -1146,6 +1358,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.
@@ -1166,6 +1386,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'])
@@ -1214,6 +1436,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) {
@@ -1228,6 +1458,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'];
@@ -1263,6 +1494,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.
@@ -1283,6 +1522,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']) {
@@ -1303,7 +1544,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="'.$cellLeftAligned.'">'.htmlspecialchars($record['timesheet_name']).'</td>';
           $body .= '</tr>';
           if ($show_note_row && $record['note']) {
             $body .= '<tr style="'.$row_style.'">';
@@ -1333,6 +1574,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) {
@@ -1347,6 +1596,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'];
@@ -1375,6 +1625,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) {
@@ -1389,6 +1647,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'];
@@ -1417,9 +1676,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));
@@ -1439,27 +1709,27 @@ static function checkFavReportCondition($options, $condition)
     $equal = ttStartsWith($condition, '=');
     if ($equal) $condition = trim(str_replace('=', '', $condition));
 
-    $count_required = (int) $condition;
+    $required_value = (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;
   }
 
   // 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();
@@ -1493,19 +1763,31 @@ 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['billable'] = $bean->getAttribute('include_records');
-    $options['invoice'] = $bean->getAttribute('invoice');
-    $options['paid_status'] = $bean->getAttribute('paid_status');
-    $options['approved'] = $bean->getAttribute('approved');
+    // $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');
+
+    // 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');
+    $options['paid_status'] = (int)$bean->getAttribute('paid_status');
+    $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 = '';
     if ($active_users_in_bean && is_array($active_users_in_bean)) {
       $users = join(',', $active_users_in_bean);
     }
@@ -1516,24 +1798,25 @@ 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['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['note_containing'] = $bean->getAttribute('note_containing');
+    $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')) {
@@ -1545,8 +1828,14 @@ 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);
-          $options[$checkbox_control_name] =  $bean->getAttribute($checkbox_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);
         }
       }
 
@@ -1555,18 +1844,38 @@ 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);
-          $options[$checkbox_control_name] =  $bean->getAttribute($checkbox_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);
         }
       }
 
-      // 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;
+          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);
+        }
+      }
     }
 
     $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;
   }
 
@@ -1574,6 +1883,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');
@@ -1594,13 +1906,166 @@ static function verifyBean($bean) {
       }
     }
 
-    // TODO: add additional checks here. Perhaps do it before saving the bean for consistency.
+    // Check fav report id.
+    $fav_report_id = $bean->getAttribute('favorite_report');
+    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;
+
+    // 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 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;
+
+    // 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;
+    if (!ttValidCheckbox($bean->getAttribute('chproject'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chtask'))) 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('chunits'))) 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;
+
+    // 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;
+        }
+      }
+    }
+
+    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' || $groupByOption == null)
+      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) {
+    $group_by_key = '';
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
       $group_by1 = $options['group_by1'];
@@ -1629,284 +2094,400 @@ 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'];
+    $group_by_parts = '';
+    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";
+    return $group_by_part;
+  }
 
-    // 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;
-    }
+  // 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) {
+    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);
     // 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;
+  // 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);
+    }
+  }
 
-    $group_by1 = $options['group_by1'];
-    $group_by2 = $options['group_by2'];
-    $group_by3 = $options['group_by3'];
+  // 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;
 
-    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;
+    // 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')");
+          }
+        }
+      }
     }
-    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;
+    // 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')");
+          }
+        }
+      }
     }
-    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;
+    // 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')");
+          }
+        }
+      }
     }
-    // Remove garbage from the beginning.
-    $group_by_parts = ltrim($group_by_parts, ', ');
-    if ($group_by_parts)
-      $group_by_part = "group by $group_by_parts";
-    return $group_by_part;
+    return null;
   }
 
-  // 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'];
+  // 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;
 
-    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;
+    // 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')");
+          }
+        }
+      }
     }
-    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 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')");
+          }
+        }
+      }
     }
-    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;
+    // 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'");
+          }
+        }
+      }
     }
-    // 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";
+    return null;
   }
 
-  // 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'];
+  // 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);
+    }
+  }
 
-    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;
+  // 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 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");
+          }
+        }
+      }
     }
-    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;
+    // 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");
+          }
+        }
+      }
     }
-    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;
+    // 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;
+  }
+
+  // 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 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) {
+        $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) {
+    if (!ttReportHelper::grouping($options)) return null;
+
+    $group_by_fields_parts = '';
+    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;
+  }
+
+  // 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 = '';
+    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;
+  }
+
+  // makeConcatPart builds a concatenation part for getSubtotals query (for time items).
+  static function makeConcatPart($options) {
+    if (!ttReportHelper::grouping($options)) return null;
+
+    $concat_part = '';
+    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);
+    $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) {
+    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);
     // 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.
@@ -1969,7 +2550,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();
@@ -1986,35 +2567,35 @@ 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.
-    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];
-        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.
-            $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)";
           }
         }
       }
     }
     // 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];
         $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) {
@@ -2029,10 +2610,31 @@ 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;
-    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)";
@@ -2050,8 +2652,8 @@ static function makeJoinPart($options) {
   static function makeWorkUnitPart($options) {
     global $user;
 
-    $workUnits = $options['show_work_units'];
-    if ($workUnits) {
+    $work_unit_part = '';
+    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);
@@ -2067,7 +2669,8 @@ static function makeWorkUnitPart($options) {
   static function makeCostPart($options) {
     global $user;
 
-    if ($options['show_cost']) {
+    $cost_part = '';
+    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
@@ -2097,12 +2700,12 @@ 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];
         $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) {
@@ -2117,6 +2720,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;
   }
@@ -2134,38 +2758,85 @@ 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;
   }
 
-  // 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.
+    if (!ttContains($dropdown_value, '_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.
+
+    // 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'];
+        }
+      }
+    }
+    // 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;
+  }
+
+  // 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;
 
-    if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
+    $group_by_header = '';
+    if (isset($options['group_by1']) && $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') {
+    if (isset($options['group_by2']) && $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') {
+    if (isset($options['group_by3']) && $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;
@@ -2174,6 +2845,14 @@ 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.
       $tag .= '_'.$options['group_by1'];
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 7fa9f8fb2..fa6739a5b 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']);
@@ -149,7 +126,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'));
@@ -191,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_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/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index 015674067..e93d3d669 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;
@@ -131,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.
@@ -185,6 +168,11 @@ static function insert($fields)
           return false;
       }
     }
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return $last_id;
   }
  
@@ -266,6 +254,11 @@ static function update($fields)
         }
       }
     }
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 9bb538912..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/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index cedda1671..0b9fcf92a 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 {
@@ -73,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;
   }
 
@@ -112,6 +91,11 @@ static function insert($fields) {
           return false;
       }
     }
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return $last_id;
   }
 
@@ -129,7 +113,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).
@@ -154,6 +138,10 @@ static function update($fields) {
           die($affected->getMessage());
       }
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index faa1197cd..6019b2f12 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -1,32 +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
-// +----------------------------------------------------------------------+
-
-import('DateAndTime');
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // The ttTimeHelper is a class to help with time-related values.
 class ttTimeHelper {
@@ -143,13 +117,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.
@@ -224,6 +198,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, '-');
 
@@ -438,9 +415,9 @@ static function insert($fields)
     $org_id = $user->org_id;
 
     $date = $fields['date'];
-    $start = $fields['start'];
-    $finish = $fields['finish'];
-    $duration = $fields['duration'];
+    $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);
       $duration = ttTimeHelper::minutesToDuration($minutes);
@@ -448,10 +425,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) {
@@ -463,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);
@@ -473,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)";
@@ -503,7 +478,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);
@@ -524,9 +499,9 @@ static function update($fields)
     $finish = ttTimeHelper::to24HourFormat($finish);
     if ('00:00' == $finish) $finish = '24:00';
     
-    if ($start) $duration = '';
+    if ($start) $duration = null;
 
-    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);
@@ -536,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";
@@ -594,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();
@@ -606,17 +579,17 @@ static function getTimeForDay($date) {
   // getTimeForWeek - gets total time for a user for a given week.
   static function getTimeForWeek($date) {
     global $user;
-    import('Period');
+    import('ttPeriod');
     $mdb2 = getConnection();
 
     $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $period = new Period(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(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
+      " and date >= '".$period->getStartDate()."' and date <= '".$period->getEndDate()."' and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -628,17 +601,17 @@ static function getTimeForWeek($date) {
   // 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();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $period = new Period(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(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
+      " and date >= '".$period->getStartDate()."' and date <= '".$period->getEndDate()."' and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -649,10 +622,45 @@ static function getTimeForMonth($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;
+
     $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";
+    $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".
+      " 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 earliest uncompleted for date.
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if (!$res->numRows()) {
@@ -716,6 +724,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();
@@ -747,6 +757,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.
   //
@@ -867,7 +915,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) {
@@ -881,6 +930,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".
@@ -893,7 +944,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/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 17119edac..16d740291 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -1,33 +1,11 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
+import('ttPeriod');
+import('ttDate');
 
 // Class ttTimesheetHelper is used to help with project related tasks.
 class ttTimesheetHelper {
@@ -69,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;
 
@@ -88,9 +66,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";
 
@@ -115,6 +95,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".
@@ -148,6 +129,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".
@@ -462,16 +444,18 @@ 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'];
 
-    $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 = '';
     if ($client_id) $client_part = " and client_id = $client_id";
     if ($project_id) $project_part = " and project_id = $project_id";
 
@@ -500,18 +484,20 @@ 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'];
 
-    $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.
+    $client_part = $project_part = '';
     if ($client_id) $client_part = " and client_id = $client_id";
     if ($project_id) $project_part = " and project_id = $project_id";
 
@@ -523,7 +509,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;
       }
     }
@@ -560,16 +546,16 @@ static function getMatchingTimesheets($options) {
 
     // Determine start and end dates.
     $dateFormat = $user->getDateFormat();
-    if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($dateFormat));
+    if (isset($options['period']) && $options['period'])
+      $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/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 4ef5d26e0..fedf3dafb 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');
@@ -33,6 +9,7 @@
 import('form.Form');
 import('form.ActionForm');
 import('ttTemplateHelper');
+import('ttDate');
 
 class ttUser {
   var $login = null;            // User login.
@@ -53,18 +30,16 @@ 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.
   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.
-  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.
@@ -74,6 +49,8 @@ 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_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.
@@ -85,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) {
@@ -92,90 +72,99 @@ 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.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 ";
-    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->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->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->future_entries = $this->configHelper->getDefinedValue('future_entries');
-      
-      // 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());
     }
   }
 
   // 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.
@@ -193,6 +182,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);
@@ -298,12 +292,22 @@ 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);
   }
 
+  // getCustomCss returns custom css for active group.
+  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);
@@ -317,7 +321,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.
@@ -343,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']) && $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".
@@ -353,10 +359,10 @@ 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 = $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
@@ -454,7 +460,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;
 
@@ -484,6 +490,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.
@@ -570,9 +577,11 @@ function 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.
+    $name = '';
+    // 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);
@@ -587,6 +596,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();
@@ -602,22 +612,20 @@ 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;
+    $uid = (int)$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)".
-      " 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')) {
@@ -686,10 +694,14 @@ 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 =
+      $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']);
@@ -701,25 +713,33 @@ 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']);
     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']);
+    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']);
     $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.$holidays_part.$workday_minutes_part.$modified_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.
+      $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);
-    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;
 
     return true;
   }
@@ -751,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".
@@ -769,35 +789,9 @@ function markUserDeleted($user_id) {
     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)
-  {
-    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;
-    }
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
 
     return true;
   }
@@ -867,7 +861,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;
   }
@@ -881,6 +875,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']);
@@ -888,6 +883,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();
@@ -918,6 +914,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;
@@ -927,16 +924,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/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/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 17ef08c23..2aeada43c 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');
 
@@ -82,12 +58,18 @@ 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);
 
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      return $val['user_id'];
+      if ($val)
+        return $val['user_id'];
     }
     return false;
   }
@@ -107,38 +89,38 @@ 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);
+    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.
@@ -154,6 +136,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']);
     }
@@ -253,6 +237,11 @@ static function update($user_id, $fields) {
         }
       }
     }
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
@@ -303,9 +292,41 @@ static function delete($user_id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     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();
@@ -324,6 +345,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/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 05ec4e9d0..cd1e4a952 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 {
@@ -191,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 = 0; $i < 5; $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 = 0; $i < 5; $i++) {
+          $control_id = '1_'. $dayHeaders[$i];
+          $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+        }
       }
     }
 
@@ -229,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 = 0; $i < 5; $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 = 0; $i < 5; $i++) {
+              $control_id = $pos.'_'. $dayHeaders[$i];
+              $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+            }
           }
           $pos--;
         }
@@ -266,23 +271,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);
@@ -291,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 = 0; $i < 5; $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 = 0; $i < 5; $i++) {
+          $control_id = '1_'. $dayHeaders[$i];
+          $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+        }
       }
     }
 
@@ -320,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 = 0; $i < 5; $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 = 0; $i < 5; $i++) {
+              $control_id = $pos.'_'. $dayHeaders[$i];
+              $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+            }
           }
           $pos--;
         }
@@ -369,11 +405,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;
         }
       }
@@ -388,23 +426,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;
   }
 
@@ -412,12 +438,11 @@ 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;
   }
 
@@ -428,8 +453,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'];
@@ -439,7 +465,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)
@@ -460,8 +486,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 .= ' - ';
@@ -473,7 +500,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];
@@ -513,18 +540,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.
@@ -534,12 +558,14 @@ 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->future_entries && $fields['browser_today']) {
-      $objBrowserToday = new DateAndTime(DB_DATEFORMAT, $fields['browser_today']);
-      if ($objEntryDate->after($objBrowserToday)) {
+    if (!$user->isOptionEnabled('future_entries') && $fields['browser_today']) {
+      $objBrowserToday = new ttDate($fields['browser_today']);
+      $server_tomorrow = new ttDate();
+      $server_tomorrow->incrementDay();
+      if ($objEntryDate->after($objBrowserToday) || $objEntryDate->after($server_tomorrow)) {
         $err->add($i18n->get('error.future_date'));
         return false;
       }
@@ -553,7 +579,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/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/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 9893ad523..327132ed8 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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à)';
@@ -51,6 +28,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Temps',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Informes',
@@ -63,7 +41,6 @@
 'menu.users' => 'Usuaris',
 'menu.groups' => 'Grups',
 // TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clients',
 'menu.options' => 'Opcions',
@@ -82,6 +59,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.',
@@ -97,6 +75,8 @@
 // '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.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
@@ -120,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.
@@ -150,12 +129,15 @@
 'button.import' => 'Importar grup',
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Moneda',
@@ -214,6 +196,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',
@@ -234,9 +217,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',
@@ -262,9 +242,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Només totals',
@@ -281,20 +261,8 @@
 // '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',
-// '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.
@@ -312,9 +280,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Eliminar grup',
@@ -326,6 +295,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',
@@ -411,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.
@@ -459,7 +413,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',
@@ -470,13 +423,23 @@
 // 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.',
+
+// 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.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.
 '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.',
@@ -512,10 +475,13 @@
 // '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',
 // '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',
@@ -530,6 +496,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',
 
@@ -543,8 +510,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',
 
@@ -571,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' => 'Rol',
 'form.users.manager' => 'Manejador',
@@ -632,23 +600,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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.',
 
@@ -704,22 +677,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 59756d1b5..c89457e6d 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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.
@@ -52,6 +29,7 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Sestavy',
@@ -64,7 +42,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.
@@ -84,6 +61,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é.',
@@ -99,6 +77,8 @@
 // '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.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
@@ -122,7 +102,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.
@@ -152,12 +131,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Měna',
@@ -222,6 +204,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.
@@ -244,10 +227,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',
@@ -272,9 +251,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Pouze sou�ty',
@@ -291,20 +270,8 @@
 // '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',
-// '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.
@@ -322,9 +289,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Smazat tým', // TODO: change "team" to "group".
@@ -336,6 +304,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',
@@ -421,22 +390,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.
@@ -467,7 +420,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',
@@ -478,13 +430,23 @@
 // 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.',
+
+// 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.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.
 '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.
@@ -521,10 +483,13 @@
 // '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',
 // '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 ---',
@@ -539,6 +504,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',
 
@@ -552,8 +518,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',
 
@@ -580,6 +546,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',
@@ -645,23 +612,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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.',
 
@@ -717,22 +689,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index a8a14b53d..6fe93c261 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -50,6 +27,7 @@
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tid',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Udgifter',
 'menu.reports' => 'Rapporter',
@@ -61,7 +39,6 @@
 'menu.users' => 'Brugere',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Kunder',
 'menu.options' => 'Indstillinger',
@@ -77,6 +54,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.',
@@ -89,6 +67,9 @@
 // TODO: translate the following.
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -117,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.
@@ -145,12 +125,17 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Team navn', // TODO: replace "team" with "group".
 'label.address' => 'Adresse',
 'label.currency' => 'Valuta',
@@ -207,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' => 'Sprog',
 'label.decimal_mark' => 'Decimal tegn',
@@ -225,9 +211,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.
@@ -252,9 +235,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Kun Total',
@@ -271,21 +254,8 @@
 // '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.
-// '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.
@@ -299,9 +269,10 @@
 // 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.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".
@@ -312,6 +283,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',
@@ -394,22 +366,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.
@@ -442,7 +398,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',
@@ -452,15 +407,25 @@
 
 // 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.',
+
+// 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.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.
 '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",
+// 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 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.',
@@ -495,10 +460,13 @@
 // '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',
 // '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',
@@ -511,6 +479,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',
 
@@ -524,8 +493,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',
 
@@ -548,6 +517,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',
@@ -608,23 +579,28 @@
 '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',
 // 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',
 
+// 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?',
 
 // 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.',
+'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.',
 
@@ -679,22 +655,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index a8f1d165a..9e9ad0a3d 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -43,24 +20,21 @@
 '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',
+'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',
 'menu.users' => 'Personen',
 'menu.groups' => 'Gruppen',
-// TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exportieren',
 'menu.clients' => 'Kunden',
 'menu.options' => 'Optionen',
@@ -75,6 +49,7 @@
 'error.access_denied' => 'Zugriff verweigert.',
 'error.sys' => 'Systemfehler.',
 'error.db' => 'Datenbankfehler.',
+'error.registered_recently' => 'Kürzlich registriert.',
 'error.feature_disabled' => 'Funktion ist deaktiviert.',
 'error.field' => 'Ungültige "{0}" Daten.',
 'error.empty' => 'Feld "{0}" ist leer.',
@@ -86,38 +61,34 @@
 'error.report' => 'Bericht auswählen.',
 'error.record' => 'Eintrag auswählen.',
 'error.auth' => 'Benutzername oder Passwort ungültig.',
+'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.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.',
-// 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' => '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.',
@@ -139,14 +110,14 @@
 'button.export' => 'Gruppe exportieren',
 'button.import' => 'Gruppe importieren',
 'button.close' => 'Schließen',
+'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.approve' => 'Annehmen',
+'button.disapprove' => 'Ablehnen',
+'button.sync' => 'Sync',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+'label.menu' => 'Menü',
 'label.group_name' => 'Gruppenname',
 'label.address' => 'Adresse',
 'label.currency' => 'Währung',
@@ -166,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',
@@ -199,6 +169,7 @@
 'label.select_none' => 'Alle abwählen',
 'label.day_view' => 'Tagesansicht',
 'label.week_view' => 'Wochenansicht',
+'label.puncher' => 'Stempeluhr',
 'label.id' => 'ID',
 'label.language' => 'Sprache',
 'label.decimal_mark' => 'Dezimaltrennzeichen',
@@ -217,9 +188,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',
@@ -228,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',
@@ -242,59 +209,39 @@
 '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.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.image' => 'Image',
-// 'label.download' => 'Download',
+'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',
-// 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',
-// 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.
-// 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',
-'title.success' => 'Erfol',
+'title.success' => 'Erfolg',
 'title.login' => 'Anmelden',
+'title.2fa' => 'Zwei-Faktor-Authentifizierung',
 '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',
@@ -303,20 +250,18 @@
 '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.time_files' => 'Zeiterfassungsdateien',
+'title.puncher' => 'Stempeluhr',
 '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',
-// 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',
@@ -349,10 +294,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',
@@ -372,30 +316,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.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.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.
@@ -419,21 +346,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.pending_approval' => 'pending approval',
-// '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
@@ -442,12 +365,20 @@
 
 // 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.',
+
+// Email subject and body for two-factor authentication.
+'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.
+'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.',
 '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.',
@@ -474,16 +405,14 @@
 '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',
+'form.reports.note_containing' => 'Notiz enthält',
 'form.reports.show_fields' => 'Felder anzeigen',
-// TODO: translate the following.
-// 'form.reports.time_fields' => 'Time fields',
-// 'form.reports.user_fields' => 'User 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',
@@ -495,22 +424,20 @@
 // 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',
+'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',
+'form.report.assign_to_timesheet' => 'Zu 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.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',
 
@@ -532,6 +459,7 @@
 'form.tasks.inactive_tasks' => 'Inaktive Tasks',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+'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',
@@ -585,23 +513,26 @@
 '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',
+'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',
-'form.group_edit.allow_ip' => 'Erlaube IP',
-// 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',
+'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?',
 
 // 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.',
+'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.',
 
@@ -609,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.
@@ -625,9 +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 zu ihm gehörende Berichte und Rechnungen ansehen.',
+'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.',
@@ -642,35 +571,21 @@
 '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.
-// 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.
-// 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.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.',
+'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/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 2beefaa1c..5858b63d4 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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';
@@ -45,9 +22,9 @@
 'menu.register' => 'Register',
 'menu.profile' => 'Profile',
 'menu.group' => 'Group',
-'menu.subgroups' => 'Subgroups',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Time',
+'menu.puncher' => 'Punch',
 'menu.week' => 'Week',
 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reports',
@@ -72,6 +49,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.',
@@ -83,6 +61,8 @@
 '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.',
 'error.invoice_exists' => 'Invoice with this number already exists.',
@@ -109,11 +89,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?',
@@ -139,11 +114,14 @@
 'button.export' => 'Export group',
 'button.import' => 'Import group',
 'button.close' => 'Close',
+'button.start' => 'Start',
 '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',
 'label.group_name' => 'Group name',
 'label.address' => 'Address',
 'label.currency' => 'Currency',
@@ -195,6 +173,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',
@@ -213,9 +192,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',
@@ -237,9 +213,9 @@
 '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.weekends' => 'Weekends',
 'label.work_units' => 'Work units',
 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totals only',
@@ -255,20 +231,8 @@
 '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',
-'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.
@@ -280,8 +244,8 @@
 'title.error' => 'Error',
 'title.success' => 'Success',
 'title.login' => 'Login',
+'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Groups',
-'title.subgroups' => 'Subgroups',
 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Deleting Group',
@@ -291,6 +255,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',
@@ -368,22 +333,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.
@@ -412,7 +361,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',
@@ -427,18 +375,27 @@
 
 // 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.',
+
+// 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.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.
 '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.',
 
 // 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',
@@ -469,9 +426,11 @@
 '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',
+'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',
@@ -483,6 +442,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',
 
@@ -494,8 +454,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',
 
@@ -517,6 +477,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',
@@ -571,21 +532,26 @@
 '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',
 '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',
 
+// 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?',
 
 // 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.',
+'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.',
 
@@ -635,22 +601,10 @@
 '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',
-
-// 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.',
+'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',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 1cf3ce768..b302de1c4 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -50,6 +27,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tiempo',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reportes',
@@ -62,7 +40,6 @@
 'menu.users' => 'Personas',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clientes',
 'menu.options' => 'Opciones',
@@ -81,6 +58,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.',
@@ -95,6 +73,8 @@
 // '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.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
@@ -118,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.
@@ -149,12 +128,15 @@
 'button.import' => 'Importar grupo',
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 'label.address' => 'Dirección',
 'label.currency' => 'Moneda',
@@ -215,6 +197,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',
@@ -238,9 +221,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',
@@ -265,9 +245,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Solo totales',
@@ -284,20 +264,8 @@
 // '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',
-// '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.
@@ -311,9 +279,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
@@ -325,6 +294,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',
@@ -410,22 +380,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.
@@ -458,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',
@@ -474,7 +427,17 @@
 // 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.',
+
+// 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.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.
 // TODO: check / improve translation of form.reset_password.message.
@@ -483,10 +446,10 @@
 '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.
-// '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' => "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.
@@ -525,10 +488,13 @@
 // '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',
 // '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',
@@ -543,6 +509,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',
 
@@ -556,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' => 'Número de factura',
 'form.invoice.person' => 'Persona',
 
@@ -583,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',
 'form.users.manager' => 'Manejador',
@@ -646,24 +614,29 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
 // 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.',
 
@@ -719,22 +692,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5e2e78caa..19a74b4cd 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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.
@@ -51,6 +28,7 @@
 'menu.plugins' => 'Lisad',
 'menu.time' => 'Ajaarvestus',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Kulud',
 'menu.reports' => 'Raportid',
@@ -61,7 +39,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',
@@ -76,6 +53,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.',
@@ -87,6 +66,9 @@
 'error.report' => 'Vali raport.',
 '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.',
 'error.invoice_exists' => 'Arve number on juba kasutusel.',
@@ -129,7 +111,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?',
@@ -155,13 +136,18 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Grupi nimi',
 'label.address' => 'Aadress',
 'label.currency' => 'Valuuta',
@@ -213,6 +199,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',
@@ -232,9 +220,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',
@@ -258,10 +243,10 @@
 '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',
+// TODO: translate the following:
+// 'label.weekends' => 'Weekends',
 'label.work_units' => 'Töö ühikud',
 'label.work_units_short' => 'Ãœhikud',
 'label.totals_only' => 'Ainult summad',
@@ -278,21 +263,8 @@
 // '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.
-// '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.
@@ -309,8 +281,9 @@
 'title.error' => 'Viga',
 'title.success' => 'Õnnestumine',
 'title.login' => 'Sisene',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Grupid',
-'title.subgroups' => 'Alamgrupid',
 'title.add_group' => 'Lisa grupp',
 'title.edit_group' => 'Muuda gruppi',
 'title.delete_group' => 'Kustuta grupp',
@@ -321,6 +294,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',
@@ -402,22 +376,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.
@@ -448,7 +406,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',
@@ -459,12 +416,22 @@
 
 // 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.',
+
+// 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.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.
 '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.',
@@ -506,10 +473,13 @@
 // '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',
 // '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',
@@ -521,6 +491,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',
@@ -535,8 +507,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',
 
@@ -558,6 +530,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',
@@ -616,22 +590,28 @@
 '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.
 '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',
 
+// 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?',
 
 // 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.',
+'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.',
 
@@ -686,22 +666,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e078a0a34..32dacdf00 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -1,33 +1,11 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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');
@@ -51,6 +29,7 @@
 'menu.plugins' => 'پلاگین ها',
 'menu.time' => 'زمان',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'هزينه ها',
 'menu.reports' => 'گزارشات',
@@ -62,7 +41,6 @@
 'menu.users' => 'کاربران',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'پشتیبانی',
 'menu.clients' => 'مشتری ها',
 'menu.options' => 'تنظیمات',
@@ -81,6 +59,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}" خالیست.',
@@ -94,6 +73,9 @@
 // 'error.report' => 'Select report.',
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -125,7 +107,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.
@@ -153,12 +134,17 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'نام تیم', // TODO: replace "team" with "group".
 'label.address' => 'آدرس',
 'label.currency' => 'واحد پول',
@@ -217,6 +203,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.
@@ -236,9 +223,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',
@@ -264,9 +248,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
@@ -282,21 +266,8 @@
 // '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.
-// '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.
@@ -310,9 +281,10 @@
 // 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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'حذ� تیم', // TODO: change "team" to "group".
@@ -323,6 +295,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' => 'حذ� آیتم هزینه ها',
@@ -403,22 +376,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.
@@ -454,7 +411,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',
@@ -469,16 +425,26 @@
 
 // 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.',
+// 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.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.
 '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.
 // '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",
+// 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",
 
@@ -516,10 +482,13 @@
 // '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',
 // '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' => 'تاریخ',
@@ -532,6 +501,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',
 
@@ -545,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' => 'شماره �اکتور',
 'form.invoice.person' => 'شخص',
 
@@ -570,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' => 'سمت',
 'form.users.manager' => 'مدیر',
@@ -631,23 +602,28 @@
 '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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.
-// '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' => '�اکتور ارسال شد.',
 
@@ -703,22 +679,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 575dc04f6..cdfc4c5fe 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -50,6 +27,7 @@
 'menu.plugins' => 'Lisäosat',
 'menu.time' => 'Tunnit',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Kulut',
 'menu.reports' => 'Raportit',
@@ -61,7 +39,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',
@@ -79,6 +56,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ä.',
@@ -91,6 +69,9 @@
 // TODO: translate the following.
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -119,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.
@@ -147,12 +127,17 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Tiimin nimi', // TODO: replace "team" with "group".
 'label.address' => 'Osoite',
 'label.currency' => 'Valuutta',
@@ -210,6 +195,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',
@@ -228,9 +214,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',
@@ -256,9 +239,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Vain yhteissummat',
@@ -275,21 +258,8 @@
 // '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.
-// '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.
@@ -303,9 +273,10 @@
 // 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.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".
@@ -316,6 +287,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',
@@ -394,22 +366,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.
@@ -442,7 +398,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',
@@ -457,15 +412,26 @@
 
 // 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.',
+
+// 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.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.
 '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",
+'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.',
@@ -500,10 +466,13 @@
 // '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',
 // '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ä',
@@ -516,6 +485,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',
 
@@ -529,8 +499,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ö',
 
@@ -554,6 +524,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',
@@ -614,21 +585,27 @@
 '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
+// 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.',
@@ -685,22 +662,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5fe0f76d7..b488be0bc 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -50,6 +27,7 @@
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Temps',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Dépenses',
 'menu.reports' => 'Rapports',
@@ -61,7 +39,6 @@
 'menu.users' => 'Utilisateurs',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exporter',
 'menu.clients' => 'Clients',
 'menu.options' => 'Options',
@@ -77,6 +54,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.',
@@ -89,6 +67,9 @@
 // TODO: translate the following.
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -117,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.
@@ -145,12 +125,17 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Nom équipe', // TODO: replace "team" with "group".
 'label.address' => 'Adresse',
 'label.currency' => 'Devise',
@@ -206,6 +191,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',
@@ -224,9 +210,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.
@@ -250,9 +233,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totaux uniquement',
@@ -269,21 +252,8 @@
 // '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.
-// '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.
@@ -297,9 +267,10 @@
 // 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.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".
@@ -310,6 +281,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',
@@ -388,22 +360,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.
@@ -434,7 +390,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',
@@ -449,15 +404,25 @@
 
 // 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.',
+
+// 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.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.
 '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",
+'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.',
@@ -492,10 +457,13 @@
 // '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',
 // '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',
@@ -508,6 +476,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',
 
@@ -521,8 +490,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',
 
@@ -545,6 +514,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',
@@ -605,22 +576,27 @@
 '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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.',
+'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.',
 
@@ -675,22 +651,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 5d0dd6bde..34f1890eb 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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 (Ελληνικά)';
@@ -49,6 +26,7 @@
 'menu.plugins' => 'Π�όσθετα',
 'menu.time' => 'Χ�όνος',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Έξοδα',
 'menu.reports' => 'Αναφο�ές',
@@ -59,8 +37,6 @@
 'menu.tasks' => 'Ε�γασίες',
 'menu.users' => 'Χ�ήστες',
 'menu.groups' => 'Ομάδες',
-// TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Εξαγωγή',
 'menu.clients' => 'Πελάτες',
 'menu.options' => 'Επιλογές',
@@ -76,6 +52,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}" είναι κενό.',
@@ -87,6 +64,9 @@
 'error.report' => 'Επιλογή αναφο�άς.',
 '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' => 'Το αντικείμενο με αυτό το όνομα υπά�χει ήδη.',
 'error.invoice_exists' => 'Το τιμολόγιο με αυτόν τον α�ιθμό υπά�χει ήδη.',
@@ -113,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.
@@ -141,12 +120,17 @@
 'button.export' => 'Εξαγωγη ομάδας',
 'button.import' => 'Εισαγωγή ομάδας',
 'button.close' => 'Κλείσιμο',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Τέλος',
 // 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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Όνομα ομάδας',
 'label.address' => 'Διε�θυνση',
 'label.currency' => '�όμισμα',
@@ -200,6 +184,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' => 'Δεκαδική ένδειξη',
@@ -218,9 +204,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' => 'ναι',
@@ -244,11 +227,10 @@
 '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.
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Σ�νολα μόνο',
@@ -265,21 +247,8 @@
 // '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.
-// '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.
@@ -293,9 +262,10 @@
 // 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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Επεξε�γασία ομάδας',
 'title.delete_group' => 'Διαγ�αφή ομάδας',
@@ -306,6 +276,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' => 'Διαγ�αφή δαπάνης',
@@ -387,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.
@@ -433,7 +388,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' => 'εξοφλημένο',
@@ -449,12 +403,22 @@
 
 // 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> είναι ένα ανοικτο� κώδικα σ�στημα πα�ακολο�θησης χ�όνου.',
+
+// 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.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.
 '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' => 'Πληκτ�ολογήστε νέο κωδικό π�όσβασης και κάντε κλικ στην επιλογή Αποθήκευση.',
@@ -488,10 +452,13 @@
 // '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',
 // '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' => 'ημε�ομηνία',
@@ -503,6 +470,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',
@@ -517,8 +486,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' => 'Άτομο',
 
@@ -540,6 +509,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' => 'Διευθυντής',
@@ -596,23 +567,29 @@
 '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' => 'Μη ολοκλη�ωμένες ενδείξεις',
 // 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',
 
+// 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?',
 
 // 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> για πε�ισσότε�ες πλη�οφο�ίες.',
+'form.mail.footer' => 'Το Anuko Time Tracker είναι ένα ανοικτο� κώδικα σ�στημα πα�ακολο�θησης χ�όνου. Επισκεφθείτε τη διε�θυνση <a href="https://www.anuko.com">www.anuko.com</a> για πε�ισσότε�ες πλη�οφο�ίες.',
 'form.mail.report_sent' => 'Η αναφο�ά στάλθηκε.',
 'form.mail.invoice_sent' => 'Το τιμολόγιο στάλθηκε.',
 
@@ -668,22 +645,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 199e26533..585a7ec2f 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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 (עברית)';
@@ -51,6 +28,7 @@
 'menu.plugins' => 'תוספי�',
 'menu.time' => 'זמן',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'דוחות',
@@ -62,7 +40,6 @@
 'menu.users' => 'משתמשי�',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'ייצו�',
 'menu.clients' => 'לקוחות',
 'menu.options' => '�פשרויות',
@@ -83,6 +60,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}" ריק',
@@ -104,6 +82,9 @@
 // 'error.report' => 'Select report.'
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -133,7 +114,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.
@@ -161,12 +141,17 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'ש� הצוות', // TODO: replace "team" with "group".
 'label.address' => 'כתובת',
 'label.currency' => 'מטבע',
@@ -225,6 +210,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.
@@ -244,9 +230,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',
@@ -271,9 +254,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'labl.totals_only' => 'סיכומי� בלבד',
@@ -290,21 +273,8 @@
 // '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.
-// '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.
@@ -318,9 +288,10 @@
 // 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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'מחיקת צוות', // TODO: change "team" to "group".
@@ -331,6 +302,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',
@@ -410,22 +382,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.
@@ -459,7 +415,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',
@@ -474,13 +429,25 @@
 
 // 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> הינה מערכת פשוטה, קלה לשימוש וחינמית לניהול זמן.',
 
+// 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.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.
 '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",
 
@@ -517,10 +484,13 @@
 // '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',
 // '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' => 'ת�ריך',
@@ -534,6 +504,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',
 
@@ -547,8 +518,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' => 'משתמש',
 
@@ -572,6 +543,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' => 'מנהל',
@@ -633,21 +605,28 @@
 '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
+// 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' => 'החשבונית נשלחה.',
@@ -704,22 +683,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index a4a4dd005..e2d7500d3 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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.
@@ -52,6 +29,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Munkaidő',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Riportok',
@@ -64,8 +42,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',
@@ -84,6 +60,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.',
@@ -98,6 +75,8 @@
 // '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.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
@@ -122,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.
@@ -153,12 +131,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Pénznem',
@@ -221,6 +202,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',
@@ -242,9 +224,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',
@@ -269,9 +248,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
@@ -287,20 +266,8 @@
 // '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',
-// '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.
@@ -314,9 +281,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Csoport törlése',
@@ -327,6 +295,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',
@@ -411,22 +380,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.
@@ -461,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',
@@ -472,13 +424,23 @@
 // 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.',
+
+// 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.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.
 // 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.
@@ -517,9 +479,11 @@
 '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',
+// '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',
@@ -534,6 +498,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',
 
@@ -547,8 +512,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',
 
@@ -574,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' => 'Szerepkör',
 'form.users.manager' => 'Vezető',
@@ -637,23 +603,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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.',
 
@@ -709,22 +680,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index b10575302..73ca8a022 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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.
@@ -51,6 +28,7 @@
 'menu.plugins' => 'Plugin',
 'menu.time' => 'Tempo',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Spese',
 'menu.reports' => 'Rapporti',
@@ -61,8 +39,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',
@@ -78,6 +54,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.',
@@ -89,6 +66,9 @@
 'error.report' => 'Seleziona rapporto.',
 '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -117,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.
@@ -145,12 +124,17 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Nome del gruppo',
 'label.address' => 'Indirizzo',
 'label.currency' => 'Moneta',
@@ -204,6 +188,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',
@@ -222,9 +208,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',
@@ -248,11 +231,10 @@
 '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.
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Solo i totali',
@@ -269,21 +251,8 @@
 // '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.
-// '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.
@@ -301,9 +270,10 @@
 // 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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Modifica gruppo',
 'title.delete_group' => 'Elimina gruppo',
@@ -314,6 +284,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',
@@ -397,22 +368,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.
@@ -443,7 +398,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',
@@ -459,15 +413,25 @@
 
 // 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.',
+
+// 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.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.
 '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.',
@@ -501,10 +465,13 @@
 // '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',
 // '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',
@@ -516,6 +483,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',
@@ -530,8 +499,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',
 
@@ -553,6 +522,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',
@@ -611,23 +582,28 @@
 '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',
 // 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',
 
+// 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?',
 
 // 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.',
+'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.',
 
@@ -682,22 +658,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 8ebec5955..0de6e88ea 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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 (日本語)';
@@ -51,6 +28,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => '時間',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'レ�ート',
@@ -63,7 +41,6 @@
 'menu.users' => 'ユーザー',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'クライアント',
 'menu.options' => 'オプション',
@@ -82,6 +59,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}"�フィールド�空白��。',
@@ -96,6 +74,9 @@
 // 'error.report' => 'Select report.',
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -124,7 +105,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.
@@ -156,12 +136,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => '通貨',
@@ -222,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.
@@ -243,11 +227,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',
@@ -272,9 +251,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => '全体��',
@@ -291,20 +270,8 @@
 // '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',
-// '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.
@@ -318,9 +285,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '�ーム�削除',  // TODO: change "team" to "group".
@@ -332,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',
@@ -417,22 +386,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.
@@ -462,7 +415,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',
@@ -473,16 +425,26 @@
 // 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.',
+
+// 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.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.
 '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.
@@ -521,10 +483,13 @@
 // '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',
 // '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' => '日付',
@@ -539,6 +504,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',
 
@@ -552,8 +518,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' => '個人',
 
@@ -579,6 +545,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' => '管�者',
@@ -640,23 +607,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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' => '�信���り状。',
 
@@ -712,22 +684,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 76c159472..fcbe14d24 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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 (한국어)';
@@ -51,6 +28,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => '시간',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '보고서',
@@ -63,7 +41,6 @@
 'menu.users' => '사용�',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => '���언트',
 'menu.options' => '옵션',
@@ -82,6 +59,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}" � 필드가 비어있습니다.',
@@ -96,6 +74,9 @@
 // 'error.report' => 'Select report.',
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -123,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.
@@ -155,12 +135,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => '화�',
@@ -221,6 +204,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.
@@ -242,11 +226,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',
@@ -272,9 +251,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => '오� 전체만',
@@ -291,20 +270,8 @@
 // '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',
-// '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.
@@ -318,9 +285,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '팀 삭제',  // TODO: change "team" to "group".
@@ -332,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',
@@ -418,22 +387,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.
@@ -466,7 +419,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',
@@ -477,13 +429,23 @@
 // 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.',
+
+// 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.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.
 '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.
@@ -519,10 +481,13 @@
 // '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',
 // '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' => '날짜',
@@ -537,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',
 
@@ -550,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' => '개�',
 
@@ -577,6 +543,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' => '관리�',
@@ -638,23 +605,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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' => '송신한 송장.',
 
@@ -710,22 +682,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 06f764d4c..2ca444c0a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -47,6 +24,7 @@
 'menu.group' => 'Groep',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tijden',
+'menu.puncher' => 'Prikklok',
 'menu.week' => 'Week',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
@@ -56,7 +34,6 @@
 'menu.tasks' => 'Taken',
 'menu.users' => 'Medewerkers',
 'menu.groups' => 'Groepen',
-'menu.subgroups' => 'Subgroepen',
 'menu.export' => 'Exporteren',
 'menu.clients' => 'Klanten',
 'menu.options' => 'Opties',
@@ -71,6 +48,7 @@
 'error.access_denied' => 'Toegang geweigerd.',
 'error.sys' => 'Systeem fout.',
 'error.db' => 'Database fout.',
+'error.registered_recently' => 'Recent geregistreerd.',
 'error.feature_disabled' => 'Functie is uitgeschakeld.',
 'error.field' => 'Incorrecte gegevens: "{0}".',
 'error.empty' => 'Veld "{0}" is leeg.',
@@ -82,6 +60,8 @@
 'error.report' => 'Kies rapport.',
 'error.record' => 'Kies record.',
 'error.auth' => 'Onjuiste inlognaam of wachtwoord.',
+'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.',
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
@@ -103,22 +83,7 @@
 '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.',
 
 // Warning messages.
 'warn.sure' => 'Ben je er zeker van?',
@@ -144,11 +109,14 @@
 'button.export' => 'Groep exporteren',
 'button.import' => 'Groep importeren',
 'button.close' => 'Sluiten',
+'button.start' => 'Start',
 'button.stop' => 'Stop',
 'button.approve' => 'Goedkeuren',
 'button.disapprove' => 'Afkeuren',
+'button.sync' => 'Sychroniseer',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+'label.menu' => 'Menu',
 'label.group_name' => 'Groepsnaam',
 'label.address' => 'Adres',
 'label.currency' => 'Munteenheid',
@@ -200,6 +168,7 @@
 'label.select_none' => 'Selecteer niets',
 'label.day_view' => 'Dag overzicht',
 'label.week_view' => 'Week overzicht',
+'label.puncher' => 'Prikklok',
 'label.id' => 'ID',
 'label.language' => 'Taal',
 'label.decimal_mark' => 'Decimaal teken',
@@ -218,9 +187,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',
@@ -242,9 +208,9 @@
 '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.weekends' => 'Weekeinden',
 'label.work_units' => 'Werk eenheid',
 'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
@@ -255,27 +221,13 @@
 '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',
-'label.image' => 'Afbeelding',
-'label.download' => 'Download',
 'label.active_users' => 'Actieve medewerkers',
 '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.
 
 // Entity names.
 'entity.time' => 'tijd',
@@ -286,8 +238,8 @@
 'title.error' => 'Fout',
 'title.success' => 'Succes',
 'title.login' => 'Aanmelden',
+'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Groepen',
-'title.subgroups' => 'Subgroepen',
 'title.add_group' => 'Groep toevoegen',
 'title.edit_group' => 'Groep bewerken',
 'title.delete_group' => 'Groep aan het verwijderen',
@@ -297,11 +249,11 @@
 'title.edit_time_record' => 'Wijzigen tijdrecord',
 'title.delete_time_record' => 'Verwijder tijdrecord',
 'title.time_files' => 'Tijden bestanden',
+'title.puncher' => 'Prikklok',
 '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',
@@ -373,24 +325,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',
-// 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',
-'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.
@@ -419,8 +353,6 @@
 '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',
@@ -435,12 +367,20 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 '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 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.',
+
+// Email subject and body for two-factor authentication.
+'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.
+'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.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker wachtwoord herstel verzoek',
-'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.',
@@ -472,9 +412,11 @@
 'form.reports.include_pending' => 'in afwachting',
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
+'form.reports.note_containing' => 'Notitie bevat',
 'form.reports.show_fields' => 'Toon velden',
 'form.reports.time_fields' => 'Tijd velden',
 'form.reports.user_fields' => 'Medewerker velden',
+'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',
@@ -486,6 +428,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',
+'form.report.per_hour' => 'Per uur',
 'form.report.assign_to_invoice' => 'Voeg toe aan factuur',
 'form.report.assign_to_timesheet' => 'Wijs toe aan tijdenoverzicht',
 
@@ -497,8 +440,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',
 
@@ -520,6 +463,7 @@
 'form.tasks.inactive_tasks' => 'Inactieve taken',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+'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',
@@ -574,21 +518,25 @@
 '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.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',
 'form.group_edit.confirm_save' => 'Bevestigen dat je wilt opslaan',
-'form.group_edit.allow_ip' => 'Toegestane IP adressen',
 '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',
+'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?',
 
 // 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.',
+'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.',
 
@@ -638,22 +586,10 @@
 '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',
-
-// 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.',
+'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',
+'form.display_options.cost_per_hour' => 'Kosten per uur',
+'form.display_options.custom_css' => 'Aangepaste CSS',
+'form.display_options.custom_translation' => 'Maatwerk vertaling',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index ad95bd7e3..720f71f34 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -52,6 +29,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tid',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Rapporter',
@@ -64,7 +42,6 @@
 'menu.users' => 'Brukere',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Klienter',
 'menu.options' => 'Opsjoner',
@@ -83,6 +60,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.',
@@ -97,6 +75,9 @@
 // 'error.report' => 'Select report.',
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -124,7 +105,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.
@@ -155,12 +135,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Valuta',
@@ -222,6 +205,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.
@@ -244,9 +228,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',
@@ -270,9 +251,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
@@ -288,20 +269,8 @@
 // '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',
-// '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.
@@ -315,9 +284,9 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Slett team', // TODO: change "team" to "group".
@@ -329,6 +298,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',
@@ -414,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.
@@ -462,7 +416,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',
@@ -472,14 +425,26 @@
 
 // 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.',
 
+// 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.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.
 // 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",
 
@@ -518,10 +483,13 @@
 // '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',
 // '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',
@@ -535,6 +503,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',
 
@@ -548,8 +517,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',
 
@@ -575,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' => 'Rolle',
 // TODO: translate the following.
@@ -637,23 +607,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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.',
 
@@ -709,22 +684,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f988df4a4..69dddf311 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -50,6 +27,7 @@
 'menu.plugins' => 'Moduły',
 'menu.time' => 'Czas',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Wydatki',
 'menu.reports' => 'Raporty',
@@ -61,7 +39,6 @@
 'menu.users' => 'Użytkownicy',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Klienci',
 'menu.options' => 'Opcje',
@@ -80,6 +57,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.',
@@ -92,6 +70,9 @@
 // TODO: translate the following.
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -121,7 +102,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.
@@ -149,12 +129,17 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Nazwa zespołu',  // TODO: replace "team" with "group".
 'label.address' => 'Adres',
 'label.currency' => 'Waluta',
@@ -212,6 +197,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',
@@ -230,9 +216,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',
@@ -257,9 +240,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Tylko sumy',
@@ -276,21 +259,8 @@
 // '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.
-// '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.
@@ -304,9 +274,10 @@
 // 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.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".
@@ -317,6 +288,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',
@@ -397,22 +369,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.
@@ -445,7 +401,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',
@@ -460,15 +415,25 @@
 
 // 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.',
+
+// 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.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.
 '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.',
@@ -503,10 +468,13 @@
 // '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',
 // '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',
@@ -519,6 +487,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',
 
@@ -532,8 +501,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',
 
@@ -557,6 +526,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',
@@ -617,22 +587,27 @@
 '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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.',
+'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ę',
 
@@ -688,22 +663,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 5c9d89a32..c9a4ad998 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -1,35 +1,12 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
+$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');
@@ -42,26 +19,21 @@
 '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.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.groups' => 'Grupos',
 'menu.export' => 'Exportar',
 'menu.clients' => 'Clientes',
 'menu.options' => 'Opções',
@@ -76,58 +48,50 @@
 '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.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.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.',
 'error.invoice_exists' => 'Já existe fatura com este número.',
-// TODO: translate the following.
-// 'error.role_exists' => 'Role with this rank already exists.',
+'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.',
+'error.range_locked' => 'Período bloqueado.',
+'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.',
 '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.',
 
 // 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',
@@ -142,17 +106,20 @@
 '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 grupo',
+'button.export' => 'Exportar grupo',
+'button.import' => 'Importar grupo',
 'button.close' => 'Fechar',
+'button.start' => 'Iniciar',
 'button.stop' => 'Parar',
+'button.approve' => 'Aprovar',
+'button.disapprove' => 'Desaprovar',
 // 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.
-'label.group_name' => 'Nome da equipe',  // TODO: replace "team" with "group".
+'label.menu' => 'Menu',
+'label.group_name' => 'Nome do grupo',
 'label.address' => 'Endereço',
 'label.currency' => 'Moeda',
 'label.manager_name' => 'Nome do gerente',
@@ -164,18 +131,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' => 'Funções',
 'label.client' => 'Cliente',
 'label.clients' => 'Clientes',
 'label.option' => 'Opção',
@@ -189,16 +154,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',
@@ -206,9 +168,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.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',
@@ -227,21 +189,15 @@
 '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',
-// 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',
@@ -249,89 +205,71 @@
 '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_menu' => 'Week menu',
-// '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',
+// TODO: translate the following.
+// 'label.weekends' => 'Weekends',
+'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.
-// '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.
-// 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".
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
+'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.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',
@@ -343,11 +281,10 @@
 'title.add_user' => 'Adicionando usuário',
 'title.edit_user' => 'Editando usuário',
 'title.delete_user' => 'Apagando usuário',
-// TODO: translate the following.
-// 'title.roles' => 'Roles',
-// 'title.add_role' => 'Adding Role',
-// 'title.edit_role' => 'Editing Role',
-// 'title.delete_role' => 'Deleting Role',
+'title.roles' => 'Funções',
+'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',
@@ -360,16 +297,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.export' => 'Exportando dados de equipe', // TODO: replace "team" with "group".
-'title.import' => 'Importando dados de equipe', // TODO: replace "team" with "group".
+'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 do grupo',
+'title.import' => 'Importando dados do grupo',
 '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',
@@ -381,41 +316,23 @@
 '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 funções',
+'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',
 
 // Section for common strings inside combo boxes on 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',
@@ -424,8 +341,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',
 'dropdown.selected_year' => 'ano',
 'dropdown.all_time' => 'todas as datas',
 'dropdown.projects' => 'projetos',
@@ -433,20 +349,17 @@
 '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.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
@@ -455,15 +368,22 @@
 
 // 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.',
+
+// 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.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.
 '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",
-// "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' => "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.',
@@ -472,36 +392,36 @@
 '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',
+'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.',
+'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.
-// 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
+// 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',
 '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',
+// 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',
 // 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' => '--- sem agrupar ---',
 'form.reports.group_by_date' => 'data',
@@ -514,94 +434,88 @@
 // (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.per_hour' => 'Per hour',
+'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',
+// 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
-// TODO: translate the following.
-// 'form.templates.active_templates' => 'Active Templates',
-// 'form.templates.inactive_templates' => 'Inactive Templates',
+// Templates form. See example at https://timetracker.anuko.com/templates.php.
+'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',
 
-// 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',
-// 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
+// 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
+// Users form. See example at https://timetracker.anuko.com/users.php.
 // TODO: translate the following.
-// 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-'form.users.role' => 'Papel',
+// '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',
 '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
-// TODO: translate the following.
-// 'form.user_edit.swap_roles' => 'Swap roles',
+// 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
-// 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',
-
-// Clients form. See example at https://timetracker.anuko.com/clients.php
+// 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.
 '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 "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.',
+// 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 "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).',
+'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',
 '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',
@@ -610,95 +524,84 @@
 'form.group_edit.type_all' => 'todos',
 '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.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',
-
-// 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_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',
+'form.group_edit.confirm_save' => 'Confirme o salvamento',
+'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?',
 
 // 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.',
+'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.',
 
 // 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 função inferior trocando funções com outra pessoa. Isto não pode ser desfeito.',
+'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.
-// 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.
+'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.menu' => 'Menu',
-// 'form.display_options.note_on_separate_row' => 'Note on separate row',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
+// '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.
-// '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.',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
+
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 3043e8bba..abcd5793f 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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.
@@ -53,6 +30,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Relatórios',
@@ -65,7 +43,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',
@@ -83,6 +60,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.',
@@ -95,6 +73,8 @@
 // '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.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
@@ -117,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.
@@ -148,12 +127,15 @@
 // 'button.export' => 'Export group',
 // 'button.import' => 'Import group',
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 // 'label.currency' => 'Currency',
@@ -211,6 +193,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',
@@ -232,10 +215,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',
@@ -258,9 +237,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
@@ -276,20 +255,8 @@
 // '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',
-// '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.
@@ -303,9 +270,9 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
@@ -315,6 +282,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',
@@ -398,22 +366,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.
@@ -445,7 +397,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',
@@ -456,13 +407,23 @@
 // 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.',
+
+// 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.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.
 // 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.
@@ -499,10 +460,13 @@
 // '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',
 // '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',
@@ -515,6 +479,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',
 
@@ -528,8 +493,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',
@@ -556,6 +521,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',
@@ -619,23 +585,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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.',
 
@@ -691,22 +662,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index add70a4ea..03db7da44 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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.
@@ -53,6 +30,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Timpul',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Rapoarte',
@@ -65,7 +43,6 @@
 'menu.users' => 'Utilizatori',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clienti',
 // TODO: translate the following.
@@ -85,6 +62,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.',
@@ -101,6 +79,8 @@
 // '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.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
@@ -124,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.
@@ -155,12 +134,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Moneda',
@@ -221,6 +203,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',
@@ -242,9 +225,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',
@@ -269,9 +249,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Numai totaluri',
@@ -288,20 +268,8 @@
 // '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',
-// '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.
@@ -318,9 +286,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Șterge echipa', // TODO: change "team" to "group".
@@ -332,6 +301,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',
@@ -416,22 +386,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.
@@ -465,7 +419,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',
@@ -476,15 +429,25 @@
 // 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.',
+
+// 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.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.
 '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.
@@ -520,10 +483,13 @@
 // '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',
 // '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',
@@ -537,6 +503,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',
 
@@ -550,8 +517,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',
 
@@ -577,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' => 'Functie', // TODO: is "Rol" a better term here?
 'form.users.manager' => 'Manager',
@@ -640,23 +608,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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.',
 
@@ -712,22 +685,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index fb050a1a0..6c924df2d 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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 (Ру��кий)';
@@ -47,6 +24,7 @@
 'menu.group' => 'Группа',
 'menu.plugins' => 'Плагины',
 'menu.time' => 'Врем�',
+'menu.puncher' => 'Пробить',
 'menu.week' => '�едел�',
 'menu.expenses' => 'Ра�ходы',
 'menu.reports' => 'Отчёты',
@@ -56,7 +34,6 @@
 'menu.tasks' => 'Задачи',
 'menu.users' => 'Пользователи',
 'menu.groups' => 'Группы',
-'menu.subgroups' => 'Подгруппы',
 'menu.export' => 'Эк�порт',
 'menu.clients' => 'Клиенты',
 'menu.options' => 'Опции',
@@ -71,6 +48,7 @@
 'error.access_denied' => 'До�туп запрещён.',
 'error.sys' => 'Си�темна� ошибка.',
 'error.db' => 'Ошибка базы данных.',
+'error.registered_recently' => '�едавн�� реги�траци�.',
 'error.feature_disabled' => 'Функци� отключена.',
 'error.field' => '�екорректные данные в поле "{0}".',
 'error.empty' => 'Пу�тое поле "{0}".',
@@ -82,6 +60,8 @@
 'error.report' => 'Выберите отчёт.',
 'error.record' => 'Выберите запи�ь.',
 'error.auth' => '�еправильно введен логин или пароль.',
+'error.2fa_code' => '�еверный код 2FA.',
+'error.weak_password' => 'Слабый пароль.',
 'error.user_exists' => 'Пользователь � таким логином уже �уще�твует.',
 'error.object_exists' => 'Объект � таким именем уже е�ть.',
 'error.invoice_exists' => 'Счёт � таким номером уже е�ть.',
@@ -104,7 +84,6 @@
 'error.user_count' => 'Ограничение на количе�тво пользователей.',
 'error.expired' => 'До�тигнута дата �к�пирации.',
 'error.file_storage' => 'Ошибка �ервера дл� хранени� файлов.',
-'error.remote_work' => 'Ошибка �ервера удаленной работы.',
 
 // Warning messages.
 'warn.sure' => 'Вы уверены?',
@@ -130,11 +109,14 @@
 'button.export' => 'Эк�портировать группу',
 'button.import' => 'Импортировать группу',
 'button.close' => 'Закрыть',
+'button.start' => '�ачать',
 'button.stop' => 'Завершить',
 'button.approve' => 'Одобрить',
 'button.disapprove' => '�е одобрить',
+'button.sync' => 'Синхронизовать',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+'label.menu' => 'Меню',
 'label.group_name' => '�азвание группы',
 'label.address' => '�дре�',
 'label.currency' => 'Валюта',
@@ -186,6 +168,7 @@
 'label.select_none' => 'Сн�ть в�е отметки',
 'label.day_view' => 'День',
 'label.week_view' => '�едел�',
+'label.puncher' => 'Пробиватель',
 'label.id' => 'ID',
 'label.language' => 'Язык',
 'label.decimal_mark' => 'Де��тичный знак',
@@ -204,9 +187,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' => 'да',
@@ -228,9 +208,9 @@
 'label.paid_status' => 'Стату� оплаты',
 'label.paid' => 'Оплачено',
 'label.mark_paid' => 'Отметить оплату',
-'label.week_menu' => 'Меню недели',
 'label.week_note' => 'Комментарий недели',
 'label.week_list' => 'Спи�ок недели',
+'label.weekends' => 'Выходные',
 'label.work_units' => 'Единицы работы',
 'label.work_units_short' => 'Единицы',
 'label.totals_only' => 'Только итоги',
@@ -246,17 +226,8 @@
 'label.attachments' => 'Приложени�',
 'label.files' => 'Файлы',
 'label.file' => 'Файл',
-'label.image' => 'Изображение',
-'label.download' => 'Скачать',
 'label.active_users' => '�ктивные пользователи',
 '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.
@@ -268,8 +239,8 @@
 'title.error' => 'Ошибка',
 'title.success' => 'У�пех',
 'title.login' => 'Вход в �и�тему',
+'title.2fa' => 'Двухфакторна� аутентификаци�',
 'title.groups' => 'Группы',
-'title.subgroups' => 'Подгруппы',
 'title.add_group' => 'Добавление группы',
 'title.edit_group' => 'Редактирование группы',
 'title.delete_group' => 'Удаление группы',
@@ -279,6 +250,7 @@
 'title.edit_time_record' => 'Редактирование запи�и о времени',
 'title.delete_time_record' => 'Удаление запи�и о времени',
 'title.time_files' => 'Файлы запи�и о времени',
+'title.puncher' => 'Пробиватель',
 'title.expenses' => 'Ра�ходы',
 'title.edit_expense' => 'Редактирование предмета ра�хода',
 'title.delete_expense' => 'Удаление предмета ра�хода',
@@ -354,22 +326,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.
@@ -398,7 +354,6 @@
 'dropdown.status_inactive' => 'неактивный',
 'dropdown.delete' => 'удалить',
 'dropdown.do_not_delete' => 'не удал�ть',
-'dropdown.pending_approval' => 'в ожидании одобрени�',
 'dropdown.approved' => 'одобрено',
 'dropdown.not_approved' => 'не одобрено',
 'dropdown.paid' => 'оплачено',
@@ -413,12 +368,20 @@
 
 // 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) �и�тема трекинга рабочего времени.',
+
+// 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.hint' => 'Проверьте �лектронную почту и введите вы�ланный вам 2FA код зде�ь.',
+'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',
-'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охранить.',
@@ -450,9 +413,11 @@
 'form.reports.include_pending' => 'в ожидании',
 'form.reports.select_period' => 'Выберите интервал времени',
 'form.reports.set_period' => 'или укажите даты',
+'form.reports.note_containing' => 'Комментарий �одержит',
 'form.reports.show_fields' => 'Показывать пол�',
-'form.reports.time_fields' => 'Time fields',
-'form.reports.user_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' => 'дате',
@@ -464,6 +429,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' => 'Включить в табель',
 
@@ -475,8 +441,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' => 'Работник',
 
@@ -498,6 +464,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' => 'Менеджер',
@@ -552,21 +519,25 @@
 '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' => 'Индикаторы незавершени�',
 'form.group_edit.confirm_save' => 'Предупреждать при �охранении',
-'form.group_edit.allow_ip' => 'Разрешить до�туп � IP',
 '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' => 'Вы уверены, что хотите удалить в�ю группу?',
 
 // 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>.',
+'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' => 'Счёт отправлен.',
 
@@ -616,21 +587,10 @@
 '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' => 'Комментарий в отдельном р�ду',
-
-// 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' => 'Сообщение ото�лано.',
+'form.display_options.not_complete_days' => '�езавершенные дни',
+'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 cf0b8432b..0404fb8d0 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -50,6 +27,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',
@@ -61,7 +39,6 @@
 'menu.users' => 'Používatelia',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Export',
 'menu.clients' => 'Klienti',
 'menu.options' => 'Nastavenia',
@@ -81,6 +58,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.',
@@ -93,6 +71,9 @@
 // 'error.report' => 'Select report.',
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -122,7 +103,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.
@@ -152,11 +132,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Názov tímu', // TODO: replace "team" with "group".
 'label.address' => 'Adresa',
 'label.currency' => 'Mena',
@@ -214,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' => 'Jazyk',
 // TODO: translate the following.
@@ -233,9 +218,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',
@@ -261,9 +243,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Iba celkové',
@@ -280,21 +262,8 @@
 // '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.
-// '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.
@@ -308,9 +277,10 @@
 // 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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Vymazávanie tímu', // TODO: change "team" to "group".
@@ -321,6 +291,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',
@@ -400,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.
@@ -449,7 +404,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',
@@ -464,15 +418,25 @@
 
 // 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.',
+
+// 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.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.
 '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ť.',
@@ -507,10 +471,13 @@
 // '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',
 // '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',
@@ -523,6 +490,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',
 
@@ -536,8 +504,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',
 
@@ -561,6 +529,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',
@@ -622,22 +591,27 @@
 '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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í.',
+'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á.',
 
@@ -693,22 +667,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f4aa21b58..b3153ad79 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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.
@@ -52,6 +29,7 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Poro�ila',
@@ -63,7 +41,6 @@
 // 'menu.tasks' => 'Tasks',
 // 'menu.users' => 'Users',
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Stranke',
 'menu.options' => 'Možnosti',
@@ -81,6 +58,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.',
@@ -92,6 +70,8 @@
 // '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.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
@@ -114,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.
@@ -145,12 +124,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 // 'label.currency' => 'Currency',
@@ -208,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',
@@ -228,9 +211,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',
@@ -253,9 +233,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
@@ -271,20 +251,8 @@
 // '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',
-// '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.
@@ -298,9 +266,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
@@ -311,6 +280,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',
@@ -391,22 +361,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.
@@ -437,7 +391,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',
@@ -448,16 +401,26 @@
 // 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.',
+
+// 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.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.
 '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.
@@ -494,9 +457,11 @@
 // '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',
+// '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',
@@ -510,6 +475,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',
 
@@ -523,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).
 // TODO: translate the following.
 // 'form.invoice.number' => 'Invoice number',
 // 'form.invoice.person' => 'Person',
@@ -551,6 +517,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',
@@ -613,23 +580,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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.',
 
@@ -685,22 +657,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index be5739b6e..6902d9223 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -50,6 +27,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',
@@ -61,7 +39,6 @@
 'menu.users' => 'Korisnici',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Izvoz',
 'menu.clients' => 'Klijenti',
 'menu.options' => 'Opcije',
@@ -77,6 +54,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.',
@@ -89,6 +67,9 @@
 // TODO: translate the following.
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -118,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.
@@ -146,12 +126,17 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Naziv tim-a', // TODO: replace "team" with "group".
 'label.address' => 'Adresa',
 'label.currency' => 'Valuta',
@@ -209,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' => 'Jezik',
 'label.decimal_mark' => 'Decimala',
@@ -227,9 +213,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',
@@ -256,9 +239,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 'label.totals_only' => 'Samo zbirno',
 // TODO: translate the following.
@@ -274,21 +257,8 @@
 // '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.
-// '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.
@@ -302,9 +272,10 @@
 // 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.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".
@@ -315,6 +286,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',
@@ -395,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.
@@ -443,7 +399,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',
@@ -458,13 +413,25 @@
 
 // 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.',
 
+// 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.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.
 '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",
 
@@ -501,10 +468,13 @@
 // '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',
 // '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',
@@ -517,6 +487,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',
 
@@ -530,8 +501,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',
 
@@ -555,6 +526,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',
@@ -615,21 +587,28 @@
 '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
+// 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.',
@@ -686,22 +665,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 43b0d92b6..dba0fd6f2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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)';
@@ -49,6 +26,7 @@
 'menu.plugins' => 'Tillägg',
 'menu.time' => 'Tider',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Kostnader',
 'menu.reports' => 'Rapporter',
@@ -59,8 +37,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',
@@ -77,6 +53,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.',
@@ -89,6 +66,9 @@
 // TODO: translate the following.
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -117,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.
@@ -145,12 +124,17 @@
 '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',
 // '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Namn på grupp',
 'label.address' => 'Adress',
 'label.currency' => 'Valuta',
@@ -206,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' => 'Språk',
 'label.decimal_mark' => 'Decimaltecken',
@@ -224,9 +209,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.
@@ -252,9 +234,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Visa endast summeringar',
@@ -271,21 +253,8 @@
 // '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.
-// '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.
@@ -299,9 +268,10 @@
 // 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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Redigera grupp',
 'title.delete_group' => 'Ta bort grupp',
@@ -312,6 +282,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',
@@ -396,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.
@@ -442,7 +397,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',
@@ -457,13 +411,25 @@
 
 // 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.',
 
+// 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.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.
 '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",
 
@@ -500,10 +466,13 @@
 // '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',
 // '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',
@@ -516,6 +485,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',
 
@@ -529,8 +499,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',
 
@@ -553,6 +523,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',
@@ -613,22 +585,29 @@
 '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',
 // 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',
 
+// 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?',
 
 // 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',
+// 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.',
@@ -684,22 +663,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index e241cace8..f2531ee76 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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.
@@ -53,6 +30,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Zaman',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Raporlar',
@@ -65,7 +43,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.
@@ -85,6 +62,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.',
@@ -104,6 +82,8 @@
 // '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.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
@@ -127,7 +107,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.
@@ -159,12 +138,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Para birimi',
@@ -228,6 +210,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',
@@ -249,9 +232,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',
@@ -276,9 +256,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Sadece toplamlar',
@@ -295,20 +275,8 @@
 // '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',
-// '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.
@@ -327,9 +295,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Ekibi sil', // TODO: change "team" to "group".
@@ -341,6 +310,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',
@@ -425,22 +395,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.
@@ -473,7 +427,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',
@@ -484,16 +437,26 @@
 // 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.',
+
+// 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.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.
 '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.
@@ -531,10 +494,13 @@
 // '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',
 // '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',
@@ -549,6 +515,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',
 
@@ -562,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' => 'Fatura numarası',
 'form.invoice.person' => 'KiÅŸi',
 
@@ -589,6 +556,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.
@@ -653,23 +621,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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ı.',
 
@@ -725,22 +698,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b1d81418b..d30515863 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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 (简体中文)';
@@ -50,6 +27,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => '时间记录',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => '费用',
 'menu.reports' => '报告',
@@ -61,7 +39,6 @@
 'menu.users' => '用户',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => '导出数�',
 'menu.clients' => '客户',
 'menu.options' => '选项',
@@ -77,6 +54,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}"为空。',
@@ -91,6 +69,9 @@
 // 'error.report' => 'Select report.',
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -117,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.
@@ -148,11 +128,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 'label.group_name' => '团队�称', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'label.address' => 'Address',
@@ -213,6 +197,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.
@@ -235,9 +220,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',
@@ -262,9 +244,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
@@ -280,20 +262,8 @@
 // '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',
-// '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.
@@ -307,9 +277,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '删除团队', // TODO: change "team" to "group".
@@ -321,6 +292,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',
@@ -406,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.
@@ -453,7 +409,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',
@@ -463,13 +418,25 @@
 
 // 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> 是一�简��易用�开放�代�的实时跟踪系统。',
 
+// 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.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.
 '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.
@@ -505,10 +472,13 @@
 // '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',
 // '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' => '日期',
@@ -523,6 +493,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',
 
@@ -536,8 +507,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?
 
@@ -563,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' => '角色',
 'form.users.manager' => '��',
@@ -624,23 +596,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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' => '�票已�出。',
 
@@ -696,22 +673,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 05615586d..890244f66 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.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
-// +----------------------------------------------------------------------+
-
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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 (簡體中文)';
@@ -49,6 +26,7 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '報告',
@@ -61,7 +39,6 @@
 'menu.users' => '用戶',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => '輸出資料',
 'menu.clients' => '客戶',
 'menu.options' => '�項',
@@ -80,6 +57,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}"為空。',
@@ -94,6 +72,9 @@
 // 'error.report' => 'Select report.',
 // '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.
 // 'error.object_exists' => 'Object with this name already exists.',
@@ -121,7 +102,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.
@@ -152,12 +132,15 @@
 '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',
+// '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.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => '貨幣',
@@ -219,6 +202,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.
@@ -241,9 +225,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',
@@ -268,9 +249,9 @@
 // '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.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
@@ -286,20 +267,8 @@
 // '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',
-// '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.
@@ -313,9 +282,10 @@
 // '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.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '刪除團隊', // TODO: change "team" to "group".
@@ -327,6 +297,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',
@@ -411,22 +382,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.
@@ -458,7 +413,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',
@@ -469,13 +423,23 @@
 // 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.',
+
+// 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.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.
 '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.
@@ -511,10 +475,13 @@
 // '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',
 // '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' => '日期',
@@ -529,6 +496,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',
 
@@ -542,8 +510,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?
 
@@ -569,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' => '經�',
@@ -630,23 +599,28 @@
 // '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',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
 // '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?',
 
 // 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',
-// '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' => '發票已�出。',
 
@@ -702,22 +676,10 @@
 
 // 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',
-
-// 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.',
+// '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',
 );
diff --git a/WEB-INF/templates/2fa.tpl b/WEB-INF/templates/2fa.tpl
new file mode 100644
index 000000000..d425cbc11
--- /dev/null
+++ b/WEB-INF/templates/2fa.tpl
@@ -0,0 +1,30 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<div class="page-hint">{$i18n.form.2fa.hint}</div>
+{$forms.twoFactorAuthForm.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.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 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.twoFactorAuthForm.close}
+
diff --git a/WEB-INF/templates/admin_group_add.tpl b/WEB-INF/templates/admin_group_add.tpl
index 029b52545..17514e478 100644
--- a/WEB-INF/templates/admin_group_add.tpl
+++ b/WEB-INF/templates/admin_group_add.tpl
@@ -1,49 +1,53 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.groupForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.group_name} (*):</label></td></tr>
   <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>
+    <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>
-          <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 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>
-          <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 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_delete.tpl b/WEB-INF/templates/admin_group_delete.tpl
index 57164d4a8..a4205036e 100644
--- a/WEB-INF/templates/admin_group_delete.tpl
+++ b/WEB-INF/templates/admin_group_delete.tpl
@@ -1,20 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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/WEB-INF/templates/admin_group_edit.tpl b/WEB-INF/templates/admin_group_edit.tpl
index 70443e327..15185163e 100644
--- a/WEB-INF/templates/admin_group_edit.tpl
+++ b/WEB-INF/templates/admin_group_edit.tpl
@@ -1,45 +1,47 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.groupForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.group_name} (*):</label></td></tr>
   <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>
+    <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>
-          <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 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>
-          <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 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/WEB-INF/templates/admin_groups.tpl b/WEB-INF/templates/admin_groups.tpl
index 218fe77cd..ef9d729ff 100644
--- a/WEB-INF/templates/admin_groups.tpl
+++ b/WEB-INF/templates/admin_groups.tpl
@@ -1,42 +1,36 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <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">
+<div class="page-hint">{$i18n.form.groups.hint}</div>
+{if $groups}
+<table class="x-scrollable-table">
   <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>
+    <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>
-{if $groups}
   {foreach $groups as $group}
-  <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+  <tr>
     <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="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 class="text-cell">{$group.name|escape}</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>
   </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>
+{/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/WEB-INF/templates/admin_options.tpl b/WEB-INF/templates/admin_options.tpl
index bff36ff19..be5bc79e5 100644
--- a/WEB-INF/templates/admin_options.tpl
+++ b/WEB-INF/templates/admin_options.tpl
@@ -1,39 +1,41 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.optionsForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.person_name} (*):</label></td></tr>
   <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>
+    <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>
-          <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>
+  <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>
-          <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 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/WEB-INF/templates/cf_custom_field_add.tpl b/WEB-INF/templates/cf_custom_field_add.tpl
index 089e4b681..acf1f386c 100644
--- a/WEB-INF/templates/cf_custom_field_add.tpl
+++ b/WEB-INF/templates/cf_custom_field_add.tpl
@@ -1,35 +1,35 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.fieldForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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 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/WEB-INF/templates/cf_custom_field_delete.tpl b/WEB-INF/templates/cf_custom_field_delete.tpl
index fae6d804d..d8595735a 100644
--- a/WEB-INF/templates/cf_custom_field_delete.tpl
+++ b/WEB-INF/templates/cf_custom_field_delete.tpl
@@ -1,22 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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/WEB-INF/templates/cf_custom_field_edit.tpl b/WEB-INF/templates/cf_custom_field_edit.tpl
index 62e2a267e..36bbd3dce 100644
--- a/WEB-INF/templates/cf_custom_field_edit.tpl
+++ b/WEB-INF/templates/cf_custom_field_edit.tpl
@@ -1,35 +1,35 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.fieldForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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 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/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index e64f18157..812943db8 100644
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -1,47 +1,41 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.customFieldsForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
+<table class="x-scrollable-table">
   <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}
+    <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 bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$field['label']|escape}</td>
+  <tr>
+    <td class="text-cell">{$field['label']|escape}</td>
       {if CustomFields::ENTITY_TIME == $field['entity_type']}
-          <td>{$i18n.entity.time}</td>
+    <td>{$i18n.entity.time}</td>
       {elseif CustomFields::ENTITY_USER == $field['entity_type']}
-          <td>{$i18n.entity.user}</td>
+    <td>{$i18n.entity.user}</td>
+      {elseif CustomFields::ENTITY_PROJECT == $field['entity_type']}
+    <td>{$i18n.entity.project}</td>
       {else}
-          <td></td>
+    <td></td>
       {/if}
       {if CustomFields::TYPE_TEXT == $field['type']}
-          <td>{$i18n.label.type_text}</td>
-          <td></td>
+    <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>
+    <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>
-        </tr>
+    <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>
+<div class="button-set">{$forms.customFieldsForm.btn_add.control}</div>
 {$forms.customFieldsForm.close}
diff --git a/WEB-INF/templates/cf_dropdown_option_add.tpl b/WEB-INF/templates/cf_dropdown_option_add.tpl
index bcc1cee72..5ba70387b 100644
--- a/WEB-INF/templates/cf_dropdown_option_add.tpl
+++ b/WEB-INF/templates/cf_dropdown_option_add.tpl
@@ -1,27 +1,16 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.optionAddForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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
index bec03cc32..8fb56d618 100644
--- a/WEB-INF/templates/cf_dropdown_option_delete.tpl
+++ b/WEB-INF/templates/cf_dropdown_option_delete.tpl
@@ -1,22 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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
index c2b0bae9c..f7f987cd8 100644
--- a/WEB-INF/templates/cf_dropdown_option_edit.tpl
+++ b/WEB-INF/templates/cf_dropdown_option_edit.tpl
@@ -1,27 +1,16 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.optionEditForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
index b920d733e..f7a6b28b5 100644
--- a/WEB-INF/templates/cf_dropdown_options.tpl
+++ b/WEB-INF/templates/cf_dropdown_options.tpl
@@ -1,39 +1,26 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
-<table cellspacing="0" cellpadding="7" border="0" width="720">
+<table class="x-scrollable-table">
   <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="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}
-      </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>
+    <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/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index 8e05e1985..27d335ffb 100644
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -1,37 +1,141 @@
-<p></p>
+{* 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() {
+  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");
+      }
+    }
+  }
+}
+
+// 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");
+  var smallScreenCalendarDiv = document.getElementById("small_screen_calendar");
+  var largeScreenCalendarDiv = document.getElementById("large_screen_calendar");
+
+  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 = "";
+    }
+    if (smallScreenCalendarDiv != null) {
+      smallScreenCalendarDiv.style.display = "";
+    }
+    if (largeScreenCalendarDiv != null) {
+      largeScreenCalendarDiv.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";
+    }
+    if (smallScreenCalendarDiv != null) {
+      smallScreenCalendarDiv.style.display = "none";
+    }
+    if (largeScreenCalendarDiv != null) {
+      largeScreenCalendarDiv.style.display = "none";
+    }
+  }
+}
+</script>
+
 {$forms.chartForm.open}
-<table border="0" width="720">
+<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 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>
-{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}
+    <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 $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}
-
+{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>
-<table border="0" width="720">
+
+<div class="chart">
+<table class="centered-table">
   <tr>
-    <td width="50%" align="center"><img src="{$img_file_name}" height="300" width="300" border="0"/></td>
-    <td>
-      <table border="0" cellspacing="3">
+    <td><img class="chart-image" src="{$img_file_name}"></td>
+    <td class="large-screen-chart-items-list">
+      <table class="chart-items-list-table">
       {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>
+        <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>
-  </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>
+</div>
+
+<div class="chart">
+<table class="centered-table">
+  <tr>
+    <td class="small-screen-chart-items-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>
+      {/if}
+      {/section}
+      </table>
+    </td>
 </table>
+</div>
 {$forms.chartForm.close}
diff --git a/WEB-INF/templates/client_add.tpl b/WEB-INF/templates/client_add.tpl
index db10ede45..ac7a63efc 100644
--- a/WEB-INF/templates/client_add.tpl
+++ b/WEB-INF/templates/client_add.tpl
@@ -1,37 +1,40 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.clientForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.client_name} (*):</label></td></tr>
   <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>
+    <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="small-screen-form-control-separator"></div></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>
+  <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>
+    <td class="td-with-checkboxes">{$forms.clientForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.clientForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
+  <tr>
+    <td colspan="2">{$forms.clientForm.btn_submit.control}</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_delete.tpl b/WEB-INF/templates/client_delete.tpl
index f40b94c12..47506f79b 100644
--- a/WEB-INF/templates/client_delete.tpl
+++ b/WEB-INF/templates/client_delete.tpl
@@ -1,25 +1,19 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.clientDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td>{$i18n.form.client.client_to_delete}:</td></tr>
   <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>
+    <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/WEB-INF/templates/client_edit.tpl b/WEB-INF/templates/client_edit.tpl
index 2abf70dc1..39c965ae0 100644
--- a/WEB-INF/templates/client_edit.tpl
+++ b/WEB-INF/templates/client_edit.tpl
@@ -1,41 +1,43 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.clientForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.client_name} (*):</label></td></tr>
   <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>
+    <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="small-screen-form-control-separator"></div></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><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>
+    <td class="td-with-checkboxes">{$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/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
index ca93b92f5..9f7d4064b 100644
--- a/WEB-INF/templates/clients.tpl
+++ b/WEB-INF/templates/clients.tpl
@@ -1,74 +1,62 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <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 $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}
-        <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="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>
-
-      <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>
-
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></div>
   {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>
+<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 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>
-        </tr>
+  <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>
-
-      <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>
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></div>
   {/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>
+<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/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index d7bbdd57d..0d0418af9 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -1,23 +1,73 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.displayOptionsForm.open}
-<table cellspacing="1" cellpadding="2" border="0">
-  <tr><td>&nbsp;</td></tr>
-  <tr><td class="sectionHeaderNoBorder">{$i18n.title.time}</td></tr>
+<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><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>
+    <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>
-
-  <tr><td>&nbsp;</td></tr>
-  <tr><td class="sectionHeaderNoBorder">{$i18n.title.reports}</td></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><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>
+    <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>&nbsp;</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 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 class = "small-screen-label"><td><label for="report_cost_per_hour">{$i18n.form.display_options.cost_per_hour}:</label></td></tr>
   <tr>
-    <td colspan="2" height="50" align="center">{$forms.displayOptionsForm.btn_save.control}</td>
+    <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>
+  <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 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>
+  <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>
 </table>
+<div class="button-set">{$forms.displayOptionsForm.btn_save.control}</div>
 {$forms.displayOptionsForm.close}
diff --git a/WEB-INF/templates/entity_files.tpl b/WEB-INF/templates/entity_files.tpl
index fc552b24b..07a46443d 100644
--- a/WEB-INF/templates/entity_files.tpl
+++ b/WEB-INF/templates/entity_files.tpl
@@ -1,47 +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="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>
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {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 bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="file_download.php?id={$file.id}">{$file.name|escape}</a></td>
-          <td>{$file.description|escape}</td>
+  <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="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}
-{/if}
-      </table>
-    </td>
   </tr>
+  {/foreach}
 </table>
+{/if}
 
 {if $can_edit}
+<div class="form-control-separator"></div>
 {$forms.fileUploadForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
+<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 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>
+    <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>
+  <tr><td colspan="2">{$forms.fileUploadForm.btn_submit.control}</td></tr>
 </table>
 {$forms.fileUploadForm.close}
 {/if}
+
+
+
diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl
index 6e5bf12c8..a9ea04d10 100644
--- a/WEB-INF/templates/expense_delete.tpl
+++ b/WEB-INF/templates/expense_delete.tpl
@@ -1,39 +1,28 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.expenseItemForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-<tr>
-  <td>
-  <table border="0" cellpadding="3" cellspacing="1" width="100%">
+<table class="centered-table">
   <tr>
 {if $user->isPluginEnabled('cl')}
-    <td class="tableHeader" align="center">{$i18n.label.client}</td>
+    <th>{$i18n.label.client}</th>
 {/if}
-
 {if $show_project}
-    <td class="tableHeader" align="center">{$i18n.label.project}</td>
+    <th>{$i18n.label.project}</th>
 {/if}
-    <td class="tableHeader" align="center">{$i18n.label.item}</td>
-    <td class="tableHeader" align="center">{$i18n.label.cost}</td>
+    <th>{$i18n.label.item}</th>
+    <th>{$i18n.label.cost}</th>
   </tr>
   <tr>
 {if $user->isPluginEnabled('cl')}
-    <td>{$expense_item.client_name|escape}</td>
+    <td class="text-cell">{$expense_item.client_name|escape}</td>
 {/if}
 {if $show_project}
-    <td>{$expense_item.project_name|escape}</td>
+    <td class="text-cell">{$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>
+    <td class="text-cell">{$expense_item.name|escape}</td>
+    <td class="time-cell">{$expense_item.cost}</td>
   </tr>
-  </table>
-  </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/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl
index 671e868cf..fc5cef8cc 100644
--- a/WEB-INF/templates/expense_edit.tpl
+++ b/WEB-INF/templates/expense_edit.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.
@@ -35,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() {
@@ -125,65 +128,62 @@ function recalculateCost() {
 </script>
 
 {$forms.expenseItemForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-  <table width = "100%">
+<table class="centered-table">
   <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>
+  <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>
-      <td align="right">{$i18n.label.project} (*):</td>
-      <td>{$forms.expenseItemForm.project.control}</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.expenseItemForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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>
+  <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>
-      <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>
+  <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 align="right">&nbsp;</td>
-      <td><label>{$forms.expenseItemForm.paid.control}{$i18n.label.paid}</label></td>
-    </tr>
+  <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>
-      <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 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/expenses.tpl b/WEB-INF/templates/expenses.tpl
index c064b13de..859ae3506 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.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.
@@ -113,129 +116,126 @@ function recalculateCost() {
 </script>
 
 {$forms.expensesForm.open}
-<table cellspacing="4" cellpadding="0" border="0">
+<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 isset($user_dropdown)}
+  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
-    <td valign="top">
-      <table>
-{if $user_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.expensesForm.user.control}</td>
-        </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>
-          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
-          <td>{$forms.expensesForm.client.control}</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.expensesForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_project}
-        <tr>
-          <td align="right">{$i18n.label.project} (*):</td>
-          <td>{$forms.expensesForm.project.control}</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.expensesForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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>
+  <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>
-          <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>
+  <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>
-          <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 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>
-</table>
-
-<table>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
   <tr>
-    <td align="center" colspan="2">{$forms.expensesForm.btn_submit.control}</td>
+    <td align="center" colspan="3">{$forms.expensesForm.btn_submit.control}</td>
   </tr>
 </table>
+{$forms.expensesForm.close}
 
-<table width="720">
-<tr>
-  <td valign="top">
 {if $expense_items}
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
+<div class="record-list">
+<table class="x-scrollable-table">
+  <tr>
   {if $user->isPluginEnabled('cl')}
-        <td 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}
-        <td class="tableHeader">{$i18n.label.item}</td>
-        <td width="5%" class="tableHeaderCentered">{$i18n.label.cost}</td>
+    <th>{$i18n.label.item}</th>
+    <th>{$i18n.label.cost}</th>
   {if $show_files}
-        <td></td>
+    <th></th>
   {/if}
-        <td></td>
-        <td></td>
-      </tr>
+    <th></th>
+    <th></th>
+  </tr>
   {foreach $expense_items as $item}
-      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+  <tr>
     {if $user->isPluginEnabled('cl')}
-        <td valign="top">{$item.client|escape}</td>
+    <td class="text-cell">{$item.client|escape}</td>
     {/if}
     {if $show_project}
-        <td valign="top">{$item.project|escape}</td>
+    <td class="text-cell">{$item.project|escape}</td>
     {/if}
-        <td valign="top">{$item.item|escape}</td>
-        <td valign="top" align="right">{$item.cost}</td>
+    <td class="text-cell">{$item.item|escape}</td>
+    <td class="time-cell">{$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><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><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">
+    <td>
     {if $item.approved || $item.invoice_id}
-          &nbsp;
+      &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">
+    </td>
+    <td>
     {if $item.approved || $item.invoice_id}
-          &nbsp;
+      &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>
+    </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}
+</div>
+<div class="day-totals">{$i18n.label.day_total}: {$user->getCurrency()|escape} {$day_total}</div>
+{/if}
+
diff --git a/WEB-INF/templates/export.tpl b/WEB-INF/templates/export.tpl
index 487f00978..171aa9b1b 100644
--- a/WEB-INF/templates/export.tpl
+++ b/WEB-INF/templates/export.tpl
@@ -1,23 +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 cellspacing="0" cellpadding="7" border="0" width="720">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="compression">{$i18n.form.export.compression}:</label></td></tr>
   <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>
+    <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/file_delete.tpl b/WEB-INF/templates/file_delete.tpl
index 81107daa5..80abe01ce 100644
--- a/WEB-INF/templates/file_delete.tpl
+++ b/WEB-INF/templates/file_delete.tpl
@@ -1,18 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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/WEB-INF/templates/file_edit.tpl b/WEB-INF/templates/file_edit.tpl
index 697a650ce..66f72cc3d 100644
--- a/WEB-INF/templates/file_edit.tpl
+++ b/WEB-INF/templates/file_edit.tpl
@@ -1,29 +1,22 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.fileForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="file_name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7486f21e1..8844f56e8 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -1,28 +1,7 @@
-    </td>
-  </tr>
-  <tr>
-    <td valign="bottom" width="100%" align="center">
-      <p>&nbsp;</p>
+</div> {* page-content *}
 
-      <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">&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>
-          </td>
-        </tr>
-      </table>
-      <br>
+<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>
 
-    </td>
-  </tr>
-</table>
 </body>
 </html>
diff --git a/WEB-INF/templates/group_add.tpl b/WEB-INF/templates/group_add.tpl
index 852f1b78b..cc4231ebf 100644
--- a/WEB-INF/templates/group_add.tpl
+++ b/WEB-INF/templates/group_add.tpl
@@ -1,28 +1,22 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.groupForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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
index a9369787e..82eac702c 100644
--- a/WEB-INF/templates/group_advanced_edit.tpl
+++ b/WEB-INF/templates/group_advanced_edit.tpl
@@ -1,37 +1,58 @@
-{$forms.groupAdvancedForm.open}
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
 
-<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>
+{$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_advanced_edit.allow_ip}:</label></td></tr>
+  <tr>
+    <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_advanced_edit.password_complexity}:</label></td></tr>
+  <tr>
+    <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>
+    </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_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>
+  <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>
-{$forms.groupForm.close}
+<div class="button-set">{$forms.groupAdvancedForm.btn_save.control}</div>
+{$forms.groupAdvancedForm.close}
diff --git a/WEB-INF/templates/group_delete.tpl b/WEB-INF/templates/group_delete.tpl
index a14373f55..5a02f29af 100644
--- a/WEB-INF/templates/group_delete.tpl
+++ b/WEB-INF/templates/group_delete.tpl
@@ -1,22 +1,8 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index 67bddd9e5..909b485e6 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -1,137 +1,183 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <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}
 {include file="datetime_format_preview.tpl"}
-
-<table cellspacing="4" cellpadding="7" border="0">
-    <tr>
-      <td>
-        <table cellspacing="1" cellpadding="2" border="0">
+<table class="centered-table">
 {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 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>
-            <td align="right" nowrap>{$i18n.label.subgroups}:</td>
-            <td><a href="groups.php">{$i18n.label.configure}</a></td>
-          </tr>
+  <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>
-            <td align="right">{$i18n.label.currency}:</td>
-            <td>{$forms.groupForm.currency.control}</td>
-          </tr>
+  <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>
-            <td align="right" nowrap>{$i18n.label.roles}:</td>
-            <td><a href="roles.php">{$i18n.label.configure}</a></td>
-          </tr>
+  <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>
-           <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} {$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.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>
+  <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} <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} <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} <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>
+  <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="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>
+  <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>
-            <td align="right" nowrap>{$i18n.form.group_edit.advanced_settings}:</td>
-            <td><a href="group_advanced_edit.php">{$i18n.label.configure}</a></td>
-          </tr>
+  <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}
-          <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>
+<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/WEB-INF/templates/groups.tpl b/WEB-INF/templates/groups.tpl
index 0289ef9ee..b5ed9a7b2 100644
--- a/WEB-INF/templates/groups.tpl
+++ b/WEB-INF/templates/groups.tpl
@@ -1,42 +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 $group_dropdown}
-<table cellspacing="1" cellpadding="3" border="0" width="100%">
+{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 align="center">{$i18n.label.group}: {$forms.subgroupsForm.group.control}</td>
+    <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>&nbsp;</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 cellspacing="1" cellpadding="3" border="0" width="720">
+<table class="x-scrollable-table">
   <tr>
-    <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
-    <td width="40%" class="tableHeader">{$i18n.label.description}</td>
-    <td></td>
-    <td></td>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{{$i18n.label.description}}</th>
+    <th></th>
+    <th></th>
   </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="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>
+    <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}
-
-<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>
+<div class="button-set">
+  <form>
+    <input type="button" onclick="chLocation('group_add.php');" value="{$i18n.button.add}">
+  </form>
+</div>
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 837ef05b3..af6151acb 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -1,13 +1,18 @@
-<html>
+<!DOCTYPE html>
+<html lang="{constant('LANG_DEFAULT')}">
 <head>
-  <meta http-equiv="content-type" content="text/html; charset={$smarty.const.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="{$smarty.const.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('DEFAULT_CSS')}" rel="stylesheet">
+{if (isset($i18n.language.rtl) && $i18n.language.rtl)}
+  <link href="{constant('RTL_CSS')}" rel="stylesheet">
 {/if}
-  <title>Time Tracker{if $title} - {$title}{/if}</title>
+{if $user->getCustomCss()}
+  <link href="custom_css.php" rel="stylesheet">
+{/if}
+  <title>Time Tracker{if isset($title) && $title} - {$title}{/if}</title>
   <script src="js/strftime.js"></script>
   <script>
     {* Setup locale for strftime *}
@@ -16,192 +21,168 @@
   <script src="js/strptime.js"></script>
 </head>
 
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" {$onload}>
-
-{assign var="tab_width" value="700"}
+<body{if isset($onload)} {$onload}{/if}>
 
-<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>
+<div class="logo">
 {if $user->custom_logo}
-          <td align="center">
+  <img alt="Time Tracker" width="300" height="43" src="{$custom_logo}">
 {else}
-          <td bgcolor="#a6ccf7" background="images/top_bg.gif" 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"></a>
 {/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 -->
+</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="{constant('HELP_LINK')}">{$i18n.menu.help}</a></td>
+    </tr>
+  </table>
+</div>
+{* end of top menu for small screens *}
 
-{if $authenticated}
+{* top menu for large screens *}
+{if (isset($authenticated) && $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 -->
+  {* 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="{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>
+  {* 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="work/admin_work.php">{$i18n.label.work}</a>
-    {/if}
-          </td>
-        </tr>
-      </table>
-      <!-- end of sub 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>
+    </td>
+  </table>
+</div>
+  {* 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>
+  {* 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')}
-            <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a>
+      <td><a href="profile_edit.php">{$i18n.menu.profile}</a></td>
     {/if}
     {if $user->can('manage_basic_settings')}
-            <a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a>
+      <td><a href="group_edit.php">{$i18n.menu.group}</a></td>
     {/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 -->
+      <td><a href="plugins.php">{$i18n.menu.plugins}</a></td>
+    {/if}
+      <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>
+  {* 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;
+  {* 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'))}
-           <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
+      <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')}
-           <a class="mainMenu" href="week.php">{$i18n.menu.week}</a>
+      <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'))}
-           <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
+      <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'))}
-           <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
+      <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'))}
-           <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
+      <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'))}
-           <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
+      <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() ||
+    {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'))}
-           <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
+      <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())}
-           <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
+    {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')))}
-           <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
+    {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')}
-           <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
+      <td><a href="users.php">{$i18n.menu.users}</a></td>
     {/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>
+      <td><a href="clients.php">{$i18n.menu.clients}</a></td>
     {/if}
     {if $user->can('export_data')}
-           <a class="mainMenu" href="export.php">{$i18n.menu.export}</a>
+      <td><a href="export.php">{$i18n.menu.export}</a></td>
     {/if}
-          </td>
-        </tr>
-      </table>
-      <!-- end of sub menu for authorized user -->
+    </tr>
+  </table>
+</div>
+  {* 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>
+  {* 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') && constant('AUTH_MODULE') == 'db'}
+      <td><a href="register.php">{$i18n.menu.register}</a></td>
   {/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>
+      <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>
 {/if}
-      <br>
+{* end of top menu for large screens *}
 
-      <!-- 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>
+{* page title and user details *}
+{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}
 {/if}
-      <!-- end of page title and user details -->
+{* end of page title and user details *}
 
-      <!-- output errors -->
+{* output errors *}
 {if $err->yes()}
-      <table id="page_errors" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
-        <tr>
-          <td class="error">
+<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. *}
+{$error.message}<br> {* No need to escape as they are not coming from user and may contain a link. *}
   {/foreach}
-          </td>
-        </tr>
-      </table>
+</div>
 {/if}
-      <!-- end of output errors -->
+{* end of output errors *}
 
-      <!-- output messages -->
+{* output messages *}
 {if $msg->yes()}
-      <table id="page_messages" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
-        <tr>
-          <td class="info_message">
+<div class="page-messages">
   {foreach $msg->getErrors() as $message}
-            {$message.message}<br> {* No need to escape. *}
+{$message.message}<br> {* No need to escape. *}
   {/foreach}
-          </td>
-        </tr>
-      </table>
+</div>
 {/if}
-      <!-- end of output messages -->
+{* end of output messages *}
+
+<div class="page-content">
diff --git a/WEB-INF/templates/import.tpl b/WEB-INF/templates/import.tpl
index d65b64963..5d7cd33ac 100644
--- a/WEB-INF/templates/import.tpl
+++ b/WEB-INF/templates/import.tpl
@@ -1,17 +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 cellspacing="0" cellpadding="7" border="0" width="720">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="xmlfile">{$i18n.form.import.file}:</label></td></tr>
   <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>
+    <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>
-{$forms.importForm.close}
+<div class="button-set">{$forms.importForm.btn_submit.control}</div>
+{$forms.importForm.open}
diff --git a/WEB-INF/templates/invoice_add.tpl b/WEB-INF/templates/invoice_add.tpl
index f5211eeef..78e4f5ba2 100644
--- a/WEB-INF/templates/invoice_add.tpl
+++ b/WEB-INF/templates/invoice_add.tpl
@@ -1,46 +1,50 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.invoiceForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<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>
-      <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>
+    <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>
-          <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 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>
diff --git a/WEB-INF/templates/invoice_delete.tpl b/WEB-INF/templates/invoice_delete.tpl
index 3e0c0700d..951e5e816 100644
--- a/WEB-INF/templates/invoice_delete.tpl
+++ b/WEB-INF/templates/invoice_delete.tpl
@@ -1,3 +1,6 @@
+{* 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");
@@ -10,25 +13,22 @@
 </script>
 
 {$forms.invoiceDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<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>
-      <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 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}
+      <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>
+<div class="button-set">{$forms.invoiceDeleteForm.btn_delete.control} {$forms.invoiceDeleteForm.btn_cancel.control}</div>
 {$forms.invoiceDeleteForm.close}
diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl
index 0d8c31ffe..801245559 100644
--- a/WEB-INF/templates/invoice_view.tpl
+++ b/WEB-INF/templates/invoice_view.tpl
@@ -1,90 +1,104 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
-<table cellspacing="0" cellpadding="7" border="0" width="720">
+<div class="invoice-header">{$i18n.title.invoice} {$invoice_name|escape}</div>
+<table class="centered-table">
   <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>
+    <th class="invoice-label">{$i18n.label.date}:</th>
+    <td class="text-cell">{$invoice_date}</td>
   </tr>
   <tr>
-    <td valign="top">
+    <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 border="0" cellpadding="3" cellspacing="1" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.date}</td>
-          <td class="tableHeader">{$i18n.form.invoice.person}</td>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.date}</th>
+    <th>{$i18n.form.invoice.person}</th>
   {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}
-          <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>
+    <th>{$i18n.label.note}</th>
+    <th>{$i18n.label.duration}</th>
+    <th>{$i18n.label.cost}</th>
   {if $user->isPluginEnabled('ps')}
-          <td class="tableHeader">{$i18n.label.paid}</td>
+    <th>{$i18n.label.paid}</th>
   {/if}
-        </tr>
+  </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>
+  <tr>
+    <td class="date-cell">{$invoice_item.date}</td>
+    <td class="text-cell">{$invoice_item.user_name|escape}</td>
     {if $show_project}
-          <td valign="top">{$invoice_item.project_name|escape}</td>
+    <td class="text-cell">{$invoice_item.project_name|escape}</td>
     {/if}
     {if $show_task}
-          <td valign="top">{$invoice_item.task_name|escape}</td>
+    <td class="text-cell">{$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>
+     <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>
+  </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">
+  {if isset($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>
-    <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>
+    <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>
-  </table>
-  {$forms.invoiceForm.close}
   {/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}
-    </td>
+
+{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>
+  <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 align="center"><br><form>
-    <input type="button" onclick="chLocation('invoice_send.php?id={$invoice_id}');" value="{$i18n.button.send_by_email}">
-  </form></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/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl
index 2df35a8ce..003266cb0 100644
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -1,60 +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}
-<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}
+{$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 cellspacing="0" cellpadding="7" border="0" width="720">
+<table class="x-scrollable-table">
   <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>
+    <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>{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 class="yes-no-cell">{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</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>
+    <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}
-{/if}
-    </td>
   </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/WEB-INF/templates/locking.tpl b/WEB-INF/templates/locking.tpl
index 0d76e46cc..8ecf48cc9 100644
--- a/WEB-INF/templates/locking.tpl
+++ b/WEB-INF/templates/locking.tpl
@@ -1,20 +1,17 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.lockingForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="lock_spec">{$i18n.label.schedule}:</label></td></tr>
   <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 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/WEB-INF/templates/login.db.tpl b/WEB-INF/templates/login.db.tpl
index 977d9b996..3d5aa9667 100644
--- a/WEB-INF/templates/login.db.tpl
+++ b/WEB-INF/templates/login.db.tpl
@@ -1,21 +1,23 @@
-<table border="0">
+{* 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>
-    <td{if !$i18n.language.rtl} align="right"{/if}>{$i18n.label.login}:</td>
-    <td>{$forms.loginForm.login.control}</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><label for="password">{$i18n.label.password}:</label></td></tr>
   <tr>
-    <td{if !$i18n.language.rtl} align="right"{/if}>{$i18n.label.password}:</td>
-    <td>{$forms.loginForm.password.control}</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>
-    <td>&nbsp;</td>
-    <td><a href ="password_reset.php">{$i18n.form.login.forgot_password}</a></td>
+    <td colspan="2"><a href ="password_reset.php">{$i18n.form.login.forgot_password}</a></td>
   </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2" align="center" height="50">{$forms.loginForm.btn_login.control}</td>
+    <td colspan="2">{$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
index bf285dc29..e60d954ee 100644
--- a/WEB-INF/templates/login.ldap.tpl
+++ b/WEB-INF/templates/login.ldap.tpl
@@ -1,28 +1,26 @@
-<table border="0">
-  {if $show_hint}
+{* 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}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login}:</label></td></tr>
   <tr>
-    <td colspan="2" align="center">{$i18n.label.ldap_hint}</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><label for="password">{$i18n.label.password}:</label></td></tr>
   <tr>
-    <td colspan="2">&nbsp;</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>
-  {/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>
+    <td colspan="2"><a href ="password_reset.php">{$i18n.form.login.forgot_password}</a></td>
   </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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>
+    <td colspan="2">{$forms.loginForm.btn_login.control}</td>
   </tr>
 </table>
-  
\ No newline at end of file
diff --git a/WEB-INF/templates/login.tpl b/WEB-INF/templates/login.tpl
index d7d9b93f4..e6a8a4ed3 100644
--- a/WEB-INF/templates/login.tpl
+++ b/WEB-INF/templates/login.tpl
@@ -1,21 +1,17 @@
+{* 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>
-<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>
+
+{$forms.loginForm.open}
+{include file="login.`$smarty.const.AUTH_MODULE`.tpl"}
+{$forms.loginForm.close}
 
 {if !empty($about_text)}
-  <div id="LoginAboutText"> {$about_text} </div>
+  <div id="LoginAboutText">{$about_text}</div>
 {/if}
diff --git a/WEB-INF/templates/mail.tpl b/WEB-INF/templates/mail.tpl
index c57399f1f..3a3cf132f 100644
--- a/WEB-INF/templates/mail.tpl
+++ b/WEB-INF/templates/mail.tpl
@@ -1,43 +1,34 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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.from} (*):</td>
-          <td>{$sender}</td>
-        </tr>
-        <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 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/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/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/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/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/header.tpl b/WEB-INF/templates/mobile/header.tpl
deleted file mode 100644
index ec0b05926..000000000
--- a/WEB-INF/templates/mobile/header.tpl
+++ /dev/null
@@ -1,127 +0,0 @@
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset={$smarty.const.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">
-{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="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="../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="{$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>
-{/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="../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>
-          </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="../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}
-    {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())}
-           <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()}
-           <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}
-          </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/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/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/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/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/time.tpl b/WEB-INF/templates/mobile/time.tpl
deleted file mode 100644
index 79398703b..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 ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <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>
-      {/foreach}
-    </table>
-    <table border="0">
-      <tr>
-        <td align="right">{$i18n.label.day_total}:</td>
-        <td>{$day_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 $user->isPluginEnabled('cl')}
-      <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>
-{/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 ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <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)}
-    <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))}
-    <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))}
-    <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/time_delete.tpl b/WEB-INF/templates/mobile/time_delete.tpl
deleted file mode 100644
index 0428e13b1..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 ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <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)}
-    <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 a93c0a60a..000000000
--- a/WEB-INF/templates/mobile/time_edit.tpl
+++ /dev/null
@@ -1,73 +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 $user->isPluginEnabled('cl')}
-    <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>
-{/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 ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <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)}
-    <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))}
-    <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))}
-    <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/timer.tpl b/WEB-INF/templates/mobile/timer.tpl
deleted file mode 100644
index ea52f6b6b..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 $user->isPluginEnabled('cl')}
-    <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>
-{/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 ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <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)}
-    <tr><td>{$i18n.label.task}:</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/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/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/WEB-INF/templates/notification_add.tpl b/WEB-INF/templates/notification_add.tpl
index a710c0c1d..b7e609126 100644
--- a/WEB-INF/templates/notification_add.tpl
+++ b/WEB-INF/templates/notification_add.tpl
@@ -1,42 +1,59 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+
 {$forms.notificationForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="fav_report">{$i18n.label.fav_report} (*):</label></td></tr>
   <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.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 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/WEB-INF/templates/notification_delete.tpl b/WEB-INF/templates/notification_delete.tpl
index fac015c3a..bd413463d 100644
--- a/WEB-INF/templates/notification_delete.tpl
+++ b/WEB-INF/templates/notification_delete.tpl
@@ -1,18 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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
index abb03e658..1a0967cc6 100644
--- a/WEB-INF/templates/notification_edit.tpl
+++ b/WEB-INF/templates/notification_edit.tpl
@@ -1,42 +1,59 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+
 {$forms.notificationForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="fav_report">{$i18n.label.fav_report} (*):</label></td></tr>
   <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.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 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/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl
index 3a62e8cb2..a1be398ea 100644
--- a/WEB-INF/templates/notifications.tpl
+++ b/WEB-INF/templates/notifications.tpl
@@ -1,36 +1,28 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.notificationsForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
+<table class="x-scrollable-table">
   <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="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}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br>{$forms.notificationsForm.btn_add.control}</td></tr>
-      </table>
-{/if}
-    </td>
+    <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/WEB-INF/templates/password_change.tpl b/WEB-INF/templates/password_change.tpl
index 797f4a358..bc2517a25 100644
--- a/WEB-INF/templates/password_change.tpl
+++ b/WEB-INF/templates/password_change.tpl
@@ -1,41 +1,25 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.newPasswordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<div class="page-hint">{$i18n.form.change_password.tip}</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>
-    <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>
+    <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="small-screen-form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.newPasswordForm.btn_save.control}</td>
   </tr>
 </table>
 {$forms.newPasswordForm.close}
diff --git a/WEB-INF/templates/password_reset.tpl b/WEB-INF/templates/password_reset.tpl
index 93c5d49db..72664dbbc 100644
--- a/WEB-INF/templates/password_reset.tpl
+++ b/WEB-INF/templates/password_reset.tpl
@@ -1,27 +1,16 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.resetPasswordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login}:</label></td></tr>
   <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>
-          <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>
-{/if}
-    </td>
+    <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/WEB-INF/templates/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 97f7cdb95..e4402f62d 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -1,6 +1,20 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+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");
@@ -28,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 {
@@ -46,10 +59,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");
@@ -98,82 +114,102 @@ function handlePluginCheckboxes() {
 </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"><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_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_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_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_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_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_conf"><a href="work_units.php">{$i18n.label.configure}</a></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_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 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 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="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>
+    <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>
 </table>
+<div class="button-set">{$forms.pluginsForm.btn_save.control}</div>
 {$forms.pluginsForm.close}
diff --git a/WEB-INF/templates/predefined_expense_add.tpl b/WEB-INF/templates/predefined_expense_add.tpl
index fd2983a70..5e7473848 100644
--- a/WEB-INF/templates/predefined_expense_add.tpl
+++ b/WEB-INF/templates/predefined_expense_add.tpl
@@ -1,26 +1,21 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.predefinedExpenseForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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/WEB-INF/templates/predefined_expense_delete.tpl b/WEB-INF/templates/predefined_expense_delete.tpl
index e91692f4c..23a7193c8 100644
--- a/WEB-INF/templates/predefined_expense_delete.tpl
+++ b/WEB-INF/templates/predefined_expense_delete.tpl
@@ -1,18 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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
index f53b512ad..06af4a315 100644
--- a/WEB-INF/templates/predefined_expense_edit.tpl
+++ b/WEB-INF/templates/predefined_expense_edit.tpl
@@ -1,26 +1,21 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.predefinedExpenseForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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
index 4f138becf..c0d45af9e 100644
--- a/WEB-INF/templates/predefined_expenses.tpl
+++ b/WEB-INF/templates/predefined_expenses.tpl
@@ -1,30 +1,24 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.predefinedExpensesForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
+<table class="x-scrollable-table">
   <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="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}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br>{$forms.predefinedExpensesForm.btn_add.control}</td></tr>
-      </table>
-    </td>
+    <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/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl
index 1fb040005..772172485 100644
--- a/WEB-INF/templates/profile_edit.tpl
+++ b/WEB-INF/templates/profile_edit.tpl
@@ -1,43 +1,43 @@
-{$forms.profileForm.open}
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
 
-<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>
+{$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 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>
+  <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>
-            <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>
+  <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/WEB-INF/templates/project_add.tpl b/WEB-INF/templates/project_add.tpl
index 309b13788..7b1fd835c 100644
--- a/WEB-INF/templates/project_add.tpl
+++ b/WEB-INF/templates/project_add.tpl
@@ -1,49 +1,62 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.projectForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="project_name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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="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>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.projectForm.newfile.control}</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.projectForm.newfile.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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>
+  <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>
+    <td class="td-with-checkboxes">{$forms.projectForm.users.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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>
+  <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>
+    <td class="td-with-checkboxes">{$forms.projectForm.tasks.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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><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.projectForm.btn_add.control}</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_delete.tpl b/WEB-INF/templates/project_delete.tpl
index 98d3e836d..86a4cab3f 100644
--- a/WEB-INF/templates/project_delete.tpl
+++ b/WEB-INF/templates/project_delete.tpl
@@ -1,18 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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/WEB-INF/templates/project_edit.tpl b/WEB-INF/templates/project_edit.tpl
index 2a2364f20..4e3b02e79 100644
--- a/WEB-INF/templates/project_edit.tpl
+++ b/WEB-INF/templates/project_edit.tpl
@@ -1,47 +1,57 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.projectForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="project_name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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="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>
+    <td class="td-with-input">{$forms.projectForm.status.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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>
+  <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>
+    <td class="td-with-checkboxes">{$forms.projectForm.users.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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><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>
+    <td class="td-with-checkboxes">{$forms.projectForm.tasks.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>
 </table>
+<div class="button-set">{$forms.projectForm.btn_save.control} {$forms.projectForm.btn_copy.control}</div>
 {$forms.projectForm.close}
diff --git a/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl
index 92348e7ab..bb40d1430 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -2,109 +2,90 @@
   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 $inactive_projects}<div class="section-header">{$i18n.form.projects.active_projects}</div>{/if}
   {if $active_projects}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
     {if $show_files}
-          <td></td>
+    <th></th>
     {/if}
-          <td></td>
-          <td></td>
-        </tr>
+    <th></th>
+    <th></th>
+  </tr>
     {foreach $active_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
+  <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="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>
-        </tr>
+    <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}
-      </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>
-
+<div class="button-set"><form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form></div>
   {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>
+<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}
-          <td></td>
+    <th></th>
     {/if}
-          <td></td>
-          <td></td>
-        </tr>
+    <th></th>
+    <th></th>
+  </tr>
     {foreach $inactive_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
+  <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="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>
-        </tr>
+    <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>
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form></div>
   {/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>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
     {if $show_files}
-          <td></td>
+    <th></th>
     {/if}
-        </tr>
+  </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>
+  <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>
+  </tr>
     {/foreach}
   {/if}
-      </table>
-{/if}
-    </td>
-  </tr>
 </table>
+{/if}
diff --git a/WEB-INF/templates/puncher.tpl b/WEB-INF/templates/puncher.tpl
new file mode 100644
index 000000000..98bd5ca24
--- /dev/null
+++ b/WEB-INF/templates/puncher.tpl
@@ -0,0 +1,210 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{include file="time_script.tpl"}
+
+<div class="punch-timer"><span id="hour">00</span><span id="separator">:</span><span id="min">00</span></div>
+
+<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_today}
+<script>
+startDate = new Date();
+startDate.setHours({substr($uncompleted_today['start'], 0, 2)});
+startDate.setMinutes({substr($uncompleted_today['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>
+{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 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']}
+    <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">
+<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/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/quotas.tpl b/WEB-INF/templates/quotas.tpl
index 1dba4f239..1c38bb322 100644
--- a/WEB-INF/templates/quotas.tpl
+++ b/WEB-INF/templates/quotas.tpl
@@ -1,47 +1,36 @@
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr><td valign="top">{$i18n.form.quota.hint}</td></tr>
-</table>
+{* 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}
-<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>
+<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>{$i18n.form.quota.year}:</td>
-    <td>{$forms.monthlyQuotasForm.year.control}</td>
+    <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>&nbsp;</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>
-    <td colspan="2">
-      <table>
-        <tr>
-          <td class="tableHeaderCentered">{$i18n.form.quota.month}</td>
-          <td class="tableHeaderCentered">{$i18n.label.quota}</td>
-        </tr>
+    <th>{$i18n.form.quota.month}</th>
+    <th>{$i18n.label.quota}</th>
+  </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>
+    <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>
diff --git a/WEB-INF/templates/register.tpl b/WEB-INF/templates/register.tpl
index d751c9bfa..b8a92e2a9 100644
--- a/WEB-INF/templates/register.tpl
+++ b/WEB-INF/templates/register.tpl
@@ -1,51 +1,64 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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}:</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>
+<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}
+      <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><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>
+  <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><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="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="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="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}
+{$forms.groupForm.close}
\ No newline at end of file
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index b65d0dfa9..b63e505f8 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -1,115 +1,128 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <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}
-<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 -->
+{* 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>
+<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 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>
+  <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><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>
+  {* 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>
 {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 $custom_fields && $custom_fields->userFields}
+{* 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 class="user-header">{$i18n.label.user}</th>{/if}
+  {* 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']}
-      {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$userField['label']|escape}}</td>{/if}
+      {if $bean->getAttribute($checkbox_control_name)}<th>{{$userField['label']|escape}}</th>{/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 $custom_fields && $custom_fields->timeFields}
+  {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}
     {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}
+      {if $bean->getAttribute($checkbox_control_name)}<th>{{$timeField['label']|escape}}</th>{/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>
+  {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 class="note-header">{$i18n.label.note}</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}
+  {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 -->
+  {* 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 $custom_fields && $custom_fields->userFields}
+  <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 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']}
             {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
           {/foreach}
         {/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}
 
-        {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 $custom_fields && $custom_fields->timeFields}
+        {* 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']}
             {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')}
+          {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}
@@ -117,102 +130,120 @@
         {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>
+    <td></td>{* column for edit icons *}
+  </tr>
+  <tr><td colspan="{$colspan+1}">&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 $custom_fields && $custom_fields->userFields}
+    {* 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 fields *}
+    {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}
+        {if $bean->getAttribute($checkbox_control_name)}<td class="text-cell">{$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 $custom_fields && $custom_fields->timeFields}
+    {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}
       {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}
+        {if $bean->getAttribute($checkbox_control_name)}<td class="text-cell">{$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('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')}
+      {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}
+    {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 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>{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 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 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 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}
     {/if}
-      </tr>
+  </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>
+  <tr>
+    <th class="invoice-label">{$i18n.label.note}</th>
+    <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 -->
+  {* 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}
+  <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 $custom_fields && $custom_fields->userFields}
+    {* 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']}
         {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 $custom_fields && $custom_fields->timeFields}
+    {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}
       {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('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="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('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}
@@ -220,40 +251,47 @@
     {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
     {if $bean->getAttribute('chfiles')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
-      </tr>
+    <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>
+  {* print totals *}
+  <tr><td colspan="{$colspan+1}">&nbsp;</td></tr>
+  <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 *}
-    {if $custom_fields && $custom_fields->userFields}
+    {* 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']}
         {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}
+    {* 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 fileds *}
-    {if $custom_fields && $custom_fields->timeFields}
+    {* 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']}
         {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('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 nowrap class="cellRightAlignedSubtotal">{$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}
@@ -261,62 +299,46 @@
     {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
     {if $bean->getAttribute('chfiles')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
-      </tr>
-{/if}
-    </table>
-  </td>
-</tr>
+    <td></td>{* column for edit icons *}
+  </tr>
 </table>
+{/if}
 {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
index 41c625602..485cfc121 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.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.
@@ -67,26 +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");
-
-  // Determine previously selected item.
-  var selected_item = dropdown.options[dropdown.selectedIndex].value;
+  var projectDropdown = document.getElementById("project[]");
+
+  // 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;
-  var project_reset = true;
+  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) {
@@ -96,57 +112,83 @@ 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();
 }
 
 
 // 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.
   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.
+  // 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++;
       }
@@ -187,30 +229,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;
+            }
           }
         }
+      }
     }
   }
 }
@@ -243,217 +315,300 @@ function handleCheckboxes() {
 </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">
+<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">
+  <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 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>
+    <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_project}
-              <tr><td><b>{$i18n.label.project}</b></td></tr>
-              <tr><td>{$forms.reportForm.project.control}</td></tr>
+{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>
+  <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><td><b>{$i18n.form.time.billable}</b></td></tr>
-              <tr><td>{$forms.reportForm.include_records.control}</td></tr>
+  <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_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><td><b>{$i18n.label.paid_status}</b></td></tr>
-              <tr><td>{$forms.reportForm.paid_status.control}</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.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}
-            </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>
+  <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}
 {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>
+  <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><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>
+  <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}
-        <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">
+  <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}
+      <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>
+<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>
-{/if}
-{if $show_task}
-                    <tr><td><label>{$forms.reportForm.chtask.control}&nbsp;{$i18n.label.task}</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_ip}
-                    <tr><td><label>{$forms.reportForm.chip.control}&nbsp;{$i18n.label.ip}</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="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><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>
+  <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_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_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="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_ip}
+  <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_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>
+{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_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>
-{if $custom_fields && $custom_fields->timeFields}
-    <tr><td colspan="3"><b>{$i18n.form.reports.time_fields}</b></td></tr>
+</table>
+<div class="form-control-separator"></div>
+<table class="centered-table">
+{if isset($custom_fields) && $custom_fields->timeFields}
+  <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 $custom_fields && $custom_fields->userFields}
-    <tr><td colspan="3"><b>{$i18n.form.reports.user_fields}</b></td></tr>
+{if isset($custom_fields) && $custom_fields->userFields}
+  <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>
+{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']}
+    {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">
+  <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/WEB-INF/templates/role_add.tpl b/WEB-INF/templates/role_add.tpl
index 6a56fd253..3fb24fee0 100644
--- a/WEB-INF/templates/role_add.tpl
+++ b/WEB-INF/templates/role_add.tpl
@@ -1,33 +1,31 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.roleForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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 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/WEB-INF/templates/role_delete.tpl b/WEB-INF/templates/role_delete.tpl
index 9c85d2208..56c5dfa07 100644
--- a/WEB-INF/templates/role_delete.tpl
+++ b/WEB-INF/templates/role_delete.tpl
@@ -1,20 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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/WEB-INF/templates/role_edit.tpl b/WEB-INF/templates/role_edit.tpl
index 3ad9e6cfe..096716e29 100644
--- a/WEB-INF/templates/role_edit.tpl
+++ b/WEB-INF/templates/role_edit.tpl
@@ -1,45 +1,47 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.roleForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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 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><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><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/WEB-INF/templates/roles.tpl b/WEB-INF/templates/roles.tpl
index 85efc66bd..60985c520 100644
--- a/WEB-INF/templates/roles.tpl
+++ b/WEB-INF/templates/roles.tpl
@@ -1,71 +1,56 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
-<table cellspacing="0" cellpadding="7" border="0" width="720">
+{if $inactive_roles}
+<div class="section-header">{$i18n.form.roles.active_roles}</div>
+{/if}
+<table class="x-scrollable-table">
   <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>
+    <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 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="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>
+  <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>
-
-      <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>
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('role_add.php');" value="{$i18n.button.add}"></form></div>
 
-  {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>
+{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 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="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>
+  <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}
-      </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>
+<div class="button-set"><form><input type="button" onclick="chLocation('role_add.php');" value="{$i18n.button.add}"></form></div>
+{/if}
diff --git a/WEB-INF/templates/site_map.tpl b/WEB-INF/templates/site_map.tpl
new file mode 100644
index 000000000..8688f7677
--- /dev/null
+++ b/WEB-INF/templates/site_map.tpl
@@ -0,0 +1,90 @@
+{if $authenticated}
+  {if $user->can('administer_site')}
+  {* sub menu for admin *}
+<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>
+</div>
+  {* end of sub menu for admin *}
+  {* main menu for admin *}
+<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 *}
+<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}
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
+  <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'))}
+  <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'))}
+  <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'))}
+  <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') || $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>
+    {/if}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
+  <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')))}
+  <div class="sitemap-item"><a href="tasks.php">{$i18n.menu.tasks}</a></div>
+    {/if}
+    {if $user->can('view_users') || $user->can('manage_users')}
+  <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'))}
+  <div class="sitemap-item"><a href="clients.php">{$i18n.menu.clients}</a></div>
+    {/if}
+    {if $user->can('export_data')}
+  <div class="sitemap-item"><a href="export.php">{$i18n.menu.export}</a></div>
+    {/if}
+</div>
+  {* end of sub menu for authorized user *}
+  {* main menu for authorized user *}
+<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')}
+  <div class="sitemap-item"><a href="profile_edit.php">{$i18n.menu.profile}</a></div>
+    {/if}
+    {if $user->can('manage_basic_settings')}
+  <div class="sitemap-item"><a href="group_edit.php">{$i18n.menu.group}</a></div>
+    {/if}
+    {if $user->can('manage_features')}
+  <div class="sitemap-item"><a href="plugins.php">{$i18n.menu.plugins}</a></div>
+    {/if}
+  <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 *}
+<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'}
+  <div class="sitemap-item"><a href="register.php">{$i18n.menu.register}</a></div>
+  {/if}
+  <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/WEB-INF/templates/swap_roles.tpl b/WEB-INF/templates/swap_roles.tpl
index 2d3086329..a858db84b 100644
--- a/WEB-INF/templates/swap_roles.tpl
+++ b/WEB-INF/templates/swap_roles.tpl
@@ -1,15 +1,15 @@
+{* 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 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 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>
+  <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/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/WEB-INF/templates/task_add.tpl b/WEB-INF/templates/task_add.tpl
index d1892709a..d933160af 100644
--- a/WEB-INF/templates/task_add.tpl
+++ b/WEB-INF/templates/task_add.tpl
@@ -1,36 +1,34 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.taskForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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="small-screen-form-control-separator"></div></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>
+  <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>
+    <td class="td-with-checkboxes">{$forms.taskForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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><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.taskForm.btn_submit.control}</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_delete.tpl b/WEB-INF/templates/task_delete.tpl
index 9f16d7c3a..88a33966c 100644
--- a/WEB-INF/templates/task_delete.tpl
+++ b/WEB-INF/templates/task_delete.tpl
@@ -1,20 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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/WEB-INF/templates/task_edit.tpl b/WEB-INF/templates/task_edit.tpl
index 0c2b1a555..c6e433b73 100644
--- a/WEB-INF/templates/task_edit.tpl
+++ b/WEB-INF/templates/task_edit.tpl
@@ -1,40 +1,37 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.taskForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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="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="small-screen-form-control-separator"></div></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><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>
+    <td class="td-with-checkboxes">{$forms.taskForm.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.taskForm.btn_save.control} {$forms.taskForm.btn_copy.control}</div>
 {$forms.taskForm.close}
diff --git a/WEB-INF/templates/tasks.tpl b/WEB-INF/templates/tasks.tpl
index 24fd04380..6bf29d418 100644
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -1,84 +1,75 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
+{$forms.tasksForm.open}
 {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>
-  {/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>
+<div>
+<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>
+</div>
+  {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 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>
-        </tr>
+  <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}
-      </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>
-
+<div class="button-set"><form><input type="button" onclick="chLocation('task_add.php');" value="{$i18n.button.add}"></form></div>
   {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>
+<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 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>
-        </tr>
+  <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>
-
-      <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>
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('task_add.php');" value="{$i18n.button.add}"></form></div>
   {/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>
+<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 bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$task.name|escape}</td>
-          <td>{$task.description|escape}</td>
-        </tr>
+  <tr>
+    <td class="text-cell">{$task.name|escape}</td>
+    <td class="text-cell">{$task.description|escape}</td>
+  </tr>
     {/foreach}
   {/if}
-      </table>
-  {/if}
-    </td>
-  </tr>
 </table>
+{/if}
+{$forms.tasksForm.close}
diff --git a/WEB-INF/templates/template_add.tpl b/WEB-INF/templates/template_add.tpl
index bfd624028..554267b20 100644
--- a/WEB-INF/templates/template_add.tpl
+++ b/WEB-INF/templates/template_add.tpl
@@ -1,37 +1,37 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.templateForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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>&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><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/WEB-INF/templates/template_delete.tpl b/WEB-INF/templates/template_delete.tpl
index 2dc4114aa..a7ca2e75f 100644
--- a/WEB-INF/templates/template_delete.tpl
+++ b/WEB-INF/templates/template_delete.tpl
@@ -1,18 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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/WEB-INF/templates/template_edit.tpl b/WEB-INF/templates/template_edit.tpl
index f4db77878..bdcbb279f 100644
--- a/WEB-INF/templates/template_edit.tpl
+++ b/WEB-INF/templates/template_edit.tpl
@@ -1,41 +1,43 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.templateForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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>&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><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/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
index c1ffff729..b37de3051 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -1,68 +1,69 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<div class="section-header">{$i18n.form.templates.active_templates}</div>
 {/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="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>
-      <table width="100%">
-        <tr><td align="center"><br>{$forms.templatesForm.btn_add.control}</td></tr>
-      </table>
+<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}
-      <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="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>
-      <table width="100%">
-        <tr><td align="center"><br>{$forms.templatesForm.btn_add.control}</td></tr>
-      </table>
+<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}
-      <div class="table-divider"></div>
-      <table width="100%">
+<table class="centered-table">
 {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>
+  <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>
-          <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>
+  <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/time.tpl b/WEB-INF/templates/time.tpl
index d153dc96d..fa24e8062 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -1,228 +1,246 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {include file="time_script.tpl"}
 
-<style>
-.not_billable td {
-  color: #ff6666;
+<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;
 }
-</style>
+</script>
 
-{$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>
+<div class="optional-nav">
+  <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</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}
+
+{$forms.timeRecordForm.open}
+<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 isset($user_dropdown)}
+  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
-    <td valign="top">
-      <table>
-{if $user_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.timeRecordForm.user.control}</td>
-        </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>
-          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
-          <td>{$forms.timeRecordForm.client.control}</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 align="right">&nbsp;</td>
-          <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></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}
+{if isset($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>
+        {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>
-          <td align="right">{$i18n.label.project} (*):</td>
-          <td>{$forms.timeRecordForm.project.control}</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>
-          <td align="right">{$i18n.label.task}{if $user->task_required} (*){/if}:</td>
-          <td>{$forms.timeRecordForm.task.control}</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>
-          <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>
+  <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>
-          <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>
+  <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>
-          <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 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>
-</table>
-
-<table>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if (isset($template_dropdown) && $template_dropdown)}
+  <tr class = "small-screen-label"><td><label for="template">{$i18n.label.template}:</label></td></tr>
   <tr>
-    <td align="right">{$i18n.label.note}:</td>
-    <td align="left">{$forms.timeRecordForm.note.control}</td>
+    <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 align="center" colspan="2">{$forms.timeRecordForm.btn_submit.control}</td>
+    <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>
 
-<table width="720">
-<tr>
-  <td valign="top">
 {if $time_records}
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
+<input type="hidden" id="record_id" name="record_id">
+<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">
+  <tr>
   {if $show_client}
-        <td class="tableHeader">{$i18n.label.client}</td>
+    <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}
-        <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>
+    <th>{$i18n.label.start}</th>
+    <th>{$i18n.label.finish}</th>
   {/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>
+    <th>{$i18n.label.duration}</th>
   {if $show_note_column}
-        <td class="tableHeader">{$i18n.label.note}</td>
+    <th>{$i18n.label.note}</th>
   {/if}
   {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}>
+  <tr{if !$record.billable} class="not-billable"{/if}>
     {if $show_client}
-        <td valign="top">{$record.client|escape}</td>
+    <td class="text-cell">{$record.client|escape}</td>
+    {/if}
+    {* 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']}
+    <td class="text-cell">{$record.$control_name|escape}</td>
+      {/foreach}
     {/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 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}
-    {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>
+    <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 valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+    <td class="text-cell">{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><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><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 id={$record.id}>
     {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="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="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>
-        <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="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>
+    </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 class="note-header-cell">{$i18n.label.note}:</td>
+    <td colspan="{$colspan}" class="text-cell">{$record.comment|escape}</td>
+  </tr>
     {/if}
   {/foreach}
-    </table>
-{/if}
-  </td>
-</tr>
 </table>
+</div>
+{/if}
+{$forms.timeRecordForm.close}
 
-<table cellpadding="3" cellspacing="1" width="720">
+<div class="day-totals">
+<table class="centered-table">
   <tr>
-    <td align="left">{$i18n.label.week_total}: {$week_total}</td>
-    <td align="right">{$i18n.label.day_total}: {$day_total}</td>
+    <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')}
+{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_balance}
-    <td align="right">{$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 align="right">{$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 align="left">{$i18n.label.quota}: {$month_quota}</td>
+    <td class="day-totals-col1">{$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>
+    <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}
+{/if}
 </table>
-
-{$forms.timeRecordForm.close}
+</div>
diff --git a/WEB-INF/templates/time_delete.tpl b/WEB-INF/templates/time_delete.tpl
index 41b7a4e97..59d9039d1 100644
--- a/WEB-INF/templates/time_delete.tpl
+++ b/WEB-INF/templates/time_delete.tpl
@@ -1,50 +1,40 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-<tr>
-  <td>
-  <table border='0' cellpadding='3' cellspacing='1' width="100%">
+<table class="centered-table">
   <tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <td class="tableHeader" align="center">{$i18n.label.project}</td>
+{if $show_project}
+    <th>{$i18n.label.project}</th>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <td class="tableHeader" align="center">{$i18n.label.task}</td>
+{if $show_task}
+    <th>{$i18n.label.task}</th>
 {/if}
-{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
-    <td class="tableHeader" align="center">{$i18n.label.start}</td>
-    <td class="tableHeader" align="center">{$i18n.label.finish}</td>
+{if $show_start}
+    <th>{$i18n.label.start}</th>
+    <th>{$i18n.label.finish}</th>
 {/if}
-{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
-    <td class="tableHeader" align="center">{$i18n.label.duration}</td>
+{if $show_duration}
+    <th>{$i18n.label.duration}</th>
 {/if}
-    <td class="tableHeader" align="center">{$i18n.label.note}</td>
+    <th>{$i18n.label.note}</th>
   </tr>
   <tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <td>{$time_rec.project_name|escape}</td>
+{if $show_project}
+    <td class="text-cell">{$time_rec.project_name|escape}</td>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <td>{$time_rec.task_name|escape}</td>
+{if $show_task}
+    <td class="text-cell">{$time_rec.task_name|escape}</td>
 {/if}
-{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
-    <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 $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 (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
-    <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 $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>{if $time_rec.comment}{$time_rec.comment|escape}{else}&nbsp;{/if}</td>
+    <td class="text-cell">{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>
+<div class="button-set">{$forms.timeRecordForm.delete_button.control}&nbsp;{$forms.timeRecordForm.cancel_button.control}</div>
 {$forms.timeRecordForm.close}
diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index 5b0e3e2de..8425965b9 100644
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -1,7 +1,10 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+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}";
 
@@ -15,94 +18,99 @@ function confirmSave() {
 {/if}
 
 {$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-  <table width = "100%">
+<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 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.timeRecordForm.client.control}</td>
-    </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 $user->isPluginEnabled('iv')}
-    <tr>
-      <td align="right">&nbsp;</td>
-      <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
-    </tr>
+{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 ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
-    <tr>
-      <td align="right">&nbsp;</td>
-      <td><label>{$forms.timeRecordForm.paid.control}{$i18n.label.paid}</label></td>
-    </tr>
+{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}
+{if isset($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>
+    {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 ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <tr>
-      <td align="right">{$i18n.label.project} (*):</td>
-      <td>{$forms.timeRecordForm.project.control}</td>
-    </tr>
+{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 ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-    <tr>
-      <td align="right">{$i18n.label.task}{if $user->task_required} (*){/if}:</td>
-      <td>{$forms.timeRecordForm.task.control}</td>
-    </tr>
+{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 (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
-    <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 $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 (($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>
-    </tr>
+{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>
-      <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>
+  <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 (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>
+    <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>
-      <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 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/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 463ab4f72..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,31 +37,28 @@ 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();
-{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) {
@@ -141,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.
 
@@ -153,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) {
@@ -177,17 +172,19 @@ 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->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}
   }
 }
 
 // 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}
 
@@ -232,7 +229,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");
@@ -252,20 +249,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;
@@ -274,9 +285,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";
@@ -295,7 +308,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);
@@ -310,4 +323,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/WEB-INF/templates/timesheet_add.tpl b/WEB-INF/templates/timesheet_add.tpl
index f4becf7f5..f69a8ff74 100644
--- a/WEB-INF/templates/timesheet_add.tpl
+++ b/WEB-INF/templates/timesheet_add.tpl
@@ -1,49 +1,48 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.timesheetForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="timesheet_name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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>
-          <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>
+  <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>
-          <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 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/WEB-INF/templates/timesheet_delete.tpl b/WEB-INF/templates/timesheet_delete.tpl
index 87928052e..a3e7b7312 100644
--- a/WEB-INF/templates/timesheet_delete.tpl
+++ b/WEB-INF/templates/timesheet_delete.tpl
@@ -1,18 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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_edit.tpl b/WEB-INF/templates/timesheet_edit.tpl
index ec1123608..62cf01a8c 100644
--- a/WEB-INF/templates/timesheet_edit.tpl
+++ b/WEB-INF/templates/timesheet_edit.tpl
@@ -1,34 +1,28 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.timesheetForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="timesheet_name">{$i18n.label.thing_name} (*):</label></td></tr>
   <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>
+    <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/WEB-INF/templates/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 77cc78bd5..a7d8b0e14 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -1,84 +1,82 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <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>
+<div class="invoice-header">{$timesheet['name']|escape}</div>
+<table class="centered-table">
 {if $user->behalfUser}
-        <tr><td align="left"><b>{$i18n.label.user}:</b> {$timesheet['user_name']|escape}</td></tr>
+  <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><td align="left"><b>{$i18n.label.client}:</b> {$timesheet['client_name']|escape}</td></tr>
+  <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><td align="left"><b>{$i18n.label.project}:</b> {$timesheet['project_name']|escape}</td></tr>
+  <tr>
+    <th class="invoice-label">{$i18n.label.project}:</th>
+    <td class="text-cell">{$timesheet['project_name']|escape}</td>
+  </tr>
 {/if}
 {if $timesheet['comment']}
-        <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['comment']|escape}</td></tr>
+  <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><td align="left"><b>{$i18n.label.submitted}:</b> {if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
+  <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><td align="left"><b>{$i18n.label.approved}:</b> {if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
+  <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><td align="left"><b>{$i18n.label.note}:</b> {$timesheet['approve_comment']|escape}</td></tr>
-{/if}
-      </table>
-    </td>
+  <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>
-    <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>
+    <th>{$group_by_header|escape}</th>
+    <th>{$i18n.label.duration}</th>
+  </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>
+    <td class="text-cell">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
+    <td class="time-cell">{$subtotal['time']}</td>
   </tr>
-  </table>
-  {/if}
-  {if $show_approve}
-  <table width="720" cellspacing="0" cellpadding="0" border="0">
+  {/foreach}
   <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>
+    <th class="invoice-label">{$i18n.label.total}:</th>
+    <td class="time-cell">{$totals['time']}</td>
   </tr>
-  </table>
-  {/if}
-{$forms.timesheetForm.close}
+</table>
 
-    </td>
-  </tr>
+{$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/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index a5e893e59..2bd927369 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -1,107 +1,104 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <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}
+<table class="centered-table">
+{if isset($user_dropdown)}
+  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <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>
+    <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>
 {/if}
-          <td class="tableHeader">{$i18n.label.submitted}</td>
-          <td class="tableHeader">{$i18n.label.approved}</td>
-{if $show_files}
-          <td></td>
+</table>
+{$forms.timesheetsForm.close}
+<div class="form-control-separator"></div>
+{if $inactive_timesheets}
+<div class="section-header">{$i18n.form.timesheets.active_timesheets}</div>
 {/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>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
   {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>
+    <th>{$i18n.label.client}</th>
   {/if}
+    <th>{$i18n.label.submitted}</th>
+    <th>{$i18n.label.approved}</th>
   {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}
+    <th></th>
   {/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>
-{/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>
-
+    <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>
+<div class="button-set"><form><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.add}"></form></div>
 {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>
+<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}
-          <td class="tableHeader">{$i18n.label.client}</td>
+    <th>{$i18n.label.client}</th>
   {/if}
-          <td class="tableHeader">{$i18n.label.submitted}</td>
-          <td class="tableHeader">{$i18n.label.approved}</td>
+    <th>{$i18n.label.submitted}</th>
+    <th>{$i18n.label.approved}</th>
   {if $show_files}
-          <td></td>
+    <th></th>
   {/if}
-          <td></td>
-          <td></td>
-        </tr>
+    <th></th>
+    <th></th>
+  </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>
+  <tr>
+    <td class="text-cell"><a href="timesheet_view.php?id={$timesheet.id}">{$timesheet.name|escape}</a></td>
     {if $show_client}
-          <td>{$timesheet.client_name|escape}</td>
+    <td class="text-cell">{$timesheet.client_name|escape}</td>
     {/if}
-          <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+    <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>
+    <td></td>
     {else}
-          <td>{if $timesheet.approve_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}
     {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>
-        </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>
+    <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>
-{$forms.timesheetsForm.close}
+<div class="button-set"><form><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.add}"></form></div>
+{/if}
diff --git a/WEB-INF/templates/user_add.tpl b/WEB-INF/templates/user_add.tpl
index 35040f3c4..7275b645e 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.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.
@@ -16,7 +19,7 @@ function setDefaultRate(element) {
     // No default rate, nothing to do!
     return;
   }
-  // Iterate through elements of the form to find and set the project rate. 
+  // 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) {
@@ -29,11 +32,12 @@ 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");
   var nonClientBlock = document.getElementById("non_client_block");
   var projectsControl = document.getElementById("projects_control");
 
@@ -42,7 +46,7 @@ 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";
 
@@ -54,7 +58,7 @@ function handleClientControl() {
         }
       } else {
         clientControl.value = "";
-        clientControl.style.visibility = "hidden";
+        clientBlock.style.display = "none";
         nonClientBlock.style.display = "";
         projectsControl.style.display = "";
       }
@@ -65,70 +69,100 @@ function handleClientControl() {
 </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>
+<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>
-      <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>
+  <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>
+  <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>
+{if $user->isPluginEnabled('cl')}
+<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>
 {/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>
+  <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}
+{if isset($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>
+        {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>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
+  <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><td>&nbsp;</td></tr>
-    <tr valign="top">
-      <td align="right">{$i18n.label.projects}:</td>
-      <td>{$forms.userForm.projects.control}</td>
-    </tr>
+  <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.userForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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>
+  <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.userForm.btn_submit.control}</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_delete.tpl b/WEB-INF/templates/user_delete.tpl
index e85d97f1f..63e9f795f 100644
--- a/WEB-INF/templates/user_delete.tpl
+++ b/WEB-INF/templates/user_delete.tpl
@@ -1,20 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<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/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 49fa4ae50..e4d916a5c 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.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.
@@ -38,7 +41,7 @@ function setRate(element) {
     // No default rate, nothing to do!
     return;
   }
-  // Iterate through elements of the form to find and set the project rate. 
+  // 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) {
@@ -51,11 +54,16 @@ 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() {
-  var selectedRoleId = document.getElementById("role").value;
+// handleClientRole - manages visibility and content of controls related to client role,
+// also hides and unselects projects when client role is selected.
+function handleClientRole() {
+  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");
   var projectsControl = document.getElementById("projects_control");
 
@@ -64,7 +72,7 @@ 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";
 
@@ -76,7 +84,7 @@ function handleClientControl() {
         }
       } else {
         clientControl.value = "";
-        clientControl.style.visibility = "hidden";
+        clientBlock.style.display = "none";
         nonClientBlock.style.display = "";
         projectsControl.style.display = "";
       }
@@ -87,82 +95,116 @@ function handleClientControl() {
 </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>
+<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>
-      <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>
+  <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>
-      <td align="right" nowrap>{$i18n.label.email}:</td>
-      <td>{$forms.userForm.email.control}</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.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>
+  <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>
+{if $user->isPluginEnabled('cl')}
+<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>
+{/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>
+    <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>
-      <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>
+  <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>
-      <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>
+  <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}
+{if isset($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>
+        {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>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
+  <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><td>&nbsp;</td></tr>
-    <tr valign="top">
-      <td align="right">{$i18n.label.projects}:</td>
-      <td>{$forms.userForm.projects.control}</td>
-    </tr>
+  <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.userForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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>
+  <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.userForm.btn_submit.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 {$forms.userForm.close}
diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index 401751fcb..2a226238d 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -1,121 +1,106 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <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 $inactive_users}<div class="section-header">{$i18n.label.active_users}</div>{/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>
+<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}
-          <td class="tableHeader">{$i18n.label.quota}</td>
+     <th>{$i18n.label.quota}</th>
     {/if}
-          <td></td>
-          <td></td>
-        </tr>
+    <th></th>
+    <th></th>
+  </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>
+  <tr>
+    <td class="text-cell">
+      {if isset($uncompleted_indicators) && $uncompleted_indicators}
+        {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>
-          <td>{$u.login|escape}</td>
-          <td>{$u.role_name|escape}</td>
+      {$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="cellRightAligned">{$u.quota_percent}</td>
+    <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="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>
+    <td></td>
+    <td></td>
       {/if}
-        </tr>
+  </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>
-
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form></div>
   {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>
+<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}
-          <td class="tableHeader">{$i18n.label.quota}</td>
+    <th>{$i18n.label.quota}</th>
     {/if}
-          <td></td>
-          <td></td>
-        </tr>
+    <th></th>
+    <th></th>
+  </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>
+  <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="cellRightAligned">{$u.quota_percent}</td>
+    <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="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>
+    <td></td>
+    <td></td>
       {/if}
-        </tr>
+  </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>
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form></div>
   {/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>
+<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 bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>
+  <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>
+      <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}
+      {$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/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index fbf512ceb..6032d4eb5 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {include file="time_script.tpl"}
 
 <script>
@@ -15,192 +18,182 @@ 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>
+</div>
+{/if}
 
 {$forms.weekTimeForm.open}
-<table cellspacing="4" cellpadding="0" border="0">
-{if $show_navigation}
+<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 isset($user_dropdown)}
+  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <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>
+    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
+    <td class="td-with-input">{$forms.weekTimeForm.user.control}</td>
   </tr>
-{/if}
-  <tr>
-    <td valign="top">
-      <table>
-{if $on_behalf_control}
-        <tr>
-          <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.weekTimeForm.onBehalfUser.control}</td>
-        </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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>
+  <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}
-{if $user->isPluginEnabled('iv')}
-        <tr>
-          <td align="right">&nbsp;</td>
-          <td><label>{$forms.weekTimeForm.billable.control}{$i18n.form.time.billable}</label></td>
-        </tr>
+{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 $custom_fields && $custom_fields->timeFields}
+{if isset($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>
+    {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>
-          <td align="right">{$i18n.label.project} (*):</td>
-          <td>{$forms.weekTimeForm.project.control}</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.weekTimeForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_task}
-        <tr>
-          <td align="right">{$i18n.label.task}:</td>
-          <td>{$forms.weekTimeForm.task.control}</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.weekTimeForm.task.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></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 class = "small-screen-label"><td><label for="comment">{$i18n.label.week_note}:</label></td></tr>
+  <tr>
+    <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>
-
-<table>
+<div class="form-control-separator"></div>
+<table class="x-scrollable-table">
   <tr>
-    <td align="center" colspan="2">{$forms.weekTimeForm.btn_submit.control}</td>
+    <td>{$forms.weekTimeForm.week_durations.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>
-  {if $user->isPluginEnabled('cl')}
-        <td width="20%" class="tableHeader">{$i18n.label.client}</td>
+<div class="form-control-separator"></div>
+<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}
-  {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 $show_project}
+    <th>{$i18n.label.project}</th>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td class="tableHeader">{$i18n.label.task}</td>
+  {if $show_task}
+    <th>{$i18n.label.task}</th>
   {/if}
-  {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
-        <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
-        <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
+  {if $show_start}
+    <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>
-    {if $user->isPluginEnabled('cl')}
-        <td valign="top">{$record.client|escape}</td>
+  <tr {if !$record.billable}class="not-billable"{/if}>
+    <td class="date-cell">{$record.date}</td>
+    {* 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']}
+    <td class="text-cell">{$record.$control_name|escape}</td>
+      {/foreach}
+    {/if}
+    {if $show_client}
+    <td class="text-cell">{$record.client|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 $show_project}
+    <td class="text-cell">{$record.project|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td valign="top">{$record.task|escape}</td>
+    {if $show_task}
+    <td class="text-cell">{$record.task|escape}</td>
     {/if}
-    {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
-        <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 $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 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="images/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="images/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">
-    {if $record.approved || $record.timesheet_id || $record.invoice_id}
-          &nbsp;
+    <td>
+    {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="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}
+      <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;
+    </td>
+    <td>
+    {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="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>
+    </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>
+</div>
 {/if}
-{$forms.weekTimeForm.close}
diff --git a/WEB-INF/templates/week_view.tpl b/WEB-INF/templates/week_view.tpl
index 17b02cb4e..9cd7b90a2 100644
--- a/WEB-INF/templates/week_view.tpl
+++ b/WEB-INF/templates/week_view.tpl
@@ -1,27 +1,53 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$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>
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="week_menu">{$i18n.label.menu}:</label></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>
+    <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>
+    </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 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>
+    <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 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>
+    <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 colspan="2">&nbsp;</td>
+    <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>
+  <tr class = "small-screen-label"><td><label for="weekends">{$i18n.label.weekends}:</label></td></tr>
   <tr>
-    <td colspan="2" height="50" align="center">{$forms.weekViewForm.btn_save.control}</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>
+    </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/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 39050ab3e..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="../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
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/header.tpl b/WEB-INF/templates/work/header.tpl
deleted file mode 100644
index 084870958..000000000
--- a/WEB-INF/templates/work/header.tpl
+++ /dev/null
@@ -1,207 +0,0 @@
-<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
deleted file mode 100644
index 6817f3963..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="footer.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 3397dc6a1..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="../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
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/WEB-INF/templates/work_units.tpl b/WEB-INF/templates/work_units.tpl
index a4fb6b578..a2b5626f5 100644
--- a/WEB-INF/templates/work_units.tpl
+++ b/WEB-INF/templates/work_units.tpl
@@ -1,22 +1,35 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.workUnitsForm.open}
-<table cellspacing="1" cellpadding="2" border="0">
+<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>{$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>
+    <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>{$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>
+    <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 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>
+    <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>
-{$forms.weekViewForm.close}
+<div class="button-set">{$forms.workUnitsForm.btn_save.control}</div>
+{$forms.workUnitsForm.close}
diff --git a/access_denied.php b/access_denied.php
index 72a28d192..80900d570 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/admin_group_add.php b/admin_group_add.php
index c42644f09..9aeff1831 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');
@@ -38,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');
@@ -70,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));
@@ -91,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())
diff --git a/admin_group_delete.php b/admin_group_delete.php
index 944500195..909b2347a 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');
@@ -37,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 ee639d042..496c7b8fb 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');
@@ -38,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/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..aed852320 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');
@@ -38,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'));
@@ -71,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/cf_custom_field_add.php b/cf_custom_field_add.php
index 961bdd69a..87d46bcd5 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');
@@ -39,23 +15,21 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$fields = CustomFields::getFields();
 // End of access checks.
 
 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');
 $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'))
+                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'),
@@ -67,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/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..582794ae5 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');
@@ -50,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_delete.php b/cf_dropdown_option_delete.php
index 999094e53..50c685014 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,9 +15,9 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$cl_id = $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
 $option = CustomFields::getOptionName($cl_id);
-if (!$option) {
+if ($option == null) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index 4f1103d7b..2477b057c 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,9 +15,9 @@
   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) {
+if ($cl_name == null) {
   header('Location: access_denied.php');
   exit();
 }
@@ -49,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/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');
diff --git a/charts.php b/charts.php
index 942b5ce7b..9dbb95c70 100644
--- a/charts.php
+++ b/charts.php
@@ -1,44 +1,23 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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.
 
 require_once('initialize.php');
 import('form.Form');
-import('DateAndTime');
+import('ttDate');
 import('ttChartHelper');
 import('ttUserConfig');
 import('PieChartEx');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttFavReportHelper');
+
+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();
 }
@@ -50,7 +29,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();
 }
@@ -58,21 +37,34 @@
   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'); // Reused below access checks.
 if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid($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();
   }
 }
+$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.
-$userChanged = $request->getParameter('user_changed');
-if ($request->isPost() && $userChanged) {
-  $user_id = $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();
@@ -81,55 +73,110 @@
 // 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;
 
 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_fav_report = (int)$request->getParameter('favorite_report');
+  if (!$cl_fav_report) $cl_fav_report = -1;
+  $_SESSION['fav_report'] = $cl_fav_report;
 
-  $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);
-} else {
-  // Initialize chart interval.
-  $cl_interval = $_SESSION['chart_interval'];
-  if (!$cl_interval) $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
+
+  // Remember all users selection in session.
+  $_SESSION['chart_all_users'] = $userDropdownSelectionId == constant('ALL_USERS_OPTION_ID') ? true : false;
+
+  $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'];
+  $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;
+
+  // Set user selection to all users, if necessary.
+  $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.
+$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;
 
-// User dropdown. Changes the user "on behalf" of whom we are working. 
-if ($user->can('view_charts')) {
+// 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());
   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'),
     ));
     $chart_form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $largeScreenCalendarRowSpan += 2;
     $smarty->assign('user_dropdown', 1);
   }
 }
@@ -139,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');
 
@@ -149,32 +197,16 @@
   '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
-  ));
-}
+$largeScreenCalendarRowSpan += 2;
 
 // 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);
+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.
@@ -196,13 +228,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,8 +251,10 @@
 $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();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/client_add.php b/client_add.php
index 820a32fde..f1f45333e 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');
@@ -43,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'));
@@ -57,8 +35,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));
diff --git a/client_delete.php b/client_delete.php
index a5f00656e..e832c6bcb 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');
diff --git a/client_edit.php b/client_edit.php
index 7b572ea7c..665fda15e 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');
@@ -50,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'));
@@ -72,8 +49,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'))));
@@ -87,6 +64,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/clients.php b/clients.php
index a299d3061..309eb155a 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');
diff --git a/cron.php b/cron.php
index 337f96aef..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.
@@ -47,7 +23,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 +70,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/custom_css.php b/custom_css.php
new file mode 100644
index 000000000..9aa287321
--- /dev/null
+++ b/custom_css.php
@@ -0,0 +1,10 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// 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/dbinstall.php b/dbinstall.php
index f596a05e6..44fede0cd 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');
@@ -115,13 +91,22 @@ 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.
-  if (version_compare(phpversion(), $required_version, '>=')) {
-    echo('PHP version: '.phpversion().', good enough.<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 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 {
-    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.
@@ -195,13 +180,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();
@@ -211,7 +200,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);
@@ -225,7 +214,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");
@@ -239,7 +228,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`");
@@ -254,7 +243,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";
@@ -291,15 +280,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
@@ -326,7 +315,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");
@@ -431,7 +420,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.
@@ -528,7 +517,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");
@@ -635,7 +624,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");
@@ -653,7 +642,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);
@@ -691,10 +680,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.
-  if ($_POST['update_custom_fields']) {
+  // The update_custom_fields function updates option_id field in tt_custom_field_log table.
+  if (array_key_exists('update_custom_fields', $_POST)) {
     $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());
@@ -703,7 +692,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);
@@ -713,7 +702,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");
@@ -761,7 +750,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`");
@@ -804,7 +793,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();
@@ -843,7 +832,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");
@@ -948,7 +937,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)";
@@ -994,7 +983,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`");
@@ -1161,7 +1150,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 (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')");
@@ -1188,9 +1177,32 @@ 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'");
+    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'");
+    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'");
+    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'");
+    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"]) {
+  if (array_key_exists('cleanup', $_POST)) {
     $mdb2 = getConnection();
     $inactive_orgs = ttOrgHelper::getInactiveOrgs();
 
@@ -1201,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");
@@ -1212,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");
@@ -1238,7 +1258,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.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>
@@ -1287,8 +1307,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.22.3)</td>
+    <td><input type="submit" name="convert11900to12203" value="Update"></td>
   </tr>
 </table>
 
diff --git a/default.css b/default.css
index 77559c330..d1a77ebd8 100644
--- a/default.css
+++ b/default.css
@@ -1,32 +1,629 @@
-/*
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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;
+  font-size: 10pt;
+  font-family: Verdana, sans-serif;
+  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;
+}
+
+/* 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;
+}
+
+/* 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;
+}
+
+/* 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;
+  color: silver;
+  text-align: center;
+  padding: .25rem;
+  border-bottom: 1px solid lightgray;
+  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: .5rem;
+}
+
+/* project rate table for user add and user edit pages */
+.project-rate-table {
+  width: 300px;
+  border-collapse: collapse;
+}
+
+.project-rate-table td {
+  padding: .2rem;
+}
+
+/* a table to display controls centered horizontally */
+.centered-table {
+  display: inline-block;
+  margin-top: .5rem;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+/* a table to hold things that may not fit into available screen width */
+.x-scrollable-table {
+  display: inline-block;
+  margin-top: .5rem;
+  margin-left: auto;
+  margin-right: auto;
+  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-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; }
+  /* 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;
+  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}
+
+/* a text cell in tables */
+.text-cell {
+  text-align: left;
+}
+
+/* time cell in tables */
+.time-cell {
+  text-align: right;
+}
+
+/* number cell in tables */
+.number-cell {
+  text-align: right;
+}
+
+/* date cell in tables */
+.date-cell {
+  white-space: nowrap;
+}
+
+/* money value cell in tables */
+.money-value-cell {
+  text-align: right;
+  white-space: nowrap;
+}
+
+/* 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;
+}
+
+/* cell containing text labels */
+.label-cell {
+  text-align: right;
+}
+
+/* cell containign a subtotal */
+.subtotal-cell {
+  font-weight: bold;
+}
+
+/* control labels for large screens */
+.large-screen-label {
+  text-align: right;
+  vertical-align: middle;
+  display: table-cell;
+}
+
+/* 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;
+}
+
+/* list of items displayed in a chart on small screens */
+.small-screen-chart-items-list {
+  display: none;
+}
+
+/* a div to display a chart in */
+div.chart {
+  padding-left: 1rem;
+  padding-right: 1rem;
+}
+
+/* a table to annotate items from chart picture */
+.chart-items-list-table {
+  border-spacing: .2rem;
+}
+
+/* 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;
+}
+
+/* input controls with focus on them */
+.page-content input:focus {
+  background-color: yellow;
+  border: 1px solid black;
+  outline: none;
+}
+
+/* a table cell containing input control */
+.td-with-input {
+  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;
+  width: 300px;
+}
+
+/* div containing how to contribute message */
+div.contribute-msg {
+  text-align: center;
+  margin-top: 2rem;
+  padding: .2rem;
+  background-color: #eeeeee;
+}
+
+/* div containing app version and copyright info */
+div.version-and-copyright {
+  text-align: center;
+  padding: .5rem;
+}
+
+/* img in td in centered-table, ex: now icons */
+.centered-table td img {
+  vertical-align: middle;
+}
+
+/* span for what is it icon image */
+span.what-is-it-img {
+  display: none;
+}
+
+/* span for what is it text */
+span.what-is-it-text {
+  display: inline-block;
+  vertical-align: middle;
+}
+
+/* span for what format example */
+span.format-example {
+  color: #777777;
+}
+
+/* buttons */
+input[type="submit"], input[type="button"] {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+}
+
+/* input controls */
+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;
+}
+
+/* project rate input control */
+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;
+}
+
+/* dropdown control with an associated format example */
+.dropdown-field-with-format-example {
+  width: 136px;
+}
+
+/* dropdown control with an associated button */
+.dropdown-field-with-button {
+  width: 136px;
+}
+
+/* a short dropdown control for small strings */
+.dropdown-field-short {
+  width: 85px;
+}
+
+/* textareas for fields */
+#description, #address, #item_name, #comment, #custom_css, #custom_translation, #content {
+  width: 220px;
+  border-radius: 4px;
+  border: 1px solid #c9c9c9;
+  padding: .4rem;
+}
+
+/* textareas with 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;
+}
+
+/* textarea for note field */
+#note {
+  width: 100%;
+  margin: 0;
+  height: 4rem;
+  resize: none;
+  border-radius: 4px;
+  border: 1px solid #c9c9c9;
+  padding: .4rem;
+}
+
+/* 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;
+  margin-top: 1rem;
+  margin-left: auto;
+  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;
+  padding-left: 1rem;
+  margin-top: 1rem;
+}
+
+/* label for checkboxes */
+.checkbox-label {
+  float: left;
+}
+
+/* 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: red;
+}
+
+/* remaining quota span */
+span.remaining-quota {
+  color: red;
+}
+
+/* remaining quota balance span */
+span.remaining-quota-balance {
+  color: red;
+}
+
+/* over quota span */
+span.over-quota {
+  color: green;
+}
+
+/* over quota balance span */
+span.over-quota-balance {
+  color: green;
+}
+
+/* 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 div */
+div.section-header {
+  font-weight: bold;
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: .5rem;
+  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;
+  margin-bottom: 2rem;
+}
+
+/* div for a single item in site map */
+div.sitemap-item {
+  margin: .4rem;
+}
+
+div.punch-timer {
+  font-size: 2rem;
+  color: blue;
+}
+
+/* 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;
+  }
+
+  /* show what is it icons */
+  span.what-is-it-img {
+    display: inline-block;
+  }
+
+  /* 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;
+  }
+}
+
+/* TODO: below are legacy styles. Review as work on mobile-friendly pages continues. */
 a { color: blue; text-decoration: none; }
 
 a:visited { text-decoration: none; }
@@ -63,23 +660,94 @@ 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 {
   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;
@@ -150,8 +818,6 @@ input[type=checkbox], label {
 
 div.table-divider { height: 30px; }
 
-div#LoginAboutText { width: 400px; }
-
 .uncompleted-entry {
   display: inline-block;
   height: 8px;
@@ -159,8 +825,10 @@ div#LoginAboutText { width: 400px; }
   border: 1px solid rgba(0, 0, 0, .1);
   border-radius: 50%;
   background-color: rgba(0, 0, 0, .1);
+  margin-right: .25em;
 }
-.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/display_options.php b/display_options.php
index d65f15ab3..e0b7bc987 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,11 +16,23 @@
 $config = $user->getConfigHelper();
 
 if ($request->isPost()) {
-  $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');
+  $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_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');
+  $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();
+  $cl_custom_translation = $user->getCustomTranslation();
 }
 
 $form = new Form('displayOptionsForm');
@@ -58,20 +46,38 @@
 // $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));
+$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.
 $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));
+$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()) {
     // 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()))) {
+    $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,
+      'custom_translation' => $cl_custom_translation))) {
       header('Location: success.php');
       exit();
     } else
diff --git a/expense_delete.php b/expense_delete.php
index 788fb59fa..6dbf421a9 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -1,34 +1,10 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
-import('DateAndTime');
+import('ttDate');
 import('ttExpenseHelper');
 
 // Access checks.
@@ -54,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/expense_edit.php b/expense_edit.php
index 3cebac129..98098a19f 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -1,37 +1,13 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
 import('ttGroupHelper');
-import('DateAndTime');
 import('ttTimeHelper');
 import('ttExpenseHelper');
+import('ttDate');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
@@ -45,20 +21,29 @@
 $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');
   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']);
+$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;
 
 // 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');
@@ -66,14 +51,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'.
@@ -85,7 +70,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,16 +82,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'))));
 
   // 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. 
+    // 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 +108,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 +120,13 @@
     $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'));
 }
-$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));
@@ -169,12 +150,14 @@
   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->getConfigOption('future_entries')) {
-    $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-    if ($new_date->after($browser_today))
+  if (!$user->isOptionEnabled('future_entries')) {
+    $browser_today = new ttDate($request->getParameter('browser_today', null));
+    $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'));
@@ -197,9 +180,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();
       }
     }
@@ -213,9 +196,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'));
@@ -237,7 +220,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_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/expense_files.php b/expense_files.php
index feab9b611..7fe2a5d1a 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()) {
diff --git a/expenses.php b/expenses.php
index 2b7a15bc4..3cbbd8bec 100644
--- a/expenses.php
+++ b/expenses.php
@@ -1,36 +1,12 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
 import('ttUserHelper');
 import('ttGroupHelper');
-import('DateAndTime');
+import('ttDate');
 import('ttTimeHelper');
 import('ttExpenseHelper');
 import('ttFileHelper');
@@ -57,17 +33,32 @@
   exit();
 }
 if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid($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();
   }
 }
+// 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');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // 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();
@@ -75,13 +66,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');
@@ -96,6 +86,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 +99,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 +114,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 +127,17 @@
   $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.
+  $client_list = array();
   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 +154,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 +167,21 @@
   $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'));
+  $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')));
@@ -193,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'));
@@ -202,12 +202,13 @@
     if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
 
     // Prohibit creating entries in future.
-    if (!$user->getConfigOption('future_entries')) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
+    if (!$user->isOptionEnabled('future_entries')) {
+      $browser_today = new ttDate($request->getParameter('browser_today', null));
+      $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'));
     }
-    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating input data.
 
     // Prohibit creating entries in locked range.
@@ -237,6 +238,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);
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/feature_disabled.php b/feature_disabled.php
index 7f0bb81f5..d15413541 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');
 
diff --git a/file_delete.php b/file_delete.php
index ff56f118b..e6cb53378 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');
diff --git a/file_download.php b/file_download.php
index ac076b27e..2fb52f79b 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/file_edit.php b/file_edit.php
index d2c8f2990..aeb8f70c7 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()) {
diff --git a/group_add.php b/group_add.php
index f39ec016c..6f88af205 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');
@@ -37,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'));
@@ -44,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()) {
diff --git a/group_advanced_edit.php b/group_advanced_edit.php
index 03c7711a2..26134c789 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');
@@ -40,24 +16,31 @@
 // End of access checks.
 
 $group = ttGroupHelper::getGroupAttrs($user->getGroup());
+$config = $user->getConfigHelper();
 
 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'));
+  $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');
-$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));
+$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')));
 
@@ -67,15 +50,22 @@
     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 (!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()) {
+      // 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))) {
+        'allow_ip' => $cl_allow_ip,
+        'password_complexity' => $cl_password_complexity,
+        'config' => $config->getConfig()))) {
         header('Location: success.php');
         exit();
       } else
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 c4fdc2174..dbfca56bb 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');
@@ -38,9 +14,9 @@
 //   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) {
@@ -63,9 +39,12 @@
 // 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);
+ $user->setOnBehalfGroup($group_id); // User changed the group in a post using group selector on group_edit.php.
+}
+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.
 }
 
 $groups = $user->getGroupsForDropdown();
@@ -85,15 +64,15 @@
   $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');
-  $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_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');
+  $cl_confirm_save = (bool)$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'];
@@ -102,9 +81,9 @@
   $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_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');
@@ -117,7 +96,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')));
@@ -142,10 +120,10 @@
   $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,
+$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(
@@ -154,12 +132,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.
@@ -167,7 +145,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));
@@ -177,20 +155,22 @@
 $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','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();
 $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));
 
+// 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));
 
@@ -225,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);
@@ -241,7 +222,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 +235,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/groups.php b/groups.php
index f335153ce..ca01a5f7c 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');
@@ -35,14 +11,21 @@
   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.
 
 if ($request->isPost()) {
-  $group_id = $request->getParameter('group');
+  $group_id = (int)$request->getParameter('group');
   $user->setOnBehalfGroup($group_id);
 } else {
   $group_id = $user->getGroup();
@@ -54,7 +37,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'this.form.submit();',
     'name'=>'group',
-    'style'=>'width: 250px;',
     'value'=>$group_id,
     'data'=>$groups,
     'datakeys'=>array('id','name')));
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/img/icon-now.png b/img/icon-now.png
new file mode 100644
index 000000000..44cd60462
Binary files /dev/null and b/img/icon-now.png differ
diff --git a/img/icon-question-mark.png b/img/icon-question-mark.png
new file mode 100644
index 000000000..a6225d271
Binary files /dev/null and b/img/icon-question-mark.png differ
diff --git a/images/tt_logo.png b/img/logo.png
similarity index 100%
rename from images/tt_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/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/index.php b/index.php
index cabc7060b..c74f2688b 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');
 
@@ -38,29 +14,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>
@@ -69,11 +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>
-
-<?php 
-}
-?>
diff --git a/initialize.php b/initialize.php
index 404872936..18946798c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -1,42 +1,27 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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.
 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');
+// 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', '>=')) {
+  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.22.5818");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
@@ -90,16 +75,20 @@
   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');
+if (!defined('LOGIN_COOKIE_NAME')) define('LOGIN_COOKIE_NAME', 'tt_login');
+
 // 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.
@@ -128,11 +117,12 @@
 
 define('CHARSET', 'utf-8');
 
-date_default_timezone_set(@date_default_timezone_get());
+// 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);
 
-// 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();
+date_default_timezone_set(@date_default_timezone_get());
 
 // Initialize global objects that are needed for the application.
 import('html.HttpRequest');
@@ -146,8 +136,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/invoice_add.php b/invoice_add.php
index 273d761ef..e7018f009 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');
@@ -43,9 +19,10 @@
 }
 // 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 = $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');
@@ -58,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 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 e94e8050f..5483a09b1 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');
@@ -63,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()) {
@@ -101,16 +77,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/invoice_view.php b/invoice_view.php
index 5e11781c3..b1fcf91f9 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -1,33 +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 */
 
 require_once('initialize.php');
-import('DateAndTime');
+import('ttDate');
 import('ttInvoiceHelper');
 import('ttClientHelper');
 import('form.Form');
@@ -49,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']);
@@ -99,8 +75,8 @@
   $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));
+    'class'=>'dropdown-field-with-button',
+    '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);
 }
@@ -127,6 +103,7 @@
 $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'));
diff --git a/invoices.php b/invoices.php
index 3b6fdc0da..d34e1220e 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');
@@ -41,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');
@@ -59,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'))));
@@ -77,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));
@@ -97,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,
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/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 8185203a3..2d9dde044 100644
--- a/login.php
+++ b/login.php
@@ -1,43 +1,31 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
 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();
+  }
+}
+// End of access checks.
 
 $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');
-$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')));
 
@@ -46,32 +34,103 @@
   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;
-
+    // Check user login.
+    $loginSucceeded = $auth->doLogin($cl_login, $cl_password);
+    if ($loginSucceeded) {
       // Remember user login in a cookie.
-      setcookie('tt_login', $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
+      setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
+    } else {
       $err->add($i18n->get('error.auth'));
+    }
+  }
+
+  // Do we have to use 2FA?
+  if ($err->no() && $loginSucceeded) {
+    $user = new ttUser(null, $auth->getUserId());
+
+    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 ($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);
+    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
+      $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;
+
+    // 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();
   }
 } // isPost
 
@@ -79,12 +138,12 @@
   $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);
 $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', 'login.tpl');
-$smarty->assign('about_text', $i18n->get('form.login.about'));
 $smarty->display('index.tpl');
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/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/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');
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 654d1698d..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->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'));
-  }
-  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
deleted file mode 100644
index 3b229368e..000000000
--- a/mobile/expenses.php
+++ /dev/null
@@ -1,254 +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');
-
-// 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;
-
-// 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->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'));
-    }
-    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/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
deleted file mode 100644
index fa3f04c46..000000000
--- a/mobile/index.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');
-
-// 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>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>
diff --git a/mobile/login.php b/mobile/login.php
deleted file mode 100644
index a432e5b60..000000000
--- a/mobile/login.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('ttOrgHelper');
-import('ttUser');
-
-if ($request->isPost()) {
-  $cl_login = $request->getParameter('login');
-} else {
-  $cl_login = @$_COOKIE['tt_login'];
-}
-$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('tt_login', $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/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
deleted file mode 100644
index 6a5ac572a..000000000
--- a/mobile/projects.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_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/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 153f3a2d8..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->tracking_mode) {
-  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 facf18c67..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->tracking_mode) {
-  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
deleted file mode 100644
index 2745df23a..000000000
--- a/mobile/tasks.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_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/time.php b/mobile/time.php
deleted file mode 100644
index e51e00bdc..000000000
--- a/mobile/time.php
+++ /dev/null
@@ -1,380 +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('ttConfigHelper');
-import('ttTimeHelper');
-import('DateAndTime');
-
-// 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 = $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;
-
-// 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 ($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', ($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;
-
-$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');
-
-// 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.
-if (MODE_TIME == $user->getTrackingMode() && $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 (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
-  // 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 ($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']);
-      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'))));
-  }
-}
-
-if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
-  $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'))));
-}
-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()) {
-    // Make the start and finish fields read-only.
-    $form->getElement('start')->setEnabled(false);
-    $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'))));
-    }
-  }
-}
-
-// 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);
-  }
-}
-
-// 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'));
-    // 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'));
-    }
-    if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $user->task_required) {
-      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 ((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->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
-          $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->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('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();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/time_delete.php b/mobile/time_delete.php
deleted file mode 100644
index a68da767a..000000000
--- a/mobile/time_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('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.
-
-// Escape comment for presentation.
-$time_rec['comment'] = htmlspecialchars($time_rec['comment']);
-
-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('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 6fefebd86..000000000
--- a/mobile/time_edit.php
+++ /dev/null
@@ -1,448 +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());
-
-// 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 ($user->isPluginEnabled('iv'))
-    $cl_billable = $request->getParameter('billable');
-} 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->date_format);
-  $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'];
-
-  // 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.
-if (MODE_TIME == $user->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 (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  // 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 ($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']);
-      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'))));
-  }
-}
-
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $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'))));
-}
-
-// Add other controls.
-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');"));
-  $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);
-  }
-}
-if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-  $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'))));
-    }
-  }
-}
-
-// 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);
-  }
-}
-
-// 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));
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save 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'));
-  // 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'));
-  }
-  if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->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 ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-        $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->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->date_format, $cl_date);
-
-  // Prohibit creating entries in future.
-  if (!$user->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));
-
-      // 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();
-      }
-    }
-  }
-
-  // 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),
-        '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('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 e44483ecc..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 tt_login cookie that stores login name.
-        unset($_COOKIE['tt_login']);
-        setcookie('tt_login', 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 411586bda..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('tt_login', $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 tt_login cookie that stores login name.
-            unset($_COOKIE['tt_login']);
-            setcookie('tt_login', 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
deleted file mode 100644
index d51cafcab..000000000
--- a/mobile/users.php
+++ /dev/null
@@ -1,70 +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('ttTimeHelper');
-
-// 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');
diff --git a/mysql.sql b/mysql.sql
index ae31890b5..f614d0ac8 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
@@ -39,12 +38,15 @@ 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
+  `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
   `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`)
 );
@@ -77,7 +79,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_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');
 
 
 #
@@ -85,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
@@ -272,6 +274,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
@@ -313,6 +316,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`)
@@ -606,42 +610,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.
@@ -655,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.19.17', 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.
diff --git a/notification_add.php b/notification_add.php
index c6b37fe65..99602fe5d 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');
@@ -46,7 +22,8 @@
   header('Location: access_denied.php'); // No users in subgroup.
   exit();
 }
-if ($request->isPost()) {
+$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)) {
     header('Location: access_denied.php'); // Invalid fav report id in post.
@@ -57,11 +34,13 @@
 
 $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'));
   $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).
@@ -70,31 +49,32 @@
 $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'=>'report_condition','style'=>'width: 250px;','value'=>$cl_report_condition));
+$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','value'=>$cl_report_condition));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // 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 (!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()) {
     // 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,
@@ -103,6 +83,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_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 8af8dc8c4..164127e93 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');
@@ -68,6 +44,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 +53,7 @@
   $cl_email = $notification['email'];
   $cl_cc = $notification['cc'];
   $cl_subject = $notification['subject'];
+  $cl_comment = $notification['comment'];
   $cl_report_condition = $notification['report_condition'];
 }
 
@@ -83,16 +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'=>'report_condition','style'=>'width: 250px;','value'=>$cl_report_condition));
+$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','value'=>$cl_report_condition));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
@@ -102,12 +80,12 @@
   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()) {
     // 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,
@@ -116,6 +94,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/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 b4e577557..d395b6396 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');
@@ -53,8 +29,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);
 
@@ -73,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.
@@ -83,7 +62,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/password_reset.php b/password_reset.php
index 4d4e24867..9645139e4 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');
@@ -39,7 +15,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()) {
@@ -64,8 +40,16 @@
   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());
+    $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;
@@ -88,10 +72,11 @@
 
     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");
+      $secure_connection = false;
       if ((!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] !== 'off')) || ($_SERVER['SERVER_PORT'] == 443))
         $secure_connection = true;
       if($secure_connection)
@@ -100,14 +85,20 @@
         $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;
-      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'));
+      $dir_name = $app_root = '';
+      if (defined('DIR_NAME'))
+        $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)))
+        $msg->add($i18n->get('form.reset_password.message'));
+      else
+        $err->add($i18n->get('error.mail_send'));
     }
   }
 } // isPost
diff --git a/plugins.php b/plugins.php
index bc26e5869..a4372694a 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,29 +14,30 @@
 
 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_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');
+  $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');
 } 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);
   $cl_client_required = $user->isOptionEnabled('client_required');
   $cl_invoices = in_array('iv', $plugins);
@@ -77,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');
@@ -94,13 +70,13 @@
 $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));
 $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')));
@@ -110,8 +86,11 @@
   // We update plugin list for the current group.
 
   // Prepare plugins string.
+  $plugins = '';
   if ($cl_charts)
     $plugins .= ',ch';
+  if ($cl_puncher)
+    $plugins .= ',pu';
   if ($cl_clients)
      $plugins .= ',cl';
   if ($cl_invoices)
@@ -142,8 +121,6 @@
     $plugins .= ',tp';
   if ($cl_attachments)
     $plugins .= ',at';
-  if ($cl_work)
-    $plugins .= ',wk';
   $plugins = trim($plugins, ',');
 
   // Prepare a new config string.
@@ -154,7 +131,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'));
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index a11e40a32..b561af804 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 {
 
@@ -140,8 +115,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;
@@ -156,6 +132,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 +151,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 +184,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.
@@ -226,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;
 
@@ -234,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.
@@ -281,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;
@@ -314,7 +332,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 +353,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.
@@ -340,24 +372,40 @@ 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" .
                 " 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.
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index c8559ad46..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');
 
@@ -51,8 +27,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;
   }
 
@@ -98,13 +80,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++;
       }
@@ -133,7 +115,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.
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);
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index 2a0ab6be9..08e395ce2 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');
@@ -41,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('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 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..8f4750245 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');
@@ -57,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()) {
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');
diff --git a/profile_edit.php b/profile_edit.php
index d0d3de5fe..3958a4018 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');
@@ -46,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'));
@@ -90,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/project_add.php b/project_add.php
index 5768d5fb5..859fdc259 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');
@@ -43,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)
@@ -53,11 +36,24 @@
   $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'));
   $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'];
@@ -66,8 +62,22 @@
 }
 
 $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 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));
@@ -79,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_delete.php b/project_delete.php
index 3b165a33d..4f4353b87 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');
diff --git a/project_edit.php b/project_edit.php
index e1792e48c..a0190ff83 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');
@@ -48,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'];
@@ -63,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']);
@@ -73,8 +80,22 @@
 
 $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));
+// 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));
@@ -87,6 +108,14 @@
   // 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'));
 
@@ -95,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/project_files.php b/project_files.php
index 6ffe123f1..8b38a8ce6 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');
@@ -48,6 +24,7 @@
 }
 // End of access checks.
 
+$cl_description = '';
 if ($request->isPost()) {
   $cl_description = trim($request->getParameter('description'));
 }
@@ -58,7 +35,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()) {
diff --git a/projects.php b/projects.php
index 0075c038f..ed4d371df 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');
diff --git a/mobile/timer.php b/puncher.php
similarity index 53%
rename from mobile/timer.php
rename to puncher.php
index c7c1c2d40..26b371fcd 100644
--- a/mobile/timer.php
+++ b/puncher.php
@@ -1,111 +1,116 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
+/* 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');
+import('ttDate');
 
 // Access check.
 if (!ttAccessAllowed('track_own_time')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('pu')) {
+  header('Location: feature_disabled.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');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// 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_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.
 
-// 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.
+$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;
+$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.
+$cl_date = $date_today->toString();
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
-  require_once('../plugins/CustomFields.class.php');
+  require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
+// 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());
+
 // 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.
 $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;
 }
-$cl_client = $request->getParameter('client', @$_SESSION['client']);
+$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;
 
+// 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 (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() && $enable_controls ? 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 == $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);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'enable'=>$enable_controls,
       'value'=>$cl_client,
       'data'=>$active_clients,
@@ -114,23 +119,48 @@
   // 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 (isset($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.
+$project_list = $client_list = array();
+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'))));
 
-  // 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. 
+    // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
 
@@ -147,7 +177,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'enable'=>$enable_controls,
       'value'=>$cl_client,
       'data'=>$client_list,
@@ -156,42 +185,31 @@
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+// Task dropdown.
+$task_list = array();
+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'))));
 }
-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.
-$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'))));
-    }
-  }
-}
+// Start and stop buttons.
+$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));
 
 // Submit.
 if ($request->isPost()) {
@@ -200,37 +218,39 @@
     $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) {
+    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']));
       }
     }
-    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 && $taskRequired) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     // 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))
+    if (!$user->isOptionEnabled('future_entries')) {
+      // $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))
         $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.
-    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.
@@ -253,12 +273,12 @@
 
       // 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);
       }
 
       if ($id && $result) {
-        header('Location: timer.php');
+        header('Location: puncher.php');
         exit();
       }
       $err->add($i18n->get('error.db'));
@@ -266,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
@@ -282,7 +302,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'));
@@ -294,17 +314,26 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($cl_date);
+$week_total = ttTimeHelper::getTimeForWeek($date_today);
+$timeRecords = ttTimeHelper::getRecords($cl_date);
+
 $smarty->assign('week_total', $week_total);
-$smarty->assign('uncompleted', $uncompleted);
-$smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
+$smarty->assign('uncompleted_today', $uncompletedToday);
+$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('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);
 $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');
+$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');
diff --git a/puncher_conf.php b/puncher_conf.php
new file mode 100644
index 000000000..51610f693
--- /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('title.puncher'));
+$smarty->assign('content_page_name', 'puncher_conf.tpl');
+$smarty->display('index.tpl');
diff --git a/quotas.php b/quotas.php
index b6d63fa3e..55214093f 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');
@@ -116,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)){
@@ -125,7 +101,7 @@
     $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);
diff --git a/readme.txt b/readme.txt
index c8929fae4..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:
 
@@ -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'
@@ -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
diff --git a/register.php b/register.php
index 0c0374b33..6f54ccf5b 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');
@@ -42,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'));
@@ -58,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();
@@ -77,16 +55,18 @@
   $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));
+$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,
@@ -106,7 +86,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/report.php b/report.php
index da035fca7..b8a549b69 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');
@@ -42,6 +18,7 @@
 // End of access checks.
 
 $config = new ttConfigHelper($user->getConfig());
+$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']));
@@ -82,40 +59,43 @@
 // 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:
 // - 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')))
+$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('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 && !$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;
 }
 
 $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.
+$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',
+    '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')));
@@ -123,15 +103,18 @@
 }
 
 // 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',
+    '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')));
@@ -139,6 +122,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);
@@ -146,10 +130,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,
@@ -160,14 +146,17 @@
 }
 
 // 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',
+      '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,
@@ -197,9 +186,9 @@
     // 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 beacues the arrays are used in both "Mark paid" and "Assign to invoice" handlers below.
+    $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()) {
@@ -272,6 +261,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));
@@ -285,23 +276,42 @@
 }
 $totals = ttReportHelper::getTotals($options);
 
-// Determine column span for note field.
-$colspan = 1;
+// 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) {
+  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 (!$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++;
 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', '');
@@ -311,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);
diff --git a/report_send.php b/report_send.php
index 526457bf4..b20dd6dfe 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');
@@ -52,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()) {
@@ -95,16 +71,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()"');
diff --git a/reports.php b/reports.php
index 253652b94..aabeec08f 100644
--- a/reports.php
+++ b/reports.php
@@ -1,41 +1,17 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
 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'))) {
@@ -64,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'))));
@@ -75,6 +50,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"
@@ -87,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'))));
@@ -95,9 +70,12 @@
 
 // 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.
+    $config = new ttConfigHelper($user->getConfig());
+    $includeInactiveProjects = $config->getDefinedValue('report_inactive_projects');
+    $project_list = ttProjectHelper::getProjects($includeInactiveProjects);
   } elseif ($user->isClient()) {
     $project_list = ttProjectHelper::getProjectsForClient();
   } else {
@@ -106,10 +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',
-    'style'=>'width: 250px;',
+  $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'))));
@@ -117,6 +101,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;
@@ -124,7 +109,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'))));
@@ -137,7 +121,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'))));
 }
@@ -149,7 +132,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'))));
 }
@@ -160,7 +142,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'))
  ));
@@ -173,7 +154,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'))
   ));
@@ -184,7 +164,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'),
@@ -197,7 +176,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')) {
@@ -229,15 +208,14 @@
       }
     }
   }
-  $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,
     'layout'=>'V',
-    'groupin'=>$row_count,
-    'style'=>'width: 100%;'));
+    'groupin'=>$row_count));
 
-    foreach ($inactive_users as $single_user) {
+  foreach ($inactive_users as $single_user) {
     $user_list_inactive[$single_user['id']] = $single_user['name'];
     $projects = ttProjectHelper::getAssignedProjects($single_user['id']);
     if ($projects) {
@@ -251,25 +229,26 @@
     '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_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'));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
 
+// Add control for notes containing.
+$form->addInput(array('type'=>'text','maxlength'=>'80','name'=>'note_containing'));
+
 // Add checkboxes for "Show fields" block.
 if ($showClient)
   $form->addInput(array('type'=>'checkbox','name'=>'chclient'));
@@ -310,15 +289,14 @@
   $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;
     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'))));
     }
@@ -328,15 +306,14 @@
 }
 
 // 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;
     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'))));
     }
@@ -345,6 +322,23 @@
   }
 }
 
+// If we have projects custom fields - add controls for them.
+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;
+    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');
@@ -357,21 +351,26 @@
 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) {
+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'];
   }
-}*/
+}
+// 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));
@@ -379,7 +378,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')));
 
@@ -392,9 +391,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');
@@ -425,83 +424,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')) {
-      $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'));
+    } 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 ($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();
+      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);
diff --git a/role_add.php b/role_add.php
index 97883151b..b4e05f903 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');
@@ -36,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'));
@@ -43,12 +20,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()) {
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..f2aecadee 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');
@@ -60,20 +36,20 @@
 
 $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')));
 
 // 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()) {
@@ -82,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/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/rtl.css b/rtl.css
index ede511c8e..890cdd75c 100644
--- a/rtl.css
+++ b/rtl.css
@@ -2,4 +2,56 @@
 
 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;
+}
+
+.checkbox-label {
+  float: right;
+}
+
+.day-totals-col1 {
+  text-align: right;
+}
+
+.day-totals-col2 {
+  text-align: left;
+}
+
+.text-cell {
+  text-align: right;
+}
+
+.number-cell {
+  text-align: left;
+}
+
+.time-cell {
+  text-align: left;
+}
+
+.money-value-cell {
+  text-align: left;
+}
+
+.note-header-cell {
+  text-align: left;
+}
+
+.label-cell {
+  text-align: left;
+}
+
+th.invoice-label {
+  text-align: left;
+}
diff --git a/site_map.php b/site_map.php
new file mode 100644
index 000000000..f769edd76
--- /dev/null
+++ b/site_map.php
@@ -0,0 +1,16 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+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('content_page_name', 'site_map.tpl');
+$smarty->display('index.tpl');
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/swap_roles.php b/swap_roles.php
index 1652ae2a8..7a036a777 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')));
 
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');
diff --git a/task_add.php b/task_add.php
index 078bd5ca1..4a3353703 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');
@@ -45,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'));
@@ -55,15 +32,15 @@
 }
 
 $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','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_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  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()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
diff --git a/task_delete.php b/task_delete.php
index d8e14399f..04008010f 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');
@@ -35,7 +11,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_edit.php b/task_edit.php
index 10410c4b3..1eb8c7f5b 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');
@@ -55,19 +31,21 @@
   $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'];
 }
 
 $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','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));
@@ -76,8 +54,9 @@
 
 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_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'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
diff --git a/tasks.php b/tasks.php
index 7b5f99790..13787a8ab 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');
@@ -41,12 +17,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/template_add.php b/template_add.php
index 086baf3b4..8eef424ef 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');
@@ -43,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'));
@@ -59,9 +37,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')));
 
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..2ff87b721 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');
@@ -49,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'));
@@ -73,9 +51,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));
@@ -86,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/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 b1c0c4dba..ee90770b8 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');
@@ -34,7 +10,7 @@
 import('ttClientHelper');
 import('ttTimeHelper');
 import('ttFileHelper');
-import('DateAndTime');
+import('ttDate');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
@@ -50,17 +26,55 @@
   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();
   }
 }
+// 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');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    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.
 if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
+  $user_id = (int)$request->getParameter('user');
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
@@ -74,19 +88,20 @@
 $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;
-$showFinish = $showStart;
 $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']);
-$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;
 
 // Use custom fields plugin if it is enabled.
@@ -102,10 +117,14 @@
   // Determine column span for note field.
   $colspan = 0;
   if ($showClient) $colspan++;
+  if ($showRecordCustomFields && isset($custom_fields) && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $colspan++;
+    }
+  }
   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.
@@ -117,13 +136,13 @@
 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_quota_minutes = $quota->getUserQuota($selected_date->year, $selected_date->month);
   $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);
@@ -133,12 +152,12 @@
 }
 
 // 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 ($user->isPluginEnabled('iv')) {
+if ($showBillable) {
   if ($request->isPost()) {
     $cl_billable = $request->getParameter('billable');
     $_SESSION['billable'] = (int) $cl_billable;
@@ -153,24 +172,25 @@
 $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 (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' => is_null($cl_control_name) ? null : trim($cl_control_name));
   }
 }
 
 // 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')) {
@@ -184,11 +204,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);
   }
 }
@@ -200,35 +220,38 @@
   $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 ($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) {
+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) {
-      $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;
   }
 }
 
 // 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');
@@ -236,11 +259,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) {
@@ -263,24 +286,25 @@
     $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;
   }
 }
 
 // Task dropdown.
+$task_list = array();
 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'))));
+  $largeScreenCalendarRowSpan += 2;
 }
 
 // Start and finish controls.
@@ -292,13 +316,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')){
@@ -307,7 +339,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'))));
@@ -315,40 +346,47 @@
     $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
+
 // 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.
+
+    // 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'));
     // 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']));
       }
     }
-    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 && $taskRequired) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
-    if (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'));
@@ -359,11 +397,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 {
@@ -374,13 +412,14 @@
     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->future_entries) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
+    if (!$user->isOptionEnabled('future_entries')) {
+      $browser_today = new ttDate($request->getParameter('browser_today', null));
+      $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'));
     }
 
@@ -389,7 +428,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>");
     }
@@ -415,7 +454,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);
       }
 
@@ -467,28 +506,32 @@
 
 $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);
 $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->isOptionEnabled('week_menu'));
+$smarty->assign('show_record_custom_fields', $showRecordCustomFields);
+$smarty->assign('show_navigation', $showNavigation);
 $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_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);
 $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();"');
+$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', 'time.tpl');
diff --git a/time_delete.php b/time_delete.php
index a7b802b60..cd0af11ab 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -1,36 +1,12 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license 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');
 import('ttUserHelper');
 import('ttTimeHelper');
-import('DateAndTime');
+import('ttDate');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
@@ -46,14 +22,18 @@
 }
 // End of access checks.
 
-// Escape comment for presentation.
-$time_rec['comment'] = htmlspecialchars($time_rec['comment']);
+$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;
 
 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']);
+    $item_date = new ttDate($time_rec['date']);
 
     // Determine if the record is uncompleted.
     $uncompleted = ($time_rec['duration'] == '0:00');
@@ -83,6 +63,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');
diff --git a/time_edit.php b/time_edit.php
index 83989404f..35037dcaf 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');
@@ -33,7 +9,7 @@
 import('ttClientHelper');
 import('ttTimeHelper');
 import('ttConfigHelper');
-import('DateAndTime');
+import('ttDate');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
@@ -42,16 +18,38 @@
 }
 $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');
   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();
 $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;
+$taskRequired = false;
+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;
+$oneUncompleted = $config->getDefinedValue('one_uncompleted');
+
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
@@ -59,19 +57,19 @@
   $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.
 $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 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'],
@@ -86,9 +84,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 ($user->isPluginEnabled('ps'))
+  $cl_paid = 0;
+  if ($showPaidStatus)
     $cl_paid = $request->getParameter('paid');
 } else {
   $cl_client = $time_rec['client_id'];
@@ -97,11 +96,11 @@
   $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.
-  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'],
@@ -118,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'));
   }
 }
@@ -128,12 +127,12 @@
 $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);',
     'name'=>'client',
-    'style'=>'width: 250px;',
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
@@ -141,21 +140,45 @@
   // 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 (isset($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,
+      '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.
+$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');
   $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 ($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)
@@ -175,7 +198,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'),
@@ -183,19 +205,20 @@
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+// Task dropdown.
+$task_list = array();
+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'))));
 }
 
-// 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,27 +227,16 @@
     $form->getElement('finish')->setEnabled(false);
   }
 }
-if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-  $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'))));
-    }
-  }
+// 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');"));
 }
 
+// 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();
@@ -232,7 +244,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'))));
@@ -243,41 +254,46 @@
   }
 }
 
+// Note control.
+$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));
-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')));
 
 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) {
+  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']));
     }
   }
-  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 &&  $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) {
@@ -287,11 +303,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 {
@@ -307,12 +323,16 @@
   // Finished validating user input.
 
   // This is a new date for the time record.
-  $new_date = new DateAndTime($user->date_format, $cl_date);
+  $new_date = null;
+  if ($err->no())
+    $new_date = new ttDate($cl_date, $user->getDateFormat());
 
   // Prohibit creating entries in future.
-  if (!$user->future_entries) {
-    $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-    if ($new_date->after($browser_today))
+  if ($err->no() && !$user->isOptionEnabled('future_entries')) {
+    $browser_today = new ttDate($request->getParameter('browser_today', null));
+    $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'));
   }
 
@@ -334,8 +354,8 @@
         $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) {
+      $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'])) {
           // We have another not completed record.
@@ -346,7 +366,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'));
     }
 
@@ -354,7 +374,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,
@@ -366,18 +386,19 @@
         '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)
       {
-        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'));
     }
   }
 
-  // Save as new record.
+  // Copy record.
   if ($request->getParameter('btn_copy')) {
     // We need to:
     // 1) Prohibit saving into locked range.
@@ -391,7 +412,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.
@@ -402,7 +423,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'));
     }
 
@@ -410,7 +431,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,
@@ -423,11 +444,11 @@
 
       // 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) {
-        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'));
@@ -444,6 +465,14 @@
   $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);
diff --git a/time_files.php b/time_files.php
index 33273da45..c5dce5baa 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');
@@ -48,6 +24,7 @@
 }
 // End of access checks.
 
+$cl_description = '';
 if ($request->isPost()) {
   $cl_description = trim($request->getParameter('description'));
 }
@@ -58,7 +35,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()) {
diff --git a/timesheet_add.php b/timesheet_add.php
index 7c7633c6c..b52775f2f 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');
@@ -41,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');
@@ -53,23 +30,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()) {
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_edit.php b/timesheet_edit.php
index b883b20e9..3e46733ae 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');
@@ -64,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')));
@@ -75,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/timesheet_files.php b/timesheet_files.php
index d32b2c99f..bec4e29d8 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');
@@ -48,6 +24,7 @@
 }
 // End of access checks.
 
+$cl_description = null;
 if ($request->isPost()) {
   $cl_description = trim($request->getParameter('description'));
 }
@@ -58,7 +35,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()) {
diff --git a/timesheet_view.php b/timesheet_view.php
index a1ee74d26..b4eda31f7 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');
@@ -59,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();
@@ -83,7 +60,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')));
 }
@@ -140,7 +117,6 @@
   }
 }
 
-$smarty->assign('not_client', $notClient);
 $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 $smarty->assign('timesheet', $timesheet);
 $smarty->assign('subtotals', $subtotals);
diff --git a/timesheets.php b/timesheets.php
index b7ce44b84..7dbbb78df 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();
@@ -83,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')));
diff --git a/tofile.php b/tofile.php
index 8b3ae2302..0134885f8 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');
@@ -44,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);
 
@@ -119,7 +97,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;
@@ -128,9 +106,17 @@
       }
       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 ($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;
@@ -147,6 +133,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())
@@ -214,22 +205,30 @@
     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;
-        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').'"';
     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 ($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;
-        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').'"';
@@ -237,7 +236,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').'"';
@@ -248,24 +251,32 @@
     // 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) {
+      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;
-          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 ',"'.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('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('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;
-          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,12 +288,15 @@
         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())
+        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'].'"';
@@ -290,8 +304,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";
     }
   }
diff --git a/topdf.php b/topdf.php
index 337a05a41..6393d5f55 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/.
@@ -62,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.
@@ -70,6 +47,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)
@@ -77,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;
@@ -152,7 +131,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;
@@ -161,9 +140,17 @@
   }
   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 ($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;
@@ -175,6 +162,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>'; }
@@ -198,7 +186,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;
@@ -215,13 +203,21 @@
             $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']);
             $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;
@@ -233,6 +229,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())
@@ -266,7 +263,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;
@@ -275,9 +272,17 @@
     }
     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 ($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;
@@ -289,6 +294,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())
@@ -338,7 +348,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;
@@ -355,13 +365,21 @@
       $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']);
       $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;
@@ -373,6 +391,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())
@@ -395,7 +414,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;
@@ -404,9 +423,17 @@
   }
   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 ($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;
@@ -418,6 +445,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())
@@ -460,7 +488,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 = '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 +522,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'));
diff --git a/user_add.php b/user_add.php
index 0cd71b0a4..e75e0901d 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');
@@ -57,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'));
@@ -70,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'],
@@ -86,7 +65,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 +76,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));
@@ -106,19 +85,18 @@
 $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'))));
 
 // 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) {
       $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'))));
@@ -139,7 +117,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();
   }
@@ -148,6 +125,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');
@@ -160,9 +138,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);
@@ -181,13 +158,16 @@ 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.
   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']));
@@ -214,7 +194,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);
       }
 
@@ -236,7 +216,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_delete.php b/user_delete.php
index 38d4f5424..e6ec7365e 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');
@@ -61,9 +37,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..0633e8a1f 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');
@@ -61,12 +37,14 @@
 }
 
 $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;
 }
+$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'));
@@ -80,7 +58,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'],
@@ -110,7 +88,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'],
@@ -133,28 +111,27 @@
 }
 
 $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')));
+$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'))));
 
 // 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) {
       $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'))));
@@ -171,7 +148,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();
   }
@@ -179,8 +155,8 @@ 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());
     $field->setSize(5);
     $field->setFormat('.2');
@@ -193,9 +169,8 @@ 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->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setValue($cl_projects);
@@ -215,13 +190,17 @@ 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.
   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 ($custom_fields && $custom_fields->userFields) {
+  // 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.
       if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
@@ -249,14 +228,14 @@ 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);
       }
 
       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 +245,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');
@@ -299,7 +278,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);
diff --git a/users.php b/users.php
index 2fbcb5d20..38d4e1bc3 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');
@@ -54,8 +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) {
+    $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);
diff --git a/week.php b/week.php
index b0d609d13..3c2384b91 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');
@@ -36,7 +12,7 @@
 import('ttWeekViewHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
-import('DateAndTime');
+import('ttDate');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
@@ -55,21 +31,59 @@
   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();
+  }
+}
+// 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');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    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;
+$taskRequired = false;
+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');
+$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);
+$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;
 
 // Determine selected week start and end dates.
@@ -80,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.
@@ -97,7 +111,7 @@
 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_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);
 
@@ -107,24 +121,8 @@
 }
 
 // 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 ($user->isPluginEnabled('iv')) {
+if ($showBillable) {
   if ($request->isPost()) {
     $cl_billable = $request->getParameter('billable');
     $_SESSION['billable'] = (int) $cl_billable;
@@ -132,33 +130,66 @@
     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']));
 $_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.
+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));
+  }
+}
 
 // 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());
+// 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;
+  }
+  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.
-$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);
-$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 {
@@ -202,7 +233,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.
@@ -216,7 +247,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']);
@@ -224,7 +255,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());
@@ -234,66 +265,102 @@ 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);
   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',
-      'style'=>'width: 250px;',
-      'value'=>$on_behalf_id,
+      'onchange'=>'document.weekTimeForm.user_changed.value=1;document.weekTimeForm.submit();',
+      'name'=>'user',
+      'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
-    $smarty->assign('on_behalf_control', 1);
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $largeScreenCalendarRowSpan += 2;
+    $smarty->assign('user_dropdown', 1);
   }
 }
 
 // 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);
 // 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) {
+  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]]));
+  }
 }
 $table->setInteractive(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);',
     '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.
 }
 
-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));
+  $largeScreenCalendarRowSpan += 2;
+}
+
+// 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'];
+    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,
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+    $largeScreenCalendarRowSpan += 2;
+  }
+}
+
+// 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();
   $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 ($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)
@@ -313,51 +380,42 @@ 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;
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+// Task dropdown.
+$task_list = array();
+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'))));
+  $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));
 
-// 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));
-$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'))));
-    }
-  }
+// Week note control.
+if ($showWeekNote) {
+  $form->addInput(array('type'=>'textarea','name'=>'comment','value'=>$cl_note));
+  $largeScreenCalendarRowSpan += 2;
 }
 
+// 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'=>'')); // 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')) {
@@ -372,19 +430,19 @@ 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) {
+      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']));
         }
       }
-      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 && $taskRequired) {
         if (!$cl_task) $err->add($i18n->get('error.task'));
       }
     }
@@ -428,9 +486,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'];
@@ -441,7 +496,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)
@@ -455,21 +510,23 @@ 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;
-              $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) {
                 // 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)) {
+            } elseif ($postedDuration == null) {
               // Delete an already existing record here.
               $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id']);
             } else {
@@ -505,10 +562,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) {
@@ -517,26 +574,13 @@ 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('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);
@@ -544,12 +588,16 @@ 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);
 $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');
diff --git a/week_view.php b/week_view.php
index 149842e87..7db10226a 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,15 +14,17 @@
 $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');
+  $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');
@@ -54,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()){
@@ -62,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'));
   }
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');
diff --git a/work_units.php b/work_units.php
index e4d198d5c..b8a4a747e 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);
@@ -54,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')));