From 54d7e41f6ed9d8db4d59f7e0283afff85db6448b Mon Sep 17 00:00:00 2001
From: jebsolutions <jebsolutions@users.noreply.github.com>
Date: Thu, 3 Nov 2016 18:24:40 -0400
Subject: [PATCH] app/fax/app_defaults.php: (#2031)

+ fix: duplicate check only within same default_setting_category.  This fixes the bug where "keep_local" for fax wasn't being created because there was a "keep_local" for voicemail.  Without this fix you will get a lua error due to the field not being set and nothing shows up in the sent faxes log.

fax/fax_log_view.php:
+ fix: back button text is missing.  Copied correct localized text code from another fax page that worked.

app/fax/app_config.php
+ fix: date field is now timestamp for postgres+mysql.  This fixes the listing only showing the date, not the time as well.

Note: app->defaults doesn't change field types.  Existing installs will have to manually update the field type e.g. for postgres:

sudo -sHu postgres
\d fusionpbx
alter table v_fax_logs alter column fax_date type timestamp without time zone;
\q
---
 app/fax/app_config.php   | 4 +++-
 app/fax/app_defaults.php | 2 +-
 app/fax/fax_log_view.php | 6 ++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index 838ecf936f..d9a94cc3c2 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -507,7 +507,9 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "fax_date";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "date";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "timestamp";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "date";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "timestamp";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "fax_epoch";
diff --git a/app/fax/app_defaults.php b/app/fax/app_defaults.php
index 6d935a155e..464c8a80ec 100644
--- a/app/fax/app_defaults.php
+++ b/app/fax/app_defaults.php
@@ -158,7 +158,7 @@ if ($domains_processed == 1) {
 		$x++;
 
 	//get an array of the default settings
-		$sql = "select * from v_default_settings ";
+		$sql = "select * from v_default_settings where default_setting_category = 'fax'";
 		$prep_statement = $db->prepare($sql);
 		$prep_statement->execute();
 		$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
diff --git a/app/fax/fax_log_view.php b/app/fax/fax_log_view.php
index 5b5a14195c..edf0e96065 100644
--- a/app/fax/fax_log_view.php
+++ b/app/fax/fax_log_view.php
@@ -11,10 +11,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //pre-populate the form
 	if (isset($_REQUEST["id"]) && isset($_REQUEST["fax_uuid"])) {