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` ;-)
This commit is contained in:
parent
74e8c25a5b
commit
2515cb17be
15
.htaccess
15
.htaccess
|
@ -43,6 +43,21 @@
|
||||||
RewriteRule ^remote/(.*) remote.php [QSA,L]
|
RewriteRule ^remote/(.*) remote.php [QSA,L]
|
||||||
RewriteRule ^(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
|
RewriteRule ^(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
|
||||||
RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
|
RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
|
||||||
|
|
||||||
|
<IfModule mod_env.c>
|
||||||
|
SetEnv front_controller_active true
|
||||||
|
RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]
|
||||||
|
RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]
|
||||||
|
RewriteCond %{REQUEST_FILENAME} !\.(css|js|svg|gif|png|html|ttf|woff)$
|
||||||
|
RewriteCond %{REQUEST_FILENAME} !/remote.php
|
||||||
|
RewriteCond %{REQUEST_FILENAME} !/public.php
|
||||||
|
RewriteCond %{REQUEST_FILENAME} !/cron.php
|
||||||
|
RewriteCond %{REQUEST_FILENAME} !/status.php
|
||||||
|
RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php
|
||||||
|
RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php
|
||||||
|
RewriteRule .* index.php [PT,E=PATH_INFO:$1]
|
||||||
|
</IfModule>
|
||||||
|
|
||||||
</IfModule>
|
</IfModule>
|
||||||
<IfModule mod_mime.c>
|
<IfModule mod_mime.c>
|
||||||
AddType image/svg+xml svg svgz
|
AddType image/svg+xml svg svgz
|
||||||
|
|
|
@ -213,7 +213,6 @@ $CONFIG = array(
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mail Parameters
|
* Mail Parameters
|
||||||
*
|
*
|
||||||
|
|
|
@ -141,6 +141,7 @@ $array = array(
|
||||||
'version' => implode('.', OC_Util::getVersion()),
|
'version' => implode('.', OC_Util::getVersion()),
|
||||||
'versionstring' => OC_Util::getVersionString(),
|
'versionstring' => OC_Util::getVersionString(),
|
||||||
'enable_avatars' => \OC::$server->getConfig()->getSystemValue('enable_avatars', true),
|
'enable_avatars' => \OC::$server->getConfig()->getSystemValue('enable_avatars', true),
|
||||||
|
'modRewriteWorking' => (getenv('front_controller_active') === 'true'),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
"oc_appconfig" => json_encode(
|
"oc_appconfig" => json_encode(
|
||||||
|
|
|
@ -160,7 +160,11 @@ var OC={
|
||||||
url = '/' + url;
|
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);
|
return OC.webroot + '/index.php' + _build(url, params);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -85,9 +85,15 @@ class Router implements IRouter {
|
||||||
*/
|
*/
|
||||||
protected $logger;
|
protected $logger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param ILogger $logger
|
||||||
|
*/
|
||||||
public function __construct(ILogger $logger) {
|
public function __construct(ILogger $logger) {
|
||||||
$this->logger = $logger;
|
$this->logger = $logger;
|
||||||
|
$baseUrl = \OC::$WEBROOT;
|
||||||
|
if(!(getenv('front_controller_active') === 'true')) {
|
||||||
$baseUrl = \OC_Helper::linkTo('', 'index.php');
|
$baseUrl = \OC_Helper::linkTo('', 'index.php');
|
||||||
|
}
|
||||||
if (!\OC::$CLI) {
|
if (!\OC::$CLI) {
|
||||||
$method = $_SERVER['REQUEST_METHOD'];
|
$method = $_SERVER['REQUEST_METHOD'];
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -432,6 +432,12 @@ class Setup {
|
||||||
//custom 404 error page
|
//custom 404 error page
|
||||||
$content.= "\nErrorDocument 404 ".\OC::$WEBROOT."/core/templates/404.php";
|
$content.= "\nErrorDocument 404 ".\OC::$WEBROOT."/core/templates/404.php";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add rewrite base
|
||||||
|
$content.="\n<IfModule mod_rewrite.c>";
|
||||||
|
$content.="\n RewriteBase ".\OC::$WEBROOT;
|
||||||
|
$content.="\n</IfModule>";
|
||||||
|
|
||||||
if ($content !== '') {
|
if ($content !== '') {
|
||||||
//suppress errors in case we don't have permissions for it
|
//suppress errors in case we don't have permissions for it
|
||||||
@file_put_contents($setupHelper->pathToHtaccess(), $content . "\n", FILE_APPEND);
|
@file_put_contents($setupHelper->pathToHtaccess(), $content . "\n", FILE_APPEND);
|
||||||
|
|
|
@ -90,7 +90,7 @@ class URLGenerator implements IURLGenerator {
|
||||||
* Returns a url to the given app and file.
|
* Returns a url to the given app and file.
|
||||||
*/
|
*/
|
||||||
public function linkTo( $app, $file, $args = array() ) {
|
public function linkTo( $app, $file, $args = array() ) {
|
||||||
$frontControllerActive=($this->config->getSystemValue('front_controller_active', 'false') == 'true');
|
$frontControllerActive = (getenv('front_controller_active') === 'true');
|
||||||
|
|
||||||
if( $app != '' ) {
|
if( $app != '' ) {
|
||||||
$app_path = \OC_App::getAppPath($app);
|
$app_path = \OC_App::getAppPath($app);
|
||||||
|
|
|
@ -1073,9 +1073,14 @@ class OC_Util {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(getenv('front_controller_active') === 'true') {
|
||||||
|
$location = $urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
|
||||||
|
} else {
|
||||||
$location = $urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
|
$location = $urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return $location;
|
return $location;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -338,6 +338,26 @@ class Test_Util extends \Test\TestCase {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testGetDefaultPageUrlWithRedirectUrlWithoutFrontController() {
|
||||||
|
putenv('front_controller_active=false');
|
||||||
|
|
||||||
|
$_REQUEST['redirect_url'] = 'myRedirectUrl.com';
|
||||||
|
$this->assertSame('http://localhost'.\OC::$WEBROOT.'/myRedirectUrl.com', OC_Util::getDefaultPageUrl());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetDefaultPageUrlWithRedirectUrlRedirectBypassWithoutFrontController() {
|
||||||
|
putenv('front_controller_active=false');
|
||||||
|
|
||||||
|
$_REQUEST['redirect_url'] = 'myRedirectUrl.com@foo.com:a';
|
||||||
|
$this->assertSame('http://localhost'.\OC::$WEBROOT.'/index.php/apps/files/', OC_Util::getDefaultPageUrl());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetDefaultPageUrlWithRedirectUrlRedirectBypassWithFrontController() {
|
||||||
|
putenv('front_controller_active=true');
|
||||||
|
$_REQUEST['redirect_url'] = 'myRedirectUrl.com@foo.com:a';
|
||||||
|
$this->assertSame('http://localhost'.\OC::$WEBROOT.'/apps/files/', OC_Util::getDefaultPageUrl());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test needUpgrade() when the core version is increased
|
* Test needUpgrade() when the core version is increased
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue