|
@@ -170,15 +170,15 @@ discard block |
|
|
block discarded – undo |
|
170
|
170
|
* @return bool |
|
171
|
171
|
*/ |
|
172
|
172
|
private function isSiteReachable($sitename) { |
|
173
|
|
- $httpSiteName = 'http://' . $sitename . '/'; |
|
174
|
|
- $httpsSiteName = 'https://' . $sitename . '/'; |
|
|
173
|
+ $httpSiteName = 'http://'.$sitename.'/'; |
|
|
174
|
+ $httpsSiteName = 'https://'.$sitename.'/'; |
|
175
|
175
|
|
|
176
|
176
|
try { |
|
177
|
177
|
$client = $this->clientService->newClient(); |
|
178
|
178
|
$client->get($httpSiteName); |
|
179
|
179
|
$client->get($httpsSiteName); |
|
180
|
180
|
} catch (\Exception $e) { |
|
181
|
|
- $this->logger->error('Cannot connect to: ' . $sitename, [ |
|
|
181
|
+ $this->logger->error('Cannot connect to: '.$sitename, [ |
|
182
|
182
|
'app' => 'internet_connection_check', |
|
183
|
183
|
'exception' => $e, |
|
184
|
184
|
]); |
|
@@ -520,7 +520,7 @@ discard block |
|
|
block discarded – undo |
|
520
|
520
|
protected function getSuggestedOverwriteCliURL(): string { |
|
521
|
521
|
$suggestedOverwriteCliUrl = ''; |
|
522
|
522
|
if ($this->config->getSystemValue('overwrite.cli.url', '') === '') { |
|
523
|
|
- $suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT; |
|
|
523
|
+ $suggestedOverwriteCliUrl = $this->request->getServerProtocol().'://'.$this->request->getInsecureServerHost().\OC::$WEBROOT; |
|
524
|
524
|
if (!$this->config->getSystemValue('config_is_read_only', false)) { |
|
525
|
525
|
// Set the overwrite URL when it was not set yet. |
|
526
|
526
|
$this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl); |
|
@@ -535,7 +535,7 @@ discard block |
|
|
block discarded – undo |
|
535
|
535
|
return [ |
|
536
|
536
|
'diffInSeconds' => time() - $lastCronRun, |
|
537
|
537
|
'relativeTime' => $this->dateTimeFormatter->formatTimeSpan($lastCronRun), |
|
538
|
|
- 'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']) . '#backgroundjobs', |
|
|
538
|
+ 'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']).'#backgroundjobs', |
|
539
|
539
|
]; |
|
540
|
540
|
} |
|
541
|
541
|
|
|
@@ -589,7 +589,7 @@ discard block |
|
|
block discarded – undo |
|
589
|
589
|
|
|
590
|
590
|
foreach ($appsDir as $fileInfo) { |
|
591
|
591
|
if ($fileInfo->isDir() && !$fileInfo->isDot()) { |
|
592
|
|
- $absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename(); |
|
|
592
|
+ $absAppPath = $appsPath.DIRECTORY_SEPARATOR.$fileInfo->getFilename(); |
|
593
|
593
|
$appDirUser = fileowner($absAppPath); |
|
594
|
594
|
if ($appDirUser !== $currentUser) { |
|
595
|
595
|
$appDirsWithDifferentOwner[] = $absAppPath; |
|
@@ -666,7 +666,7 @@ discard block |
|
|
block discarded – undo |
|
666
|
666
|
$isAutoIncrement = $column->getAutoincrement(); |
|
667
|
667
|
$isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement; |
|
668
|
668
|
if ($column->getType()->getName() !== Types::BIGINT && !$isAutoIncrementOnSqlite) { |
|
669
|
|
- $pendingColumns[] = $tableName . '.' . $columnName; |
|
|
669
|
+ $pendingColumns[] = $tableName.'.'.$columnName; |
|
670
|
670
|
} |
|
671
|
671
|
} |
|
672
|
672
|
} |
|
@@ -692,12 +692,12 @@ discard block |
|
|
block discarded – undo |
|
692
|
692
|
|
|
693
|
693
|
$tempPath = sys_get_temp_dir(); |
|
694
|
694
|
if (!is_dir($tempPath)) { |
|
695
|
|
- $this->logger->error('Error while checking the temporary PHP path - it was not properly set to a directory. value: ' . $tempPath); |
|
|
695
|
+ $this->logger->error('Error while checking the temporary PHP path - it was not properly set to a directory. value: '.$tempPath); |
|
696
|
696
|
return false; |
|
697
|
697
|
} |
|
698
|
698
|
$freeSpaceInTemp = disk_free_space($tempPath); |
|
699
|
699
|
if ($freeSpaceInTemp === false) { |
|
700
|
|
- $this->logger->error('Error while checking the available disk space of temporary PHP path - no free disk space returned. temporary path: ' . $tempPath); |
|
|
700
|
+ $this->logger->error('Error while checking the available disk space of temporary PHP path - no free disk space returned. temporary path: '.$tempPath); |
|
701
|
701
|
return false; |
|
702
|
702
|
} |
|
703
|
703
|
|
|
@@ -706,7 +706,7 @@ discard block |
|
|
block discarded – undo |
|
706
|
706
|
return true; |
|
707
|
707
|
} |
|
708
|
708
|
|
|
709
|
|
- $this->logger->warning('Checking the available space in the temporary path resulted in ' . round($freeSpaceInTempInGB, 1) . ' GB instead of the recommended 50GB. Path: ' . $tempPath); |
|
|
709
|
+ $this->logger->warning('Checking the available space in the temporary path resulted in '.round($freeSpaceInTempInGB, 1).' GB instead of the recommended 50GB. Path: '.$tempPath); |
|
710
|
710
|
return false; |
|
711
|
711
|
} |
|
712
|
712
|
|