mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add repair step for copying the RewriteBase

This commit is contained in:
Lukas Reschke 2016-05-10 17:19:45 +02:00
parent 4e10b81eb0
commit b78625e0ae
No known key found for this signature in database
GPG Key ID: 9AB0ADB949B6898C
2 changed files with 91 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/repair.php
View File

@ -34,6 +34,7 @@ use OC\Repair\AssetCache;
use OC\Repair\BrokenUpdaterRepair;
use OC\Repair\CleanTags;
use OC\Repair\Collation;
use OC\Repair\CopyRewriteBaseToConfig;
use OC\Repair\DropOldJobs;
use OC\Repair\OldGroupMembershipShares;
use OC\Repair\RemoveGetETagEntries;
@ -144,6 +145,7 @@ class Repair extends BasicEmitter {
new Collation(\OC::$server->getConfig(), $connection),
new SqliteAutoincrement($connection),
new SearchLuceneTables(),
new CopyRewriteBaseToConfig(\OC::$server->getConfig()),
];
//There is no need to delete all previews on every single update

89
lib/private/repair/copyrewritebasetoconfig.php Normal file
View File

@ -0,0 +1,89 @@
<?php
/**
* @author Lukas Reschke <lukas@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\Repair;
use OC\Hooks\BasicEmitter;
use OC\RepairStep;
use OCP\IConfig;
/**
* Class CopyRewriteBaseToConfig
*
* @package OC\Repair
*/
class CopyRewriteBaseToConfig extends BasicEmitter implements RepairStep {
/** @var IConfig */
private $config;
/**
* @param IConfig $config
*/
public function __construct(IConfig $config) {
$this->config = $config;
}
/**
* {@inheritdoc}
*/
public function getName() {
return 'Copy the rewrite base to the config file';
}
/**
* {@inheritdoc}
*/
public function run() {
$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
$versionsToApplyFrom = [
'9.0.0.19',
'9.0.1.3',
'9.0.2.2',
];
if(in_array($ocVersionFromBeforeUpdate, $versionsToApplyFrom, true)) {
// For CLI read the value from overwrite.cli.url
if(\OC::$CLI) {
$webRoot = $this->config->getSystemValue('overwrite.cli.url', '');
if($webRoot === '') {
return;
}
$webRoot = parse_url($webRoot, PHP_URL_PATH);
$webRoot = rtrim($webRoot, '/');
} else {
$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
}
// ownCloud may be configured to live at the root folder without a
// trailing slash being specified. In this case manually set the
// rewrite base to `/`
$rewriteBase = $webRoot;
if($webRoot === '') {
$rewriteBase = '/';
}
$this->config->setSystemValue('htaccess.RewriteBase', $rewriteBase);
\OC\Setup::updateHtaccess();
}
}
}