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

Merge branch 'release/1.8.11'

Browse source
This commit is contained in:
bnu 2015-09-17 21:03:18 +09:00
commit 35d09dd351
3 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.inc.php
View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/** /**
* Display XE's full version. * Display XE's full version.
*/ */
define('__XE_VERSION__', '1.8.10'); define('__XE_VERSION__', '1.8.11');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false)); define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false)); define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false)); define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

11
modules/menu/menu.admin.controller.php
View file

@ -543,9 +543,6 @@ class menuAdminController extends menu
if($request->menu_desc) $args->desc = $request->menu_desc; if($request->menu_desc) $args->desc = $request->menu_desc;
else $args->desc = ''; else $args->desc = '';
$args->name = strip_tags(removeHackTag($args->name));
$args->desc = strip_tags(removeHackTag($args->desc));
debugPrint($args);
if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0) if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
{ {
return new Object(-1, 'msg_invalid_request'); return new Object(-1, 'msg_invalid_request');
@ -649,7 +646,7 @@ debugPrint($args);
public function procMenuAdminUpdateItem() public function procMenuAdminUpdateItem()
{ {
$request = Context::getRequestVars(); $request = Context::getRequestVars();
debugPrint($request);
if(!$request->menu_item_srl || !$request->menu_name) if(!$request->menu_item_srl || !$request->menu_name)
{ {
return new Object(-1, 'msg_invalid_request'); return new Object(-1, 'msg_invalid_request');
@ -732,9 +729,6 @@ debugPrint($request);
if($request->menu_desc) $args->desc = $request->menu_desc; if($request->menu_desc) $args->desc = $request->menu_desc;
else $args->desc = ''; else $args->desc = '';
$args->name = removeHackTag($args->name);
$args->desc = removeHackTag($args->desc);
unset($args->group_srls); unset($args->group_srls);
$args->open_window = $request->menu_open_window; $args->open_window = $request->menu_open_window;
$args->expand = $request->menu_expand; $args->expand = $request->menu_expand;
@ -813,9 +807,6 @@ debugPrint($request);
public function _updateMenuItem($itemInfo) public function _updateMenuItem($itemInfo)
{ {
$itemInfo->name = removeHackTag($itemInfo->name);
$itemInfo->desc = removeHackTag($itemInfo->desc);
$output = executeQuery('menu.updateMenuItem', $itemInfo); $output = executeQuery('menu.updateMenuItem', $itemInfo);
return $output; return $output;

8
modules/module/module.controller.php
View file

@ -441,6 +441,8 @@ class moduleController extends module
unset($output); unset($output);
$args->browser_title = strip_tags($args->browser_title);
if($isMenuCreate == TRUE) if($isMenuCreate == TRUE)
{ {
$menuArgs = new stdClass; $menuArgs = new stdClass;
@ -462,7 +464,7 @@ class moduleController extends module
$menuArgs->url = $args->mid; $menuArgs->url = $args->mid;
$menuArgs->expand = 'N'; $menuArgs->expand = 'N';
$menuArgs->is_shortcut = 'N'; $menuArgs->is_shortcut = 'N';
$menuArgs->name = removeHackTag($args->browser_title); $menuArgs->name = $args->browser_title;
$menuArgs->listorder = $args->menu_item_srl * -1; $menuArgs->listorder = $args->menu_item_srl * -1;
$menuItemOutput = executeQuery('menu.insertMenuItem', $menuArgs); $menuItemOutput = executeQuery('menu.insertMenuItem', $menuArgs);
@ -478,7 +480,6 @@ class moduleController extends module
// Insert a module // Insert a module
$args->menu_srl = $menuArgs->menu_srl; $args->menu_srl = $menuArgs->menu_srl;
$args->browser_title = removeHackTag($args->browser_title);
$output = executeQuery('module.insertModule', $args); $output = executeQuery('module.insertModule', $args);
if(!$output->toBool()) if(!$output->toBool())
{ {
@ -521,7 +522,8 @@ class moduleController extends module
if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl; if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
if(!$args->browser_title) $args->browser_title = $module_info->browser_title; if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
} }
$args->browser_title = removeHackTag($args->browser_title);
$args->browser_title = strip_tags($args->browser_title);
$output = executeQuery('module.isExistsModuleName', $args); $output = executeQuery('module.isExistsModuleName', $args);
if(!$output->toBool() || $output->data->count) if(!$output->toBool() || $output->data->count)