nextcloud /
server
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | <meta charset="utf-8"> |
| 5 | 5 | <title> |
| 6 | 6 | <?php |
| 7 | - p(!empty($_['application'])?$_['application'].' - ':''); |
|
| 7 | + p(!empty($_['application']) ? $_['application'].' - ' : ''); |
|
| 8 | 8 | p($theme->getTitle()); |
| 9 | 9 | ?> |
| 10 | 10 | </title> |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | <meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>"> |
| 15 | 15 | <meta name="apple-mobile-web-app-capable" content="yes"> |
| 16 | 16 | <meta name="apple-mobile-web-app-status-bar-style" content="black"> |
| 17 | - <meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>"> |
|
| 17 | + <meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>"> |
|
| 18 | 18 | <meta name="mobile-web-app-capable" content="yes"> |
| 19 | 19 | <meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>"> |
| 20 | 20 | <link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>"> |
@@ -26,18 +26,18 @@ discard block |
||
| 26 | 26 | <?php print_unescaped($_['inline_ocjs']); ?> |
| 27 | 27 | </script> |
| 28 | 28 | <?php endif; ?> |
| 29 | - <?php foreach($_['cssfiles'] as $cssfile): ?> |
|
| 29 | + <?php foreach ($_['cssfiles'] as $cssfile): ?> |
|
| 30 | 30 | <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> |
| 31 | 31 | <?php endforeach; ?> |
| 32 | - <?php foreach($_['printcssfiles'] as $cssfile): ?> |
|
| 32 | + <?php foreach ($_['printcssfiles'] as $cssfile): ?> |
|
| 33 | 33 | <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> |
| 34 | 34 | <?php endforeach; ?> |
| 35 | - <?php foreach($_['jsfiles'] as $jsfile): ?> |
|
| 35 | + <?php foreach ($_['jsfiles'] as $jsfile): ?> |
|
| 36 | 36 | <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script> |
| 37 | 37 | <?php endforeach; ?> |
| 38 | 38 | <?php print_unescaped($_['headers']); ?> |
| 39 | 39 | </head> |
| 40 | - <body id="<?php p($_['bodyid']);?>"> |
|
| 40 | + <body id="<?php p($_['bodyid']); ?>"> |
|
| 41 | 41 | <?php include('layout.noscript.warning.php'); ?> |
| 42 | 42 | <div id="notification-container"> |
| 43 | 43 | <div id="notification"></div> |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | <a href="#" class="header-appname-container menutoggle" tabindex="2"> |
| 57 | 57 | <h1 class="header-appname"> |
| 58 | - <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?> |
|
| 58 | + <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?> |
|
| 59 | 59 | </h1> |
| 60 | 60 | <div class="icon-caret"></div> |
| 61 | 61 | </a> |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | <a href="<?php print_unescaped($entry['href']); ?>" |
| 67 | 67 | tabindex="3" |
| 68 | 68 | <?php if ($entry['active']): ?> class="active"<?php endif; ?>> |
| 69 | - <img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" |
|
| 69 | + <img src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>" |
|
| 70 | 70 | class="app-icon"/> |
| 71 | 71 | <div class="icon-loading-small-dark" |
| 72 | 72 | style="display:none;"></div> |
@@ -88,13 +88,13 @@ discard block |
||
| 88 | 88 | <div id="navigation"> |
| 89 | 89 | <div id="apps"> |
| 90 | 90 | <ul> |
| 91 | - <?php foreach($_['navigation'] as $entry): ?> |
|
| 91 | + <?php foreach ($_['navigation'] as $entry): ?> |
|
| 92 | 92 | <li data-id="<?php p($entry['id']); ?>"> |
| 93 | 93 | <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" |
| 94 | - <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> |
|
| 94 | + <?php if ($entry['active']): ?> class="active"<?php endif; ?>> |
|
| 95 | 95 | <svg width="16" height="16" viewBox="0 0 16 16"> |
| 96 | 96 | <defs><filter id="invert-<?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> |
| 97 | - <image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image> |
|
| 97 | + <image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>" class="app-icon"></image> |
|
| 98 | 98 | </svg> |
| 99 | 99 | <div class="icon-loading-small-dark" style="display:none;"></div> |
| 100 | 100 | <span><?php p($entry['name']); ?></span> |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | <div id="header-right"> |
| 112 | 112 | <form class="searchbox" action="#" method="post" role="search" novalidate> |
| 113 | 113 | <label for="searchbox" class="hidden-visually"> |
| 114 | - <?php p($l->t('Search'));?> |
|
| 114 | + <?php p($l->t('Search')); ?> |
|
| 115 | 115 | </label> |
| 116 | 116 | <input id="searchbox" type="search" name="query" |
| 117 | 117 | value="" required |
@@ -123,8 +123,8 @@ discard block |
||
| 123 | 123 | <div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>"> |
| 124 | 124 | <?php if ($_['userAvatarSet']): ?> |
| 125 | 125 | <img alt="" width="32" height="32" |
| 126 | - src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>" |
|
| 127 | - srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x" |
|
| 126 | + src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>" |
|
| 127 | + srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']])); ?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']])); ?> 4x" |
|
| 128 | 128 | > |
| 129 | 129 | <?php endif; ?> |
| 130 | 130 | </div> |
@@ -132,11 +132,11 @@ discard block |
||
| 132 | 132 | </div> |
| 133 | 133 | <div id="expanddiv"> |
| 134 | 134 | <ul> |
| 135 | - <?php foreach($_['settingsnavigation'] as $entry):?> |
|
| 135 | + <?php foreach ($_['settingsnavigation'] as $entry):?> |
|
| 136 | 136 | <li> |
| 137 | 137 | <a href="<?php print_unescaped($entry['href']); ?>" |
| 138 | - <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>> |
|
| 139 | - <img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"> |
|
| 138 | + <?php if ($entry["active"]): ?> class="active"<?php endif; ?>> |
|
| 139 | + <img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"> |
|
| 140 | 140 | <?php p($entry['name']) ?> |
| 141 | 141 | </a> |
| 142 | 142 | </li> |
@@ -111,9 +111,9 @@ discard block |
||
| 111 | 111 | $apps = self::getEnabledApps(); |
| 112 | 112 | |
| 113 | 113 | // Add each apps' folder as allowed class path |
| 114 | - foreach($apps as $app) { |
|
| 114 | + foreach ($apps as $app) { |
|
| 115 | 115 | $path = self::getAppPath($app); |
| 116 | - if($path !== false) { |
|
| 116 | + if ($path !== false) { |
|
| 117 | 117 | self::registerAutoloading($app, $path); |
| 118 | 118 | } |
| 119 | 119 | } |
@@ -138,15 +138,15 @@ discard block |
||
| 138 | 138 | public static function loadApp($app) { |
| 139 | 139 | self::$loadedApps[] = $app; |
| 140 | 140 | $appPath = self::getAppPath($app); |
| 141 | - if($appPath === false) { |
|
| 141 | + if ($appPath === false) { |
|
| 142 | 142 | return; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | // in case someone calls loadApp() directly |
| 146 | 146 | self::registerAutoloading($app, $appPath); |
| 147 | 147 | |
| 148 | - if (is_file($appPath . '/appinfo/app.php')) { |
|
| 149 | - \OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app); |
|
| 148 | + if (is_file($appPath.'/appinfo/app.php')) { |
|
| 149 | + \OC::$server->getEventLogger()->start('load_app_'.$app, 'Load app: '.$app); |
|
| 150 | 150 | self::requireAppFile($app); |
| 151 | 151 | if (self::isType($app, array('authentication'))) { |
| 152 | 152 | // since authentication apps affect the "is app enabled for group" check, |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | // enabled for groups |
| 156 | 156 | self::$enabledAppsCache = array(); |
| 157 | 157 | } |
| 158 | - \OC::$server->getEventLogger()->end('load_app_' . $app); |
|
| 158 | + \OC::$server->getEventLogger()->end('load_app_'.$app); |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | $info = self::getAppInfo($app); |
@@ -182,17 +182,17 @@ discard block |
||
| 182 | 182 | * @param string $path |
| 183 | 183 | */ |
| 184 | 184 | public static function registerAutoloading($app, $path) { |
| 185 | - $key = $app . '-' . $path; |
|
| 186 | - if(isset(self::$alreadyRegistered[$key])) { |
|
| 185 | + $key = $app.'-'.$path; |
|
| 186 | + if (isset(self::$alreadyRegistered[$key])) { |
|
| 187 | 187 | return; |
| 188 | 188 | } |
| 189 | 189 | self::$alreadyRegistered[$key] = true; |
| 190 | 190 | // Register on PSR-4 composer autoloader |
| 191 | 191 | $appNamespace = \OC\AppFramework\App::buildAppNamespace($app); |
| 192 | 192 | \OC::$server->registerNamespace($app, $appNamespace); |
| 193 | - \OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true); |
|
| 193 | + \OC::$composerAutoloader->addPsr4($appNamespace.'\\', $path.'/lib/', true); |
|
| 194 | 194 | if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) { |
| 195 | - \OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true); |
|
| 195 | + \OC::$composerAutoloader->addPsr4($appNamespace.'\\Tests\\', $path.'/tests/', true); |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | // Register on legacy autoloader |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | private static function requireAppFile($app) { |
| 208 | 208 | try { |
| 209 | 209 | // encapsulated here to avoid variable scope conflicts |
| 210 | - require_once $app . '/appinfo/app.php'; |
|
| 210 | + require_once $app.'/appinfo/app.php'; |
|
| 211 | 211 | } catch (Error $ex) { |
| 212 | 212 | \OC::$server->getLogger()->logException($ex); |
| 213 | 213 | $blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps(); |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | */ |
| 262 | 262 | public static function setAppTypes($app) { |
| 263 | 263 | $appData = self::getAppInfo($app); |
| 264 | - if(!is_array($appData)) { |
|
| 264 | + if (!is_array($appData)) { |
|
| 265 | 265 | return; |
| 266 | 266 | } |
| 267 | 267 | |
@@ -325,8 +325,8 @@ discard block |
||
| 325 | 325 | } else { |
| 326 | 326 | $apps = $appManager->getEnabledAppsForUser($user); |
| 327 | 327 | } |
| 328 | - $apps = array_filter($apps, function ($app) { |
|
| 329 | - return $app !== 'files';//we add this manually |
|
| 328 | + $apps = array_filter($apps, function($app) { |
|
| 329 | + return $app !== 'files'; //we add this manually |
|
| 330 | 330 | }); |
| 331 | 331 | sort($apps); |
| 332 | 332 | array_unshift($apps, 'files'); |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | ); |
| 371 | 371 | $isDownloaded = $installer->isDownloaded($appId); |
| 372 | 372 | |
| 373 | - if(!$isDownloaded) { |
|
| 373 | + if (!$isDownloaded) { |
|
| 374 | 374 | $installer->downloadApp($appId); |
| 375 | 375 | } |
| 376 | 376 | |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | $info = self::getAppInfo($appId); |
| 411 | - if(isset($info['settings']) && is_array($info['settings'])) { |
|
| 411 | + if (isset($info['settings']) && is_array($info['settings'])) { |
|
| 412 | 412 | $appPath = self::getAppPath($appId); |
| 413 | 413 | self::registerAutoloading($appId, $appPath); |
| 414 | 414 | \OC::$server->getSettingsManager()->setupSettings($info['settings']); |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | */ |
| 512 | 512 | public static function findAppInDirectories($appId) { |
| 513 | 513 | $sanitizedAppId = self::cleanAppId($appId); |
| 514 | - if($sanitizedAppId !== $appId) { |
|
| 514 | + if ($sanitizedAppId !== $appId) { |
|
| 515 | 515 | return false; |
| 516 | 516 | } |
| 517 | 517 | static $app_dir = array(); |
@@ -522,7 +522,7 @@ discard block |
||
| 522 | 522 | |
| 523 | 523 | $possibleApps = array(); |
| 524 | 524 | foreach (OC::$APPSROOTS as $dir) { |
| 525 | - if (file_exists($dir['path'] . '/' . $appId)) { |
|
| 525 | + if (file_exists($dir['path'].'/'.$appId)) { |
|
| 526 | 526 | $possibleApps[] = $dir; |
| 527 | 527 | } |
| 528 | 528 | } |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | } |
| 564 | 564 | |
| 565 | 565 | if (($dir = self::findAppInDirectories($appId)) != false) { |
| 566 | - return $dir['path'] . '/' . $appId; |
|
| 566 | + return $dir['path'].'/'.$appId; |
|
| 567 | 567 | } |
| 568 | 568 | return false; |
| 569 | 569 | } |
@@ -577,7 +577,7 @@ discard block |
||
| 577 | 577 | */ |
| 578 | 578 | public static function getAppWebPath($appId) { |
| 579 | 579 | if (($dir = self::findAppInDirectories($appId)) != false) { |
| 580 | - return OC::$WEBROOT . $dir['url'] . '/' . $appId; |
|
| 580 | + return OC::$WEBROOT.$dir['url'].'/'.$appId; |
|
| 581 | 581 | } |
| 582 | 582 | return false; |
| 583 | 583 | } |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | * @return string |
| 591 | 591 | */ |
| 592 | 592 | public static function getAppVersion($appId, $useCache = true) { |
| 593 | - if($useCache && isset(self::$appVersion[$appId])) { |
|
| 593 | + if ($useCache && isset(self::$appVersion[$appId])) { |
|
| 594 | 594 | return self::$appVersion[$appId]; |
| 595 | 595 | } |
| 596 | 596 | |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | * @return string |
| 607 | 607 | */ |
| 608 | 608 | public static function getAppVersionByPath($path) { |
| 609 | - $infoFile = $path . '/appinfo/info.xml'; |
|
| 609 | + $infoFile = $path.'/appinfo/info.xml'; |
|
| 610 | 610 | $appData = self::getAppInfo($infoFile, true); |
| 611 | 611 | return isset($appData['version']) ? $appData['version'] : ''; |
| 612 | 612 | } |
@@ -629,10 +629,10 @@ discard block |
||
| 629 | 629 | return self::$appInfo[$appId]; |
| 630 | 630 | } |
| 631 | 631 | $appPath = self::getAppPath($appId); |
| 632 | - if($appPath === false) { |
|
| 632 | + if ($appPath === false) { |
|
| 633 | 633 | return null; |
| 634 | 634 | } |
| 635 | - $file = $appPath . '/appinfo/info.xml'; |
|
| 635 | + $file = $appPath.'/appinfo/info.xml'; |
|
| 636 | 636 | } |
| 637 | 637 | |
| 638 | 638 | $parser = new InfoParser(\OC::$server->getMemCacheFactory()->create('core.appinfo')); |
@@ -641,9 +641,9 @@ discard block |
||
| 641 | 641 | if (is_array($data)) { |
| 642 | 642 | $data = OC_App::parseAppInfo($data, $lang); |
| 643 | 643 | } |
| 644 | - if(isset($data['ocsid'])) { |
|
| 644 | + if (isset($data['ocsid'])) { |
|
| 645 | 645 | $storedId = \OC::$server->getConfig()->getAppValue($appId, 'ocsid'); |
| 646 | - if($storedId !== '' && $storedId !== $data['ocsid']) { |
|
| 646 | + if ($storedId !== '' && $storedId !== $data['ocsid']) { |
|
| 647 | 647 | $data['ocsid'] = $storedId; |
| 648 | 648 | } |
| 649 | 649 | } |
@@ -735,7 +735,7 @@ discard block |
||
| 735 | 735 | * @param string $page |
| 736 | 736 | */ |
| 737 | 737 | public static function registerAdmin($app, $page) { |
| 738 | - self::$adminForms[] = $app . '/' . $page . '.php'; |
|
| 738 | + self::$adminForms[] = $app.'/'.$page.'.php'; |
|
| 739 | 739 | } |
| 740 | 740 | |
| 741 | 741 | /** |
@@ -744,7 +744,7 @@ discard block |
||
| 744 | 744 | * @param string $page |
| 745 | 745 | */ |
| 746 | 746 | public static function registerPersonal($app, $page) { |
| 747 | - self::$personalForms[] = $app . '/' . $page . '.php'; |
|
| 747 | + self::$personalForms[] = $app.'/'.$page.'.php'; |
|
| 748 | 748 | } |
| 749 | 749 | |
| 750 | 750 | /** |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | |
| 774 | 774 | foreach (OC::$APPSROOTS as $apps_dir) { |
| 775 | 775 | if (!is_readable($apps_dir['path'])) { |
| 776 | - \OCP\Util::writeLog('core', 'unable to read app folder : ' . $apps_dir['path'], \OCP\Util::WARN); |
|
| 776 | + \OCP\Util::writeLog('core', 'unable to read app folder : '.$apps_dir['path'], \OCP\Util::WARN); |
|
| 777 | 777 | continue; |
| 778 | 778 | } |
| 779 | 779 | $dh = opendir($apps_dir['path']); |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | if (is_resource($dh)) { |
| 782 | 782 | while (($file = readdir($dh)) !== false) { |
| 783 | 783 | |
| 784 | - if ($file[0] != '.' and is_dir($apps_dir['path'] . '/' . $file) and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) { |
|
| 784 | + if ($file[0] != '.' and is_dir($apps_dir['path'].'/'.$file) and is_file($apps_dir['path'].'/'.$file.'/appinfo/info.xml')) { |
|
| 785 | 785 | |
| 786 | 786 | $apps[] = $file; |
| 787 | 787 | } |
@@ -811,12 +811,12 @@ discard block |
||
| 811 | 811 | |
| 812 | 812 | $info = OC_App::getAppInfo($app, false, $langCode); |
| 813 | 813 | if (!is_array($info)) { |
| 814 | - \OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', \OCP\Util::ERROR); |
|
| 814 | + \OCP\Util::writeLog('core', 'Could not read app info file for app "'.$app.'"', \OCP\Util::ERROR); |
|
| 815 | 815 | continue; |
| 816 | 816 | } |
| 817 | 817 | |
| 818 | 818 | if (!isset($info['name'])) { |
| 819 | - \OCP\Util::writeLog('core', 'App id "' . $app . '" has no name in appinfo', \OCP\Util::ERROR); |
|
| 819 | + \OCP\Util::writeLog('core', 'App id "'.$app.'" has no name in appinfo', \OCP\Util::ERROR); |
|
| 820 | 820 | continue; |
| 821 | 821 | } |
| 822 | 822 | |
@@ -843,13 +843,13 @@ discard block |
||
| 843 | 843 | } |
| 844 | 844 | |
| 845 | 845 | $appPath = self::getAppPath($app); |
| 846 | - if($appPath !== false) { |
|
| 847 | - $appIcon = $appPath . '/img/' . $app . '.svg'; |
|
| 846 | + if ($appPath !== false) { |
|
| 847 | + $appIcon = $appPath.'/img/'.$app.'.svg'; |
|
| 848 | 848 | if (file_exists($appIcon)) { |
| 849 | - $info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, $app . '.svg'); |
|
| 849 | + $info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, $app.'.svg'); |
|
| 850 | 850 | $info['previewAsIcon'] = true; |
| 851 | 851 | } else { |
| 852 | - $appIcon = $appPath . '/img/app.svg'; |
|
| 852 | + $appIcon = $appPath.'/img/app.svg'; |
|
| 853 | 853 | if (file_exists($appIcon)) { |
| 854 | 854 | $info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, 'app.svg'); |
| 855 | 855 | $info['previewAsIcon'] = true; |
@@ -883,9 +883,9 @@ discard block |
||
| 883 | 883 | * @return string|false |
| 884 | 884 | */ |
| 885 | 885 | public static function getInternalAppIdByOcs($ocsID) { |
| 886 | - if(is_numeric($ocsID)) { |
|
| 886 | + if (is_numeric($ocsID)) { |
|
| 887 | 887 | $idArray = \OC::$server->getAppConfig()->getValues(false, 'ocsid'); |
| 888 | - if(array_search($ocsID, $idArray)) { |
|
| 888 | + if (array_search($ocsID, $idArray)) { |
|
| 889 | 889 | return array_search($ocsID, $idArray); |
| 890 | 890 | } |
| 891 | 891 | } |
@@ -989,7 +989,7 @@ discard block |
||
| 989 | 989 | public static function getAppVersions() { |
| 990 | 990 | static $versions; |
| 991 | 991 | |
| 992 | - if(!$versions) { |
|
| 992 | + if (!$versions) { |
|
| 993 | 993 | $appConfig = \OC::$server->getAppConfig(); |
| 994 | 994 | $versions = $appConfig->getValues(false, 'installed_version'); |
| 995 | 995 | } |
@@ -1011,7 +1011,7 @@ discard block |
||
| 1011 | 1011 | if ($app !== false) { |
| 1012 | 1012 | // check if the app is compatible with this version of ownCloud |
| 1013 | 1013 | $info = self::getAppInfo($app); |
| 1014 | - if(!is_array($info)) { |
|
| 1014 | + if (!is_array($info)) { |
|
| 1015 | 1015 | throw new \Exception( |
| 1016 | 1016 | $l->t('App "%s" cannot be installed because appinfo file cannot be read.', |
| 1017 | 1017 | [$info['name']] |
@@ -1036,7 +1036,7 @@ discard block |
||
| 1036 | 1036 | $config->setAppValue($app, 'ocsid', $appData['id']); |
| 1037 | 1037 | } |
| 1038 | 1038 | |
| 1039 | - if(isset($info['settings']) && is_array($info['settings'])) { |
|
| 1039 | + if (isset($info['settings']) && is_array($info['settings'])) { |
|
| 1040 | 1040 | $appPath = self::getAppPath($app); |
| 1041 | 1041 | self::registerAutoloading($app, $appPath); |
| 1042 | 1042 | \OC::$server->getSettingsManager()->setupSettings($info['settings']); |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | |
| 1045 | 1045 | \OC_Hook::emit('OC_App', 'post_enable', array('app' => $app)); |
| 1046 | 1046 | } else { |
| 1047 | - if(empty($appName) ) { |
|
| 1047 | + if (empty($appName)) { |
|
| 1048 | 1048 | throw new \Exception($l->t("No app name specified")); |
| 1049 | 1049 | } else { |
| 1050 | 1050 | throw new \Exception($l->t("App '%s' could not be installed!", $appName)); |
@@ -1062,24 +1062,24 @@ discard block |
||
| 1062 | 1062 | */ |
| 1063 | 1063 | public static function updateApp($appId) { |
| 1064 | 1064 | $appPath = self::getAppPath($appId); |
| 1065 | - if($appPath === false) { |
|
| 1065 | + if ($appPath === false) { |
|
| 1066 | 1066 | return false; |
| 1067 | 1067 | } |
| 1068 | 1068 | $appData = self::getAppInfo($appId); |
| 1069 | 1069 | self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']); |
| 1070 | - if (file_exists($appPath . '/appinfo/database.xml')) { |
|
| 1071 | - OC_DB::updateDbFromStructure($appPath . '/appinfo/database.xml'); |
|
| 1070 | + if (file_exists($appPath.'/appinfo/database.xml')) { |
|
| 1071 | + OC_DB::updateDbFromStructure($appPath.'/appinfo/database.xml'); |
|
| 1072 | 1072 | } |
| 1073 | 1073 | self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']); |
| 1074 | 1074 | self::setupLiveMigrations($appId, $appData['repair-steps']['live-migration']); |
| 1075 | 1075 | unset(self::$appVersion[$appId]); |
| 1076 | 1076 | // run upgrade code |
| 1077 | - if (file_exists($appPath . '/appinfo/update.php')) { |
|
| 1077 | + if (file_exists($appPath.'/appinfo/update.php')) { |
|
| 1078 | 1078 | self::loadApp($appId); |
| 1079 | - include $appPath . '/appinfo/update.php'; |
|
| 1079 | + include $appPath.'/appinfo/update.php'; |
|
| 1080 | 1080 | } |
| 1081 | 1081 | self::setupBackgroundJobs($appData['background-jobs']); |
| 1082 | - if(isset($appData['settings']) && is_array($appData['settings'])) { |
|
| 1082 | + if (isset($appData['settings']) && is_array($appData['settings'])) { |
|
| 1083 | 1083 | $appPath = self::getAppPath($appId); |
| 1084 | 1084 | self::registerAutoloading($appId, $appPath); |
| 1085 | 1085 | \OC::$server->getSettingsManager()->setupSettings($appData['settings']); |
@@ -1088,14 +1088,14 @@ discard block |
||
| 1088 | 1088 | //set remote/public handlers |
| 1089 | 1089 | if (array_key_exists('ocsid', $appData)) { |
| 1090 | 1090 | \OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']); |
| 1091 | - } elseif(\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) { |
|
| 1091 | + } elseif (\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) { |
|
| 1092 | 1092 | \OC::$server->getConfig()->deleteAppValue($appId, 'ocsid'); |
| 1093 | 1093 | } |
| 1094 | 1094 | foreach ($appData['remote'] as $name => $path) { |
| 1095 | - \OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path); |
|
| 1095 | + \OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $appId.'/'.$path); |
|
| 1096 | 1096 | } |
| 1097 | 1097 | foreach ($appData['public'] as $name => $path) { |
| 1098 | - \OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path); |
|
| 1098 | + \OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $appId.'/'.$path); |
|
| 1099 | 1099 | } |
| 1100 | 1100 | |
| 1101 | 1101 | self::setAppTypes($appId); |
@@ -1165,17 +1165,17 @@ discard block |
||
| 1165 | 1165 | public static function getStorage($appId) { |
| 1166 | 1166 | if (OC_App::isEnabled($appId)) { //sanity check |
| 1167 | 1167 | if (\OC::$server->getUserSession()->isLoggedIn()) { |
| 1168 | - $view = new \OC\Files\View('/' . OC_User::getUser()); |
|
| 1168 | + $view = new \OC\Files\View('/'.OC_User::getUser()); |
|
| 1169 | 1169 | if (!$view->file_exists($appId)) { |
| 1170 | 1170 | $view->mkdir($appId); |
| 1171 | 1171 | } |
| 1172 | - return new \OC\Files\View('/' . OC_User::getUser() . '/' . $appId); |
|
| 1172 | + return new \OC\Files\View('/'.OC_User::getUser().'/'.$appId); |
|
| 1173 | 1173 | } else { |
| 1174 | - \OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ', user not logged in', \OCP\Util::ERROR); |
|
| 1174 | + \OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.', user not logged in', \OCP\Util::ERROR); |
|
| 1175 | 1175 | return false; |
| 1176 | 1176 | } |
| 1177 | 1177 | } else { |
| 1178 | - \OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ' not enabled', \OCP\Util::ERROR); |
|
| 1178 | + \OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.' not enabled', \OCP\Util::ERROR); |
|
| 1179 | 1179 | return false; |
| 1180 | 1180 | } |
| 1181 | 1181 | } |
@@ -1207,9 +1207,9 @@ discard block |
||
| 1207 | 1207 | |
| 1208 | 1208 | if ($attributeLang === $similarLang) { |
| 1209 | 1209 | $similarLangFallback = $option['@value']; |
| 1210 | - } else if (strpos($attributeLang, $similarLang . '_') === 0) { |
|
| 1210 | + } else if (strpos($attributeLang, $similarLang.'_') === 0) { |
|
| 1211 | 1211 | if ($similarLangFallback === false) { |
| 1212 | - $similarLangFallback = $option['@value']; |
|
| 1212 | + $similarLangFallback = $option['@value']; |
|
| 1213 | 1213 | } |
| 1214 | 1214 | } |
| 1215 | 1215 | } else { |
@@ -1244,7 +1244,7 @@ discard block |
||
| 1244 | 1244 | $data['description'] = trim(self::findBestL10NOption($data['description'], $lang)); |
| 1245 | 1245 | } else if (isset($data['description']) && is_string($data['description'])) { |
| 1246 | 1246 | $data['description'] = trim($data['description']); |
| 1247 | - } else { |
|
| 1247 | + } else { |
|
| 1248 | 1248 | $data['description'] = ''; |
| 1249 | 1249 | } |
| 1250 | 1250 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | */ |
| 109 | 109 | public function installApp($appId) { |
| 110 | 110 | $app = \OC_App::findAppInDirectories($appId); |
| 111 | - if($app === false) { |
|
| 111 | + if ($app === false) { |
|
| 112 | 112 | throw new \Exception('App not found in any app directory'); |
| 113 | 113 | } |
| 114 | 114 | |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | $info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true); |
| 117 | 117 | |
| 118 | 118 | //install the database |
| 119 | - if(is_file($basedir.'/appinfo/database.xml')) { |
|
| 119 | + if (is_file($basedir.'/appinfo/database.xml')) { |
|
| 120 | 120 | if (\OC::$server->getAppConfig()->getValue($info['id'], 'installed_version') === null) { |
| 121 | 121 | OC_DB::createDbFromStructure($basedir.'/appinfo/database.xml'); |
| 122 | 122 | } else { |
@@ -128,8 +128,8 @@ discard block |
||
| 128 | 128 | \OC_App::setupBackgroundJobs($info['background-jobs']); |
| 129 | 129 | |
| 130 | 130 | //run appinfo/install.php |
| 131 | - if((!isset($data['noinstall']) or $data['noinstall']==false)) { |
|
| 132 | - self::includeAppScript($basedir . '/appinfo/install.php'); |
|
| 131 | + if ((!isset($data['noinstall']) or $data['noinstall'] == false)) { |
|
| 132 | + self::includeAppScript($basedir.'/appinfo/install.php'); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | $appData = OC_App::getAppInfo($appId); |
@@ -140,10 +140,10 @@ discard block |
||
| 140 | 140 | \OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no'); |
| 141 | 141 | |
| 142 | 142 | //set remote/public handlers |
| 143 | - foreach($info['remote'] as $name=>$path) { |
|
| 143 | + foreach ($info['remote'] as $name=>$path) { |
|
| 144 | 144 | \OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path); |
| 145 | 145 | } |
| 146 | - foreach($info['public'] as $name=>$path) { |
|
| 146 | + foreach ($info['public'] as $name=>$path) { |
|
| 147 | 147 | \OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path); |
| 148 | 148 | } |
| 149 | 149 | |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * |
| 160 | 160 | * Checks whether or not an app is installed, i.e. registered in apps table. |
| 161 | 161 | */ |
| 162 | - public static function isInstalled( $app ) { |
|
| 162 | + public static function isInstalled($app) { |
|
| 163 | 163 | return (\OC::$server->getConfig()->getAppValue($app, "installed_version", null) !== null); |
| 164 | 164 | } |
| 165 | 165 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | * @return bool |
| 171 | 171 | */ |
| 172 | 172 | public function updateAppstoreApp($appId) { |
| 173 | - if(self::isUpdateAvailable($appId, $this->appFetcher)) { |
|
| 173 | + if (self::isUpdateAvailable($appId, $this->appFetcher)) { |
|
| 174 | 174 | try { |
| 175 | 175 | $this->downloadApp($appId); |
| 176 | 176 | } catch (\Exception $e) { |
@@ -194,18 +194,18 @@ discard block |
||
| 194 | 194 | $appId = strtolower($appId); |
| 195 | 195 | |
| 196 | 196 | $apps = $this->appFetcher->get(); |
| 197 | - foreach($apps as $app) { |
|
| 198 | - if($app['id'] === $appId) { |
|
| 197 | + foreach ($apps as $app) { |
|
| 198 | + if ($app['id'] === $appId) { |
|
| 199 | 199 | // Load the certificate |
| 200 | 200 | $certificate = new X509(); |
| 201 | - $certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt')); |
|
| 201 | + $certificate->loadCA(file_get_contents(__DIR__.'/../../resources/codesigning/root.crt')); |
|
| 202 | 202 | $loadedCertificate = $certificate->loadX509($app['certificate']); |
| 203 | 203 | |
| 204 | 204 | // Verify if the certificate has been revoked |
| 205 | 205 | $crl = new X509(); |
| 206 | - $crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt')); |
|
| 207 | - $crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl')); |
|
| 208 | - if($crl->validateSignature() !== true) { |
|
| 206 | + $crl->loadCA(file_get_contents(__DIR__.'/../../resources/codesigning/root.crt')); |
|
| 207 | + $crl->loadCRL(file_get_contents(__DIR__.'/../../resources/codesigning/root.crl')); |
|
| 208 | + if ($crl->validateSignature() !== true) { |
|
| 209 | 209 | throw new \Exception('Could not validate CRL signature'); |
| 210 | 210 | } |
| 211 | 211 | $csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString(); |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | // Verify if the certificate has been issued by the Nextcloud Code Authority CA |
| 223 | - if($certificate->validateSignature() !== true) { |
|
| 223 | + if ($certificate->validateSignature() !== true) { |
|
| 224 | 224 | throw new \Exception( |
| 225 | 225 | sprintf( |
| 226 | 226 | 'App with id %s has a certificate not issued by a trusted Code Signing Authority', |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | // Verify if the certificate is issued for the requested app id |
| 233 | 233 | $certInfo = openssl_x509_parse($app['certificate']); |
| 234 | - if(!isset($certInfo['subject']['CN'])) { |
|
| 234 | + if (!isset($certInfo['subject']['CN'])) { |
|
| 235 | 235 | throw new \Exception( |
| 236 | 236 | sprintf( |
| 237 | 237 | 'App with id %s has a cert with no CN', |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | ) |
| 240 | 240 | ); |
| 241 | 241 | } |
| 242 | - if($certInfo['subject']['CN'] !== $appId) { |
|
| 242 | + if ($certInfo['subject']['CN'] !== $appId) { |
|
| 243 | 243 | throw new \Exception( |
| 244 | 244 | sprintf( |
| 245 | 245 | 'App with id %s has a cert issued to %s', |
@@ -256,21 +256,21 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | // Check if the signature actually matches the downloaded content |
| 258 | 258 | $certificate = openssl_get_publickey($app['certificate']); |
| 259 | - $verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512); |
|
| 259 | + $verified = (bool) openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512); |
|
| 260 | 260 | openssl_free_key($certificate); |
| 261 | 261 | |
| 262 | - if($verified === true) { |
|
| 262 | + if ($verified === true) { |
|
| 263 | 263 | // Seems to match, let's proceed |
| 264 | 264 | $extractDir = $this->tempManager->getTemporaryFolder(); |
| 265 | 265 | $archive = new TAR($tempFile); |
| 266 | 266 | |
| 267 | - if($archive) { |
|
| 267 | + if ($archive) { |
|
| 268 | 268 | $archive->extract($extractDir); |
| 269 | 269 | $allFiles = scandir($extractDir); |
| 270 | 270 | $folders = array_diff($allFiles, ['.', '..']); |
| 271 | 271 | $folders = array_values($folders); |
| 272 | 272 | |
| 273 | - if(count($folders) > 1) { |
|
| 273 | + if (count($folders) > 1) { |
|
| 274 | 274 | throw new \Exception( |
| 275 | 275 | sprintf( |
| 276 | 276 | 'Extracted app %s has more than 1 folder', |
@@ -281,22 +281,22 @@ discard block |
||
| 281 | 281 | |
| 282 | 282 | // Check if appinfo/info.xml has the same app ID as well |
| 283 | 283 | $loadEntities = libxml_disable_entity_loader(false); |
| 284 | - $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); |
|
| 284 | + $xml = simplexml_load_file($extractDir.'/'.$folders[0].'/appinfo/info.xml'); |
|
| 285 | 285 | libxml_disable_entity_loader($loadEntities); |
| 286 | - if((string)$xml->id !== $appId) { |
|
| 286 | + if ((string) $xml->id !== $appId) { |
|
| 287 | 287 | throw new \Exception( |
| 288 | 288 | sprintf( |
| 289 | 289 | 'App for id %s has a wrong app ID in info.xml: %s', |
| 290 | 290 | $appId, |
| 291 | - (string)$xml->id |
|
| 291 | + (string) $xml->id |
|
| 292 | 292 | ) |
| 293 | 293 | ); |
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | // Check if the version is lower than before |
| 297 | 297 | $currentVersion = OC_App::getAppVersion($appId); |
| 298 | - $newVersion = (string)$xml->version; |
|
| 299 | - if(version_compare($currentVersion, $newVersion) === 1) { |
|
| 298 | + $newVersion = (string) $xml->version; |
|
| 299 | + if (version_compare($currentVersion, $newVersion) === 1) { |
|
| 300 | 300 | throw new \Exception( |
| 301 | 301 | sprintf( |
| 302 | 302 | 'App for id %s has version %s and tried to update to lower version %s', |
@@ -307,12 +307,12 @@ discard block |
||
| 307 | 307 | ); |
| 308 | 308 | } |
| 309 | 309 | |
| 310 | - $baseDir = OC_App::getInstallPath() . '/' . $appId; |
|
| 310 | + $baseDir = OC_App::getInstallPath().'/'.$appId; |
|
| 311 | 311 | // Remove old app with the ID if existent |
| 312 | 312 | OC_Helper::rmdirr($baseDir); |
| 313 | 313 | // Move to app folder |
| 314 | - if(@mkdir($baseDir)) { |
|
| 315 | - $extractDir .= '/' . $folders[0]; |
|
| 314 | + if (@mkdir($baseDir)) { |
|
| 315 | + $extractDir .= '/'.$folders[0]; |
|
| 316 | 316 | OC_Helper::copyr($extractDir, $baseDir); |
| 317 | 317 | } |
| 318 | 318 | OC_Helper::copyr($extractDir, $baseDir); |
@@ -372,8 +372,8 @@ discard block |
||
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | $apps = $appFetcher->get(); |
| 375 | - foreach($apps as $app) { |
|
| 376 | - if($app['id'] === $appId) { |
|
| 375 | + foreach ($apps as $app) { |
|
| 376 | + if ($app['id'] === $appId) { |
|
| 377 | 377 | $currentVersion = OC_App::getAppVersion($appId); |
| 378 | 378 | $newestVersion = $app['releases'][0]['version']; |
| 379 | 379 | if (version_compare($newestVersion, $currentVersion, '>')) { |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | * The function will check if the app is already downloaded in the apps repository |
| 396 | 396 | */ |
| 397 | 397 | public function isDownloaded($name) { |
| 398 | - foreach(\OC::$APPSROOTS as $dir) { |
|
| 398 | + foreach (\OC::$APPSROOTS as $dir) { |
|
| 399 | 399 | $dirToTest = $dir['path']; |
| 400 | 400 | $dirToTest .= '/'; |
| 401 | 401 | $dirToTest .= $name; |
@@ -423,11 +423,11 @@ discard block |
||
| 423 | 423 | * this has to be done by the function oc_app_uninstall(). |
| 424 | 424 | */ |
| 425 | 425 | public function removeApp($appId) { |
| 426 | - if($this->isDownloaded( $appId )) { |
|
| 427 | - $appDir = OC_App::getInstallPath() . '/' . $appId; |
|
| 426 | + if ($this->isDownloaded($appId)) { |
|
| 427 | + $appDir = OC_App::getInstallPath().'/'.$appId; |
|
| 428 | 428 | OC_Helper::rmdirr($appDir); |
| 429 | 429 | return true; |
| 430 | - }else{ |
|
| 430 | + } else { |
|
| 431 | 431 | \OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', \OCP\Util::ERROR); |
| 432 | 432 | |
| 433 | 433 | return false; |
@@ -443,8 +443,8 @@ discard block |
||
| 443 | 443 | */ |
| 444 | 444 | public function installAppBundle(Bundle $bundle) { |
| 445 | 445 | $appIds = $bundle->getAppIdentifiers(); |
| 446 | - foreach($appIds as $appId) { |
|
| 447 | - if(!$this->isDownloaded($appId)) { |
|
| 446 | + foreach ($appIds as $appId) { |
|
| 447 | + if (!$this->isDownloaded($appId)) { |
|
| 448 | 448 | $this->downloadApp($appId); |
| 449 | 449 | } |
| 450 | 450 | $this->installApp($appId); |
@@ -466,13 +466,13 @@ discard block |
||
| 466 | 466 | */ |
| 467 | 467 | public static function installShippedApps($softErrors = false) { |
| 468 | 468 | $errors = []; |
| 469 | - foreach(\OC::$APPSROOTS as $app_dir) { |
|
| 470 | - if($dir = opendir( $app_dir['path'] )) { |
|
| 471 | - while( false !== ( $filename = readdir( $dir ))) { |
|
| 472 | - if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ) { |
|
| 473 | - if( file_exists( $app_dir['path']."/$filename/appinfo/info.xml" )) { |
|
| 474 | - if(!Installer::isInstalled($filename)) { |
|
| 475 | - $info=OC_App::getAppInfo($filename); |
|
| 469 | + foreach (\OC::$APPSROOTS as $app_dir) { |
|
| 470 | + if ($dir = opendir($app_dir['path'])) { |
|
| 471 | + while (false !== ($filename = readdir($dir))) { |
|
| 472 | + if (substr($filename, 0, 1) != '.' and is_dir($app_dir['path']."/$filename")) { |
|
| 473 | + if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) { |
|
| 474 | + if (!Installer::isInstalled($filename)) { |
|
| 475 | + $info = OC_App::getAppInfo($filename); |
|
| 476 | 476 | $enabled = isset($info['default_enable']); |
| 477 | 477 | if (($enabled || in_array($filename, \OC::$server->getAppManager()->getAlwaysEnabledApps())) |
| 478 | 478 | && \OC::$server->getConfig()->getAppValue($filename, 'enabled') !== 'no') { |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | } |
| 496 | 496 | } |
| 497 | 497 | } |
| 498 | - closedir( $dir ); |
|
| 498 | + closedir($dir); |
|
| 499 | 499 | } |
| 500 | 500 | } |
| 501 | 501 | |
@@ -510,12 +510,12 @@ discard block |
||
| 510 | 510 | public static function installShippedApp($app) { |
| 511 | 511 | //install the database |
| 512 | 512 | $appPath = OC_App::getAppPath($app); |
| 513 | - if(is_file("$appPath/appinfo/database.xml")) { |
|
| 513 | + if (is_file("$appPath/appinfo/database.xml")) { |
|
| 514 | 514 | try { |
| 515 | 515 | OC_DB::createDbFromStructure("$appPath/appinfo/database.xml"); |
| 516 | 516 | } catch (TableExistsException $e) { |
| 517 | 517 | throw new HintException( |
| 518 | - 'Failed to enable app ' . $app, |
|
| 518 | + 'Failed to enable app '.$app, |
|
| 519 | 519 | 'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer">support channels</a>.', |
| 520 | 520 | 0, $e |
| 521 | 521 | ); |
@@ -542,16 +542,16 @@ discard block |
||
| 542 | 542 | } |
| 543 | 543 | |
| 544 | 544 | //set remote/public handlers |
| 545 | - foreach($info['remote'] as $name=>$path) { |
|
| 545 | + foreach ($info['remote'] as $name=>$path) { |
|
| 546 | 546 | $config->setAppValue('core', 'remote_'.$name, $app.'/'.$path); |
| 547 | 547 | } |
| 548 | - foreach($info['public'] as $name=>$path) { |
|
| 548 | + foreach ($info['public'] as $name=>$path) { |
|
| 549 | 549 | $config->setAppValue('core', 'public_'.$name, $app.'/'.$path); |
| 550 | 550 | } |
| 551 | 551 | |
| 552 | 552 | OC_App::setAppTypes($info['id']); |
| 553 | 553 | |
| 554 | - if(isset($info['settings']) && is_array($info['settings'])) { |
|
| 554 | + if (isset($info['settings']) && is_array($info['settings'])) { |
|
| 555 | 555 | // requires that autoloading was registered for the app, |
| 556 | 556 | // as happens before running the install.php some lines above |
| 557 | 557 | \OC::$server->getSettingsManager()->setupSettings($info['settings']); |
@@ -567,7 +567,7 @@ discard block |
||
| 567 | 567 | */ |
| 568 | 568 | public static function checkCode($folder) { |
| 569 | 569 | // is the code checker enabled? |
| 570 | - if(!\OC::$server->getConfig()->getSystemValue('appcodechecker', false)) { |
|
| 570 | + if (!\OC::$server->getConfig()->getSystemValue('appcodechecker', false)) { |
|
| 571 | 571 | return true; |
| 572 | 572 | } |
| 573 | 573 | |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | * @param string $script |
| 582 | 582 | */ |
| 583 | 583 | private static function includeAppScript($script) { |
| 584 | - if ( file_exists($script) ){ |
|
| 584 | + if (file_exists($script)) { |
|
| 585 | 585 | include $script; |
| 586 | 586 | } |
| 587 | 587 | } |
@@ -27,14 +27,14 @@ |
||
| 27 | 27 | * {@inheritDoc} |
| 28 | 28 | */ |
| 29 | 29 | public function getName() { |
| 30 | - return (string)$this->l10n->t('Enterprise bundle'); |
|
| 30 | + return (string) $this->l10n->t('Enterprise bundle'); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * {@inheritDoc} |
| 35 | 35 | */ |
| 36 | 36 | public function getDescription() { |
| 37 | - return (string)$this->l10n->t('Apps for the Enterprise.'); |
|
| 37 | + return (string) $this->l10n->t('Apps for the Enterprise.'); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -27,14 +27,14 @@ |
||
| 27 | 27 | * {@inheritDoc} |
| 28 | 28 | */ |
| 29 | 29 | public function getName() { |
| 30 | - return (string)$this->l10n->t('Groupware bundle'); |
|
| 30 | + return (string) $this->l10n->t('Groupware bundle'); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * {@inheritDoc} |
| 35 | 35 | */ |
| 36 | 36 | public function getDescription() { |
| 37 | - return (string)$this->l10n->t('Apps for groupware functionalities.'); |
|
| 37 | + return (string) $this->l10n->t('Apps for groupware functionalities.'); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -53,44 +53,44 @@ discard block |
||
| 53 | 53 | * @param string $renderAs |
| 54 | 54 | * @param string $appId application id |
| 55 | 55 | */ |
| 56 | - public function __construct( $renderAs, $appId = '' ) { |
|
| 56 | + public function __construct($renderAs, $appId = '') { |
|
| 57 | 57 | |
| 58 | 58 | // yes - should be injected .... |
| 59 | 59 | $this->config = \OC::$server->getConfig(); |
| 60 | 60 | |
| 61 | 61 | |
| 62 | 62 | // Decide which page we show |
| 63 | - if($renderAs == 'user') { |
|
| 64 | - parent::__construct( 'core', 'layout.user' ); |
|
| 65 | - if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) { |
|
| 63 | + if ($renderAs == 'user') { |
|
| 64 | + parent::__construct('core', 'layout.user'); |
|
| 65 | + if (in_array(\OC_App::getCurrentApp(), ['settings', 'admin', 'help']) !== false) { |
|
| 66 | 66 | $this->assign('bodyid', 'body-settings'); |
| 67 | - }else{ |
|
| 67 | + } else { |
|
| 68 | 68 | $this->assign('bodyid', 'body-user'); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | // Code integrity notification |
| 72 | 72 | $integrityChecker = \OC::$server->getIntegrityCodeChecker(); |
| 73 | - if(\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) { |
|
| 73 | + if (\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) { |
|
| 74 | 74 | \OCP\Util::addScript('core', 'integritycheck-failed-notification'); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | // Add navigation entry |
| 78 | - $this->assign( 'application', ''); |
|
| 79 | - $this->assign( 'appid', $appId ); |
|
| 78 | + $this->assign('application', ''); |
|
| 79 | + $this->assign('appid', $appId); |
|
| 80 | 80 | $navigation = \OC_App::getNavigation(); |
| 81 | - $this->assign( 'navigation', $navigation); |
|
| 81 | + $this->assign('navigation', $navigation); |
|
| 82 | 82 | $settingsNavigation = \OC_App::getSettingsNavigation(); |
| 83 | - $this->assign( 'settingsnavigation', $settingsNavigation); |
|
| 84 | - foreach($navigation as $entry) { |
|
| 83 | + $this->assign('settingsnavigation', $settingsNavigation); |
|
| 84 | + foreach ($navigation as $entry) { |
|
| 85 | 85 | if ($entry['active']) { |
| 86 | - $this->assign( 'application', $entry['name'] ); |
|
| 86 | + $this->assign('application', $entry['name']); |
|
| 87 | 87 | break; |
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - foreach($settingsNavigation as $entry) { |
|
| 91 | + foreach ($settingsNavigation as $entry) { |
|
| 92 | 92 | if ($entry['active']) { |
| 93 | - $this->assign( 'application', $entry['name'] ); |
|
| 93 | + $this->assign('application', $entry['name']); |
|
| 94 | 94 | break; |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | // Send the language to our layouts |
| 119 | 119 | $this->assign('language', \OC::$server->getL10NFactory()->findLanguage()); |
| 120 | 120 | |
| 121 | - if(\OC::$server->getSystemConfig()->getValue('installed', false)) { |
|
| 121 | + if (\OC::$server->getSystemConfig()->getValue('installed', false)) { |
|
| 122 | 122 | if (empty(self::$versionHash)) { |
| 123 | 123 | $v = \OC_App::getAppVersions(); |
| 124 | 124 | $v['core'] = implode('.', \OCP\Util::getVersion()); |
@@ -149,10 +149,10 @@ discard block |
||
| 149 | 149 | $this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash])); |
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | - foreach($jsFiles as $info) { |
|
| 152 | + foreach ($jsFiles as $info) { |
|
| 153 | 153 | $web = $info[1]; |
| 154 | 154 | $file = $info[2]; |
| 155 | - $this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() ); |
|
| 155 | + $this->append('jsfiles', $web.'/'.$file.$this->getVersionHashSuffix()); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | try { |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | // Do not initialise scss appdata until we have a fully installed instance |
| 165 | 165 | // Do not load scss for update, errors, installation or login page |
| 166 | - if(\OC::$server->getSystemConfig()->getValue('installed', false) |
|
| 166 | + if (\OC::$server->getSystemConfig()->getValue('installed', false) |
|
| 167 | 167 | && !\OCP\Util::needUpgrade() |
| 168 | 168 | && $pathInfo !== '' |
| 169 | 169 | && !preg_match('/^\/login/', $pathInfo)) { |
@@ -178,27 +178,27 @@ discard block |
||
| 178 | 178 | $this->assign('cssfiles', array()); |
| 179 | 179 | $this->assign('printcssfiles', []); |
| 180 | 180 | $this->assign('versionHash', self::$versionHash); |
| 181 | - foreach($cssFiles as $info) { |
|
| 181 | + foreach ($cssFiles as $info) { |
|
| 182 | 182 | $web = $info[1]; |
| 183 | 183 | $file = $info[2]; |
| 184 | 184 | |
| 185 | 185 | if (substr($file, -strlen('print.css')) === 'print.css') { |
| 186 | - $this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() ); |
|
| 186 | + $this->append('printcssfiles', $web.'/'.$file.$this->getVersionHashSuffix()); |
|
| 187 | 187 | } else { |
| 188 | - $this->append( 'cssfiles', $web.'/'.$file . $this->getVersionHashSuffix() ); |
|
| 188 | + $this->append('cssfiles', $web.'/'.$file.$this->getVersionHashSuffix()); |
|
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | protected function getVersionHashSuffix() { |
| 194 | - if(\OC::$server->getConfig()->getSystemValue('debug', false)) { |
|
| 194 | + if (\OC::$server->getConfig()->getSystemValue('debug', false)) { |
|
| 195 | 195 | // allows chrome workspace mapping in debug mode |
| 196 | 196 | return ""; |
| 197 | 197 | } |
| 198 | 198 | if ($this->config->getSystemValue('installed', false) && \OC::$server->getAppManager()->isInstalled('theming')) { |
| 199 | - return '?v=' . self::$versionHash . '-' . $this->config->getAppValue('theming', 'cachebuster', '0'); |
|
| 199 | + return '?v='.self::$versionHash.'-'.$this->config->getAppValue('theming', 'cachebuster', '0'); |
|
| 200 | 200 | } |
| 201 | - return '?v=' . self::$versionHash; |
|
| 201 | + return '?v='.self::$versionHash; |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | /** |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | // Read the selected theme from the config file |
| 210 | 210 | $theme = \OC_Util::getTheme(); |
| 211 | 211 | |
| 212 | - if($compileScss) { |
|
| 212 | + if ($compileScss) { |
|
| 213 | 213 | $SCSSCacher = \OC::$server->query(SCSSCacher::class); |
| 214 | 214 | } else { |
| 215 | 215 | $SCSSCacher = null; |
@@ -218,8 +218,8 @@ discard block |
||
| 218 | 218 | $locator = new \OC\Template\CSSResourceLocator( |
| 219 | 219 | \OC::$server->getLogger(), |
| 220 | 220 | $theme, |
| 221 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 222 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 221 | + array(\OC::$SERVERROOT => \OC::$WEBROOT), |
|
| 222 | + array(\OC::$SERVERROOT => \OC::$WEBROOT), |
|
| 223 | 223 | $SCSSCacher |
| 224 | 224 | ); |
| 225 | 225 | $locator->find($styles); |
@@ -237,8 +237,8 @@ discard block |
||
| 237 | 237 | $locator = new \OC\Template\JSResourceLocator( |
| 238 | 238 | \OC::$server->getLogger(), |
| 239 | 239 | $theme, |
| 240 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 241 | - array( \OC::$SERVERROOT => \OC::$WEBROOT ), |
|
| 240 | + array(\OC::$SERVERROOT => \OC::$WEBROOT), |
|
| 241 | + array(\OC::$SERVERROOT => \OC::$WEBROOT), |
|
| 242 | 242 | new JSCombiner( |
| 243 | 243 | \OC::$server->getAppDataDir('js'), |
| 244 | 244 | \OC::$server->getURLGenerator(), |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | */ |
| 259 | 259 | public static function convertToRelativePath($filePath) { |
| 260 | 260 | $relativePath = explode(\OC::$SERVERROOT, $filePath); |
| 261 | - if(count($relativePath) !== 2) { |
|
| 261 | + if (count($relativePath) !== 2) { |
|
| 262 | 262 | throw new \Exception('$filePath is not under the \OC::$SERVERROOT'); |
| 263 | 263 | } |
| 264 | 264 | |
@@ -66,12 +66,12 @@ |
||
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $defaultBundle = $this->bundleFetcher->getDefaultInstallationBundle(); |
| 69 | - foreach($defaultBundle as $bundle) { |
|
| 69 | + foreach ($defaultBundle as $bundle) { |
|
| 70 | 70 | try { |
| 71 | 71 | $this->installer->installAppBundle($bundle); |
| 72 | 72 | $output->info('Successfully installed core app bundle.'); |
| 73 | 73 | } catch (\Exception $e) { |
| 74 | - $output->warning('Could not install core app bundle:' . $e->getMessage()); |
|
| 74 | + $output->warning('Could not install core app bundle:'.$e->getMessage()); |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class); |
| 138 | 138 | $this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class); |
| 139 | 139 | |
| 140 | - $this->registerService(\OCP\IPreview::class, function (Server $c) { |
|
| 140 | + $this->registerService(\OCP\IPreview::class, function(Server $c) { |
|
| 141 | 141 | return new PreviewManager( |
| 142 | 142 | $c->getConfig(), |
| 143 | 143 | $c->getRootFolder(), |
@@ -148,13 +148,13 @@ discard block |
||
| 148 | 148 | }); |
| 149 | 149 | $this->registerAlias('PreviewManager', \OCP\IPreview::class); |
| 150 | 150 | |
| 151 | - $this->registerService(\OC\Preview\Watcher::class, function (Server $c) { |
|
| 151 | + $this->registerService(\OC\Preview\Watcher::class, function(Server $c) { |
|
| 152 | 152 | return new \OC\Preview\Watcher( |
| 153 | 153 | $c->getAppDataDir('preview') |
| 154 | 154 | ); |
| 155 | 155 | }); |
| 156 | 156 | |
| 157 | - $this->registerService('EncryptionManager', function (Server $c) { |
|
| 157 | + $this->registerService('EncryptionManager', function(Server $c) { |
|
| 158 | 158 | $view = new View(); |
| 159 | 159 | $util = new Encryption\Util( |
| 160 | 160 | $view, |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | ); |
| 173 | 173 | }); |
| 174 | 174 | |
| 175 | - $this->registerService('EncryptionFileHelper', function (Server $c) { |
|
| 175 | + $this->registerService('EncryptionFileHelper', function(Server $c) { |
|
| 176 | 176 | $util = new Encryption\Util( |
| 177 | 177 | new View(), |
| 178 | 178 | $c->getUserManager(), |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | ); |
| 187 | 187 | }); |
| 188 | 188 | |
| 189 | - $this->registerService('EncryptionKeyStorage', function (Server $c) { |
|
| 189 | + $this->registerService('EncryptionKeyStorage', function(Server $c) { |
|
| 190 | 190 | $view = new View(); |
| 191 | 191 | $util = new Encryption\Util( |
| 192 | 192 | $view, |
@@ -197,32 +197,32 @@ discard block |
||
| 197 | 197 | |
| 198 | 198 | return new Encryption\Keys\Storage($view, $util); |
| 199 | 199 | }); |
| 200 | - $this->registerService('TagMapper', function (Server $c) { |
|
| 200 | + $this->registerService('TagMapper', function(Server $c) { |
|
| 201 | 201 | return new TagMapper($c->getDatabaseConnection()); |
| 202 | 202 | }); |
| 203 | 203 | |
| 204 | - $this->registerService(\OCP\ITagManager::class, function (Server $c) { |
|
| 204 | + $this->registerService(\OCP\ITagManager::class, function(Server $c) { |
|
| 205 | 205 | $tagMapper = $c->query('TagMapper'); |
| 206 | 206 | return new TagManager($tagMapper, $c->getUserSession()); |
| 207 | 207 | }); |
| 208 | 208 | $this->registerAlias('TagManager', \OCP\ITagManager::class); |
| 209 | 209 | |
| 210 | - $this->registerService('SystemTagManagerFactory', function (Server $c) { |
|
| 210 | + $this->registerService('SystemTagManagerFactory', function(Server $c) { |
|
| 211 | 211 | $config = $c->getConfig(); |
| 212 | 212 | $factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory'); |
| 213 | 213 | /** @var \OC\SystemTag\ManagerFactory $factory */ |
| 214 | 214 | $factory = new $factoryClass($this); |
| 215 | 215 | return $factory; |
| 216 | 216 | }); |
| 217 | - $this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) { |
|
| 217 | + $this->registerService(\OCP\SystemTag\ISystemTagManager::class, function(Server $c) { |
|
| 218 | 218 | return $c->query('SystemTagManagerFactory')->getManager(); |
| 219 | 219 | }); |
| 220 | 220 | $this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class); |
| 221 | 221 | |
| 222 | - $this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) { |
|
| 222 | + $this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function(Server $c) { |
|
| 223 | 223 | return $c->query('SystemTagManagerFactory')->getObjectMapper(); |
| 224 | 224 | }); |
| 225 | - $this->registerService('RootFolder', function (Server $c) { |
|
| 225 | + $this->registerService('RootFolder', function(Server $c) { |
|
| 226 | 226 | $manager = \OC\Files\Filesystem::getMountManager(null); |
| 227 | 227 | $view = new View(); |
| 228 | 228 | $root = new Root( |
@@ -250,30 +250,30 @@ discard block |
||
| 250 | 250 | }); |
| 251 | 251 | $this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class); |
| 252 | 252 | |
| 253 | - $this->registerService(\OCP\IUserManager::class, function (Server $c) { |
|
| 253 | + $this->registerService(\OCP\IUserManager::class, function(Server $c) { |
|
| 254 | 254 | $config = $c->getConfig(); |
| 255 | 255 | return new \OC\User\Manager($config); |
| 256 | 256 | }); |
| 257 | 257 | $this->registerAlias('UserManager', \OCP\IUserManager::class); |
| 258 | 258 | |
| 259 | - $this->registerService(\OCP\IGroupManager::class, function (Server $c) { |
|
| 259 | + $this->registerService(\OCP\IGroupManager::class, function(Server $c) { |
|
| 260 | 260 | $groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger()); |
| 261 | - $groupManager->listen('\OC\Group', 'preCreate', function ($gid) { |
|
| 261 | + $groupManager->listen('\OC\Group', 'preCreate', function($gid) { |
|
| 262 | 262 | \OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid)); |
| 263 | 263 | }); |
| 264 | - $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) { |
|
| 264 | + $groupManager->listen('\OC\Group', 'postCreate', function(\OC\Group\Group $gid) { |
|
| 265 | 265 | \OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID())); |
| 266 | 266 | }); |
| 267 | - $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) { |
|
| 267 | + $groupManager->listen('\OC\Group', 'preDelete', function(\OC\Group\Group $group) { |
|
| 268 | 268 | \OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID())); |
| 269 | 269 | }); |
| 270 | - $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) { |
|
| 270 | + $groupManager->listen('\OC\Group', 'postDelete', function(\OC\Group\Group $group) { |
|
| 271 | 271 | \OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID())); |
| 272 | 272 | }); |
| 273 | - $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
| 273 | + $groupManager->listen('\OC\Group', 'preAddUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
| 274 | 274 | \OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID())); |
| 275 | 275 | }); |
| 276 | - $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
| 276 | + $groupManager->listen('\OC\Group', 'postAddUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
| 277 | 277 | \OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID())); |
| 278 | 278 | //Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks |
| 279 | 279 | \OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID())); |
@@ -293,11 +293,11 @@ discard block |
||
| 293 | 293 | return new Store($session, $logger, $tokenProvider); |
| 294 | 294 | }); |
| 295 | 295 | $this->registerAlias(IStore::class, Store::class); |
| 296 | - $this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) { |
|
| 296 | + $this->registerService('OC\Authentication\Token\DefaultTokenMapper', function(Server $c) { |
|
| 297 | 297 | $dbConnection = $c->getDatabaseConnection(); |
| 298 | 298 | return new Authentication\Token\DefaultTokenMapper($dbConnection); |
| 299 | 299 | }); |
| 300 | - $this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) { |
|
| 300 | + $this->registerService('OC\Authentication\Token\DefaultTokenProvider', function(Server $c) { |
|
| 301 | 301 | $mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper'); |
| 302 | 302 | $crypto = $c->getCrypto(); |
| 303 | 303 | $config = $c->getConfig(); |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | }); |
| 308 | 308 | $this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider'); |
| 309 | 309 | |
| 310 | - $this->registerService(\OCP\IUserSession::class, function (Server $c) { |
|
| 310 | + $this->registerService(\OCP\IUserSession::class, function(Server $c) { |
|
| 311 | 311 | $manager = $c->getUserManager(); |
| 312 | 312 | $session = new \OC\Session\Memory(''); |
| 313 | 313 | $timeFactory = new TimeFactory(); |
@@ -320,40 +320,40 @@ discard block |
||
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | $userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom(), $c->getLockdownManager()); |
| 323 | - $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { |
|
| 323 | + $userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) { |
|
| 324 | 324 | \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password)); |
| 325 | 325 | }); |
| 326 | - $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) { |
|
| 326 | + $userSession->listen('\OC\User', 'postCreateUser', function($user, $password) { |
|
| 327 | 327 | /** @var $user \OC\User\User */ |
| 328 | 328 | \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password)); |
| 329 | 329 | }); |
| 330 | - $userSession->listen('\OC\User', 'preDelete', function ($user) { |
|
| 330 | + $userSession->listen('\OC\User', 'preDelete', function($user) { |
|
| 331 | 331 | /** @var $user \OC\User\User */ |
| 332 | 332 | \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID())); |
| 333 | 333 | }); |
| 334 | - $userSession->listen('\OC\User', 'postDelete', function ($user) { |
|
| 334 | + $userSession->listen('\OC\User', 'postDelete', function($user) { |
|
| 335 | 335 | /** @var $user \OC\User\User */ |
| 336 | 336 | \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID())); |
| 337 | 337 | }); |
| 338 | - $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) { |
|
| 338 | + $userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) { |
|
| 339 | 339 | /** @var $user \OC\User\User */ |
| 340 | 340 | \OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword)); |
| 341 | 341 | }); |
| 342 | - $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) { |
|
| 342 | + $userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) { |
|
| 343 | 343 | /** @var $user \OC\User\User */ |
| 344 | 344 | \OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword)); |
| 345 | 345 | }); |
| 346 | - $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) { |
|
| 346 | + $userSession->listen('\OC\User', 'preLogin', function($uid, $password) { |
|
| 347 | 347 | \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password)); |
| 348 | 348 | }); |
| 349 | - $userSession->listen('\OC\User', 'postLogin', function ($user, $password) { |
|
| 349 | + $userSession->listen('\OC\User', 'postLogin', function($user, $password) { |
|
| 350 | 350 | /** @var $user \OC\User\User */ |
| 351 | 351 | \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password)); |
| 352 | 352 | }); |
| 353 | - $userSession->listen('\OC\User', 'logout', function () { |
|
| 353 | + $userSession->listen('\OC\User', 'logout', function() { |
|
| 354 | 354 | \OC_Hook::emit('OC_User', 'logout', array()); |
| 355 | 355 | }); |
| 356 | - $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) { |
|
| 356 | + $userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value, $oldValue) { |
|
| 357 | 357 | /** @var $user \OC\User\User */ |
| 358 | 358 | \OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue)); |
| 359 | 359 | }); |
@@ -361,14 +361,14 @@ discard block |
||
| 361 | 361 | }); |
| 362 | 362 | $this->registerAlias('UserSession', \OCP\IUserSession::class); |
| 363 | 363 | |
| 364 | - $this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) { |
|
| 364 | + $this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function(Server $c) { |
|
| 365 | 365 | return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger()); |
| 366 | 366 | }); |
| 367 | 367 | |
| 368 | 368 | $this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class); |
| 369 | 369 | $this->registerAlias('NavigationManager', \OCP\INavigationManager::class); |
| 370 | 370 | |
| 371 | - $this->registerService(\OC\AllConfig::class, function (Server $c) { |
|
| 371 | + $this->registerService(\OC\AllConfig::class, function(Server $c) { |
|
| 372 | 372 | return new \OC\AllConfig( |
| 373 | 373 | $c->getSystemConfig() |
| 374 | 374 | ); |
@@ -376,17 +376,17 @@ discard block |
||
| 376 | 376 | $this->registerAlias('AllConfig', \OC\AllConfig::class); |
| 377 | 377 | $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class); |
| 378 | 378 | |
| 379 | - $this->registerService('SystemConfig', function ($c) use ($config) { |
|
| 379 | + $this->registerService('SystemConfig', function($c) use ($config) { |
|
| 380 | 380 | return new \OC\SystemConfig($config); |
| 381 | 381 | }); |
| 382 | 382 | |
| 383 | - $this->registerService(\OC\AppConfig::class, function (Server $c) { |
|
| 383 | + $this->registerService(\OC\AppConfig::class, function(Server $c) { |
|
| 384 | 384 | return new \OC\AppConfig($c->getDatabaseConnection()); |
| 385 | 385 | }); |
| 386 | 386 | $this->registerAlias('AppConfig', \OC\AppConfig::class); |
| 387 | 387 | $this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class); |
| 388 | 388 | |
| 389 | - $this->registerService(\OCP\L10N\IFactory::class, function (Server $c) { |
|
| 389 | + $this->registerService(\OCP\L10N\IFactory::class, function(Server $c) { |
|
| 390 | 390 | return new \OC\L10N\Factory( |
| 391 | 391 | $c->getConfig(), |
| 392 | 392 | $c->getRequest(), |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | }); |
| 397 | 397 | $this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class); |
| 398 | 398 | |
| 399 | - $this->registerService(\OCP\IURLGenerator::class, function (Server $c) { |
|
| 399 | + $this->registerService(\OCP\IURLGenerator::class, function(Server $c) { |
|
| 400 | 400 | $config = $c->getConfig(); |
| 401 | 401 | $cacheFactory = $c->getMemCacheFactory(); |
| 402 | 402 | return new \OC\URLGenerator( |
@@ -406,10 +406,10 @@ discard block |
||
| 406 | 406 | }); |
| 407 | 407 | $this->registerAlias('URLGenerator', \OCP\IURLGenerator::class); |
| 408 | 408 | |
| 409 | - $this->registerService('AppHelper', function ($c) { |
|
| 409 | + $this->registerService('AppHelper', function($c) { |
|
| 410 | 410 | return new \OC\AppHelper(); |
| 411 | 411 | }); |
| 412 | - $this->registerService('AppFetcher', function ($c) { |
|
| 412 | + $this->registerService('AppFetcher', function($c) { |
|
| 413 | 413 | return new AppFetcher( |
| 414 | 414 | $this->getAppDataDir('appstore'), |
| 415 | 415 | $this->getHTTPClientService(), |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | $this->getConfig() |
| 418 | 418 | ); |
| 419 | 419 | }); |
| 420 | - $this->registerService('CategoryFetcher', function ($c) { |
|
| 420 | + $this->registerService('CategoryFetcher', function($c) { |
|
| 421 | 421 | return new CategoryFetcher( |
| 422 | 422 | $this->getAppDataDir('appstore'), |
| 423 | 423 | $this->getHTTPClientService(), |
@@ -426,21 +426,21 @@ discard block |
||
| 426 | 426 | ); |
| 427 | 427 | }); |
| 428 | 428 | |
| 429 | - $this->registerService(\OCP\ICache::class, function ($c) { |
|
| 429 | + $this->registerService(\OCP\ICache::class, function($c) { |
|
| 430 | 430 | return new Cache\File(); |
| 431 | 431 | }); |
| 432 | 432 | $this->registerAlias('UserCache', \OCP\ICache::class); |
| 433 | 433 | |
| 434 | - $this->registerService(Factory::class, function (Server $c) { |
|
| 434 | + $this->registerService(Factory::class, function(Server $c) { |
|
| 435 | 435 | $config = $c->getConfig(); |
| 436 | 436 | |
| 437 | 437 | if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { |
| 438 | 438 | $v = \OC_App::getAppVersions(); |
| 439 | - $v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php')); |
|
| 439 | + $v['core'] = md5(file_get_contents(\OC::$SERVERROOT.'/version.php')); |
|
| 440 | 440 | $version = implode(',', $v); |
| 441 | 441 | $instanceId = \OC_Util::getInstanceId(); |
| 442 | 442 | $path = \OC::$SERVERROOT; |
| 443 | - $prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . \OC::$WEBROOT); |
|
| 443 | + $prefix = md5($instanceId.'-'.$version.'-'.$path.'-'.\OC::$WEBROOT); |
|
| 444 | 444 | return new \OC\Memcache\Factory($prefix, $c->getLogger(), |
| 445 | 445 | $config->getSystemValue('memcache.local', null), |
| 446 | 446 | $config->getSystemValue('memcache.distributed', null), |
@@ -457,12 +457,12 @@ discard block |
||
| 457 | 457 | $this->registerAlias('MemCacheFactory', Factory::class); |
| 458 | 458 | $this->registerAlias(ICacheFactory::class, Factory::class); |
| 459 | 459 | |
| 460 | - $this->registerService('RedisFactory', function (Server $c) { |
|
| 460 | + $this->registerService('RedisFactory', function(Server $c) { |
|
| 461 | 461 | $systemConfig = $c->getSystemConfig(); |
| 462 | 462 | return new RedisFactory($systemConfig); |
| 463 | 463 | }); |
| 464 | 464 | |
| 465 | - $this->registerService(\OCP\Activity\IManager::class, function (Server $c) { |
|
| 465 | + $this->registerService(\OCP\Activity\IManager::class, function(Server $c) { |
|
| 466 | 466 | return new \OC\Activity\Manager( |
| 467 | 467 | $c->getRequest(), |
| 468 | 468 | $c->getUserSession(), |
@@ -472,14 +472,14 @@ discard block |
||
| 472 | 472 | }); |
| 473 | 473 | $this->registerAlias('ActivityManager', \OCP\Activity\IManager::class); |
| 474 | 474 | |
| 475 | - $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) { |
|
| 475 | + $this->registerService(\OCP\Activity\IEventMerger::class, function(Server $c) { |
|
| 476 | 476 | return new \OC\Activity\EventMerger( |
| 477 | 477 | $c->getL10N('lib') |
| 478 | 478 | ); |
| 479 | 479 | }); |
| 480 | 480 | $this->registerAlias(IValidator::class, Validator::class); |
| 481 | 481 | |
| 482 | - $this->registerService(\OCP\IAvatarManager::class, function (Server $c) { |
|
| 482 | + $this->registerService(\OCP\IAvatarManager::class, function(Server $c) { |
|
| 483 | 483 | return new AvatarManager( |
| 484 | 484 | $c->getUserManager(), |
| 485 | 485 | $c->getAppDataDir('avatar'), |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | }); |
| 491 | 491 | $this->registerAlias('AvatarManager', \OCP\IAvatarManager::class); |
| 492 | 492 | |
| 493 | - $this->registerService(\OCP\ILogger::class, function (Server $c) { |
|
| 493 | + $this->registerService(\OCP\ILogger::class, function(Server $c) { |
|
| 494 | 494 | $logType = $c->query('AllConfig')->getSystemValue('log_type', 'file'); |
| 495 | 495 | $logger = Log::getLogClass($logType); |
| 496 | 496 | call_user_func(array($logger, 'init')); |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | }); |
| 500 | 500 | $this->registerAlias('Logger', \OCP\ILogger::class); |
| 501 | 501 | |
| 502 | - $this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) { |
|
| 502 | + $this->registerService(\OCP\BackgroundJob\IJobList::class, function(Server $c) { |
|
| 503 | 503 | $config = $c->getConfig(); |
| 504 | 504 | return new \OC\BackgroundJob\JobList( |
| 505 | 505 | $c->getDatabaseConnection(), |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | }); |
| 510 | 510 | $this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class); |
| 511 | 511 | |
| 512 | - $this->registerService(\OCP\Route\IRouter::class, function (Server $c) { |
|
| 512 | + $this->registerService(\OCP\Route\IRouter::class, function(Server $c) { |
|
| 513 | 513 | $cacheFactory = $c->getMemCacheFactory(); |
| 514 | 514 | $logger = $c->getLogger(); |
| 515 | 515 | if ($cacheFactory->isAvailable()) { |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | }); |
| 522 | 522 | $this->registerAlias('Router', \OCP\Route\IRouter::class); |
| 523 | 523 | |
| 524 | - $this->registerService(\OCP\ISearch::class, function ($c) { |
|
| 524 | + $this->registerService(\OCP\ISearch::class, function($c) { |
|
| 525 | 525 | return new Search(); |
| 526 | 526 | }); |
| 527 | 527 | $this->registerAlias('Search', \OCP\ISearch::class); |
@@ -541,27 +541,27 @@ discard block |
||
| 541 | 541 | ); |
| 542 | 542 | }); |
| 543 | 543 | |
| 544 | - $this->registerService(\OCP\Security\ISecureRandom::class, function ($c) { |
|
| 544 | + $this->registerService(\OCP\Security\ISecureRandom::class, function($c) { |
|
| 545 | 545 | return new SecureRandom(); |
| 546 | 546 | }); |
| 547 | 547 | $this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class); |
| 548 | 548 | |
| 549 | - $this->registerService(\OCP\Security\ICrypto::class, function (Server $c) { |
|
| 549 | + $this->registerService(\OCP\Security\ICrypto::class, function(Server $c) { |
|
| 550 | 550 | return new Crypto($c->getConfig(), $c->getSecureRandom()); |
| 551 | 551 | }); |
| 552 | 552 | $this->registerAlias('Crypto', \OCP\Security\ICrypto::class); |
| 553 | 553 | |
| 554 | - $this->registerService(\OCP\Security\IHasher::class, function (Server $c) { |
|
| 554 | + $this->registerService(\OCP\Security\IHasher::class, function(Server $c) { |
|
| 555 | 555 | return new Hasher($c->getConfig()); |
| 556 | 556 | }); |
| 557 | 557 | $this->registerAlias('Hasher', \OCP\Security\IHasher::class); |
| 558 | 558 | |
| 559 | - $this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) { |
|
| 559 | + $this->registerService(\OCP\Security\ICredentialsManager::class, function(Server $c) { |
|
| 560 | 560 | return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection()); |
| 561 | 561 | }); |
| 562 | 562 | $this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class); |
| 563 | 563 | |
| 564 | - $this->registerService(IDBConnection::class, function (Server $c) { |
|
| 564 | + $this->registerService(IDBConnection::class, function(Server $c) { |
|
| 565 | 565 | $systemConfig = $c->getSystemConfig(); |
| 566 | 566 | $factory = new \OC\DB\ConnectionFactory($systemConfig); |
| 567 | 567 | $type = $systemConfig->getValue('dbtype', 'sqlite'); |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | }); |
| 576 | 576 | $this->registerAlias('DatabaseConnection', IDBConnection::class); |
| 577 | 577 | |
| 578 | - $this->registerService('HTTPHelper', function (Server $c) { |
|
| 578 | + $this->registerService('HTTPHelper', function(Server $c) { |
|
| 579 | 579 | $config = $c->getConfig(); |
| 580 | 580 | return new HTTPHelper( |
| 581 | 581 | $config, |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | ); |
| 584 | 584 | }); |
| 585 | 585 | |
| 586 | - $this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) { |
|
| 586 | + $this->registerService(\OCP\Http\Client\IClientService::class, function(Server $c) { |
|
| 587 | 587 | $user = \OC_User::getUser(); |
| 588 | 588 | $uid = $user ? $user : null; |
| 589 | 589 | return new ClientService( |
@@ -593,7 +593,7 @@ discard block |
||
| 593 | 593 | }); |
| 594 | 594 | $this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class); |
| 595 | 595 | |
| 596 | - $this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) { |
|
| 596 | + $this->registerService(\OCP\Diagnostics\IEventLogger::class, function(Server $c) { |
|
| 597 | 597 | if ($c->getSystemConfig()->getValue('debug', false)) { |
| 598 | 598 | return new EventLogger(); |
| 599 | 599 | } else { |
@@ -602,7 +602,7 @@ discard block |
||
| 602 | 602 | }); |
| 603 | 603 | $this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class); |
| 604 | 604 | |
| 605 | - $this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) { |
|
| 605 | + $this->registerService(\OCP\Diagnostics\IQueryLogger::class, function(Server $c) { |
|
| 606 | 606 | if ($c->getSystemConfig()->getValue('debug', false)) { |
| 607 | 607 | return new QueryLogger(); |
| 608 | 608 | } else { |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | }); |
| 612 | 612 | $this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class); |
| 613 | 613 | |
| 614 | - $this->registerService(TempManager::class, function (Server $c) { |
|
| 614 | + $this->registerService(TempManager::class, function(Server $c) { |
|
| 615 | 615 | return new TempManager( |
| 616 | 616 | $c->getLogger(), |
| 617 | 617 | $c->getConfig() |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | $this->registerAlias('TempManager', TempManager::class); |
| 621 | 621 | $this->registerAlias(ITempManager::class, TempManager::class); |
| 622 | 622 | |
| 623 | - $this->registerService(AppManager::class, function (Server $c) { |
|
| 623 | + $this->registerService(AppManager::class, function(Server $c) { |
|
| 624 | 624 | return new \OC\App\AppManager( |
| 625 | 625 | $c->getUserSession(), |
| 626 | 626 | $c->getAppConfig(), |
@@ -632,7 +632,7 @@ discard block |
||
| 632 | 632 | $this->registerAlias('AppManager', AppManager::class); |
| 633 | 633 | $this->registerAlias(IAppManager::class, AppManager::class); |
| 634 | 634 | |
| 635 | - $this->registerService(\OCP\IDateTimeZone::class, function (Server $c) { |
|
| 635 | + $this->registerService(\OCP\IDateTimeZone::class, function(Server $c) { |
|
| 636 | 636 | return new DateTimeZone( |
| 637 | 637 | $c->getConfig(), |
| 638 | 638 | $c->getSession() |
@@ -640,7 +640,7 @@ discard block |
||
| 640 | 640 | }); |
| 641 | 641 | $this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class); |
| 642 | 642 | |
| 643 | - $this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) { |
|
| 643 | + $this->registerService(\OCP\IDateTimeFormatter::class, function(Server $c) { |
|
| 644 | 644 | $language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null); |
| 645 | 645 | |
| 646 | 646 | return new DateTimeFormatter( |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | }); |
| 651 | 651 | $this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class); |
| 652 | 652 | |
| 653 | - $this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) { |
|
| 653 | + $this->registerService(\OCP\Files\Config\IUserMountCache::class, function(Server $c) { |
|
| 654 | 654 | $mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger()); |
| 655 | 655 | $listener = new UserMountCacheListener($mountCache); |
| 656 | 656 | $listener->listen($c->getUserManager()); |
@@ -658,10 +658,10 @@ discard block |
||
| 658 | 658 | }); |
| 659 | 659 | $this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class); |
| 660 | 660 | |
| 661 | - $this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) { |
|
| 661 | + $this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function(Server $c) { |
|
| 662 | 662 | $loader = \OC\Files\Filesystem::getLoader(); |
| 663 | 663 | $mountCache = $c->query('UserMountCache'); |
| 664 | - $manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache); |
|
| 664 | + $manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache); |
|
| 665 | 665 | |
| 666 | 666 | // builtin providers |
| 667 | 667 | |
@@ -674,14 +674,14 @@ discard block |
||
| 674 | 674 | }); |
| 675 | 675 | $this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class); |
| 676 | 676 | |
| 677 | - $this->registerService('IniWrapper', function ($c) { |
|
| 677 | + $this->registerService('IniWrapper', function($c) { |
|
| 678 | 678 | return new IniGetWrapper(); |
| 679 | 679 | }); |
| 680 | - $this->registerService('AsyncCommandBus', function (Server $c) { |
|
| 680 | + $this->registerService('AsyncCommandBus', function(Server $c) { |
|
| 681 | 681 | $jobList = $c->getJobList(); |
| 682 | 682 | return new AsyncBus($jobList); |
| 683 | 683 | }); |
| 684 | - $this->registerService('TrustedDomainHelper', function ($c) { |
|
| 684 | + $this->registerService('TrustedDomainHelper', function($c) { |
|
| 685 | 685 | return new TrustedDomainHelper($this->getConfig()); |
| 686 | 686 | }); |
| 687 | 687 | $this->registerService('Throttler', function(Server $c) { |
@@ -692,10 +692,10 @@ discard block |
||
| 692 | 692 | $c->getConfig() |
| 693 | 693 | ); |
| 694 | 694 | }); |
| 695 | - $this->registerService('IntegrityCodeChecker', function (Server $c) { |
|
| 695 | + $this->registerService('IntegrityCodeChecker', function(Server $c) { |
|
| 696 | 696 | // IConfig and IAppManager requires a working database. This code |
| 697 | 697 | // might however be called when ownCloud is not yet setup. |
| 698 | - if(\OC::$server->getSystemConfig()->getValue('installed', false)) { |
|
| 698 | + if (\OC::$server->getSystemConfig()->getValue('installed', false)) { |
|
| 699 | 699 | $config = $c->getConfig(); |
| 700 | 700 | $appManager = $c->getAppManager(); |
| 701 | 701 | } else { |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | $c->getTempManager() |
| 714 | 714 | ); |
| 715 | 715 | }); |
| 716 | - $this->registerService(\OCP\IRequest::class, function ($c) { |
|
| 716 | + $this->registerService(\OCP\IRequest::class, function($c) { |
|
| 717 | 717 | if (isset($this['urlParams'])) { |
| 718 | 718 | $urlParams = $this['urlParams']; |
| 719 | 719 | } else { |
@@ -749,7 +749,7 @@ discard block |
||
| 749 | 749 | }); |
| 750 | 750 | $this->registerAlias('Request', \OCP\IRequest::class); |
| 751 | 751 | |
| 752 | - $this->registerService(\OCP\Mail\IMailer::class, function (Server $c) { |
|
| 752 | + $this->registerService(\OCP\Mail\IMailer::class, function(Server $c) { |
|
| 753 | 753 | return new Mailer( |
| 754 | 754 | $c->getConfig(), |
| 755 | 755 | $c->getLogger(), |
@@ -763,14 +763,14 @@ discard block |
||
| 763 | 763 | $this->registerService('LDAPProvider', function(Server $c) { |
| 764 | 764 | $config = $c->getConfig(); |
| 765 | 765 | $factoryClass = $config->getSystemValue('ldapProviderFactory', null); |
| 766 | - if(is_null($factoryClass)) { |
|
| 766 | + if (is_null($factoryClass)) { |
|
| 767 | 767 | throw new \Exception('ldapProviderFactory not set'); |
| 768 | 768 | } |
| 769 | 769 | /** @var \OCP\LDAP\ILDAPProviderFactory $factory */ |
| 770 | 770 | $factory = new $factoryClass($this); |
| 771 | 771 | return $factory->getLDAPProvider(); |
| 772 | 772 | }); |
| 773 | - $this->registerService('LockingProvider', function (Server $c) { |
|
| 773 | + $this->registerService('LockingProvider', function(Server $c) { |
|
| 774 | 774 | $ini = $c->getIniWrapper(); |
| 775 | 775 | $config = $c->getConfig(); |
| 776 | 776 | $ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time'))); |
@@ -786,42 +786,42 @@ discard block |
||
| 786 | 786 | return new NoopLockingProvider(); |
| 787 | 787 | }); |
| 788 | 788 | |
| 789 | - $this->registerService(\OCP\Files\Mount\IMountManager::class, function () { |
|
| 789 | + $this->registerService(\OCP\Files\Mount\IMountManager::class, function() { |
|
| 790 | 790 | return new \OC\Files\Mount\Manager(); |
| 791 | 791 | }); |
| 792 | 792 | $this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class); |
| 793 | 793 | |
| 794 | - $this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) { |
|
| 794 | + $this->registerService(\OCP\Files\IMimeTypeDetector::class, function(Server $c) { |
|
| 795 | 795 | return new \OC\Files\Type\Detection( |
| 796 | 796 | $c->getURLGenerator(), |
| 797 | 797 | \OC::$configDir, |
| 798 | - \OC::$SERVERROOT . '/resources/config/' |
|
| 798 | + \OC::$SERVERROOT.'/resources/config/' |
|
| 799 | 799 | ); |
| 800 | 800 | }); |
| 801 | 801 | $this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class); |
| 802 | 802 | |
| 803 | - $this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) { |
|
| 803 | + $this->registerService(\OCP\Files\IMimeTypeLoader::class, function(Server $c) { |
|
| 804 | 804 | return new \OC\Files\Type\Loader( |
| 805 | 805 | $c->getDatabaseConnection() |
| 806 | 806 | ); |
| 807 | 807 | }); |
| 808 | 808 | $this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class); |
| 809 | - $this->registerService(BundleFetcher::class, function () { |
|
| 809 | + $this->registerService(BundleFetcher::class, function() { |
|
| 810 | 810 | return new BundleFetcher($this->getL10N('lib')); |
| 811 | 811 | }); |
| 812 | 812 | $this->registerService(AppFetcher::class, function() { |
| 813 | 813 | return $this->getAppFetcher(); |
| 814 | 814 | }); |
| 815 | - $this->registerService(\OCP\Notification\IManager::class, function (Server $c) { |
|
| 815 | + $this->registerService(\OCP\Notification\IManager::class, function(Server $c) { |
|
| 816 | 816 | return new Manager( |
| 817 | 817 | $c->query(IValidator::class) |
| 818 | 818 | ); |
| 819 | 819 | }); |
| 820 | 820 | $this->registerAlias('NotificationManager', \OCP\Notification\IManager::class); |
| 821 | 821 | |
| 822 | - $this->registerService(\OC\CapabilitiesManager::class, function (Server $c) { |
|
| 822 | + $this->registerService(\OC\CapabilitiesManager::class, function(Server $c) { |
|
| 823 | 823 | $manager = new \OC\CapabilitiesManager($c->getLogger()); |
| 824 | - $manager->registerCapability(function () use ($c) { |
|
| 824 | + $manager->registerCapability(function() use ($c) { |
|
| 825 | 825 | return new \OC\OCS\CoreCapabilities($c->getConfig()); |
| 826 | 826 | }); |
| 827 | 827 | return $manager; |
@@ -877,13 +877,13 @@ discard block |
||
| 877 | 877 | $cacheFactory->createLocal('SCSS') |
| 878 | 878 | ); |
| 879 | 879 | }); |
| 880 | - $this->registerService(EventDispatcher::class, function () { |
|
| 880 | + $this->registerService(EventDispatcher::class, function() { |
|
| 881 | 881 | return new EventDispatcher(); |
| 882 | 882 | }); |
| 883 | 883 | $this->registerAlias('EventDispatcher', EventDispatcher::class); |
| 884 | 884 | $this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class); |
| 885 | 885 | |
| 886 | - $this->registerService('CryptoWrapper', function (Server $c) { |
|
| 886 | + $this->registerService('CryptoWrapper', function(Server $c) { |
|
| 887 | 887 | // FIXME: Instantiiated here due to cyclic dependency |
| 888 | 888 | $request = new Request( |
| 889 | 889 | [ |
@@ -908,7 +908,7 @@ discard block |
||
| 908 | 908 | $request |
| 909 | 909 | ); |
| 910 | 910 | }); |
| 911 | - $this->registerService('CsrfTokenManager', function (Server $c) { |
|
| 911 | + $this->registerService('CsrfTokenManager', function(Server $c) { |
|
| 912 | 912 | $tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom()); |
| 913 | 913 | |
| 914 | 914 | return new CsrfTokenManager( |
@@ -916,10 +916,10 @@ discard block |
||
| 916 | 916 | $c->query(SessionStorage::class) |
| 917 | 917 | ); |
| 918 | 918 | }); |
| 919 | - $this->registerService(SessionStorage::class, function (Server $c) { |
|
| 919 | + $this->registerService(SessionStorage::class, function(Server $c) { |
|
| 920 | 920 | return new SessionStorage($c->getSession()); |
| 921 | 921 | }); |
| 922 | - $this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) { |
|
| 922 | + $this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function(Server $c) { |
|
| 923 | 923 | return new ContentSecurityPolicyManager(); |
| 924 | 924 | }); |
| 925 | 925 | $this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class); |
@@ -970,29 +970,29 @@ discard block |
||
| 970 | 970 | ); |
| 971 | 971 | return $manager; |
| 972 | 972 | }); |
| 973 | - $this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) { |
|
| 973 | + $this->registerService(\OC\Files\AppData\Factory::class, function(Server $c) { |
|
| 974 | 974 | return new \OC\Files\AppData\Factory( |
| 975 | 975 | $c->getRootFolder(), |
| 976 | 976 | $c->getSystemConfig() |
| 977 | 977 | ); |
| 978 | 978 | }); |
| 979 | 979 | |
| 980 | - $this->registerService('LockdownManager', function (Server $c) { |
|
| 980 | + $this->registerService('LockdownManager', function(Server $c) { |
|
| 981 | 981 | return new LockdownManager(function() use ($c) { |
| 982 | 982 | return $c->getSession(); |
| 983 | 983 | }); |
| 984 | 984 | }); |
| 985 | 985 | |
| 986 | - $this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) { |
|
| 986 | + $this->registerService(\OCP\OCS\IDiscoveryService::class, function(Server $c) { |
|
| 987 | 987 | return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService()); |
| 988 | 988 | }); |
| 989 | 989 | |
| 990 | - $this->registerService(ICloudIdManager::class, function (Server $c) { |
|
| 990 | + $this->registerService(ICloudIdManager::class, function(Server $c) { |
|
| 991 | 991 | return new CloudIdManager(); |
| 992 | 992 | }); |
| 993 | 993 | |
| 994 | 994 | /* To trick DI since we don't extend the DIContainer here */ |
| 995 | - $this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) { |
|
| 995 | + $this->registerService(CleanPreviewsBackgroundJob::class, function(Server $c) { |
|
| 996 | 996 | return new CleanPreviewsBackgroundJob( |
| 997 | 997 | $c->getRootFolder(), |
| 998 | 998 | $c->getLogger(), |
@@ -1007,7 +1007,7 @@ discard block |
||
| 1007 | 1007 | $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class); |
| 1008 | 1008 | $this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class); |
| 1009 | 1009 | |
| 1010 | - $this->registerService(Defaults::class, function (Server $c) { |
|
| 1010 | + $this->registerService(Defaults::class, function(Server $c) { |
|
| 1011 | 1011 | return new Defaults( |
| 1012 | 1012 | $c->getThemingDefaults() |
| 1013 | 1013 | ); |
@@ -1159,7 +1159,7 @@ discard block |
||
| 1159 | 1159 | * @deprecated since 9.2.0 use IAppData |
| 1160 | 1160 | */ |
| 1161 | 1161 | public function getAppFolder() { |
| 1162 | - $dir = '/' . \OC_App::getCurrentApp(); |
|
| 1162 | + $dir = '/'.\OC_App::getCurrentApp(); |
|
| 1163 | 1163 | $root = $this->getRootFolder(); |
| 1164 | 1164 | if (!$root->nodeExists($dir)) { |
| 1165 | 1165 | $folder = $root->newFolder($dir); |
@@ -68,8 +68,8 @@ |
||
| 68 | 68 | $this->getBundles(), |
| 69 | 69 | $this->getDefaultInstallationBundle() |
| 70 | 70 | ); |
| 71 | - foreach($bundles as $bundle) { |
|
| 72 | - if($bundle->getIdentifier() === $identifier) { |
|
| 71 | + foreach ($bundles as $bundle) { |
|
| 72 | + if ($bundle->getIdentifier() === $identifier) { |
|
| 73 | 73 | return $bundle; |
| 74 | 74 | } |
| 75 | 75 | } |
