From a44d7e3af00b05d76cb98903c52a8b1dad6f091f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 21 May 2024 13:48:06 +0200 Subject: [PATCH 1/3] expand tabs --- doc/README.Install.md | 58 +++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/doc/README.Install.md b/doc/README.Install.md index c6596fbb3..7ffbe77ce 100644 --- a/doc/README.Install.md +++ b/doc/README.Install.md @@ -8,7 +8,7 @@ SeedDMS is a web-based application written in PHP. It uses MySQL, SQLite3 or PostgreSQL to manage the documents that were uploaded into the application. Be aware that PostgreSQL is not very well tested. -Make sure you have PHP >= 7.3 and MySQL 5 or higher installed. SeedDMS +Make sure you have PHP >= 7.4 and MySQL 5 or higher installed. SeedDMS will work with PHP running in CGI-mode as well as running as a module under apache. @@ -240,7 +240,7 @@ in your current installation with new versions from the quickstart archive. current installation and make the link `seeddms` point to this new directory. 3. copy the directory `pear` from the unpacked archive into your current installation, replacing the existing directory. Make a backup of `pear` before - the replacement if you want to ensure to be able to go back to your old version. + the replacement if you want to ensure to be able to go back to your old version. 4. you may compare your `conf/settings.xml` file with the shipped version `conf/settings.xml.template` for new parameters. If you don't do it, the next time you save the configuration the default values will be used. @@ -350,7 +350,7 @@ http://localhost/seeddms/ * Create a data directory with the thre sub directories staging, cache and lucene. Make sure the data directory is either *not* below your document root - or is protected with a .htaccess file against web access. The data directory + or is protected with a .htaccess file against web access. The data directory needs to be writable by the web server. * Clicking on 'Start installation' will show a form with all necessary @@ -371,9 +371,9 @@ full text search engine support, you will also need to unpack * Unpack all the files in a public web server folder. If you're working on a host machine your provider will tell you where to upload the files. If possible, do not unpack the pear packages `SeedDMS_Core-.tgz`, - `SeedDMS_Preview-.tgz` and + `SeedDMS_Preview-.tgz` and `SeedDMS_Lucene-.tgz` below the document root of your web server. - Choose a temporary folder, as the files will be moved in a second. + Choose a temporary folder, as the files will be moved in a second. Create a directory e.g. `pear` in the same directory where you unpacked seeddms and create a sub directory SeedDMS. Move the content except for the @@ -395,36 +395,36 @@ full text search engine support, you will also need to unpack Since they are pear packages they can also be installed with - > pear install SeedDMS_Core-.tgz - > pear install SeedDMS_Lucene-.tgz - > pear install SeedDMS_Preview-.tgz + > pear install SeedDMS_Core-.tgz + > pear install SeedDMS_Lucene-.tgz + > pear install SeedDMS_Preview-.tgz * The PEAR packages Log and Mail are also needed. They can be downloaded from http://pear.php.net/package/Log and http://pear.php.net/package/Mail. - Either install it as a pear package - or place it under your new directory 'pear' + Either install it as a pear package + or place it under your new directory 'pear' > pear - > Log - > Log.php - > Mail - > Mail.php + > Log + > Log.php + > Mail + > Mail.php * The package HTTP_WebDAV_Server is also needed. It can be downloaded from http://pear.php.net/package/HTTP_WebDAV_Server. Either install it as a - pear package or place it under your new directory 'pear' + pear package or place it under your new directory 'pear' > pear > HTTP - > WebDAV - > Server - > Server.php + > WebDAV + > Server + > Server.php If you run PHP in CGI mode, you also need to place a .htaccess file - in the webdav directory with the following content. + in the webdav directory with the following content. - RewriteEngine on - RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last] + RewriteEngine on + RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last] * Create a data folder somewhere on your web server including the subdirectories staging, cache and lucene and make sure they are writable by your web server, @@ -435,24 +435,24 @@ or should be protected by a .htaccess file. The folder containing the configuration (settings.xml) must be protected by an .htaccess file like the following. - > - > Order allow,deny - > Deny from all - > + > + > Order allow,deny + > Deny from all + > If you install SeedDMS for the first time continue with the database setup. * Create a new database on your web server e.g. for mysql: - create database seeddms; + create database seeddms; * Create a new user for the database with all permissions on the new database e.g. for mysql: - grant all privileges on seeddms.* to seeddms@localhost identified by 'secret'; - (replace 'secret' with you own password) + grant all privileges on seeddms.* to seeddms@localhost identified by 'secret'; + (replace 'secret' with you own password) * Optionally import `create_tables-innodb.sql` in the new database e.g. for mysql: - > cat create_tables-innodb.sql | mysql -useeddms -p seeddms + > cat create_tables-innodb.sql | mysql -useeddms -p seeddms This step can also be done by the install tool. * create a file `ENABLE_INSTALL_TOOL` in the `conf` directory and point your browser at http://hostname/seeddms/install From e39cfe068c68337e55de94511db2c83dd6924734 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 17 Jun 2024 09:26:29 +0200 Subject: [PATCH 2/3] use getReadableDate() instead of date() --- views/bootstrap/class.Bootstrap.php | 2 +- views/bootstrap4/class.Bootstrap4.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 59b4cc525..84aadda4c 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -3464,7 +3464,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) $content .= "params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; if(isset($extracontent['below_title'])) $content .= $extracontent['below_title']; - $content .= "
".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $subFolder->getDate()).""; + $content .= "
".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".getReadableDate($subFolder->getDate()).""; if($comment) { $content .= "
".htmlspecialchars($comment).""; } diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php index 10fc6d563..3de05af2c 100644 --- a/views/bootstrap4/class.Bootstrap4.php +++ b/views/bootstrap4/class.Bootstrap4.php @@ -3520,7 +3520,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) $content .= "params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; if(isset($extracontent['below_title'])) $content .= $extracontent['below_title']; - $content .= "
".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $subFolder->getDate()).""; + $content .= "
".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".getReadableDate($subFolder->getDate()).""; if($comment) { $content .= "
".htmlspecialchars($comment).""; } From 19668222ca50a442133fa66e58db8a959a53d6db Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 17 Jun 2024 13:53:51 +0200 Subject: [PATCH 3/3] translate error msg after authentication error --- webdav/webdav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webdav/webdav.php b/webdav/webdav.php index 8973ff4ed..988087368 100644 --- a/webdav/webdav.php +++ b/webdav/webdav.php @@ -181,7 +181,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $controller->setParam('source', 'webdav'); if(!$controller()) { if($this->logger) { - $this->logger->log($controller->getErrorMsg(), PEAR_LOG_NOTICE); + $this->logger->log(getMLText($controller->getErrorMsg()), PEAR_LOG_NOTICE); $this->logger->log('check_auth: error authenicating user '.$user, PEAR_LOG_NOTICE); } return false;