From 9b3de1d8954470101f88b7f03a84e10e802014ee Mon Sep 17 00:00:00 2001 From: Chris Black Date: Wed, 24 Jun 2020 23:44:57 -0700 Subject: [PATCH] Update scripts.php (#5263) fix so that if user has a hostname instead of IP address the config.lua gets written correctly --- app/scripts/resources/classes/scripts.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/scripts/resources/classes/scripts.php b/app/scripts/resources/classes/scripts.php index a4a7dd32cd..69c682c681 100644 --- a/app/scripts/resources/classes/scripts.php +++ b/app/scripts/resources/classes/scripts.php @@ -239,12 +239,12 @@ if (!class_exists('scripts')) { elseif ($this->db_type == "pgsql") { if ($this->db_host == "localhost") { $this->db_host = "127.0.0.1"; } if ($this->db_secure == true) { - $tmp .= " database.system = \"pgsql://hostaddr=".$this->db_host." port=".$this->db_port." dbname=".$this->db_name." user=".$this->db_username." password=".$this->db_password." sslmode=verify-ca sslrootcert=".$this->db_cert_authority." options=''\";\n"; - $tmp .= " database.switch = \"pgsql://hostaddr=".$this->db_host." port=".$this->db_port." dbname=freeswitch user=".$this->db_username." password=".$this->db_password." sslmode=verify-ca sslrootcert=".$this->db_cert_authority." options=''\";\n"; + $tmp .= " database.system = \"pgsql://".(filter_var($this->db_host, FILTER_VALIDATE_IP) ? "hostaddr" : "host")."=".$this->db_host." port=".$this->db_port." dbname=".$this->db_name." user=".$this->db_username." password=".$this->db_password." sslmode=verify-ca sslrootcert=".$this->db_cert_authority." options=''\";\n"; + $tmp .= " database.switch = \"pgsql://".(filter_var($this->db_host, FILTER_VALIDATE_IP) ? "hostaddr" : "host")."=".$this->db_host." port=".$this->db_port." dbname=freeswitch user=".$this->db_username." password=".$this->db_password." sslmode=verify-ca sslrootcert=".$this->db_cert_authority." options=''\";\n"; } else { - $tmp .= " database.system = \"pgsql://hostaddr=".$this->db_host." port=".$this->db_port." dbname=".$this->db_name." user=".$this->db_username." password=".$this->db_password." options=''\";\n"; - $tmp .= " database.switch = \"pgsql://hostaddr=".$this->db_host." port=".$this->db_port." dbname=freeswitch user=".$this->db_username." password=".$this->db_password." options=''\";\n"; + $tmp .= " database.system = \"pgsql://".(filter_var($this->db_host, FILTER_VALIDATE_IP) ? "hostaddr" : "host")."=".$this->db_host." port=".$this->db_port." dbname=".$this->db_name." user=".$this->db_username." password=".$this->db_password." options=''\";\n"; + $tmp .= " database.switch = \"pgsql://".(filter_var($this->db_host, FILTER_VALIDATE_IP) ? "hostaddr" : "host")."=".$this->db_host." port=".$this->db_port." dbname=freeswitch user=".$this->db_username." password=".$this->db_password." options=''\";\n"; } } elseif ($this->db_type == "sqlite") {