diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 303727453..9c789ab7d 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -172,10 +172,12 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { $list = $extmgr->importExtensionList($reposurl); foreach($list as $e) { if($e[0] != '#') { - $re = json_decode($e); - $needsupdate = !isset($GLOBALS['EXT_CONF'][$re->name]) || SeedDMS_Extension_Mgr::cmpVersion($re->version, $GLOBALS['EXT_CONF'][$re->name]['version']) > 0; + $re = json_decode($e, true); + $extmgr->checkExtension($re); + $checkmsgs = $extmgr->getErrorMsgs(); + $needsupdate = !isset($GLOBALS['EXT_CONF'][$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $GLOBALS['EXT_CONF'][$re['name']]['version']) > 0; echo "name])) { + if(isset($GLOBALS['EXT_CONF'][$re['name']])) { if($needsupdate) echo " class=\"warning\""; else @@ -183,13 +185,16 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style { } echo ">"; echo ""; - echo "".$re->title."
".$re->description.""; - echo "".$re->version."
".$re->releasedate.""; - echo "".$re->author->name."
".$re->author->company.""; + echo "".$re['title']."
".$re['description'].""; + if($checkmsgs) + echo "
getImgPath("attention.gif")."\"> ".implode('
', $checkmsgs)."
"; + echo ""; + echo "".$re['version']."
".$re['releasedate'].""; + echo "".$re['author']['name']."
".$re['author']['company'].""; echo ""; echo "
"; - if($needsupdate) - echo "
".createHiddenFieldWithKey('extensionmgr')."filename."\" />
"; + if($needsupdate && !$checkmsgs) + echo "
".createHiddenFieldWithKey('extensionmgr')."
"; echo "
"; echo ""; echo "";