fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 12:02:24 +09:00
Code Issues Projects Releases Packages Wiki Activity

Do not activate blacklisted addons

Browse source
This commit is contained in:
Kijin Sung 2016-02-23 21:51:18 +09:00
parent e335aa477e
commit e0dba3a340
4 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/addon/addon.admin.model.php
View file

@ -46,13 +46,23 @@ class addonAdminModel extends addon
$oAutoinstallModel = getModel('autoinstall'); $oAutoinstallModel = getModel('autoinstall');
foreach($addonList as $key => $addon) foreach($addonList as $key => $addon)
{ {
// check blacklist
$addonList[$key]->isBlacklisted = Context::isBlacklistedPlugin($addon->addon);
// get easyinstall remove url // get easyinstall remove url
$packageSrl = $oAutoinstallModel->getPackageSrlByPath($addon->path); $packageSrl = $oAutoinstallModel->getPackageSrlByPath($addon->path);
$addonList[$key]->remove_url = $oAutoinstallModel->getRemoveUrlByPackageSrl($packageSrl); $addonList[$key]->remove_url = $oAutoinstallModel->getRemoveUrlByPackageSrl($packageSrl);
// get easyinstall need update // get easyinstall need update
if($addonList[$key]->isBlacklisted)
{
$addonList[$key]->need_update = 'N';
}
else
{
$package = $oAutoinstallModel->getInstalledPackages($packageSrl); $package = $oAutoinstallModel->getInstalledPackages($packageSrl);
$addonList[$key]->need_update = $package[$packageSrl]->need_update; $addonList[$key]->need_update = $package[$packageSrl]->need_update;
}
// get easyinstall update url // get easyinstall update url
if($addonList[$key]->need_update == 'Y') if($addonList[$key]->need_update == 'Y')

1
modules/addon/addon.class.php
View file

@ -19,7 +19,6 @@ class addon extends ModuleObject
$oAddonController = getAdminController('addon'); $oAddonController = getAdminController('addon');
$oAddonController->doInsert('autolink', 0, 'site', 'Y'); $oAddonController->doInsert('autolink', 0, 'site', 'Y');
$oAddonController->doInsert('blogapi'); $oAddonController->doInsert('blogapi');
$oAddonController->doInsert('member_communication', 0, 'site', 'Y');
$oAddonController->doInsert('member_extra_info', 0, 'site', 'Y'); $oAddonController->doInsert('member_extra_info', 0, 'site', 'Y');
$oAddonController->doInsert('mobile', 0, 'site', 'Y'); $oAddonController->doInsert('mobile', 0, 'site', 'Y');
$oAddonController->doInsert('resize_image', 0, 'site', 'Y'); $oAddonController->doInsert('resize_image', 0, 'site', 'Y');

2
modules/addon/addon.controller.php
View file

@ -84,7 +84,7 @@ class addonController extends addon
$addon_list = $oAddonModel->getInsertedAddons($site_srl, $gtype); $addon_list = $oAddonModel->getInsertedAddons($site_srl, $gtype);
foreach($addon_list as $addon => $val) foreach($addon_list as $addon => $val)
{ {
if($val->addon == "smartphone" if($val->addon == "smartphone" || Context::isBlacklistedPlugin($addon)
|| ($type == "pc" && $val->is_used != 'Y') || ($type == "pc" && $val->is_used != 'Y')
|| ($type == "mobile" && $val->is_used_m != 'Y') || ($type == "mobile" && $val->is_used_m != 'Y')
|| ($gtype == 'global' && $val->is_fixed != 'Y') || ($gtype == 'global' && $val->is_fixed != 'Y')

18
modules/addon/tpl/addon_list.html
View file

@ -34,23 +34,29 @@
<tbody> <tbody>
<tr loop="$addon_list => $addon"> <tr loop="$addon_list => $addon">
<td class="title"> <td class="title">
<p><strong>{$addon->title}</strong></p> <p><strong style="color:#aaa"|cond="$addon->isBlacklisted">{$addon->title}</strong></p>
<p>{$addon->description}</p> <p>{$addon->description}</p>
<p cond="$addon->need_update == 'Y'" class="update"> <p cond="$addon->need_update == 'Y'" class="update">
{$lang->msg_avail_easy_update} <a href="{$addon->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a> {$lang->msg_avail_easy_update} <a href="{$addon->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a>
</p> </p>
</td> </td>
<td>{$addon->version}</td> <td><span style="color:#aaa"|cond="$addon->isBlacklisted">{$addon->version}</span></td>
<td class="nowr"> <td class="nowr">
<block loop="$addon->author => $author"> <block loop="$addon->author => $author">
<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->name}</a> <a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->name}</a>
<block cond="!$author->homepage">{$author->name}</block> <block cond="!$author->homepage">{$author->name}</block>
</block> </block>
</td> </td>
<td>{$addon->path}</td> <td><span style="color:#aaa"|cond="$addon->isBlacklisted">{$addon->path}</span></td>
<td><a href="{getUrl('act', 'dispAddonAdminSetup', 'selected_addon', $addon->addon_name)}">{$lang->cmd_setup}</a></td> <td>
<td><input type="checkbox" name="pc_on[]" title="PC" value="{htmlspecialchars($addon->addon_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" checked="checked"|cond="$addon->activated" /></td> <!--@if($addon->isBlacklisted)-->
<td><input type="checkbox" name="mobile_on[]" title="Mobile" value="{htmlspecialchars($addon->addon_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" checked="checked"|cond="$addon->mactivated" /></td> <span style="color:#aaa">{$lang->cmd_setup}</span>
<!--@else-->
<a href="{getUrl('act', 'dispAddonAdminSetup', 'selected_addon', $addon->addon_name)}">{$lang->cmd_setup}</a>
<!--@end-->
</td>
<td><input type="checkbox" name="pc_on[]" title="PC" value="{htmlspecialchars($addon->addon_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" checked="checked"|cond="$addon->activated && !$addon->isBlacklisted" disabled="disabled"|cond="$addon->isBlacklisted" /></td>
<td><input type="checkbox" name="mobile_on[]" title="Mobile" value="{htmlspecialchars($addon->addon_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" checked="checked"|cond="$addon->mactivated && !$addon->isBlacklisted" disabled="disabled"|cond="$addon->isBlacklisted" /></td>
<td><a cond="$addon->remove_url" href="{$addon->remove_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a></td> <td><a cond="$addon->remove_url" href="{$addon->remove_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a></td>
</tr> </tr>
</tbody> </tbody>