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

Merge pull request #4804 from nextcloud/proper-upgrade-size 

Properly decide on actual users if instance is too big
This commit is contained in:
Lukas Reschke 2017-05-11 17:10:45 +02:00 committed by GitHub
parent ec0c7fd104 abe4a19cbc
commit 23b6f0e4d7
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
<h2 class="title"><?php p($l->t('Update needed')) ?></h2>
<div class="infogroup">
<?php if ($_['tooBig']) {
p($l->t('Please use the command line updater because you have a big instance.'));
p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
} else {
p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
} ?><br><br>

24
lib/base.php
View File

@ -313,7 +313,29 @@ class OC {
$tooBig = false;
if (!$disableWebUpdater) {
$apps = \OC::$server->getAppManager();
$tooBig = $apps->isInstalled('user_ldap') || $apps->isInstalled('user_shibboleth');
$tooBig = false;
if ($apps->isInstalled('user_ldap')) {
$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$result = $qb->selectAlias($qb->createFunction('COUNT(*)'), 'user_count')
->from('ldap_user_mapping')
->execute();
$row = $result->fetch();
$result->closeCursor();
$tooBig = ($row['user_count'] > 50);
}
if (!$tooBig && $apps->isInstalled('user_saml')) {
$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$result = $qb->selectAlias($qb->createFunction('COUNT(*)'), 'user_count')
->from('user_saml_users')
->execute();
$row = $result->fetch();
$result->closeCursor();
$tooBig = ($row['user_count'] > 50);
}
if (!$tooBig) {
// count users
$stats = \OC::$server->getUserManager()->countUsers();