From 38be018b2148aea77bf617e7085657fe2ca6c15c Mon Sep 17 00:00:00 2001
From: moglia <moglia@ispconfig3>
Date: Sun, 09 Aug 2009 23:34:12 -0400
Subject: [PATCH] Do not apply port if host is http only for https.
---
server/lib/classes/getconf.inc.php | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/lib/classes/getconf.inc.php b/server/lib/classes/getconf.inc.php
index fd0c088..a4bc832 100644
--- a/server/lib/classes/getconf.inc.php
+++ b/server/lib/classes/getconf.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2006, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -49,10 +49,15 @@
}
}
- function get_global_config() {
+ public function get_global_config($section = '') {
+ global $app;
- die("not yet implemented");
-
+ if(!is_array($this->config['global'])) {
+ $app->uses('ini_parser');
+ $tmp = $app->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
+ $this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp["config"]));
+ }
+ return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
}
--
Gitblit v1.9.1