Merge pull request #1470 from connortechnology/api_improvements

Api improvements
ZoneMinder · May 25, 2016 · ceaacf9 · ceaacf9
2 parents 575f8ec + e804cfb
commit ceaacf9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/web/api/app/Config/bootstrap.php.in b/web/api/app/Config/bootstrap.php.in
@@ -134,8 +134,10 @@ function loadConfigFile() {
 		                continue;
 		            elseif ( preg_match( '/^\s*#/', $str ))
 		                continue;
-		            elseif ( preg_match( '/^\s*([^=\s]+)\s*=\s*(.*?)\s*$/', $str, $matches ))
-	                    Configure::write("$matches[1]", "$matches[2]");
+		            elseif ( preg_match( '/^\s*([^=\s]+)\s*=\s*(.*?)\s*$/', $str, $matches )) {
+	                    Configure::write( $matches[1], $matches[2] );
+                      define( $matches[1], $matches[2] );
+                }
 		        }
 		        fclose( $cfg );
 }

diff --git a/web/api/app/Config/database.php.default b/web/api/app/Config/database.php.default
@@ -67,10 +67,9 @@ class DATABASE_CONFIG {
 	public $default = array(
 		'datasource' => 'Database/Mysql',
 		'persistent' => false,
-		'host' => '@ZM_DB_HOST@',
-		'login' => '@ZM_DB_USER@',
-		'password' => '@ZM_DB_PASS@',
-		'database' => '@ZM_DB_NAME@',
+		'login' => ZM_DB_USER,
+		'password' => ZM_DB_PASS,
+		'database' => ZM_DB_NAME,
 		'prefix' => '',
 		//'encoding' => 'utf8',
 	);
@@ -85,4 +84,18 @@ class DATABASE_CONFIG {
 		'prefix' => '',
 		//'encoding' => 'utf8',
 	);
+
+	public function __construct() {
+		if (strpos(ZM_DB_HOST, ':')):
+			$array = explode(':', ZM_DB_HOST, 2);
+                        if (is_numeric($array[1])):
+				$this->default['host'] = $array[0];
+				$this->default['port'] = $array[1];
+			else:
+				$this->default['unix_socket'] = $array[1];
+			endif;
+		else:
+			$this->default['host'] = ZM_DB_HOST;
+		endif;
+	}
 }