', $templateCode);
}
diff --git a/app/applications_leases_view.php b/app/applications_leases_view.php
index c400c7a..d388ced 100644
--- a/app/applications_leases_view.php
+++ b/app/applications_leases_view.php
@@ -1,5 +1,5 @@
'Query',
'page x of y' => 'Page of ',
'total # queries' => 'Total # queries.',
+
+ // Added in 6.0
+ 'Interactive SQL queries tool' => 'Interactive SQL queries tool',
+ 'Enter SQL query' => 'Enter SQL query',
+ 'Query must start with select' => 'Query must start with %s',
+ 'Display results' => 'Display results',
+ 'Update results as you type' => 'Update results as you type',
+ 'Use cache' => 'Use cache',
+ 'results truncated' => 'Results below might have been truncated to a limit of %s records for performance purposes.',
+ 'Results will be displayed here' => 'Results will be displayed here.',
+ 'Bookmark this query' => 'Bookmark this query',
+ 'Query name' => 'Query name',
+ 'Manage bookmarked queries' => 'Manage bookmarked queries',
];
diff --git a/app/dynamic.css b/app/dynamic.css
index 6104c03..40b6407 100644
--- a/app/dynamic.css
+++ b/app/dynamic.css
@@ -210,7 +210,7 @@ td.units-description { white-space: normal !important; max-width: 80px !importan
.tv-tools .btn { width: 5em; }
/* compact theme styles */
-.container.theme-compact, .container-fluid.theme-compact { font-size: 0.857em; }
+.container.theme-compact, .container-fluid.theme-compact { line-height: 1.6; font-size: 0.857em; }
.theme-compact .btn {
font-size: 12px;
diff --git a/app/employment_and_income_history_autofill.php b/app/employment_and_income_history_autofill.php
index 31bb858..496e3b6 100644
--- a/app/employment_and_income_history_autofill.php
+++ b/app/employment_and_income_history_autofill.php
@@ -1,5 +1,5 @@
', html_attr($row['occupation']), $templateCode);
$templateCode = str_replace('<%%URLVALUE(occupation)%%>', urlencode($urow['occupation']), $templateCode);
if($AllowUpdate || $AllowInsert) {
- $templateCode = str_replace('<%%HTMLAREA(notes)%%>', '', $templateCode);
+ $templateCode = str_replace('<%%HTMLAREA(notes)%%>', '', $templateCode);
} else {
$templateCode = str_replace('<%%HTMLAREA(notes)%%>', '
' . $row['notes'] . '
', $templateCode);
}
diff --git a/app/employment_and_income_history_view.php b/app/employment_and_income_history_view.php
index e764728..70a1e9e 100644
--- a/app/employment_and_income_history_view.php
+++ b/app/employment_and_income_history_view.php
@@ -1,5 +1,5 @@
diff --git a/app/incCommon.php b/app/incCommon.php
index e914d48..0e16555 100644
--- a/app/incCommon.php
+++ b/app/incCommon.php
@@ -1222,17 +1222,7 @@ function PrepareUploadedFile($FieldName, $MaxSize, $FileTypes = 'jpg|jpeg|gif|pn
$dir = getUploadDir($dir);
/* get php.ini upload_max_filesize in bytes */
- $php_upload_size_limit = trim(ini_get('upload_max_filesize'));
- $last = strtolower($php_upload_size_limit[strlen($php_upload_size_limit) - 1]);
- switch($last) {
- case 'g':
- $php_upload_size_limit *= 1024;
- case 'm':
- $php_upload_size_limit *= 1024;
- case 'k':
- $php_upload_size_limit *= 1024;
- }
-
+ $php_upload_size_limit = toBytes(ini_get('upload_max_filesize'));
$MaxSize = min($MaxSize, $php_upload_size_limit);
if($f['size'] > $MaxSize || $f['error']) {
diff --git a/app/language.php b/app/language.php
index 0e781a8..7e43a88 100644
--- a/app/language.php
+++ b/app/language.php
@@ -1,43 +1,43 @@
-).
-
-Do NOT translate the strings between square brackets ([])
-Also, leave the text between < and > untranslated.
-And also, leave the special string %s as-is, untranslated.
-
-=====================================================
-PLEASE NOTE:
-============
-When a new version of AppGini is released, new strings
-might be added to the "defaultLang.php" file. To translate
-them, simply copy them to this file ("language.php") and
-translate them here. Do NOT translate them directly in
-the "defaultLang.php" file.
-=====================================================
-
-To avoid any error messages, please make sure to:
-
-1. Add a comma at the end of each line if it's not already there.
-2. Leave the last line in this file like this:
-];
-
-*/
-
-$Translation = [
- 'language' => 'english',
+).
+
+Do NOT translate the strings between square brackets ([])
+Also, leave the text between < and > untranslated.
+And also, leave the special string %s as-is, untranslated.
+
+=====================================================
+PLEASE NOTE:
+============
+When a new version of AppGini is released, new strings
+might be added to the "defaultLang.php" file. To translate
+them, simply copy them to this file ("language.php") and
+translate them here. Do NOT translate them directly in
+the "defaultLang.php" file.
+=====================================================
+
+To avoid any error messages, please make sure to:
+
+1. Add a comma at the end of each line if it's not already there.
+2. Leave the last line in this file like this:
+];
+
+*/
+
+$Translation = [
+ 'language' => 'english',
'membership management' => 'Membership Management',
'password mismatch' => "Password doesn't match.",
'error' => 'Error',
@@ -809,4 +809,17 @@
'query' => 'Query',
'page x of y' => 'Page of ',
'total # queries' => 'Total # queries.',
+
+ // Added in 6.0
+ 'Interactive SQL queries tool' => 'Interactive SQL queries tool',
+ 'Enter SQL query' => 'Enter SQL query',
+ 'Query must start with select' => 'Query must start with %s',
+ 'Display results' => 'Display results',
+ 'Update results as you type' => 'Update results as you type',
+ 'Use cache' => 'Use cache',
+ 'results truncated' => 'Results below might have been truncated to a limit of %s records for performance purposes.',
+ 'Results will be displayed here' => 'Results will be displayed here.',
+ 'Bookmark this query' => 'Bookmark this query',
+ 'Query name' => 'Query name',
+ 'Manage bookmarked queries' => 'Manage bookmarked queries',
];
\ No newline at end of file
diff --git a/app/lib.php b/app/lib.php
index e029d00..2c25ba3 100644
--- a/app/lib.php
+++ b/app/lib.php
@@ -1,5 +1,5 @@