Merge pull request Athlon1600#36 from miicha/patch-1

Athlon1600 · web-flow · commit 2292179eb80b · 2019-11-09T15:50:16.000-06:00
make app_url configurable
diff --git a/src/helpers.php b/src/helpers.php
@@ -85,7 +85,12 @@ function str_rot_pass($str, $key, $decrypt = false){
 }
 
 function app_url(){
-	return (!empty($_SERVER['HTTPS']) ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'];
+	if(Config::get('app_url')){
+		return Config::get('app_url');
+	}
+	else{
+		return (!empty($_SERVER['HTTPS']) ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'];
+	}
 }
 
 function render_string($str, $vars = array()){
@@ -213,4 +218,4 @@ function rel2abs($rel, $base)
 	return $scheme . '://' . $abs;
 }
 
-?>
+?>

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,12 @@ function str_rot_pass($str, $key, $decrypt = false){`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`function app_url(){`
`88`		`- return (!empty($_SERVER['HTTPS']) ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'];`
	`88`	`+ if(Config::get('app_url')){`
	`89`	`+ return Config::get('app_url');`
	`90`	`+ }`
	`91`	`+ else{`
	`92`	`+ return (!empty($_SERVER['HTTPS']) ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'];`
	`93`	`+ }`
`89`	`94`	`}`
`90`	`95`
`91`	`96`	`function render_string($str, $vars = array()){`
`@@ -213,4 +218,4 @@ function rel2abs($rel, $base)`
`213`	`218`	`return $scheme . '://' . $abs;`
`214`	`219`	`}`
`215`	`220`
`216`		`-?>`
	`221`	`+?>`