From 2150e4d2e88fe505de6c885ed235c4207ebc22d2 Mon Sep 17 00:00:00 2001
From: objecttothis <objecttothis@gmail.com>
Date: Fri, 17 Feb 2023 17:27:06 +0400
Subject: [PATCH] Fix encryption and missing call

---
 app/Config/Encryption.php             |   6 +-
 app/Controllers/Customers.php         |   2 +-
 app/Libraries/Mailchimp_lib.php       |   1 +
 app/Views/partial/daterangepicker.php | 306 +++++++++++++-------------
 4 files changed, 160 insertions(+), 155 deletions(-)

diff --git a/app/Config/Encryption.php b/app/Config/Encryption.php
index e37b4e2a1..640bd5860 100644
--- a/app/Config/Encryption.php
+++ b/app/Config/Encryption.php
@@ -63,7 +63,7 @@ class Encryption extends BaseConfig
      *
      * Set to false for CI3 Encryption compatibility.
      */
-    public bool $rawData = true;
+    public bool $rawData = false;
 
     /**
      * Encryption key info.
@@ -71,7 +71,7 @@ class Encryption extends BaseConfig
      *
      * Set to 'encryption' for CI3 Encryption compatibility.
      */
-    public string $encryptKeyInfo = '';
+    public string $encryptKeyInfo = 'encryption';
 
     /**
      * Authentication key info.
@@ -79,5 +79,5 @@ class Encryption extends BaseConfig
      *
      * Set to 'authentication' for CI3 Encryption compatibility.
      */
-    public string $authKeyInfo = '';
+    public string $authKeyInfo = 'authentication';
 }
diff --git a/app/Controllers/Customers.php b/app/Controllers/Customers.php
index ab1f65332..b450a6eb9 100644
--- a/app/Controllers/Customers.php
+++ b/app/Controllers/Customers.php
@@ -34,7 +34,7 @@ class Customers extends Persons
 	public function __construct()
 	{
 		parent::__construct('customers');
-
+		helper('tabular');
 		$this->mailchimp_lib = new Mailchimp_lib();
 
 		$this->customer = model('Customer');
diff --git a/app/Libraries/Mailchimp_lib.php b/app/Libraries/Mailchimp_lib.php
index 08cba4e54..a36efe0df 100644
--- a/app/Libraries/Mailchimp_lib.php
+++ b/app/Libraries/Mailchimp_lib.php
@@ -38,6 +38,7 @@ class MailchimpConnector
 	public function __construct(string $api_key = '')
 	{
 		$config = config('OSPOS')->settings;
+
 		$encrypter = Services::encrypter();
 
 		$this->_api_key = empty($api_key)
diff --git a/app/Views/partial/daterangepicker.php b/app/Views/partial/daterangepicker.php
index 9a6f13837..dc4939944 100644
--- a/app/Views/partial/daterangepicker.php
+++ b/app/Views/partial/daterangepicker.php
@@ -1,109 +1,113 @@
-<?php $this->lang->load("calendar"); $this->lang->load("date"); 
+<?php
+/**
+ * @var array $config
+ */
+
 	if(empty($config['date_or_time_format']))
 	{
 ?>
 		$('#daterangepicker').css("width","180");
-		var start_date = "<?php echo date('Y-m-d') ?>";
-		var end_date   = "<?php echo date('Y-m-d') ?>";
+		var start_date = "<?= date('Y-m-d') ?>";
+		var end_date   = "<?= date('Y-m-d') ?>";
 
 		$('#daterangepicker').daterangepicker({
 			"ranges": {
-				"<?php echo lang('Datepicker.today') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
+				"<?= lang('Datepicker.today') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 				],
-				"<?php echo lang('Datepicker.today_last_year') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
+				"<?= lang('Datepicker.today_last_year') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
 				],
-				"<?php echo lang('Datepicker.yesterday') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))-1) ?>"
+				"<?= lang('Datepicker.yesterday') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))-1) ?>"
 				],
-				"<?php echo lang('Datepicker.last_7') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
+				"<?= lang('Datepicker.last_7') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 				],
-				"<?php echo lang('Datepicker.last_30') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
+				"<?= lang('Datepicker.last_30') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 				],
-				"<?php echo lang('Datepicker.this_month') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y"))-1) ?>"
+				"<?= lang('Datepicker.this_month') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y"))-1) ?>"
 				],
-				"<?php echo lang('Datepicker.same_month_to_same_day_last_year') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
+				"<?= lang('Datepicker.same_month_to_same_day_last_year') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
 				],
-				"<?php echo lang('Datepicker.same_month_last_year') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y")-1)-1) ?>"
+				"<?= lang('Datepicker.same_month_last_year') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y")-1)-1) ?>"
 				],
-				"<?php echo lang('Datepicker.last_month') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))-1) ?>"
+				"<?= lang('Datepicker.last_month') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))-1) ?>"
 				],
-				"<?php echo lang('Datepicker.this_year') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,1,1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
+				"<?= lang('Datepicker.this_year') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,1,1,date("Y"))) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
 				],
-				"<?php echo lang('Datepicker.last_year') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,1,1,date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,1,1,date("Y"))-1) ?>"
+				"<?= lang('Datepicker.last_year') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,1,1,date("Y")-1)) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,1,1,date("Y"))-1) ?>"
 				],
-				"<?php echo lang('Datepicker.this_financial_year') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,$config['financial_year'],1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
+				"<?= lang('Datepicker.this_financial_year') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,$config['financial_year'],1,date("Y"))) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
 				],
-				"<?php echo lang('Datepicker.last_financial_year') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,$config['financial_year'],1,date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,$config['financial_year'],1,date("Y"))-1) ?>"
+				"<?= lang('Datepicker.last_financial_year') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,$config['financial_year'],1,date("Y")-1)) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,$config['financial_year'],1,date("Y"))-1) ?>"
 				],
-				"<?php echo lang('Datepicker.all_time') ?>": [
-					"<?php echo date($config['dateformat'], mktime(0,0,0,1,1,2010)) ?>",
-					"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
+				"<?= lang('Datepicker.all_time') ?>": [
+					"<?= date($config['dateformat'], mktime(0,0,0,1,1,2010)) ?>",
+					"<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 				],
 			},
 			"locale": {
-				"format": '<?php echo dateformat_momentjs($config['dateformat']) ?>',
+				"format": '<?= dateformat_momentjs($config['dateformat']) ?>',
 				"separator": " - ",
-				"applyLabel": "<?php echo lang('Datepicker.apply') ?>",
-				"cancelLabel": "<?php echo lang('Datepicker.cancel') ?>",
-				"fromLabel": "<?php echo lang('Datepicker.from') ?>",
-				"toLabel": "<?php echo lang('Datepicker.to') ?>",
-				"customRangeLabel": "<?php echo lang('Datepicker.custom') ?>",
+				"applyLabel": "<?= lang('Datepicker.apply') ?>",
+				"cancelLabel": "<?= lang('Datepicker.cancel') ?>",
+				"fromLabel": "<?= lang('Datepicker.from') ?>",
+				"toLabel": "<?= lang('Datepicker.to') ?>",
+				"customRangeLabel": "<?= lang('Datepicker.custom') ?>",
 				"daysOfWeek": [
-					"<?php echo lang('Cal.su') ?>",
-					"<?php echo lang('Cal.mo') ?>",
-					"<?php echo lang('Cal.tu') ?>",
-					"<?php echo lang('Cal.we') ?>",
-					"<?php echo lang('Cal.th') ?>",
-					"<?php echo lang('Cal.fr') ?>",
-					"<?php echo lang('Cal.sa') ?>",
-					"<?php echo lang('Cal.su') ?>"
+					"<?= lang('Cal.su') ?>",
+					"<?= lang('Cal.mo') ?>",
+					"<?= lang('Cal.tu') ?>",
+					"<?= lang('Cal.we') ?>",
+					"<?= lang('Cal.th') ?>",
+					"<?= lang('Cal.fr') ?>",
+					"<?= lang('Cal.sa') ?>",
+					"<?= lang('Cal.su') ?>"
 				],
 				"monthNames": [
-					"<?php echo lang('Cal.january') ?>",
-					"<?php echo lang('Cal.february') ?>",
-					"<?php echo lang('Cal.march') ?>",
-					"<?php echo lang('Cal.april') ?>",
-					"<?php echo lang('Cal.may') ?>",
-					"<?php echo lang('Cal.june') ?>",
-					"<?php echo lang('Cal.july') ?>",
-					"<?php echo lang('Cal.august') ?>",
-					"<?php echo lang('Cal.september') ?>",
-					"<?php echo lang('Cal.october') ?>",
-					"<?php echo lang('Cal.november') ?>",
-					"<?php echo lang('Cal.december') ?>"
+					"<?= lang('Cal.january') ?>",
+					"<?= lang('Cal.february') ?>",
+					"<?= lang('Cal.march') ?>",
+					"<?= lang('Cal.april') ?>",
+					"<?= lang('Cal.may') ?>",
+					"<?= lang('Cal.june') ?>",
+					"<?= lang('Cal.july') ?>",
+					"<?= lang('Cal.august') ?>",
+					"<?= lang('Cal.september') ?>",
+					"<?= lang('Cal.october') ?>",
+					"<?= lang('Cal.november') ?>",
+					"<?= lang('Cal.december') ?>"
 				],
-				"firstDay": <?php echo lang('Datepicker.weekstart') ?>
+				"firstDay": <?= lang('Datepicker.weekstart') ?>
 			},
 			"alwaysShowCalendars": true,
-			"startDate": "<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
-			"endDate": "<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
-			"minDate": "<?php echo date($config['dateformat'], mktime(0,0,0,01,01,2010)) ?>",
-			"maxDate": "<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
+			"startDate": "<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
+			"endDate": "<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
+			"minDate": "<?= date($config['dateformat'], mktime(0,0,0,01,01,2010)) ?>",
+			"maxDate": "<?= date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 		}, function(start, end, label) {
 			start_date = start.format('YYYY-MM-DD');
 			end_date = end.format('YYYY-MM-DD');
@@ -114,108 +118,108 @@
 	{
 ?>
 		$('#daterangepicker').css("width","305");
-		var start_date = "<?php echo date('Y-m-d H:i:s', mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>";
-		var end_date = "<?php echo date('Y-m-d H:i:s', mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>";
+		var start_date = "<?= date('Y-m-d H:i:s', mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>";
+		var end_date = "<?= date('Y-m-d H:i:s', mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>";
 		$('#daterangepicker').daterangepicker({
 			"ranges": {
-				"<?php echo lang('Datepicker.today') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
+				"<?= lang('Datepicker.today') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
-				"<?php echo lang('Datepicker.today_last_year') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
+				"<?= lang('Datepicker.today_last_year') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
 				],
-				"<?php echo lang('Datepicker.yesterday') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d")-1,date("Y"))) ?>"
+				"<?= lang('Datepicker.yesterday') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d")-1,date("Y"))) ?>"
 				],
-				"<?php echo lang('Datepicker.last_7') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
+				"<?= lang('Datepicker.last_7') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
-				"<?php echo lang('Datepicker.last_30') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
+				"<?= lang('Datepicker.last_30') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
-				"<?php echo lang('Datepicker.this_month') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
+				"<?= lang('Datepicker.this_month') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),1,date("Y"))) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
-				"<?php echo lang('Datepicker.same_month_to_same_day_last_year') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
+				"<?= lang('Datepicker.same_month_to_same_day_last_year') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
 				],
-				"<?php echo lang('Datepicker.same_month_last_year') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y")-1)) ?>"
+				"<?= lang('Datepicker.same_month_last_year') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y")-1)) ?>"
 				],
-				"<?php echo lang('Datepicker.last_month') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),0,date("Y"))) ?>"
+				"<?= lang('Datepicker.last_month') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),0,date("Y"))) ?>"
 				],
-				"<?php echo lang('Datepicker.this_year') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,1,1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
+				"<?= lang('Datepicker.this_year') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,1,1,date("Y"))) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
 				],
-				"<?php echo lang('Datepicker.last_year') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,1,1,date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,12,31,date("Y")-1)) ?>"
+				"<?= lang('Datepicker.last_year') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,1,1,date("Y")-1)) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,12,31,date("Y")-1)) ?>"
 				],
-				"<?php echo lang('Datepicker.this_financial_year') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,$config['financial_year'],1,date("Y"))) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
+				"<?= lang('Datepicker.this_financial_year') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,$config['financial_year'],1,date("Y"))) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
 				],
-				"<?php echo lang('Datepicker.last_financial_year') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,$config['financial_year'],1,date("Y")-1)) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,$config['financial_year'],0,date("Y"))) ?>"
+				"<?= lang('Datepicker.last_financial_year') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,$config['financial_year'],1,date("Y")-1)) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,$config['financial_year'],0,date("Y"))) ?>"
 				],
-				"<?php echo lang('Datepicker.all_time') ?>": [
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,1,1,2010)) ?>",
-					"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
+				"<?= lang('Datepicker.all_time') ?>": [
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,1,1,2010)) ?>",
+					"<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
 			},
 			"locale": {
-				"format": '<?php echo dateformat_momentjs($config['dateformat'] . ' ' . $config['timeformat']) ?>',
+				"format": '<?= dateformat_momentjs($config['dateformat'] . ' ' . $config['timeformat']) ?>',
 				"separator": " - ",
-				"applyLabel": "<?php echo lang('Datepicker.apply') ?>",
-				"cancelLabel": "<?php echo lang('Datepicker.cancel') ?>",
-				"fromLabel": "<?php echo lang('Datepicker.from') ?>",
-				"toLabel": "<?php echo lang('Datepicker.to') ?>",
-				"customRangeLabel": "<?php echo lang('Datepicker.custom') ?>",
+				"applyLabel": "<?= lang('Datepicker.apply') ?>",
+				"cancelLabel": "<?= lang('Datepicker.cancel') ?>",
+				"fromLabel": "<?= lang('Datepicker.from') ?>",
+				"toLabel": "<?= lang('Datepicker.to') ?>",
+				"customRangeLabel": "<?= lang('Datepicker.custom') ?>",
 				"daysOfWeek": [
-					"<?php echo lang('Cal.su') ?>",
-					"<?php echo lang('Cal.mo') ?>",
-					"<?php echo lang('Cal.tu') ?>",
-					"<?php echo lang('Cal.we') ?>",
-					"<?php echo lang('Cal.th') ?>",
-					"<?php echo lang('Cal.fr') ?>",
-					"<?php echo lang('Cal.sa') ?>",
-					"<?php echo lang('Cal.su') ?>"
+					"<?= lang('Cal.su') ?>",
+					"<?= lang('Cal.mo') ?>",
+					"<?= lang('Cal.tu') ?>",
+					"<?= lang('Cal.we') ?>",
+					"<?= lang('Cal.th') ?>",
+					"<?= lang('Cal.fr') ?>",
+					"<?= lang('Cal.sa') ?>",
+					"<?= lang('Cal.su') ?>"
 				],
 				"monthNames": [
-					"<?php echo lang('Cal.january') ?>",
-					"<?php echo lang('Cal.february') ?>",
-					"<?php echo lang('Cal.march') ?>",
-					"<?php echo lang('Cal.april') ?>",
-					"<?php echo lang('Cal.may') ?>",
-					"<?php echo lang('Cal.june') ?>",
-					"<?php echo lang('Cal.july') ?>",
-					"<?php echo lang('Cal.august') ?>",
-					"<?php echo lang('Cal.september') ?>",
-					"<?php echo lang('Cal.october') ?>",
-					"<?php echo lang('Cal.november') ?>",
-					"<?php echo lang('Cal.december') ?>"
+					"<?= lang('Cal.january') ?>",
+					"<?= lang('Cal.february') ?>",
+					"<?= lang('Cal.march') ?>",
+					"<?= lang('Cal.april') ?>",
+					"<?= lang('Cal.may') ?>",
+					"<?= lang('Cal.june') ?>",
+					"<?= lang('Cal.july') ?>",
+					"<?= lang('Cal.august') ?>",
+					"<?= lang('Cal.september') ?>",
+					"<?= lang('Cal.october') ?>",
+					"<?= lang('Cal.november') ?>",
+					"<?= lang('Cal.december') ?>"
 				],
-				"firstDay": <?php echo lang('Datepicker.weekstart') ?>
+				"firstDay": <?= lang('Datepicker.weekstart') ?>
 			},
 		    "timePicker": true,
 		    "timePickerSeconds": true,
 			"alwaysShowCalendars": true,
-			"startDate": "<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
-			"endDate": "<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>",
-			"minDate": "<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,01,01,2010)) ?>",
-			"maxDate": "<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
+			"startDate": "<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
+			"endDate": "<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>",
+			"minDate": "<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,01,01,2010)) ?>",
+			"maxDate": "<?= date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 		}, function(start, end, label) {
 			start_date = start.format('YYYY-MM-DD HH:mm:ss');
 			end_date = end.format('YYYY-MM-DD HH:mm:ss');