gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-01-13 12:57:59 +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 2025-11-18 15:04:01 +01:00
commit fa9d0ded01
15 changed files with 331 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -352,6 +352,7 @@
- rest api endpoint 'statstotal' returns number of groups and categories
- add new command line program utils/console
- major code polishing
- add markdown editor editor.md
--------------------------------------------------------------------------------
Changes in version 5.1.42

21
Gruntfile.js
View File

@ -221,6 +221,27 @@ module.exports = function (grunt) {
],
dest: bootstrapDir + '/jquery-lazy',
flatten: true
},{
expand: true,
src: [
nodeDir + '/editor.md/editormd.min.js'
],
dest: bootstrapDir + '/editor.md',
flatten: true
},{
expand: true,
cwd: nodeDir + '/editor.md/',
src: [
'lib/*',
'languages/*',
'images/*',
'fonts/*',
'plugins/*',
'lib/codemirror/**',
'css/*'
],
dest: bootstrapDir + '/editor.md',
flatten: false
},{
expand: true,
src: [

28
composer-dist.json
View File

@ -19,19 +19,21 @@
}
},
"autoload": {
"psr-4": {
"SeedDMS\\Console\\": "seeddms/utils"
},
"classmap": [
"seeddms/inc/inc.ClassTranslator.php",
"seeddms/inc/inc.ClassSettings.php",
"seeddms/inc/inc.Version.php",
"seeddms/inc/inc.ClassViewCommon.php",
"seeddms/inc/inc.ClassControllerCommon.php",
"seeddms/inc/inc.ClassController.php",
"seeddms/inc/inc.ClassSession.php",
"seeddms/inc/inc.ClassUtilities.php"
]
"psr-4": {
"SeedDMS\\Console\\": "seeddms/utils"
},
"classmap": [
"seeddms/inc/inc.ClassTranslator.php",
"seeddms/inc/inc.ClassSettings.php",
"seeddms/inc/inc.Version.php",
"seeddms/inc/inc.ClassViewCommon.php",
"seeddms/inc/inc.ClassControllerCommon.php",
"seeddms/inc/inc.ClassController.php",
"seeddms/inc/inc.ClassSession.php",
"seeddms/inc/inc.ClassUtilities.php",
"seeddms/inc/inc.ClassExtensionMgr.php",
"seeddms/inc/inc.ClassExtBase.php"
]
},
"require": {
"pear/http_request2": "^2",

4
composer.json
View File

@ -31,7 +31,9 @@
"inc/inc.ClassControllerCommon.php",
"inc/inc.ClassController.php",
"inc/inc.ClassSession.php",
"inc/inc.ClassUtilities.php"
"inc/inc.ClassUtilities.php",
"inc/inc.ClassExtensionMgr.php",
"inc/inc.ClassExtBase.php"
]
},
"require": {

6
inc/inc.ClassExtBase.php
View File

@ -22,18 +22,20 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
namespace Seeddms\Seeddms;
/**
* Base class for extensions
*
* @author Uwe Steinmann <uwe@steinmann.cx>
* @package SeedDMS
*/
class SeedDMS_ExtBase {
class ExtensionBase {
var $settings;
var $dms;
var $logger;
public function __construct($settings, $dms, $logger) {
public function __construct(Settings $settings, $dms, $logger) {
$this->settings = $settings;
$this->dms = $dms;
$this->logger = $logger;

7
inc/inc.ClassExtensionMgr.php
View File

@ -595,6 +595,11 @@ $EXT_CONF = '.var_export($EXT_CONF, true).';');
return false;
}
if (!$this->createExtensionConf()) {
// $this->errmsgs[] = "Cannot update extension configuration";
// return false;
}
return true;
} /* }}} */
@ -750,5 +755,3 @@ $EXT_CONF = '.var_export($EXT_CONF, true).';');
return $this->errmsgs;
} /* }}} */
}
class_alias('Seeddms\Seeddms\ExtensionMgr', 'SeedDMS_Extension_Mgr');

14
inc/inc.Extension.php
View File

@ -11,11 +11,21 @@
* @version Release: @package_version@
*/
require "inc.ClassExtensionMgr.php";
require_once "inc.ClassExtensionMgr.php";
require_once "inc.ClassSchedulerTaskBase.php";
require_once "inc.ClassExtBase.php";
$extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $settings->_repositoryUrl, $settings->_proxyUrl, $settings->_proxyUser, $settings->_proxyPassword);
// Do not set a namespace until all extensions use that namespace
// or set the class name in the conf file to '\xxxx'
//namespace Seeddms\Seeddms;
use Seeddms\Seeddms\ExtensionMgr;
class_alias('Seeddms\Seeddms\ExtensionMgr', 'SeedDMS_Extension_Mgr');
/* Declare an alias as long as it used by extensions */
class_alias('Seeddms\Seeddms\ExtensionBase', 'SeedDMS_ExtBase');
$extmgr = new ExtensionMgr($settings->_rootDir."/ext", $settings->_cacheDir, $settings->_repositoryUrl, $settings->_proxyUrl, $settings->_proxyUser, $settings->_proxyPassword);
foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
if($extconf['disable']) {

100
out/out.EditMarkdown.php Normal file
View File

@ -0,0 +1,100 @@
<?php
// MyDMS. Document Management System
// Copyright (C) 2002-2005 Markus Westphal
// Copyright (C) 2006-2008 Malcolm Cowe
// Copyright (C) 2010-2016 Uwe Steinmann
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
if(!isset($settings))
require_once("../inc/inc.Settings.php");
require_once("inc/inc.Utils.php");
require_once("inc/inc.LogInit.php");
require_once("inc/inc.Language.php");
require_once("inc/inc.Init.php");
require_once("inc/inc.Extension.php");
require_once("inc/inc.DBInit.php");
require_once("inc/inc.ClassUI.php");
require_once("inc/inc.Authentication.php");
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
$documentid = $_GET["documentid"];
if (!isset($documentid) || !is_numeric($documentid) || intval($documentid)<1) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
}
$document = $dms->getDocument($documentid);
if (!is_object($document)) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
}
if ($document->getAccessMode($user) < M_READWRITE) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
}
if(isset($_GET["version"])) {
$version = $_GET["version"];
if (!is_numeric($version)) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
}
$content = $document->getContentByVersion($version);
$lc = $document->getLatestContent();
} else {
$version = 0;
$content = $document->getLatestContent();
$lc = $document->getLatestContent();
}
if (!is_object($content)) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
}
/* Only the latest version may be edited */
if($content->getVersion() != $lc->getVersion()) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
}
/*
if (!isset($settings->_editOnlineFileTypes) || !is_array($settings->_editOnlineFileTypes) || !in_array(strtolower($content->getFileType()), $settings->_editOnlineFileTypes)) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
}
*/
/* Create object for checking access to certain operations */
$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
if(!$accessop->mayEditVersion($version)) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
}
$folder = $document->getFolder();
if($view) {
$view->setParam('document', $document);
$view->setParam('version', $content);
$view->setParam('folder', $folder);
$view->setParam('accessobject', $accessop);
$view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
$view->setParam('timeout', $settings->_cmdTimeout);
$view($_GET);
exit;
}

1
package.json
View File

@ -17,6 +17,7 @@
"chartjs": "^0.3.24",
"cytoscape": "^3.16.2",
"cytoscape-grid-guide": "^2.3.2",
"editor.md": "^1.5.0",
"fine-uploader": "^5.16.2",
"flag-icon-css": "^3.5.0",
"flot": "^4.2.2",

24
utils/Commands/ConfigureextensionCommand.php
View File

@ -55,7 +55,7 @@ class ConfigureextensionCommand extends Command
$output->writeln("<comment>Using configuration from '".$settings->_configFilePath."'.</comment>", OutputInterface::VERBOSITY_VERBOSE);
if (!is_writable($settings->_configFilePath)) {
if (($input->getOption('enable') || $input->getOption('disable')) && !is_writable($settings->_configFilePath)) {
$output->writeln(sprintf("<error>The configuration file '%s' is not writable by the system user running this script.</error>", $settings->_configFilePath));
return Command::FAILURE;
}
@ -69,23 +69,31 @@ class ConfigureextensionCommand extends Command
if ($input->getOption('enable')) {
if ($settings->extensionIsDisabled($extname)) {
$settings->enableExtension($extname);
if (false === $settings->save()) {
$output->writeln(sprintf("<error>Could not write configuration.</error>", $extname));
return Command::FAILURE;
} else {
$output->writeln(sprintf("Extension is %s.", $settings->extensionIsDisabled($extname) ? 'disabled' : 'enabled'));
}
} else {
$output->writeln(sprintf("<info>Extension already enabled.</info>"));
return Command::SUCCESS;
$output->writeln(sprintf("Extension already enabled."));
}
} elseif ($input->getOption('disable')) {
if (!$settings->extensionIsDisabled($extname)) {
$settings->disableExtension($extname);
if (false === $settings->save()) {
$output->writeln(sprintf("<error>Could not write configuration.</error>", $extname));
return Command::FAILURE;
} else {
$output->writeln(sprintf("Extension is %s.", $settings->extensionIsDisabled($extname) ? 'disabled' : 'enabled'));
}
} else {
$output->writeln(sprintf("<info>Extension already disabled.</info>"));
return Command::SUCCESS;
$output->writeln(sprintf("Extension already disabled."));
}
} else {
$output->writeln(sprintf("<error>Missing option --enable or --disable</error>"));
return Command::FAILURE;
$output->writeln(sprintf("Extension is %s.", $settings->extensionIsDisabled($extname) ? 'disabled' : 'enabled'));
}
$settings->save();
return Command::SUCCESS;
}
}

7
utils/Commands/RepositoryextensionCommand.php
View File

@ -41,7 +41,7 @@ class RepositoryextensionCommand extends Command
{
$this->setName('ext:repository')
->setDescription('Get list of extensions from repository')
->setHelp('')
->setHelp('Retrieves the list of extensions from the repository and checks which of them can be updated or installed. If --url is not set, the repository url from the SeedDMS configuraton is used.')
->addOption('url', '', InputOption::VALUE_REQUIRED, 'Url of repository.', null)
;
}
@ -55,6 +55,11 @@ class RepositoryextensionCommand extends Command
$output->writeln("<comment>Using configuration from '".$settings->_configFilePath."'.</comment>", OutputInterface::VERBOSITY_VERBOSE);
if (!is_writable($settings->_cacheDir)) {
$output->writeln(sprintf("<error>The cache dir '%s' is not writable for the system user running this script.</error>", $settings->_cacheDir));
return Command::FAILURE;
}
$reposurl = $input->getOption('url');
if($reposurl)
$extmgr->setRepositoryUrl($reposurl);

6
utils/Commands/UpdateextensionCommand.php
View File

@ -41,7 +41,7 @@ class UpdateextensionCommand extends Command
{
$this->setName('ext:update')
->setDescription('Check for extension upates')
->setHelp('')
->setHelp('Retrieves the list of extensions from the repository and offers to either update or install those extension, which met the dependencies. If --url is not set, the repository url from the SeedDMS configuraton is used.')
->addOption('url', '', InputOption::VALUE_REQUIRED, 'Url of repository.', null)
;
}
@ -106,7 +106,7 @@ class UpdateextensionCommand extends Command
$output->writeln(sprintf("<info>Update extension '%s' to version %s.</info>", $extname, $answer));
if ($tmpfile = $extmgr->getExtensionFromRepository($update[$answer]['filename'])) {
if (0&&!$extmgr->updateExtension($tmpfile)) {
if (!$extmgr->updateExtension($tmpfile)) {
foreach ($extmgr->getErrorMsgs() as $msg) {
$output->writeln(sprintf("<error>%s</error>", $msg));
}
@ -135,7 +135,7 @@ class UpdateextensionCommand extends Command
$output->writeln(sprintf("<info>Install extension '%s' to version %s.</info>", $extname, $answer));
if ($tmpfile = $extmgr->getExtensionFromRepository($install[$answer]['filename'])) {
if (0&&!$extmgr->updateExtension($tmpfile)) {
if (!$extmgr->updateExtension($tmpfile)) {
foreach ($extmgr->getErrorMsgs() as $msg) {
$output->writeln(sprintf("<error>%s</error>", $msg));
}

22
utils/console
View File

@ -62,12 +62,26 @@ $application->add(new RepositoryextensionCommand($settings, $logger, $translator
$application->add(new UpdateextensionCommand($settings, $logger, $translator, $extmgr));
$application->add(new DownloadextensionCommand($settings, $logger, $translator, $extmgr));
if(isset($GLOBALS['SEEDDMS_HOOKS']['console'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['console'] as $hookObj) {
if (method_exists($hookObj, 'addCommand')) {
$hookObj->addCommand($application, ['settings'=>$settings, 'logger'=>$logger, 'translator'=>$translator, 'extmgr'=>$extmgr]);
/* If extension are not compatible with the current version of
* SeedDMS anymore, calling the hooks may fail and exit this
* script. Hence there no change to even disable an extension with
* `utils/console ext:configure --name <extname> --disable`
* In such a case the last resort is to set the environment variable
* SEEDDMS_NO_EXTENSION_HOOKS to any value, which will prevent calling
* any hooks.
*/
if (false === getenv('SEEDDMS_NO_EXTENSION_HOOKS')) {
if (isset($GLOBALS['SEEDDMS_HOOKS']['console'])) {
foreach ($GLOBALS['SEEDDMS_HOOKS']['console'] as $hookObj) {
if (method_exists($hookObj, 'addCommand')) {
$hookObj->addCommand($application, ['settings'=>$settings, 'logger'=>$logger, 'translator'=>$translator, 'extmgr'=>$extmgr]);
}
}
}
} else {
echo "NOT RUNNING HOOKS\n\n";
}
$application->run();
// vim: ts=4 sw=4 expandtab

122
views/bootstrap/class.EditMarkdown.php Normal file
View File

@ -0,0 +1,122 @@
<?php
/**
* Implementation of EditOnline view
*
* @category DMS
* @package SeedDMS
* @license GPL 2
* @version @version@
* @author Uwe Steinmann <uwe@steinmann.cx>
* @copyright Copyright (C) 2002-2005 Markus Westphal,
* 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
* 2010-2012 Uwe Steinmann
* @version Release: @package_version@
*/
/**
* Include parent class
*/
//require_once("class.Bootstrap.php");
/**
* Class which outputs the html page for EditOnline view
*
* @category DMS
* @package SeedDMS
* @author Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
* @copyright Copyright (C) 2002-2005 Markus Westphal,
* 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
* 2010-2012 Uwe Steinmann
* @version Release: @package_version@
*/
class SeedDMS_View_EditMarkdown extends SeedDMS_Theme_Style {
var $dms;
var $folder_count;
var $document_count;
var $file_count;
var $storage_size;
function js() { /* {{{ */
$document = $this->params['document'];
header('Content-Type: application/javascript; charset=UTF-8');
?>
var editor;
$(function() {
editor = editormd("editor", {
// width: "100%",
height: 560,
// markdown: "xxxx", // dynamic set Markdown text
path : "/views/bootstrap4/vendors/editor.md/lib/" // Autoload modules mode, codemirror, marked... dependents libs path
});
});
$(document).ready(function() {
$('#update').click(function(event) {
event.preventDefault();
// alert(editor.getMarkdown());
$.post("../op/op.EditOnline.php", $('#form1').serialize(), function(response) {
noty({
text: response.message,
type: response.success === true ? 'success' : 'error',
dismissQueue: true,
layout: 'topRight',
theme: 'defaultTheme',
timeout: 1500,
});
}, "json");
return false;
});
});
<?php
} /* }}} */
function show() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
$document = $this->params['document'];
$version = $this->params['version'];
$cachedir = $this->params['cachedir'];
$previewwidthlist = $this->params['previewWidthList'];
$previewwidthdetail = $this->params['previewWidthDetail'];
$set = 'markdown'; //default or markdown
$skin = 'simple'; // simple or markitup
$this->htmlAddHeader('<link href="'.$this->params['settings']->_httpRoot.'views/'.$this->theme.'/vendors/editor.md/css/editormd.min.css" rel="stylesheet"/>');
$this->htmlAddHeader('<script type="text/javascript" src="'.$this->params['settings']->_httpRoot.'views/'.$this->theme.'/vendors/editor.md/editormd.min.js"></script>');
$this->htmlAddHeader('<script type="text/javascript" src="'.$this->params['settings']->_httpRoot.'views/'.$this->theme.'/vendors/editor.md/languages/en.js"></script>');
$this->htmlStartPage(getMLText("edit_online"));
$this->globalNavigation();
$this->contentStart();
$folder = $document->getFolder();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
$this->rowStart();
$this->columnStart(12);
?>
<form action="../op/op.EditOnline.php" id="form1" method="post">
<input type="hidden" name="documentid" value="<?php echo $document->getId(); ?>" />
<div id="editor">
<textarea id="markdown" name="data" style="display: nont;">
<?php
$luser = $document->getLatestContent()->getUser();
echo htmlspecialchars(file_get_contents($dms->contentDir . $version->getPath()), ENT_SUBSTITUTE);
?>
</textarea>
</div>
<?php
if($user->getId() == $luser->getId()) {
echo $this->warningMsg(getMLText('edit_online_warning'));
$this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'),'update','','primary');
} else {
echo $this->errorMsg(getMLText('edit_online_not_allowed'));
}
?>
</form>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */
}

5
views/bootstrap/class.ViewDocument.php
View File

@ -861,7 +861,10 @@ $(document).ready( function() {
$items = array();
if ($file_exists){
if($islatest && $accessobject->mayEditVersion($latestContent->getDocument())) {
$items[] = array('link'=>$this->html_url('EditOnline', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion())), 'icon'=>'edit', 'label'=>'edit_version');
if($this->theme == 'bootstrap4')
$items[] = array('link'=>$this->html_url('EditMarkdown', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion())), 'icon'=>'edit', 'label'=>'edit_version');
else
$items[] = array('link'=>$this->html_url('EditOnline', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion())), 'icon'=>'edit', 'label'=>'edit_version');
}
}
/* Only admin has the right to remove version in any case or a regular