diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php index c49dbabd1..15ae24c50 100644 --- a/modules/addon/addon.admin.model.php +++ b/modules/addon/addon.admin.model.php @@ -46,13 +46,23 @@ class addonAdminModel extends addon $oAutoinstallModel = getModel('autoinstall'); foreach($addonList as $key => $addon) { + // check blacklist + $addonList[$key]->isBlacklisted = Context::isBlacklistedPlugin($addon->addon); + // get easyinstall remove url $packageSrl = $oAutoinstallModel->getPackageSrlByPath($addon->path); $addonList[$key]->remove_url = $oAutoinstallModel->getRemoveUrlByPackageSrl($packageSrl); // get easyinstall need update - $package = $oAutoinstallModel->getInstalledPackages($packageSrl); - $addonList[$key]->need_update = $package[$packageSrl]->need_update; + if($addonList[$key]->isBlacklisted) + { + $addonList[$key]->need_update = 'N'; + } + else + { + $package = $oAutoinstallModel->getInstalledPackages($packageSrl); + $addonList[$key]->need_update = $package[$packageSrl]->need_update; + } // get easyinstall update url if($addonList[$key]->need_update == 'Y') diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php index bb605cd77..8eb142106 100644 --- a/modules/addon/addon.class.php +++ b/modules/addon/addon.class.php @@ -19,7 +19,6 @@ class addon extends ModuleObject $oAddonController = getAdminController('addon'); $oAddonController->doInsert('autolink', 0, 'site', 'Y'); $oAddonController->doInsert('blogapi'); - $oAddonController->doInsert('member_communication', 0, 'site', 'Y'); $oAddonController->doInsert('member_extra_info', 0, 'site', 'Y'); $oAddonController->doInsert('mobile', 0, 'site', 'Y'); $oAddonController->doInsert('resize_image', 0, 'site', 'Y'); diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php index d647f62a2..2fd699187 100644 --- a/modules/addon/addon.controller.php +++ b/modules/addon/addon.controller.php @@ -84,7 +84,7 @@ class addonController extends addon $addon_list = $oAddonModel->getInsertedAddons($site_srl, $gtype); foreach($addon_list as $addon => $val) { - if($val->addon == "smartphone" + if($val->addon == "smartphone" || Context::isBlacklistedPlugin($addon) || ($type == "pc" && $val->is_used != 'Y') || ($type == "mobile" && $val->is_used_m != 'Y') || ($gtype == 'global' && $val->is_fixed != 'Y') diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html index 11d746c9e..bed17e82a 100644 --- a/modules/addon/tpl/addon_list.html +++ b/modules/addon/tpl/addon_list.html @@ -34,23 +34,29 @@ -

{$addon->title}

+

{$addon->title}

{$addon->description}

{$lang->msg_avail_easy_update} {$lang->msg_do_you_like_update}

- {$addon->version} + {$addon->version} {$author->name} {$author->name} - {$addon->path} - {$lang->cmd_setup} - - + {$addon->path} + + + {$lang->cmd_setup} + + {$lang->cmd_setup} + + + + {$lang->cmd_delete}