simplify SQLite warning

remotes/origin/ldap_group_count
Morris Jobke 12 years ago
parent f88482355f
commit 25c676f203
  1. 22
      settings/admin.php
  2. 8
      settings/templates/admin.php

@ -89,27 +89,7 @@ foreach($forms as $form) {
$tmpl->append('forms', $form);
}
$databaseOverload = false;
if(strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false){
// > 5 users
$userCount = 0;
foreach (\OC::$server->getUserManager()->countUsers() as $classname => $count) {
$userCount += $count;
}
if($userCount >= 5){
$databaseOverload = true;
}
// OR > 1000 files
$sql = 'SELECT COUNT(*) FROM *PREFIX*filecache;';
$query = \OCP\DB::prepare($sql);
$row = $query->execute()->fetchRow();
$fileCount = $row['COUNT(*)'];
if($fileCount >= 1000){
$databaseOverload = true;
}
}
$databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false);
$tmpl->assign('databaseOverload', $databaseOverload);
$tmpl->printPage();

@ -102,11 +102,11 @@ if (!$_['isAnnotationsWorking']) {
if ($_['databaseOverload']) {
?>
<div class="section">
<h2><?php p($l->t('Database Performance Warning'));?></h2>
<h2><?php p($l->t('Database Performance Info'));?></h2>
<span class="securitywarning">
<?php p($l->t('SQLite will be used as database. For larger installations we recommend to change this.')); ?>
</span>
<p class="securitywarning">
<?php p($l->t('SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: \'occ db:convert-type\'')); ?>
</p>
</div>
<?php

Loading…
Cancel
Save