CI: Installer: Prevent 404 errors on IIS for COPYING file in iframe.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11266 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 26, 2011 · 547a360 · 547a360
1 parent 942f3b0
commit 547a360
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/application/controllers/installer.php b/application/controllers/installer.php
@@ -793,6 +793,19 @@ function optional()
         }
     }
 
+    /**
+     * display the license file as IIS for example
+     * does not display it via the server.
+     *
+     */
+    public function license()
+    {
+        $filename = base_url(). 'COPYING';
+        header('Content-Type: text/plain;');
+        readfile($filename);
+        exit;
+    }
+
     /**
      * Loads optional configuration screen.
      * @return

diff --git a/application/views/installer/license_view.php b/application/views/installer/license_view.php
@@ -21,7 +21,7 @@
 <div style="-moz-border-radius:15px; border-radius:15px;" >
 <p>&nbsp;<?php echo $descp; ?></p>
 <hr />
-<iframe src="<?php echo base_url(); ?>COPYING" style="height: 268px; width: 694px; border-width: 0px;"> </iframe>
+<iframe src="<?php echo site_url("installer/license"); ?>" style="height: 268px; width: 694px; border-width: 0px;"> </iframe>
 <hr />
 
 </div>