Commit 04f5b1f0 authored by Menno Dekker's avatar Menno Dekker

Fixed #7107: Login using http://<serverurl>/admin broken on IIS

dev: now checking path style in config
parent 847e70a6
<?php
/*
* LimeSurvey
* Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
* All rights reserved.
* License: GNU/GPL License v2 or later, see LICENSE.php
* LimeSurvey is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See COPYRIGHT.php for copyright notices and details.
*/
// Simple redirect to still have the old /admin URL
if (stripos($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
header( 'Location: ../index.php/admin' );
} else {
// For IIS use get style
header( 'Location: ../index.php?r=admin' );
}
?>
<?php
include 'index.php';
\ No newline at end of file
<?php
/*
* LimeSurvey
* Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
* All rights reserved.
* License: GNU/GPL License v2 or later, see LICENSE.php
* LimeSurvey is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See COPYRIGHT.php for copyright notices and details.
*/
/*
* LimeSurvey
* Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
* All rights reserved.
* License: GNU/GPL License v2 or later, see LICENSE.php
* LimeSurvey is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See COPYRIGHT.php for copyright notices and details.
*/
// Simple redirect to still have the old /admin URL
if (stripos($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
header( 'Location: ../index.php/admin' );
} else {
// For IIS use get style
header( 'Location: ../index.php?r=admin' );
}
?>
$config_folder = dirname(__FILE__) . '/../application/config/';
$config_file = $config_folder . 'config.php';
if (!file_exists($config_file))
{
$config_file = $config_folder . 'config-sample-mysql.php';
}
define('BASEPATH', dirname(__FILE__) . '/..'); // To prevent direct access not allowed
$config = require($config_file);
$urlStyle = $config['components']['urlManager']['urlFormat'];
// Simple redirect to still have the old /admin URL
if ($urlStyle == 'path') {
header( 'Location: ../index.php/admin' );
} else {
// For IIS use get style
header( 'Location: ../index.php?r=admin' );
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment