@@ -39,7 +39,7 @@ |
||
| 39 | 39 | $reader->parseInnerTree(); |
| 40 | 40 | |
| 41 | 41 | if (!is_string($componentName)) { |
| 42 | - throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute'); |
|
| 42 | + throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}prop-filter requires a valid name attribute'); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | return $componentName; |
@@ -40,11 +40,11 @@ |
||
| 40 | 40 | $reader->parseInnerTree(); |
| 41 | 41 | |
| 42 | 42 | if (!is_string($property)) { |
| 43 | - throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid property attribute'); |
|
| 43 | + throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}param-filter requires a valid property attribute'); |
|
| 44 | 44 | |
| 45 | 45 | } |
| 46 | 46 | if (!is_string($parameter)) { |
| 47 | - throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid parameter attribute'); |
|
| 47 | + throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}param-filter requires a valid parameter attribute'); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | return [ |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | <tr><td> |
| 28 | 28 | <table cellspacing="0" cellpadding="0" border="0" width="600px"> |
| 29 | 29 | <tr> |
| 30 | - <td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>"> |
|
| 30 | + <td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>"> |
|
| 31 | 31 | <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/> |
| 32 | 32 | </td> |
| 33 | 33 | </tr> |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br> |
| 53 | 53 | <?php p($theme->getName()); ?> - |
| 54 | 54 | <?php p($theme->getSlogan()); ?> |
| 55 | - <br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a> |
|
| 55 | + <br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a> |
|
| 56 | 56 | </td> |
| 57 | 57 | </tr> |
| 58 | 58 | <tr> |
@@ -171,14 +171,14 @@ |
||
| 171 | 171 | protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) { |
| 172 | 172 | $qb = $this->connection->getQueryBuilder(); |
| 173 | 173 | |
| 174 | - $qb->select('d.' . $deleteId) |
|
| 174 | + $qb->select('d.'.$deleteId) |
|
| 175 | 175 | ->from($deleteTable, 'd') |
| 176 | - ->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId)) |
|
| 176 | + ->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.'.$deleteId, 's.'.$sourceId)) |
|
| 177 | 177 | ->where( |
| 178 | 178 | $qb->expr()->eq('d.type', $qb->expr()->literal('files')) |
| 179 | 179 | ) |
| 180 | 180 | ->andWhere( |
| 181 | - $qb->expr()->isNull('s.' . $sourceNullColumn) |
|
| 181 | + $qb->expr()->isNull('s.'.$sourceNullColumn) |
|
| 182 | 182 | ); |
| 183 | 183 | $result = $qb->execute(); |
| 184 | 184 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | $item = $node; |
| 117 | - $appendix = '/' . $node->getName(); |
|
| 117 | + $appendix = '/'.$node->getName(); |
|
| 118 | 118 | while (!empty($byId)) { |
| 119 | 119 | try { |
| 120 | 120 | /** @var Node $item */ |
@@ -122,12 +122,12 @@ discard block |
||
| 122 | 122 | |
| 123 | 123 | if (!empty($byId[$item->getId()])) { |
| 124 | 124 | foreach ($byId[$item->getId()] as $uid => $path) { |
| 125 | - $results[$uid] = $path . $appendix; |
|
| 125 | + $results[$uid] = $path.$appendix; |
|
| 126 | 126 | } |
| 127 | 127 | unset($byId[$item->getId()]); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - $appendix = '/' . $item->getName() . $appendix; |
|
| 130 | + $appendix = '/'.$item->getName().$appendix; |
|
| 131 | 131 | } catch (NotFoundException $e) { |
| 132 | 132 | return $results; |
| 133 | 133 | } catch (InvalidPathException $e) { |
@@ -212,6 +212,6 @@ discard block |
||
| 212 | 212 | protected function getMountedPath(Node $node) { |
| 213 | 213 | $path = $node->getPath(); |
| 214 | 214 | $sections = explode('/', $path, 4); |
| 215 | - return '/' . $sections[3]; |
|
| 215 | + return '/'.$sections[3]; |
|
| 216 | 216 | } |
| 217 | 217 | } |
@@ -107,32 +107,32 @@ discard block |
||
| 107 | 107 | case '{DAV:}prop': |
| 108 | 108 | $newProps['properties'] = array_keys($elem['value']); |
| 109 | 109 | break; |
| 110 | - case '{' . SearchPlugin::NS_Nextcloud . '}filter': |
|
| 110 | + case '{'.SearchPlugin::NS_Nextcloud.'}filter': |
|
| 111 | 111 | foreach ($elem['value'] as $subElem) { |
| 112 | - if ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}comp-filter') { |
|
| 112 | + if ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}comp-filter') { |
|
| 113 | 113 | if (!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])) { |
| 114 | 114 | $newProps['filters']['comps'] = []; |
| 115 | 115 | } |
| 116 | 116 | $newProps['filters']['comps'][] = $subElem['value']; |
| 117 | - } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}prop-filter') { |
|
| 117 | + } elseif ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}prop-filter') { |
|
| 118 | 118 | if (!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])) { |
| 119 | 119 | $newProps['filters']['props'] = []; |
| 120 | 120 | } |
| 121 | 121 | $newProps['filters']['props'][] = $subElem['value']; |
| 122 | - } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}param-filter') { |
|
| 122 | + } elseif ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}param-filter') { |
|
| 123 | 123 | if (!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])) { |
| 124 | 124 | $newProps['filters']['params'] = []; |
| 125 | 125 | } |
| 126 | 126 | $newProps['filters']['params'][] = $subElem['value']; |
| 127 | - } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}search-term') { |
|
| 127 | + } elseif ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}search-term') { |
|
| 128 | 128 | $newProps['filters']['search-term'] = $subElem['value']; |
| 129 | 129 | } |
| 130 | 130 | } |
| 131 | 131 | break; |
| 132 | - case '{' . SearchPlugin::NS_Nextcloud . '}limit': |
|
| 132 | + case '{'.SearchPlugin::NS_Nextcloud.'}limit': |
|
| 133 | 133 | $newProps['limit'] = $elem['value']; |
| 134 | 134 | break; |
| 135 | - case '{' . SearchPlugin::NS_Nextcloud . '}offset': |
|
| 135 | + case '{'.SearchPlugin::NS_Nextcloud.'}offset': |
|
| 136 | 136 | $newProps['offset'] = $elem['value']; |
| 137 | 137 | break; |
| 138 | 138 | |
@@ -140,21 +140,21 @@ discard block |
||
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | if (empty($newProps['filters'])) { |
| 143 | - throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}filter element is required for this request'); |
|
| 143 | + throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}filter element is required for this request'); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | $propsOrParamsDefined = (!empty($newProps['filters']['props']) || !empty($newProps['filters']['params'])); |
| 147 | 147 | $noCompsDefined = empty($newProps['filters']['comps']); |
| 148 | 148 | if ($propsOrParamsDefined && $noCompsDefined) { |
| 149 | - throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter given without any {' . SearchPlugin::NS_Nextcloud . '}comp-filter'); |
|
| 149 | + throw new BadRequest('{'.SearchPlugin::NS_Nextcloud.'}prop-filter or {'.SearchPlugin::NS_Nextcloud.'}param-filter given without any {'.SearchPlugin::NS_Nextcloud.'}comp-filter'); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | if (!isset($newProps['filters']['search-term'])) { |
| 153 | - throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}search-term is required for this request'); |
|
| 153 | + throw new BadRequest('{'.SearchPlugin::NS_Nextcloud.'}search-term is required for this request'); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | if (empty($newProps['filters']['props']) && empty($newProps['filters']['params'])) { |
| 157 | - throw new BadRequest('At least one{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter is required for this request'); |
|
| 157 | + throw new BadRequest('At least one{'.SearchPlugin::NS_Nextcloud.'}prop-filter or {'.SearchPlugin::NS_Nextcloud.'}param-filter is required for this request'); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $json = file_get_contents('php://stdin'); |
| 113 | 113 | } else { |
| 114 | 114 | if (!file_exists($path)) { |
| 115 | - $output->writeln('<error>File not found: ' . $path . '</error>'); |
|
| 115 | + $output->writeln('<error>File not found: '.$path.'</error>'); |
|
| 116 | 116 | return 1; |
| 117 | 117 | } |
| 118 | 118 | $json = file_get_contents($path); |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | $existingMount->getApplicableUsers() === $mount->getApplicableUsers() && |
| 165 | 165 | $existingMount->getBackendOptions() === $mount->getBackendOptions() |
| 166 | 166 | ) { |
| 167 | - $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>"); |
|
| 167 | + $output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>"); |
|
| 168 | 168 | return 1; |
| 169 | 169 | } |
| 170 | 170 | } |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | $olderVersions = $ms->getMigratedVersions(); |
| 79 | 79 | $olderVersions[] = '0'; |
| 80 | 80 | $olderVersions[] = 'prev'; |
| 81 | - if (in_array($version, $olderVersions, true)) { |
|
| 81 | + if (in_array($version, $olderVersions, true)) { |
|
| 82 | 82 | $output->writeln('<error>Can not go back to previous migration without debug enabled</error>'); |
| 83 | 83 | return 1; |
| 84 | 84 | } |
@@ -304,9 +304,9 @@ |
||
| 304 | 304 | */ |
| 305 | 305 | public static function linkToRemote($service) { |
| 306 | 306 | $urlGenerator = \OC::$server->getURLGenerator(); |
| 307 | - $remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service; |
|
| 307 | + $remoteBase = $urlGenerator->linkTo('', 'remote.php').'/'.$service; |
|
| 308 | 308 | return $urlGenerator->getAbsoluteURL( |
| 309 | - $remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '') |
|
| 309 | + $remoteBase.(($service[strlen($service) - 1] != '/') ? '/' : '') |
|
| 310 | 310 | ); |
| 311 | 311 | } |
| 312 | 312 | |