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

Merge pull request #20391 from nextcloud/refactor/spaces-cleanup 

Remove all extra whitespace PSR2 does not like
This commit is contained in:
Christoph Wurst 2020-04-09 20:39:37 +02:00 committed by GitHub
parent 64510932b8 3a415e4139
commit 008e6d7e84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
169 changed files with 411 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
View File

@ -133,7 +133,7 @@ class RequestHandlerController extends Controller {
$shareType === null ||
!is_array($protocol) ||
!isset($protocol['name']) ||
!isset ($protocol['options']) ||
!isset($protocol['options']) ||
!is_array($protocol['options']) ||
!isset($protocol['options']['sharedSecret'])
) {

2
apps/comments/lib/EventHandler.php
View File

@ -55,7 +55,7 @@ class EventHandler implements ICommentsEventHandler {
}
$eventType = $event->getEvent();
if( $eventType === CommentsEvent::EVENT_ADD
if($eventType === CommentsEvent::EVENT_ADD
) {
$this->notificationHandler($event);
$this->activityHandler($event);

2
apps/comments/lib/Listener/LoadAdditionalScripts.php
View File

@ -39,7 +39,7 @@ class LoadAdditionalScripts implements IEventListener {
return;
}
// TODO: make sure to only include the sidebar script when
// TODO: make sure to only include the sidebar script when
// we properly split it between files list and sidebar
Util::addScript(Application::APP_ID, 'comments');
}

2
apps/comments/lib/Listener/LoadSidebarScripts.php
View File

@ -38,7 +38,7 @@ class LoadSidebarScripts implements IEventListener {
return;
}
// TODO: make sure to only include the sidebar script when
// TODO: make sure to only include the sidebar script when
// we properly split it between files list and sidebar
Util::addScript(Application::APP_ID, 'comments');
}

4
apps/comments/lib/Notification/Listener.php
View File

@ -65,7 +65,7 @@ class Listener {
$notification = $this->instantiateNotification($comment);
foreach($mentions as $uid) {
if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
if(($comment->getActorType() === 'users' && $uid === $comment->getActorId())
|| !$this->userManager->userExists($uid)
) {
// do not notify unknown users or yourself
@ -73,7 +73,7 @@ class Listener {
}
$notification->setUser($uid);
if( $event->getEvent() === CommentsEvent::EVENT_DELETE
if($event->getEvent() === CommentsEvent::EVENT_DELETE
|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
{
$this->notificationManager->markProcessed($notification);

2
apps/dav/lib/CalDAV/CachedSubscription.php
View File

@ -135,7 +135,7 @@ class CachedSubscription extends \Sabre\CalDAV\Calendar {
}
$obj['acl'] = $this->getChildACL();
return new CachedSubscriptionObject ($this->caldavBackend, $this->calendarInfo, $obj);
return new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
}

10
apps/dav/lib/CalDAV/CalDavBackend.php
View File

@ -805,11 +805,11 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
foreach ($mutations as $propertyName => $propertyValue) {
switch ($propertyName) {
case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' :
case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp':
$fieldName = 'transparent';
$newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
break;
default :
default:
$fieldName = $this->propertyMap[$propertyName];
$newValues[$fieldName] = $propertyValue;
break;
@ -1812,13 +1812,13 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
foreach($changes as $uri => $operation) {
switch($operation) {
case 1 :
case 1:
$result['added'][] = $uri;
break;
case 2 :
case 2:
$result['modified'][] = $uri;
break;
case 3 :
case 3:
$result['deleted'][] = $uri;
break;
}

4
apps/dav/lib/CalDAV/Publishing/PublishPlugin.php
View File

@ -176,7 +176,7 @@ class PublishPlugin extends ServerPlugin {
switch ($documentType) {
case '{'.self::NS_CALENDARSERVER.'}publish-calendar' :
case '{'.self::NS_CALENDARSERVER.'}publish-calendar':
// We can only deal with IShareableCalendar objects
if (!$node instanceof Calendar) {
@ -204,7 +204,7 @@ class PublishPlugin extends ServerPlugin {
// Breaking the event chain
return false;
case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar' :
case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar':
// We can only deal with IShareableCalendar objects
if (!$node instanceof Calendar) {

10
apps/dav/lib/CardDAV/CardDavBackend.php
View File

@ -369,10 +369,10 @@ class CardDavBackend implements BackendInterface, SyncSupport {
foreach($mutations as $property=>$newValue) {
switch($property) {
case '{DAV:}displayname' :
case '{DAV:}displayname':
$updates['displayname'] = $newValue;
break;
case '{' . Plugin::NS_CARDDAV . '}addressbook-description' :
case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
$updates['description'] = $newValue;
break;
}
@ -414,13 +414,13 @@ class CardDavBackend implements BackendInterface, SyncSupport {
foreach($properties as $property=>$newValue) {
switch($property) {
case '{DAV:}displayname' :
case '{DAV:}displayname':
$values['displayname'] = $newValue;
break;
case '{' . Plugin::NS_CARDDAV . '}addressbook-description' :
case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
$values['description'] = $newValue;
break;
default :
default:
throw new BadRequest('Unknown property: ' . $property);
}

2
apps/dav/lib/CardDAV/ImageExportPlugin.php
View File

@ -97,7 +97,7 @@ class ImageExportPlugin extends ServerPlugin {
$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
$response->setHeader('Etag', $node->getETag() );
$response->setHeader('Etag', $node->getETag());
$response->setHeader('Pragma', 'public');
try {

2
apps/dav/lib/Command/MoveCalendar.php
View File

@ -180,7 +180,7 @@ class MoveCalendar extends Command {
*/
if (count($shares) > 0) {
$this->io->note([
"Please note that moving calendar " . $calendar['uri'] . " from user <$userOrigin> to <$userDestination> has caused share links to change.",
"Please note that moving calendar " . $calendar['uri'] . " from user <$userOrigin> to <$userDestination> has caused share links to change.",
"Sharees will need to change \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userOrigin\" to \"example.com/remote.php/dav/calendars/uid/" . $calendar['uri'] . "_shared_by_$userDestination\""
]);
}

2
apps/dav/lib/Comments/CommentNode.php
View File

@ -131,7 +131,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
protected function checkWriteAccessOnComment() {
$user = $this->userSession->getUser();
if( $this->comment->getActorType() !== 'users'
if($this->comment->getActorType() !== 'users'
|| is_null($user)
|| $this->comment->getActorId() !== $user->getUID()
) {

2
apps/dav/lib/Connector/Sabre/File.php
View File

@ -512,7 +512,7 @@ class File extends Node implements IFile {
$bytesWritten = $chunk_handler->store($info['index'], $data);
//detect aborted upload
if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
if (isset($_SERVER['CONTENT_LENGTH'])) {
$expected = (int)$_SERVER['CONTENT_LENGTH'];
if ($bytesWritten !== $expected) {

2
apps/dav/lib/DAV/Sharing/Plugin.php
View File

@ -149,7 +149,7 @@ class Plugin extends ServerPlugin {
// Dealing with the 'share' document, which modified invitees on a
// calendar.
case '{' . self::NS_OWNCLOUD . '}share' :
case '{' . self::NS_OWNCLOUD . '}share':
// We can only deal with IShareableCalendar objects
if (!$node instanceof IShareable) {

4
apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php
View File

@ -59,7 +59,7 @@ class ShareRequest implements XmlDeserializable {
foreach ($elements as $elem) {
switch ($elem['name']) {
case '{' . Plugin::NS_OWNCLOUD . '}set' :
case '{' . Plugin::NS_OWNCLOUD . '}set':
$sharee = $elem['value'];
$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
@ -73,7 +73,7 @@ class ShareRequest implements XmlDeserializable {
];
break;
case '{' . Plugin::NS_OWNCLOUD . '}remove' :
case '{' . Plugin::NS_OWNCLOUD . '}remove':
$remove[] = $elem['value']['{DAV:}href'];
break;

2
apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
View File

@ -189,7 +189,7 @@ class SystemTagsObjectMappingCollection implements ICollection {
}
/**
* Create a sabre node for the mapping of the
* Create a sabre node for the mapping of the
* given system tag to the collection's object
*
* @param ISystemTag $tag

2
apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php
View File

@ -80,7 +80,7 @@ class SystemTagsObjectTypeCollection implements ICollection {
* @param \Closure $childExistsFunction
*/
public function __construct(
$objectType,
$objectType,
ISystemTagManager $tagManager,
ISystemTagObjectMapper $tagMapper,
IUserSession $userSession,

6
apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
View File

@ -192,7 +192,7 @@ class IMipPluginTest extends TestCase {
->with('dav', 'invitation_link_recipients', 'yes')
->willReturn('yes');
$message = $this->_testMessage( $veventParams );
$message = $this->_testMessage($veventParams);
$this->_expectSend('frodo@hobb.it', $expectsMail, $expectsMail);
@ -274,8 +274,8 @@ class IMipPluginTest extends TestCase {
'SUMMARY' => 'Fellowship meeting',
'DTSTART' => new \DateTime('2018-01-01 00:00:00')
], $attrs));
$message->message->VEVENT->add( 'ORGANIZER', 'mailto:gandalf@wiz.ard' );
$message->message->VEVENT->add( 'ATTENDEE', 'mailto:'.$recipient, [ 'RSVP' => 'TRUE' ] );
$message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
$message->message->VEVENT->add('ATTENDEE', 'mailto:'.$recipient, [ 'RSVP' => 'TRUE' ]);
$message->sender = 'mailto:gandalf@wiz.ard';
$message->senderName = 'Mr. Wizard';
$message->recipient = 'mailto:'.$recipient;

6
apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
View File

@ -573,7 +573,7 @@ class SystemTagPluginTest extends \Test\TestCase {
$request->expects($this->once())
->method('getHeader')
->with('Content-Type')
->willReturn('application/json');
->willReturn('application/json');
$request->expects($this->once())
->method('getUrl')
@ -647,7 +647,7 @@ class SystemTagPluginTest extends \Test\TestCase {
$request->expects($this->once())
->method('getHeader')
->with('Content-Type')
->willReturn('application/json');
->willReturn('application/json');
$request->expects($this->once())
->method('getBaseUrl')
@ -744,7 +744,7 @@ class SystemTagPluginTest extends \Test\TestCase {
$request->expects($this->once())
->method('getHeader')
->with('Content-Type')
->willReturn('application/json');
->willReturn('application/json');
$this->plugin->httpPost($request, $response);
}

2
apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
View File

@ -62,7 +62,7 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
}
public function getNode() {
return new \OCA\DAV\SystemTag\SystemTagsObjectMappingCollection (
return new \OCA\DAV\SystemTag\SystemTagsObjectMappingCollection(
111,
'files',
$this->user,

2
apps/encryption/lib/Controller/RecoveryController.php
View File

@ -121,7 +121,7 @@ class RecoveryController extends Controller {
if (empty($newPassword)) {
$errorMessage = (string)$this->l->t('Please provide a new recovery password');
return new DataResponse (['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if (empty($confirmPassword)) {

2
apps/encryption/lib/Controller/StatusController.php
View File

@ -70,7 +70,7 @@ class StatusController extends Controller {
$status = 'error';
$message = 'no valid init status';
switch( $this->session->getStatus()) {
switch($this->session->getStatus()) {
case Session::INIT_EXECUTED:
$status = 'interactionNeeded';
$message = (string)$this->l->t(

4
apps/encryption/lib/Crypto/EncryptAll.php
View File

@ -473,11 +473,11 @@ class EncryptAll {
protected function createMailBody($password) {
$html = new \OC_Template("encryption", "mail", "");
$html->assign ('password', $password);
$html->assign('password', $password);
$htmlMail = $html->fetchPage();
$plainText = new \OC_Template("encryption", "altmail", "");
$plainText->assign ('password', $password);
$plainText->assign('password', $password);
$plainTextMail = $plainText->fetchPage();
return [$htmlMail, $plainTextMail];

2
apps/encryption/templates/altmail.php
View File

@ -3,7 +3,7 @@
/** @var array $_ */
print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", [$_['password']]));
if ( isset($_['expiration']) ) {
if (isset($_['expiration'])) {
print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
print_unescaped("\n\n");
}

2
apps/encryption/templates/settings-admin.php
View File

@ -13,7 +13,7 @@ style('encryption', 'settings-admin');
<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> />
<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
<em><?php p( $l->t( "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" ) ); ?></em>
<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
</p>
<br />
<?php if($_['masterKeyEnabled'] === false): ?>

32
apps/encryption/templates/settings-personal.php
View File

@ -6,49 +6,49 @@ script('encryption', 'settings-personal');
<form id="ocDefaultEncryptionModule" class="section">
<h2 data-anchor-name="basic-encryption-module"><?php p($l->t('Basic encryption module')); ?></h2>
<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
<?php p($l->t("Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.")); ?>
<?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
<?php elseif ($_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED): ?>
<p>
<a name="changePKPasswd" />
<label for="changePrivateKeyPasswd">
<em><?php p( $l->t( "Your private key password no longer matches your log-in password." ) ); ?></em>
<em><?php p($l->t("Your private key password no longer matches your log-in password.")); ?></em>
</label>
<br />
<?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?>
<?php if ( $_["recoveryEnabledForUser"] ):
p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
<?php p($l->t("Set your old private key password to your current log-in password:")); ?>
<?php if ($_["recoveryEnabledForUser"]):
p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
endif; ?>
<br />
<input
type="password"
name="changePrivateKeyPassword"
id="oldPrivateKeyPassword" />
<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>
<label for="oldPrivateKeyPassword"><?php p($l->t("Old log-in password")); ?></label>
<br />
<input
type="password"
name="changePrivateKeyPassword"
id="newPrivateKeyPassword" />
<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>
<label for="newRecoveryPassword"><?php p($l->t("Current log-in password")); ?></label>
<br />
<button
type="button"
name="submitChangePrivateKeyPassword"
disabled><?php p($l->t( "Update Private Key Password" )); ?>
disabled><?php p($l->t("Update Private Key Password")); ?>
</button>
<span class="msg"></span>
</p>
<?php elseif ( $_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL ): ?>
<?php elseif ($_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL): ?>
<br />
<p id="userEnableRecovery">
<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
<label for="userEnableRecovery"><?php p($l->t("Enable password recovery:")); ?></label>
<span class="msg"></span>
<br />
<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>
<em><?php p($l->t("Enabling this option will allow you to reobtain access to your encrypted files in case of password loss")); ?></em>
<br />
<input
type="radio"
@ -56,8 +56,8 @@ script('encryption', 'settings-personal');
id="userEnableRecoveryCheckbox"
name="userEnableRecovery"
value="1"
<?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> />
<label for="userEnableRecoveryCheckbox"><?php p( $l->t( "Enabled" ) ); ?></label>
<?php echo($_["recoveryEnabledForUser"] ? 'checked="checked"' : ''); ?> />
<label for="userEnableRecoveryCheckbox"><?php p($l->t("Enabled")); ?></label>
<br />
<input
@ -66,8 +66,8 @@ script('encryption', 'settings-personal');
id="userDisableRecoveryCheckbox"
name="userEnableRecovery"
value="0"
<?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> />
<label for="userDisableRecoveryCheckbox"><?php p( $l->t( "Disabled" ) ); ?></label>
<?php echo($_["recoveryEnabledForUser"] === false ? 'checked="checked"' : ''); ?> />
<label for="userDisableRecoveryCheckbox"><?php p($l->t("Disabled")); ?></label>
</p>
<?php endif; ?>
</form>

2
apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php
View File

@ -146,7 +146,7 @@ class MountPublicLinkController extends Controller {
$storedPassword = $share->getPassword();
$authenticated = $this->session->get('public_link_authenticated') === $share->getId() ||
$this->shareManager->checkPassword($share, $password);
if (!empty($storedPassword) && !$authenticated ) {
if (!empty($storedPassword) && !$authenticated) {
$response = new JSONResponse(
['message' => 'No permission to access the share'],
Http::STATUS_BAD_REQUEST

2
apps/files/lib/Command/Scan.php
View File

@ -173,7 +173,7 @@ class Scan extends Base {
$inputPath = $input->getOption('path');
if ($inputPath) {
$inputPath = '/' . trim($inputPath, '/');
list (, $user,) = explode('/', $inputPath, 3);
list(, $user,) = explode('/', $inputPath, 3);
$users = [$user];
} else if ($input->getOption('all')) {
$users = $this->userManager->search('');

1
apps/files/list.php
View File

@ -37,4 +37,3 @@ $tmpl = new OCP\Template('files', 'list', '');
$tmpl->assign('showgridview', $showgridview && !$isIE);
$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
$tmpl->printPage();

1
apps/files/simplelist.php
View File

@ -35,4 +35,3 @@ $tmpl = new OCP\Template('files', 'simplelist', '');
// gridview not available for ie
$tmpl->assign('showgridview', $showgridview && !$isIE);
$tmpl->printPage();

4
apps/files/templates/list.php
View File

@ -44,7 +44,7 @@
<th id='headerName' class="hidden column-name">
<div id="headerName-container">
<a class="name sort columntitle" data-sort="name">
<span><?php p($l->t( 'Name' )); ?></span>
<span><?php p($l->t('Name')); ?></span>
<span class="sort-indicator"></span>
</a>
@ -60,7 +60,7 @@
<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
</th>
<th id="headerDate" class="hidden column-mtime">
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
</th>
</tr>
</thead>

4
apps/files/templates/simplelist.php
View File

@ -18,14 +18,14 @@
<tr>
<th id='headerName' class="hidden column-name">
<div id="headerName-container">
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
</div>
</th>
<th id="headerSize" class="hidden column-size">
<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
</th>
<th id="headerDate" class="hidden column-mtime">
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
<span class="selectedActions">
<a href="" class="delete-selected">
<img class="svg" alt=""

2
apps/files_external/lib/Lib/Storage/FTP.php
View File

@ -56,7 +56,7 @@ class FTP extends StreamWrapper{
$this->secure = false;
}
$this->root=isset($params['root'])?$params['root']:'/';
if ( ! $this->root || $this->root[0]!=='/') {
if (! $this->root || $this->root[0]!=='/') {
$this->root='/'.$this->root;
}
if (substr($this->root, -1) !== '/') {

2
apps/files_external/lib/Lib/Storage/SFTP.php
View File

@ -371,7 +371,7 @@ class SFTP extends \OC\Files\Storage\Common {
switch($mode) {
case 'r':
case 'rb':
if ( !$this->file_exists($path)) {
if (!$this->file_exists($path)) {
return false;
}
SFTPReadStream::register();

1
apps/files_external/lib/Lib/Storage/SFTPWriteStream.php
View File

@ -180,4 +180,3 @@ class SFTPWriteStream implements File {
}
}

2
apps/files_external/templates/list.php
View File

@ -16,7 +16,7 @@
<tr>
<th id='headerName' class="hidden column-name">
<div id="headerName-container">
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
</div>
</th>
<th id="headerBackend" class="hidden column-backend">

10
apps/files_external/templates/settings.php
View File

@ -1,10 +1,10 @@
<?php
use \OCA\Files_External\Lib\Backend\Backend;
use \OCA\Files_External\Lib\Auth\AuthMechanism;
use \OCA\Files_External\Lib\DefinitionParameter;
use \OCA\Files_External\Service\BackendService;
use \OCA\Files_External\Lib\Auth\AuthMechanism;
use \OCA\Files_External\Lib\DefinitionParameter;
use \OCA\Files_External\Service\BackendService;
$canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
$canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
$l->t("Enable encryption");
$l->t("Enable previews");
@ -142,7 +142,7 @@
});
?>
<?php foreach ($sortedBackends as $backend): ?>
<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends?>
<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
<?php endforeach; ?>
</select>

2
apps/files_external/tests/Service/GlobalStoragesServiceTest.php
View File

@ -267,7 +267,7 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
],
],
],
// mixed groups and users
// mixed groups and users
[
['user1', 'user2'],
['group1', 'group2'],

2
apps/files_external/tests/Storage/Amazons3Test.php
View File

@ -45,7 +45,7 @@ class Amazons3Test extends \Test\Files\Storage\Storage {
parent::setUp();
$this->config = include('files_external/tests/config.amazons3.php');
if ( ! is_array($this->config) or ! $this->config['run']) {
if (! is_array($this->config) or ! $this->config['run']) {
$this->markTestSkipped('AmazonS3 backend not configured');
}
$this->instance = new AmazonS3($this->config);

2
apps/files_external/tests/Storage/FtpTest.php
View File

@ -47,7 +47,7 @@ class FtpTest extends \Test\Files\Storage\Storage {
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.ftp.php');
if ( ! is_array($this->config) or ! $this->config['run']) {
if (! is_array($this->config) or ! $this->config['run']) {
$this->markTestSkipped('FTP backend not configured');
}
$this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in

2
apps/files_external/tests/Storage/OwncloudTest.php
View File

@ -45,7 +45,7 @@ class OwncloudTest extends \Test\Files\Storage\Storage {
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.php');
if ( ! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) {
if (! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) {
$this->markTestSkipped('Nextcloud backend not configured');
}
$this->config['owncloud']['root'] .= '/' . $id; //make sure we have an new empty folder to work in

2
apps/files_external/tests/Storage/SFTP_KeyTest.php
View File

@ -44,7 +44,7 @@ class SFTP_KeyTest extends \Test\Files\Storage\Storage {
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.php');
if ( ! is_array($this->config) or ! isset($this->config['sftp_key']) or ! $this->config['sftp_key']['run']) {
if (! is_array($this->config) or ! isset($this->config['sftp_key']) or ! $this->config['sftp_key']['run']) {
$this->markTestSkipped('SFTP with key backend not configured');
}
// Make sure we have an new empty folder to work in

2
apps/files_sharing/lib/Controller/ShareController.php
View File

@ -425,7 +425,7 @@ class ShareController extends AuthPublicShareController {
$shareTmpl['previewURL'] = $shareTmpl['downloadURL'];
if ($shareTmpl['previewSupported']) {
$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute( 'files_sharing.PublicPreview.getPreview',
$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.PublicPreview.getPreview',
['x' => 200, 'y' => 200, 'file' => $shareTmpl['directory_path'], 'token' => $shareTmpl['dirToken']]);
$ogPreview = $shareTmpl['previewImage'];

2
apps/files_sharing/lib/Exceptions/SharingRightsException.php
View File

@ -25,7 +25,6 @@ namespace OCA\Files_Sharing\Exceptions;
use Exception;
/**
* Sharing and Resharing rights.
*
@ -36,4 +35,3 @@ use Exception;
class SharingRightsException extends Exception {
}

6
apps/files_sharing/templates/list.php
View File

@ -15,14 +15,14 @@
<tr>
<th id='headerName' class="hidden column-name">
<div id="headerName-container">
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
</div>
</th>
<th id="headerDate" class="hidden column-mtime">
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a>
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Share time')); ?></span><span class="sort-indicator"></span></a>
</th>
<th class="hidden column-expiration">
<a class="columntitle"><span><?php p($l->t( 'Expiration date' )); ?></span></a>
<a class="columntitle"><span><?php p($l->t('Expiration date')); ?></span></a>
</th>
</tr>
</thead>

2
apps/files_sharing/tests/Migration/SetPasswordColumnTest.php
View File

@ -109,7 +109,7 @@ class SetPasswordColumnTest extends TestCase {
foreach ($allShares as $share) {
if ((int)$share['share_type'] === Share::SHARE_TYPE_LINK) {
$this->assertNull( $share['share_with']);
$this->assertNull($share['share_with']);
$this->assertSame('shareWith', $share['password']);
} else {
$this->assertSame('shareWith', $share['share_with']);

38
apps/files_sharing/tests/MountProviderTest.php
View File

@ -112,9 +112,9 @@ class MountProviderTest extends \Test\TestCase {
$this->makeMockShare(2, 100, 'user2', '/share2', 31),
];
$groupShares = [
$this->makeMockShare(3, 100, 'user2', '/share2', 0),
$this->makeMockShare(4, 101, 'user2', '/share4', 31),
$this->makeMockShare(5, 100, 'user1', '/share4', 31),
$this->makeMockShare(3, 100, 'user2', '/share2', 0),
$this->makeMockShare(4, 101, 'user2', '/share4', 31),
$this->makeMockShare(5, 100, 'user1', '/share4', 31),
];
$roomShares = [
$this->makeMockShare(6, 102, 'user2', '/share6', 0),
@ -180,10 +180,10 @@ class MountProviderTest extends \Test\TestCase {
// #0: share as outsider with "group1" and "user1" with same permissions
[
[
[1, 100, 'user2', '/share2', 31],
[1, 100, 'user2', '/share2', 31],
],
[
[2, 100, 'user2', '/share2', 31],
[2, 100, 'user2', '/share2', 31],
],
[
// combined, user share has higher priority
@ -193,10 +193,10 @@ class MountProviderTest extends \Test\TestCase {
// #1: share as outsider with "group1" and "user1" with different permissions
[
[
[1, 100, 'user2', '/share', 31],
[1, 100, 'user2', '/share', 31],
],
[
[2, 100, 'user2', '/share', 15],
[2, 100, 'user2', '/share', 15],
],
[
// use highest permissions
@ -208,8 +208,8 @@ class MountProviderTest extends \Test\TestCase {
[
],
[
[1, 100, 'user2', '/share', 31],
[2, 100, 'user2', '/share', 31],
[1, 100, 'user2', '/share', 31],
[2, 100, 'user2', '/share', 31],
],
[
// combined, first group share has higher priority
@ -221,8 +221,8 @@ class MountProviderTest extends \Test\TestCase {
[
],
[
[1, 100, 'user2', '/share', 31],
[2, 100, 'user2', '/share', 15],
[1, 100, 'user2', '/share', 31],
[2, 100, 'user2', '/share', 15],
],
[
// use higher permissions
@ -234,7 +234,7 @@ class MountProviderTest extends \Test\TestCase {
[
],
[
[1, 100, 'user1', '/share', 31],
[1, 100, 'user1', '/share', 31],
],
[
// no received share since "user1" is the sharer/owner
@ -245,8 +245,8 @@ class MountProviderTest extends \Test\TestCase {
[
],
[
[1, 100, 'user1', '/share', 31],
[2, 100, 'user1', '/share', 15],
[1, 100, 'user1', '/share', 31],
[2, 100, 'user1', '/share', 15],
],
[
// no received share since "user1" is the sharer/owner
@ -257,7 +257,7 @@ class MountProviderTest extends \Test\TestCase {
[
],
[
[1, 100, 'user2', '/share', 0],
[1, 100, 'user2', '/share', 0],
],
[
// no received share since "user1" opted out
@ -266,10 +266,10 @@ class MountProviderTest extends \Test\TestCase {
// #7: share as outsider with "group1" and "user1" where recipient renamed in between
[
[
[1, 100, 'user2', '/share2-renamed', 31],
[1, 100, 'user2', '/share2-renamed', 31],
],
[
[2, 100, 'user2', '/share2', 31],
[2, 100, 'user2', '/share2', 31],
],
[
// use target of least recent share
@ -279,10 +279,10 @@ class MountProviderTest extends \Test\TestCase {
// #8: share as outsider with "group1" and "user1" where recipient renamed in between
[
[
[2, 100, 'user2', '/share2', 31],
[2, 100, 'user2', '/share2', 31],
],
[
[1, 100, 'user2', '/share2-renamed', 31],
[1, 100, 'user2', '/share2-renamed', 31],
],
[
// use target of least recent share

4
apps/files_trashbin/templates/index.php
View File

@ -29,7 +29,7 @@
</th>
<th id='headerName' class="hidden column-name">
<div id="headerName-container">
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
<span id="selectedActionsList" class='selectedActions'>
<a href="" class="actions-selected">
<span class="icon icon-more"></span>
@ -39,7 +39,7 @@
</div>
</th>
<th id="headerDate" class="hidden column-mtime">
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a>
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Deleted')); ?></span><span class="sort-indicator"></span></a>
</th>
</tr>
</thead>

1
apps/files_versions/appinfo/app.php
View File

@ -22,4 +22,3 @@
*/
\OC::$server->query(\OCA\Files_Versions\AppInfo\Application::class);

1
apps/files_versions/appinfo/routes.php
View File

@ -46,4 +46,3 @@ $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php')
->actionInclude('files_versions/ajax/getVersions.php');
$this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php')
->actionInclude('files_versions/ajax/rollbackVersion.php');

2
apps/files_versions/lib/Expiration.php
View File

@ -129,7 +129,7 @@ class Expiration {
}
/**
* Read versions_retention_obligation, validate it
* Read versions_retention_obligation, validate it
* and set private members accordingly
*/
private function parseRetentionObligation() {

2
apps/files_versions/lib/Listener/LoadAdditionalListener.php
View File

@ -39,7 +39,7 @@ class LoadAdditionalListener implements IEventListener {
return;
}
// TODO: make sure to only include the sidebar script when
// TODO: make sure to only include the sidebar script when
// we properly split it between files list and sidebar
Util::addScript(Application::APP_ID, 'files_versions');
}

2
apps/files_versions/lib/Listener/LoadSidebarListener.php
View File

@ -39,7 +39,7 @@ class LoadSidebarListener implements IEventListener {
return;
}
// TODO: make sure to only include the sidebar script when
// TODO: make sure to only include the sidebar script when
// we properly split it between files list and sidebar
Util::addScript(Application::APP_ID, 'files_versions');
}

4
apps/files_versions/lib/Storage.php
View File

@ -107,7 +107,7 @@ class Storage {
$uid = User::getUser();
}
Filesystem::initMountPoints($uid);
if ( $uid !== User::getUser() ) {
if ($uid !== User::getUser()) {
$info = Filesystem::getFileInfo($filename);
$ownerView = new View('/'.$uid.'/files');
try {
@ -735,7 +735,7 @@ class Storage {
$softQuota = true;
$quota = $user->getQuota();
if ( $quota === null || $quota === 'none' ) {
if ($quota === null || $quota === 'none') {
$quota = Filesystem::free_space('/');
$softQuota = false;
} else {

2
apps/oauth2/lib/Controller/OauthApiController.php
View File

@ -99,7 +99,7 @@ class OauthApiController extends Controller {
}
// We handle the initial and refresh tokens the same way
if ($grant_type === 'refresh_token' ) {
if ($grant_type === 'refresh_token') {
$code = $refresh_token;
}

2
apps/provisioning_api/tests/Controller/GroupsControllerTest.php
View File

@ -249,7 +249,7 @@ class GroupsControllerTest extends \Test\TestCase {
'disabled' => 11,
'canAdd' => true,
'canRemove' => true
],
],
[
'id' => 'group2',
'displayname' => 'group2-name',

2
apps/settings/templates/help.php
View File

@ -1,5 +1,5 @@
<?php
\OC_Util::addStyle( 'settings', "settings" );
\OC_Util::addStyle('settings', "settings");
?>
<div id="app-navigation">
<ul>

2
apps/settings/templates/settings/admin/overview.php
View File

@ -51,7 +51,7 @@
<ul class="info hidden"></ul>
</div>
<p id="postsetupchecks-hint" class="hidden">
<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%1$s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%2$s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])] )); ?>
<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%1$s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%2$s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])])); ?>
</p>
<p class="extra-top-margin">

8
apps/settings/templates/settings/admin/sharing.php
View File

@ -44,10 +44,10 @@
<label for="shareapiDefaultInternalExpireDate"><?php p($l->t('Set default expiration date for shares'));?></label><br/>
</p>
<p id="setDefaultInternalExpireDate" class="double-indent <?php if ($_['shareDefaultInternalExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
<?php p($l->t( 'Expire after ' )); ?>
<?php p($l->t('Expire after ')); ?>
<input type="text" name='shareapi_internal_expire_after_n_days' id="shareapiInternalExpireAfterNDays" placeholder="<?php p('7')?>"
value='<?php p($_['shareInternalExpireAfterNDays']) ?>' />
<?php p($l->t( 'days' )); ?>
<?php p($l->t('days')); ?>
<input type="checkbox" name="shareapi_internal_enforce_expire_date" id="shareapiInternalEnforceExpireDate" class="checkbox"
value="1" <?php if ($_['shareInternalEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
<label for="shareapiInternalEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
@ -76,10 +76,10 @@
</p>
<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
<?php p($l->t( 'Expire after ' )); ?>
<?php p($l->t('Expire after ')); ?>
<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
value='<?php p($_['shareExpireAfterNDays']) ?>' />
<?php p($l->t( 'days' )); ?>
<?php p($l->t('days')); ?>
<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" class="checkbox"
value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>

2
apps/settings/templates/settings/frame.php
View File

@ -22,7 +22,7 @@
*/
style('settings', 'settings');
script('settings', [ 'settings', 'admin', 'log', 'certificates'] );
script('settings', [ 'settings', 'admin', 'log', 'certificates']);
script('core', 'setupchecks');
script('files', 'jquery.fileupload');

2
apps/settings/tests/Controller/CheckSetupControllerTest.php
View File

@ -970,7 +970,7 @@ class CheckSetupControllerTest extends TestCase {
$this->checker
->expects($this->once())
->method('getResults')
->willReturn( [ 'core' => [ 'EXTRA_FILE' => ['/testfile' => []], 'INVALID_HASH' => [ '/.idea/workspace.xml' => [ 'expected' => 'f1c5e2630d784bc9cb02d5a28f55d6f24d06dae2a0fee685f3c2521b050955d9d452769f61454c9ddfa9c308146ade10546cfa829794448eaffbc9a04a29d216', 'current' => 'ce08bf30bcbb879a18b49239a9bec6b8702f52452f88a9d32142cad8d2494d5735e6bfa0d8642b2762c62ca5be49f9bf4ec231d4a230559d4f3e2c471d3ea094', ], '/lib/private/integritycheck/checker.php' => [ 'expected' => 'c5a03bacae8dedf8b239997901ba1fffd2fe51271d13a00cc4b34b09cca5176397a89fc27381cbb1f72855fa18b69b6f87d7d5685c3b45aee373b09be54742ea', 'current' => '88a3a92c11db91dec1ac3be0e1c87f862c95ba6ffaaaa3f2c3b8f682187c66f07af3a3b557a868342ef4a271218fe1c1e300c478e6c156c5955ed53c40d06585', ], '/settings/controller/checksetupcontroller.php' => [ 'expected' => '3e1de26ce93c7bfe0ede7c19cb6c93cadc010340225b375607a7178812e9de163179b0dc33809f451e01f491d93f6f5aaca7929685d21594cccf8bda732327c4', 'current' => '09563164f9904a837f9ca0b5f626db56c838e5098e0ccc1d8b935f68fa03a25c5ec6f6b2d9e44a868e8b85764dafd1605522b4af8db0ae269d73432e9a01e63a', ], ], ], 'bookmarks' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'dav' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'encryption' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'external' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'federation' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_antivirus' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_drop' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_external' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_pdfviewer' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_sharing' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_trashbin' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_versions' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_videoviewer' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'firstrunwizard' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'gitsmart' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'logreader' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature could not get verified.', ], ], 'password_policy' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'provisioning_api' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'sketch' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'threatblock' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'two_factor_auth' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'user_ldap' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'user_shibboleth' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], ]);
->willReturn([ 'core' => [ 'EXTRA_FILE' => ['/testfile' => []], 'INVALID_HASH' => [ '/.idea/workspace.xml' => [ 'expected' => 'f1c5e2630d784bc9cb02d5a28f55d6f24d06dae2a0fee685f3c2521b050955d9d452769f61454c9ddfa9c308146ade10546cfa829794448eaffbc9a04a29d216', 'current' => 'ce08bf30bcbb879a18b49239a9bec6b8702f52452f88a9d32142cad8d2494d5735e6bfa0d8642b2762c62ca5be49f9bf4ec231d4a230559d4f3e2c471d3ea094', ], '/lib/private/integritycheck/checker.php' => [ 'expected' => 'c5a03bacae8dedf8b239997901ba1fffd2fe51271d13a00cc4b34b09cca5176397a89fc27381cbb1f72855fa18b69b6f87d7d5685c3b45aee373b09be54742ea', 'current' => '88a3a92c11db91dec1ac3be0e1c87f862c95ba6ffaaaa3f2c3b8f682187c66f07af3a3b557a868342ef4a271218fe1c1e300c478e6c156c5955ed53c40d06585', ], '/settings/controller/checksetupcontroller.php' => [ 'expected' => '3e1de26ce93c7bfe0ede7c19cb6c93cadc010340225b375607a7178812e9de163179b0dc33809f451e01f491d93f6f5aaca7929685d21594cccf8bda732327c4', 'current' => '09563164f9904a837f9ca0b5f626db56c838e5098e0ccc1d8b935f68fa03a25c5ec6f6b2d9e44a868e8b85764dafd1605522b4af8db0ae269d73432e9a01e63a', ], ], ], 'bookmarks' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'dav' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'encryption' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'external' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'federation' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_antivirus' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_drop' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_external' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_pdfviewer' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_sharing' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_trashbin' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_versions' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_videoviewer' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'firstrunwizard' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'gitsmart' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'logreader' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature could not get verified.', ], ], 'password_policy' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'provisioning_api' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'sketch' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'threatblock' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'two_factor_auth' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'user_ldap' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'user_shibboleth' => [ 'EXCEPTION' => [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], ]);
$expected = new DataDisplayResponse(
'Technical information

1
apps/settings/tests/Settings/Admin/ServerTest.php
View File

@ -40,7 +40,6 @@ use OCP\IDBConnection;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
/**
* @group DB
*/

4
apps/sharebymail/tests/CapabilitiesTest.php
View File

@ -39,9 +39,9 @@ class CapabilitiesTest extends TestCase {
public function testGetCapabilities() {
$capabilities = [
'files_sharing' =>
'files_sharing' =>
[
'sharebymail' =>
'sharebymail' =>
[
'enabled' => true,
'upload_files_drop' => ['enabled' => true],

1
apps/systemtags/appinfo/app.php
View File

@ -69,4 +69,3 @@ $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
'name' => $l->t('Tags'),
];
});

4
apps/systemtags/templates/list.php
View File

@ -18,14 +18,14 @@
<tr>
<th id='headerName' class="hidden column-name">
<div id="headerName-container">
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
</div>
</th>
<th id="headerSize" class="hidden column-size">
<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
</th>
<th id="headerDate" class="hidden column-mtime">
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
</th>
</tr>
</thead>

1
apps/testing/appinfo/app.php
View File

@ -22,4 +22,3 @@
*/
$app = new \OCA\Testing\AppInfo\Application();

2
apps/theming/appinfo/app.php
View File

@ -57,4 +57,4 @@ $linkToJs = \OC::$server->getURLGenerator()->linkToRoute(
'src' => $linkToJs,
'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
], ''
);
);

1
apps/theming/appinfo/routes.php
View File

@ -84,4 +84,3 @@ return ['routes' => [
'requirements' => ['image' => '.+']
],
]];

4
apps/theming/lib/ThemingDefaults.php
View File

@ -198,7 +198,7 @@ class ThemingDefaults extends \OC_Defaults {
$divider = ' · ';
}
}
if($legalLinks !== '' ) {
if($legalLinks !== '') {
$footer .= '<br/>' . $legalLinks;
}
@ -353,7 +353,7 @@ class ThemingDefaults extends \OC_Defaults {
} catch (AppPathNotFoundException $e) {}
$route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest');
}
if (strpos($image, 'filetypes/') === 0 && file_exists(\OC::$SERVERROOT . '/core/img/' . $image )) {
if (strpos($image, 'filetypes/') === 0 && file_exists(\OC::$SERVERROOT . '/core/img/' . $image)) {
$route = $this->urlGenerator->linkToRoute('theming.Icon.getThemedIcon', ['app' => $app, 'image' => $image]);
}

6
apps/user_ldap/lib/Access.php
View File

@ -620,7 +620,7 @@ class Access extends LDAPUtility {
// outside of core user management will still cache the user as non-existing.
$originalTTL = $this->connection->ldapCacheTTL;
$this->connection->setConfiguration(['ldapCacheTTL' => 0]);
if( $intName !== ''
if($intName !== ''
&& (($isUser && !$this->ncUserManager->userExists($intName))
|| (!$isUser && !\OC::$server->getGroupManager()->groupExists($intName))
)
@ -708,7 +708,7 @@ class Access extends LDAPUtility {
foreach($ldapObjects as $ldapObject) {
$nameByLDAP = null;
if( isset($ldapObject[$nameAttribute])
if(isset($ldapObject[$nameAttribute])
&& is_array($ldapObject[$nameAttribute])
&& isset($ldapObject[$nameAttribute][0])
) {
@ -1777,7 +1777,7 @@ class Access extends LDAPUtility {
if($this->detectUuidAttribute($dn, $isUser, false, $ldapRecord)) {
$attr = $this->connection->$uuidAttr;
$uuid = isset($ldapRecord[$attr]) ? $ldapRecord[$attr] : $this->readAttribute($dn, $attr);
if( !is_array($uuid)
if(!is_array($uuid)
&& $uuidOverride !== ''
&& $this->detectUuidAttribute($dn, $isUser, true, $ldapRecord))
{

4
apps/user_ldap/lib/Configuration.php
View File

@ -311,7 +311,7 @@ class Configuration {
/**
* Sets multi-line values as arrays
*
*
* @param string $varName name of config-key
* @param array|string $value to set
*/
@ -387,7 +387,7 @@ class Configuration {
/**
* Sets a scalar value.
*
*
* @param string $varName name of config key
* @param mixed $value to set
*/

2
apps/user_ldap/lib/Controller/RenewPasswordController.php
View File

@ -54,7 +54,7 @@ class RenewPasswordController extends Controller {
* @param IConfig $config
* @param IURLGenerator $urlGenerator
*/
function __construct($appName, IRequest $request, IUserManager $userManager,
function __construct($appName, IRequest $request, IUserManager $userManager,
IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
parent::__construct($appName, $request);
$this->userManager = $userManager;

2
apps/user_ldap/lib/Helper.php
View File

@ -305,7 +305,7 @@ class Helper {
$userBackend = new User_Proxy(
$configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager
);
$uid = $userBackend->loginName2UserName($param['uid'] );
$uid = $userBackend->loginName2UserName($param['uid']);
if($uid !== false) {
$param['uid'] = $uid;
}

6
apps/user_ldap/lib/LDAPProvider.php
View File

@ -110,11 +110,11 @@ class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
if(!$result){
throw new \Exception('Translation to LDAP DN unsuccessful');
}
return $result;
return $result;
}
/**
* Translate a LDAP DN to an internal user name. If there is no mapping between
* Translate a LDAP DN to an internal user name. If there is no mapping between
* the DN and the user name, a new one will be created.
* @param string $dn LDAP DN
* @return string with the internal user name
@ -147,7 +147,7 @@ class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
}
/**
* Return a new LDAP connection resource for the specified user.
* Return a new LDAP connection resource for the specified user.
* The connection must be closed manually.
* @param string $uid user id
* @return resource of the LDAP connection

2
apps/user_ldap/lib/LDAPProviderFactory.php
View File

@ -56,7 +56,7 @@ class LDAPProviderFactory implements ILDAPProviderFactory {
$dbConnection = $this->serverContainer->getDatabaseConnection();
$userMapping = new UserMapping($dbConnection);
return new LDAPProvider($this->serverContainer, new Helper($this->serverContainer->getConfig()),
new DeletedUsersIndex($this->serverContainer->getConfig(),
new DeletedUsersIndex($this->serverContainer->getConfig(),
$dbConnection, $userMapping));
}
}

2
apps/user_ldap/lib/Migration/UUIDFixGroup.php
View File

@ -34,7 +34,7 @@ use OCP\IConfig;
class UUIDFixGroup extends UUIDFix {
public function __construct(GroupMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
$this->mapper = $mapper;
$this->proxy = new User_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config,
$this->proxy = new User_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config,
\OC::$server->getNotificationManager(), \OC::$server->getUserSession(),
\OC::$server->query('LDAPUserPluginManager'));
}

4
apps/user_ldap/lib/User/Manager.php
View File

@ -130,7 +130,7 @@ class Manager {
$this->checkAccess();
$user = new User($uid, $dn, $this->access, $this->ocConfig,
$this->ocFilesystem, clone $this->image, $this->ocLog,
$this->avatarManager, $this->userManager,
$this->avatarManager, $this->userManager,
$this->notificationManager);
$this->usersByDN[$dn] = $user;
$this->usersByUid[$uid] = $user;
@ -264,7 +264,7 @@ class Manager {
return $this->usersByUid[$id];
}
if($this->access->stringResemblesDN($id) ) {
if($this->access->stringResemblesDN($id)) {
$uid = $this->access->dn2username($id);
if($uid !== false) {
return $this->createAndCache($id, $uid);

6
apps/user_ldap/lib/User/User.php
View File

@ -327,12 +327,12 @@ class User {
if ($path !== '') {
//if attribute's value is an absolute path take this, otherwise append it to data dir
//check for / at the beginning or pattern c:\ resp. c:/
if( '/' !== $path[0]
if('/' !== $path[0]
&& !(3 < strlen($path) && ctype_alpha($path[0])
&& $path[1] === ':' && ('\\' === $path[2] || '/' === $path[2]))
) {
$path = $this->config->getSystemValue('datadirectory',
\OC::$SERVERROOT.'/data' ) . '/' . $path;
\OC::$SERVERROOT.'/data') . '/' . $path;
}
//we need it to store it in the DB as well in case a user gets
//deleted so we can clean up afterwards
@ -342,7 +342,7 @@ class User {
return $path;
}
if( !is_null($attr)
if(!is_null($attr)
&& $this->config->getAppValue('user_ldap', 'enforce_home_folder_naming_rule', true)
) {
// a naming rule attribute is defined, but it doesn't exist for that LDAP user

2
apps/user_ldap/templates/settings.php
View File

@ -83,7 +83,7 @@ style('user_ldap', 'settings');
<p><label for="ldap_backup_host"><?php p($l->t('Backup (Replica) Host'));?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php p($_['ldap_backup_host_default']); ?>" title="<?php p($l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.'));?>"></p>
<p><label for="ldap_backup_port"><?php p($l->t('Backup (Replica) Port'));?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php p($_['ldap_backup_port_default']); ?>" /></p>
<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>" title="<?php p($l->t('Only connect to the replica server.'));?>" /></p>
<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', [$theme->getName()] ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', [$theme->getName()]));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
</div>
<h3><?php p($l->t('Directory Settings'));?></h3>

4
apps/user_ldap/tests/GroupLDAPPluginTest.php
View File

@ -152,7 +152,7 @@ class GroupLDAPPluginTest extends \Test\TestCase {
$pluginManager = $this->getGroupPluginManager();
$pluginManager->addToGroup('foo', 'bar');
}
}
public function testRemoveFromGroup() {
$pluginManager = $this->getGroupPluginManager();
@ -214,7 +214,7 @@ class GroupLDAPPluginTest extends \Test\TestCase {
$pluginManager = $this->getGroupPluginManager();
$pluginManager->countUsersInGroup('foo', 'bar');
}
}
public function testgetGroupDetails() {
$pluginManager = $this->getGroupPluginManager();

2
apps/user_ldap/tests/Group_LDAPTest.php
View File

@ -194,7 +194,7 @@ class Group_LDAPTest extends TestCase {
$ldap = new GroupLDAP($access, $pluginManager);
$this->assertEquals($ldap->countUsersInGroup('gid', 'search'),42);
}
}
public function testGidNumber2NameSuccess() {
$access = $this->getAccessMock();

2
apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
View File

@ -36,7 +36,7 @@ use OCA\User_LDAP\LDAP;
*
* LDAP must be available via toxiproxy.
*
* This test must be run manually.
* This test must be run manually.
*
*/
class ExceptionOnLostConnection {

2
apps/user_ldap/tests/Jobs/CleanUpTest.php
View File

@ -55,7 +55,7 @@ class CleanUpTest extends \Test\TestCase {
$args = $this->getMocks();
$args['helper']->expects($this->once())
->method('haveDisabledConfigurations')
->willReturn(true );
->willReturn(true);
$args['ocConfig']->expects($this->never())
->method('getSystemValue');

8
apps/user_ldap/tests/UserLDAPPluginTest.php
View File

@ -153,7 +153,7 @@ class UserLDAPPluginTest extends \Test\TestCase {
$pluginManager = $this->getUserPluginManager();
$pluginManager->getHome('foo');
}
}
public function testGetDisplayName() {
$pluginManager = $this->getUserPluginManager();
@ -204,7 +204,7 @@ class UserLDAPPluginTest extends \Test\TestCase {
);
$pluginManager->register($plugin);
$pluginManager->setDisplayName('user', 'password');
$pluginManager->setDisplayName('user', 'password');
}
@ -214,7 +214,7 @@ class UserLDAPPluginTest extends \Test\TestCase {
$pluginManager = $this->getUserPluginManager();
$pluginManager->setDisplayName('foo', 'bar');
}
}
public function testCanChangeAvatar() {
$pluginManager = $this->getUserPluginManager();
@ -271,7 +271,7 @@ class UserLDAPPluginTest extends \Test\TestCase {
$pluginManager = $this->getUserPluginManager();
$pluginManager->countUsers();
}
}
public function testDeleteUser() {
$pluginManager = $this->getUserPluginManager();

5
build/integration/features/bootstrap/Sharing.php
View File

@ -504,11 +504,11 @@ trait Sharing {
$fd = $body->getRowsHash();
foreach($fd as $field => $value) {
if (substr($field, 0, 10 ) === "share_with"){
if (substr($field, 0, 10) === "share_with"){
$value = str_replace("REMOTE", substr($this->remoteBaseUrl, 0, -5), $value);
$value = str_replace("LOCAL", substr($this->localBaseUrl, 0, -5), $value);
}
if (substr($field, 0, 6 ) === "remote"){
if (substr($field, 0, 6) === "remote"){
$value = str_replace("REMOTE", substr($this->remoteBaseUrl, 0, -4), $value);
$value = str_replace("LOCAL", substr($this->localBaseUrl, 0, -4), $value);
}
@ -742,4 +742,3 @@ trait Sharing {
return $sharees;
}
}

1
build/integration/features/bootstrap/Trashbin.php
View File

@ -167,4 +167,3 @@ trait Trashbin {
return;
}
}

2
build/license.php
View File

@ -234,7 +234,7 @@ With help from many libraries and frameworks including:
array_shift($lines);
continue;
}
if (strpos($line, '*/') !== false ) {
if (strpos($line, '*/') !== false) {
array_shift($lines);
break;
}

1
build/signed-off-checker.php
View File

@ -127,4 +127,3 @@ if($notSignedCommits !== []) {
} else {
exit(0);
}

2
core/Command/Background/Base.php
View File

@ -71,7 +71,7 @@ abstract class Base extends Command {
*/
protected function execute(InputInterface $input, OutputInterface $output) {
$mode = $this->getMode();
$this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode );
$this->config->setAppValue('core', 'backgroundjobs_mode', $mode);
$output->writeln("Set mode for background jobs to '$mode'");
}
}

2
core/Command/Encryption/DecryptAll.php
View File

@ -125,7 +125,7 @@ class DecryptAll extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
if ( !$input->isInteractive() ) {
if (!$input->isInteractive()) {
$output->writeln('Invalid TTY.');
$output->writeln('If you are trying to execute the command in a Docker ');
$output->writeln("container, do not forget to execute 'docker exec' with");

2
core/Command/Encryption/EncryptAll.php
View File

@ -106,7 +106,7 @@ class EncryptAll extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
if ( !$input->isInteractive() ) {
if (!$input->isInteractive()) {
$output->writeln('Invalid TTY.');
$output->writeln('If you are trying to execute the command in a Docker ');
$output->writeln("container, do not forget to execute 'docker exec' with");

2
core/Command/TwoFactorAuth/State.php
View File

@ -62,7 +62,7 @@ class State extends Base {
$providerStates = $this->registry->getProviderStates($user);
$filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
list ($enabled, $disabled) = $filtered;
list($enabled, $disabled) = $filtered;
if (!empty($enabled)) {
$output->writeln("Two-factor authentication is enabled for user $uid");

6
core/Controller/SetupController.php
View File

@ -109,7 +109,7 @@ class SetupController {
}
private function finishSetup(bool $installRecommended) {
if( file_exists( $this->autoConfigFile )) {
if(file_exists($this->autoConfigFile)) {
unlink($this->autoConfigFile);
}
\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
@ -130,11 +130,11 @@ class SetupController {
}
public function loadAutoConfig($post) {
if( file_exists($this->autoConfigFile)) {
if(file_exists($this->autoConfigFile)) {
\OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO);
$AUTOCONFIG = [];
include $this->autoConfigFile;
$post = array_merge ($post, $AUTOCONFIG);
$post = array_merge($post, $AUTOCONFIG);
}
$dbIsSet = isset($post['dbtype']);

2
core/templates/403.php
View File

@ -11,7 +11,7 @@ if(!isset($_)) {//standalone page is not supported anymore - redirect to /
?>
<ul>
<li class='error'>
<?php p($l->t( 'Access forbidden' )); ?><br>
<?php p($l->t('Access forbidden')); ?><br>
<p class='hint'><?php if(isset($_['message'])) p($_['message'])?></p>
</li>
</ul>

54
core/templates/installation.php
View File

@ -35,35 +35,35 @@ script('core', [
</fieldset>
<?php endif; ?>
<fieldset id="adminaccount">
<legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend>
<legend><?php print_unescaped($l->t('Create an <strong>admin account</strong>')); ?></legend>
<p class="grouptop">
<input type="text" name="adminlogin" id="adminlogin"
placeholder="<?php p($l->t( 'Username' )); ?>"
placeholder="<?php p($l->t('Username')); ?>"
value="<?php p($_['adminlogin']); ?>"
autocomplete="off" autocapitalize="none" autocorrect="off" autofocus required>
<label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label>
<label for="adminlogin" class="infield"><?php p($l->t('Username')); ?></label>
</p>
<p class="groupbottom">
<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
placeholder="<?php p($l->t( 'Password' )); ?>"
placeholder="<?php p($l->t('Password')); ?>"
value="<?php p($_['adminpass']); ?>"
autocomplete="off" autocapitalize="none" autocorrect="off" required>
<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
<label for="adminpass" class="infield"><?php p($l->t('Password')); ?></label>
<input type="checkbox" id="show" class="hidden-visually" name="show">
<label for="show" class="hidden-visually"><?php p($l->t( 'Show password')); ?></label>
<label for="show" class="hidden-visually"><?php p($l->t('Show password')); ?></label>
</p>
</fieldset>
<?php if(!$_['directoryIsSet'] or !$_['dbIsSet'] or count($_['errors']) > 0): ?>
<fieldset id="advancedHeader">
<legend><a id="showAdvanced" tabindex="0" href="#"><?php p($l->t( 'Storage & database' )); ?><img src="<?php print_unescaped(image_path('', 'actions/caret-white.svg')); ?>" /></a></legend>
<legend><a id="showAdvanced" tabindex="0" href="#"><?php p($l->t('Storage & database')); ?><img src="<?php print_unescaped(image_path('', 'actions/caret-white.svg')); ?>" /></a></legend>
</fieldset>
<?php endif; ?>
<?php if(!$_['directoryIsSet'] or count($_['errors']) > 0): ?>
<fieldset id="datadirField">
<div id="datadirContent">
<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
<label for="directory"><?php p($l->t('Data folder')); ?></label>
<input type="text" name="directory" id="directory"
placeholder="<?php p(OC::$SERVERROOT.'/data'); ?>"
value="<?php p($_['directory']); ?>"
@ -75,16 +75,16 @@ script('core', [
<?php if(!$_['dbIsSet'] or count($_['errors']) > 0): ?>
<fieldset id='databaseBackend'>
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
<legend><?php p($l->t( 'Configure the database' )); ?></legend>
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite?>
<legend><?php p($l->t('Configure the database')); ?></legend>
<div id="selectDbType">
<?php foreach($_['databases'] as $type => $label): ?>
<?php if(count($_['databases']) === 1): ?>
<p class="info">
<?php p($l->t( 'Only %s is available.', [$label] )); ?>
<?php p($l->t( 'Install and activate additional PHP modules to choose other database types.' )); ?><br>
<?php p($l->t('Only %s is available.', [$label])); ?>
<?php p($l->t('Install and activate additional PHP modules to choose other database types.')); ?><br>
<a href="<?php print_unescaped(link_to_docs('admin-source_install')); ?>" target="_blank" rel="noreferrer noopener">
<?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a>
<?php p($l->t('For more details check out the documentation.')); ?> ↗</a>
</p>
<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
<?php else: ?>
@ -100,25 +100,25 @@ script('core', [
<fieldset id='databaseField'>
<div id="use_other_db">
<p class="grouptop">
<label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label>
<label for="dbuser" class="infield"><?php p($l->t('Database user')); ?></label>
<input type="text" name="dbuser" id="dbuser"
placeholder="<?php p($l->t( 'Database user' )); ?>"
placeholder="<?php p($l->t('Database user')); ?>"
value="<?php p($_['dbuser']); ?>"
autocomplete="off" autocapitalize="none" autocorrect="off">
</p>
<p class="groupmiddle">
<input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword-toggle"
placeholder="<?php p($l->t( 'Database password' )); ?>"
placeholder="<?php p($l->t('Database password')); ?>"
value="<?php p($_['dbpass']); ?>"
autocomplete="off" autocapitalize="none" autocorrect="off">
<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
<label for="dbpass" class="infield"><?php p($l->t('Database password')); ?></label>
<input type="checkbox" id="dbpassword-toggle" class="hidden-visually" name="dbpassword-toggle">
<label for="dbpassword-toggle"></label>
</p>
<p class="groupmiddle">
<label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label>
<label for="dbname" class="infield"><?php p($l->t('Database name')); ?></label>
<input type="text" name="dbname" id="dbname"
placeholder="<?php p($l->t( 'Database name' )); ?>"
placeholder="<?php p($l->t('Database name')); ?>"
value="<?php p($_['dbname']); ?>"
autocomplete="off" autocapitalize="none" autocorrect="off"
pattern="[0-9a-zA-Z$_-]+">
@ -126,23 +126,23 @@ script('core', [
<?php if($_['hasOracle']): ?>
<div id="use_oracle_db">
<p class="groupmiddle">
<label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label>
<label for="dbtablespace" class="infield"><?php p($l->t('Database tablespace')); ?></label>
<input type="text" name="dbtablespace" id="dbtablespace"
placeholder="<?php p($l->t( 'Database tablespace' )); ?>"
placeholder="<?php p($l->t('Database tablespace')); ?>"
value="<?php p($_['dbtablespace']); ?>"
autocomplete="off" autocapitalize="none" autocorrect="off">
</p>
</div>
<?php endif; ?>
<p class="groupbottom">
<label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label>
<label for="dbhost" class="infield"><?php p($l->t('Database host')); ?></label>
<input type="text" name="dbhost" id="dbhost"
placeholder="<?php p($l->t( 'Database host' )); ?>"
placeholder="<?php p($l->t('Database host')); ?>"
value="<?php p($_['dbhost']); ?>"
autocomplete="off" autocapitalize="none" autocorrect="off">
</p>
<p class="info">
<?php p($l->t( 'Please specify the port number along with the host name (e.g., localhost:5432).' )); ?>
<?php p($l->t('Please specify the port number along with the host name (e.g., localhost:5432).')); ?>
</p>
</div>
</fieldset>
@ -162,15 +162,15 @@ script('core', [
<p class="info">
<input type="checkbox" id="install-recommended-apps" name="install-recommended-apps" class="checkbox checkbox--white" checked>
<label for="install-recommended-apps">
<?php p($l->t( 'Install recommended apps' )); ?>
<span><?php p($l->t( 'Calendar, Contacts, Talk, Mail & OnlyOffice' )); ?></span>
<?php p($l->t('Install recommended apps')); ?>
<span><?php p($l->t('Calendar, Contacts, Talk, Mail & OnlyOffice')); ?></span>
</label>
</p>
</fieldset>
<div class="icon-loading-dark float-spinner">&nbsp;</div>
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div>
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t('Finish setup')); ?>" data-finishing="<?php p($l->t('Finishing …')); ?>"></div>
<p class="info">
<span class="icon-info-white"></span>

2
core/templates/layout.guest.php
View File

@ -30,7 +30,7 @@
<?php }?>
<div class="wrapper">
<div class="v-align">
<?php if ($_['bodyid'] === 'body-login' ): ?>
<?php if ($_['bodyid'] === 'body-login'): ?>
<header role="banner">
<div id="header">
<div class="logo">

4
core/templates/layout.user.php
View File

@ -84,7 +84,7 @@
<?php foreach($_['navigation'] as $entry): ?>
<li data-id="<?php p($entry['id']); ?>">
<a href="<?php print_unescaped($entry['href']); ?>"
<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>
<?php if($entry['active']): ?> class="active"<?php endif; ?>
aria-label="<?php p($entry['name']); ?>">
<svg width="16" height="16" viewBox="0 0 16 16" alt="">
<defs><filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
@ -139,7 +139,7 @@
<?php foreach($_['settingsnavigation'] as $entry):?>
<li data-id="<?php p($entry['id']); ?>">
<a href="<?php print_unescaped($entry['href']); ?>"
<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
<?php if($entry["active"]): ?> class="active"<?php endif; ?>>
<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
<?php p($entry['name']) ?>
</a>

2
core/templates/update.admin.php
View File

@ -49,7 +49,7 @@
<p id="update-progress-message-error" class="hidden"></p>
<ul id="update-progress-message-warnings" class="hidden"></ul>
<p id="update-progress-message"></p>
<a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <span class="icon-caret-white"></span></a>
<a class="update-show-detailed"><?php p($l->t('Detailed logs')); ?> <span class="icon-caret-white"></span></a>
<div id="update-progress-detailed" class="hidden"></div>
</div>
</div>

4
core/templates/update.use-cli.php
View File

@ -14,8 +14,8 @@
<?php if ($_['tooBig']) { ?>
<div class="warning updateAnyways">
<p><?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.' )); ?></p>
<a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk' )); ?></a>
<p><?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.')); ?></p>
<a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk')); ?></a>
</div>
<?php } ?>

4
lib/base.php
View File

@ -265,7 +265,7 @@ class OC {
$l->t('Cannot write into "config" directory!'),
$l->t('This can usually be fixed by giving the webserver write access to the config directory.') . '. '
. $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s',
[ $urlGenerator->linkToDocs('admin-config') ] ),
[ $urlGenerator->linkToDocs('admin-config') ]),
503
);
}
@ -863,7 +863,7 @@ class OC {
private static function registerAppRestrictionsHooks() {
$groupManager = self::$server->query(\OCP\IGroupManager::class);
$groupManager->listen ('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
$groupManager->listen('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
$appManager = self::$server->getAppManager();
$apps = $appManager->getEnabledAppsForGroup($group);
foreach ($apps as $appId) {

Some files were not shown because too many files have changed in this diff Show More