Menu
▾
▴
[mxbb-commits] core/admin admin_mx_module_cp.php, 1.28, 1.29 admin_mx_page_cp.php, 1.38, 1.39
|
From: Florin C B. <ory...@us...> - 2013-06-25 21:49:13
|
Update of /cvsroot/mxbb/core/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28338 Modified Files: admin_mx_module_cp.php admin_mx_page_cp.php Log Message: Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** admin_mx_module_cp.php 25 Jun 2013 17:15:34 -0000 1.28 --- admin_mx_module_cp.php 25 Jun 2013 21:49:10 -0000 1.29 *************** *** 22,26 **** $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); ! $no_page_header = TRUE; require('./pagestart.' . $phpEx); --- 22,26 ---- $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); ! $no_page_header = true; require('./pagestart.' . $phpEx); Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** admin_mx_page_cp.php 17 Jun 2013 02:53:26 -0000 1.38 --- admin_mx_page_cp.php 25 Jun 2013 21:49:10 -0000 1.39 *************** *** 150,154 **** 'L_CHANGE_NOW' => $lang['Change'], 'S_SUBMIT' => $lang['Update'], ! 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', // --- 150,154 ---- 'L_CHANGE_NOW' => $lang['Change'], 'S_SUBMIT' => $lang['Update'], ! 'RESULT_MESSAGE' => isset($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', // *************** *** 156,160 **** // 'S_ACTION' => mx_append_sid(PORTAL_URL . "admin/admin_mx_page_cp.$phpEx"), ! 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_TITLE' => $lang['Page_admin'], 'L_COLUMN' => $lang['Column'], --- 156,160 ---- // 'S_ACTION' => mx_append_sid(PORTAL_URL . "admin/admin_mx_page_cp.$phpEx"), ! 'BLOCK_SIZE' => (isset($block_size) ? $block_size : '100%'), 'L_TITLE' => $lang['Page_admin'], 'L_COLUMN' => $lang['Column'], *************** *** 178,183 **** 'L_RESYNC' => $lang['Resync'], 'L_RESET' => $lang['Reset'], ! 'L_MOVE_UP' => $new_column ? '' : $lang['Move_up'], ! 'L_MOVE_DOWN' => $new_column ? '' : $lang['Move_down'], // --- 178,183 ---- 'L_RESYNC' => $lang['Resync'], 'L_RESET' => $lang['Reset'], ! 'L_MOVE_UP' => $new_column ? 'up' : $lang['Move_up'], ! 'L_MOVE_DOWN' => $new_column ? 'down' : $lang['Move_down'], // *************** *** 187,203 **** 'L_PAGE_DESC' => $lang['Page_desc'], 'L_PAGE_PARENT' => $lang['Page_parent'], ! 'L_PAGE_ID' => empty($lang['Page_Id']) ? "Page Id" : $lang['Page_Id'], ! 'L_PAGE_ICON' => empty($lang['Page_icon']) ? "Page Icon" : $lang['Page_icon'], ! 'L_PAGE_ALT_ICON' => empty($lang['Page_alt_icon']) ? "Page Alt Icon" : $lang['Page_alt_icon'], ! "L_DEFAULT_STYLE" => empty($lang['Default_page_style']) ? "Default page style" : $lang['Default_page_style'], ! "L_OVERRIDE_STYLE" => empty($lang['Override_page_style']) ? "Override page style" : $lang['Override_page_style'], ! "L_OVERRIDE_STYLE_EXPLAIN" => empty($lang['Override_page_style_explain']) ? "Override page style explain" : $lang['Override_page_style_explain'], ! 'L_PAGE_HEADER' => empty($lang['Page_header']) ? "Page header file" : $lang['Page_header'], ! 'L_PAGE_FOOTER' => empty($lang['Page_footer']) ? "Page footer file" : $lang['Page_footer'], ! 'L_PAGE_MAIN_LAYOUT' => empty($lang['Page_main_layout']) ? "Page main_layout file" : $lang['Page_main_layout'], "L_NAVIGATION_BLOCK" => $lang['Page_Navigation_block'], "L_NAVIGATION_BLOCK_EXPLAIN" => $lang['Page_Navigation_block_explain'], ! 'L_AUTH_TITLE' => empty($lang['Auth_Page']) ? "Permission" : $lang['Auth_Page'], 'L_PRIVATE_AUTH_TITLE' => $lang['Mx_Page_Auth_Title'], 'L_PRIVATE_AUTH_EXPLAIN' => $lang['Mx_Page_Auth_Explain'], --- 187,203 ---- 'L_PAGE_DESC' => $lang['Page_desc'], 'L_PAGE_PARENT' => $lang['Page_parent'], ! 'L_PAGE_ID' => t('Page_Id'), ! 'L_PAGE_ICON' => t('Page_icon'), ! 'L_PAGE_ALT_ICON' => t('Page_alt_icon'), ! "L_DEFAULT_STYLE" => t('Default_page_style'), ! "L_OVERRIDE_STYLE" => t('Override_page_style'), ! "L_OVERRIDE_STYLE_EXPLAIN" => t('Override_page_style_explain'), ! 'L_PAGE_HEADER' => !isset($lang['Page_header']) ? "Page header file" : $lang['Page_header'], ! 'L_PAGE_FOOTER' => !isset($lang['Page_footer']) ? "Page footer file" : $lang['Page_footer'], ! 'L_PAGE_MAIN_LAYOUT' => !isset($lang['Page_main_layout']) ? "Page main_layout file" : $lang['Page_main_layout'], "L_NAVIGATION_BLOCK" => $lang['Page_Navigation_block'], "L_NAVIGATION_BLOCK_EXPLAIN" => $lang['Page_Navigation_block_explain'], ! 'L_AUTH_TITLE' => !isset($lang['Auth_Page']) ? "Permission" : $lang['Auth_Page'], 'L_PRIVATE_AUTH_TITLE' => $lang['Mx_Page_Auth_Title'], 'L_PRIVATE_AUTH_EXPLAIN' => $lang['Mx_Page_Auth_Explain'], *************** *** 208,215 **** "L_PHPBB_STATS" => $lang['Mx_phpBB_stats'], "L_PHPBB_STATS_EXPLAIN" => $lang['Mx_phpBB_stats_explain'], ! ! // // Graphics - // 'IMG_URL_CONTRACT' => $admin_icon['contract'], 'IMG_URL_EXPAND' => $admin_icon['expand'], --- 208,213 ---- "L_PHPBB_STATS" => $lang['Mx_phpBB_stats'], "L_PHPBB_STATS_EXPLAIN" => $lang['Mx_phpBB_stats_explain'], ! // Graphics 'IMG_URL_CONTRACT' => $admin_icon['contract'], 'IMG_URL_EXPAND' => $admin_icon['expand'], *************** *** 221,235 **** 'IMG_ICON_BLOCK' => $admin_icon['block'], 'IMG_ICON_EDIT_BLOCK' => $admin_icon['edit_block'], ! // // Cookies - // 'COOKIE_NAME' => $board_config['cookie_name'], 'COOKIE_PATH' => $board_config['cookie_path'], 'COOKIE_DOMAIN' => $board_config['cookie_domain'], 'COOKIE_SECURE' => $board_config['cookie_secure'], ! ! // // Sorting - // 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], 'L_ORDER' => $lang['Order'], --- 219,230 ---- 'IMG_ICON_BLOCK' => $admin_icon['block'], 'IMG_ICON_EDIT_BLOCK' => $admin_icon['edit_block'], ! // Cookies 'COOKIE_NAME' => $board_config['cookie_name'], 'COOKIE_PATH' => $board_config['cookie_path'], 'COOKIE_DOMAIN' => $board_config['cookie_domain'], 'COOKIE_SECURE' => $board_config['cookie_secure'], ! // Sorting 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], 'L_ORDER' => $lang['Order'], *************** *** 258,264 **** )); - // // Start Page Template - // $sql = "SELECT * FROM " . PAGE_TEMPLATES . " WHERE page_template_id <> 1 ORDER BY page_template_id"; --- 253,257 ---- *************** *** 269,273 **** $template_rows = array(); ! if( $total_templates = $db->sql_numrows($q_templates) ) { $template_rows = $db->sql_fetchrowset($q_templates); --- 262,266 ---- $template_rows = array(); ! if($total_templates = $db->sql_numrows($q_templates)) { $template_rows = $db->sql_fetchrowset($q_templates); *************** *** 276,280 **** $db->sql_freeresult($result); ! if ( $total_templates == 0 ) { $template->assign_block_vars('notemplate', array( --- 269,273 ---- $db->sql_freeresult($result); ! if ($total_templates == 0) { $template->assign_block_vars('notemplate', array( *************** *** 283,289 **** } - // // Templates loop - // for( $template_count = 0; $template_count < $total_templates + 1; $template_count++ ) { --- 276,280 ---- *************** *** 295,302 **** $action = $new_template ? MX_DO_INSERT : MX_DO_UPDATE; $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $page_template_id; ! ! // // Hidden fields - // $s_hidden_template_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> --- 286,291 ---- $action = $new_template ? MX_DO_INSERT : MX_DO_UPDATE; $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $page_template_id; ! // Hidden fields $s_hidden_template_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> *************** *** 310,320 **** . '<br /><br />' . sprintf($lang['Click_page_template_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; ! ! // // Templates subpanel - edit - // $visible_template = in_array('adminTemplateEdit_' . $page_template_id, $cookie_states); $visible_template_delete = in_array('adminTemplateDelete_' . $page_template_id, $cookie_states); ! $template->assign_block_vars('templates', array( 'L_TITLE' => $lang['Page_templates_admin'], --- 299,307 ---- . '<br /><br />' . sprintf($lang['Click_page_template_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; ! // Templates subpanel - edit $visible_template = in_array('adminTemplateEdit_' . $page_template_id, $cookie_states); $visible_template_delete = in_array('adminTemplateDelete_' . $page_template_id, $cookie_states); ! $template->assign_block_vars('templates', array( 'L_TITLE' => $lang['Page_templates_admin'], *************** *** 334,364 **** 'L_TEMPLATE_DELETE' => $lang['Page_template_delete'], 'U_TEMPLATE_DELETE' => mx_append_sid("admin_mx_page_cp_template_setting.$phpEx?mode=deletetemplate&page_template_id=$page_template_id"), ! 'L_CREATE_TEMPLATE' => $lang['Add_Template'], 'L_TEMPLATE' => $lang['Template'], 'L_TEMPLATE_NAME' => $lang['Template_name'], ! ! // // Page subpanel - edit - // 'E_TEMPLATE_TITLE' => $template_title, ! ! // // Main - // 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! ! // // Quick Panels - // 'MESSAGE_DELETE' => $message_delete, - 'S_HIDDEN_FIELDS' => $s_hidden_template_fields, - 'S_SUBMIT' => $new_template ? $lang['Add_Template'] : $lang['Update'] )); ! if ( !$new_template ) { $template->assign_block_vars('templates.edit', array()); --- 321,343 ---- 'L_TEMPLATE_DELETE' => $lang['Page_template_delete'], 'U_TEMPLATE_DELETE' => mx_append_sid("admin_mx_page_cp_template_setting.$phpEx?mode=deletetemplate&page_template_id=$page_template_id"), ! 'L_CREATE_TEMPLATE' => $lang['Add_Template'], 'L_TEMPLATE' => $lang['Template'], 'L_TEMPLATE_NAME' => $lang['Template_name'], ! // Page subpanel - edit 'E_TEMPLATE_TITLE' => $template_title, ! // Main 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! // Quick Panels 'MESSAGE_DELETE' => $message_delete, 'S_HIDDEN_FIELDS' => $s_hidden_template_fields, 'S_SUBMIT' => $new_template ? $lang['Add_Template'] : $lang['Update'] )); ! if (!$new_template) { $template->assign_block_vars('templates.edit', array()); *************** *** 374,392 **** $template->assign_block_vars('templates.current_template', array()); } ! if ( $new_template ) { continue; } ! $sql = "SELECT * FROM " . COLUMN_TEMPLATES . " WHERE page_template_id = $page_template_id ORDER BY page_template_id, column_order"; ! if( !($q_column = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, "Could not query column list", "", __LINE__, __FILE__, $sql); } $q_columns = false; $column_rows = array(); --- 353,372 ---- $template->assign_block_vars('templates.current_template', array()); } ! if ( $new_template ) { continue; } ! $sql = "SELECT * FROM " . COLUMN_TEMPLATES . " WHERE page_template_id = $page_template_id ORDER BY page_template_id, column_order"; ! if( !($q_column = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, "Could not query column list", "", __LINE__, __FILE__, $sql); } + $q_columns = false; $column_rows = array(); *************** *** 395,410 **** $column_rows = $db->sql_fetchrowset($q_columns); } ! $db->sql_freeresult($result); ! ! // // Okay, let's build the index - // for( $column = 0; $column < $total_column + 1; $column++ ) { $new_column = $column == $total_column; ! $column_template_id = $new_column ? $page_template_id . '_0' : $column_rows[$column]['column_template_id']; ! $mode = MX_PAGE_TEMPLATE_COLUMN_TYPE; $action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE; --- 375,388 ---- $column_rows = $db->sql_fetchrowset($q_columns); } ! $db->sql_freeresult($result); ! // Okay, let's build the index for( $column = 0; $column < $total_column + 1; $column++ ) { $new_column = $column == $total_column; ! $column_template_id = $new_column ? $page_template_id . '_0' : $column_rows[$column]['column_template_id']; ! $mode = MX_PAGE_TEMPLATE_COLUMN_TYPE; $action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE; *************** *** 412,419 **** $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_template_id . '&page_template_id=' . $page_template_id . '&move=-15'; $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_template_id . '&page_template_id=' . $page_template_id . '&move=15'; ! ! // // Hidden fields - // $s_hidden_column_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> --- 390,395 ---- $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_template_id . '&page_template_id=' . $page_template_id . '&move=-15'; $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_template_id . '&page_template_id=' . $page_template_id . '&move=15'; ! // Hidden fields $s_hidden_column_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> *************** *** 421,428 **** <input type="hidden" name="id" value="' . $column_template_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! ! // // Subpanel - column edit - // $column_title = $new_column ? '' : $column_rows[$column]['column_title']; $column_size = $new_column ? '100%' : $column_rows[$column]['column_size']; --- 397,402 ---- <input type="hidden" name="id" value="' . $column_template_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! // Subpanel - column edit $column_title = $new_column ? '' : $column_rows[$column]['column_title']; $column_size = $new_column ? '100%' : $column_rows[$column]['column_size']; *************** *** 432,436 **** . '<br /><br />' . sprintf($lang['Click_page_template_column_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; ! $visible_column_edit = in_array('adminTemplateColumnEdit_' . $page_template_id . '_' . $column_template_id, $cookie_states); $visible_column_delete = in_array('adminTemplateColumnDelete_' . $page_template_id . '_' . $column_template_id, $cookie_states); --- 406,410 ---- . '<br /><br />' . sprintf($lang['Click_page_template_column_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; ! $visible_column_edit = in_array('adminTemplateColumnEdit_' . $page_template_id . '_' . $column_template_id, $cookie_states); $visible_column_delete = in_array('adminTemplateColumnDelete_' . $page_template_id . '_' . $column_template_id, $cookie_states); *************** *** 440,488 **** 'IMG_URL' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], 'IMG_URL_DELETE' => $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'], ! 'COLUMN_ID' => $column_template_id, 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode), 'U_COLUMN_MOVE_UP' => mx_append_sid("admin_mx_page_cp.$phpEx" . $upmode), 'U_COLUMN_MOVE_DOWN' => mx_append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! ! // // Column Edit - // 'L_DELETE' => $new_column ? '' : $lang['Delete'], 'L_MOVE_UP' => $new_column ? '' : $lang['Move_up'], 'L_MOVE_DOWN' => $new_column ? '' : $lang['Move_down'], ! 'L_COLUMN' => $lang['Column'], 'L_COLUMN_NAME' => $lang['Column_name'], 'L_COLUMN_SIZE' => $lang['Column_Size'], ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', 'IMG_URL_EDIT' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! 'E_COLUMN_TITLE' => $column_title, 'E_COLUMN_SIZE' => $column_size, ! 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], ! ! // // Quick Panels - // 'MESSAGE_DELETE' => $message_delete, ! 'S_HIDDEN_FIELDS' => $s_hidden_column_fields - )); } // for ... column } ! // ! // Start Page Admin ! // - // // Get the list of phpBB usergroups - // $sql = $mx_backend->generate_group_select_sql(); --- 414,455 ---- 'IMG_URL' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], 'IMG_URL_DELETE' => $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'], ! 'COLUMN_ID' => $column_template_id, 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode), 'U_COLUMN_MOVE_UP' => mx_append_sid("admin_mx_page_cp.$phpEx" . $upmode), 'U_COLUMN_MOVE_DOWN' => mx_append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! // Column Edit 'L_DELETE' => $new_column ? '' : $lang['Delete'], 'L_MOVE_UP' => $new_column ? '' : $lang['Move_up'], 'L_MOVE_DOWN' => $new_column ? '' : $lang['Move_down'], ! 'L_COLUMN' => $lang['Column'], 'L_COLUMN_NAME' => $lang['Column_name'], 'L_COLUMN_SIZE' => $lang['Column_Size'], ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', 'IMG_URL_EDIT' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! 'E_COLUMN_TITLE' => $column_title, 'E_COLUMN_SIZE' => $column_size, ! 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], ! // Quick Panels 'MESSAGE_DELETE' => $message_delete, ! 'S_HIDDEN_FIELDS' => $s_hidden_column_fields )); } // for ... column } ! /* ! * Start Page Admin ! */ // Get the list of phpBB usergroups $sql = $mx_backend->generate_group_select_sql(); *************** *** 571,578 **** $total_pages = $total_pages + $total_pages_current; ! // ! // Pages loop ! // ! for( $page_count = -1; $page_count < $total_pages; $page_count++ ) { $new_page = $page_count == -1; --- 538,545 ---- $total_pages = $total_pages + $total_pages_current; ! /* ! * Pages loop ! */ ! for($page_count = -1; $page_count < $total_pages; $page_count++) { $new_page = $page_count == -1; *************** *** 589,618 **** $action = $new_page ? MX_DO_INSERT : MX_DO_UPDATE; $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $page_id; ! ! // // Hidden fields - // $s_hidden_page_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> <input type="hidden" name="id" value="' . $page_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $s_hidden_private_fields = '<input type="hidden" name="mode" value="' . MX_PAGE_PRIVATE_TYPE . '" /> <input type="hidden" name="action" value="' . MX_DO_UPDATE . '" /> <input type="hidden" name="id" value="' . $page_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! ! $page_title = !$new_page ? $page_rows[$page_count]['page_name'] : ''; $page_desc = !$new_page ? $page_rows[$page_count]['page_desc'] : ''; $page_parent = !$new_page ? $page_rows[$page_count]['page_parent'] : ''; ! $page_icon = !$new_page ? $page_rows[$page_count]['page_icon'] : ''; $page_alt_icon = !$new_page ? $page_rows[$page_count]['page_alt_icon'] : ''; ! $page_header = $page_rows[$page_count]['page_header']; ! $page_footer = $page_rows[$page_count]['page_footer']; ! $page_main_layout = $page_rows[$page_count]['page_main_layout']; ! $navigation_block_list = get_list_formatted('block_list', $page_rows[$page_count]['navigation_block'], 'navigation_block', 'mx_menu_nav.' . $phpEx); ! ! $style_select = mx_style_select($page_rows[$page_count]['default_style'], 'mx_default_style', 'templates', true); $override_user_style_yes = !$new_page ? ( $page_rows[$page_count]['override_user_style'] == 1 ? "checked=\"checked\"" : "" ) : ""; --- 556,582 ---- $action = $new_page ? MX_DO_INSERT : MX_DO_UPDATE; $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $page_id; ! // Hidden fields $s_hidden_page_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> <input type="hidden" name="id" value="' . $page_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $s_hidden_private_fields = '<input type="hidden" name="mode" value="' . MX_PAGE_PRIVATE_TYPE . '" /> <input type="hidden" name="action" value="' . MX_DO_UPDATE . '" /> <input type="hidden" name="id" value="' . $page_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $page_title = !$new_page ? $page_rows[$page_count]['page_name'] : ''; $page_desc = !$new_page ? $page_rows[$page_count]['page_desc'] : ''; $page_parent = !$new_page ? $page_rows[$page_count]['page_parent'] : ''; ! $page_icon = !$new_page ? $page_rows[$page_count]['page_icon'] : 'default.gif'; $page_alt_icon = !$new_page ? $page_rows[$page_count]['page_alt_icon'] : ''; ! $page_header = !$new_page ? $page_rows[$page_count]['page_header'] : 'overall_header_navigation.html'; ! $page_footer = !$new_page ? $page_rows[$page_count]['page_footer'] : 'overall_footer.html'; ! $page_main_layout = !$new_page ? $page_rows[$page_count]['page_main_layout'] : 'mx_main_layout.html'; ! $navigation_block_list = get_list_formatted('block_list', $page_main_layout, 'navigation_block', 'mx_menu_nav.' . $phpEx); ! $default_style = !$new_page ? $page_rows[$page_count]['default_style'] : '_core'; ! $style_select = mx_style_select($default_style, 'mx_default_style', 'templates', true); $override_user_style_yes = !$new_page ? ( $page_rows[$page_count]['override_user_style'] == 1 ? "checked=\"checked\"" : "" ) : ""; *************** *** 628,634 **** $phpbb_stats_default = !$new_page ? ( $page_rows[$page_count]['phpbb_stats'] == -1 ? "checked=\"checked\"" : "" ) : "checked=\"checked\""; - // // Page subpanel - edit - // $visible_page = in_array('adminPage_' . $page_id, $cookie_states); $visible_page_delete = in_array('adminPageDelete_' . $page_id, $cookie_states); --- 592,596 ---- *************** *** 641,648 **** . '<br /><br />' . sprintf($lang['Click_page_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; ! ! // // Make the settings panel default when switching pages - // if ($is_current_page && !$visible_page && !$visible_page_edit && !$visible_page_settings && !$visible_page_private) { --- 603,608 ---- . '<br /><br />' . sprintf($lang['Click_page_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; ! // Make the settings panel default when switching pages if ($is_current_page && !$visible_page && !$visible_page_edit && !$visible_page_settings && !$visible_page_private) { *************** *** 651,658 **** $page_icon = post_icons('page_icons/', $page_icon); ! ! // // Page templates dropdown - // $template_list = !$new_page ? '' : mx_get_list('use_template', PAGE_TEMPLATES, 'page_template_id', 'template_name', 1, true); $l_choose_page_template = !$new_page ? '' : empty($lang['Choose_page_template']) ? "Choose page template" : $lang['Choose_page_template']; --- 611,616 ---- $page_icon = post_icons('page_icons/', $page_icon); ! // Page templates dropdown $template_list = !$new_page ? '' : mx_get_list('use_template', PAGE_TEMPLATES, 'page_template_id', 'template_name', 1, true); $l_choose_page_template = !$new_page ? '' : empty($lang['Choose_page_template']) ? "Choose page template" : $lang['Choose_page_template']; *************** *** 687,696 **** 'U_DELETE' => mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode), 'U_PREVIEW' => mx_append_sid($mx_root_path . "index.$phpEx" . '?page=' . $page_id), ! ! // // Page subpanel - edit - // 'L_CHOOSE_PAGE_TEMPLATE' => $l_choose_page_template, ! 'E_PAGE_TITLE' => $page_title, 'E_PAGE_DESC' => $page_desc, --- 645,652 ---- 'U_DELETE' => mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode), 'U_PREVIEW' => mx_append_sid($mx_root_path . "index.$phpEx" . '?page=' . $page_id), ! // Page subpanel - edit 'L_CHOOSE_PAGE_TEMPLATE' => $l_choose_page_template, ! 'E_PAGE_TITLE' => $page_title, 'E_PAGE_DESC' => $page_desc, *************** *** 703,741 **** "E_NAVIGATION_BLOCK" => $navigation_block_list, 'S_TEMPLATE_LIST' => $template_list, ! ! // // Style - // "STYLE_SELECT" => $style_select, "OVERRIDE_STYLE_YES" => $override_user_style_yes, "OVERRIDE_STYLE_NO" => $override_user_style_no, "OVERRIDE_STYLE_DEFAULT" => $override_user_style_default, ! ! // // IP filter - // "IP_FILTER" => $ip_filter, ! 'S_PHPBB_STATS_YES' => $phpbb_stats_yes, 'S_PHPBB_STATS_NO' => $phpbb_stats_no, 'S_PHPBB_STATS_DEFAULT' => $phpbb_stats_default, ! ! // // Main - // 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'PAGELIST' => $page_list, ! ! // // Quick Panels - // 'MESSAGE_DELETE' => $message_delete, ! 'S_HIDDEN_FIELDS' => $s_hidden_page_fields, 'S_HIDDEN_PRIVATE_FIELDS' => $s_hidden_private_fields, ! 'S_SUBMIT' => $new_page ? $lang['Add_Page'] : $lang['Update'] - )); --- 659,688 ---- "E_NAVIGATION_BLOCK" => $navigation_block_list, 'S_TEMPLATE_LIST' => $template_list, ! // Style "STYLE_SELECT" => $style_select, "OVERRIDE_STYLE_YES" => $override_user_style_yes, "OVERRIDE_STYLE_NO" => $override_user_style_no, "OVERRIDE_STYLE_DEFAULT" => $override_user_style_default, ! // IP filter "IP_FILTER" => $ip_filter, ! 'S_PHPBB_STATS_YES' => $phpbb_stats_yes, 'S_PHPBB_STATS_NO' => $phpbb_stats_no, 'S_PHPBB_STATS_DEFAULT' => $phpbb_stats_default, ! // Main 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'PAGELIST' => $page_list, ! // Quick Panels 'MESSAGE_DELETE' => $message_delete, ! 'S_HIDDEN_FIELDS' => $s_hidden_page_fields, 'S_HIDDEN_PRIVATE_FIELDS' => $s_hidden_private_fields, ! 'S_SUBMIT' => $new_page ? $lang['Add_Page'] : $lang['Update'] )); *************** *** 744,759 **** $template->assign_block_vars('pages.template', array()); } ! ! // // Auth - // $s_column_span = 0; ! for( $j = 0; $j < count($auth_fields); $j++ ) { $custom_auth[$j] = ' <select name="' . $auth_fields[$j] . '">'; ! for( $k = 0; $k < count($auth_levels); $k++ ) { ! $selected = ( $page_rows[$page_count][$auth_fields[$j]] == $auth_const[$k] ) ? ' selected="selected"' : ''; $custom_auth[$j] .= '<option value="' . $auth_const[$k] . '"' . $selected . '>' . $lang['AUTH_' . $auth_levels[$k]] . '</option>'; } --- 691,705 ---- $template->assign_block_vars('pages.template', array()); } ! // Auth $s_column_span = 0; ! for($j = 0; $j < count($auth_fields); $j++) { $custom_auth[$j] = ' <select name="' . $auth_fields[$j] . '">'; ! for($k = 0; $k < count($auth_levels); $k++) { ! $auth_var = ($j > 0) ? $page_rows[$page_count][$auth_fields[$j]] : ''; ! $selected = ($auth_var == $auth_const[$k]) ? ' selected="selected"' : ''; $custom_auth[$j] .= '<option value="' . $auth_const[$k] . '"' . $selected . '>' . $lang['AUTH_' . $auth_levels[$k]] . '</option>'; } *************** *** 962,974 **** 'S_HIDDEN_FIELDS' => $s_hidden_column_fields )); - - // // Add up radioboxes for block to column form - // if (!$new_column) { $radio_column_list .= '<input type="radio" name="id" value="'.$column_id.'" '.$radio_column_checked.' /><span class="gensmall">'.$column_title.' </span><br />'; } ! $sql = "SELECT cbl.*, blk.*, fnc.function_file, function_admin FROM " . COLUMN_BLOCK_TABLE . " cbl, --- 908,917 ---- 'S_HIDDEN_FIELDS' => $s_hidden_column_fields )); // Add up radioboxes for block to column form if (!$new_column) { $radio_column_list .= '<input type="radio" name="id" value="'.$column_id.'" '.$radio_column_checked.' /><span class="gensmall">'.$column_title.' </span><br />'; } ! $column_id = isset($column_rows[$column]['column_id']) ? $column_rows[$column]['column_id'] : 0; $sql = "SELECT cbl.*, blk.*, fnc.function_file, function_admin FROM " . COLUMN_BLOCK_TABLE . " cbl, *************** *** 977,981 **** WHERE blk.function_id = fnc.function_id AND blk.block_id = cbl.block_id ! AND cbl.column_id = '" . $column_rows[$column]['column_id'] . "' ORDER BY column_id, block_order"; --- 920,924 ---- WHERE blk.function_id = fnc.function_id AND blk.block_id = cbl.block_id ! AND cbl.column_id = '" . $column_id . "' ORDER BY column_id, block_order"; |
