diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-17 13:40:58 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-17 13:40:58 +0000 |
| commit | 3aafcffec03c5f1771264896623a620ec29fe191 (patch) | |
| tree | 405c65990d443d96803140b6045ee05f87a4aa68 /phpBB | |
| parent | 3735ecdb1665f2f6487a85004c9254305cc9e5cb (diff) | |
| download | forums-3aafcffec03c5f1771264896623a620ec29fe191.tar forums-3aafcffec03c5f1771264896623a620ec29fe191.tar.gz forums-3aafcffec03c5f1771264896623a620ec29fe191.tar.bz2 forums-3aafcffec03c5f1771264896623a620ec29fe191.tar.xz forums-3aafcffec03c5f1771264896623a620ec29fe191.zip | |
#2277
git-svn-id: file:///svn/phpbb/trunk@6088 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rwxr-xr-x | phpBB/install/install_install.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 27fcaa5d97..bdd718ab1a 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -833,6 +833,12 @@ class install_install extends module $s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : ''; $email_enable = ($email_enable !== '') ? $email_enable : true; + + $server_name = ($server_name !== '') ? $server_name : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); + $server_port = ($server_port !== '') ? $server_port : ((!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT')); + $server_protocol = ($server_protocol !== '') ? $server_protocol : (isset($_SERVER['HTTPS']) ? 'https://' : 'http://'); + $cookie_secure = ($cookie_secure !== '') ? $cookie_secure : (isset($_SERVER['HTTPS']) ? true : false); + foreach ($this->advanced_config_options as $config_key => $vars) { |