adjust files app, and integrate files_external into that section

This commit is contained in:
Arthur Schiwon 2016-08-11 18:39:16 +02:00
parent 36c1b7eb31
commit 30ff3ad45b
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
7 changed files with 106 additions and 62 deletions

View File

@ -1,51 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Frank Karlitschek <frank@karlitschek.de>
* @author Michael Göhler <somebody.here@gmx.de>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <robin@icewind.nl>
* @author Robin McCorkell <robin@mccorkell.me.uk>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @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/>
*
*/
$htaccessWorking=(getenv('htaccessWorking')=='true');
$upload_max_filesize = OC::$server->getIniWrapper()->getBytes('upload_max_filesize');
$post_max_size = OC::$server->getIniWrapper()->getBytes('post_max_size');
$maxUploadFilesize = OCP\Util::humanFileSize(min($upload_max_filesize, $post_max_size));
if($_POST && \OC::$server->getRequest()->passesCSRFCheck()) {
if(isset($_POST['maxUploadSize'])) {
if(($setMaxSize = OC_Files::setUploadLimit(OCP\Util::computerFileSize($_POST['maxUploadSize']))) !== false) {
$maxUploadFilesize = OCP\Util::humanFileSize($setMaxSize);
}
}
}
$htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess');
$userIniWritable=is_writable(OC::$SERVERROOT.'/.user.ini');
$tmpl = new OCP\Template( 'files', 'admin' );
$tmpl->assign( 'uploadChangable', ($htaccessWorking and $htaccessWritable) or $userIniWritable );
$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
// max possible makes only sense on a 32 bit system
$tmpl->assign( 'displayMaxPossibleUploadSize', PHP_INT_SIZE===4);
$tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
return $tmpl->fetchPage();

View File

@ -26,8 +26,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
\OCP\App::registerAdmin('files', 'admin');
$l = \OC::$server->getL10N('files');
\OC::$server->getNavigationManager()->add(function () {

View File

@ -6,7 +6,7 @@
<licence>AGPL</licence>
<author>Robin Appelman, Vincent Petry</author>
<default_enable/>
<version>1.6.0</version>
<version>1.6.1</version>
<types>
<filesystem/>
</types>
@ -22,4 +22,9 @@
<job>OCA\Files\BackgroundJob\DeleteOrphanedItems</job>
<job>OCA\Files\BackgroundJob\CleanupFileLocks</job>
</background-jobs>
<settings>
<admin>OCA\Files\Settings\Admin</admin>
<admin-section>OCA\Files\Settings\Section</admin-section>
</settings>
</info>

View File

@ -0,0 +1,93 @@
<?php
/**
* @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* 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
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Files\Settings;
use bantu\IniGetWrapper\IniGetWrapper;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IRequest;
use OCP\Settings\ISettings;
use OCP\Util;
class Admin implements ISettings {
/** @var IniGetWrapper */
private $iniWrapper;
/** @var IRequest */
private $request;
public function __construct(IniGetWrapper $iniWrapper, IRequest $request) {
$this->iniWrapper = $iniWrapper;
$this->request = $request;
}
/**
* @return TemplateResponse
*/
public function getForm() {
$htaccessWorking = (getenv('htaccessWorking') == 'true');
$htaccessWritable = is_writable(\OC::$SERVERROOT.'/.htaccess');
$userIniWritable = is_writable(\OC::$SERVERROOT.'/.user.ini');
$upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize');
$post_max_size = $this->iniWrapper->getBytes('post_max_size');
$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
if($_POST && $this->request->passesCSRFCheck()) {
if(isset($_POST['maxUploadSize'])) {
if(($setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($_POST['maxUploadSize']))) !== false) {
$maxUploadFilesize = Util::humanFileSize($setMaxSize);
}
}
}
$parameters = [
'uploadChangable' => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
'uploadMaxFilesize' => $maxUploadFilesize,
// max possible makes only sense on a 32 bit system
'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,
'maxPossibleUploadSize' => Util::humanFileSize(PHP_INT_MAX),
];
return new TemplateResponse('files', 'admin', $parameters, '');
}
/**
* @return string the section ID, e.g. 'sharing'
*/
public function getSection() {
return 'files';
}
/**
* @return int whether the form should be rather on the top or bottom of
* the admin section. The forms are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
*
* E.g.: 70
*/
public function getPriority() {
return 5;
}
}

View File

@ -21,7 +21,7 @@
*
*/
namespace OCA\Files_External\Settings;
namespace OCA\Files\Settings;
use OCP\IL10N;
use OCP\Settings\ISection;
@ -41,7 +41,7 @@ class Section implements ISection {
* @returns string
*/
public function getID() {
return 'externalstorage';
return 'files';
}
/**
@ -51,7 +51,7 @@ class Section implements ISection {
* @return string
*/
public function getName() {
return $this->l->t('External Storage');
return $this->l->t('Files & Storages');
}
/**
@ -62,6 +62,6 @@ class Section implements ISection {
* E.g.: 70
*/
public function getPriority() {
return 35;
return 10;
}
}

View File

@ -13,7 +13,7 @@
<admin>admin-external-storage</admin>
</documentation>
<rememberlogin>false</rememberlogin>
<version>1.1.1</version>
<version>1.1.2</version>
<types>
<filesystem/>
</types>
@ -27,6 +27,5 @@
<settings>
<admin>OCA\Files_External\Settings\Admin</admin>
<admin-section>OCA\Files_External\Settings\Section</admin-section>
</settings>
</info>

View File

@ -79,7 +79,7 @@ class Admin implements ISettings {
* @return string the section ID, e.g. 'sharing'
*/
public function getSection() {
return 'externalstorage';
return 'files';
}
/**
@ -90,7 +90,7 @@ class Admin implements ISettings {
* E.g.: 70
*/
public function getPriority() {
return 5;
return 40;
}
}