gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-11 12:11:19 +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-13 21:30:35 +01:00
commit ace30334a8
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/inc.DBInit.php
View File

@ -21,7 +21,7 @@
if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) { if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['initDB'] as $hookObj) { foreach($GLOBALS['SEEDDMS_HOOKS']['initDB'] as $hookObj) {
if (method_exists($hookObj, 'pretInitDB')) { if (method_exists($hookObj, 'pretInitDB')) {
$hookObj->preInitDB(array('settings'=>$settings)); $hookObj->preInitDB(array('settings'=>$settings, 'logger'=>$logger));
} }
} }
} }
@ -32,7 +32,7 @@ $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostn
if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) { if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['initDB'] as $hookObj) { foreach($GLOBALS['SEEDDMS_HOOKS']['initDB'] as $hookObj) {
if (method_exists($hookObj, 'postInitDB')) { if (method_exists($hookObj, 'postInitDB')) {
$hookObj->postInitDB(array('db'=>$db, 'settings'=>$settings)); $hookObj->postInitDB(array('db'=>$db, 'settings'=>$settings, 'logger'=>$logger));
} }
} }
} }
@ -40,7 +40,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) {
if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) { if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) { foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
if (method_exists($hookObj, 'pretInitDMS')) { if (method_exists($hookObj, 'pretInitDMS')) {
$hookObj->preInitDMS(array('db'=>$db, 'settings'=>$settings)); $hookObj->preInitDMS(array('db'=>$db, 'settings'=>$settings, 'logger'=>$logger));
} }
} }
} }
@ -61,7 +61,7 @@ $dms->setMaxDirID($settings->_maxDirID);
if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) { if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) { foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
if (method_exists($hookObj, 'postInitDMS')) { if (method_exists($hookObj, 'postInitDMS')) {
$hookObj->postInitDMS(array('dms'=>$dms, 'settings'=>$settings)); $hookObj->postInitDMS(array('dms'=>$dms, 'settings'=>$settings, 'logger'=>$logger));
} }
} }
} }

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

@ -3331,6 +3331,11 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$content .= "<td>"; $content .= "<td>";
$content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent); $content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent);
$content .= "</td>"; $content .= "</td>";
if(!empty($extracontent['columns_last'])) {
foreach($extracontent['columns_last'] as $col)
$content .= '<td>'.$col.'</td>';
}
if(!$skipcont) if(!$skipcont)
$content .= $this->documentListRowEnd($document); $content .= $this->documentListRowEnd($document);
} }

5
views/bootstrap4/class.Bootstrap4.php
View File

@ -3327,6 +3327,11 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$content .= "<td>"; $content .= "<td>";
$content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent); $content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent);
$content .= "</td>"; $content .= "</td>";
if(!empty($extracontent['columns_last'])) {
foreach($extracontent['columns_last'] as $col)
$content .= '<td>'.$col.'</td>';
}
if(!$skipcont) if(!$skipcont)
$content .= $this->documentListRowEnd($document); $content .= $this->documentListRowEnd($document);
} }