gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +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 2022-11-18 17:17:38 +01:00
commit baa3010b43
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -62,7 +62,9 @@ repository:
doc: doc:
$(PHPDOC) -d SeedDMS_Core --ignore 'getusers.php,getfoldertree.php,config.php,reverselookup.php' --force -t html $(PHPDOC) -d SeedDMS_Core --ignore 'getusers.php,getfoldertree.php,config.php,reverselookup.php' --force -t html
# Download apigen with
# composer create-project --no-dev apigen/apigen:^7.0@alpha tools/apigen
apidoc: apidoc:
apigen generate -s SeedDMS_Core --exclude tests -d html tools/apigen/bin/apigen SeedDMS_Core/Core --exclude "tests/*" --output html
.PHONY: doc webdav webapp repository .PHONY: doc webdav webapp repository

12
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -124,7 +124,7 @@ define("S_LOG_SLEEPING", -3);
/** /**
* Class to represent a document in the document management system * Class to represent a document in the document management system
* *
* A document in SeedDMS is similar to files in a regular file system. * A document in SeedDMS is similar to a file in a regular file system.
* Documents may have any number of content elements * Documents may have any number of content elements
* ({@link SeedDMS_Core_DocumentContent}). These content elements are often * ({@link SeedDMS_Core_DocumentContent}). These content elements are often
* called versions ordered in a timely manner. The most recent content element * called versions ordered in a timely manner. The most recent content element
@ -139,7 +139,7 @@ define("S_LOG_SLEEPING", -3);
* @author Markus Westphal, Malcolm Cowe, Matteo Lucarelli, * @author Markus Westphal, Malcolm Cowe, Matteo Lucarelli,
* Uwe Steinmann <uwe@steinmann.cx> * Uwe Steinmann <uwe@steinmann.cx>
* @copyright Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe, * @copyright Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe,
* 2010 Matteo Lucarelli, 2010 Uwe Steinmann * 2010 Matteo Lucarelli, 2010-2022 Uwe Steinmann
* @version Release: @package_version@ * @version Release: @package_version@
*/ */
class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
@ -3293,7 +3293,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
* Uwe Steinmann <uwe@steinmann.cx> * Uwe Steinmann <uwe@steinmann.cx>
* @copyright Copyright (C) 2002-2005 Markus Westphal, * @copyright Copyright (C) 2002-2005 Markus Westphal,
* 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli, * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
* 2010 Uwe Steinmann * 2010-2022 Uwe Steinmann
* @version Release: @package_version@ * @version Release: @package_version@
*/ */
class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
@ -7097,7 +7097,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
* Uwe Steinmann <uwe@steinmann.cx> * Uwe Steinmann <uwe@steinmann.cx>
* @copyright Copyright (C) 2002-2005 Markus Westphal, * @copyright Copyright (C) 2002-2005 Markus Westphal,
* 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli, * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
* 2010 Uwe Steinmann * 2010-2022 Uwe Steinmann
* @version Release: @package_version@ * @version Release: @package_version@
*/ */
class SeedDMS_Core_DocumentLink { /* {{{ */ class SeedDMS_Core_DocumentLink { /* {{{ */
@ -7229,7 +7229,7 @@ class SeedDMS_Core_DocumentLink { /* {{{ */
* Uwe Steinmann <uwe@steinmann.cx> * Uwe Steinmann <uwe@steinmann.cx>
* @copyright Copyright (C) 2002-2005 Markus Westphal, * @copyright Copyright (C) 2002-2005 Markus Westphal,
* 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli, * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
* 2010 Uwe Steinmann * 2010-2022 Uwe Steinmann
* @version Release: @package_version@ * @version Release: @package_version@
*/ */
class SeedDMS_Core_DocumentFile { /* {{{ */ class SeedDMS_Core_DocumentFile { /* {{{ */
@ -7545,7 +7545,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
* Uwe Steinmann <uwe@steinmann.cx> * Uwe Steinmann <uwe@steinmann.cx>
* @copyright Copyright (C) 2002-2005 Markus Westphal, * @copyright Copyright (C) 2002-2005 Markus Westphal,
* 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli, * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
* 2010 Uwe Steinmann * 2010-2022 Uwe Steinmann
* @version Release: @package_version@ * @version Release: @package_version@
*/ */
class SeedDMS_Core_AddContentResultSet { /* {{{ */ class SeedDMS_Core_AddContentResultSet { /* {{{ */

2
SeedDMS_Core/Core/inc.ClassIterator.php
View File

@ -1,5 +1,5 @@
<?php <?php
namespace SeedDMS; namespace SeedDMS\Core;
/** /**
* Implementation of the document iterartor * Implementation of the document iterartor

3
SeedDMS_Core/package.xml
View File

@ -12,7 +12,7 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2022-11-07</date> <date>2022-11-18</date>
<time>13:44:55</time> <time>13:44:55</time>
<version> <version>
<release>6.0.21</release> <release>6.0.21</release>
@ -2031,6 +2031,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
- add SeedDMS_Core_DMS::getDuplicateSequenceNo() and SeedDMS_Core_Folder::reorderDocuments() - add SeedDMS_Core_DMS::getDuplicateSequenceNo() and SeedDMS_Core_Folder::reorderDocuments()
- add SeedDMS_Core_File::mimetype(), fix SeedDMS_Core_File::moveDir() - add SeedDMS_Core_File::mimetype(), fix SeedDMS_Core_File::moveDir()
- all file operations use methods of SeedDMS_Core_File - all file operations use methods of SeedDMS_Core_File
- change namespace of iterators from SeedDMS to SeedDMS\Core
</notes> </notes>
</release> </release>
<release> <release>

2
inc/inc.Utils.php
View File

@ -1134,7 +1134,7 @@ class SeedDMS_JwtToken { /* {{{ */
class SeedDMS_FolderTree { /* {{{ */ class SeedDMS_FolderTree { /* {{{ */
public function __construct($folder, $callback) { /* {{{ */ public function __construct($folder, $callback) { /* {{{ */
$iter = new \SeedDMS\RecursiveFolderIterator($folder); $iter = new \SeedDMS\Core\RecursiveFolderIterator($folder);
$iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::SELF_FIRST); $iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::SELF_FIRST);
foreach($iter2 as $ff) { foreach($iter2 as $ff) {
call_user_func($callback, $ff, $iter2->getDepth()); call_user_func($callback, $ff, $iter2->getDepth());