fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 1073 when addon mobile option on, error message showed.

Browse source 
fix this bug


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9870 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-11-24 02:30:59 +00:00
parent aefa6e25e3
commit f874e669e0
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/addon/addon.admin.controller.php
View file

@ -20,8 +20,8 @@
**/ **/
function procAddonAdminSaveActivate() function procAddonAdminSaveActivate()
{ {
$pc = Context::get('pc'); $pcOnList = Context::get('pc_on');
$mobile = Context::get('mobile'); $mobileOnList = Context::get('mobile_on');
$fixed = Context::get('fixed'); $fixed = Context::get('fixed');
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
@ -29,13 +29,13 @@
if($site_module_info->site_srl) $site_srl = $site_module_info->site_srl; if($site_module_info->site_srl) $site_srl = $site_module_info->site_srl;
else $site_srl = 0; else $site_srl = 0;
if (!$pc) $pc = array(); if (!$pcOnList) $pcOnList = array();
if (!$mobile) $mobile = array(); if (!$mobileOnList) $mobileOnList = array();
if (!$fixed) $fixed = array(); if (!$fixed) $fixed = array();
if (!is_array($pc)) $pc = array($pc); if (!is_array($pcOnList)) $pcOnList = array($pcOnList);
if (!is_array($mobile)) $pc = array($mobile); if (!is_array($mobileOnList)) $pcOnList = array($mobileOnList);
if (!is_array($fixed)) $pc = array($fixed); if (!is_array($fixed)) $pcOnList = array($fixed);
// get current addon info // get current addon info
$oModel = &getAdminModel('addon'); $oModel = &getAdminModel('addon');
@ -45,13 +45,13 @@
$updateList = array(); $updateList = array();
foreach($currentAddonList as $addon) foreach($currentAddonList as $addon)
{ {
if ($addon->activated !== in_array($addon->addon_name, $pc)) if ($addon->activated !== in_array($addon->addon_name, $pcOnList))
{ {
$updateList[] = $addon->addon_name; $updateList[] = $addon->addon_name;
continue; continue;
} }
if ($addon->mactivated !== in_array($addon->addon_name, $mobile)) if ($addon->mactivated !== in_array($addon->addon_name, $mobileOnList))
{ {
$updateList[] = $addon->addon_name; $updateList[] = $addon->addon_name;
continue; continue;
@ -69,12 +69,12 @@
{ {
unset($args); unset($args);
if (in_array($targetAddon, $pc)) if (in_array($targetAddon, $pcOnList))
$args->is_used = 'Y'; $args->is_used = 'Y';
else else
$args->is_used = 'N'; $args->is_used = 'N';
if (in_array($targetAddon, $mobile)) if (in_array($targetAddon, $mobileOnList))
$args->is_used_m = 'Y'; $args->is_used_m = 'Y';
else else
$args->is_used_m = 'N'; $args->is_used_m = 'N';
@ -97,6 +97,7 @@
$this->makeCacheFile($site_srl, 'mobile', 'site'); $this->makeCacheFile($site_srl, 'mobile', 'site');
} }
$this->setMessage('success_updated', 'info');
if (Context::get('success_return_url')) if (Context::get('success_return_url'))
{ {
$this->setRedirectUrl(Context::get('success_return_url')); $this->setRedirectUrl(Context::get('success_return_url'));

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

@ -41,8 +41,8 @@
</td> </td>
<td>{$addon->path}</td> <td>{$addon->path}</td>
<td><a href="{getUrl('act', 'dispAddonAdminSetup', 'selected_addon', $addon->addon_name)}">{$lang->cmd_setup}</a></td> <td><a href="{getUrl('act', 'dispAddonAdminSetup', 'selected_addon', $addon->addon_name)}">{$lang->cmd_setup}</a></td>
<td><input type="checkbox" name="pc[]" title="PC" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->activated" /></td> <td><input type="checkbox" name="pc_on[]" title="PC" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->activated" /></td>
<td><input type="checkbox" name="mobile[]" title="Mobile" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->mactivated" /></td> <td><input type="checkbox" name="mobile_on[]" title="Mobile" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->mactivated" /></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>