mirror of
https://src.fedoraproject.org/rpms/nextcloud.git
synced 2025-01-10 10:51:54 +01:00
107 lines
4.0 KiB
Diff
107 lines
4.0 KiB
Diff
diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php
|
|
deleted file mode 100644
|
|
index 2185078..0000000
|
|
--- a/core/Command/Maintenance/UpdateHtaccess.php
|
|
+++ /dev/null
|
|
@@ -1,45 +0,0 @@
|
|
-<?php
|
|
-/**
|
|
- * @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
- *
|
|
- * @author Lukas Reschke <lukas@statuscode.ch>
|
|
- *
|
|
- * @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\Core\Command\Maintenance;
|
|
-
|
|
-use InvalidArgumentException;
|
|
-use OC\Setup;
|
|
-use OCP\IConfig;
|
|
-use Symfony\Component\Console\Command\Command;
|
|
-use Symfony\Component\Console\Input\InputInterface;
|
|
-use Symfony\Component\Console\Input\InputOption;
|
|
-use Symfony\Component\Console\Output\OutputInterface;
|
|
-
|
|
-class UpdateHtaccess extends Command {
|
|
-
|
|
- protected function configure() {
|
|
- $this
|
|
- ->setName('maintenance:update:htaccess')
|
|
- ->setDescription('Updates the .htaccess file');
|
|
- }
|
|
-
|
|
- protected function execute(InputInterface $input, OutputInterface $output) {
|
|
- \OC\Setup::updateHtaccess();
|
|
- $output->writeln('.htaccess has been updated');
|
|
- return 0;
|
|
- }
|
|
-}
|
|
diff --git a/core/register_command.php b/core/register_command.php
|
|
index 6f20769..09535fe 100644
|
|
--- a/core/register_command.php
|
|
+++ b/core/register_command.php
|
|
@@ -60,7 +60,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
|
|
$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
|
|
$application->add(new OC\Core\Command\App\GetPath());
|
|
$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
|
|
-
|
|
+
|
|
$application->add(new OC\Core\Command\TwoFactorAuth\Enable(
|
|
\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
|
|
));
|
|
@@ -126,7 +126,6 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
|
|
new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
|
|
\OC::$server->getEventDispatcher()));
|
|
$application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
|
|
- $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
|
|
|
|
$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
|
|
|
|
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
|
|
index 3b3a57c..cd56795 100644
|
|
--- a/lib/private/Setup.php
|
|
+++ b/lib/private/Setup.php
|
|
@@ -379,10 +379,6 @@ class Setup {
|
|
// out that this is indeed an ownCloud data directory
|
|
file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
|
|
|
|
- // Update .htaccess files
|
|
- Setup::updateHtaccess();
|
|
- Setup::protectDataDirectory();
|
|
-
|
|
//try to write logtimezone
|
|
if (date_default_timezone_get()) {
|
|
$config->setSystemValue('logtimezone', date_default_timezone_get());
|
|
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
|
|
index 609e965..85d4869 100644
|
|
--- a/lib/private/Updater.php
|
|
+++ b/lib/private/Updater.php
|
|
@@ -237,14 +237,6 @@ class Updater extends BasicEmitter {
|
|
throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
|
|
}
|
|
|
|
- // Update .htaccess files
|
|
- try {
|
|
- Setup::updateHtaccess();
|
|
- Setup::protectDataDirectory();
|
|
- } catch (\Exception $e) {
|
|
- throw new \Exception($e->getMessage());
|
|
- }
|
|
-
|
|
// create empty file in data dir, so we can later find
|
|
// out that this is indeed an ownCloud data directory
|
|
// (in case it didn't exist before)
|