gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 09:35:00 +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 2017-08-01 11:33:35 +02:00
commit 9fe0a39321
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -187,6 +187,7 @@
- fix sql statement for creating temp. tables (sqlite)
- remove empty lines at end of view/bootstrap/class.*.php files (Closes #329)
- make sure contentDir ends with DIRECTORY_SEPARATOR (Closes #323)
- minor improvements of installation
--------------------------------------------------------------------------------
Changes in version 4.3.35

2
inc/inc.ClassSettings.php
View File

@ -478,7 +478,7 @@ class Settings { /* {{{ */
$this->_rootDir = strval($tab["rootDir"]);
$this->_httpRoot = strval($tab["httpRoot"]);
$this->_contentDir = strval($tab["contentDir"]);
if(substr($this->_contentDir, -1, 1) != DIRECTORY_SEPARATOR)
if($this->_contentDir && substr($this->_contentDir, -1, 1) != DIRECTORY_SEPARATOR)
$this->_contentDir .= DIRECTORY_SEPARATOR;
$this->_cacheDir = strval($tab["cacheDir"]);
$this->_stagingDir = strval($tab["stagingDir"]);

17
install/install.php
View File

@ -165,13 +165,16 @@ do {
if(!$settings->_rootDir)
$settings->_rootDir = $rootDir;
//$settings->_coreDir = $settings->_rootDir;
//$settings->_luceneClassDir = $settings->_rootDir;
elseif(realpath ("..") != realpath($settings->_rootDir)) { // Fix rootDir if required
$msg = "Your Root directory has been modified to fit your installation path!";
$settings->_rootDir = realpath ("..")."/";
}
if(!$settings->_contentDir) {
$settings->_contentDir = $settings->_rootDir . 'data/';
$settings->_luceneDir = $settings->_rootDir . 'data/lucene/';
$settings->_stagingDir = $settings->_rootDir . 'data/staging/';
$settings->_cacheDir = $settings->_rootDir . 'data/cache/';
$settings->_contentDir = realpath($settings->_rootDir."..") . '/data/';
$settings->_luceneDir = $settings->_contentDir . 'lucene/';
$settings->_stagingDir = $settings->_contentDir . 'staging/';
$settings->_cacheDir = $settings->_contentDir . 'cache/';
} else {
if(!$settings->_cacheDir) {
$settings->_cacheDir = $settings->_contentDir . 'cache/';
@ -195,6 +198,8 @@ UI::htmlStartPage("INSTALL");
UI::globalBanner();
UI::contentStart();
UI::contentHeading("SeedDMS Installation for version ".SEEDDMS_VERSION);
if(isset($msg))
echo "<div class=\"alert alert-warning\">".$msg."</div>";
UI::contentContainerStart();

8
languages/de_DE/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (2461), dgrutsch (22)
// Translators: Admin (2464), dgrutsch (22)
$text = array(
'2_factor_auth' => '2-Faktor Authentifizierung',
@ -1038,7 +1038,7 @@ URL: [url]',
'rm_role' => 'Diese Rolle löschen',
'rm_transmittal' => 'Dokumentenliste entfernen',
'rm_transmittalitem' => 'Eintrag löschen',
'rm_user' => 'Diesen Benutzer löschen',
'rm_user' => 'Benutzer löschen',
'rm_user_from_processes' => 'Benutzer aus Prozessen löschen',
'rm_version' => 'Version löschen',
'rm_workflow' => 'Lösche Workflow',
@ -1198,7 +1198,7 @@ URL: [url]',
'settings_enableClipboard_desc' => 'Schaltet die Zwischenablage auf der \'View Folder\' Seite ein/aus',
'settings_enableConverting' => 'Dokumentenkonvertierung einschalten',
'settings_enableConverting_desc' => 'Ein/Auschalten der automatischen Konvertierung von Dokumenten',
'settings_enableDropFolderList' => 'Ein-/Ausschalten der Liste der Dateien im Ablageordner im Menü',
'settings_enableDropFolderList' => 'Liste der Dateien im Ablageordner im Menü',
'settings_enableDropFolderList_desc' => '',
'settings_enableDropUpload' => 'Schnelles Hochladen einschalten',
'settings_enableDropUpload_desc' => 'Ein/Ausschalten des Bereichs auf der \'View Folder\' Seite zum Hochladen von Dateien per Drag&Drop.',
@ -1242,7 +1242,7 @@ URL: [url]',
'settings_enableRevisionWorkflow_desc' => 'Anwählen, um den Workflow der Wiederholungsprüfung von Dokumenten nach einer einstellbaren Zeit zu ermöglichen.',
'settings_enableSelfRevApp' => 'Erlaube Prüfung/Freigabe durch angemeldeten Benutzer',
'settings_enableSelfRevApp_desc' => 'Anwählen, um den aktuell angemeldeten Benutzer in der Liste der Prüfer/Freigeber und für Workflow-Aktionen auswählbar zu machen.',
'settings_enableSessionList' => 'Liste angemeldeter Benutzer einschalten',
'settings_enableSessionList' => 'Liste angemeldeter Benutzer im Menü',
'settings_enableSessionList_desc' => 'Schaltet die Liste der zur Zeit angemeldeten Benutzer im Menu ein/aus.',
'settings_enableThemeSelector' => 'Auswahl des Themas',
'settings_enableThemeSelector_desc' => 'Schaltet das Auswahlmenü für die Themenauswahl in der Anmeldemaske ein oder aus.',

8
languages/en_GB/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (1588), dgrutsch (9), netixw (14)
// Translators: Admin (1591), dgrutsch (9), netixw (14)
$text = array(
'2_factor_auth' => '2-factor authentication',
@ -1033,7 +1033,7 @@ URL: [url]',
'rm_role' => 'Delete this role',
'rm_transmittal' => 'Remove transmittal',
'rm_transmittalitem' => 'Remove item',
'rm_user' => 'Remove this user',
'rm_user' => 'Remove user',
'rm_user_from_processes' => 'Remove user from processes',
'rm_version' => 'Remove version',
'rm_workflow' => 'Remove Workflow',
@ -1193,7 +1193,7 @@ URL: [url]',
'settings_enableClipboard_desc' => 'Enable/disable the clipboard on the \'View Folder\' page',
'settings_enableConverting' => 'Enable Converting',
'settings_enableConverting_desc' => 'Enable/disable converting of files',
'settings_enableDropFolderList' => 'Enable/disable list of files in drop folder in the menu',
'settings_enableDropFolderList' => 'Enable list of files in drop folder in menu',
'settings_enableDropFolderList_desc' => '',
'settings_enableDropUpload' => 'Enable Fast Upload',
'settings_enableDropUpload_desc' => 'Enable/Disable the drop area on the \'View Folder\' page for uploading files by Drag&Drop.',
@ -1237,7 +1237,7 @@ URL: [url]',
'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.',
'settings_enableSelfRevApp' => 'Allow review/approval for logged in user',
'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.',
'settings_enableSessionList' => 'Enable list of users online',
'settings_enableSessionList' => 'Enable list of users online in menu',
'settings_enableSessionList_desc' => 'Enable list of currently logged in users in menu.',
'settings_enableThemeSelector' => 'Theme selection',
'settings_enableThemeSelector_desc' => 'Turns on/off the theme selector on the login page.',