@@ -83,10 +83,10 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | $question = new Question('Please enter the recovery key password: '); |
| 85 | 85 | |
| 86 | - if($this->util->isMasterKeyEnabled()) { |
|
| 86 | + if ($this->util->isMasterKeyEnabled()) { |
|
| 87 | 87 | $output->writeln('Use master key to decrypt all files'); |
| 88 | 88 | $user = $this->keyManager->getMasterKeyId(); |
| 89 | - $password =$this->keyManager->getMasterKeyPassword(); |
|
| 89 | + $password = $this->keyManager->getMasterKeyPassword(); |
|
| 90 | 90 | } else { |
| 91 | 91 | $recoveryKeyId = $this->keyManager->getRecoveryKeyId(); |
| 92 | 92 | if (!empty($user)) { |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | if ($useLoginPassword) { |
| 102 | 102 | $question = new Question('Please enter the user\'s login password: '); |
| 103 | 103 | } else if ($this->util->isRecoveryEnabledForUser($user) === false) { |
| 104 | - $output->writeln('No recovery key available for user ' . $user); |
|
| 104 | + $output->writeln('No recovery key available for user '.$user); |
|
| 105 | 105 | return false; |
| 106 | 106 | } else { |
| 107 | 107 | $user = $recoveryKeyId; |
@@ -55,15 +55,15 @@ discard block |
||
| 55 | 55 | $comment = $event->getComment(); |
| 56 | 56 | |
| 57 | 57 | $mentions = $this->extractMentions($comment->getMentions()); |
| 58 | - if(empty($mentions)) { |
|
| 58 | + if (empty($mentions)) { |
|
| 59 | 59 | // no one to notify |
| 60 | 60 | return; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | $notification = $this->instantiateNotification($comment); |
| 64 | 64 | |
| 65 | - foreach($mentions as $uid) { |
|
| 66 | - if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId()) |
|
| 65 | + foreach ($mentions as $uid) { |
|
| 66 | + if (($comment->getActorType() === 'users' && $uid === $comment->getActorId()) |
|
| 67 | 67 | || !$this->userManager->userExists($uid) |
| 68 | 68 | ) { |
| 69 | 69 | // do not notify unknown users or yourself |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | $notification->setUser($uid); |
| 74 | - if( $event->getEvent() === CommentsEvent::EVENT_DELETE |
|
| 74 | + if ($event->getEvent() === CommentsEvent::EVENT_DELETE |
|
| 75 | 75 | || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE) |
| 76 | 76 | { |
| 77 | 77 | $this->notificationManager->markProcessed($notification); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $notification |
| 93 | 93 | ->setApp('comments') |
| 94 | 94 | ->setObject('comment', $comment->getId()) |
| 95 | - ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ]) |
|
| 95 | + ->setSubject('mention', [$comment->getObjectType(), $comment->getObjectId()]) |
|
| 96 | 96 | ->setDateTime($comment->getCreationDateTime()); |
| 97 | 97 | |
| 98 | 98 | return $notification; |
@@ -105,12 +105,12 @@ discard block |
||
| 105 | 105 | * @return string[] containing the mentions, e.g. ['alice', 'bob'] |
| 106 | 106 | */ |
| 107 | 107 | public function extractMentions(array $mentions) { |
| 108 | - if(empty($mentions)) { |
|
| 108 | + if (empty($mentions)) { |
|
| 109 | 109 | return []; |
| 110 | 110 | } |
| 111 | 111 | $uids = []; |
| 112 | - foreach($mentions as $mention) { |
|
| 113 | - if($mention['type'] === 'user') { |
|
| 112 | + foreach ($mentions as $mention) { |
|
| 113 | + if ($mention['type'] === 'user') { |
|
| 114 | 114 | $uids[] = $mention['id']; |
| 115 | 115 | } |
| 116 | 116 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | |
| 27 | 27 | class Application extends App { |
| 28 | 28 | |
| 29 | - public function __construct (array $urlParams = array()) { |
|
| 29 | + public function __construct(array $urlParams = array()) { |
|
| 30 | 30 | parent::__construct('comments', $urlParams); |
| 31 | 31 | $container = $this->getContainer(); |
| 32 | 32 | |
@@ -51,13 +51,13 @@ discard block |
||
| 51 | 51 | * @param CommentsEvent $event |
| 52 | 52 | */ |
| 53 | 53 | public function handle(CommentsEvent $event) { |
| 54 | - if($event->getComment()->getObjectType() !== 'files') { |
|
| 54 | + if ($event->getComment()->getObjectType() !== 'files') { |
|
| 55 | 55 | // this is a 'files'-specific Handler |
| 56 | 56 | return; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | $eventType = $event->getEvent(); |
| 60 | - if( $eventType === CommentsEvent::EVENT_ADD |
|
| 60 | + if ($eventType === CommentsEvent::EVENT_ADD |
|
| 61 | 61 | ) { |
| 62 | 62 | $this->notificationHandler($event); |
| 63 | 63 | $this->activityHandler($event); |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | CommentsEvent::EVENT_UPDATE, |
| 70 | 70 | CommentsEvent::EVENT_DELETE, |
| 71 | 71 | ]; |
| 72 | - if(in_array($eventType, $applicableEvents)) { |
|
| 72 | + if (in_array($eventType, $applicableEvents)) { |
|
| 73 | 73 | $this->notificationHandler($event); |
| 74 | 74 | return; |
| 75 | 75 | } |
@@ -50,14 +50,14 @@ discard block |
||
| 50 | 50 | $application = new \OCP\AppFramework\App('comments'); |
| 51 | 51 | return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class); |
| 52 | 52 | }, |
| 53 | - function () { |
|
| 53 | + function() { |
|
| 54 | 54 | $l = \OC::$server->getL10N('comments'); |
| 55 | 55 | return ['id' => 'comments', 'name' => $l->t('Comments')]; |
| 56 | 56 | } |
| 57 | 57 | ); |
| 58 | 58 | |
| 59 | 59 | $commentsManager = \OC::$server->getCommentsManager(); |
| 60 | -$commentsManager->registerEventHandler(function () { |
|
| 60 | +$commentsManager->registerEventHandler(function() { |
|
| 61 | 61 | $application = new \OCP\AppFramework\App('comments'); |
| 62 | 62 | /** @var \OCA\Comments\EventHandler $handler */ |
| 63 | 63 | $handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $commentsManager->registerDisplayNameResolver('user', function($id) { |
| 67 | 67 | $manager = \OC::$server->getUserManager(); |
| 68 | 68 | $user = $manager->get($id); |
| 69 | - if(is_null($user)) { |
|
| 69 | + if (is_null($user)) { |
|
| 70 | 70 | $l = \OC::$server->getL10N('comments'); |
| 71 | 71 | $displayName = $l->t('Unknown user'); |
| 72 | 72 | } else { |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | <label for="select_all_trash"> |
| 28 | 28 | <span class="hidden-visually"><?php p($l->t('Select all'))?></span> |
| 29 | 29 | </label> |
| 30 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
| 30 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
| 31 | 31 | <span id="selectedActionsList" class='selectedActions'> |
| 32 | 32 | <a href="" class="undelete"> |
| 33 | 33 | <span class="icon icon-history"></span> |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | </div> |
| 38 | 38 | </th> |
| 39 | 39 | <th id="headerDate" class="hidden column-mtime"> |
| 40 | - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a> |
|
| 40 | + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Deleted')); ?></span><span class="sort-indicator"></span></a> |
|
| 41 | 41 | <span class="selectedActions"> |
| 42 | 42 | <a href="" class="delete-selected"> |
| 43 | 43 | <span><?php p($l->t('Delete'))?></span> |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | $dir = '/'; |
| 33 | 33 | if (isset($_POST['dir'])) { |
| 34 | - $dir = rtrim((string)$_POST['dir'], '/'). '/'; |
|
| 34 | + $dir = rtrim((string) $_POST['dir'], '/').'/'; |
|
| 35 | 35 | } |
| 36 | 36 | $allFiles = false; |
| 37 | -if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') { |
|
| 37 | +if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') { |
|
| 38 | 38 | $allFiles = true; |
| 39 | 39 | $list = array(); |
| 40 | 40 | $dirListing = true; |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) { |
| 45 | 45 | $fileName = $file['name']; |
| 46 | 46 | if (!$dirListing) { |
| 47 | - $fileName .= '.d' . $file['mtime']; |
|
| 47 | + $fileName .= '.d'.$file['mtime']; |
|
| 48 | 48 | } |
| 49 | 49 | $list[] = $fileName; |
| 50 | 50 | } |
@@ -57,21 +57,21 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | $i = 0; |
| 59 | 59 | foreach ($list as $file) { |
| 60 | - $path = $dir . '/' . $file; |
|
| 60 | + $path = $dir.'/'.$file; |
|
| 61 | 61 | if ($dir === '/') { |
| 62 | 62 | $file = ltrim($file, '/'); |
| 63 | 63 | $delimiter = strrpos($file, '.d'); |
| 64 | 64 | $filename = substr($file, 0, $delimiter); |
| 65 | - $timestamp = substr($file, $delimiter+2); |
|
| 65 | + $timestamp = substr($file, $delimiter + 2); |
|
| 66 | 66 | } else { |
| 67 | 67 | $path_parts = pathinfo($file); |
| 68 | 68 | $filename = $path_parts['basename']; |
| 69 | 69 | $timestamp = null; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) { |
|
| 72 | + if (!OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp)) { |
|
| 73 | 73 | $error[] = $filename; |
| 74 | - \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR); |
|
| 74 | + \OCP\Util::writeLog('trashbin', 'can\'t restore '.$filename, \OCP\Util::ERROR); |
|
| 75 | 75 | } else { |
| 76 | 76 | $success[$i]['filename'] = $file; |
| 77 | 77 | $success[$i]['timestamp'] = $timestamp; |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | -if ( $error ) { |
|
| 83 | +if ($error) { |
|
| 84 | 84 | $filelist = ''; |
| 85 | - foreach ( $error as $e ) { |
|
| 85 | + foreach ($error as $e) { |
|
| 86 | 86 | $filelist .= $e.', '; |
| 87 | 87 | } |
| 88 | 88 | $l = OC::$server->getL10N('files_trashbin'); |
@@ -25,8 +25,8 @@ |
||
| 25 | 25 | \OC::$server->getSession()->close(); |
| 26 | 26 | |
| 27 | 27 | // Load the files |
| 28 | -$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; |
|
| 29 | -$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; |
|
| 28 | +$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : ''; |
|
| 29 | +$sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name'; |
|
| 30 | 30 | $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; |
| 31 | 31 | $data = array(); |
| 32 | 32 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $folder = isset($_POST['dir']) ? $_POST['dir'] : '/'; |
| 32 | 32 | |
| 33 | 33 | // "empty trash" command |
| 34 | -if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){ |
|
| 34 | +if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') { |
|
| 35 | 35 | $deleteAll = true; |
| 36 | 36 | if ($folder === '/' || $folder === '') { |
| 37 | 37 | OCA\Files_Trashbin\Trashbin::deleteAll(); |
@@ -43,11 +43,11 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | else { |
| 45 | 45 | $deleteAll = false; |
| 46 | - $files = (string)$_POST['files']; |
|
| 46 | + $files = (string) $_POST['files']; |
|
| 47 | 47 | $list = json_decode($files); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | -$folder = rtrim($folder, '/') . '/'; |
|
| 50 | +$folder = rtrim($folder, '/').'/'; |
|
| 51 | 51 | $error = array(); |
| 52 | 52 | $success = array(); |
| 53 | 53 | |
@@ -57,16 +57,16 @@ discard block |
||
| 57 | 57 | $file = ltrim($file, '/'); |
| 58 | 58 | $delimiter = strrpos($file, '.d'); |
| 59 | 59 | $filename = substr($file, 0, $delimiter); |
| 60 | - $timestamp = substr($file, $delimiter+2); |
|
| 60 | + $timestamp = substr($file, $delimiter + 2); |
|
| 61 | 61 | } else { |
| 62 | - $filename = $folder . '/' . $file; |
|
| 62 | + $filename = $folder.'/'.$file; |
|
| 63 | 63 | $timestamp = null; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp); |
| 67 | 67 | if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { |
| 68 | 68 | $error[] = $filename; |
| 69 | - \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR); |
|
| 69 | + \OCP\Util::writeLog('trashbin', 'can\'t delete '.$filename.' permanently.', \OCP\Util::ERROR); |
|
| 70 | 70 | } |
| 71 | 71 | // only list deleted files if not deleting everything |
| 72 | 72 | else if (!$deleteAll) { |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | -if ( $error ) { |
|
| 79 | +if ($error) { |
|
| 80 | 80 | $filelist = ''; |
| 81 | - foreach ( $error as $e ) { |
|
| 81 | + foreach ($error as $e) { |
|
| 82 | 82 | $filelist .= $e.', '; |
| 83 | 83 | } |
| 84 | 84 | $l = \OC::$server->getL10N('files_trashbin'); |