gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 13:18:06 +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 2023-01-22 19:15:32 +01:00
commit c56a92b395
33 changed files with 2 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/class.EmptyFolder.php
View File

@ -77,7 +77,6 @@ class SeedDMS_Controller_EmptyFolder extends SeedDMS_Controller_Common {
}
/* Register another callback which removes the preview images of the document */
require_once("SeedDMS/Preview.php");
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
$dms->addCallback('onPreRemoveDocument', 'SeedDMS_Controller_EmptyFolder::removePreviews', array($previewer));

1
controllers/class.RemoveDocument.php
View File

@ -43,7 +43,6 @@ class SeedDMS_Controller_RemoveDocument extends SeedDMS_Controller_Common {
$result = $this->callHook('removeDocument', $document);
if($result === null) {
require_once("SeedDMS/Preview.php");
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
$previewer->deleteDocumentPreviews($document);
if (!$document->remove()) {

1
controllers/class.RemoveFolder.php
View File

@ -77,7 +77,6 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
}
/* Register another callback which removes the preview images of the document */
require_once("SeedDMS/Preview.php");
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
$dms->addCallback('onPreRemoveDocument', 'SeedDMS_Controller_RemoveFolder::removePreviews', array($previewer));

2
inc/inc.FulltextInit.php
View File

@ -49,7 +49,7 @@ if($settings->_enableFullSearch) {
$fulltextservice->setConversionMgr($conversionmgr);
$fulltextservice->setMaxSize($settings->_maxSizeForFullText);
$fulltextservice->setCmdTimeout($settings->_cmdTimeout);
require_once("SeedDMS/Preview.php");
// require_once("vendor/seeddms/preview/Preview.php");
$txtpreviewer = new SeedDMS_Preview_TxtPreviewer($settings->_cacheDir, $settings->_cmdTimeout, $settings->_enableXsendfile);
if($conversionmgr)
$txtpreviewer->setConversionMgr($conversionmgr);

1
op/op.Ajax.php
View File

@ -520,7 +520,6 @@ switch($command) {
$previewer->deleteDocumentPreviews($document);
return null;
}
require_once("SeedDMS/Preview.php");
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
$dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer));

5
op/op.DropFolderPreview.php
View File

@ -29,11 +29,6 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
if (!isset($_GET["filename"])) {
exit;
}

5
op/op.PdfPreview.php
View File

@ -30,11 +30,6 @@ include("../inc/inc.ClassUI.php");
include("../inc/inc.ClassController.php");
include("../inc/inc.Authentication.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));

5
op/op.Preview.php
View File

@ -30,11 +30,6 @@ include("../inc/inc.ClassUI.php");
include("../inc/inc.ClassController.php");
include("../inc/inc.Authentication.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));

1
op/op.RemoveDocument.php
View File

@ -68,7 +68,6 @@ if($document->isLocked()) {
$folder = $document->getFolder();
/* Remove all preview images. */
require_once("SeedDMS/Preview.php");
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
$previewer->deleteDocumentPreviews($document);

1
op/op.RemoveDocumentFile.php
View File

@ -65,7 +65,6 @@ if (($document->getAccessMode($user, 'removeDocumentFile') < M_ALL)&&($user->get
}
/* Remove preview image. */
require_once("SeedDMS/Preview.php");
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
$previewer->deletePreview($file, $settings->_previewWidthDetail);

2
op/op.RemoveFolder.php
View File

@ -62,7 +62,7 @@ function removePreviews($arr, $document) {
$previewer->deleteDocumentPreviews($document);
return null;
}
require_once("SeedDMS/Preview.php");
require_once("vendor/seeddms/preview/Preview.php");
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
$dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer));
*/

1
op/op.RemoveVersion.php
View File

@ -62,7 +62,6 @@ if (!is_object($version)) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
}
require_once("SeedDMS/Preview.php");
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
$folder = $document->getFolder();
/* Check if there is just one version. In that case remove the document */

2
restapi/index.php
View File

@ -1392,8 +1392,6 @@ class RestapiController { /* {{{ */
} /* }}} */
function getDocumentPreview($request, $response, $args) { /* {{{ */
require_once "SeedDMS/Preview.php";
$dms = $this->container->dms;
$userobj = $this->container->userobj;
$settings = $this->container->config;

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for ApprovalSummary view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for AttributeMgr view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for Calendar view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for Categories view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for clipboard view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for DocumentVersionDetail view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for DropFolderChooser view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for ExpiredDocuments view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for GroupMgr view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for ManageNotify view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for MyDocuments view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for ObjectCheck view
*

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

@ -16,11 +16,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for RemoveUserFromProcesses view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for ReviewSummary view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for Search result view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for clipboard view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for Timeline view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for ViewDocument view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for ViewFolder view
*

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

@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
*/
require_once("SeedDMS/Preview.php");
/**
* Class which outputs the html page for WorkflowSummary view
*