gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +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 2024-06-17 13:54:22 +02:00
commit eefbd18e5e
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
doc/README.Install.md
View File

@ -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 SQLite3 or PostgreSQL to manage the documents that were uploaded into
the application. Be aware that PostgreSQL is not very well tested. 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 will work with PHP running in CGI-mode as well as running as a module under
apache. 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. current installation and make the link `seeddms` point to this new directory.
3. copy the directory `pear` from the unpacked archive into your current 3. copy the directory `pear` from the unpacked archive into your current
installation, replacing the existing directory. Make a backup of `pear` before 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 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 `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. 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 * Create a data directory with the thre sub directories staging, cache
and lucene. and lucene.
Make sure the data directory is either *not* below your document root 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. needs to be writable by the web server.
* Clicking on 'Start installation' will show a form with all necessary * 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 * 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. a host machine your provider will tell you where to upload the files.
If possible, do not unpack the pear packages `SeedDMS_Core-<version>.tgz`, If possible, do not unpack the pear packages `SeedDMS_Core-<version>.tgz`,
`SeedDMS_Preview-<version>.tgz` and `SeedDMS_Preview-<version>.tgz` and
`SeedDMS_Lucene-<version>.tgz` below the document root of your web server. `SeedDMS_Lucene-<version>.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 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 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 Since they are pear packages they can also be installed with
> pear install SeedDMS_Core-<version>.tgz > pear install SeedDMS_Core-<version>.tgz
> pear install SeedDMS_Lucene-<version>.tgz > pear install SeedDMS_Lucene-<version>.tgz
> pear install SeedDMS_Preview-<version>.tgz > pear install SeedDMS_Preview-<version>.tgz
* The PEAR packages Log and Mail are also needed. They can be downloaded from * 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. http://pear.php.net/package/Log and http://pear.php.net/package/Mail.
Either install it as a pear package Either install it as a pear package
or place it under your new directory 'pear' or place it under your new directory 'pear'
> pear > pear
> Log > Log
> Log.php > Log.php
> Mail > Mail
> Mail.php > Mail.php
* The package HTTP_WebDAV_Server is also needed. It can be downloaded from * 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 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 > pear
> HTTP > HTTP
> WebDAV > WebDAV
> Server > Server
> Server.php > Server.php
If you run PHP in CGI mode, you also need to place a .htaccess file 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 RewriteEngine on
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last] RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
* Create a data folder somewhere on your web server including the subdirectories * 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, 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 configuration (settings.xml) must be protected by an .htaccess file like the
following. following.
> <Files ~ "^settings\.xml"> > <Files ~ "^settings\.xml">
> Order allow,deny > Order allow,deny
> Deny from all > Deny from all
> </Files> > </Files>
If you install SeedDMS for the first time continue with the database setup. If you install SeedDMS for the first time continue with the database setup.
* Create a new database on your web server * Create a new database on your web server
e.g. for mysql: e.g. for mysql:
create database seeddms; create database seeddms;
* Create a new user for the database with all permissions on the new database * Create a new user for the database with all permissions on the new database
e.g. for mysql: e.g. for mysql:
grant all privileges on seeddms.* to seeddms@localhost identified by 'secret'; grant all privileges on seeddms.* to seeddms@localhost identified by 'secret';
(replace 'secret' with you own password) (replace 'secret' with you own password)
* Optionally import `create_tables-innodb.sql` in the new database * Optionally import `create_tables-innodb.sql` in the new database
e.g. for mysql: 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. This step can also be done by the install tool.
* create a file `ENABLE_INSTALL_TOOL` in the `conf` directory and point * create a file `ENABLE_INSTALL_TOOL` in the `conf` directory and point
your browser at http://hostname/seeddms/install your browser at http://hostname/seeddms/install

2
views/bootstrap/class.Bootstrap.php
View File

@ -3627,7 +3627,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$content .= "<td class=\"wordbreak\"><a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>"; $content .= "<td class=\"wordbreak\"><a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";
if(isset($extracontent['below_title'])) if(isset($extracontent['below_title']))
$content .= $extracontent['below_title']; $content .= $extracontent['below_title'];
$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $subFolder->getDate())."</b></span>"; $content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".getReadableDate($subFolder->getDate())."</b></span>";
if($comment) { if($comment) {
$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>"; $content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
} }

2
views/bootstrap4/class.Bootstrap4.php
View File

@ -3607,7 +3607,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$content .= "<td class=\"wordbreak\"><a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>"; $content .= "<td class=\"wordbreak\"><a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";
if(isset($extracontent['below_title'])) if(isset($extracontent['below_title']))
$content .= $extracontent['below_title']; $content .= $extracontent['below_title'];
$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $subFolder->getDate())."</b></span>"; $content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".getReadableDate($subFolder->getDate())."</b></span>";
if($comment) { if($comment) {
$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>"; $content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
} }

2
webdav/webdav.php
View File

@ -181,7 +181,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
$controller->setParam('source', 'webdav'); $controller->setParam('source', 'webdav');
if(!$controller()) { if(!$controller()) {
if($this->logger) { 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); $this->logger->log('check_auth: error authenicating user '.$user, PEAR_LOG_NOTICE);
} }
return false; return false;