dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corrected path retrieval for test

Browse Source 
added missing () when reporting domain name
This commit is contained in:
Matthew Vale
2015-12-03 10:49:38 +00:00
parent 90b8e4d707
commit 148f7207c5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/install/resources/classes/install_fusionpbx.php
+2 -2
View File
@@ -551,9 +551,9 @@ include "root.php";
} }
protected function create_domain() { protected function create_domain() {
$this->write_progress("\tChecking if domain exists '" . $this->global_settings->domain_name . "'"); $this->write_progress("\tChecking if domain exists '" . $this->global_settings->domain_name() . "'");
$sql = "select * from v_domains "; $sql = "select * from v_domains ";
$sql .= "where domain_name = '".$this->global_settings->domain_name."' "; $sql .= "where domain_name = '".$this->global_settings->domain_name()."' ";
$sql .= "limit 1"; $sql .= "limit 1";
$this->write_debug($sql); $this->write_debug($sql);
$prep_statement = $this->dbh->prepare(check_sql($sql)); $prep_statement = $this->dbh->prepare(check_sql($sql));
core/install/resources/classes/install_switch.php
+2 -1
View File
@@ -278,9 +278,10 @@ include "root.php";
public function create_config_lua() { public function create_config_lua() {
$this->write_progress("\tCreating " . $this->config_lua); $this->write_progress("\tCreating " . $this->config_lua);
$dirs = array_pop(explode("/", normalize_path($config_path))); $dirs = array_pop(explode("/", normalize_path($this->config_lua)));
$path = normalize_path_to_os(join("/", $dirs)); $path = normalize_path_to_os(join("/", $dirs));
if($dirs[(sizeof($dirs)-1)] == 'resources' and !file_exists($path)){ if($dirs[(sizeof($dirs)-1)] == 'resources' and !file_exists($path)){
$this->write_progress("\t... creating missing '$path'");
if (!mkdir($path, 0755, true)) { if (!mkdir($path, 0755, true)) {
throw new Exception("Failed to create the missing resources directory '$path'"); throw new Exception("Failed to create the missing resources directory '$path'");
} }