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 /core | |
| 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 'core')
| -rw-r--r-- | core/js/config.php | 1 | ||||
| -rw-r--r-- | core/js/js.js | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/js/config.php b/core/js/config.php index 953bd2ede45..463e334ef26 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -141,6 +141,7 @@ $array = array( 'version' => implode('.', OC_Util::getVersion()), 'versionstring' => OC_Util::getVersionString(), 'enable_avatars' => \OC::$server->getConfig()->getSystemValue('enable_avatars', true), + 'modRewriteWorking' => (getenv('front_controller_active') === 'true'), ) ), "oc_appconfig" => json_encode( diff --git a/core/js/js.js b/core/js/js.js index ce552bb8ea2..cbdffd0f016 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -160,7 +160,11 @@ var OC={ url = '/' + url; } - // TODO save somewhere whether the webserver is able to skip the index.php to have shorter links (e.g. for sharing) + + if(oc_config.modRewriteWorking == true) { + return OC.webroot + _build(url, params); + } + return OC.webroot + '/index.php' + _build(url, params); }, |