diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-02-11 01:10:03 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-12-01 16:46:07 +0100 |
| commit | 2515cb17be18da4aee32167259ee75fdc7a5a56b (patch) | |
| tree | 38635a8d2181478f8200c5bb7dea96b26c184822 /lib/private/route | |
| parent | 74e8c25a5b48eb4b675de262ced1702dec4307f4 (diff) | |
| download | nextcloud-server-2515cb17be18da4aee32167259ee75fdc7a5a56b.tar.gz nextcloud-server-2515cb17be18da4aee32167259ee75fdc7a5a56b.zip | |
Support pretty URLs
This changeset allows ownCloud to run with pretty URLs, they will be used if mod_rewrite and mod_env are available. This means basically that the `index.php` in the URL is not shown to the user anymore.
Also the not deprecated functions to generate URLs have been modified to support this behaviour, old functions such as `filePath` will still behave as before for compatibility reasons.
Examples:
http://localhost/owncloud/index.php/s/AIDyKbxiRZWAAjP => http://localhost/owncloud/s/AIDyKbxiRZWAAjP
http://localhost/owncloud/index.php/apps/files/ => http://localhost/owncloud/apps/files/
Due to the way our CSS and JS is structured the .htaccess uses some hacks for the final result but could be worse... And I was just annoyed by all that users crying for the removal of `index.php` ;-)
Diffstat (limited to 'lib/private/route')
| -rw-r--r-- | lib/private/route/router.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/route/router.php b/lib/private/route/router.php index 6d3b7c742bb..25860ee46bf 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -85,9 +85,15 @@ class Router implements IRouter { */ protected $logger; + /** + * @param ILogger $logger + */ public function __construct(ILogger $logger) { $this->logger = $logger; - $baseUrl = \OC_Helper::linkTo('', 'index.php'); + $baseUrl = \OC::$WEBROOT; + if(!(getenv('front_controller_active') === 'true')) { + $baseUrl = \OC_Helper::linkTo('', 'index.php'); + } if (!\OC::$CLI) { $method = $_SERVER['REQUEST_METHOD']; } else { |