Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

dev: now checking path style in config
  • Loading branch information...
commit 04f5b1f0c171df8dd6c3cc2ef93b012c47f0c3fc 1 parent 847e70a
Menno Dekker mennodekker authored
Showing with 31 additions and 40 deletions.
  1. +2 −21 admin/admin.php
  2. +29 −19 admin/index.php
23 admin/admin.php
View
@@ -1,21 +1,2 @@
-<?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';
48 admin/index.php
View
@@ -1,21 +1,31 @@
<?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' );
+}
Please sign in to comment.
Something went wrong with that request. Please try again.