gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 05:11:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-04-06 11:18:11 +02:00
commit e8d1369fad
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -218,6 +218,8 @@
previous versions
- search hits in typeahead search are now links to the folder/document.
Only the first item in the list still opens the search page.
- make sure encryption key is always, prevents error when settings are
first saved and encryption key was not set initially
--------------------------------------------------------------------------------
Changes in version 5.1.21

6
inc/inc.Settings.php
View File

@ -29,6 +29,12 @@ if(!defined("SEEDDMS_INSTALL") && file_exists(dirname($settings->_configFilePath
die("SeedDMS won't run unless your remove the file ENABLE_INSTALL_TOOL from your configuration directory.");
}
/* Set an encryption key if is not set */
if(!trim($settings->_encryptionKey)) {
$settings->_encryptionKey = md5(uniqid());
$settings->save();
}
if(isset($settings->_extraPath))
ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));

4
out/out.Settings.php
View File

@ -34,10 +34,6 @@ if (!$accessop->check_view_access($view, $_GET)) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Set an encryption key if is not set */
if(!trim($settings->_encryptionKey))
$settings->_encryptionKey = md5(uniqid());
$users = $dms->getAllUsers($settings->_sortUsersInList);
$groups = $dms->getAllGroups();