diff --git a/lib/session/Session.inc b/lib/session/Session.inc
index 35d5654..0a27067 100644
--- a/lib/session/Session.inc
+++ b/lib/session/Session.inc
@@ -218,12 +218,16 @@ class Session {
header("Cache-Control: must-revalidate");
header("Expires: " . gmdate("D, d M Y H:i:s", time() - 3600) . " GMT");
$sessionID = session_id();
- $version = KTUtil::getSystemSetting('databaseVersion');
- if ($default->systemVersion != $version) {
- if (KTLOG_CACHE) $default->log->info("Session::verify : Database not upgraded");
- $_SESSION['errormessage']['login'] = sprintf(_kt('Database incompatibility error:
Please ensure that you have completed the database upgrade procedure.
Please click here to complete.'),'setup/upgrade.php');
- return PEAR::raiseError($_SESSION['errormessage']['login']);
+ if($default->dbversioncompare){
+ // Compare the system version and the database version to determine if the database needs to be upgraded.
+ $version = KTUtil::getSystemSetting('databaseVersion');
+
+ if ($default->systemVersion != $version) {
+ if (KTLOG_CACHE) $default->log->info("Session::verify : Database not upgraded");
+ $_SESSION['errormessage']['login'] = sprintf(_kt('Database incompatibility error:
Please ensure that you have completed the database upgrade procedure.
Please click here to complete.'),'setup/upgrade.php');
+ return PEAR::raiseError($_SESSION['errormessage']['login']);
+ }
}
if (empty($sessionID)) {
diff --git a/plugins/ktcore/folder/BulkImport.php b/plugins/ktcore/folder/BulkImport.php
index 0db63d5..a513b5f 100644
--- a/plugins/ktcore/folder/BulkImport.php
+++ b/plugins/ktcore/folder/BulkImport.php
@@ -59,6 +59,11 @@ class KTBulkImportFolderAction extends KTFolderAction {
}
function getInfo() {
+ global $default;
+ if($default->disableBulkImport){
+ return null;
+ }
+
if (!Permission::userIsSystemAdministrator($this->oUser->getId())) {
return null;
diff --git a/sql/mysql/install/data.sql b/sql/mysql/install/data.sql
index 49d191d..a8f6053 100644
--- a/sql/mysql/install/data.sql
+++ b/sql/mysql/install/data.sql
@@ -270,7 +270,9 @@ INSERT INTO `config_settings` VALUES
(96, 'KnowledgeTree', 'Redirect To Browse View: Exceptions', 'Specifies that, when \'Redirect To Browse\' is set to \'True\' all users, except for the users listed in the text field below are redirected to the Browse view on log in. The users listed for this setting are directed to the KnowledgeTree Dashboard. To define exceptions, add user names in the text field as follows, e.g. admin, joebloggs, etc.', 'redirectToBrowseExceptions', '', '', '', NULL, 1),
(97, 'session', 'Allow Automatic Sign In', 'Defines whether to automatically create a user account on first login for any user who does not yet exist in the system. Default is \'False\'.', 'allowAutoSignup', 'default', 'false', 'boolean', '', 1),
(98, 'ldapAuthentication', 'Create Groups Automatically', 'Defines whether to allow LDAP groups to be created automatically. Default is \'False\'.', 'autoGroupCreation', 'default', 'false', 'boolean', '', 1),
-(99, 'browse', 'Truncate Document and Folder Titles in Browse View', 'Defines the length of the document or folder title displayed in the browse view.', 'titleCharLength', 'default', '40', 'numeric_string', '', 1);
+(99, 'browse', 'Truncate Document and Folder Titles in Browse View', 'Defines the length of the document or folder title displayed in the browse view.', 'titleCharLength', 'default', '40', 'numeric_string', '', 1),
+(100, 'import', 'Disable Bulk Import', 'Disable the bulk import plugin', 'disableBulkImport', 'default', 'false', 'string', NULL, 1),
+(101, 'session', 'Enable version check', 'Compares the system version with the database version to determine if a database upgrade is needed.','dbversioncompare', 'default', 'true', 'boolean', NULL, 0);
/*!40000 ALTER TABLE `config_settings` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/sql/mysql/upgrade/3.5.3/length_config_setting.sql b/sql/mysql/upgrade/3.5.3/length_config_setting.sql
index af35a67..eb6be55 100644
--- a/sql/mysql/upgrade/3.5.3/length_config_setting.sql
+++ b/sql/mysql/upgrade/3.5.3/length_config_setting.sql
@@ -1,3 +1,9 @@
INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) VALUES
+
('browse', 'Truncate Document and Folder Titles in Browse View', 'Defines the length of the document or folder title displayed in the
-browse view.', 'titleCharLength', 'default', '40', 'numeric_string', '', 1);
\ No newline at end of file
+browse view.', 'titleCharLength', 'default', '40', 'numeric_string', '', 1),
+
+('import', 'Disable Bulk Import', 'Disable the bulk import plugin', 'disableBulkImport', 'default', 'false', 'string', NULL, 1),
+
+('session', 'Enable version check', 'Compares the system version with the database version to determine if a database upgrade is needed.',
+'dbversioncompare', 'default', 'true', 'boolean', NULL, 0);
\ No newline at end of file