gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +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 2021-11-04 17:44:14 +01:00
commit f727843720
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
views/bootstrap/class.ExtensionMgr.php
View File

@ -196,15 +196,14 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
$errmsgs = array(); $errmsgs = array();
if(!$settings->extensionIsDisabled($extname)) { if(!$settings->extensionIsDisabled($extname)) {
// if(!isset($extconf['disable']) || $extconf['disable'] == false) { // if(!isset($extconf['disable']) || $extconf['disable'] == false) {
$extmgr->checkExtension($extname); if(!$extmgr->checkExtensionByDir($extname))
$errmsgs = $extmgr->getErrorMsgs();
if($errmsgs)
echo "<tr class=\"table-danger error\" ref=\"".$extname."\">"; echo "<tr class=\"table-danger error\" ref=\"".$extname."\">";
else else
echo "<tr class=\"table-success success\" ref=\"".$extname."\">"; echo "<tr class=\"table-success success\" ref=\"".$extname."\">";
} else { } else {
echo "<tr class=\"table-warning warning\" ref=\"".$extname."\">"; echo "<tr class=\"table-warning warning\" ref=\"".$extname."\">";
} }
$errmsgs = $extmgr->getErrorMsgs();
echo "<td width=\"32\">"; echo "<td width=\"32\">";
if($extconf['icon']) if($extconf['icon'])
echo "<img width=\"32\" height=\"32\" src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">"; echo "<img width=\"32\" height=\"32\" src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
@ -309,10 +308,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
print "<th></th>\n"; print "<th></th>\n";
print "</tr></thead><tbody>\n"; print "</tr></thead><tbody>\n";
$list = $extmgr->getExtensionList(); $list = $extmgr->getExtensionList();
foreach($list as $re) { foreach($list as $en=>$re) {
if(!$re) if(!$re)
continue; continue;
$extmgr->checkExtension($re); $extmgr->checkExtensionByName($en, $re);
$checkmsgs = $extmgr->getErrorMsgs(); $checkmsgs = $extmgr->getErrorMsgs();
$needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0; $needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0;
echo "<tr"; echo "<tr";