diff --git a/README.md b/README.md
index cf2f8601..022c0c03 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,9 @@
 ## About
 Anuko [Time Tracker](https://www.anuko.com/time-tracker/index.htm) is an open source, web-based time tracking application written in PHP. It allows you to track the time that employees or colleagues spend working on projects and tasks. It needs a web server such as Apache, IIS, etc. to run on, and a database to keep the data in, such as MySQL.
 
+## Terminal Illness of the Owner
+December 28, 2023: Nik Okuntseff, the owner and lead software developer at Anuko, developed a terminal illness. Anuko, the company behind Time Tracker, will cease to exist at soon.
+
 ## Free Hosting
 [Anuko](https://www.anuko.com) provides [free hosting](https://www.anuko.com/time-tracker/free-hosting/index.htm) of Time Tracker to individuals and small groups up to 5 users. To start using Time Tracker immediately, create a group at https://timetracker.anuko.com
 
diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index 1760da48..bd4e9ffd 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -51,9 +51,16 @@ function get($key) {
     return $value;
   }
 
+  // get - keyExists determines if a key exists.
+  function keyExists($key) {
+    $value = $this->get($key);
+    return ($value !== null);
+  }
+
   // load - loads localized strings into $keys array by first going through the default file (en.lang.php)
-  // and then through the requested language file (which is supplied as parameter).
-  // This means we end up with default English strings when keys are missing in the translation file.
+  // and then through the requested language file (which is supplied as parameter),
+  // (this means we end up with default English strings when keys are missing in the translation file),
+  // and then from a group custom translation field, if available.
   function load($langName) {
     // Load default English keys first.
     $defaultFileName = RESOURCE_DIR . '/' . $this->defaultLang . '.lang.php';
@@ -105,6 +112,35 @@ function load($langName) {
         }
       }
     }
+
+    // Now load custom translation for group.
+    global $user;
+    $customTranslation = $user->getCustomTranslation();
+    if ($customTranslation != null) {
+      $lines =  preg_split("/\r\n|\n|\r/", $customTranslation);
+      for ($i = 0; $i < count($lines); $i++) {
+        $parts = explode('=', $lines[$i]);
+        if (count($parts) != 2) continue;
+
+        $key = trim($parts[0]);
+        $value = trim($parts[1]);
+        // 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.
diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 2d8e287d..79aba106 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -126,7 +126,7 @@ function isTrue($val)
 }
 
 // ttValidString is used to check user input to validate a string.
-function ttValidString($val, $emptyValid = false)
+function ttValidString($val, $emptyValid = false, $maxChars = 0)
 {
   if (is_null($val)) {
     return $emptyValid ? true : false;
@@ -140,6 +140,10 @@ function ttValidString($val, $emptyValid = false)
   if (stristr($val, '<script>') || stristr($val, '<script '))
     return false;
 
+  // Count of UTF-8 characters in string must not exceeed $maxChars.
+  if ($maxChars > 0 && mb_strlen($val, 'UTF-8') > $maxChars) // 4 byte emojis are counted as 1 each, newlines as 2.
+    return false;
+
   return true;    
 }
 
@@ -162,6 +166,46 @@ function ttValidCss($val)
   return true;
 }
 
+// ttValidTranslation is used to check user input for custom translation.
+function ttValidTranslation($val)
+{
+  $val = trim($val);
+  if (strlen($val) == 0)
+    return true;
+
+  // 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).
@@ -334,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)
 {
@@ -555,7 +608,7 @@ function ttMitigateCSRF() {
   return true;
 }
 
-// ttStartsWith functions checks if a string starts with a given substring.
+// ttStartsWith function checks if a string starts with a given substring.
 function ttStartsWith($string, $startString)
 {
   if (is_null($string))
@@ -565,7 +618,7 @@ function ttStartsWith($string, $startString)
   return (substr($string, 0, $len) === $startString);
 }
 
-// ttEndsWith functions checks if a string ends with a given substring.
+// ttEndsWith function checks if a string ends with a given substring.
 function ttEndsWith($string, $endString)
 {
   $len = strlen($endString);
@@ -573,6 +626,16 @@ function ttEndsWith($string, $endString)
   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)
 {
diff --git a/WEB-INF/lib/form/ActionForm.class.php b/WEB-INF/lib/form/ActionForm.class.php
index 253091b4..358f8af5 100644
--- a/WEB-INF/lib/form/ActionForm.class.php
+++ b/WEB-INF/lib/form/ActionForm.class.php
@@ -69,6 +69,11 @@ function initAttributes(&$request) {
         if ($this->mForm) {
 	        $elements = $this->mForm->getElements();
 			foreach ($elements as $name=>$el) {
+// TODO: Refactor this. This is a temporary fix for project multiple select. mValues should probably contain just project, not project[].
+if ($name == 'project' && isset($this->mValues['project[]'])) {
+    $this->mForm->elements['project']->setValue($this->mValues['project[]']);
+}
+// End of TODO.
     			if ($this->mForm->elements[$name] && isset($this->mValues[$name])) {
 				    $this->mForm->elements[$name]->setValue($this->mValues[$name]);
 	    	    }
@@ -164,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/Form.class.php b/WEB-INF/lib/form/Form.class.php
index 27a36e9b..cee608fe 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -103,6 +103,16 @@ function addInput($params) {
 			    if (isset($params["datakeys"])) $el->setDataKeys($params["datakeys"]);
 			    break;
 
+                        case "multipleselectcombobox":
+			    import('form.MultipleSelectCombobox');
+                            $multipleSelectComboboxName = $params["name"].'[]';
+			    $el = new MultipleSelectCombobox($multipleSelectComboboxName);
+			    $el->setData(@$params["data"]);
+			    $el->setDataDefault(@$params["empty"]);
+                            if (isset($params['class'])) $el->setCssClass($params['class']);
+			    if (isset($params["datakeys"])) $el->setDataKeys($params["datakeys"]);
+			    break;
+
 			case "calendar":
 			    import('form.Calendar');
 			    $el = new Calendar($params["name"]);
diff --git a/WEB-INF/lib/form/MultipleSelectCombobox.class.php b/WEB-INF/lib/form/MultipleSelectCombobox.class.php
new file mode 100644
index 00000000..2c2cf050
--- /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/TextField.class.php b/WEB-INF/lib/form/TextField.class.php
index 91f8b5c2..bfc0e551 100644
--- a/WEB-INF/lib/form/TextField.class.php
+++ b/WEB-INF/lib/form/TextField.class.php
@@ -56,7 +56,7 @@ function getHtml() {
       if (!empty($this->on_change)) $html .= " onchange=\"$this->on_change\"";
     }
 
-    $html .= " value=\"".htmlspecialchars($this->getValue() ? $this->getValue() : '')."\"";
+    $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
 
     if(!$this->isEnabled()) $html .= " readonly";
     $html .= ">\n";
diff --git a/WEB-INF/lib/smarty/Autoloader.php b/WEB-INF/lib/smarty/Autoloader.php
index 1673ce2f..da7e32ab 100644
--- a/WEB-INF/lib/smarty/Autoloader.php
+++ b/WEB-INF/lib/smarty/Autoloader.php
@@ -5,6 +5,11 @@
  * @package Smarty
  */
 
+
+if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
+	include __DIR__ . '/functions.php';
+}
+
 /**
  * Smarty Autoloader
  *
@@ -73,7 +78,7 @@ public static function registerBC($prepend = false)
      */
     public static function register($prepend = false)
     {
-        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
+        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : __DIR__ . DIRECTORY_SEPARATOR;
         self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
             self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
         spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
@@ -89,7 +94,7 @@ public static function autoload($class)
         if ($class[ 0 ] !== 'S' || strpos($class, 'Smarty') !== 0) {
             return;
         }
-        $_class = strtolower($class);
+        $_class = smarty_strtolower_ascii($class);
         if (isset(self::$rootClasses[ $_class ])) {
             $file = self::$SMARTY_DIR . self::$rootClasses[ $_class ];
             if (is_file($file)) {
diff --git a/WEB-INF/lib/smarty/Smarty.class.php b/WEB-INF/lib/smarty/Smarty.class.php
index 85a3d9a6..5d2e3a4b 100644
--- a/WEB-INF/lib/smarty/Smarty.class.php
+++ b/WEB-INF/lib/smarty/Smarty.class.php
@@ -36,7 +36,7 @@
     /**
      *
      */
-    define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+    define('SMARTY_DIR', __DIR__ . DIRECTORY_SEPARATOR);
 }
 /**
  * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
@@ -61,23 +61,20 @@
     define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
 
-// Note: Nik put this back in from smarty3 for php5.4 that we still support.
-// See also comment around Smarty::$_CHARSET.
-if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    // UTF-8 can only be done properly when mbstring is available!
-    /**
-     * @deprecated in favor of Smarty::$_CHARSET
-     */
-    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
+/**
+ * Load helper functions
+ */
+if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
+    include __DIR__ . '/functions.php';
 }
-// End of inserted fragment by Nik.
 
 /**
  * Load Smarty_Autoloader
  */
 if (!class_exists('Smarty_Autoloader')) {
-    include dirname(__FILE__) . '/bootstrap.php';
+    include __DIR__ . '/bootstrap.php';
 }
+
 /**
  * Load always needed external class files
  */
@@ -110,7 +107,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '4.1.0';
+    const SMARTY_VERSION = '4.3.0';
     /**
      * define variable scopes
      */
@@ -172,9 +169,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
-    // public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
-    // Note by Nik: the above assignment only works with php >= 5.6, rolling back to SMARTY_RESOURCE_CHAR_SET as in smarty3.
-    public static $_CHARSET =  SMARTY_RESOURCE_CHAR_SET;
+    public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
 
     /**
      * The date format to be used internally
@@ -881,7 +876,7 @@ public function getPluginsDir()
                 $this->plugins_dir = (array)$this->plugins_dir;
             }
             foreach ($this->plugins_dir as $k => $v) {
-                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, '/\\') . DIRECTORY_SEPARATOR, true);
+                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v ?? '', '/\\') . DIRECTORY_SEPARATOR, true);
             }
             $this->_cache[ 'plugin_files' ] = array();
             $this->_pluginsDirNormalized = true;
@@ -1359,7 +1354,7 @@ public function __set($name, $value)
      */
     private function _normalizeDir($dirName, $dir)
     {
-        $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DIRECTORY_SEPARATOR, true);
+        $this->{$dirName} = $this->_realpath(rtrim($dir ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
     }
 
     /**
@@ -1381,7 +1376,7 @@ private function _normalizeTemplateConfig($isConfig)
         }
         foreach ($dir as $k => $v) {
             if (!isset($processed[ $k ])) {
-                $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DIRECTORY_SEPARATOR, true);
+                $dir[ $k ] = $v = $this->_realpath(rtrim($v ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
                 $processed[ $k ] = true;
             }
         }
@@ -1396,7 +1391,7 @@ private function _normalizeTemplateConfig($isConfig)
      *
      * @void
      */
-    public function muteUndefinedOrNullWarnings() {
+    public function muteUndefinedOrNullWarnings(): void {
         $this->isMutingUndefinedOrNullWarnings = true;
     }
 
@@ -1404,7 +1399,7 @@ public function muteUndefinedOrNullWarnings() {
      * Indicates if PHP7 compatibility mode is set.
      * @bool
      */
-    public function isMutingUndefinedOrNullWarnings() {
+    public function isMutingUndefinedOrNullWarnings(): bool {
         return $this->isMutingUndefinedOrNullWarnings;
     }
 
diff --git a/WEB-INF/lib/smarty/bootstrap.php b/WEB-INF/lib/smarty/bootstrap.php
index 2c830468..a226ac04 100644
--- a/WEB-INF/lib/smarty/bootstrap.php
+++ b/WEB-INF/lib/smarty/bootstrap.php
@@ -11,6 +11,6 @@
  * Load and register Smarty Autoloader
  */
 if (!class_exists('Smarty_Autoloader')) {
-    include dirname(__FILE__) . '/Autoloader.php';
+    include __DIR__ . '/Autoloader.php';
 }
 Smarty_Autoloader::register(true);
diff --git a/WEB-INF/lib/smarty/debug.tpl b/WEB-INF/lib/smarty/debug.tpl
index edc7bef9..4f82a582 100644
--- a/WEB-INF/lib/smarty/debug.tpl
+++ b/WEB-INF/lib/smarty/debug.tpl
@@ -1,9 +1,9 @@
 {capture name='_smarty_debug' assign=debug_output}
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <!DOCTYPE html>
+    <html lang="en">
     <head>
         <title>Smarty Debug Console</title>
-        <style type="text/css">
+        <style>
             {literal}
             body, h1, h2, h3, td, th, p {
                 font-family: sans-serif;
@@ -31,6 +31,7 @@
                 padding: 2px;
                 border-top: 1px solid black;
             }
+
             h3 {
                 text-align: left;
                 font-weight: bold;
@@ -67,11 +68,11 @@
                 color: green;
             }
 
-            .odd {
+            tr:nth-child(odd) {
                 background-color: #eeeeee;
             }
 
-            .even {
+            tr:nth-child(even) {
                 background-color: #fafafa;
             }
 
@@ -84,13 +85,16 @@
                 color: black;
                 font-weight: bold;
             }
+
             #blue h3 {
                 color: blue;
             }
+
             #normal div {
                 color: black;
                 font-weight: normal;
             }
+
             #table_assigned_vars th {
                 color: blue;
                 font-weight: bold;
@@ -99,7 +103,6 @@
             #table_config_vars th {
                 color: maroon;
             }
-
             {/literal}
         </style>
     </head>
@@ -112,11 +115,11 @@
         <h2>included templates &amp; config files (load time in seconds)</h2>
         <div>
             {foreach $template_data as $template}
-                <font color=brown>{$template.name}</font>
-                <br />&nbsp;&nbsp;<span class="exectime">
+                <span style="color: brown;">{$template.name}</span>
+                <br>&nbsp;&nbsp;<span class="exectime">
                 (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
                  </span>
-                <br />
+                <br>
             {/foreach}
         </div>
     {/if}
@@ -125,13 +128,22 @@
 
     <table id="table_assigned_vars">
         {foreach $assigned_vars as $vars}
-            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>${$vars@key}</font></h3>
-                    {if isset($vars['nocache'])}<b>Nocache</b><br />{/if}
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+            <tr>
+                <td>
+                    <h3 style="color: blue;">${$vars@key}</h3>
+                    {if isset($vars['nocache'])}<strong>Nocache</strong><br>{/if}
+                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>
+                    <h3>Value</h3>
+                    {$vars['value']|debug_print_var:10:80 nofilter}
+                </td>
+                <td>
+                    {if isset($vars['attributes'])}
+                        <h3>Attributes</h3>
+                        {$vars['attributes']|debug_print_var nofilter}
+                    {/if}
                 </td>
-                <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
-                <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
          {/foreach}
     </table>
 
@@ -139,11 +151,14 @@
 
     <table id="table_config_vars">
         {foreach $config_vars as $vars}
-            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>#{$vars@key}#</font></h3>
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+            <tr>
+                <td>
+                    <h3 style="color: blue;">#{$vars@key}#</h3>
+                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>
+                    {$vars['value']|debug_print_var:10:80 nofilter}
                 </td>
-                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
             </tr>
         {/foreach}
 
diff --git a/WEB-INF/lib/smarty/functions.php b/WEB-INF/lib/smarty/functions.php
new file mode 100644
index 00000000..bac00e52
--- /dev/null
+++ b/WEB-INF/lib/smarty/functions.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * This file is part of the Smarty package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ * Registers some helper/polyfill functions.
+ */
+
+const SMARTY_HELPER_FUNCTIONS_LOADED = true;
+
+/**
+ * Converts the first characters in $string to uppercase (A-Z) if it is an ASCII lowercase character (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_ucfirst_ascii($string): string {
+    return smarty_strtoupper_ascii(substr($string, 0, 1)) . substr($string, 1);
+}
+
+/**
+ * Converts all uppercase ASCII characters (A-Z) in $string to lowercase (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtolower_ascii($string): string {
+    return strtr($string, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
+}
+
+/**
+ * Converts all lowercase ASCII characters (a-z) in $string to uppercase (A-Z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtoupper_ascii($string): string {
+    return strtr($string, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+}
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/function.html_select_date.php b/WEB-INF/lib/smarty/plugins/function.html_select_date.php
index 763fc60f..d9c57197 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_select_date.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_select_date.php
@@ -101,6 +101,7 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
     $field_separator = "\n";
     $option_separator = "\n";
     $time = null;
+
     // $all_empty = null;
     // $day_empty = null;
     // $month_empty = null;
@@ -113,17 +114,7 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
     foreach ($params as $_key => $_value) {
         switch ($_key) {
             case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $template->_checkPlugins(
-                        array(
-                            array(
-                                'function' => 'smarty_make_timestamp',
-                                'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
-                            )
-                        )
-                    );
-                    $time = smarty_make_timestamp($_value);
-                }
+                $$_key = $_value; // we'll handle conversion below
                 break;
             case 'month_names':
                 if (is_array($_value) && count($_value) === 12) {
@@ -178,43 +169,59 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
     }
     // Note: date() is faster than strftime()
     // Note: explode(date()) is faster than date() date() date()
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
+
+    if (isset($time) && is_array($time)) {
+        if (isset($time[$prefix . 'Year'])) {
             // $_REQUEST[$field_array] given
-            foreach (array(
-                'Y' => 'Year',
-                'm' => 'Month',
-                'd' => 'Day'
-            ) as $_elementKey => $_elementName) {
+            foreach ([
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ] as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName =
-                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+                    isset($time[$prefix . $_elementName]) ? $time[$prefix . $_elementName] :
                         date($_elementKey);
             }
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
+        } elseif (isset($time[$field_array][$prefix . 'Year'])) {
             // $_REQUEST given
-            foreach (array(
-                'Y' => 'Year',
-                'm' => 'Month',
-                'd' => 'Day'
-            ) as $_elementKey => $_elementName) {
+            foreach ([
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ] as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
-                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+                $$_variableName = isset($time[$field_array][$prefix . $_elementName]) ?
+                    $time[$field_array][$prefix . $_elementName] : date($_elementKey);
             }
         } else {
             // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+            [$_year, $_month, $_day] = explode('-', date('Y-m-d'));
         }
+    } elseif (isset($time) && preg_match("/(\d*)-(\d*)-(\d*)/", $time, $matches)) {
+        $_year = $_month = $_day = null;
+        if ($matches[1] > '') $_year = (int) $matches[1];
+        if ($matches[2] > '') $_month = (int) $matches[2];
+        if ($matches[3] > '') $_day = (int) $matches[3];
     } elseif ($time === null) {
         if (array_key_exists('time', $params)) {
-            $_year = $_month = $_day = $time = null;
+            $_year = $_month = $_day = null;
         } else {
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+            [$_year, $_month, $_day] = explode('-', date('Y-m-d'));
         }
     } else {
-        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
+        $template->_checkPlugins(
+            array(
+                array(
+                    'function' => 'smarty_make_timestamp',
+                    'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
+                )
+            )
+        );
+        $time = smarty_make_timestamp($time);
+        [$_year, $_month, $_day] = explode('-', date('Y-m-d', $time));
     }
+
     // make syntax "+N" or "-N" work with $start_year and $end_year
     // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
     foreach (array(
@@ -309,8 +316,8 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
         for ($i = 1; $i <= 12; $i++) {
             $_val = sprintf('%02d', $i);
             $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
-                ($month_format === '%m' ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
-            $_value = $month_value_format === '%m' ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
+                ($month_format === '%m' ? $_val : @strftime($month_format, $_month_timestamps[ $i ]));
+            $_value = $month_value_format === '%m' ? $_val : @strftime($month_value_format, $_month_timestamps[ $i ]);
             $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
                              '>' . $_text . '</option>' . $option_separator;
         }
diff --git a/WEB-INF/lib/smarty/plugins/function.mailto.php b/WEB-INF/lib/smarty/plugins/function.mailto.php
index 834d0535..671ac069 100644
--- a/WEB-INF/lib/smarty/plugins/function.mailto.php
+++ b/WEB-INF/lib/smarty/plugins/function.mailto.php
@@ -48,8 +48,13 @@
  */
 function smarty_function_mailto($params)
 {
-    static $_allowed_encoding =
-        array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
+    static $_allowed_encoding = [
+        'javascript' => true,
+        'javascript_charcode' => true,
+        'hex' => true,
+        'none' => true
+    ];
+
     $extra = '';
     if (empty($params[ 'address' ])) {
         trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
@@ -57,19 +62,19 @@ function smarty_function_mailto($params)
     } else {
         $address = $params[ 'address' ];
     }
+
     $text = $address;
+
     // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
     // so, don't encode it.
-    $search = array('%40', '%2C');
-    $replace = array('@', ',');
-    $mail_parms = array();
+    $mail_parms = [];
     foreach ($params as $var => $value) {
         switch ($var) {
             case 'cc':
             case 'bcc':
             case 'followupto':
                 if (!empty($value)) {
-                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+                    $mail_parms[] = $var . '=' . str_replace(['%40', '%2C'], ['@', ','], rawurlencode($value));
                 }
                 break;
             case 'subject':
@@ -83,6 +88,7 @@ function smarty_function_mailto($params)
             default:
         }
     }
+
     if ($mail_parms) {
         $address .= '?' . join('&', $mail_parms);
     }
@@ -94,19 +100,21 @@ function smarty_function_mailto($params)
         );
         return;
     }
+
+    $string = '<a href="mailto:' . htmlspecialchars($address, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, Smarty::$_CHARSET) .
+        '" ' . $extra . '>' . htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, Smarty::$_CHARSET) . '</a>';
+
     if ($encode === 'javascript') {
-	    $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
         $js_encode = '';
         for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
             $js_encode .= '%' . bin2hex($string[ $x ]);
         }
         return '<script type="text/javascript">document.write(unescape(\'' . $js_encode . '\'))</script>';
     } elseif ($encode === 'javascript_charcode') {
-        $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
         for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
             $ord[] = ord($string[ $x ]);
         }
-	    return '<script type="text/javascript">document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
+        return '<script type="text/javascript">document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
     } elseif ($encode === 'hex') {
         preg_match('!^(.*)(\?.*)$!', $address, $match);
         if (!empty($match[ 2 ])) {
@@ -129,6 +137,6 @@ function smarty_function_mailto($params)
         return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
     } else {
         // no encoding
-        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+        return $string;
     }
 }
diff --git a/WEB-INF/lib/smarty/plugins/function.math.php b/WEB-INF/lib/smarty/plugins/function.math.php
index fd5b3d16..f9cf67fe 100644
--- a/WEB-INF/lib/smarty/plugins/function.math.php
+++ b/WEB-INF/lib/smarty/plugins/function.math.php
@@ -69,8 +69,8 @@ function smarty_function_math($params, $template)
     // Adapted from https://www.php.net/manual/en/function.eval.php#107377
     $number = '(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number
     $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
-    $operators = '[+\/*\^%-]'; // Allowed math operators
-    $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)+\)|\((?1)+\)))(?:'.$operators.'(?1))?)+$/';
+    $operators = '[,+\/*\^%-]'; // Allowed math operators
+    $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)*\)|\((?1)*\)))(?:'.$operators.'(?1))?)+$/';
 
     if (!preg_match($regexp, $equation)) {
         trigger_error("math: illegal characters", E_USER_WARNING);
diff --git a/WEB-INF/lib/smarty/plugins/modifier.capitalize.php b/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
index c5fc400a..2903d61d 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
@@ -22,6 +22,8 @@
  */
 function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
 {
+    $string = (string) $string;
+
     if (Smarty::$_MBSTRING) {
         if ($lc_rest) {
             // uppercase (including hyphenated words)
diff --git a/WEB-INF/lib/smarty/plugins/modifier.count.php b/WEB-INF/lib/smarty/plugins/modifier.count.php
new file mode 100644
index 00000000..ca35fc11
--- /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 8e7e0b6e..e3589fd0 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.date_format.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.date_format.php
@@ -78,7 +78,8 @@ function smarty_modifier_date_format($string, $format = null, $default_date = ''
             }
             $format = str_replace($_win_from, $_win_to, $format);
         }
-        return strftime($format, $timestamp);
+        // @ to suppress deprecation errors when running in PHP8.1 or higher.
+        return @strftime($format, $timestamp);
     } else {
         return date($format, $timestamp);
     }
diff --git a/WEB-INF/lib/smarty/plugins/modifier.escape.php b/WEB-INF/lib/smarty/plugins/modifier.escape.php
index 47489aa9..11e44682 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.escape.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.escape.php
@@ -23,95 +23,25 @@
  */
 function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
 {
-    static $_double_encode = true;
     static $is_loaded_1 = false;
     static $is_loaded_2 = false;
     if (!$char_set) {
         $char_set = Smarty::$_CHARSET;
     }
+
+    $string = (string)$string;
+
     switch ($esc_type) {
         case 'html':
-            if ($_double_encode) {
-                // php >=5.3.2 - go native
-                return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-            } else {
-                if ($double_encode) {
-                    // php <5.2.3 - only handle double encoding
-                    return htmlspecialchars($string, ENT_QUOTES, $char_set);
-                } else {
-                    // php <5.2.3 - prevent double encoding
-                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(
-                        array(
-                            '%%%SMARTY_START%%%',
-                            '%%%SMARTY_END%%%'
-                        ),
-                        array(
-                            '&',
-                            ';'
-                        ),
-                        $string
-                    );
-                    return $string;
-                }
-            }
+            return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
         // no break
         case 'htmlall':
             if (Smarty::$_MBSTRING) {
-                // mb_convert_encoding ignores htmlspecialchars()
-                if ($_double_encode) {
-                    // php >=5.3.2 - go native
-                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-                } else {
-                    if ($double_encode) {
-                        // php <5.2.3 - only handle double encoding
-                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                    } else {
-                        // php <5.2.3 - prevent double encoding
-                        $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                        $string =
-                            str_replace(
-                                array(
-                                    '%%%SMARTY_START%%%',
-                                    '%%%SMARTY_END%%%'
-                                ),
-                                array(
-                                    '&',
-                                    ';'
-                                ),
-                                $string
-                            );
-                        return $string;
-                    }
-                }
-                // htmlentities() won't convert everything, so use mb_convert_encoding
-                return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
+                $string = mb_convert_encoding($string, 'UTF-8', $char_set);
+                return htmlentities($string, ENT_QUOTES, 'UTF-8', $double_encode);
             }
             // no MBString fallback
-            if ($_double_encode) {
-                return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
-            } else {
-                if ($double_encode) {
-                    return htmlentities($string, ENT_QUOTES, $char_set);
-                } else {
-                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                    $string = htmlentities($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(
-                        array(
-                            '%%%SMARTY_START%%%',
-                            '%%%SMARTY_END%%%'
-                        ),
-                        array(
-                            '&',
-                            ';'
-                        ),
-                        $string
-                    );
-                    return $string;
-                }
-            }
+            return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
         // no break
         case 'url':
             return rawurlencode($string);
diff --git a/WEB-INF/lib/smarty/plugins/modifier.explode.php b/WEB-INF/lib/smarty/plugins/modifier.explode.php
new file mode 100644
index 00000000..5186fde3
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifier.explode.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty explode modifier plugin
+ * Type:     modifier
+ * Name:     explode
+ * Purpose:  split a string by a string
+ *
+ * @param string   $separator
+ * @param string   $string
+ * @param int|null $limit
+ *
+ * @return array
+ */
+function smarty_modifier_explode($separator, $string, ?int $limit = null)
+{
+    // provide $string default to prevent deprecation errors in PHP >=8.1
+    return explode($separator, $string ?? '', $limit ?? PHP_INT_MAX);
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.number_format.php b/WEB-INF/lib/smarty/plugins/modifier.number_format.php
new file mode 100644
index 00000000..8c612601
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifier.number_format.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty number_format modifier plugin
+ * Type:     modifier
+ * Name:     number_format
+ * Purpose:  Format a number with grouped thousands
+ *
+ * @param float|null  $num
+ * @param int         $decimals
+ * @param string|null $decimal_separator
+ * @param string|null $thousands_separator
+ *
+ * @return string
+ */
+function smarty_modifier_number_format(?float $num, int $decimals = 0, ?string $decimal_separator = ".", ?string $thousands_separator = ",")
+{
+    // provide $num default to prevent deprecation errors in PHP >=8.1
+    return number_format($num ?? 0.0, $decimals, $decimal_separator, $thousands_separator);
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.truncate.php b/WEB-INF/lib/smarty/plugins/modifier.truncate.php
index 33e7e53a..80dcdb53 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.truncate.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.truncate.php
@@ -42,8 +42,8 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
             if (!$middle) {
                 return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
             }
-            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
-                   mb_substr($string, -$length / 2, $length, Smarty::$_CHARSET);
+            return mb_substr($string, 0, intval($length / 2), Smarty::$_CHARSET) . $etc .
+                   mb_substr($string, -intval($length / 2), $length, Smarty::$_CHARSET);
         }
         return $string;
     }
@@ -56,7 +56,7 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
         if (!$middle) {
             return substr($string, 0, $length) . $etc;
         }
-        return substr($string, 0, $length / 2) . $etc . substr($string, -$length / 2);
+        return substr($string, 0, intval($length / 2)) . $etc . substr($string, -intval($length / 2));
     }
     return $string;
 }
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
index 70b95cc9..602c3dbf 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
@@ -18,12 +18,10 @@
  * @param Smarty_Internal_TemplateCompilerBase $compiler
  *
  * @return string with compiled code
- * @throws \SmartyException
+ * @throws SmartyException
  */
 function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
-    static $_double_encode = true;
-    static $is_loaded = false;
     $compiler->template->_checkPlugins(
         array(
             array(
@@ -41,53 +39,30 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
         }
         switch ($esc_type) {
             case 'html':
-                if ($_double_encode) {
-                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
-                           var_export($double_encode, true) . ')';
-                } elseif ($double_encode) {
-                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
-                } else {
-                    // fall back to modifier.escape.php
-                }
+                return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    var_export($double_encode, true) . ')';
             // no break
             case 'htmlall':
                 if (Smarty::$_MBSTRING) {
-                    if ($_double_encode) {
-                        // php >=5.2.3 - go native
-                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
-                               var_export($char_set, true) . ', ' . var_export($double_encode, true) .
-                               '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
-                    } elseif ($double_encode) {
-                        // php <5.2.3 - only handle double encoding
-                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
-                               var_export($char_set, true) . '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
-                    } else {
-                        // fall back to modifier.escape.php
-                    }
+                    return 'htmlentities(mb_convert_encoding((string)' . $params[ 0 ] . ', \'UTF-8\', ' .
+                        var_export($char_set, true) . '), ENT_QUOTES, \'UTF-8\', ' .
+                        var_export($double_encode, true) . ')';
                 }
                 // no MBString fallback
-                if ($_double_encode) {
-                    // php >=5.2.3 - go native
-                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
-                           var_export($double_encode, true) . ')';
-                } elseif ($double_encode) {
-                    // php <5.2.3 - only handle double encoding
-                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
-                } else {
-                    // fall back to modifier.escape.php
-                }
+                return 'htmlentities((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    var_export($double_encode, true) . ')';
             // no break
             case 'url':
-                return 'rawurlencode(' . $params[ 0 ] . ')';
+                return 'rawurlencode((string)' . $params[ 0 ] . ')';
             case 'urlpathinfo':
-                return 'str_replace("%2F", "/", rawurlencode(' . $params[ 0 ] . '))';
+                return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
             case 'quotes':
                 // escape unescaped single quotes
-                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
+                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'", (string)' . $params[ 0 ] . ')';
             case 'javascript':
                 // escape quotes and backslashes, newlines, etc.
                 // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
-                return 'strtr(' .
+                return 'strtr((string)' .
                        $params[ 0 ] .
                        ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S" ))';
         }
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.nl2br.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.nl2br.php
new file mode 100644
index 00000000..308c00e4
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.nl2br.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty nl2br modifier plugin
+ * Type:     modifier
+ * Name:     nl2br
+ * Purpose:  insert HTML line breaks before all newlines in a string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.nl2br.tpl nl2br (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_nl2br($params) {
+    return 'nl2br((string) ' . $params[0] . ', (bool) ' . ($params[1] ?? true) . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.round.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.round.php
new file mode 100644
index 00000000..97f072f0
--- /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 00000000..18eb7a76
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.str_repeat.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty str_repeat modifier plugin
+ * Type:     modifier
+ * Name:     str_repeat
+ * Purpose:  returns string repeated times times
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.str_repeat.tpl str_repeat (Smarty online manual)
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_str_repeat($params) {
+    return 'str_repeat((string) ' . $params[0] . ', (int) ' . $params[1] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
index 6ee3df9a..bd866a61 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
@@ -21,8 +21,8 @@
 function smarty_modifiercompiler_strip_tags($params)
 {
     if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
-        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
+        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]} ?: '')";
     } else {
-        return 'strip_tags(' . $params[ 0 ] . ')';
+        return 'strip_tags((string) ' . $params[ 0 ] . ')';
     }
 }
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.strlen.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.strlen.php
new file mode 100644
index 00000000..d43e8ef1
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.strlen.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty strlen modifier plugin
+ * Type:     modifier
+ * Name:     strlen
+ * Purpose:  return the length of the given string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.strlen.tpl strlen (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_strlen($params) {
+    return 'strlen((string) ' . $params[0] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
index 05beb81f..9e1f06d6 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
@@ -14,26 +14,34 @@
  * @author Rodney Rehm
  *
  * @param array $params parameters
+ * @param Smarty_Internal_TemplateCompilerBase $compiler
  *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_unescape($params)
+function smarty_modifiercompiler_unescape($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 'html';
-    }
+    $compiler->template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_literal_compiler_param',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
+            )
+        )
+    );
+
+    $esc_type = smarty_literal_compiler_param($params, 1, 'html');
+
     if (!isset($params[ 2 ])) {
         $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
-    } else {
-        $params[ 2 ] = "'{$params[ 2 ]}'";
     }
-    switch (trim($params[ 1 ], '"\'')) {
+
+    switch ($esc_type) {
         case 'entity':
         case 'htmlall':
             if (Smarty::$_MBSTRING) {
-                return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'HTML-ENTITIES\')';
+                return 'html_entity_decode(mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'UTF-8\'), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
             }
-            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_NOQUOTES, ' . $params[ 2 ] . ')';
+            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
         case 'html':
             return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
         case 'url':
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
index e12ae676..31a90a05 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
@@ -21,8 +21,8 @@
 function smarty_modifiercompiler_upper($params)
 {
     if (Smarty::$_MBSTRING) {
-        return 'mb_strtoupper(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+        return 'mb_strtoupper(' . $params[ 0 ] . ' ?? \'\', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
-    return 'strtoupper(' . $params[ 0 ] . ')';
+    return 'strtoupper(' . $params[ 0 ] . ' ?? \'\')';
 }
diff --git a/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php b/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
index 226d9035..7e85f7aa 100644
--- a/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
+++ b/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
@@ -44,9 +44,43 @@ function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
                 }
             }
         } else {
-            $parts = mb_split(preg_quote($search), $subject) ?: array();
+            $mb_reg_charset = mb_regex_encoding();
+            // Check if mbstring regex is using UTF-8
+            $reg_is_unicode = !strcasecmp($mb_reg_charset, "UTF-8");
+            if(!$reg_is_unicode) {
+                // ...and set to UTF-8 if not
+                mb_regex_encoding("UTF-8");
+            }
+
+            // See if charset used by Smarty is matching one used by regex...
+            $current_charset = mb_regex_encoding();
+            $convert_result = (bool)strcasecmp(Smarty::$_CHARSET, $current_charset);
+            if($convert_result) {
+                // ...convert to it if not.
+                $subject = mb_convert_encoding($subject, $current_charset, Smarty::$_CHARSET);
+                $search = mb_convert_encoding($search, $current_charset, Smarty::$_CHARSET);
+                $replace = mb_convert_encoding($replace, $current_charset, Smarty::$_CHARSET);
+            }
+
+            $parts = mb_split(preg_quote($search), $subject ?? "") ?: array();
+            // If original regex encoding was not unicode...
+            if(!$reg_is_unicode) {
+                // ...restore original regex encoding to avoid breaking the system.
+                mb_regex_encoding($mb_reg_charset);
+            }
+            if($parts === false) {
+                // This exception is thrown if call to mb_split failed.
+                // Usually it happens, when $search or $replace are not valid for given mb_regex_encoding().
+                // There may be other cases for it to fail, please file an issue if you find a reproducible one.
+                throw new SmartyException("Source string is not a valid $current_charset sequence (probably)");
+            }
+
             $count = count($parts) - 1;
             $subject = implode($replace, $parts);
+            // Convert results back to charset used by Smarty, if needed.
+            if($convert_result) {
+                $subject = mb_convert_encoding($subject, Smarty::$_CHARSET, $current_charset);
+            }
         }
         return $subject;
     }
diff --git a/WEB-INF/lib/smarty/readme b/WEB-INF/lib/smarty/readme
deleted file mode 100644
index 0a894518..00000000
--- a/WEB-INF/lib/smarty/readme
+++ /dev/null
@@ -1,7 +0,0 @@
-The files in this directory are from Smarty-4.1.0.
-There are 2 modified files though to support older versions of php such as 5.4.
-
-Smarty.class.php
-sysplugins/smarty_internal_cacheresource_file.php
-
-Nik edited these files in a few places for php5.4 support, as they use php7.0 and php5.6 features.
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php
index 91e9f392..db68f9bf 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php
@@ -205,11 +205,11 @@ public static function load(Smarty $smarty, $type = null)
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
-            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . smarty_ucfirst_ascii($type);
             return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
         }
         // try plugins dir
-        $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
+        $cache_resource_class = 'Smarty_CacheResource_' . smarty_ucfirst_ascii($type);
         if ($smarty->loadPlugin($cache_resource_class)) {
             return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
         }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
index 59bf1d4a..4b1c0f6d 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -244,7 +244,7 @@ protected function getTemplateUid(Smarty $smarty, $resource_name)
      */
     protected function sanitize($string)
     {
-        $string = trim($string, '|');
+        $string = trim((string)$string, '|');
         if (!$string) {
             return '';
         }
@@ -428,7 +428,7 @@ protected function listInvalidationKeys(
             $t[] = 'IVK#COMPILE' . $_compile;
         }
         $_name .= '#';
-        $cid = trim($cache_id, '|');
+        $cid = trim((string)$cache_id, '|');
         if (!$cid) {
             return $t;
         }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
index f6879bc7..c77ae9e1 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
@@ -196,7 +196,7 @@ public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $e
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        clearstatcache(true, $cached->lock_id ?: '');
+        clearstatcache(true, $cached->lock_id ?? '');
         if (null !== $cached->lock_id && is_file($cached->lock_id)) {
             $t = filemtime($cached->lock_id);
             return $t && (time() - $t < $smarty->locking_timeout);
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php
index 8ff15d8e..cbaccd2b 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php
@@ -125,7 +125,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
         // setup buffer for template function code
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
         $output = "<?php\n";
-        $output .= "/* {block {$_name}} */\n";
+        $output .= $compiler->cStyleComment(" {block {$_name}} ") . "\n";
         $output .= "class {$_className} extends Smarty_Internal_Block\n";
         $output .= "{\n";
         foreach ($_block as $property => $value) {
@@ -155,7 +155,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
         }
         $output .= "}\n";
         $output .= "}\n";
-        $output .= "/* {/block {$_name}} */\n\n";
+        $output .= $compiler->cStyleComment(" {/block {$_name}} ") . "\n\n";
         $output .= "?>\n";
         $compiler->parser->current_buffer->append_subtree(
             $compiler->parser,
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
index 84e9584d..b05a82b7 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
@@ -134,7 +134,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         if ($compiler->template->compiled->has_nocache_code) {
             $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
             $output = "<?php\n";
-            $output .= "/* {$_funcNameCaching} */\n";
+            $output .= $compiler->cStyleComment(" {$_funcNameCaching} ") . "\n";
             $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
             $output .= "function {$_funcNameCaching} (Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
             $output .= "ob_start();\n";
@@ -159,7 +159,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
             $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
             $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash ?? '', ob_get_clean());\n";
             $output .= "}\n}\n";
-            $output .= "/*/ {$_funcName}_nocache */\n\n";
+            $output .= $compiler->cStyleComment("/ {$_funcName}_nocache ") . "\n\n";
             $output .= "?>\n";
             $compiler->parser->current_buffer->append_subtree(
                 $compiler->parser,
@@ -179,7 +179,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         }
         $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
         $output = "<?php\n";
-        $output .= "/* {$_funcName} */\n";
+        $output .= $compiler->cStyleComment(" {$_funcName} ") . "\n";
         $output .= "if (!function_exists('{$_funcName}')) {\n";
         $output .= "function {$_funcName}(Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
         $output .= $_paramsCode;
@@ -196,7 +196,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         );
         $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
         $output = "<?php\n}}\n";
-        $output .= "/*/ {$_funcName} */\n\n";
+        $output .= $compiler->cStyleComment("/ {$_funcName} ") . "\n\n";
         $output .= "?>\n";
         $compiler->parser->current_buffer->append_subtree(
             $compiler->parser,
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php
index 716c91d4..bf62461b 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php
@@ -318,14 +318,14 @@ public function compileInlineTemplate(
             }
             // get compiled code
             $compiled_code = "<?php\n\n";
-            $compiled_code .= "/* Start inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= $compiler->cStyleComment(" Start inline template \"{$sourceInfo}\" =============================") . "\n";
             $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n";
             $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
             $compiled_code .= "<?php\n";
             $compiled_code .= "}\n?>\n";
             $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
             $compiled_code .= "<?php\n\n";
-            $compiled_code .= "/* End inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= $compiler->cStyleComment(" End inline template \"{$sourceInfo}\" =============================") . "\n";
             $compiled_code .= '?>';
             unset($tpl->compiler);
             if ($tpl->compiled->has_nocache_code) {
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
index c91ff62c..29031d91 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
@@ -93,7 +93,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
                 }
                 if (!empty($_dir)) {
                     foreach ((array)$_dir as $_script_dir) {
-                        $_script_dir = rtrim($_script_dir, '/\\') . DIRECTORY_SEPARATOR;
+                        $_script_dir = rtrim($_script_dir ?? '', '/\\') . DIRECTORY_SEPARATOR;
                         if (file_exists($_script_dir . $_script)) {
                             $_filepath = $_script_dir . $_script;
                             break;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php
index d3aab24b..246350dc 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php
@@ -143,7 +143,7 @@ public function matchProperty($source)
         foreach ($this->resultOffsets as $key => $offset) {
             foreach ($match[ $offset ] as $m) {
                 if (!empty($m)) {
-                    $this->matchResults[ $key ][ strtolower($m) ] = true;
+                    $this->matchResults[ $key ][ smarty_strtolower_ascii($m) ] = true;
                 }
             }
         }
@@ -213,12 +213,12 @@ public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
      */
     public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $tag = strtolower(trim($parameter[ 0 ], '"\''));
+        $tag = smarty_strtolower_ascii(trim($parameter[ 0 ], '"\''));
         $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
         if (!$name) {
             $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
         }
-        $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
+        $property = isset($parameter[ 2 ]) ? smarty_strtolower_ascii($compiler->getId($parameter[ 2 ])) : false;
         if (!$property || !in_array($property, $this->nameProperties)) {
             $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
         }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
index 72773fff..aea082f0 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
@@ -109,6 +109,9 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                             if (!is_object($compiler->smarty->security_policy)
                                 || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
                             ) {
+                                trigger_error('Using php-function "' . $modifier . '" as a modifier is deprecated and will be ' .
+                                    'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
+                                    'a custom modifier.', E_USER_DEPRECATED);
                                 $output = "{$modifier}({$params})";
                             }
                             $compiler->known_modifier_type[ $modifier ] = $type;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
index 23cae8ae..96bd3724 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -93,7 +93,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                 }
                 // autoescape html
                 if ($compiler->template->smarty->escape_html) {
-                    $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
+                    $output = "htmlspecialchars((string) {$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
                 }
                 // loop over registered filters
                 if (!empty($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ])) {
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
index d53ef51f..590cba5a 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -29,7 +29,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
-        $variable = strtolower($compiler->getId($_index[ 0 ]));
+        $variable = smarty_strtolower_ascii($compiler->getId($_index[ 0 ]));
         if ($variable === false) {
             $compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
         }
@@ -40,7 +40,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                 case 'foreach':
                 case 'section':
                     if (!isset(Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ])) {
-                        $class = 'Smarty_Internal_Compile_' . ucfirst($variable);
+                        $class = 'Smarty_Internal_Compile_' . smarty_ucfirst_ascii($variable);
                         Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ] = new $class;
                     }
                     return Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ]->compileSpecialVariable(
@@ -76,7 +76,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                         $compiler->trigger_template_error("(secure mode) super globals not permitted");
                         break;
                     }
-                    $compiled_ref = '$_' . strtoupper($variable);
+                    $compiled_ref = '$_' . smarty_strtoupper_ascii($variable);
                     break;
                 case 'template':
                     return 'basename($_smarty_tpl->source->filepath)';
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
index a9b940e5..469b9667 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
@@ -157,10 +157,12 @@ public function compileTemplate(Smarty_Internal_Template $template)
             $this->smarty->_debug->end_compile($this->template);
         }
         // template header code
-        $template_header =
-            "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . date("Y-m-d H:i:s") .
-            "\n";
-        $template_header .= "         compiled from '{$this->template->source->filepath}' */ ?>\n";
+        $template_header = sprintf(
+            "<?php /* Smarty version %s, created on %s\n         compiled from '%s' */ ?>\n",
+            Smarty::SMARTY_VERSION,
+            date("Y-m-d H:i:s"),
+            str_replace('*/', '* /' , $this->template->source->filepath)
+        );
         $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
                 var_export($this->config_data, true) . '); ?>';
         return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php
index 24b233e2..570819d2 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php
@@ -210,7 +210,7 @@ public function display_debug($obj, $full = false)
         // copy the working dirs from application
         $debObj->setCompileDir($smarty->getCompileDir());
         // init properties by hand as user may have edited the original Smarty class
-        $debObj->setPluginsDir(is_dir(dirname(__FILE__) . '/../plugins') ? dirname(__FILE__) .
+        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ .
                                                                            '/../plugins' : $smarty->getPluginsDir());
         $debObj->force_compile = false;
         $debObj->compile_check = Smarty::COMPILECHECK_ON;
@@ -221,7 +221,7 @@ public function display_debug($obj, $full = false)
         $debObj->debugging_ctrl = 'NONE';
         $debObj->error_reporting = E_ALL & ~E_NOTICE;
         $debObj->debug_tpl =
-            isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . dirname(__FILE__) . '/../debug.tpl';
+            isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
         $debObj->registered_plugins = array();
         $debObj->registered_resources = array();
         $debObj->registered_filters = array();
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
index b0761552..3ef040ab 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
@@ -36,6 +36,7 @@
  * @property   Smarty_Internal_Method_RegisterPlugin     $registerPlugin
  * @property   mixed|\Smarty_Template_Cached             configLoad
  */
+#[\AllowDynamicProperties]
 class Smarty_Internal_Extension_Handler
 {
     public $objType = null;
@@ -88,20 +89,19 @@ public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
                         $objType = $data->_objType;
                         $propertyType = false;
                         if (!isset($this->resolvedProperties[ $match[ 0 ] ][ $objType ])) {
-                            $property = isset($this->resolvedProperties[ 'property' ][ $basename ]) ?
-                                $this->resolvedProperties[ 'property' ][ $basename ] :
-                                $property = $this->resolvedProperties[ 'property' ][ $basename ] = strtolower(
-                                    join(
-                                        '_',
-                                        preg_split(
-                                            '/([A-Z][^A-Z]*)/',
-                                            $basename,
-                                            -1,
-                                            PREG_SPLIT_NO_EMPTY |
-                                            PREG_SPLIT_DELIM_CAPTURE
-                                        )
+                            $property = $this->resolvedProperties['property'][$basename] ??
+                                $this->resolvedProperties['property'][$basename] = smarty_strtolower_ascii(
+                                join(
+                                    '_',
+                                    preg_split(
+                                        '/([A-Z][^A-Z]*)/',
+                                        $basename,
+                                        -1,
+                                        PREG_SPLIT_NO_EMPTY |
+                                        PREG_SPLIT_DELIM_CAPTURE
                                     )
-                                );
+                                )
+                            );
                             if ($property !== false) {
                                 if (property_exists($data, $property)) {
                                     $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 1;
@@ -145,7 +145,7 @@ public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
     public function upperCase($name)
     {
         $_name = explode('_', $name);
-        $_name = array_map('ucfirst', $_name);
+        $_name = array_map('smarty_ucfirst_ascii', $_name);
         return implode('_', $_name);
     }
 
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php
index 3bd659cb..6ddcaec9 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php
@@ -40,7 +40,7 @@ public function loadPlugin(Smarty $smarty, $plugin_name, $check)
             throw new SmartyException("plugin {$plugin_name} is not a valid name format");
         }
         if (!empty($match[ 2 ])) {
-            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
+            $file = SMARTY_SYSPLUGINS_DIR . smarty_strtolower_ascii($plugin_name) . '.php';
             if (isset($this->plugin_files[ $file ])) {
                 if ($this->plugin_files[ $file ] !== false) {
                     return $this->plugin_files[ $file ];
@@ -60,7 +60,7 @@ public function loadPlugin(Smarty $smarty, $plugin_name, $check)
         }
         // plugin filename is expected to be: [type].[name].php
         $_plugin_filename = "{$match[1]}.{$match[4]}.php";
-        $_lower_filename = strtolower($_plugin_filename);
+        $_lower_filename = smarty_strtolower_ascii($_plugin_filename);
         if (isset($this->plugin_files)) {
             if (isset($this->plugin_files[ 'plugins_dir' ][ $_lower_filename ])) {
                 if (!$smarty->use_include_path || $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] !== false) {
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php
index 39318838..381346c8 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php
@@ -32,7 +32,7 @@ public function mustCompile(Smarty_Internal_Template $_template)
     {
         if (!$_template->source->exists) {
             if ($_template->_isSubTpl()) {
-                $parent_resource = " in '$_template->parent->template_resource}'";
+                $parent_resource = " in '{$_template->parent->template_resource}'";
             } else {
                 $parent_resource = '';
             }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
index b5361c9b..d0ca751e 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
@@ -44,9 +44,12 @@ public function create(
             $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
             $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
         }
-        $output = "<?php\n";
-        $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . date("Y-m-d H:i:s") .
-                   "\n  from '" . str_replace('*/', '* /', $_template->source->filepath) . "' */\n\n";
+        $output = sprintf(
+			"<?php\n/* Smarty version %s, created on %s\n  from '%s' */\n\n",
+            $properties[ 'version' ],
+	        date("Y-m-d H:i:s"),
+	        str_replace('*/', '* /', $_template->source->filepath)
+        );
         $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
         $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
                ($cache ? 'true' : 'false') . ')';
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php
index 53069148..7994aa04 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php
@@ -22,7 +22,7 @@ public function save(Smarty_Internal_Template $tpl, $var)
     {
         if (isset($tpl->tpl_vars[ $var ])) {
             $export =
-                preg_replace('/^Smarty_Variable::__set_state[(]|[)]$/', '', var_export($tpl->tpl_vars[ $var ], true));
+                preg_replace('/^\\\\?Smarty_Variable::__set_state[(]|[)]$/', '', var_export($tpl->tpl_vars[ $var ], true));
             if (preg_match('/(\w+)::__set_state/', $export, $match)) {
                 throw new SmartyException("{make_nocache \${$var}} in template '{$tpl->source->name}': variable does contain object '{$match[1]}' not implementing method '__set_state'");
             }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
index 4383e6f3..492d5eb2 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
@@ -29,12 +29,6 @@ public function writeFile($_filepath, $_contents, Smarty $smarty)
     {
         $_error_reporting = error_reporting();
         error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        $_file_perms = property_exists($smarty, '_file_perms') ? $smarty->_file_perms : 0644;
-        $_dir_perms =
-            property_exists($smarty, '_dir_perms') ? (isset($smarty->_dir_perms) ? $smarty->_dir_perms : 0777) : 0771;
-        if ($_file_perms !== null) {
-            $old_umask = umask(0);
-        }
         $_dirpath = dirname($_filepath);
         // if subdirs, create dir structure
         if ($_dirpath !== '.') {
@@ -42,7 +36,7 @@ public function writeFile($_filepath, $_contents, Smarty $smarty)
             // loop if concurrency problem occurs
             // see https://bugs.php.net/bug.php?id=35326
             while (!is_dir($_dirpath)) {
-                if (@mkdir($_dirpath, $_dir_perms, true)) {
+                if (@mkdir($_dirpath, 0777, true)) {
                     break;
                 }
                 clearstatcache();
@@ -89,11 +83,8 @@ public function writeFile($_filepath, $_contents, Smarty $smarty)
             error_reporting($_error_reporting);
             throw new SmartyException("unable to write file {$_filepath}");
         }
-        if ($_file_perms !== null) {
-            // set file permissions
-            chmod($_filepath, $_file_perms);
-            umask($old_umask);
-        }
+        // set file permissions
+        @chmod($_filepath, 0666 & ~umask());
         error_reporting($_error_reporting);
         return true;
     }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
index bae22a7d..72d1d52e 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
@@ -24,6 +24,7 @@
  *
  * @method bool mustCompile()
  */
+#[\AllowDynamicProperties]
 class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
 {
     /**
@@ -292,7 +293,7 @@ public function _subTemplateRender(
         $smarty = &$this->smarty;
         $_templateId = $smarty->_getTemplateId($template, $cache_id, $compile_id, $caching, $tpl);
         // recursive call ?
-        if (isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId() !== $_templateId) {
+        if ((isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId()) !== $_templateId) {
             // already in template cache?
             if (isset(self::$tplObjCache[ $_templateId ])) {
                 // copy data from cached object
@@ -358,7 +359,7 @@ public function _subTemplateRender(
         }
         if ($tpl->caching === 9999) {
             if (!isset($tpl->compiled)) {
-                $this->loadCompiled(true);
+                $tpl->loadCompiled(true);
             }
             if ($tpl->compiled->has_nocache_code) {
                 $this->cached->hashes[ $tpl->compiled->nocache_hash ] = true;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
index 2ffb896f..918362e9 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
@@ -257,7 +257,7 @@ private function _execute($template, $cache_id, $compile_id, $parent, $function)
                 error_reporting($_smarty_old_error_level);
             }
             return $result;
-        } catch (Exception $e) {
+        } catch (Throwable $e) {
             while (ob_get_level() > $level) {
                 ob_end_clean();
             }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
index 27261614..d5c18d31 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -422,9 +422,6 @@ public function compileTemplateSource(
         try {
             // save template object in compiler class
             $this->template = $template;
-            if (property_exists($this->template->smarty, 'plugin_search_order')) {
-                $this->plugin_search_order = $this->template->smarty->plugin_search_order;
-            }
             if ($this->smarty->debugging) {
                 if (!isset($this->smarty->_debug)) {
                     $this->smarty->_debug = new Smarty_Internal_Debug();
@@ -608,7 +605,7 @@ public function compilePHPFunctionCall($name, $parameter)
             if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0
                 || strcasecmp($name, 'array') === 0 || is_callable($name)
             ) {
-                $func_name = strtolower($name);
+                $func_name = smarty_strtolower_ascii($name);
 
                 if ($func_name === 'isset') {
                     if (count($parameter) === 0) {
@@ -768,7 +765,7 @@ public function getTagCompiler($tag)
         if (!isset(self::$_tag_objects[ $tag ])) {
             // lazy load internal compiler plugin
             $_tag = explode('_', $tag);
-            $_tag = array_map('ucfirst', $_tag);
+            $_tag = array_map('smarty_ucfirst_ascii', $_tag);
             $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
             if (class_exists($class_name)
                 && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
@@ -1134,8 +1131,12 @@ public function trigger_template_error($args = null, $line = null, $tagline = nu
             echo ob_get_clean();
             flush();
         }
-        $e = new SmartyCompilerException($error_text);
-        $e->setLine($line);
+        $e = new SmartyCompilerException(
+            $error_text,
+            0,
+            $this->template->source->filepath,
+            $line
+        );
         $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
         $e->desc = $args;
         $e->template = $this->template->source->filepath;
@@ -1439,6 +1440,10 @@ public function compileCheckPlugins($requiredPlugins)
      */
     abstract protected function doCompile($_content, $isTemplateSource = false);
 
+    public function cStyleComment($string) {
+        return '/*' . str_replace('*/', '* /' , $string) . '*/';
+    }
+
     /**
      * Compile Tag
      *
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
index 1fac79b7..c8ffd4cc 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
@@ -144,7 +144,7 @@ public static function testInstall(Smarty $smarty, &$errors = null)
         }
         // test if all registered plugins_dir are accessible
         // and if core plugins directory is still registered
-        $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
+        $_core_plugins_dir = realpath(__DIR__ . '/../plugins');
         $_core_plugins_available = false;
         foreach ($smarty->getPluginsDir() as $plugin_dir) {
             $_plugin_dir = $plugin_dir;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_resource.php b/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
index 7fe84536..3c43a9f4 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
@@ -76,11 +76,11 @@ public static function load(Smarty $smarty, $type)
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
-            $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
+            $_resource_class = 'Smarty_Internal_Resource_' . smarty_ucfirst_ascii($type);
             return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
         }
         // try plugins dir
-        $_resource_class = 'Smarty_Resource_' . ucfirst($type);
+        $_resource_class = 'Smarty_Resource_' . smarty_ucfirst_ascii($type);
         if ($smarty->loadPlugin($_resource_class)) {
             if (class_exists($_resource_class, false)) {
                 return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php b/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
index 8d66be3a..191fa7c9 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
@@ -47,7 +47,7 @@ protected function fetchTimestamp($name)
      */
     public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        $source->filepath = $source->type . ':' . substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25);
+        $source->filepath = $source->type . ':' . $this->generateSafeName($source->name);
         $source->uid = sha1($source->type . ':' . $source->name);
         $mtime = $this->fetchTimestamp($source->name);
         if ($mtime !== null) {
@@ -88,6 +88,17 @@ public function getContent(Smarty_Template_Source $source)
      */
     public function getBasename(Smarty_Template_Source $source)
     {
-        return basename(substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25));
+        return basename($this->generateSafeName($source->name));
+    }
+
+    /**
+     * Removes special characters from $name and limits its length to 127 characters.
+     *
+     * @param $name
+     *
+     * @return string
+     */
+    private function generateSafeName($name): string {
+        return substr(preg_replace('/[^A-Za-z0-9._]/', '', (string) $name), 0, 127);
     }
 }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_security.php b/WEB-INF/lib/smarty/sysplugins/smarty_security.php
index 3c29c813..97cd0521 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_security.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_security.php
@@ -19,6 +19,7 @@
 /**
  * This class does contain the security settings
  */
+#[\AllowDynamicProperties]
 class Smarty_Security
 {
 
@@ -105,7 +106,7 @@ class Smarty_Security
      *
      * @var array
      */
-    public $php_modifiers = array('escape', 'count', 'nl2br',);
+    public $php_modifiers = array('escape', 'count', 'sizeof', 'nl2br',);
 
     /**
      * This is an array of allowed tags.
@@ -328,7 +329,7 @@ public function isTrustedStaticClassAccess($class_name, $params, $compiler)
      *
      * @param string $modifier_name
      * @param object $compiler compiler object
-     *
+     * @deprecated
      * @return boolean                 true if modifier is trusted
      */
     public function isTrustedPhpModifier($modifier_name, $compiler)
@@ -555,35 +556,6 @@ public function isTrustedUri($uri)
         throw new SmartyException("URI '{$uri}' not allowed by security setting");
     }
 
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param string $filepath
-     *
-     * @return boolean         true if directory is trusted
-     * @throws SmartyException if PHP directory is not trusted
-     */
-    public function isTrustedPHPDir($filepath)
-    {
-        if (empty($this->trusted_dir)) {
-            throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
-        }
-        // check if index is outdated
-        if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
-            $this->_php_resource_dir = array();
-            $this->_trusted_dir = $this->trusted_dir;
-            foreach ((array)$this->trusted_dir as $directory) {
-                $directory = $this->smarty->_realpath($directory . '/', true);
-                $this->_php_resource_dir[ $directory ] = true;
-            }
-        }
-        $addPath = $this->_checkDir($filepath, $this->_php_resource_dir);
-        if ($addPath !== false) {
-            $this->_php_resource_dir = array_merge($this->_php_resource_dir, $addPath);
-        }
-        return true;
-    }
-
     /**
      * Remove old directories and its sub folders, add new directories
      *
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_variable.php b/WEB-INF/lib/smarty/sysplugins/smarty_variable.php
index 914d99bd..6a534228 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_variable.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_variable.php
@@ -7,6 +7,7 @@
  * @package    Smarty
  * @subpackage Template
  */
+#[\AllowDynamicProperties]
 class Smarty_Variable
 {
     /**
diff --git a/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php b/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
index 8833aa52..0a0a3235 100644
--- a/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
+++ b/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
@@ -7,6 +7,33 @@
  */
 class SmartyCompilerException extends SmartyException
 {
+    /**
+     * The constructor of the exception
+     *
+     * @param string         $message  The Exception message to throw.
+     * @param int            $code     The Exception code.
+     * @param string|null    $filename The filename where the exception is thrown.
+     * @param int|null       $line     The line number where the exception is thrown.
+     * @param Throwable|null $previous The previous exception used for the exception chaining.
+     */
+    public function __construct(
+        string $message = "",
+        int $code = 0,
+        ?string $filename = null,
+        ?int $line = null,
+        Throwable $previous = null
+    ) {
+        parent::__construct($message, $code, $previous);
+
+        // These are optional parameters, should be be overridden only when present!
+        if ($filename) {
+            $this->file = $filename;
+        }
+        if ($line) {
+            $this->line = $line;
+        }
+    }
+
     /**
      * @return string
      */
@@ -22,6 +49,7 @@ public function setLine($line)
     {
         $this->line = $line;
     }
+
     /**
      * The template source snippet relating to the error
      *
diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 35a26afb..4a631d5e 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -138,7 +138,8 @@ static function updateSelf($fields) {
     // Update self.
     $user_id = $user->id;
     $login_part = 'login = '.$mdb2->quote($fields['login']);
-    if ($fields['password1'])
+    $password_part = '';
+    if (isset($fields['password1']))
       $password_part = ', password = md5('.$mdb2->quote($fields['password1']).')';
     $name_part = ', name = '.$mdb2->quote($fields['name']);
     $email_part = ', email = '.$mdb2->quote($fields['email']);
@@ -150,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();
 
@@ -158,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.
diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index f0523036..6550f5fa 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -4,6 +4,8 @@
 
 import('ttPeriod');
 import('ttTimeHelper');
+import('ttFavReportHelper');
+import('ttReportHelper');
 
 // Definitions for chart types.
 define('CHART_PROJECTS', 1);
@@ -13,7 +15,7 @@
 // Class ttChartHelper is a helper class for charts.
 class ttChartHelper {
 
-  // getTotals - returns total times by project or task for a given user in a specified period.
+  // getTotals - returns total times by project, task, or client for a given user in a specified period.
   static function getTotals($user_id, $chart_type, $selected_date, $interval_type) {
 
     global $user;
@@ -35,6 +37,10 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
         $period = new ttPeriod(new ttDate($selected_date), INTERVAL_THIS_MONTH);
         break;
 
+      case INTERVAL_PREVIOUS_MONTH:
+        $period = new ttPeriod(new ttDate($selected_date), INTERVAL_PREVIOUS_MONTH);
+        break;
+
       case INTERVAL_THIS_YEAR:
         $period = new ttPeriod(new ttDate($selected_date), INTERVAL_THIS_YEAR);
         break;
@@ -123,6 +129,102 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
     return $result;
   }
 
+
+  // getTotals - returns total times by project, task, or client for a selected fav report.
+  static function getTotalsForFavReport($fav_report_id, $chart_type) {
+
+    global $user;
+
+    // Use custom fields plugin if it is enabled.
+    if ($user->isPluginEnabled('cf')) {
+      require_once(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 group by l.project_id";
+    } elseif (CHART_TASKS == $chart_type) {
+      // Data for tasks.
+      $sql = "select t.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
+        left join tt_tasks t on (t.id = l.task_id)
+        $where group by l.task_id";
+    } elseif (CHART_CLIENTS == $chart_type) {
+      // Data for clients.
+      $sql = "select c.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
+        left join tt_clients c on (c.id = l.client_id)
+        $where group by l.client_id";
+    }
+
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        if ($val['time'] > 0) // Only positive totals make sense in pie charts. Skip negatives entirely.
+          $result[] = array('name'=>$val['name'],'time'=>$val['time']); // name - entity name, time - total for entity in seconds.
+      }
+    }
+
+    // Get total time. We'll need it to calculate percentages (for labels to the right of diagram).
+    $total = 0;
+    foreach ($result as $one_val) {
+      $total += $one_val['time'];
+    }
+    // Add a string representation of time + percentage to names. Example: "Time Tracker (1:15 - 6%)".
+    foreach ($result as &$one_val) {
+      $percent = round(100*$one_val['time']/$total).'%';
+      $one_val['name'] .= ' ('.ttTimeHelper::minutesToDuration($one_val['time'] / 60).' - '.$percent.')';
+    }
+
+    // Note: the remaining code here is needed to display labels on the side of the diagram.
+    // We print labels ourselves (not using libchart.php) because quality of libchart labels is not good.
+
+    // Note: Optimize this sorting and reversing.
+    $result = mu_sort($result, 'time');
+    $result = array_reverse($result); // This is to assign correct colors to labels.
+
+    // Add color to array items. This is used in labels on the side of a chart.
+    $colors = array(
+      array(2, 78, 0),
+      array(148, 170, 36),
+      array(233, 191, 49),
+      array(240, 127, 41),
+      array(243, 63, 34),
+      array(190, 71, 47),
+      array(135, 81, 60),
+      array(128, 78, 162),
+      array(121, 75, 255),
+      array(142, 165, 250),
+      array(162, 254, 239),
+      array(137, 240, 166),
+      array(104, 221, 71),
+      array(98, 174, 35),
+      array(93, 129, 1)
+    );
+    for ($i = 0; $i < count($result); $i++) {
+      $color = $colors[$i%count($colors)];
+      $result[$i]['color_html'] = sprintf('#%02x%02x%02x', $color[0], $color[1], $color[2]);
+    }
+
+    return $result;
+  }
+
+
   // adjustType - adjust chart type to something that is available for a group.
   static function adjustType($requested_type) {
     global $user;
diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 3de0c94c..2b247043 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -97,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,".
@@ -107,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'].", ".
@@ -139,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']).", ".
@@ -226,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,
@@ -326,16 +328,35 @@ 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']);
@@ -440,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.
@@ -511,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.
@@ -522,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] = $checkbox_value;
+          $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] = (int)$checkbox_value;
         }
       }
-      // TODO: add project fields here.
     }
 
     // Adjust period_start and period_end to user date format.
@@ -576,6 +666,28 @@ static function makeReportSpec($bean) {
       }
     }
 
+    // Add project custom field settings.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = str_replace(',','&#44',$bean->getAttribute($field_name));
+        $checkbox_field_name = 'show_'.$field_name;
+        $checkbox_field_value = (int) $bean->getAttribute($checkbox_field_name);
+        if ($field_value) $reportSpecArray[] = $field_name.':'.$field_value;
+        if ($checkbox_field_value) $reportSpecArray[] = $checkbox_field_name.':1';
+      }
+    }
+
+    // Add projects ids. Format: project_ids:25&756&567&1023. Use the & sign to join multiple project ids.
+    $selected_projects_in_bean = $bean->getAttribute('project');
+    if (!is_array($selected_projects_in_bean)) {
+      $selectedProjects = $bean->getAttribute('project[]');
+    }
+    if (is_array($selected_projects_in_bean) && !empty($selected_projects_in_bean[0])) {
+      $selectedProjectsSpec = join('&', $selected_projects_in_bean);
+    }
+    if (isset($selectedProjectsSpec)) $reportSpecArray[] = 'project_ids:'.$selectedProjectsSpec;
+
     $reportSpec = null;
     if (isset($reportSpecArray))
       $reportSpec = implode(',', $reportSpecArray);
diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index a464f2e2..ecd4f80a 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -137,7 +137,8 @@ function writeData() {
     $group_part .= " workday_minutes=\"".$group['workday_minutes']."\"";
     $group_part .= " custom_logo=\"".$group['custom_logo']."\"";
     $group_part .= " config=\"".$group['config']."\"";
-    $group_part .= " custom_css=\"".$group['custom_css']."\"";
+    $group_part .= " custom_css=\"".htmlspecialchars($group['custom_css'])."\"";
+    $group_part .= " custom_translation=\"".htmlspecialchars($group['custom_translation'])."\"";
     $group_part .= ">\n";
 
     // Write group info.
@@ -424,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);
       }
@@ -566,6 +568,7 @@ function writeData() {
         $fav_report_part .= " invoice=\"".$fav_report['invoice']."\"";
         $fav_report_part .= " timesheet=\"".$fav_report['timesheet']."\"";
         $fav_report_part .= " paid_status=\"".$fav_report['paid_status']."\"";
+        $fav_report_part .= " note_containing=\"".$fav_report['note_containing']."\"";
         $fav_report_part .= " users=\"".$user_list."\"";
         $fav_report_part .= " period=\"".$fav_report['period']."\"";
         $fav_report_part .= " period_start=\"".$fav_report['period_start']."\"";
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 2ac63db4..44206fa0 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -298,8 +298,7 @@ static function createInvoice($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $name = $fields['name'];
-    if (!$name) return false;
+    $name = isset($fields['name']) ? $fields['name'] : null;
 
     $client_id = (int) $fields['client_id'];
 
diff --git a/WEB-INF/lib/ttOrgExportHelper.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
index 277eac3a..9380231e 100644
--- a/WEB-INF/lib/ttOrgExportHelper.class.php
+++ b/WEB-INF/lib/ttOrgExportHelper.class.php
@@ -1,30 +1,6 @@
 <?php
-// +----------------------------------------------------------------------+
-// | Anuko Time Tracker
-// +----------------------------------------------------------------------+
-// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
-// +----------------------------------------------------------------------+
-// | LIBERAL FREEWARE LICENSE: This source code document may be used
-// | by anyone for any purpose, and freely redistributed alone or in
-// | combination with other software, provided that the license is obeyed.
-// |
-// | There are only two ways to violate the license:
-// |
-// | 1. To redistribute this code in source form, with the copyright
-// |    notice or license removed or altered. (Distributing in compiled
-// |    forms without embedded copyright notices is permitted).
-// |
-// | 2. To redistribute modified versions of this code in *any* form
-// |    that bears insufficient indications that the modifications are
-// |    not the work of the original author(s).
-// |
-// | This license applies to this document only, not any other software
-// | that it may be combined with.
-// |
-// +----------------------------------------------------------------------+
-// | Contributors:
-// | https://www.anuko.com/time-tracker/credits.htm
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttTeamHelper');
 import('ttTimeHelper');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 744b67e4..cc0ecf1d 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -99,7 +99,8 @@ function startElement($parser, $name, $attrs) {
           'workday_minutes' => $attrs['WORKDAY_MINUTES'],
           'custom_logo' => $attrs['CUSTOM_LOGO'],
           'config' => $attrs['CONFIG'],
-          'custom_css' => $attrs['CUSTOM_CSS']));
+          'custom_css' => $attrs['CUSTOM_CSS'],
+          'custom_translation' => $attrs['CUSTOM_TRANSLATION']));
 
         // Special handling for top group.
         if (!$this->org_id && $this->current_group_id) {
@@ -167,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)
@@ -193,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)
@@ -218,7 +221,6 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'USER') {
         // We get here when processing <user> tags for the current group.
-
         $role_id = $attrs['ROLE_ID'] === '0' ? $this->top_role_id :  $this->currentGroupRoleMap[$attrs['ROLE_ID']]; // 0 (not null) means top manager role.
 
         $user_id = $this->insertUser(array(
@@ -348,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;
@@ -461,6 +464,7 @@ function startElement($parser, $name, $attrs) {
           'invoice' => $attrs['INVOICE'],
           'timesheet' => $attrs['TIMESHEET'],
           'paid_status' => $attrs['PAID_STATUS'],
+          'note_containing' => $attrs['NOTE_CONTAINING'],
           'users' => $user_list,
           'period' => $attrs['PERIOD'],
           'from' => $attrs['PERIOD_START'],
@@ -682,7 +686,7 @@ private function createGroup($fields) {
     $columns = '(parent_id, org_id, group_key, name, description, currency, decimal_mark, lang, date_format, time_format,'.
       ' week_start, tracking_mode, project_required, record_type, bcc_email,'.
       ' allow_ip, password_complexity, plugins, lock_spec,'.
-      ' workday_minutes, config, custom_css, created, created_ip, created_by)';
+      ' workday_minutes, config, custom_css, custom_translation, created, created_ip, created_by)';
 
     $values = ' values (';
     $values .= $mdb2->quote($fields['parent_id']);
@@ -707,6 +711,7 @@ private function createGroup($fields) {
     $values .= ', '.(int)$fields['workday_minutes'];
     $values .= ', '.$mdb2->quote($fields['config']);
     $values .= ', '.$mdb2->quote($fields['custom_css']);
+    $values .= ', '.$mdb2->quote($fields['custom_translation']);
     $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
     $values .= ')';
 
@@ -898,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'];
 
@@ -1013,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'];
@@ -1049,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,".
@@ -1060,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'].", ".
@@ -1150,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
index 1d63ad9d..0dcbf71c 100644
--- a/WEB-INF/lib/ttPeriod.class.php
+++ b/WEB-INF/lib/ttPeriod.class.php
@@ -7,9 +7,9 @@
 define('INTERVAL_THIS_MONTH', 3);
 define('INTERVAL_THIS_YEAR', 4);
 define('INTERVAL_ALL_TIME', 5);
-define('INTERVAL_LAST_WEEK', 6);
-define('INTERVAL_LAST_MONTH', 7);
-define('INTERVAL_LAST_DAY', 8);
+define('INTERVAL_PREVIOUS_WEEK', 6);
+define('INTERVAL_PREVIOUS_MONTH', 7);
+define('INTERVAL_PREVIOUS_DAY', 8);
 
 class ttPeriod {
   var $startDate; // ttDate object.
@@ -34,7 +34,7 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
         $this->endDate->setFromUnixTimestamp($ttDateInstance->getTimestamp());
         break;
 
-      case INTERVAL_LAST_DAY:
+      case INTERVAL_PREVIOUS_DAY:
         $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-1,$t_arr[5]));
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-1,$t_arr[5]));
         break;
@@ -44,7 +44,7 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
         break;
 
-      case INTERVAL_LAST_WEEK:
+      case INTERVAL_PREVIOUS_WEEK:
         $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]-7+$startWeekBias,$t_arr[5]));
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]-1+$startWeekBias,$t_arr[5]));
         break;
@@ -54,7 +54,7 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
 	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+2,0,$t_arr[5]));
 	break;
 
-      case INTERVAL_LAST_MONTH:
+      case INTERVAL_PREVIOUS_MONTH:
         $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4],1,$t_arr[5]));
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,0,$t_arr[5]));
         break;
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index e1d5754c..30328968 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -166,7 +166,7 @@ static function getProjectByName($name) {
   }
   
   
-  // delete - deletes things associated with a project and marks the project as deleted. 
+  // delete - deletes things associated with a project and marks the project and its custom fields as deleted.
   static function delete($id) {
     global $user;
     $mdb2 = getConnection();
@@ -220,6 +220,17 @@ static function delete($id) {
     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;
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index ae499a9d..8afbf665 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -41,13 +41,13 @@ function __construct($fields, &$err) {
   function validate() {
     global $i18n;
 
-    if (!ttValidString($this->group_name))
+    if (!ttValidString($this->group_name, false, MAX_NAME_CHARS))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
-    if (!ttValidString($this->currency, true))
+    if (!ttValidString($this->currency, true, MAX_CURRENCY_CHARS))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.currency'));
-    if (!ttValidString($this->user_name))
+    if (!ttValidString($this->user_name, false, MAX_NAME_CHARS))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_name'));
-    if (!ttValidString($this->login))
+    if (!ttValidString($this->login, false, MAX_NAME_CHARS))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_login'));
     if (!ttValidString($this->password1))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.password'));
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 693fe652..fb802f95 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -8,7 +8,7 @@
 import('ttTimeHelper');
 import('ttConfigHelper');
 
-require_once(dirname(__FILE__).'/../../plugins/CustomFields.class.php');
+require_once(APP_DIR.'/plugins/CustomFields.class.php');
 
 // Definitions of types for timesheet dropdown.
 define('TIMESHEET_ALL', 0); // Include all records.
@@ -46,18 +46,22 @@ 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 (isset($custom_fields) && $custom_fields->timeFields) {
@@ -108,6 +112,30 @@ static function getWhere($options) {
       }
     }
 
+    // Add project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        if ($projectField['type'] == CustomFields::TYPE_DROPDOWN && $field_value) {
+          $cfoTable = 'cfo'.$projectField['id'];
+          $dropdown_parts .= " and $cfoTable.id = $field_value";
+        }
+      }
+    }
+
+    // Continue preparing part for text custom fields using LIKE operator.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        if ($projectField['type'] == CustomFields::TYPE_TEXT && $field_value) {
+          $ecfTableName = 'ecf'.$projectField['id'];
+          $cf_text_parts .= " and $ecfTableName.value like ".$mdb2->quote("%$field_value%");
+        }
+      }
+    }
+
     // Prepare sql query part for user list.
     $userlist = isset($options['users']) ? $options['users'] : '-1';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
@@ -116,6 +144,12 @@ static function getWhere($options) {
       $user_list_part = " and l.user_id = ".$user->getUser();
     $user_list_part .= " and l.group_id = $group_id and l.org_id = $org_id";
 
+    // Prepare part for note_containing using LIKE operator.
+    $note_containing_part = '';
+    if (isset($options['note_containing']) && !empty($options['note_containing'])) {
+      $note_containing_part = " and l.comment like ".$mdb2->quote('%'.$options['note_containing'].'%');
+    }
+
     // Prepare sql query part for where.
     $dateFormat = $user->getDateFormat();
     if (isset($options['period']) && $options['period'])
@@ -127,7 +161,7 @@ static function getWhere($options) {
         new ttDate($options['period_end'], $dateFormat));
     }
     $where = " where l.status = 1 and l.date >= '".$period->getStartDate()."' and l.date <= '".$period->getEndDate()."'".
-      " $user_list_part $dropdown_parts $cf_text_parts";
+      $user_list_part.$dropdown_parts.$cf_text_parts.$note_containing_part;
     return $where;
   }
 
@@ -150,16 +184,20 @@ 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.
@@ -190,6 +228,30 @@ static function getExpenseWhere($options) {
       }
     }
 
+    // Add project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        if ($projectField['type'] == CustomFields::TYPE_DROPDOWN && $field_value) {
+          $cfoTable = 'cfo'.$projectField['id'];
+          $dropdown_parts .= " and $cfoTable.id = $field_value";
+        }
+      }
+    }
+
+    // Continue 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 = isset($options['users']) ? $options['users'] : '-1';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
@@ -198,6 +260,12 @@ static function getExpenseWhere($options) {
       $user_list_part = " and ei.user_id = ".$user->getUser();
     $user_list_part .= " and ei.group_id = $group_id and ei.org_id = $org_id";
 
+    // Prepare part for note_containing using LIKE operator.
+    $note_containing_part = '';
+    if (isset($options['note_containing']) && !empty($options['note_containing'])) {
+      $note_containing_part = " and ei.name like ".$mdb2->quote('%'.$options['note_containing'].'%');
+    }
+
     // Prepare sql query part for where.
     $dateFormat = $user->getDateFormat();
     if (isset($options['period']) && $options['period'])
@@ -209,7 +277,7 @@ static function getExpenseWhere($options) {
         new ttDate($options['period_end'], $dateFormat));
     }
     $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate()."' and ei.date <= '".$period->getEndDate()."'".
-      " $user_list_part $dropdown_parts $cf_text_parts";
+      $user_list_part.$dropdown_parts.$cf_text_parts.$note_containing_part;
     return $where;
   }
 
@@ -294,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");
@@ -321,12 +405,19 @@ static function getItems($options) {
     // Handle cost.
     $includeCost = $options['show_cost'];
     if ($includeCost) {
-      if (MODE_TIME == $trackingMode)
+      $includeCostPerHour = $user->getConfigOption('report_cost_per_hour');
+      if (MODE_TIME == $trackingMode) {
+        if ($includeCostPerHour)
+          array_push($fields, "cast(l.billable * coalesce(u.rate, 0) as decimal(10,2)) as cost_per_hour");   // Use default user rate.
         array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost");   // Use default user rate.
-      else
+      } else {
+        if ($includeCostPerHour)
+          array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) as decimal(10,2)) as cost_per_hour"); // Use project rate for user.
         array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
+      }
       array_push($fields, "null as expense"); 
     }
+
     // Add the fields used to determine if we show an edit icon for record.
     array_push($fields, 'l.approved');
     array_push($fields, 'l.timesheet_id');
@@ -353,8 +444,7 @@ static function getItems($options) {
 
     // Prepare sql query part for left joins.
     $left_joins = null;
-    // Left joins for custom fields.
-    // 1 join is required for each text field, 2 joins for each dropdown.
+    // Left joins for user custom fields.
     if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
@@ -374,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'])
@@ -476,6 +586,22 @@ static function getItems($options) {
           }
         }
       }
+      // Add project custom fields.
+      if (isset($custom_fields) && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          if ($options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
+            if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+              $ecfTableName = 'ecf'.$projectField['id'];
+              array_push($fields, "$ecfTableName.value as $field_name");
+            } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+              $cfoTableName = 'cfo'.$projectField['id'];
+              array_push($fields, "$cfoTableName.value as $field_name");
+            }
+          }
+        }
+      }
       if ($options['show_start']) {
         array_push($fields, 'null'); // null for unformatted_start.
         array_push($fields, 'null'); // null for start.
@@ -489,6 +615,8 @@ static function getItems($options) {
       // Use the note field to print item name.
       if ($options['show_note'])
         array_push($fields, 'ei.name as note');
+      if ($user->getConfigOption('report_cost_per_hour'))
+        array_push($fields, 'null as cost_per_hour'); // null for cost_per_hour.
       array_push($fields, 'ei.cost as cost');
       array_push($fields, 'ei.cost as expense');
       // Add the fields used to determine if we show an edit icon for record.
@@ -536,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)
@@ -592,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']);
@@ -801,6 +953,26 @@ static function getTotals($options)
         }
       }
     }
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        $entity_type = CustomFields::ENTITY_PROJECT;
+        if ($field_value) {
+          // We need to add left joins when input is not null.
+          $ecfTable = 'ecf'.$projectField['id'];
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$projectField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
+    }
     if (isset($options['show_cost']) && $options['show_cost']) {
       if (MODE_TIME == $trackingMode) {
         $left_joins .= " left join tt_users u on (l.user_id = u.id)";
@@ -851,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";
 
@@ -1012,6 +1204,7 @@ static function prepareReportBody($options, $comment = null)
     $config = new ttConfigHelper($user->getConfig());
     $show_note_column = $options['show_note'] && !$config->getDefinedValue('report_note_on_separate_row');
     $show_note_row = $options['show_note'] && $config->getDefinedValue('report_note_on_separate_row');
+    $show_cost_per_hour = $options['show_cost'] && $config->getDefinedValue('report_cost_per_hour') && ($user->can('manage_invoices') || $user->isClient());
 
     $items = ttReportHelper::getItems($options);
     $grouping = ttReportHelper::grouping($options);
@@ -1047,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) {
@@ -1060,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++;
@@ -1156,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.
@@ -1176,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'])
@@ -1224,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) {
@@ -1238,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'];
@@ -1273,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.
@@ -1293,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']) {
@@ -1313,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.'">';
@@ -1343,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) {
@@ -1357,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'];
@@ -1385,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) {
@@ -1399,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'];
@@ -1514,17 +1763,28 @@ 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 = '';
@@ -1538,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')) {
@@ -1567,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);
         }
       }
 
@@ -1577,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;
   }
 
@@ -1596,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');
@@ -1616,10 +1906,162 @@ 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) {
@@ -1760,6 +2202,19 @@ static function makeSingleDropdownConcatCustomFieldPart($dropdown_value) {
         }
       }
     }
+    // Iterate through project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ' - ', coalesce(ecf".$projectField['id'].".value, 'Null')");
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", ' - ', coalesce(cfo".$projectField['id'].".value, 'Null')");
+          }
+        }
+      }
+    }
     // Iterate through time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -1794,6 +2249,19 @@ static function makeSingleDropdownConcatCustomFieldExpensesPart($dropdown_value)
         }
       }
     }
+    // Iterate through project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ' - ', coalesce(ecf".$projectField['id'].".value, 'Null')");
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", ' - ', coalesce(cfo".$projectField['id'].".value, 'Null')");
+          }
+        }
+      }
+    }
     // Iterate through time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -1847,6 +2315,19 @@ static function makeSingleDropdownGroupByCustomFieldPart($dropdown_value) {
         }
       }
     }
+    // Iterate through project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ecf".$projectField['id'].".value as $field_name");
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", cfo".$projectField['id'].".value as $field_name");
+          }
+        }
+      }
+    }
     // Iterate through time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -1881,6 +2362,19 @@ static function makeSingleDropdownGroupByCustomFieldExpensesPart($dropdown_value
         }
       }
     }
+    // Iterate through project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ecf".$projectField['id'].".value as $field_name");
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", cfo".$projectField['id'].".value as $field_name");
+          }
+        }
+      }
+    }
     // Iterate through time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -2116,6 +2610,27 @@ static function makeJoinPart($options) {
         }
       }
     }
+    // Left joins for project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        $entity_type = CustomFields::ENTITY_PROJECT;
+        if ($field_value || ttReportHelper::groupingBy($field_name, $options)) {
+          // We need to add left joins when input is not null.
+          $ecfTable = 'ecf'.$projectField['id'];
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$projectField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
+    }
 
     // Prepare inner joins.
     $inner_joins = null;
@@ -2205,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;
   }
@@ -2237,7 +2773,7 @@ static function makeGroupByHeaderPart($dropdown_value) {
 
     // First, try to get a label from a translation file, which is the most likely scenario
     // such as grouping by date, user, project, or task.
-    if (!ttStartsWith($dropdown_value, 'time_field_') && !ttStartsWith($dropdown_value, 'user_field_')) {
+    if (!ttContains($dropdown_value, '_field_')) {
       $key = 'label.'.$dropdown_value;
       $part = $i18n->get($key);
       if ($part) return $part;
@@ -2264,6 +2800,15 @@ static function makeGroupByHeaderPart($dropdown_value) {
         }
       }
     }
+    // Process project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          return $projectField['label'];
+        }
+      }
+    }
 
     // Return null if nothing is found.
     return null;
@@ -2300,6 +2845,13 @@ static function makeGroupByHeader($options) {
   // makeGroupByXmlTag creates an xml tag for a totals only report using group_by1,
   // group_by2, and group_by3 values passed in $options.
   static function makeGroupByXmlTag($options) {
+    // Note: there is a problem with this function for custom fields.
+    // Returned xml tags are like "project_field_1134" and not their user entered labels.
+    // This is on purpose because we are trying to avoid potential XML parsing problems.
+    // See https://stackoverflow.com/questions/1478486/using-in-xml-element-name
+    // Perhaps review this if someone complains, but there are W3C standard (section 2.3) rules
+    // on names (including starting character).
+
     $tag = '';
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 2e9eddbb..6019b2f1 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -440,8 +440,7 @@ static function insert($fields)
 
     if (!$billable) $billable = 0;
     if (!$paid) $paid = 0;
-
-    if ($duration) {
+    if (!is_null($duration)) {
       $sql = "insert into tt_log (user_id, group_id, org_id, date, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by) ".
         "values ($user_id, $group_id, $org_id, ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v)";
       $affected = $mdb2->exec($sql);
@@ -500,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);
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e0565b3d..fedf3daf 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -50,6 +50,7 @@ class ttUser {
   var $config = null;           // Comma-separated list of miscellaneous config options.
   var $configHelper = null;     // An instance of ttConfigHelper class.
   var $custom_css = null;       // Custom css.
+  var $custom_translation = null; // Custom translation.
 
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
@@ -61,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) {
@@ -68,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.record_type,".
-      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.custom_css, g.holidays, g.workday_minutes, g.custom_logo".
-      " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
-    if ($id)
-      $sql .= "u.id = $id";
-    else
-      $sql .= "u.login = ".$mdb2->quote($login);
-    $sql .= " AND u.status = 1";
+    try {
+      $mdb2 = getConnection();
+
+      $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
+        " u.quota_percent, u.email, g.org_id, g.group_key, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
+        " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.record_type,".
+        " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.custom_css, g.custom_translation,".
+        " g.holidays, g.workday_minutes, g.custom_logo".
+        " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
+      if ($id)
+        $sql .= "u.id = $id";
+      else
+        $sql .= "u.login = ".$mdb2->quote($login);
+      $sql .= " AND u.status = 1";
+
+      $res = $mdb2->query($sql);
+      if (is_a($res, 'PEAR_Error')) {
+        return;
+      }
 
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) {
-      return;
-    }
+      $val = $res->fetchRow();
+      if ($val['id'] > 0) {
+        $this->login = $val['login'];
+        $this->name = $val['name'];
+        $this->id = $val['id'];
+        $this->org_id = $val['org_id'];
+        $this->group_id = $val['group_id'];
+        $this->group_key = $val['group_key'];
+        if ($this->org_id == $this->group_key) $this->org_key = $val['group_key'];
+        $this->role_id = $val['role_id'];
+        $this->role_name = $val['role_name'];
+        $this->rights = explode(',', $val['rights']);
+        $this->rank = $val['rank'];
+        $this->client_id = $val['client_id'];
+        $this->is_client = $this->client_id && !in_array('track_own_time', $this->rights);
+        if ($val['quota_percent']) $this->quota_percent = $val['quota_percent'];
+        $this->email = $val['email'];
+        if ($val['lang']) $this->lang = $val['lang'];
+        if ($val['decimal_mark']) $this->decimal_mark = $val['decimal_mark'];
+        $this->date_format = $val['date_format'];
+        $this->time_format = $val['time_format'];
+        $this->week_start = $val['week_start'];
+        $this->tracking_mode = $val['tracking_mode'];
+        $this->project_required = $val['project_required'];
+        $this->record_type = $val['record_type'];
+        $this->bcc_email = $val['bcc_email'];
+        $this->allow_ip = $val['allow_ip'];
+        $this->password_complexity = $val['password_complexity'];
+        $this->group_name = $val['group_name'];
+        $this->currency = $val['currency'];
+        $this->plugins = $val['plugins'];
+        $this->lock_spec = $val['lock_spec'];
+        $this->holidays = $val['holidays'];
+        $this->workday_minutes = $val['workday_minutes'];
+        $this->custom_logo = $val['custom_logo'];
+
+        // TODO: refactor this.
+        $this->config = $val['config'];
+        $this->configHelper = new ttConfigHelper($val['config']);
+
+        // Set user config options.
+        $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
+        $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
+
+        $this->custom_css = $val['custom_css'];
+        $this->custom_translation = $val['custom_translation'];
+
+        // Set "on behalf" id and name (user).
+        if (isset($_SESSION['behalf_id'])) {
+          $this->behalf_id = $_SESSION['behalf_id'];
+          $this->behalf_name = $_SESSION['behalf_name'];
+
+          $this->behalfUser = new ttBehalfUser($this->behalf_id, $this->org_id);
+        }
+        // Set "on behalf" id and name (group).
+        if (isset($_SESSION['behalf_group_id'])) {
+          $this->behalf_group_id = $_SESSION['behalf_group_id'];
+          $this->behalf_group_name = $_SESSION['behalf_group_name'];
 
-    $val = $res->fetchRow();
-    if ($val['id'] > 0) {
-      $this->login = $val['login'];
-      $this->name = $val['name'];
-      $this->id = $val['id'];
-      $this->org_id = $val['org_id'];
-      $this->group_id = $val['group_id'];
-      $this->group_key = $val['group_key'];
-      if ($this->org_id == $this->group_key) $this->org_key = $val['group_key'];
-      $this->role_id = $val['role_id'];
-      $this->role_name = $val['role_name'];
-      $this->rights = explode(',', $val['rights']);
-      $this->rank = $val['rank'];
-      $this->client_id = $val['client_id'];
-      $this->is_client = $this->client_id && !in_array('track_own_time', $this->rights);
-      if ($val['quota_percent']) $this->quota_percent = $val['quota_percent'];
-      $this->email = $val['email'];
-      if ($val['lang']) $this->lang = $val['lang'];
-      if ($val['decimal_mark']) $this->decimal_mark = $val['decimal_mark'];
-      $this->date_format = $val['date_format'];
-      $this->time_format = $val['time_format'];
-      $this->week_start = $val['week_start'];
-      $this->tracking_mode = $val['tracking_mode'];
-      $this->project_required = $val['project_required'];
-      $this->record_type = $val['record_type'];
-      $this->bcc_email = $val['bcc_email'];
-      $this->allow_ip = $val['allow_ip'];
-      $this->password_complexity = $val['password_complexity'];
-      $this->group_name = $val['group_name'];
-      $this->currency = $val['currency'];
-      $this->plugins = $val['plugins'];
-      $this->lock_spec = $val['lock_spec'];
-      $this->holidays = $val['holidays'];
-      $this->workday_minutes = $val['workday_minutes'];
-      $this->custom_logo = $val['custom_logo'];
-
-      // TODO: refactor this.
-      $this->config = $val['config'];
-      $this->configHelper = new ttConfigHelper($val['config']);
-
-      // Set user config options.
-      $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
-      $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
-
-      $this->custom_css = $val['custom_css'];
-
-      // 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.
@@ -290,6 +303,11 @@ function getCustomCss() {
     return ($this->behalfGroup ? $this->behalfGroup->custom_css : $this->custom_css);
   }
 
+  // getCustomTranslation returns custom translation for active group.
+  function getCustomTranslation() {
+    return ($this->behalfGroup ? $this->behalfGroup->custom_translation : $this->custom_translation);
+  }
+  
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
@@ -341,7 +359,7 @@ function getAssignedProjects($options = null)
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.description, p.tasks, upb.rate $filePart from tt_projects p $fileJoin".
       " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
-      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by upper(p.name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $bindTemplatesWithProjects = isset($options['include_templates']) && $options['include_templates'];
@@ -682,7 +700,8 @@ function updateGroup($fields) {
 
     $name_part = $description_part = $currency_part = $lang_part = $decimal_mark_part = $date_format_part = $time_format_part =
       $week_start_part = $tracking_mode_part = $project_required_part = $record_type_part = $bcc_email_part =  $allow_ip_part =
-      $plugins_part = $config_part = $custom_css_part = $lock_spec_part = $holidays_part = $workday_minutes_part = '';
+      $password_complexity_part = $plugins_part = $config_part = $custom_css_part = $custom_translation_part = $lock_spec_part =
+      $holidays_part = $workday_minutes_part = '';
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
     if (isset($fields['description'])) $description_part = ', description = '.$mdb2->quote($fields['description']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
@@ -702,6 +721,7 @@ function updateGroup($fields) {
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);
     if (isset($fields['custom_css'])) $custom_css_part = ', custom_css = '.$mdb2->quote($fields['custom_css']);
+    if (isset($fields['custom_translation'])) $custom_translation_part = ', custom_translation = '.$mdb2->quote($fields['custom_translation']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
     if (isset($fields['holidays'])) $holidays_part = ', holidays = '.$mdb2->quote($fields['holidays']);
     if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
@@ -709,7 +729,8 @@ function updateGroup($fields) {
 
     $parts = trim($name_part.$description_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
       $time_format_part.$week_start_part.$tracking_mode_part.$project_required_part.$record_type_part.
-      $bcc_email_part.$allow_ip_part.$password_complexity_part.$plugins_part.$config_part.$custom_css_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
+      $bcc_email_part.$allow_ip_part.$password_complexity_part.$plugins_part.$config_part.$custom_css_part.
+      $custom_translation_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
 
     $sql = "update tt_groups set $parts where id = $group_id and org_id = $this->org_id";
     $affected = $mdb2->exec($sql);
@@ -750,8 +771,8 @@ function markUserDeleted($user_id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    // Mark user custom fields as deleted,
-    require_once('plugins/CustomFields.class.php');
+    // Mark user custom fields as deleted.
+    require_once(APP_DIR.'/plugins/CustomFields.class.php');
     $entity_type = CustomFields::ENTITY_USER;
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
     $sql = "update tt_entity_custom_fields set status = null $modified_part".
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 122c7889..2aeada43 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -68,7 +68,8 @@ static function getUserIdByTmpRef($ref) {
 
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      return $val['user_id'];
+      if ($val)
+        return $val['user_id'];
     }
     return false;
   }
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 9908d12b..cd1e4a95 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -167,22 +167,37 @@ static function getDataForWeekView($records, $dayHeaders) {
     global $i18n;
 
     $dataArray = array();
+    $includeWeekends = $user->isOptionEnabled('weekends');
     $includeNotes = $user->isOptionEnabled('week_notes');
 
     // Construct the first row for a brand new entry.
     $dataArray[] = array('row_id' => null,'label' => $i18n->get('form.week.new_entry').':'); // Insert row.
     // Insert empty cells with proper control ids.
-    for ($i = 0; $i < 7; $i++) {
-      $control_id = '0_'. $dayHeaders[$i];
-      $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+    if ($includeWeekends) {
+      for ($i = 0; $i < 7; $i++) {
+        $control_id = '0_'. $dayHeaders[$i];
+        $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+      }
+    } else {
+      for ($i = 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);
+        }
       }
     }
 
@@ -205,18 +220,32 @@ static function getDataForWeekView($records, $dayHeaders) {
         $dataArray[] = array('row_id' => $row_id,'label' => ttWeekViewHelper::makeRowLabel($record));
         $pos = ttWeekViewHelper::findRow($row_id, $dataArray);
         // Insert empty cells with proper control ids.
-        for ($i = 0; $i < 7; $i++) {
-          $control_id = $pos.'_'. $dayHeaders[$i];
-          $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+        if ($includeWeekends) {
+          for ($i = 0; $i < 7; $i++) {
+            $control_id = $pos.'_'. $dayHeaders[$i];
+            $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+          }
+        } else {
+          for ($i = 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--;
         }
@@ -267,21 +296,38 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
       }
     }
 
+    // We will need this for iterations below.
+    $includeWeekends = $user->isOptionEnabled('weekends');
+
     // Construct the first row for a brand new entry.
     $dataArray[] = array('row_id' => null,'label' => $i18n->get('form.week.new_entry').':'); // Insert row.
     // Insert empty cells with proper control ids.
-    for ($i = 0; $i < 7; $i++) {
-      $control_id = '0_'. $dayHeaders[$i];
-      $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+    if ($includeWeekends) {
+      for ($i = 0; $i < 7; $i++) {
+        $control_id = '0_'. $dayHeaders[$i];
+        $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+      }
+    } else {
+      for ($i = 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);
+        }
       }
     }
 
@@ -296,18 +342,32 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
         $dataArray[] = array('row_id' => $row_id,'label' => ttWeekViewHelper::makeRowLabel($record));
         $pos = ttWeekViewHelper::findRow($row_id, $dataArray);
         // Insert empty cells with proper control ids.
-        for ($i = 0; $i < 7; $i++) {
-          $control_id = $pos.'_'. $dayHeaders[$i];
-          $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+        if ($includeWeekends) {
+          for ($i = 0; $i < 7; $i++) {
+            $control_id = $pos.'_'. $dayHeaders[$i];
+            $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+          }
+        } else {
+          for ($i = 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--;
         }
@@ -383,7 +443,6 @@ static function getLockedDaysForWeek($start_date) {
       $lockedDays[] = $user->isDateLocked($objDate);
       $objDate->incrementDay();
     }
-    unset($objDate);
     return $lockedDays;
   }
 
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 1326d15a..327132ed 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Catalan (Català)';
@@ -474,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',
@@ -492,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',
 
@@ -675,5 +680,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d65c6dab..c89457e6 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
@@ -482,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 ---',
@@ -500,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',
 
@@ -687,5 +692,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3fba7380..6fe93c26 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Danish (Dansk)';
@@ -459,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',
@@ -475,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',
 
@@ -653,5 +658,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index fe487464..9e9ad0a3 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'German (Deutsch)';
@@ -19,19 +20,16 @@
 'menu.logout' => 'Abmelden',
 'menu.forum' => 'Forum',
 'menu.help' => 'Hilfe',
-// TODO: translate the following.
-// 'menu.register' => 'Register',
+'menu.register' => 'Registrieren',
 'menu.profile' => 'Profil',
 'menu.group' => 'Gruppe',
 'menu.plugins' => 'Erweiterungen',
 'menu.time' => 'Zeiten',
-// TODO: translate the following.
-// 'menu.puncher' => 'Punch',
+'menu.puncher' => 'Stempeluhr',
 'menu.week' => 'Woche',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
-// TODO: translate the following.
-// 'menu.timesheets' => 'Timesheets',
+'menu.timesheets' => 'Arbeitszeittabellen',
 'menu.charts' => 'Diagramme',
 'menu.projects' => 'Projekte',
 'menu.tasks' => 'Aufgaben',
@@ -51,8 +49,7 @@
 'error.access_denied' => 'Zugriff verweigert.',
 'error.sys' => 'Systemfehler.',
 'error.db' => 'Datenbankfehler.',
-// TODO: translate the following.
-// 'error.registered_recently' => 'Registered recently.',
+'error.registered_recently' => 'Kürzlich registriert.',
 'error.feature_disabled' => 'Funktion ist deaktiviert.',
 'error.field' => 'Ungültige "{0}" Daten.',
 'error.empty' => 'Feld "{0}" ist leer.',
@@ -64,40 +61,34 @@
 'error.report' => 'Bericht auswählen.',
 'error.record' => 'Eintrag auswählen.',
 'error.auth' => 'Benutzername oder Passwort ungültig.',
-// TODO: translate the following.
-// 'error.2fa_code' => 'Invalid 2FA code.',
-// 'error.weak_password' => 'Weak password.',
+'error.2fa_code' => 'Ungültiger 2FA-Code.',
+'error.weak_password' => 'Schwaches Passwort.',
 'error.user_exists' => 'Benutzer mit diesem Konto ist bereits vorhanden.',
 'error.object_exists' => 'Objekt mit diesem Namen ist bereits vorhanden.',
 'error.invoice_exists' => 'Rechnung mit dieser Nummer existiert bereits.',
 'error.role_exists' => 'Rolle mit diesem Rang existiert bereits.',
 'error.no_invoiceable_items' => 'Keine Einträge zur Rechnungsstellung gefunden.',
-// TODO: translate the following.
-// 'error.no_records' => 'There are no records.',
+'error.no_records' => 'Es gibt keine Einträge.',
 'error.no_login' => 'Benutzer mit diesen Anmeldedaten nicht vorhanden.',
 'error.no_groups' => 'Die Datenbank ist leer. Als Administrator anmelden und ein neues Gruppe erzeugen.',
 'error.upload' => 'Fehler beim hochladen einer Datei.',
-'error.range_locked' => 'Zeitinterval ist gesperrt.',
-'error.mail_send' => 'Fehler beim versenden einer E-Mail.',
-// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
-// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
+'error.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.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.',
@@ -119,19 +110,14 @@
 'button.export' => 'Gruppe exportieren',
 'button.import' => 'Gruppe importieren',
 'button.close' => 'Schließen',
-// TODO: translate the following.
-// 'button.start' => 'Start',
+'button.start' => 'Start',
 'button.stop' => 'Stop',
-// TODO: translate the following.
-// (PR#81 suggested 'Freigeben / Genehmigen' for 'Approve' and 'Freigabe zurücknehmen' for 'Disapprove'.
-// The problem is they do not appear precise, deviate from the meaning of approval / disaproval of report items.)
-// 'button.approve' => 'Approve', (suggested 'Freigeben / Genehmigen' does not appear precise)
-// 'button.disapprove' => 'Disapprove',
-// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
+'button.approve' => 'Annehmen',
+'button.disapprove' => 'Ablehnen',
+'button.sync' => 'Sync',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-// TODO: translate the following.
-// 'label.menu' => 'Menu',
+'label.menu' => 'Menü',
 'label.group_name' => 'Gruppenname',
 'label.address' => 'Adresse',
 'label.currency' => 'Währung',
@@ -151,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',
@@ -184,8 +169,7 @@
 'label.select_none' => 'Alle abwählen',
 'label.day_view' => 'Tagesansicht',
 'label.week_view' => 'Wochenansicht',
-// TODO: translate the following:
-// 'label.puncher' => 'Puncher',
+'label.puncher' => 'Stempeluhr',
 'label.id' => 'ID',
 'label.language' => 'Sprache',
 'label.decimal_mark' => 'Dezimaltrennzeichen',
@@ -212,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',
@@ -228,40 +211,36 @@
 'label.mark_paid' => 'Als bezahlt setzen',
 'label.week_note' => 'Wochennotiz',
 'label.week_list' => 'Wochenliste',
-// TODO: translate the following:
-// 'label.weekends' => 'Weekends',
+'label.weekends' => 'Wochenenden',
 'label.work_units' => 'Arbeitseinheiten',
 'label.work_units_short' => 'Einheiten',
 'label.totals_only' => 'Nur Gesamtstunden',
 'label.quota' => 'Quote',
-// TODO: translate the following.
-// 'label.timesheet' => 'Timesheet',
-// 'label.submitted' => 'Submitted',
-// 'label.approved' => 'Approved',
-// 'label.approval' => 'Report approval',
-// 'label.mark_approved' => 'Mark approved',
-// 'label.template' => 'Template',
-// 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_note' => 'Prepopulate Note field',
-// 'label.attachments' => 'Attachments',
-// 'label.files' => 'Files',
-// 'label.file' => 'File',
+'label.timesheet' => 'Arbeitszeittabelle',
+'label.submitted' => 'Eingereicht',
+'label.approved' => 'Genehmigt',
+'label.approval' => 'Genehmigung des Berichts',
+'label.mark_approved' => 'Als genehmigt markieren',
+'label.template' => 'Vorlage',
+'label.bind_templates_with_projects' => 'Vorlagen mit Projekten verbinden',
+'label.prepopulate_note' => 'Notizfeld vorab ausfüllen',
+'label.attachments' => 'Anhänge',
+'label.files' => 'Dateien',
+'label.file' => 'Datei',
 'label.active_users' => 'Aktive Nutzer',
 'label.inactive_users' => 'Inaktive Nutzer',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
-// TODO: translate the following.
-// 'entity.time' => 'time',
-// 'entity.user' => 'user',
-// 'entity.project' => 'project',
+'entity.time' => 'Zeit',
+'entity.user' => 'Benutzer',
+'entity.project' => 'Projekt',
 
 // Form titles.
 'title.error' => 'Fehler',
-'title.success' => 'Erfol',
+'title.success' => 'Erfolg',
 'title.login' => 'Anmelden',
-// TODO: translate the follolwing.
-// 'title.2fa' => 'Two Factor Authentication',
+'title.2fa' => 'Zwei-Faktor-Authentifizierung',
 'title.groups' => 'Gruppen',
 'title.add_group' => 'Gruppe anlegen',
 'title.edit_group' => 'Gruppe bearbeiten',
@@ -271,21 +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.puncher' => 'Puncher',
+'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',
@@ -318,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',
@@ -341,14 +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.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.
@@ -372,20 +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.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
@@ -397,14 +368,12 @@
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> ist ein Open-Source Zeiterfassungssystem.',
 
 // Email subject and body for two-factor authentication.
-// TODO: translate the following.
-// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
-// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+'email.2fa_code.subject' => 'Anuko Time Tracker Zwei-Faktor-Authentifizierungscode',
+'email.2fa_code.body' => "Sehr geehrter Benutzer,\n\nIhr Zwei-Faktor-Authentifizierungscode lautet:\n\n%s\n\n",
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
-// TODO: translate the following.
-// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
-// 'form.2fa.2fa_code' => '2FA code',
+'form.2fa.hint' => 'Überprüfen Sie Ihre E-Mails auf den 2FA-Code und geben Sie ihn hier ein.',
+'form.2fa.2fa_code' => '2FA-Code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Anfrage zur Zurücksetzung des Passwortes wurde per E-mail gesendet.',
@@ -436,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',
@@ -457,19 +424,17 @@
 // 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_view.php
 // (you can get to this form after generating an invoice).
@@ -494,8 +459,7 @@
 'form.tasks.inactive_tasks' => 'Inaktive Tasks',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-// TODO: translate the following.
-// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
+'form.users.uncompleted_entry_today' => 'Der Benutzer hat heute einen nicht abgeschlossenen Zeiteintrag',
 'form.users.uncompleted_entry' => 'Nutzer hat einen unvollständigen Zeiteintrag',
 'form.users.role' => 'Rolle',
 'form.users.manager' => 'Manager',
@@ -549,21 +513,18 @@
 'form.group_edit.type_all' => 'alle',
 'form.group_edit.type_start_finish' => 'Start und Ende',
 'form.group_edit.type_duration' => 'Dauer',
-'form.group_edit.punch_mode' => 'Stechuhr-Modus',
-// TODO: translate the following.
-// 'form.group_edit.one_uncompleted' => 'One uncompleted',
+'form.group_edit.punch_mode' => 'Stempeluhr-Modus',
+'form.group_edit.one_uncompleted' => 'Eine unvollendete',
 'form.group_edit.allow_overlap' => 'Erlaube Überschneidung',
 'form.group_edit.future_entries' => 'Einträge in der Zukunft',
 'form.group_edit.uncompleted_indicators' => 'Zeige unfertige Einträge',
 'form.group_edit.confirm_save' => 'Speichern bestätigen',
-// TODO: translate the following.
-// 'form.group_edit.advanced_settings' => 'Advanced settings',
+'form.group_edit.advanced_settings' => 'Erweiterte Einstellungen',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
 'form.group_advanced_edit.allow_ip' => 'Erlaube IP',
-// TODO: Translate the following.
-// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
-// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+'form.group_advanced_edit.password_complexity' => 'Komplexität des Passworts',
+'form.group_advanced_edit.2fa' => 'Zwei-Faktor-Authentifizierung',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Sind Sie sicher, dass Sie die gesamte Gruppe löschen möchten?',
@@ -579,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.
@@ -595,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.',
@@ -612,21 +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.
 'form.display_options.note_on_separate_row' => 'Beschreibung in separater Zeile',
-// TODO: translate the following.
-// 'form.display_options.not_complete_days' => 'Not complete days',
-// 'form.display_options.inactive_projects' => 'Inactive projects',
-// 'form.display_options.custom_css' => 'Custom CSS',
+'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 5b433b0a..5858b63d 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'English';
@@ -425,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',
@@ -439,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',
 
@@ -600,5 +604,7 @@
 'form.display_options.note_on_separate_row' => 'Note on separate row',
 'form.display_options.not_complete_days' => 'Not complete days',
 'form.display_options.inactive_projects' => 'Inactive projects',
+'form.display_options.cost_per_hour' => 'Cost per hour',
 'form.display_options.custom_css' => 'Custom CSS',
+'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f57f5795..b302de1c 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Spanish (Español)';
@@ -487,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',
@@ -505,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',
 
@@ -690,5 +695,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 57b92ff3..19a74b4c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
@@ -472,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',
@@ -487,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',
@@ -663,5 +669,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 62b70671..32dacdf0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -2,8 +2,10 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
+
 $i18n_language = 'Persian (فارسی)';
 // TODO: translate the following.
 $i18n_months = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
@@ -480,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' => 'تاریخ',
@@ -496,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',
 
@@ -676,5 +682,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index fa1dd973..cdfc4c5f 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Finnish (Suomi)';
@@ -465,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ä',
@@ -481,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',
 
@@ -660,5 +665,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 7472ddf6..b488be0b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'French (Français)';
@@ -456,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',
@@ -472,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',
 
@@ -649,5 +654,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 93fb5fba..34f1890e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Greek (Ελληνικά)';
@@ -451,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' => 'ημερομηνία',
@@ -466,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',
@@ -642,5 +648,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 388622c2..585a7ec2 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Hebrew (עברית)';
@@ -483,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' => 'תאריך',
@@ -500,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',
 
@@ -681,5 +686,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 635147d8..e2d7500d 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
@@ -478,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',
@@ -495,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',
 
@@ -679,5 +683,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 55ea5deb..73ca8a02 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
@@ -464,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',
@@ -479,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',
@@ -655,5 +661,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0cf54775..0de6e88e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Japanese (日本語)';
@@ -482,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' => '日付',
@@ -500,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',
 
@@ -682,5 +687,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 42648461..fcbe14d2 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Korean (한국어)';
@@ -480,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' => '날짜',
@@ -498,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',
 
@@ -680,5 +685,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 949a3ac8..2ca444c0 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Dutch (Nederlands)';
@@ -411,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',
@@ -425,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',
 
@@ -585,5 +589,7 @@
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom', // Translator (Henk) comment: "kolom is the right word in Dutch."
 'form.display_options.not_complete_days' => 'Niet complete dagen',
 'form.display_options.inactive_projects' => 'Niet actieve projecten',
+'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 dd92cc78..720f71f3 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Norwegian (Norsk)';
@@ -482,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',
@@ -499,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',
 
@@ -682,5 +687,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 50ac9c62..69dddf31 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Polish (Polski)';
@@ -467,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',
@@ -483,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',
 
@@ -661,5 +666,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// '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 0b250d69..c9a4ad99 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Portuguese (Português Brasileiro)';
@@ -414,9 +415,13 @@
 '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.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Agrupar por',
 'form.reports.group_by_no' => '--- sem agrupar ---',
 'form.reports.group_by_date' => 'data',
@@ -428,6 +433,8 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportar',
+// TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 'form.report.assign_to_invoice' => 'Atribuir a fatura',
 'form.report.assign_to_timesheet' => 'Atribuir a planilha de horas',
 
@@ -592,6 +599,9 @@
 'form.display_options.not_complete_days' => 'Dias não completos',
 // TODO: translate the following.
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 'form.display_options.custom_css' => 'CSS customizado',
+// TODO: translate the following.
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index e7b16d92..abcd5793 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Please use proper capitalization rules for your language.
@@ -459,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',
@@ -475,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',
 
@@ -660,5 +665,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index b160169d..03db7da4 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Please use proper capitalization rules for your language.
@@ -482,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',
@@ -499,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',
 
@@ -683,5 +688,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index f24aa6f7..6c924df2 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Russian (Русский)';
@@ -412,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' => 'Поля времени',
 'form.reports.user_fields' => 'Поля пользователя',
+'form.reports.project_fields' => 'Поля проекта',
 'form.reports.group_by' => 'Группировать по',
 'form.reports.group_by_no' => '--- без группировки ---',
 'form.reports.group_by_date' => 'дате',
@@ -426,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' => 'Включить в табель',
 
@@ -586,5 +590,7 @@
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
 'form.display_options.not_complete_days' => 'Незавершенные дни',
 'form.display_options.inactive_projects' => 'Неактивные проекты',
+'form.display_options.cost_per_hour' => 'Стоимость за час',
 'form.display_options.custom_css' => 'Пользовательская CSS',
+'form.display_options.custom_translation' => 'Пользовательский перевод',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index ca4f0535..0404fb8d 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Slovak (Slovenčina)';
@@ -470,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',
@@ -486,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',
 
@@ -665,5 +670,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 574c32f0..b3153ad7 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
@@ -456,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',
@@ -472,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',
 
@@ -656,5 +660,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 06867886..6902d922 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Serbian (Srpski)';
@@ -467,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',
@@ -483,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',
 
@@ -663,5 +668,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 9f5725b8..dba0fd6f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Swedish (Svenska)';
@@ -465,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',
@@ -481,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',
 
@@ -661,5 +666,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index f8fa7dd2..f2531ee7 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
@@ -493,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',
@@ -511,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',
 
@@ -696,5 +701,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// '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 ca1709d3..d3051586 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Chinese (简体中文)';
@@ -471,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' => '日期',
@@ -489,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',
 
@@ -671,5 +676,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// '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 c59a87ef..890244f6 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Chinese (簡體中文)';
@@ -474,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' => '日期',
@@ -492,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',
 
@@ -674,5 +679,7 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index 70253cb3..812943db 100644
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -19,6 +19,8 @@ License: See license.txt *}
     <td>{$i18n.entity.time}</td>
       {elseif CustomFields::ENTITY_USER == $field['entity_type']}
     <td>{$i18n.entity.user}</td>
+      {elseif CustomFields::ENTITY_PROJECT == $field['entity_type']}
+    <td>{$i18n.entity.project}</td>
       {else}
     <td></td>
       {/if}
diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index ff15ea8f..27d335ff 100644
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -19,24 +19,69 @@ function adjustTodayLinks() {
     }
   }
 }
+
+// handleFavReportSelection - manages visibility of controls that are not relevant
+// when a fav report is selected.
+function handleFavReportSelection() {
+  var selectedFavReportId = document.getElementById("favorite_report").value;
+
+  var userLabel = document.getElementById("user_label");
+  var userControl = document.getElementById("user_control");
+  var intervalLabel = document.getElementById("interval_label");
+  var intervalControl = document.getElementById("interval_control");
+  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}
-<div class="small-screen-calendar">{$forms.chartForm.date.control}</div>
+<div id = "small_screen_calendar" class="small-screen-calendar">{$forms.chartForm.date.control}</div>
 <table class="centered-table">
-  <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.chartForm.date.control}</div></td></tr>
-{if $user_dropdown}
-  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+  <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div id = "large_screen_calendar" class="large-screen-calendar">{$forms.chartForm.date.control}</div></td></tr>
+  <tr class = "small-screen-label"><td><label for="favorite_report">{$i18n.label.fav_report}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
-    <td class="td-with-input">{$forms.chartForm.user.control}</td>
-  </tr>
-  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-{/if}
-  <tr class = "small-screen-label"><td><label for="interval">{$i18n.form.charts.interval}:</label></td></tr>
-  <tr>
-    <td class="large-screen-label"><label for="interval">{$i18n.form.charts.interval}:</label></td>
-    <td class="td-with-input">{$forms.chartForm.interval.control}</td>
+    <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}
@@ -47,6 +92,20 @@ function adjustTodayLinks() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
+{if isset($user_dropdown)}
+  <tr id = "user_label" class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+  <tr id = "user_control">
+    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
+    <td class="td-with-input">{$forms.chartForm.user.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr id ="interval_label" class = "small-screen-label"><td><label for="interval">{$i18n.form.charts.interval}:</label></td></tr>
+  <tr id = "interval_control">
+    <td class="large-screen-label"><label for="interval">{$i18n.form.charts.interval}:</label></td>
+    <td class="td-with-input">{$forms.chartForm.interval.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 
 <div class="chart">
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index 6486c0b2..0d0418af 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -49,12 +49,25 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_53.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
+  <tr class = "small-screen-label"><td><label for="report_cost_per_hour">{$i18n.form.display_options.cost_per_hour}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="report_cost_per_hour">{$i18n.form.display_options.cost_per_hour}:</label></td>
+    <td class="td-with-input">{$forms.displayOptionsForm.report_cost_per_hour.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_57.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_57.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
   <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/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 5b1da05f..859ae350 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -119,7 +119,7 @@ function recalculateCost() {
 <div class="small-screen-calendar">{$forms.expensesForm.date.control}</div>
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.expensesForm.date.control}</div></td></tr>
-{if $user_dropdown}
+{if isset($user_dropdown)}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
diff --git a/WEB-INF/templates/project_add.tpl b/WEB-INF/templates/project_add.tpl
index 8cc43fca..7b1fd835 100644
--- a/WEB-INF/templates/project_add.tpl
+++ b/WEB-INF/templates/project_add.tpl
@@ -15,6 +15,17 @@ License: See license.txt *}
     <td class="td-with-input">{$forms.projectForm.description.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if isset($custom_fields) && $custom_fields->projectFields}
+  {foreach $custom_fields->projectFields as $projectField}
+    {assign var="control_name" value='project_field_'|cat:$projectField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$projectField['label']|escape}{if $projectField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$projectField['label']|escape}{if $projectField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
 {if $show_files}
   <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
   <tr>
diff --git a/WEB-INF/templates/project_edit.tpl b/WEB-INF/templates/project_edit.tpl
index 3ecc85a8..4e3b02e7 100644
--- a/WEB-INF/templates/project_edit.tpl
+++ b/WEB-INF/templates/project_edit.tpl
@@ -15,6 +15,18 @@ License: See license.txt *}
     <td class="td-with-input">{$forms.projectForm.description.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if isset($custom_fields) && $custom_fields->projectFields}
+  {foreach $custom_fields->projectFields as $projectField}
+    {assign var="control_name" value='project_field_'|cat:$projectField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$projectField['label']|escape}{if $projectField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$projectField['label']|escape}{if $projectField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
diff --git a/WEB-INF/templates/puncher.tpl b/WEB-INF/templates/puncher.tpl
index 9190af39..98bd5ca2 100644
--- a/WEB-INF/templates/puncher.tpl
+++ b/WEB-INF/templates/puncher.tpl
@@ -145,7 +145,7 @@ startTimer();
     {if $show_client}
     <td class="text-cell">{$record.client|escape}</td>
     {/if}
-    {* record custom fileds *}
+    {* record custom fields *}
     {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
           {assign var="control_name" value='time_field_'|cat:$timeField['id']}
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 8ae981a3..b63e505f 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -38,7 +38,7 @@ License: See license.txt *}
   <tr>
     <th>{$i18n.label.date}</th>
   {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<th class="user-header">{$i18n.label.user}</th>{/if}
-  {* user custom fileds *}
+  {* user custom fields *}
   {if isset($custom_fields) && $custom_fields->userFields}
     {foreach $custom_fields->userFields as $userField}
       {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
@@ -47,8 +47,15 @@ License: See license.txt *}
   {/if}
   {if $bean->getAttribute('chclient')}<th class="client-header">{$i18n.label.client}</th>{/if}
   {if $bean->getAttribute('chproject')}<th class="project-header">{$i18n.label.project}</th>{/if}
+  {* project custom fields *}
+  {if isset($custom_fields) && $custom_fields->projectFields}
+    {foreach $custom_fields->projectFields as $projectField}
+      {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+      {if $bean->getAttribute($checkbox_control_name)}<th>{{$projectField['label']|escape}}</th>{/if}
+    {/foreach}
+  {/if}
   {if $bean->getAttribute('chtask')}<th class="task-header">{$i18n.label.task}</th>{/if}
-  {* time custom fileds *}
+  {* time custom fields *}
   {if isset($custom_fields) && $custom_fields->timeFields}
     {foreach $custom_fields->timeFields as $timeField}
       {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
@@ -60,7 +67,10 @@ License: See license.txt *}
   {if $bean->getAttribute('chduration')}<th>{$i18n.label.duration}</th>{/if}
   {if $bean->getAttribute('chunits')}<th>{$i18n.label.work_units_short}</th>{/if}
   {if $bean->getAttribute('chnote') && !$note_on_separate_row}<th class="note-header">{$i18n.label.note}</th>{/if}
-  {if $bean->getAttribute('chcost')}<th>{$i18n.label.cost}</th>{/if}
+  {if $bean->getAttribute('chcost')}
+    {if $show_cost_per_hour}<th>{$i18n.form.report.per_hour}</th>{/if}
+    <th>{$i18n.label.cost}</th>
+  {/if}
   {if $bean->getAttribute('chapproved')}<th>{$i18n.label.approved}</th>{/if}
   {if $bean->getAttribute('chpaid')}<th>{$i18n.label.paid}</th>{/if}
   {if $bean->getAttribute('chip')}<th>{$i18n.label.ip}</th>{/if}
@@ -79,7 +89,7 @@ License: See license.txt *}
   <tr>
     <th class="invoice-label">{$i18n.label.subtotal}</th>
         {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
-        {* user custom fileds *}
+        {* user custom fields *}
         {if isset($custom_fields) && $custom_fields->userFields}
           {foreach $custom_fields->userFields as $userField}
             {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
@@ -88,9 +98,16 @@ License: See license.txt *}
         {/if}
         {if $bean->getAttribute('chclient')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
         {if $bean->getAttribute('chproject')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
+        {* project custom fields *}
+        {if isset($custom_fields) && $custom_fields->projectFields}
+          {foreach $custom_fields->projectFields as $projectField}
+            {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+          {/foreach}
+        {/if}
         {if $bean->getAttribute('chtask')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
 
-        {* time custom fileds *}
+        {* time custom fields *}
           {if isset($custom_fields) && $custom_fields->timeFields}
            {foreach $custom_fields->timeFields as $timeField}
             {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
@@ -102,7 +119,10 @@ License: See license.txt *}
         {if $bean->getAttribute('chduration')}<td class="time-cell subtotal-cell">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
         {if $bean->getAttribute('chunits')}<td class="number-cell subtotal-cell">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
         {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chcost')}
+          {if $show_cost_per_hour}<td></td>{/if}
+          <td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>
+        {/if}
         {if $bean->getAttribute('chapproved')}<td></td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
         {if $bean->getAttribute('chip')}<td></td>{/if}
@@ -120,7 +140,7 @@ License: See license.txt *}
   <tr>
     <td class="date-cell">{$item.date}</td>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="text-cell">{$item.user|escape}</td>{/if}
-    {* user custom fileds *}
+    {* user custom fields *}
     {if isset($custom_fields) && $custom_fields->userFields}
       {foreach $custom_fields->userFields as $userField}
         {assign var="control_name" value='user_field_'|cat:$userField['id']}
@@ -130,8 +150,16 @@ License: See license.txt *}
     {/if}
     {if $bean->getAttribute('chclient')}<td class="text-cell">{$item.client|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="text-cell">{$item.project|escape}</td>{/if}
+    {* project custom fields *}
+    {if isset($custom_fields) && $custom_fields->projectFields}
+      {foreach $custom_fields->projectFields as $projectField}
+        {assign var="control_name" value='project_field_'|cat:$projectField['id']}
+        {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td class="text-cell">{$item.$control_name|escape}</td>{/if}
+      {/foreach}
+    {/if}
     {if $bean->getAttribute('chtask')}<td class="text-cell">{$item.task|escape}</td>{/if}
-    {* time custom fileds *}
+    {* time custom fields *}
     {if isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
         {assign var="control_name" value='time_field_'|cat:$timeField['id']}
@@ -144,7 +172,10 @@ License: See license.txt *}
     {if $bean->getAttribute('chduration')}<td class="time-cell">{$item.duration}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="number-cell">{$item.units}</td>{/if}
     {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="text-cell">{$item.note|escape}</td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="money-value-cell">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}
+      {if $show_cost_per_hour}<td class="money-value-cell">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost_per_hour}{/if}</td>{/if}
+      <td class="money-value-cell">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>
+    {/if}
     {if $bean->getAttribute('chapproved')}<td class="yes-no-cell">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td class="yes-no-cell">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
     {if $bean->getAttribute('chip')}<td class="text-cell">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}</td>{/if}
@@ -180,7 +211,7 @@ License: See license.txt *}
     <th class="invoice-label">{$i18n.label.subtotal}</th>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['user']|escape}</td>{/if}
 
-    {* user custom fileds *}
+    {* user custom fields *}
     {if isset($custom_fields) && $custom_fields->userFields}
       {foreach $custom_fields->userFields as $userField}
         {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
@@ -189,8 +220,15 @@ License: See license.txt *}
     {/if}
     {if $bean->getAttribute('chclient')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
+    {* project custom fields *}
+    {if isset($custom_fields) && $custom_fields->projectFields}
+      {foreach $custom_fields->projectFields as $projectField}
+        {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
     {if $bean->getAttribute('chtask')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
-    {* time custom fileds *}
+    {* time custom fields *}
     {if isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
         {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
@@ -202,7 +240,10 @@ License: See license.txt *}
     {if $bean->getAttribute('chduration')}<td class="time-cell subtotal-cell">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="number-cell subtotal-cell">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
     {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}
+      {if $show_cost_per_hour}<td></td>{/if}
+      <td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>
+    {/if}
     {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
@@ -218,7 +259,7 @@ License: See license.txt *}
   <tr>
     <th class="invoice-label">{$i18n.label.total}</th>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
-    {* user custom fileds *}
+    {* user custom fields *}
     {if isset($custom_fields) && $custom_fields->userFields}
       {foreach $custom_fields->userFields as $userField}
         {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
@@ -227,8 +268,15 @@ License: See license.txt *}
     {/if}
     {if $bean->getAttribute('chclient')}<td></td>{/if}
     {if $bean->getAttribute('chproject')}<td></td>{/if}
+    {* project custom fields *}
+    {if isset($custom_fields) && $custom_fields->projectFields}
+      {foreach $custom_fields->projectFields as $projectField}
+        {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
     {if $bean->getAttribute('chtask')}<td></td>{/if}
-    {* time custom fileds *}
+    {* time custom fields *}
     {if isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
         {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
@@ -240,7 +288,10 @@ License: See license.txt *}
     {if $bean->getAttribute('chduration')}<td class="time-cell subtotal-cell">{$totals['time']}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="number-cell subtotal-cell">{$totals['units']}</td>{/if}
     {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="money-value-cell subtotal-cell">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}
+      {if $show_cost_per_hour}<td></td>{/if}
+      <td class="money-value-cell subtotal-cell">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>
+    {/if}
     {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index aa8e9d63..485cfc12 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -70,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");
+  var projectDropdown = document.getElementById("project[]");
 
-  // Determine previously selected item.
-  var selected_item = dropdown.options[dropdown.selectedIndex].value;
+  // Collect selected options from the project dropdown.
+  var selectedProjects = [];
+  var options = projectDropdown && projectDropdown.options;
+  var optionsLength = options ? options.length : 0;
+  var opt;
+  var allSelected = options[0].selected;
+  if (!allSelected) {
+    for (var i = 1; i < optionsLength; i++) {
+      opt = options[i];
+      if (opt.selected) {
+        selectedProjects.push(opt.value);
+      }
+    }
+  }
 
   // Remove existing content.
-  dropdown.length = 0;
-  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) {
@@ -99,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++;
       }
@@ -190,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;
+            }
           }
         }
+      }
     }
   }
 }
@@ -245,9 +314,6 @@ function handleCheckboxes() {
 }
 </script>
 
-{* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt *}
-
 {$forms.reportForm.open}
 <table class="centered-table">
   <tr><td class="text-cell">{$i18n.label.fav_report}:</td></tr>
@@ -358,6 +424,15 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
+  <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">
@@ -507,6 +582,19 @@ License: See license.txt *}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/foreach}
 {/if}
+{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">
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 6f6f7394..fa24e806 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -23,7 +23,7 @@ function handleStop(buttonElement) {
 <div class="small-screen-calendar">{$forms.timeRecordForm.date.control}</div>
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.timeRecordForm.date.control}</div></td></tr>
-{if $user_dropdown}
+{if isset($user_dropdown)}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
@@ -160,7 +160,7 @@ function handleStop(buttonElement) {
     {if $show_client}
     <td class="text-cell">{$record.client|escape}</td>
     {/if}
-    {* record custom fileds *}
+    {* record custom fields *}
     {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
           {assign var="control_name" value='time_field_'|cat:$timeField['id']}
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 141df7ea..0dafae8c 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -12,7 +12,6 @@
 // project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
 // project_names[325] = "Time Tracker";   // Project name.
 // task_ids[325] = "100,101,302,303,304"; // Comma-separated list ot task ids for project.
-// task_names[100] = "Coding";            // Task name.
 // template_ids[325] = "17,21";           // Comma-separated list ot template ids for project. NOT YET IMPLEMENTED.
 
 // Prepare an array of project ids for clients.
@@ -38,11 +37,6 @@ var task_ids = new Array();
 {foreach $project_list as $project}
   task_ids[{$project.id}] = "{$project.tasks}";
 {/foreach}
-// Prepare an array of task names.
-var task_names = new Array();
-{foreach $task_list as $task}
-  task_names[{$task.id}] = "{$task.name|escape:'javascript'}";
-{/foreach}
 
 // Prepare an array of template ids for projects.
 var template_ids = new Array();
@@ -143,7 +137,6 @@ function fillProjectDropdown(id) {
 // tasks associated with a selected project (project id is passed here as id).
 function fillTaskDropdown(id) {
   var str_ids = task_ids[id];
-
   var dropdown = document.getElementById("task");
   if (dropdown == null) return; // Nothing to do.
 
@@ -155,20 +148,20 @@ function fillTaskDropdown(id) {
   // Add mandatory top option.
   dropdown.options[0] = new Option(empty_label_task, '', true);
 
-  // Populate the dropdown from the task_names array.
+  // Populate the Task dropdown.
   if (str_ids) {
     var ids = new Array();
     ids = str_ids.split(",");
     var len = ids.length;
 
+    // Iterate through $task_list because it is sorted by upper(name).
     var idx = 1;
-    for (var i = 0; i < len; i++) {
-      var t_id = ids[i];
-      if (task_names[t_id]) {
-        dropdown.options[idx] = new Option(task_names[t_id], t_id);
+    {foreach $task_list as $task}
+      if (ids.includes("{$task.id}")) {
+        dropdown.options[idx] = new Option("{$task.name|escape:'javascript'}", {$task.id});
         idx++;
       }
-    }
+    {/foreach}
 
     // If a previously selected item is still in dropdown - select it.
     if (dropdown.options.length > 0) {
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index e5f9abdb..2bd92736 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -7,7 +7,7 @@ License: See license.txt *}
 
 {$forms.timesheetsForm.open}
 <table class="centered-table">
-{if $user_dropdown}
+{if isset($user_dropdown)}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 744e8c40..e4d916a5 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -57,7 +57,11 @@ function setRate(element) {
 // handleClientRole - manages visibility and content of controls related to client role,
 // also hides and unselects projects when client role is selected.
 function handleClientRole() {
-  var selectedRoleId = document.getElementById("role").value;
+  var roleControl = document.getElementById("role");
+  if (roleControl == null) {
+    return;  // Role control not available, nothing to do...
+  }
+  var selectedRoleId = roleControl.value;
   var clientControl = document.getElementById("client");
   var clientBlock = document.getElementById("client_block");
   var nonClientBlock = document.getElementById("non_client_block");
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 41568f60..6032d4eb 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -28,7 +28,7 @@ function fillDropdowns() {
 <div class="small-screen-calendar">{$forms.weekTimeForm.date.control}</div>
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.weekTimeForm.date.control}</div></td></tr>
-{if $user_dropdown}
+{if isset($user_dropdown)}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
@@ -130,7 +130,7 @@ function fillDropdowns() {
   {foreach $time_records as $record}
   <tr {if !$record.billable}class="not-billable"{/if}>
     <td class="date-cell">{$record.date}</td>
-    {* record custom fileds *}
+    {* record custom fields *}
     {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
           {assign var="control_name" value='time_field_'|cat:$timeField['id']}
diff --git a/admin_group_delete.php b/admin_group_delete.php
index 0cea02b3..909b2347 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -13,7 +13,7 @@
 }
 $group_id = (int)$request->getParameter('id');
 $group_name = ttAdmin::getGroupName($group_id);
-if (!($group_id && $group_name)) {
+if (!($group_id && $group_name != null)) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/admin_group_edit.php b/admin_group_edit.php
index 81588ebe..496c7b8f 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -14,7 +14,7 @@
 }
 $group_id = (int)$request->getParameter('id');
 $group_name = ttAdmin::getGroupName($group_id);
-if (!($group_id && $group_name)) {
+if (!($group_id && $group_name != null)) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/admin_options.php b/admin_options.php
index 84a0ed3a..aed85232 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -48,7 +48,7 @@
   // If we change login, it must be unique.
   if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
     $err->add($i18n->get('error.user_exists'));
-  if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
+  if (!$auth->isPasswordExternal() && ($cl_password1 != null || $cl_password2 != null)) {
       if (!ttValidString($cl_password1))
         $err->add($i18n->get('error.field'), $i18n->get('label.password'));
       if (!ttValidString($cl_password2))
diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index 6cfd8725..87d46bcd 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -15,7 +15,6 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$fields = CustomFields::getFields();
 // End of access checks.
 
 if ($request->isPost()) {
@@ -29,7 +28,8 @@
 $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'),
@@ -41,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_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index e6eeeeb7..50c68501 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -17,7 +17,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $option = CustomFields::getOptionName($cl_id);
-if (!$option) {
+if ($option == null) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index eee02f63..2477b057 100644
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -17,7 +17,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $cl_name = CustomFields::getOptionName($cl_id);
-if (!$cl_name) {
+if ($cl_name == null) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/charts.php b/charts.php
index 1ad1c88d..9dbb95c7 100644
--- a/charts.php
+++ b/charts.php
@@ -12,6 +12,7 @@
 import('PieChartEx');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttFavReportHelper');
 
 define('ALL_USERS_OPTION_ID', -1); // An identifier for "all users" seclection in User dropdown.
 
@@ -36,7 +37,7 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
   exit();
 }
-$userDropdownSelectionId = (int) $request->getParameter('user'); // Resused below access checks.
+$userDropdownSelectionId = (int)$request->getParameter('user'); // Reused below access checks.
 if ($request->isPost() && $request->getParameter('user')) {
   if ($userDropdownSelectionId == constant('ALL_USERS_OPTION_ID') && !ttAccessAllowed('view_all_charts')) {
     header('Location: access_denied.php'); // All users option is only for users with view_all_charts access right.
@@ -55,7 +56,7 @@
 // End of access checks.
 
 // Determine user for whom we display this page.
-$userChanged = (int) $request->getParameter('user_changed');
+$userChanged = (int)$request->getParameter('user_changed');
 if ($request->isPost() && $userChanged ) {
   if ($userDropdownSelectionId != constant('ALL_USERS_OPTION_ID')) {
     $user->setOnBehalfUser($userDropdownSelectionId);
@@ -78,10 +79,9 @@
 $_SESSION['date'] = $cl_date;
 
 if ($request->isPost()) {
-  $cl_interval = (int)$request->getParameter('interval');
-  if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
-  $_SESSION['chart_interval'] = $cl_interval;
-  $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
+  $cl_fav_report = (int)$request->getParameter('favorite_report');
+  if (!$cl_fav_report) $cl_fav_report = -1;
+  $_SESSION['fav_report'] = $cl_fav_report;
 
   $cl_type = (int)$request->getParameter('type');
   if (!$cl_type) $cl_type = ttChartHelper::adjustType($cl_type);
@@ -90,12 +90,16 @@
 
   // Remember all users selection in session.
   $_SESSION['chart_all_users'] = $userDropdownSelectionId == constant('ALL_USERS_OPTION_ID') ? true : false;
-} else {
-  // Initialize chart interval.
-  $cl_interval = @$_SESSION['chart_interval'];
-  if (!$cl_interval) $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
+
+  $cl_interval = (int)$request->getParameter('interval');
   if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
   $_SESSION['chart_interval'] = $cl_interval;
+  $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
+} else {
+  // Initialize fav report selector.
+  $cl_fav_report = @$_SESSION['fav_report'];
+  if (!$cl_fav_report) $cl_fav_report = -1;
+  $_SESSION['fav_report'] = $cl_fav_report;
 
   // Initialize chart type.
   $cl_type = @$_SESSION['chart_type'];
@@ -106,13 +110,51 @@
   // Set user selection to all users, if necessary.
   $allUsersSetInSession = @$_SESSION['chart_all_users'];
   if ($allUsersSetInSession)
-      $userDropdownSelectionId = constant('ALL_USERS_OPTION_ID');
+    $userDropdownSelectionId = constant('ALL_USERS_OPTION_ID');
+
+  // 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;
+
+// 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());
@@ -144,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');
 
@@ -156,32 +199,14 @@
 ));
 $largeScreenCalendarRowSpan += 2;
 
-// Chart type options.
-$chart_selector = (MODE_PROJECTS_AND_TASKS == $tracking_mode || $user->isPluginEnabled('cl'));
-if ($chart_selector) {
-  $types = array();
-  if (MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode)
-    $types[CHART_PROJECTS] = $i18n->get('dropdown.projects');
-  if (MODE_PROJECTS_AND_TASKS == $tracking_mode)
-    $types[CHART_TASKS] = $i18n->get('dropdown.tasks');
-  if ($user->isPluginEnabled('cl'))
-    $types[CHART_CLIENTS] = $i18n->get('dropdown.clients');
-
-  // Add chart type dropdown.
-  $chart_form->addInput(array('type' => 'combobox',
-    'onchange' => 'this.form.submit();',
-    'name' => 'type',
-    'value' => $cl_type,
-    'data' => $types
-  ));
-  $largeScreenCalendarRowSpan += 2;
-}
-
 // Calendar.
 $chart_form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
 
 // Get data for our chart.
-$totals = ttChartHelper::getTotals($userDropdownSelectionId, $cl_type, $cl_date, $cl_interval);
+if ($cl_fav_report == -1)
+  $totals = ttChartHelper::getTotals($userDropdownSelectionId, $cl_type, $cl_date, $cl_interval);
+else
+  $totals = ttChartHelper::getTotalsForFavReport($cl_fav_report, $cl_type);
 $smarty->assign('totals', $totals);
 
 // Prepare chart for drawing.
@@ -229,7 +254,7 @@
 $smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('img_file_name', $img_ref);
 $smarty->assign('chart_selector', $chart_selector);
-$smarty->assign('onload', 'onLoad="adjustTodayLinks()"');
+$smarty->assign('onload', 'onLoad="adjustTodayLinks();handleFavReportSelection();"');
 $smarty->assign('forms', array($chart_form->getName() => $chart_form->toArray()));
 $smarty->assign('title', $i18n->get('title.charts'));
 $smarty->assign('content_page_name', 'charts.tpl');
diff --git a/dbinstall.php b/dbinstall.php
index f8e1b936..44fede0c 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -91,17 +91,16 @@ function ttGenerateKeys() {
   }
 
   // Check if PHP version is good enough.
-  // $required_version = '5.2.1'; // Something in TCPDF library does not work below this one.
-  $required_version = '5.4.0';    // Week view (week.php) requires 5.4 because of []-way of referencing arrays.
-                                  // This needs further investigation as we use [] elsewhere without obvious problems.
-  // Note: unmodified smarty 4.1.0 that we needed for php 8.1 support uses plp 5.6 and 7.0 features.
-  // Currently, embedded smarty in this product is adjusted to still support php 5.4.
-  // Next time we update smarty we may need to increase $required_version.
-
-  // Print a warning about php >= 8.1 because of a breaking change
-  // with mysqli default error mode, see https://php.watch/versions/8.1/mysqli-error-mode
-  if (version_compare(phpversion(), '8.1', '>=')) {
-    echo('<font color="red">Error: This app was not tested with PHP version: '.phpversion().'</font><br>');
+  $required_version = '7.0'; // smarty 4.3.0 that we embed uses null coalescing operator (introduced in php 7).
+
+  // Print a warning about php <= 7.4 because we are no longer testing there.
+  if (version_compare(phpversion(), '7.4', '<')) {
+    echo('<font color="red">Warning: This app is no longer tested with PHP version: '.phpversion().'.</font><br>');
+  }
+
+  // Print a warning about php >= 8.2 because of 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 {
     if (version_compare(phpversion(), $required_version, '>=')) {
       echo('PHP version: '.phpversion().', good enough.<br>');
@@ -201,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);
@@ -215,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");
@@ -229,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`");
@@ -244,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";
@@ -281,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
@@ -316,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");
@@ -421,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.
@@ -518,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");
@@ -625,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");
@@ -643,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);
@@ -682,7 +681,7 @@ function ttGenerateKeys() {
   }
 
   // The update_custom_fields function updates option_id field in tt_custom_field_log table.
-  if ($_POST['update_custom_fields']) {
+  if (array_key_exists('update_custom_fields', $_POST)) {
     $mdb2 = getConnection();
     $sql = "update tt_custom_field_log set option_id = value where option_id is null and value is not null and field_id in (select id from tt_custom_fields where type = 2)";
     $affected = $mdb2->exec($sql);
@@ -693,7 +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);
@@ -703,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");
@@ -751,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`");
@@ -794,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();
@@ -833,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");
@@ -938,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)";
@@ -984,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`");
@@ -1151,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["convert11900to12102"]) {
+  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')");
@@ -1197,9 +1196,13 @@ function ttGenerateKeys() {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.21.0') set rights = replace(rights, ',manage_work', '')");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.21.0') set rights = replace(rights, ',update_work', '')");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.21.2', modified = now() where param_name = 'version_db' and param_value = '1.21.0'");
+    ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `note_containing` varchar(80) default NULL after `paid_status`");
+    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();
 
@@ -1210,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");
@@ -1221,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");
@@ -1247,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.21.2)</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>
@@ -1296,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.21.2)</td>
-    <td><input type="submit" name="convert11900to12102" 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 98e40562..d1a77ebd 100644
--- a/default.css
+++ b/default.css
@@ -145,6 +145,20 @@ div.page-hint {
   border-collapse: collapse;
 }
 
+/* For printing large tables that do not fit into one page, we have to change the display
+property to "block" and also use "break-before: avoid;". This eliminates a page break between
+header and large table on print previews. I could not accomplish this with inline-block
+because break-before is apparently ignored for inline-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;
@@ -363,7 +377,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas for fields */
-#description, #address, #item_name, #comment, #custom_css, #content {
+#description, #address, #item_name, #comment, #custom_css, #custom_translation, #content {
   width: 220px;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
@@ -371,7 +385,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas with focus */
-#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus, #content:focus {
+#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus, #custom_translation:focus, #content:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
diff --git a/display_options.php b/display_options.php
index 6e0ccc54..e0b7bc98 100644
--- a/display_options.php
+++ b/display_options.php
@@ -21,14 +21,18 @@
   $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');
@@ -49,14 +53,17 @@
 // 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()) {
@@ -66,9 +73,11 @@
     $config->setDefinedValue('record_custom_fields', $cl_record_custom_fields);
     $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row);
     $config->setDefinedValue('report_inactive_projects', $cl_report_inactive_projects);
+    $config->setDefinedValue('report_cost_per_hour', $cl_report_cost_per_hour);
     if ($user->updateGroup(array(
       'config' => $config->getConfig(),
-      'custom_css' => $cl_custom_css))) {
+      'custom_css' => $cl_custom_css,
+      'custom_translation' => $cl_custom_translation))) {
       header('Location: success.php');
       exit();
     } else
diff --git a/expenses.php b/expenses.php
index ba091a63..3cbbd8be 100644
--- a/expenses.php
+++ b/expenses.php
@@ -33,7 +33,8 @@
   exit();
 }
 if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid((int)$request->getParameter('user'))) {
+  $posted_user_id = $request->getParameter('user');
+  if (!ttValidInteger($posted_user_id) && !$user->isUserValid($posted_user_id)) {
     header('Location: access_denied.php'); // Wrong user id on post.
     exit();
   }
diff --git a/initialize.php b/initialize.php
index 53810201..18946798 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,16 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.6.5719");
+// 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");
@@ -108,6 +117,11 @@
 
 define('CHARSET', 'utf-8');
 
+// Definitions of max counts of utf8mb4 characters for various varchar database fields.
+define('MAX_NAME_CHARS', 80);
+define('MAX_DESCR_CHARS', 255);
+define('MAX_CURRENCY_CHARS', 7);
+
 date_default_timezone_set(@date_default_timezone_get());
 
 // Initialize global objects that are needed for the application.
diff --git a/invoices.php b/invoices.php
index 3f6438b9..d34e1220 100644
--- a/invoices.php
+++ b/invoices.php
@@ -76,7 +76,7 @@
   if (!ttInvoiceHelper::validSortOrder($sort_order_2)) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
   if ($sort_option_1 == $sort_option_2) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
 
-  if($request->getParameter('sorting_changed')) {
+  if ($err->no() && $request->getParameter('sorting_changed')) {
     // User changed sorting. Get invoices sorted accordingly.
     $sort_options = array('sort_option_1'=>$sort_option_1,
       'sort_order_1'=>$sort_order_1,
diff --git a/login.php b/login.php
index f5dd8eec..2d9dde04 100644
--- a/login.php
+++ b/login.php
@@ -55,13 +55,17 @@
   if ($err->no() && $loginSucceeded) {
     $user = new ttUser(null, $auth->getUserId());
 
-    // Determine if we have to additionally use two-factor authentication.
-    $config = $user->getConfigHelper();
-    $use2FA = $config->getDefinedValue('2fa');
+    if ($user->initialized) {
+      // Determine if we have to additionally use two-factor authentication.
+      $config = $user->getConfigHelper();
+      $use2FA = $config->getDefinedValue('2fa');
+    } else {
+      $err->add($i18n->get('error.db'));
+    }
   }
 
   // If we have to use 2FA, email auth code to user and redirect to 2fa.php.
-  if ($use2FA && !$user->can('override_2fa')) {
+  if ($err->no() && $use2FA && !$user->can('override_2fa')) {
     // To keep things simple, we use the same code as for password resets.
     $cryptographically_strong = true;
     $random_bytes = openssl_random_pseudo_bytes(16, $cryptographically_strong);
diff --git a/mysql.sql b/mysql.sql
index 0856f94a..f614d0ac 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -39,6 +39,7 @@ CREATE TABLE `tt_groups` (
   `custom_logo` tinyint(4) default 0,                    # whether to use a custom logo or not
   `config` text default NULL,                            # miscellaneous group configuration settings
   `custom_css` text default NULL,                        # custom css for group
+  `custom_translation` text default NULL,                # custom translation for group
   `created` datetime default NULL,                       # creation timestamp
   `created_ip` varchar(45) default NULL,                 # creator ip
   `created_by` int(11) default NULL,                     # creator user_id
@@ -86,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
@@ -273,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
@@ -621,4 +623,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.21.2', 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/plugins.php b/plugins.php
index 1dfe6a07..a4372694 100644
--- a/plugins.php
+++ b/plugins.php
@@ -35,7 +35,7 @@
 } else {
   // Note: we get here in get, and also in post when group changes.
   // Which plugins do we have enabled in currently selected group?
-  $plugins = explode(',', $user->getPlugins());
+  $plugins = explode(',', $user->getPlugins() ?? '');
   $cl_charts = in_array('ch', $plugins);
   $cl_puncher = in_array('pu', $plugins);
   $cl_clients = in_array('cl', $plugins);
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 4e2f1319..b561af80 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 {
 
@@ -246,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;
 
@@ -254,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.
@@ -301,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;
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index b291d373..f37cd788 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');
 
diff --git a/project_add.php b/project_add.php
index 35b45c97..859fdc25 100644
--- a/project_add.php
+++ b/project_add.php
@@ -19,6 +19,13 @@
 }
 // End of access checks.
 
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
 $showFiles = $user->isPluginEnabled('at');
 $users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
@@ -35,6 +42,18 @@
   $cl_description = trim($request->getParameter('description'));
   $cl_users = $request->getParameter('users', array());
   $cl_tasks = $request->getParameter('tasks', array());
+  // If we have project custom fields - collect input.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $control_name = 'project_field_'.$projectField['id'];
+      $projectCustomFields[$projectField['id']] = array('field_id' => $projectField['id'],
+        'control_name' => $control_name,
+        'label' => $projectField['label'],
+        'type' => $projectField['type'],
+        'required' => $projectField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
 } else {
   foreach ($users as $user_item)
     $cl_users[] = $user_item['id'];
@@ -45,6 +64,20 @@
 $form = new Form('projectForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
+// If we have custom fields - add controls for them.
+if (isset($custom_fields) && $custom_fields->projectFields) {
+  foreach ($custom_fields->projectFields as $projectField) {
+    $field_name = 'project_field_'.$projectField['id'];
+    if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$projectCustomFields[$projectField['id']]['value']));
+    } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'data'=>CustomFields::getOptions($projectField['id']),
+      'value'=>$projectCustomFields[$projectField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
 if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
@@ -56,26 +89,37 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  // Validate input in project custom fields.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($projectCustomFields as $projectField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($projectField['value'], !$projectField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($projectField['label']));
+    }
+  }
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
-      $id = ttProjectHelper::insert(array('name' => $cl_name,
+      $project_id = ttProjectHelper::insert(array('name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
         'tasks' => $cl_tasks,
         'status' => ACTIVE));
-
+      // Insert project custom fields if we have them.
+      $result = true;
+      if ($project_id && isset($custom_fields) && $custom_fields->projectFields) {
+        $result = $custom_fields->insertEntityFields(CustomFields::ENTITY_PROJECT, $project_id, $projectCustomFields);
+      }
       // Put a new file in storage if we have it.
-      if ($id && $showFiles && $_FILES['newfile']['name']) {
+      if ($project_id && $showFiles && $_FILES['newfile']['name']) {
         $fileHelper = new ttFileHelper($err);
         $fields = array('entity_type'=>'project',
-          'entity_id' => $id,
+          'entity_id' => $project_id,
           'file_name' => $_FILES['newfile']['name']);
         $fileHelper->putFile($fields);
       }
-      if ($id) {
+      if ($project_id && $result) {
         header('Location: projects.php');
         exit();
       } else
diff --git a/project_edit.php b/project_edit.php
index 7d8e113d..a0190ff8 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -24,6 +24,13 @@
 }
 // End of access checks.
 
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
 $users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
@@ -39,9 +46,33 @@
   $cl_status = $request->getParameter('status');
   $cl_users = $request->getParameter('users', array());
   $cl_tasks = $request->getParameter('tasks', array());
+  // If we have project custom fields - collect input.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $control_name = 'project_field_'.$projectField['id'];
+      $projectCustomFields[$projectField['id']] = array('field_id' => $projectField['id'],
+        'control_name' => $control_name,
+        'label' => $projectField['label'],
+        'type' => $projectField['type'],
+        'required' => $projectField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
 } else {
   $cl_name = $project['name'];
   $cl_description = $project['description'];
+  // If we have project custom fields - collect values from database.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $control_name = 'project_field_'.$projectField['id'];
+      $projectCustomFields[$projectField['id']] = array('field_id' => $projectField['id'],
+        'control_name' => $control_name,
+        'label' => $projectField['label'],
+        'type' => $projectField['type'],
+        'required' => $projectField['required'],
+        'value' => $custom_fields->getEntityFieldValue(CustomFields::ENTITY_PROJECT, $cl_project_id, $projectField['id'], $projectField['type']));
+    }
+  }
   $cl_status = $project['status'];
   $cl_users = ttProjectHelper::getAssignedUsers($cl_project_id);
   $cl_tasks = explode(',', $project['tasks']);
@@ -51,6 +82,20 @@
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
+// If we have custom fields - add controls for them.
+if (isset($custom_fields) && $custom_fields->projectFields) {
+  foreach ($custom_fields->projectFields as $projectField) {
+    $field_name = 'project_field_'.$projectField['id'];
+    if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$projectCustomFields[$projectField['id']]['value']));
+    } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'data'=>CustomFields::getOptions($projectField['id']),
+      'value'=>$projectCustomFields[$projectField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
@@ -63,6 +108,13 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  // Validate input in project custom fields.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($projectCustomFields as $projectField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($projectField['value'], !$projectField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($projectField['label']));
+    }
+  }
   if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
@@ -72,28 +124,39 @@
       $existing_project = ttProjectHelper::getProjectByName($cl_name);
       if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
         // Update project information.
-        if (ttProjectHelper::update(array(
+        $result = ttProjectHelper::update(array(
           'id' => $cl_project_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,
           'users' => $cl_users,
-          'tasks' => $cl_tasks))) {
+          'tasks' => $cl_tasks));
+        // Update project custom fields if we have them.
+        if ($result && isset($custom_fields) && $custom_fields->projectFields) {
+          $result = $custom_fields->updateEntityFields(CustomFields::ENTITY_PROJECT, $cl_project_id, $projectCustomFields);
+        }
+        if ($result) {
           header('Location: projects.php');
           exit();
-        } else
+         } else
           $err->add($i18n->get('error.db'));
-      } else
+        } else
         $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
-        if (ttProjectHelper::insert(array('name' => $cl_name,
+        $project_id = ttProjectHelper::insert(array('name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
           'tasks' => $cl_tasks,
-          'status' => ACTIVE))) {
+          'status' => ACTIVE));
+        // Insert project custom fields if we have them.
+        $result = true;
+        if ($project_id && isset($custom_fields) && $custom_fields->projectFields) {
+          $result = $custom_fields->insertEntityFields(CustomFields::ENTITY_PROJECT, $project_id, $projectCustomFields);
+        }
+        if ($project_id && $result) {
           header('Location: projects.php');
           exit();
         } else
diff --git a/puncher.php b/puncher.php
index 9714ac24..26b371fc 100644
--- a/puncher.php
+++ b/puncher.php
@@ -324,7 +324,6 @@
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('task_required', $taskRequired);
-$smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
 $smarty->assign('show_record_custom_fields', $user->isOptionEnabled('record_custom_fields'));
diff --git a/register.php b/register.php
index 35fbee9c..6f54ccf5 100644
--- a/register.php
+++ b/register.php
@@ -36,8 +36,8 @@
 }
 
 $form = new Form('groupForm');
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group_name));
-$form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
+$form->addInput(array('type'=>'text','name'=>'group_name','value'=>$cl_group_name));
+$form->addInput(array('type'=>'text','name'=>'currency','value'=>$cl_currency));
 
 // Prepare an array of available languages.
 $lang_files = I18n::getLangFileList();
@@ -57,14 +57,16 @@
 $longname_lang = mu_sort($longname_lang, 'name');
 $form->addInput(array('type'=>'combobox','name'=>'lang','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
 
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_name','value'=>$cl_manager_name));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_login','value'=>$cl_manager_login));
+$form->addInput(array('type'=>'text','name'=>'manager_name','value'=>$cl_manager_name));
+$form->addInput(array('type'=>'text','name'=>'manager_login','value'=>$cl_manager_login));
 $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password1','value'=>$cl_password1));
 $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_email','value'=>$cl_manager_email));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
+  // Note: user input validation is done in ttRegistrator constructor.
+
   // Create fields array for ttRegistrator instance.
   $fields = array(
     'user_name' => $cl_manager_name,
diff --git a/report.php b/report.php
index bd2576f1..b8a549b6 100644
--- a/report.php
+++ b/report.php
@@ -18,6 +18,7 @@
 // End of access checks.
 
 $config = new ttConfigHelper($user->getConfig());
+$show_cost_per_hour = $config->getDefinedValue('report_cost_per_hour') && ($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']));
@@ -58,7 +59,7 @@
 // If we are in post, load the bean from session, as the constructor does it only in get.
 if ($request->isPost()) $bean->loadBean();
 
-$client_id = $bean->getAttribute('client');
+$client_id = (int)$bean->getAttribute('client');
 $options = ttReportHelper::getReportOptions($bean);
 
 // Do we need to show checkboxes? We show them in the following 4 situations:
@@ -298,7 +299,11 @@
 if ($bean->getAttribute('chduration')) $colspan++;
 if (!$user->getConfigOption('report_note_on_separate_row') && $bean->getAttribute('chnote')) $colspan++;
 if ($bean->getAttribute('chunits')) $colspan++;
-if ($bean->getAttribute('chcost')) $colspan++;
+if ($bean->getAttribute('chcost')) {
+  if ($show_cost_per_hour)
+    $colspan++;
+  $colspan++;
+}
 if ($bean->getAttribute('chapproved')) $colspan++;
 if ($bean->getAttribute('chpaid')) $colspan++;
 if ($bean->getAttribute('chip')) $colspan++;
@@ -316,6 +321,7 @@
 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
+$smarty->assign('show_cost_per_hour', $show_cost_per_hour);
 $smarty->assign('note_on_separate_row', $user->getConfigOption('report_note_on_separate_row'));
 $smarty->assign('colspan', $colspan);
 $smarty->assign('bean', $bean);
diff --git a/reports.php b/reports.php
index 858ca61c..aabeec08 100644
--- a/reports.php
+++ b/reports.php
@@ -84,9 +84,16 @@
   if (count($project_list) == 0) $showProject = false;
 }
 if ($showProject) {
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
-    'name'=>'project',
+  $form->addInput(array('type'=>'multipleselectcombobox',
+    'onchange'=>'fillTaskDropdown();selectAssignedUsers();',
+    'name'=>'project', // Multiple select now, but the name without "[]" in the end because we can't use it in reports.tpl.
+                       // Example: {$forms.reportForm.project.control}, we can't use {$forms.reportForm.project[].control}.
+                       // This creates an ugly complication:
+                       // Form.class.php addInput adds "[]" to a multiple select combobox element name.
+                       // When we verify bean in a form post, the name is "project".
+                       // But if bean is loaded from session, the name is "project[]".
+                       // It is unclear how to deal with this properly.
+    //'multiple'=>true,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
@@ -229,16 +236,19 @@
 $form->addInput(array('type'=>'combobox',
   'name'=>'period',
   'data'=>array(INTERVAL_THIS_MONTH=>$i18n->get('dropdown.current_month'),
-    INTERVAL_LAST_MONTH=>$i18n->get('dropdown.previous_month'),
+    INTERVAL_PREVIOUS_MONTH=>$i18n->get('dropdown.previous_month'),
     INTERVAL_THIS_WEEK=>$i18n->get('dropdown.current_week'),
-    INTERVAL_LAST_WEEK=>$i18n->get('dropdown.previous_week'),
+    INTERVAL_PREVIOUS_WEEK=>$i18n->get('dropdown.previous_week'),
     INTERVAL_THIS_DAY=>$i18n->get('dropdown.current_day'),
-    INTERVAL_LAST_DAY=>$i18n->get('dropdown.previous_day')),
+    INTERVAL_PREVIOUS_DAY=>$i18n->get('dropdown.previous_day')),
   'empty'=>array(''=>$i18n->get('dropdown.select'))));
 // Add controls for start and end dates.
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));
 $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'));
@@ -312,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');
@@ -337,6 +364,13 @@
     $group_by_options[$field_name] = $userField['label'];
   }
 }
+// If we have project custom fields - add group by options for them.
+if (isset($custom_fields) && $custom_fields->projectFields) {
+  foreach ($custom_fields->projectFields as $projectField) {
+    $field_name = 'project_field_'.$projectField['id'];
+    $group_by_options[$field_name] = $projectField['label'];
+  }
+}
 $group_by_options_size = sizeof($group_by_options);
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
 if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));
@@ -390,84 +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')) {
-      // Validate start date.
-      if (!ttValidDate($bean->getAttribute('start_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
-      // Validate end date.
-      if (!ttValidDate($bean->getAttribute('end_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
-      // Make sure that the end date is equal or after the start date.
-      if ($err->no()) {
-        $startDate = new ttDate($bean->getAttribute('start_date'), $user->getDateFormat());
-        $endDate = new ttDate($bean->getAttribute('end_date'), $user->getDateFormat());
-        if ($startDate->compare($endDate) > 0) {
-          $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
+    } else {
+      // Generate button pressed. Check some values.
+      if (!$bean->getAttribute('period')) {
+        // Validate start date.
+        if (!ttValidDate($bean->getAttribute('start_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
+        // Validate end date.
+        if (!ttValidDate($bean->getAttribute('end_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
+        // Make sure that the end date is equal or after the start date.
+        if ($err->no()) {
+          $startDate = new ttDate($bean->getAttribute('start_date'), $user->getDateFormat());
+          $endDate = new ttDate($bean->getAttribute('end_date'), $user->getDateFormat());
+          if ($startDate->compare($endDate) > 0) {
+            $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
+          }
         }
       }
+      $group_by1 = $bean->getAttribute('group_by1');
+      $group_by2 = $bean->getAttribute('group_by2');
+      $group_by3 = $bean->getAttribute('group_by3');
+      if (($group_by3 != null && $group_by3 != 'no_grouping') && ($group_by3 == $group_by1 || $group_by3 == $group_by2))
+        $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+      if (($group_by2 != null && $group_by2 != 'no_grouping') && ($group_by2 == $group_by1 || $group_by3 == $group_by2))
+        $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+      // TODO: review the above checks and possibly move some of them to verifyBean that we call when entering isPost above.
+
+      if ($err->no()) {
+        $bean->saveBean();
+        // Now we can go ahead and create a report.
+        header('Location: report.php');
+        exit();
+      }
     }
-    $group_by1 = $bean->getAttribute('group_by1');
-    $group_by2 = $bean->getAttribute('group_by2');
-    $group_by3 = $bean->getAttribute('group_by3');
-    if (($group_by3 != null && $group_by3 != 'no_grouping') && ($group_by3 == $group_by1 || $group_by3 == $group_by2))
-      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
-    if (($group_by2 != null && $group_by2 != 'no_grouping') && ($group_by2 == $group_by1 || $group_by3 == $group_by2))
-      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
-    // Check remaining values.
-    if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));
-
-    if ($err->no()) {
-      $bean->saveBean();
-      // Now we can go ahead and create a report.
-      header('Location: report.php');
-      exit();
-    }
-  }
+  } // if($err->no())
 } // isPost
 
 $smarty->assign('client_list', $client_list);
diff --git a/task_add.php b/task_add.php
index 3d8dcc1c..4a335370 100644
--- a/task_add.php
+++ b/task_add.php
@@ -32,15 +32,15 @@
 }
 
 $form = new Form('taskForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'text','name'=>'name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_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_edit.php b/task_edit.php
index 9761e31d..1eb8c7f5 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -44,7 +44,7 @@
 
 $form = new Form('taskForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'text','name'=>'name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
@@ -54,8 +54,8 @@
 
 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()) {
diff --git a/time.php b/time.php
index 766ee5fd..ee90770b 100644
--- a/time.php
+++ b/time.php
@@ -386,7 +386,7 @@
     if ($showTask && $taskRequired) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
-    if (strlen($cl_duration) == 0) {
+    if ($cl_duration == null) {
       if ($cl_start || $cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_start))
           $err->add($i18n->get('error.field'), $i18n->get('label.start'));
diff --git a/time_edit.php b/time_edit.php
index 7c3491ea..35037dca 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -63,9 +63,9 @@
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
 if ($request->isPost()) {
-  $cl_start = trim($request->getParameter('start'));
-  $cl_finish = trim($request->getParameter('finish'));
-  $cl_duration = trim($request->getParameter('duration'));
+  $cl_start = is_null($request->getParameter('start')) ? null : trim($request->getParameter('start'));
+  $cl_finish = is_null($request->getParameter('finish')) ? null : trim($request->getParameter('finish'));
+  $cl_duration = is_null($request->getParameter('duration')) ? null : trim($request->getParameter('duration'));
   $cl_date = $request->getParameter('date');
   $cl_note = trim($request->getParameter('note'));
   // If we have time custom fields - collect input.
@@ -117,8 +117,8 @@
 
   // Add an info message to the form if we are editing an uncompleted record.
   if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
-    $cl_finish = '';
-    $cl_duration = '';
+    $cl_finish = null;
+    $cl_duration = null;
     $msg->add($i18n->get('form.time_edit.uncompleted'));
   }
 }
@@ -292,10 +292,8 @@
   if ($showTask &&  $taskRequired) {
     if (!$cl_task) $err->add($i18n->get('error.task'));
   }
-  if (!$cl_duration) {
-    if ('0' == $cl_duration)
-      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
-    elseif ($cl_start || $cl_finish) {
+  if ($cl_duration == null) {
+    if ($cl_start || $cl_finish) {
       if (!ttTimeHelper::isValidTime($cl_start))
         $err->add($i18n->get('error.field'), $i18n->get('label.start'));
       if ($cl_finish) {
@@ -356,7 +354,7 @@
         $err->add($i18n->get('error.range_locked'));
 
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
-      $uncompleted = ($cl_finish == '' && $cl_duration == '');
+      $uncompleted = ($cl_finish == null && $cl_duration == null);
       if ($uncompleted && $oneUncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
diff --git a/tofile.php b/tofile.php
index 530d2f7d..0134885f 100644
--- a/tofile.php
+++ b/tofile.php
@@ -20,6 +20,8 @@
   $custom_fields = new CustomFields();
 }
 
+$show_cost_per_hour = $user->getConfigOption('report_cost_per_hour') && ($user->can('manage_invoices') || $user->isClient());
+
 // Report settings are stored in session bean before we get here.
 $bean = new ActionForm('reportBean', new Form('reportForm'), $request);
 
@@ -104,6 +106,14 @@
       }
       if ($bean->getAttribute('chclient')) print "\t<client><![CDATA[".$item['client']."]]></client>\n";
       if ($bean->getAttribute('chproject')) print "\t<project><![CDATA[".$item['project']."]]></project>\n";
+      // Project custom fields.
+      if (isset($custom_fields) && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($bean->getAttribute($checkbox_control_name)) print "\t<$field_name><![CDATA[".$item[$field_name]."]]></$field_name>\n";
+        }
+      }
       if ($bean->getAttribute('chtask')) print "\t<task><![CDATA[".$item['task']."]]></task>\n";
       // Time custom fields.
       if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -123,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())
@@ -199,6 +214,14 @@
     }
     if ($bean->getAttribute('chclient')) print ',"'.$i18n->get('label.client').'"';
     if ($bean->getAttribute('chproject')) print ',"'.$i18n->get('label.project').'"';
+    // Project custom field labels.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) print ',"'.ttNeutralizeForCsv($projectField['label']).'"';
+      }
+    }
     if ($bean->getAttribute('chtask')) print ',"'.$i18n->get('label.task').'"';
     // Time custom field labels.
     if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -213,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').'"';
@@ -235,6 +262,14 @@
       }
       if ($bean->getAttribute('chclient')) print ',"'.ttNeutralizeForCsv($item['client']).'"';
       if ($bean->getAttribute('chproject')) print ',"'.ttNeutralizeForCsv($item['project']).'"';
+      // Project custom fields.
+      if (isset($custom_fields) && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($bean->getAttribute($checkbox_control_name)) print ',"'.ttNeutralizeForCsv($item[$field_name]).'"';
+        }
+      }
       if ($bean->getAttribute('chtask')) print ',"'.ttNeutralizeForCsv($item['task']).'"';
       // Time custom fields.
       if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -255,10 +290,13 @@
       if ($bean->getAttribute('chunits')) print ',"'.$item['units'].'"';
       if ($bean->getAttribute('chnote')) print ',"'.ttNeutralizeForCsv($item['note']).'"';
       if ($bean->getAttribute('chcost')) {
-        if ($user->can('manage_invoices') || $user->isClient())
+        if ($user->can('manage_invoices') || $user->isClient()) {
+          if ($show_cost_per_hour)
+            print ',"'.$item['cost_per_hour'].'"';
           print ',"'.$item['cost'].'"';
-        else
+        } else {
           print ',"'.$item['expense'].'"';
+        }
       }
       if ($bean->getAttribute('chapproved')) print ',"'.$item['approved'].'"';
       if ($bean->getAttribute('chpaid')) print ',"'.$item['paid'].'"';
diff --git a/topdf.php b/topdf.php
index 85ff8d84..6393d5f5 100644
--- a/topdf.php
+++ b/topdf.php
@@ -38,6 +38,7 @@
 $config = new ttConfigHelper($user->getConfig());
 $show_note_column = $bean->getAttribute('chnote') && !$config->getDefinedValue('report_note_on_separate_row');
 $show_note_row = $bean->getAttribute('chnote') && $config->getDefinedValue('report_note_on_separate_row');
+$show_cost_per_hour = $config->getDefinedValue('report_cost_per_hour') && ($user->can('manage_invoices') || $user->isClient());
 
 // There are 2 variations of report: totals only, or normal. Totals only means that the report
 // is grouped by either date, user, client, project, or task and user only needs to see subtotals by group.
@@ -54,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;
@@ -138,6 +140,14 @@
   }
   if ($bean->getAttribute('chclient')) { $colspan++; $html .= '<td>'.$i18n->get('label.client').'</td>'; }
   if ($bean->getAttribute('chproject')) { $colspan++; $html .= '<td>'.$i18n->get('label.project').'</td>'; }
+  // Project custom field labels.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $field_name = 'project_field_'.$projectField['id'];
+      $checkbox_control_name = 'show_'.$field_name;
+      if ($bean->getAttribute($checkbox_control_name)) { $colspan++; $html .= '<td>'.htmlspecialchars($projectField['label']).'</td>'; }
+    }
+  }
   if ($bean->getAttribute('chtask')) { $colspan++; $html .= '<td>'.$i18n->get('label.task').'</td>'; }
   // Time custom field labels.
   if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -152,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>'; }
@@ -192,6 +203,14 @@
             $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
             $html .= '</td>';
         }
+        // Project custom fields.
+        if (isset($custom_fields) && $custom_fields->projectFields) {
+          foreach ($custom_fields->projectFields as $projectField) {
+            $field_name = 'project_field_'.$projectField['id'];
+            $checkbox_control_name = 'show_'.$field_name;
+            if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+          }
+        }
         if ($bean->getAttribute('chtask')) {
             $html .= '<td>';
             $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
@@ -210,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())
@@ -252,6 +272,14 @@
     }
     if ($bean->getAttribute('chclient')) $html .= '<td>'.htmlspecialchars($item['client']).'</td>';
     if ($bean->getAttribute('chproject')) $html .= '<td>'.htmlspecialchars($item['project']).'</td>';
+    // Project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) $html .= '<td>'.htmlspecialchars($item[$field_name]).'</td>';
+      }
+    }
     if ($bean->getAttribute('chtask')) $html .= '<td>'.htmlspecialchars($item['task']).'</td>';
     // Time custom fields.
     if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -266,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())
@@ -332,6 +365,14 @@
       $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
       $html .= '</td>';
     }
+    // Project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+      }
+    }
     if ($bean->getAttribute('chtask')) {
       $html .= '<td>';
       $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
@@ -350,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())
@@ -381,6 +423,14 @@
   }
   if ($bean->getAttribute('chclient')) $html .= '<td></td>';
   if ($bean->getAttribute('chproject')) $html .= '<td></td>';
+  // Project custom fields.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $field_name = 'project_field_'.$projectField['id'];
+      $checkbox_control_name = 'show_'.$field_name;
+      if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+    }
+  }
   if ($bean->getAttribute('chtask')) $html .= '<td></td>';
   // Time custom fields.
   if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -395,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())
diff --git a/user_edit.php b/user_edit.php
index 6bdbef69..0633e8a1 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -199,7 +199,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
   if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
   if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
-    // Validate input in user custom fields.
+  // Validate input in user custom fields.
   if (isset($custom_fields) && $custom_fields->userFields) {
     foreach ($userCustomFields as $userField) {
       // Validation is the same for text and dropdown fields.
diff --git a/week.php b/week.php
index 302e4dfb..3c2384b9 100644
--- a/week.php
+++ b/week.php
@@ -169,10 +169,15 @@
     $weekend_start_idx = 6 - $weekStartDay;
     $weekend_end_idx = (7 - $weekStartDay) % 7;
   }
-  unset($dayHeaders[$weekend_start_idx]);
-  unset($dayHeaders[$weekend_end_idx]);
-  unset($lockedDays[$weekend_start_idx]);
-  unset($lockedDays[$weekend_end_idx]);
+  if ($weekend_end_idx > $weekend_start_idx) {
+    array_splice($dayHeaders, $weekend_start_idx, 2);
+    array_splice($lockedDays, $weekend_start_idx, 2);
+  } else {
+    array_splice($dayHeaders, $weekend_start_idx, 1);
+    array_splice($dayHeaders, $weekend_end_idx, 1);
+    array_splice($lockedDays, $weekend_start_idx, 1);
+    array_splice($lockedDays, $weekend_end_idx, 1);
+  }
 }
 
 // Get already existing records.
@@ -228,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.
@@ -242,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']);
@@ -291,14 +296,14 @@ function render(&$table, $value, $row, $column, $selected = false) {
 // Add columns to table.
 $table->addColumn(new TableColumn('label', '', new LabelCellRenderer(), $dayTotals['label']));
 
-
-
-for ($i = 0; $i < 7; $i++) {
-  if ($showWeekends)
+if ($showWeekends) {
+  for ($i = 0; $i < 7; $i++) {
+    $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
+  }
+}
+else {
+  for ($i = 0; $i < 5; $i++) {
     $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
-  else {
-    if ($i <> $weekend_start_idx && $i <> $weekend_end_idx)
-      $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
   }
 }
 $table->setInteractive(false);
@@ -406,7 +411,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date));
 
 // A hidden control for today's date from user's browser.
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'get_date()')); // User current date, which gets filled in on btn_submit click.
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
 
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
@@ -481,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'];
@@ -524,7 +526,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 }
               }
               $result = ttWeekViewHelper::insertDurationFromWeekView($fields, $custom_fields, $err);
-            } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
+            } elseif ($postedDuration == null) {
               // Delete an already existing record here.
               $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id']);
             } else {