Explorar o código

corrected path retrieval for test

added missing () when reporting domain name
Matthew Vale %!s(int64=9) %!d(string=hai) anos
pai
achega
887ae70fd0

+ 2 - 2
core/install/resources/classes/install_fusionpbx.php

@@ -551,9 +551,9 @@ include "root.php";
 		}
 
 		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 .= "where domain_name = '".$this->global_settings->domain_name."' ";
+			$sql .= "where domain_name = '".$this->global_settings->domain_name()."' ";
 			$sql .= "limit 1";
 			$this->write_debug($sql);
 			$prep_statement = $this->dbh->prepare(check_sql($sql));

+ 2 - 1
core/install/resources/classes/install_switch.php

@@ -278,9 +278,10 @@ include "root.php";
 
 		public function create_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));
 			if($dirs[(sizeof($dirs)-1)] == 'resources' and !file_exists($path)){
+				$this->write_progress("\t... creating missing '$path'");
 				if (!mkdir($path, 0755, true)) {
 					throw new Exception("Failed to create the missing resources directory '$path'");
 				}