gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-28 02:20:41 +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-02 19:59:28 +01:00
commit 68547e4f33
7 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer-dist.json
View File

@ -22,7 +22,7 @@
"psr-4": { "psr-4": {
"SeedDMS\\Console\\": "seeddms/utils" "SeedDMS\\Console\\": "seeddms/utils"
}, },
"classmap": ["seeddms/inc/inc.ClassTranslator.php", "seeddms/inc/inc.ClassSettings.php", "seeddms/inc/inc.Version.php"] "classmap": ["seeddms/inc/inc.ClassTranslator.php", "seeddms/inc/inc.ClassSettings.php", "seeddms/inc/inc.Version.php", "inc/inc.ClassViewCommon.php", "inc/inc.ClassControllerCommon.php", "inc/inc.ClassController.php"]
}, },
"require": { "require": {
"pear/http_request2": "^2", "pear/http_request2": "^2",

2
composer.json
View File

@ -23,7 +23,7 @@
"psr-4": { "psr-4": {
"Seeddms\\Console\\": "utils" "Seeddms\\Console\\": "utils"
}, },
"classmap": ["inc/inc.ClassTranslator.php", "inc/inc.ClassSettings.php", "inc/inc.Version.php"] "classmap": ["inc/inc.ClassTranslator.php", "inc/inc.ClassSettings.php", "inc/inc.Version.php", "inc/inc.ClassViewCommon.php", "inc/inc.ClassControllerCommon.php", "inc/inc.ClassController.php"]
}, },
"require": { "require": {
"php": ">=8.2.0", "php": ">=8.2.0",

2
controllers/class.ClearCache.php
View File

@ -23,8 +23,6 @@
class SeedDMS_Controller_ClearCache extends SeedDMS_Controller_Common { class SeedDMS_Controller_ClearCache extends SeedDMS_Controller_Common {
public function run() { public function run() {
$dms = $this->params['dms'];
$user = $this->params['user'];
$settings = $this->params['settings']; $settings = $this->params['settings'];
$post = $this->params['post']; $post = $this->params['post'];

2
inc/inc.DBInit.php
View File

@ -93,7 +93,5 @@ require_once('inc/inc.Tasks.php');
require_once("inc.ConversionInit.php"); require_once("inc.ConversionInit.php");
require_once('inc.FulltextInit.php'); require_once('inc.FulltextInit.php');
require_once('inc.AuthenticationInit.php'); require_once('inc.AuthenticationInit.php');
require_once("inc.ClassNotificationService.php");
require_once("inc.ClassEmailNotify.php");
require_once('inc.Notification.php'); require_once('inc.Notification.php');

2
inc/inc.Extension.php
View File

@ -11,8 +11,6 @@
* @version Release: @package_version@ * @version Release: @package_version@
*/ */
global $logger;
require "inc.ClassExtensionMgr.php"; require "inc.ClassExtensionMgr.php";
require_once "inc.ClassSchedulerTaskBase.php"; require_once "inc.ClassSchedulerTaskBase.php";
require_once "inc.ClassExtBase.php"; require_once "inc.ClassExtBase.php";

3
inc/inc.Notification.php
View File

@ -12,6 +12,9 @@
* @version Release: @package_version@ * @version Release: @package_version@
*/ */
require_once("inc.ClassEmailNotify.php");
require_once("inc.ClassNotificationService.php");
$notifier = new SeedDMS_NotificationService($logger, $settings, $translator); $notifier = new SeedDMS_NotificationService($logger, $settings, $translator);
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) { if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {

2
www/index.php
View File

@ -76,7 +76,7 @@ if (true) {
if (method_exists($hookObj, 'addRoute')) { if (method_exists($hookObj, 'addRoute')) {
// FIXME: pass $app only just like initRestAPI. $app has a container // FIXME: pass $app only just like initRestAPI. $app has a container
// which contains all other objects // which contains all other objects
$hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings, 'conversionmgr'=>$conversionmgr, 'authenticator'=>$authenticator, 'fulltextservice'=>$fulltextservice, 'logger'=>$logger)); $hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings, 'conversionmgr'=>$conversionmgr, 'authenticator'=>$authenticator, 'fulltextservice'=>$fulltextservice, 'logger'=>$logger, 'notifier'=>$notifier, 'translator'=>$translator));
} }
} }
} }