|
From: Jon O. <jon...@us...> - 2005-08-21 21:41:01
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2254/admin Modified Files: admin_mx_module_cp.php admin_mx_page_cp.php Log Message: updating... Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_module_cp.php 20 Aug 2005 18:19:11 -0000 1.1 --- admin_mx_module_cp.php 21 Aug 2005 21:40:51 -0000 1.2 *************** *** 491,495 **** // Function loop // ! $modulelist = get_list('module_id', MODULE_TABLE, 'module_id', 'module_name', $module_id, true); for( $function_count = 0; $function_count < $total_functions + 1; $function_count++ ) { --- 491,495 ---- // Function loop // ! //$modulelist = get_list('module_id', MODULE_TABLE, 'module_id', 'module_name', $module_id, true); for( $function_count = 0; $function_count < $total_functions + 1; $function_count++ ) { *************** *** 567,571 **** 'L_FUNCTION_ADMIN_FILE' => $lang['Function_admin_file'], ! 'E_MODULE_SELECT' => $modulelist, 'E_FUNCTION_TITLE' => $function_title, 'E_FUNCTION_DESC' => $function_desc, --- 567,571 ---- 'L_FUNCTION_ADMIN_FILE' => $lang['Function_admin_file'], ! //'E_MODULE_SELECT' => $modulelist, 'E_FUNCTION_TITLE' => $function_title, 'E_FUNCTION_DESC' => $function_desc, *************** *** 612,617 **** } ! $functionlist = get_list('function_id', FUNCTION_TABLE, 'function_id', 'function_name', $function_id, true); ! // // Parameter loop --- 612,616 ---- } ! //$functionlist = get_list('function_id', FUNCTION_TABLE, 'function_id', 'function_name', $function_id, true); // // Parameter loop *************** *** 692,696 **** 'L_PARAMETER_ID' => $lang['Parameter_id'], ! 'E_FUNCTION_SELECT' => $functionlist, 'E_PARAMETER_TITLE' => $parameter_title, 'E_PARAMETER_TYPE' => $parameter_type, --- 691,695 ---- 'L_PARAMETER_ID' => $lang['Parameter_id'], ! //'E_FUNCTION_SELECT' => $functionlist, 'E_PARAMETER_TITLE' => $parameter_title, 'E_PARAMETER_TYPE' => $parameter_type, *************** *** 858,862 **** 'E_BLOCK_TITLE' => $block_title, 'E_BLOCK_DESC' => $block_desc, ! 'S_FUNCTION_LIST' => $functionlist, 'S_SHOW_BLOCK_YES' => $show_block_yes, --- 857,861 ---- 'E_BLOCK_TITLE' => $block_title, 'E_BLOCK_DESC' => $block_desc, ! //'S_FUNCTION_LIST' => $functionlist, 'S_SHOW_BLOCK_YES' => $show_block_yes, *************** *** 915,919 **** { $row_color = ( !( $i % 2 ) ) ? 'row1' : 'row2'; ! $row_private .= '<tr>'; $row_private .= '<td width="40%" class="'.$row_color.'" align="center"><span class="gen">'.$groupdata[$i]['group_name'].'</span></td>'; $row_private .= '<td width="20%" class="'.$row_color.'" align="center">'; --- 914,918 ---- { $row_color = ( !( $i % 2 ) ) ? 'row1' : 'row2'; ! $row_private .= '<tr>' . "\n"; $row_private .= '<td width="40%" class="'.$row_color.'" align="center"><span class="gen">'.$groupdata[$i]['group_name'].'</span></td>'; $row_private .= '<td width="20%" class="'.$row_color.'" align="center">'; *************** *** 945,951 **** $row_private .= '<td width="20%" class="'.$row_color.'" align="center">'; ! $row_private .= '<input name="moderator[]" type="checkbox" '. (( in_array($groupdata[$i]['group_id'], $moderator_groups) ) ? 'checked="checked"' : '') . '" value="'.$groupdata[$i]['group_id'].'" />'; $row_private .= '</td>'; ! $row_private .= '</tr>'; } --- 944,950 ---- $row_private .= '<td width="20%" class="'.$row_color.'" align="center">'; ! $row_private .= '<input name="moderator[]" type="checkbox" '. (( in_array($groupdata[$i]['group_id'], $moderator_groups) ) ? 'checked="checked"' : '') . ' value="'.$groupdata[$i]['group_id'].'" />'; $row_private .= '</td>'; ! $row_private .= '</tr>'. "\n"; } Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_page_cp.php 20 Aug 2005 18:19:11 -0000 1.1 --- admin_mx_page_cp.php 21 Aug 2005 21:40:51 -0000 1.2 *************** *** 343,360 **** $template_title = !$new_template ? $template_rows[$template_count]['template_name'] : ''; // // Templates subpanel - edit // ! $visible_template = in_array('adminTemplate_' . $page_template_id, $cookie_states); ! //$visible_template_edit = in_array('adminTemplateEdit_' . $page_template_id, $cookie_states); $template->assign_block_vars('templates', array( ! 'L_TITLE' => $lang['Page_templates_admin'], ! 'L_EXPLAIN' => $lang['Page_templates_admin_explain'], 'VISIBLE' => $visible_template ? 'block' : 'none', 'IMG_URL' => $visible_template ? $admin_icon['contract'] : $admin_icon['expand'], 'TEMPLATE_ID' => $page_template_id, --- 343,367 ---- $template_title = !$new_template ? $template_rows[$template_count]['template_name'] : ''; + + $message_delete = $lang['Delete_page_template'] + . '<br /><br />' . $lang['Delete_page_template_explain'] + . '<br /><br />' . sprintf($lang['Click_page_template_delete_yes'], '<a href="' . 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'], ! 'L_EXPLAIN' => $lang['Page_templates_admin_explain'], 'VISIBLE' => $visible_template ? 'block' : 'none', + 'VISIBLE_DELETE' => $visible_template_delete ? 'block' : 'none', 'IMG_URL' => $visible_template ? $admin_icon['contract'] : $admin_icon['expand'], + 'IMG_URL_DELETE' => $visible_template_delete ? $admin_icon['contract'] : $admin_icon['expand'], 'TEMPLATE_ID' => $page_template_id, *************** *** 363,372 **** 'U_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'L_TEMPLATE_DELETE' => $lang['Page_template_delete'], ! 'U_TEMPLATE_DELETE' => 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 --- 370,379 ---- 'U_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'L_TEMPLATE_DELETE' => $lang['Page_template_delete'], ! 'U_TEMPLATE_DELETE' => 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 *************** *** 377,380 **** --- 384,390 ---- '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, *************** *** 443,450 **** $column_size = $new_column ? '100%' : $column_rows[$column]['column_size']; ! $visible_column_edit = in_array('adminTemplateEdit_' . $page_template_id . '_' . $column_template_id, $cookie_states); $template->assign_block_vars('templates.columnrow', array( 'VISIBLE' => $visible_column_edit ? 'block' : 'none', 'IMG_URL' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], 'COLUMN_ID' => $column_template_id, --- 453,469 ---- $column_size = $new_column ? '100%' : $column_rows[$column]['column_size']; ! $message_delete = $lang['Delete_page_template_column'] . ' - ' . $column_title ! . '<br /><br />' . $lang['Delete_page_template_column_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_template_column_delete_yes'], '<a href="' . 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); $template->assign_block_vars('templates.columnrow', array( 'VISIBLE' => $visible_column_edit ? 'block' : 'none', + 'VISIBLE_DELETE' => $visible_column_delete ? 'block' : 'none', '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, *************** *** 473,476 **** --- 492,498 ---- 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], + + // Quick Panels + 'MESSAGE_DELETE' => $message_delete, 'S_HIDDEN_FIELDS' => $s_hidden_column_fields *************** *** 600,607 **** // Page subpanel - edit // ! $visible_page = in_array('adminPage_' . $page_id, $cookie_states) || $is_current_page; $visible_page_edit = in_array('adminPageEdit_' . $page_id, $cookie_states); ! $visible_page_settings = in_array('adminPageSettings_' . $page_id, $cookie_states) || $is_current_page; $visible_page_private = in_array('adminPagePrivate_' . $page_id, $cookie_states); $page_icon = post_icons('page_icons/', $page_icon); --- 622,643 ---- // Page subpanel - edit // ! $visible_page = in_array('adminPage_' . $page_id, $cookie_states); ! $visible_page_delete = in_array('adminPageDelete_' . $page_id, $cookie_states); $visible_page_edit = in_array('adminPageEdit_' . $page_id, $cookie_states); ! $visible_page_settings = in_array('adminPageSettings_' . $page_id, $cookie_states); $visible_page_private = in_array('adminPagePrivate_' . $page_id, $cookie_states); + + $message_delete = $lang['Delete_page'] + . '<br /><br />' . $lang['Delete_page_explain'] + . '<br /><br />' . sprintf($lang['Click_page_delete_yes'], '<a href="' . 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) + { + $visible_page = $visible_page_settings = true; + } $page_icon = post_icons('page_icons/', $page_icon); *************** *** 624,627 **** --- 660,664 ---- 'VISIBLE' => $visible_page ? 'block' : 'none', + 'VISIBLE_DELETE' => $visible_page_delete && !$new_page ? 'block' : 'none', 'VISIBLE_EDIT' => $visible_page_edit || $new_page ? 'block' : 'none', 'VISIBLE_SETTINGS' => $visible_page_settings && !$new_page ? 'block' : 'none', *************** *** 629,632 **** --- 666,670 ---- 'IMG_URL' => $visible_page ? $admin_icon['contract'] : $admin_icon['expand'], + 'IMG_URL_DELETE' => $visible_page_delete ? $admin_icon['contract'] : $admin_icon['expand'], 'IMG_URL_EDIT' => $visible_page_edit ? $admin_icon['contract'] : $admin_icon['expand'], 'IMG_URL_SETTINGS' => $visible_page_settings ? $admin_icon['contract'] : $admin_icon['expand'], *************** *** 654,657 **** --- 692,698 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'PAGELIST' => $pagelist, + + // Quick Panels + 'MESSAGE_DELETE' => $message_delete, 'S_HIDDEN_FIELDS' => $s_hidden_page_fields, *************** *** 744,757 **** { $row_color = ( !( $i % 2 ) ) ? 'row1' : 'row2'; ! $template->assign_block_vars('pages.grouprow', array( ! 'GROUP_ID' => $groupdata[$i]['group_id'], 'GROUP_NAME' => $groupdata[$i]['group_name'], 'ROW_COLOR' => $row_color, ! 'VIEW_CHECKED' => ( in_array($groupdata[$i]['group_id'], $view_groups) ) ? 'checked="checked"' : '', 'MODERATOR_CHECKED' => ( in_array($groupdata[$i]['group_id'], $moderator_groups) ) ? 'checked="checked"' : '') ); } ! $mx_page = new mx_page(); $mx_page->init( $page_id ); --- 785,815 ---- { $row_color = ( !( $i % 2 ) ) ? 'row1' : 'row2'; ! ! $group_id = $groupdata[$i]['group_id']; ! ! if ( $page_rows[$page_count]['auth_view'] == AUTH_ACL ) ! { ! $view_checked = in_array($groupdata[$i]['group_id'], $view_groups) ? 'checked="checked"' : ''; ! $input_private = '<input name="view[]" type="checkbox" ' . $view_checked . 'value="'.$group_id.'" />'; ! } ! else ! { ! $input_private = '-'; ! } ! ! ! $template->assign_block_vars('pages.grouprow', array( ! 'GROUP_ID' => $group_id, 'GROUP_NAME' => $groupdata[$i]['group_name'], 'ROW_COLOR' => $row_color, ! 'VIEW_INPUT' => $input_private, 'MODERATOR_CHECKED' => ( in_array($groupdata[$i]['group_id'], $moderator_groups) ) ? 'checked="checked"' : '') ); } ! ! // Get blocklist for alternative add_block ! $blocklist = get_list_formatted('block_list', 0, 'block_id'); ! $mx_page = new mx_page(); $mx_page->init( $page_id ); *************** *** 760,928 **** $radio_column_list = ''; ! // ! // Okay, let's build the index ! // ! for( $column = 0; $column < $mx_page->total_column + 1; $column++ ) ! { ! $new_column = $column == $mx_page->total_column; ! $column_id = $new_column ? $page_id . '_0' : $mx_page->columns[$column]['column_id']; ! $mode = MX_PAGE_COLUMN_TYPE; ! $action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $column_id; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_id . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_id . '&move=15'; ! ! // ! // Hidden fields ! // ! $s_hidden_column_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> ! <input type="hidden" name="action" value="' . $action . '" /> ! <input type="hidden" name="id" value="' . $column_id . '" /> ! <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! // ! // Subpanel - column edit ! // ! ! $column_title = $new_column ? '' : $mx_page->columns[$column]['column_title']; ! $column_size = $new_column ? '100%' : $mx_page->columns[$column]['column_size']; ! $visible_column_edit = in_array('adminColumnEdit_' . $page_id . '_' . $column_id, $cookie_states); ! $template->assign_block_vars('pages.columnrow', array( ! 'L_TITLE' => $lang['Column_admin'], ! 'L_TITLE_EXPLAIN' => $lang['Column_admin_explain'], ! 'L_COLUMN' => $lang['Column'], ! 'COLUMN_ID' => $column_id, ! 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => 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_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'], ! '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="column_id" value="'.$column_id.'" '.$radio_column_checked.' /><span class="gensmall">'.$column_title.' </span><br />'; ! } ! // ! // Now continue with page blocks ! // ! for( $block = 0; $block < $mx_page->total_block; $block++ ) { ! if( $mx_page->columns[$column]['column_id'] == $mx_page->blocks[$block]['column_id'] ) ! { ! $block_id = $mx_page->blocks[$block]['block_id']; ! $mx_block->init( $block_id ); ! $block_order = $mx_page->blocks[$block]['block_order']; ! $editor_name_tmp = get_userdata($mx_block->editor_id); ! $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date( $board_config['default_dateformat'], $mx_block->block_time, $board_config['board_timezone'] ); ! $mode = MX_PAGE_BLOCK_TYPE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&block_id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&block_id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&block_id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order . '&move=15'; ! $syncmode = '?mode=' . $mode . '&action=' . MX_DO_SYNC . '&block_id=' . $block_id . '&column_id=' . $column_id; ! if( !empty($mx_block->block_edit_file) ) { $l_setting = $lang['Block_cp']; ! $u_setting = append_sid(PORTAL_URL . $mx_block->block_edit_file . "?block_id=$block_id"); } ! else ! { ! $u_setting = ''; ! $l_setting = ''; ! ! // ! // Show Block Settings even if no BLOCK_SYSTEM_PARAMETER_TABLE row exists. ! // admin_mx_block.php will populate them if necessary (see B4). ! // ! //$param_rows = get_exists(PARAMETER_TABLE, 'function_id', $mx_block->block_config[$block_id]['function_id']); ! //if( $param_rows['number'] > 0 ) ! if ( count( $mx_block->block_config[$block_id] ) > 17) ! { ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); ! } ! } ! $template->assign_block_vars('pages.columnrow.blockrow', array( ! 'L_SETTING' => $l_setting, ! 'L_REMOVE' => $lang['Remove'], ! 'BLOCK_ID' => $block_id, ! 'BLOCK_TITLE' => $mx_block->block_title, ! 'BLOCK_DESC' => ( $mx_block->block_desc != '' ) ? '<br /> ' . $mx_block->block_desc : '', ! 'BLOCK_LAST_EDITED' => ( $editor_name != '' ) ? ' (' . $lang['Block_updated_by'] . $editor_name . ', ' . $edit_time . ')' : '', ! 'ROW_COLOR' => $row_color, ! 'U_BLOCK_EDIT' => $u_setting, ! 'U_BLOCK_SETTING' => $u_setting, ! 'U_BLOCK_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_BLOCK_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_BLOCK_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! 'U_BLOCK_RESYNC' => append_sid("admin_mx_page_cp.$phpEx" . $syncmode) ! )); ! } // if ... column_id == column_id ! } // for ... blocks ! ! if (!$new_column) ! { ! $mode = MX_PAGE_BLOCK_TYPE; ! $action = MX_DO_INSERT; ! // ! // 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="' . $column_id . '" /> ! <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $blocklist = get_list_formatted('block_list', 0, 'block_id'); ! ! $template->assign_block_vars('pages.columnrow.add_block', array( ! 'LIST_BLOCK' => $blocklist, ! 'S_SUBMIT' => $lang['Add_Block'], ! 'S_HIDDEN_FIELDS' => $s_hidden_page_fields ! )); ! $template->assign_block_vars('pages.columnrow.is_columnrow', array()); ! } ! } // for ... column } --- 818,1001 ---- $radio_column_list = ''; ! ! if ( $mx_page->total_column > 0) ! { ! $template->assign_block_vars('pages.has_columns', array()); ! } ! ! // ! // Okay, let's build the index ! // ! for( $column = 0; $column < $mx_page->total_column + 1; $column++ ) ! { ! $new_column = $column == $mx_page->total_column; ! $column_id = $new_column ? $page_id . '_0' : $mx_page->columns[$column]['column_id']; ! $mode = MX_PAGE_COLUMN_TYPE; ! $action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $column_id; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_id . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_id . '&move=15'; ! // ! // Hidden fields ! // ! $s_hidden_column_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> ! <input type="hidden" name="action" value="' . $action . '" /> ! <input type="hidden" name="id" value="' . $column_id . '" /> ! <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $message_delete = $lang['Delete_page_column'] ! . '<br /><br />' . $lang['Delete_page_column_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_column_delete_yes'], '<a href="' . append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') ! . '<br /><br />'; ! // ! // Subpanel - column edit ! // ! ! $column_title = $new_column ? '' : $mx_page->columns[$column]['column_title']; ! $column_size = $new_column ? '100%' : $mx_page->columns[$column]['column_size']; ! ! $visible_column_edit = in_array('adminColumnEdit_' . $page_id . '_' . $column_id, $cookie_states); ! $visible_column_delete = in_array('adminColumnDelete_' . $page_id . '_' . $column_id, $cookie_states); ! $template->assign_block_vars('pages.columnrow', array( ! 'L_TITLE' => $lang['Column_admin'], ! 'L_TITLE_EXPLAIN' => $lang['Column_admin_explain'], ! 'L_COLUMN' => $lang['Column'], ! 'COLUMN_ID' => $column_id, ! 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => 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_SIZE' => $lang['Column_Size'], ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', ! 'VISIBLE_DELETE' => $visible_column_delete ? 'block' : 'none', ! 'IMG_URL_EDIT' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! 'IMG_URL_DELETE' => $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'], ! 'E_COLUMN_TITLE' => $column_title, ! 'E_COLUMN_SIZE' => $column_size, ! ! // Quick Panels ! 'MESSAGE_DELETE' => $message_delete, ! ! 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], ! '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="column_id" value="'.$column_id.'" '.$radio_column_checked.' /><span class="gensmall">'.$column_title.' </span><br />'; ! } ! // ! // Now continue with page blocks ! // ! for( $block = 0; $block < $mx_page->total_block; $block++ ) ! { ! if( $mx_page->columns[$column]['column_id'] == $mx_page->blocks[$block]['column_id'] ) { ! $block_id = $mx_page->blocks[$block]['block_id']; ! $mx_block->init( $block_id ); ! $block_order = $mx_page->blocks[$block]['block_order']; ! $editor_name_tmp = get_userdata($mx_block->editor_id); ! $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date( $board_config['default_dateformat'], $mx_block->block_time, $board_config['board_timezone'] ); ! $mode = MX_PAGE_BLOCK_TYPE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&block_id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&block_id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&block_id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order . '&move=15'; ! $syncmode = '?mode=' . $mode . '&action=' . MX_DO_SYNC . '&block_id=' . $block_id . '&column_id=' . $column_id; ! if( !empty($mx_block->block_edit_file) ) ! { ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid(PORTAL_URL . $mx_block->block_edit_file . "?block_id=$block_id"); ! } ! else ! { ! $u_setting = ''; ! $l_setting = ''; ! ! // ! // Show Block Settings even if no BLOCK_SYSTEM_PARAMETER_TABLE row exists. ! // admin_mx_block.php will populate them if necessary (see B4). ! // ! //$param_rows = get_exists(PARAMETER_TABLE, 'function_id', $mx_block->block_config[$block_id]['function_id']); ! //if( $param_rows['number'] > 0 ) ! if ( count( $mx_block->block_config[$block_id] ) > 17) { $l_setting = $lang['Block_cp']; ! $u_setting = append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); } ! } ! $template->assign_block_vars('pages.columnrow.blockrow', array( ! 'L_SETTING' => $l_setting, ! 'L_REMOVE' => $lang['Remove'], ! 'BLOCK_ID' => $block_id, ! 'BLOCK_TITLE' => $mx_block->block_title, ! 'BLOCK_DESC' => ( $mx_block->block_desc != '' ) ? '<br /> ' . $mx_block->block_desc : '', ! 'BLOCK_LAST_EDITED' => ( $editor_name != '' ) ? ' (' . $lang['Block_updated_by'] . $editor_name . ', ' . $edit_time . ')' : '', ! 'ROW_COLOR' => $row_color, ! 'U_BLOCK_EDIT' => $u_setting, ! 'U_BLOCK_SETTING' => $u_setting, ! 'U_BLOCK_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_BLOCK_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_BLOCK_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! 'U_BLOCK_RESYNC' => append_sid("admin_mx_page_cp.$phpEx" . $syncmode) ! )); ! } // if ... column_id == column_id ! } // for ... blocks ! ! if (!$new_column) ! { ! $mode = MX_PAGE_BLOCK_TYPE; ! $action = MX_DO_INSERT; ! // ! // 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="' . $column_id . '" /> ! <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $template->assign_block_vars('pages.columnrow.add_block', array( ! 'LIST_BLOCK' => $blocklist, ! 'S_SUBMIT' => $lang['Add_Block'], ! 'S_HIDDEN_FIELDS' => $s_hidden_page_fields ! )); ! $template->assign_block_vars('pages.columnrow.is_columnrow', array()); ! } ! } // for ... column } *************** *** 942,1271 **** $template->pparse('body'); include_once('./page_footer_admin.' . $phpEx); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // ****************************************************************** - // - // ****************************************************************** - function page_edit($mode, $page_id) - { - global $template, $lang, $db, $board_config, $theme, $mx_request_vars, $phpEx; - - $auth_fields = array('auth_view'); - $auth_ary = array('auth_view' => AUTH_ALL); - - $auth_levels = array('ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN', 'ANONYMOUS'); - $auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN, AUTH_ANONYMOUS); - - $field_names = array('auth_view' => $lang['View']); - - // - // Show form to create/modify a page - // - if( $mode == 'edit' ) - { - // $newmode determines if we are going to INSERT or UPDATE after posting? - $newmode = 'modify'; - $buttonvalue = $lang['Update']; - - $row = get_info(PAGE_TABLE, 'page_id', $page_id); - - $page_name = $row['page_name']; - $page_desc = $row['page_desc']; - // $page_icon = $row['page_icon']; - $page_icon = post_icons('page_icons/', $row['page_icon']); - $page_header = empty($row['page_header']) ? 'overall_header.tpl' : $row['page_header']; - $page_graph_border = $row['page_graph_border']; - // $page_group_auth_id = $row['auth_view_group']; - $l_choose_page_template = ''; - $template_list = ''; - } - else - { - $newmode = 'create'; - $buttonvalue = $lang['Submit']; - $page_name = $mx_request_vars->post('page_name', MX_TYPE_ANY, ''); - $page_desc = $mx_request_vars->post('page_desc', MX_TYPE_ANY, ''); - // $page_icon = empty($row['page_icon']) ? 'icon_home.gif' : $row['page_icon']; - $page_icon = post_icons('page_icons/'); - $page_header = 'overall_header.tpl'; - $page_graph_border = ''; - - $sql = "SELECT MAX(page_id) AS page_id FROM " . PAGE_TABLE; - if ( !( $result = $db->sql_query($sql) ) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't get page information", '', __LINE__, __FILE__, $sql); - } - - $row = $db->sql_fetchrow($result); - $page_id = $row['page_id'] + 1; - - // - // Page templates dropdown - // - $template_list = get_list('use_template', PAGE_TEMPLATES, 'page_template_id', 'template_name', 1, true); - $l_choose_page_template = empty($lang['Choose_page_template']) ? "Choose page template" : $lang['Choose_page_template']; - } - - $template->set_filenames(array( - 'edit_page' => 'admin/mx_page_edit_body.tpl') - ); - - $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" /><input type="hidden" name="page_id" value="' . $page_id . '" />'; - - - // Output values of individual - // fields - - 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 = ( $row[$auth_fields[$j]] == $auth_const[$k] ) ? ' selected="selected"' : ''; - $custom_auth[$j] .= '<option value="' . $auth_const[$k] . '"' . $selected . '>' . $lang['AUTH_' . $auth_levels[$k]] . '</option>'; - } - $custom_auth[$j] .= '</select> '; - - // $custom_group_auth = mx_get_groups($page_group_auth_id); - - $cell_title = $field_names[$auth_fields[$j]]; - - $template->assign_block_vars('page_auth_titles', array( - 'CELL_TITLE' => $cell_title - )); - $template->assign_block_vars('page_auth_data', array( - 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j] - )); - - $s_column_span++; - } - - $template->assign_vars(array( - 'L_TITLE' => $lang['Page_admin'], - 'L_EXPLAIN' => $lang['Page_admin_explain'], - 'L_PAGE_NAME' => $lang['Page'], - 'L_PAGE_DESC' => $lang['Page_desc'], - '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_HEADER' => empty($lang['Page_header']) ? "Page header file" : $lang['Page_header'] , - 'L_PAGE_GRAPH_BORDER' => empty($lang['Page_graph_border']) ? "Page border graphics" : $lang['Page_graph_border'] , - 'L_PAGE_GRAPH_BORDER_EXPLAIN'=> $lang['Page_graph_border_explain'], - 'L_AUTH_TITLE' => empty($lang['Auth_Page']) ? "Permission" : $lang['Auth_Page'], - 'L_CHOOSE_PAGE_TEMPLATE' => $l_choose_page_template, - - 'PAGE_ID' => $page_id, - 'PAGE_NAME' => $page_name, - 'PAGE_DESC' => $page_desc, - - 'S_PAGE_ICON' => $page_icon, - 'PAGE_HEADER' => $page_header, - 'PAGE_GRAPH_BORDER' => $page_graph_border, - - 'S_ACTION' => append_sid("admin_mx_page_cp.$phpEx"), - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_SUBMIT_VALUE' => $buttonvalue, - 'S_FUNCTION_LIST' => $functionlist, - 'S_TEMPLATE_LIST' => $template_list - )); - - define('IN_ADMIN', 1); - include("./page_header_admin.$phpEx"); - $template->pparse('edit_page'); - include("./page_footer_admin.$phpEx"); - } - - // ****************************************************************** - // Modify a page in the DB - // ****************************************************************** - function page_modify($mode, $page_id) - { - global $template, $lang, $db, $board_config, $theme, $mx_request_vars, $phpEx; - - $page_id_new = $mx_request_vars->post('page_id_new', MX_TYPE_INT, 0); - $page_name = $mx_request_vars->post('page_name', MX_TYPE_ANY, ''); - $page_desc = $mx_request_vars->post('page_desc', MX_TYPE_ANY, ''); - $page_icon = $mx_request_vars->post('menuicon', MX_TYPE_NO_TAGS, ''); - $page_header = $mx_request_vars->post('page_header', MX_TYPE_NO_TAGS, ''); - $page_graph_border = $mx_request_vars->post('page_graph_border', MX_TYPE_NO_TAGS, ''); - $auth_view = $mx_request_vars->post('auth_view', MX_TYPE_INT, 0); - - if( $mode == 'modify' ) - { - if( $page_id != $page_id_new ) - { - $sql = "UPDATE " . COLUMN_TABLE . " - SET page_id = " . $page_id_new . " - WHERE page_id = " . $page_id; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't update page information", '', __LINE__, __FILE__, $sql); - } - } - $sql = "UPDATE " . PAGE_TABLE . " - SET page_id = '$page_id_new', - page_name = '$page_name', - page_desc = '$page_desc', - page_icon = '$page_icon', - page_header = '$page_header', - page_graph_border = '$page_graph_border', - auth_view = '$auth_view' - WHERE page_id = $page_id"; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die( GENERAL_ERROR, "Couldn't update page information", '', __LINE__, __FILE__, $sql); - } - } - else if( $mode == 'create' ) - { - $sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_graph_border, auth_view, page_header ) - VALUES ( '$page_id_new' , '$page_name', '$page_desc', '$page_icon', '$page_graph_border', '$auth_view', '$page_header' )"; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't insert page information", '', __LINE__, __FILE__, $sql); - } - - // - // Page templates - // - $use_template = $mx_request_vars->post('use_template', MX_TYPE_INT, 0); - - if( $use_template > 1 ) - { - $sql = " SELECT * FROM " . COLUMN_TEMPLATES . " WHERE page_template_id = " . $use_template; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't get list of Columns for this template", '', __LINE__, __FILE__, $sql); - } - - $row = $db->sql_fetchrowset($result); - - for( $row_count = 0; $row_count < count($row); $row_count++ ) - { - $sql1 = "INSERT INTO " . COLUMN_TABLE . " (column_title, column_order, column_size, page_id) - VALUES ( '" . $row[$row_count]['column_title'] . "', '" . $row[$row_count]['column_order'] . "', '" . $row[$row_count]['column_size'] . "', '$page_id_new' )"; - if( !($result = $db->sql_query($sql1)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't insert page information", '', __LINE__, __FILE__, $sql); - } - } - } - // - // End of Page templates - // - } - - // Update cache - update_session_cache($block_id); - - $message = $lang['Portal_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_portal_config'], '<a href="' . append_sid("admin_mx_page_cp.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'); - - mx_message_die(GENERAL_MESSAGE, $message); - } - - // ****************************************************************** - // Delete a page - // ****************************************************************** - function page_delete($mode, $page_id) - { - global $template, $lang, $db, $board_config, $theme, $phpEx; - - if( $mode == 'delete' ) - { - $template->set_filenames(array( - 'admin_page' => 'admin/mx_page_delete_body.tpl') - ); - - $buttonvalue = $lang['Delete']; - $newmode = 'delpage'; - - $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" />'; - - $page_name = get_list('page_id', PAGE_TABLE, 'page_id', 'page_name', $page_id, true); - - $template->assign_vars(array( - 'L_PAGE_DELETE' => $lang['Page_admin'], - 'L_PAGE_DELETE_EXPLAIN' => $lang['Page_admin_explain'], - 'L_PAGE_NAME' => $lang['Page'], - 'NAME' => $page_name, - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_PAGE_ACTION' => append_sid("admin_mx_page_cp.$phpEx"), - 'S_SUBMIT_VALUE' => $buttonvalue - )); - - define('IN_ADMIN', 1); - include_once("./page_header_admin.$phpEx"); - $template->pparse('admin_page'); - include_once("./page_footer_admin.$phpEx"); - } - - if( $mode == 'delpage' ) - { - $sql = "SELECT column_id FROM " . COLUMN_TABLE . " WHERE page_id = " . $page_id; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't get list of Column", '', __LINE__, __FILE__, $sql); - } - - while( $row = $db->sql_fetchrow($result) ) - { - $sql = "DELETE FROM " . COLUMN_BLOCK_TABLE . " - WHERE column_id = " . $row['column_id']; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't delete column/block information", '', __LINE__, __FILE__, $sql); - } - } - - $sql = "DELETE FROM " . COLUMN_TABLE . " WHERE page_id = " . $page_id; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't delete page information", '', __LINE__, __FILE__, $sql); - } - - $sql = "DELETE FROM " . PAGE_TABLE . " WHERE page_id = " . $page_id; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't delete page information", '', __LINE__, __FILE__, $sql); - } - - $message = $lang['Portal_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_portal_config'], '<a href="' . append_sid("admin_mx_page_cp.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'); - - // Update cache - update_session_cache($block_id); - - mx_message_die(GENERAL_MESSAGE, $message); - } - } - ?> \ No newline at end of file --- 1015,1017 ---- |