Menu
▾
▴
[mxbb-commits] core/modules/mx_navmenu/admin mx_module_defs.php, 1.20, 1.21
|
From: Jon O. <jon...@us...> - 2006-06-27 18:12:27
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7357/modules/mx_navmenu/admin Modified Files: mx_module_defs.php Log Message: Further minor tweaks... Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_module_defs.php 17 Jun 2006 20:09:07 -0000 1.20 --- mx_module_defs.php 27 Jun 2006 18:12:22 -0000 1.21 *************** *** 698,702 **** function _do_insert($type, $id ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars; switch ( $type ) --- 698,702 ---- function _do_insert($type, $id ) { ! global $mx_root_path, $phpbb_root_path, $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars; switch ( $type ) *************** *** 713,717 **** $block_id = $mx_request_vars->post('block_id', MX_TYPE_INT, ''); - $sql = "SELECT MAX(cat_order) AS max_order FROM " . MENU_CAT_TABLE; --- 713,716 ---- *************** *** 733,744 **** $smilies_on = $board_config['allow_smilies'] ? true : false; ! $bbcode_uid = make_bbcode_uid(); ! $message = prepare_message($HTTP_POST_VARS['cat_desc'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); $sql = "INSERT INTO " . MENU_CAT_TABLE . " (block_id, cat_title, cat_order, cat_desc, bbcode_uid, cat_show, cat_url, cat_target) VALUES( '" . $block_id . "', ! '" . $mx_request_vars->post('cat_title', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '') . "', '" . $next_order . "', ! '" . $message . "', '" . $bbcode_uid . "', '" . $mx_request_vars->post('cat_show_sel', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', --- 732,754 ---- $smilies_on = $board_config['allow_smilies'] ? true : false; ! // ! // Instantiate the mx_text class ! // ! include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); ! $mx_text = new mx_text(); ! $mx_text->init($html_on, $bbcode_on, $smilies_on); ! ! // ! // Encode for db storage ! // ! $cat_title = $mx_text->encode_simple($mx_request_vars->post('cat_title', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $cat_desc = $mx_text->encode($mx_request_vars->post('cat_desc', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $bbcode_uid = $mx_text->bbcode_uid; $sql = "INSERT INTO " . MENU_CAT_TABLE . " (block_id, cat_title, cat_order, cat_desc, bbcode_uid, cat_show, cat_url, cat_target) VALUES( '" . $block_id . "', ! '" . $cat_title . "', '" . $next_order . "', ! '" . $cat_desc . "', '" . $bbcode_uid . "', '" . $mx_request_vars->post('cat_show_sel', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', *************** *** 807,821 **** $smilies_on = $board_config['allow_smilies'] ? true : false; ! $bbcode_uid = make_bbcode_uid(); ! $message = prepare_message($HTTP_POST_VARS['message'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); $sql = "INSERT INTO " . MENU_NAV_TABLE . " (menu_id, menu_name, cat_id, function_id, block_id, page_id, menu_desc, menu_links, bbcode_uid, menu_order, menu_icon, auth_view, auth_view_group, link_target) VALUES ('" . $next_id . "', ! '" . $mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '') . "', '" . $cat_id . "', '" . $mx_request_vars->post('function_id', MX_TYPE_INT, '') . "', '" . $mx_request_vars->post('block_nav', MX_TYPE_INT, '') . "', '" . $mx_request_vars->post('page_nav', MX_TYPE_INT, '') . "', ! '" . $message . "' , '" . $mx_request_vars->post('menulinks', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', '" . $bbcode_uid . "' , --- 817,842 ---- $smilies_on = $board_config['allow_smilies'] ? true : false; ! // ! // Instantiate the mx_text class ! // ! include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); ! $mx_text = new mx_text(); ! $mx_text->init($html_on, $bbcode_on, $smilies_on); ! ! // ! // Encode for db storage ! // ! $menu_title = $mx_text->encode_simple($mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $menu_desc = $mx_text->encode($mx_request_vars->post('message', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $bbcode_uid = $mx_text->bbcode_uid; $sql = "INSERT INTO " . MENU_NAV_TABLE . " (menu_id, menu_name, cat_id, function_id, block_id, page_id, menu_desc, menu_links, bbcode_uid, menu_order, menu_icon, auth_view, auth_view_group, link_target) VALUES ('" . $next_id . "', ! '" . $menu_title . "', '" . $cat_id . "', '" . $mx_request_vars->post('function_id', MX_TYPE_INT, '') . "', '" . $mx_request_vars->post('block_nav', MX_TYPE_INT, '') . "', '" . $mx_request_vars->post('page_nav', MX_TYPE_INT, '') . "', ! '" . $menu_desc . "' , '" . $mx_request_vars->post('menulinks', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', '" . $bbcode_uid . "' , *************** *** 850,854 **** function _do_update($type, $id ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars; switch ( $type ) --- 871,875 ---- function _do_update($type, $id ) { ! global $mx_root_path, $phpbb_root_path, $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars; switch ( $type ) *************** *** 872,882 **** $smilies_on = $board_config['allow_smilies'] ? true : false; ! $bbcode_uid = make_bbcode_uid(); ! $message = prepare_message($HTTP_POST_VARS['cat_desc'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); $sql = "UPDATE " . MENU_CAT_TABLE . " SET block_id = '" . $block_id . "', ! cat_title = '" . $mx_request_vars->post('cat_title', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '') . "', ! cat_desc = '" . $message . "', bbcode_uid = '" . $bbcode_uid . "', cat_show = '" . $mx_request_vars->post('cat_show_sel', MX_TYPE_INT, '') . "', --- 893,914 ---- $smilies_on = $board_config['allow_smilies'] ? true : false; ! // ! // Instantiate the mx_text class ! // ! include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); ! $mx_text = new mx_text(); ! $mx_text->init($html_on, $bbcode_on, $smilies_on); ! ! // ! // Encode for db storage ! // ! $cat_title = $mx_text->encode_simple($mx_request_vars->post('cat_title', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $cat_desc = $mx_text->encode($mx_request_vars->post('cat_desc', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $bbcode_uid = $mx_text->bbcode_uid; $sql = "UPDATE " . MENU_CAT_TABLE . " SET block_id = '" . $block_id . "', ! cat_title = '" . $cat_title . "', ! cat_desc = '" . $cat_desc . "', bbcode_uid = '" . $bbcode_uid . "', cat_show = '" . $mx_request_vars->post('cat_show_sel', MX_TYPE_INT, '') . "', *************** *** 911,919 **** $smilies_on = $board_config['allow_smilies'] ? true : false; ! $bbcode_uid = make_bbcode_uid(); ! $message = prepare_message( $HTTP_POST_VARS['message'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid ); $sql = "UPDATE " . MENU_NAV_TABLE . " ! SET menu_name = '" . $mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '') . "', menu_icon = '" . $mx_request_vars->post('menuicons', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', cat_id = '" . $mx_request_vars->post('cat_id', MX_TYPE_INT, '') . "', --- 943,962 ---- $smilies_on = $board_config['allow_smilies'] ? true : false; ! // ! // Instantiate the mx_text class ! // ! include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); ! $mx_text = new mx_text(); ! $mx_text->init($html_on, $bbcode_on, $smilies_on); ! ! // ! // Encode for db storage ! // ! $menu_title = $mx_text->encode_simple($mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $menu_desc = $mx_text->encode($mx_request_vars->post('message', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $bbcode_uid = $mx_text->bbcode_uid; $sql = "UPDATE " . MENU_NAV_TABLE . " ! SET menu_name = '" . $menu_title . "', menu_icon = '" . $mx_request_vars->post('menuicons', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', cat_id = '" . $mx_request_vars->post('cat_id', MX_TYPE_INT, '') . "', *************** *** 921,925 **** page_id = '" . $mx_request_vars->post('page_nav', MX_TYPE_INT, '') . "', function_id = '" . $mx_request_vars->post('function_id', MX_TYPE_INT, '') . "', ! menu_desc = '" . $message . "', menu_links = '" . $mx_request_vars->post('menulinks', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', auth_view = '" . $mx_request_vars->post('auth_view', MX_TYPE_INT, '') . "', --- 964,968 ---- page_id = '" . $mx_request_vars->post('page_nav', MX_TYPE_INT, '') . "', function_id = '" . $mx_request_vars->post('function_id', MX_TYPE_INT, '') . "', ! menu_desc = '" . $menu_desc . "', menu_links = '" . $mx_request_vars->post('menulinks', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', auth_view = '" . $mx_request_vars->post('auth_view', MX_TYPE_INT, '') . "', |
