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 2023-04-22 19:42:21 +02:00
commit efa587493e
9 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
out/out.Calendar.php
View File

@ -92,6 +92,7 @@ if($view) {
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewWidthDetail', $settings->_previewWidthDetail); $view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
$view->setParam('convertToPdf', $settings->_convertToPdf);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);

1
out/out.Dashboard.php
View File

@ -22,6 +22,7 @@ if($view) {
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('convertToPdf', $settings->_convertToPdf);
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);
$view->setParam('xsendfile', $settings->_enableXsendfile); $view->setParam('xsendfile', $settings->_enableXsendfile);

1
out/out.DropFolderChooser.php
View File

@ -61,6 +61,7 @@ if($view) {
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthMenuList', $settings->_previewWidthMenuList); $view->setParam('previewWidthMenuList', $settings->_previewWidthMenuList);
$view->setParam('previewWidthList', $settings->_previewWidthDropFolderList); $view->setParam('previewWidthList', $settings->_previewWidthDropFolderList);
$view->setParam('convertToPdf', $settings->_convertToPdf);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('xsendfile', $settings->_enableXsendfile); $view->setParam('xsendfile', $settings->_enableXsendfile);

1
out/out.MyDocuments.php
View File

@ -68,6 +68,7 @@ if($view) {
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('conversionmgr', $conversionmgr); $view->setParam('conversionmgr', $conversionmgr);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('convertToPdf', $settings->_convertToPdf);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);

1
out/out.ObjectCheck.php
View File

@ -266,6 +266,7 @@ if($view) {
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);
$view->setParam('conversionmgr', $conversionmgr); $view->setParam('conversionmgr', $conversionmgr);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('convertToPdf', $settings->_convertToPdf);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('xsendfile', $settings->_enableXsendfile); $view->setParam('xsendfile', $settings->_enableXsendfile);

3
out/out.Search.php
View File

@ -217,7 +217,7 @@ if($fullsearch) {
$total = 0; $total = 0;
$index = $fulltextservice->Indexer(); $index = $fulltextservice->Indexer();
if($index) { if($index) {
if(!empty($settings->_suggestTerms)) { if(!empty($settings->_suggestTerms) && !empty($_GET['query'])) {
$terms = $index->terms($_GET['query'], $settings->_suggestTerms); $terms = $index->terms($_GET['query'], $settings->_suggestTerms);
} }
$lucenesearch = $fulltextservice->Search(); $lucenesearch = $fulltextservice->Search();
@ -691,6 +691,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
$view->setParam('workflowmode', $settings->_workflowMode); $view->setParam('workflowmode', $settings->_workflowMode);
$view->setParam('enablefullsearch', $settings->_enableFullSearch); $view->setParam('enablefullsearch', $settings->_enableFullSearch);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('convertToPdf', $settings->_convertToPdf);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('conversionmgr', $conversionmgr); $view->setParam('conversionmgr', $conversionmgr);
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);

1
out/out.Timeline.php
View File

@ -65,6 +65,7 @@ if($view) {
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewWidthDetail', $settings->_previewWidthDetail); $view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
$view->setParam('convertToPdf', $settings->_convertToPdf);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);

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

@ -373,7 +373,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
<?php $this->showConfigOption('settings_fullSearchEngine', 'fullSearchEngine', $fullsearchengines, false, true); ?> <?php $this->showConfigOption('settings_fullSearchEngine', 'fullSearchEngine', $fullsearchengines, false, true); ?>
<?php $this->showConfigOption('settings_defaultSearchMethod', 'defaultSearchMethod', array('database'=>'settings_defaultSearchMethod_valdatabase', 'fulltext'=>'settings_defaultSearchMethod_valfulltext'), false, true); ?> <?php $this->showConfigOption('settings_defaultSearchMethod', 'defaultSearchMethod', array('database'=>'settings_defaultSearchMethod_valdatabase', 'fulltext'=>'settings_defaultSearchMethod_valfulltext'), false, true); ?>
<?php $this->showConfigCheckbox('settings_showSingleSearchHit', 'showSingleSearchHit'); ?> <?php $this->showConfigCheckbox('settings_showSingleSearchHit', 'showSingleSearchHit'); ?>
<?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords'), true, true); ?> <?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords', 'content'), true, true); ?>
<?php $this->showConfigText('settings_stopWordsFile', 'stopWordsFile'); ?> <?php $this->showConfigText('settings_stopWordsFile', 'stopWordsFile'); ?>
<?php $this->showConfigCheckbox('settings_enableClipboard', 'enableClipboard'); ?> <?php $this->showConfigCheckbox('settings_enableClipboard', 'enableClipboard'); ?>
<?php $this->showConfigCheckbox('settings_enableMenuTasks', 'enableMenuTasks'); ?> <?php $this->showConfigCheckbox('settings_enableMenuTasks', 'enableMenuTasks'); ?>

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

@ -455,7 +455,7 @@ $(document).ready( function() {
if($document->getComment()) { if($document->getComment()) {
if($settings->_markdownComments) { if($settings->_markdownComments) {
$Parsedown = new Parsedown(); $Parsedown = new Parsedown();
$comment = $Parsedown->text($document->getComment()); $comment = $Parsedown->text(htmlspecialchars($document->getComment()));
} else { } else {
$comment = htmlspecialchars($document->getComment()); $comment = htmlspecialchars($document->getComment());
} }
@ -810,7 +810,7 @@ $(document).ready( function() {
if($latestContent->getComment()) if($latestContent->getComment())
if($settings->_markdownComments) { if($settings->_markdownComments) {
$Parsedown = new Parsedown(); $Parsedown = new Parsedown();
$comment = $Parsedown->text($latestContent->getComment()); $comment = $Parsedown->text(htmlspecialchars($latestContent->getComment()));
print "<div class=\"content-comment\">".$comment."</div>"; print "<div class=\"content-comment\">".$comment."</div>";
} else { } else {
$comment = htmlspecialchars($latestContent->getComment()); $comment = htmlspecialchars($latestContent->getComment());