summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2014-06-03 12:02:23 +0200
committerMorris Jobke <morris.jobke@gmail.com>2014-06-03 12:02:23 +0200
commit25c676f203b7716b6ddd33b68a287939a1a7ef55 (patch)
tree3e759580b44cfbfb30b95a84195fb3faaa7e026b /settings
parentf88482355f01209d6f0d2cc553f9d1822dc35c58 (diff)
downloadnextcloud-server-25c676f203b7716b6ddd33b68a287939a1a7ef55.tar.gz
nextcloud-server-25c676f203b7716b6ddd33b68a287939a1a7ef55.zip
simplify SQLite warning
Diffstat (limited to 'settings')
-rwxr-xr-xsettings/admin.php22
-rw-r--r--settings/templates/admin.php8
2 files changed, 5 insertions, 25 deletions
diff --git a/settings/admin.php b/settings/admin.php
index c26475c3c54..fc76d3d74ab 100755
--- a/settings/admin.php
+++ b/settings/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();
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index ad4b7a77626..c8ca031ec98 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -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
kground-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# 
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2013-06-02 02:00+0200\n"
"PO-Revision-Date: 2013-06-01 23:17+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

#: ajax/delete.php:42
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""

#: ajax/undelete.php:42
#, php-format
msgid "Couldn't restore %s"
msgstr ""

#: js/trash.js:7 js/trash.js:97
msgid "perform restore operation"
msgstr ""

#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
msgid "Error"
msgstr ""

#: js/trash.js:34
msgid "delete file permanently"
msgstr ""

#: js/trash.js:123
msgid "Delete permanently"
msgstr ""

#: js/trash.js:176 templates/index.php:17
msgid "Name"
msgstr "Ime"

#: js/trash.js:177 templates/index.php:27
msgid "Deleted"
msgstr ""

#: js/trash.js:186
msgid "1 folder"
msgstr ""

#: js/trash.js:188
msgid "{count} folders"
msgstr ""

#: js/trash.js:196
msgid "1 file"
msgstr ""

#: js/trash.js:198
msgid "{count} files"
msgstr ""

#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""

#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""

#: templates/index.php:30 templates/index.php:31
msgid "Delete"
msgstr "ObriĊĦi"

#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
msgstr ""