|
From: Markus P. <mar...@us...> - 2005-04-20 00:20:28
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9293/modules/mx_coreblocks Modified Files: mx_multiple_blocks.php Log Message: Revised page header/footer. Index: mx_multiple_blocks.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_multiple_blocks.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_multiple_blocks.php 21 Mar 2005 20:59:33 -0000 1.7 --- mx_multiple_blocks.php 20 Apr 2005 00:20:16 -0000 1.8 *************** *** 18,34 **** * (at your option) any later version. */ ! ! $block_config = read_block_config( $block_id ); $block_id_temp = $block_id; // check parameter for block count ! ! $block_ids = $block_config[$block_id][block_ids]['parameter_value']; ! $block_ids = explode( ',', $block_ids ); ! $nested_block_count = sizeof( $block_ids ); if ( $nested_block_count < 2 ) { ! mx_message_die( GENERAL_ERROR, "Nested block count must be >=2.", "", __LINE__, __FILE__, '' ); } --- 18,40 ---- * (at your option) any later version. */ ! ! if ( !defined('IN_PORTAL') ) ! { ! die("Hacking attempt"); ! } ! ! $block_config = read_block_config($block_id); $block_id_temp = $block_id; + // // check parameter for block count ! // ! $block_ids = $block_config[$block_id]['block_ids']['parameter_value']; ! $block_ids = explode(',', $block_ids); ! $nested_block_count = sizeof($block_ids); if ( $nested_block_count < 2 ) { ! mx_message_die(GENERAL_ERROR, "Nested block count must be >=2.", '', __LINE__, __FILE__, ''); } *************** *** 37,52 **** // mx_message_die(GENERAL_ERROR, "Number of block ids must be equal to block count.", "", __LINE__, __FILE__, ''); // check parameter block sizes ! $block_sizes = $block_config[$block_id][block_sizes]['parameter_value']; ! $block_sizes = explode( ',', $block_sizes ); ! ! if ( sizeof( $block_sizes ) != $nested_block_count ) { ! mx_message_die( GENERAL_ERROR, "Number of block sizes must be equal to block count.", "", __LINE__, __FILE__, '' ); } // check parameter space ! $block_space = $block_config[$block_id][space_between]['parameter_value']; --- 43,60 ---- // mx_message_die(GENERAL_ERROR, "Number of block ids must be equal to block count.", "", __LINE__, __FILE__, ''); + // // check parameter block sizes + // + $block_sizes = $block_config[$block_id]['block_sizes']['parameter_value']; + $block_sizes = explode(',', $block_sizes); ! if ( sizeof($block_sizes) != $nested_block_count ) { ! mx_message_die(GENERAL_ERROR, "Number of block sizes must be equal to block count.", '', __LINE__, __FILE__, ''); } + // // check parameter space ! // $block_space = $block_config[$block_id][space_between]['parameter_value']; *************** *** 56,64 **** } // start the placement table ! echo '<table cellspacing="0" cellpadding="0" border="0" width="100%"><tr>'; ! for ( $cell = 0;$cell < $nested_block_count;$cell++ ) { $inner_block_id = intval($block_ids[$cell]); --- 64,73 ---- } + // // start the placement table ! // echo '<table cellspacing="0" cellpadding="0" border="0" width="100%"><tr>'; ! for( $cell = 0; $cell < $nested_block_count; $cell++ ) { $inner_block_id = intval($block_ids[$cell]); *************** *** 76,91 **** $sql = "SELECT blk.*, module_path, function_file, function_admin, auth_view, auth_edit FROM " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc, ! " . MODULE_TABLE . " mdl WHERE blk.function_id = fnc.function_id AND fnc.module_id = mdl.module_id AND blk.block_id = " . $inner_block_id; - if ( !$block_result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Could not query modules information", "", __LINE__, __FILE__, $sql ); } ! ! $split_block_rows = $db->sql_fetchrow( $block_result ); $HTTP_SESSION_VARS['mx_nested_blocks']['block_' . $inner_block_id] = $split_block_rows; } --- 85,99 ---- $sql = "SELECT blk.*, module_path, function_file, function_admin, auth_view, auth_edit FROM " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc, ! " . MODULE_TABLE . " mdl WHERE blk.function_id = fnc.function_id AND fnc.module_id = mdl.module_id AND blk.block_id = " . $inner_block_id; if ( !$block_result = $db->sql_query( $sql ) ) { ! mx_message_die(GENERAL_ERROR, "Could not query modules information", '', __LINE__, __FILE__, $sql); } ! ! $split_block_rows = $db->sql_fetchrow($block_result); $HTTP_SESSION_VARS['mx_nested_blocks']['block_' . $inner_block_id] = $split_block_rows; } *************** *** 93,123 **** $module_root_path = $split_block_rows['module_path']; $block_x_file = $split_block_rows['function_file']; ! $admin_x_file = !empty( $split_block_rows['function_admin'] ) ? $split_block_rows['function_admin'] : 'admin/admin_mx_block.php'; ! $block_x_edit_img = ( ( $block_x_file == 'mx_multiple_blocks.php' ) ? 'block_edit_split.gif' : ( $block_x_file == 'mx_textblock_blog.php' ? 'block_edit_admin.gif' : 'block_edit.gif' ) ) ; ! $block_x_show_title = intval($split_block_rows['show_title']) == 1 ? TRUE : FALSE; ! $block_x_hidden = intval($split_block_rows['show_block']) == 0 ? TRUE : FALSE; ! $block_x_desc = !empty( $split_block_rows['block_desc'] ) ? ' (' . $split_block_rows['block_desc'] . ')' : ''; ! $block_x_title = !empty( $split_block_rows['block_title'] ) ? $split_block_rows['block_title'] : ''; ! // output a placement table for each single block and the optional space ! ! echo '<td width="' . $inner_block_size . '" valign="top"><table cellspacing="0" cellpadding="0" border="0" width="100%"><tr><td>'; echo '<table width="100%" cellpadding="0" cellspacing="0" border="0" class="mx_blockline">'; ! echo '<tr> '; ! if ( $block_x_show_title ) { echo '<th class="mxthHead" align="left" width="100%"> '. $block_x_title .' </th>'; } ! echo '<th class="mxthHead" align="right" >'; ! // Add EDIT block nav ! ! $is_auth_ary = array(); ! $is_auth_ary = block_auth( AUTH_EDIT, $inner_block_id , $userdata, $split_block_rows['auth_edit'], $split_block_rows['auth_edit_group'] ); ! if ( ($is_auth_ary[auth_edit] || $is_auth_ary[auth_mod]) ) { $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; --- 101,132 ---- $module_root_path = $split_block_rows['module_path']; $block_x_file = $split_block_rows['function_file']; ! $admin_x_file = ( !empty($split_block_rows['function_admin']) ? $split_block_rows['function_admin'] : 'admin/admin_mx_block.php' ); ! $block_x_edit_img = ( ( $block_x_file == 'mx_multiple_blocks.php' ) ? 'block_edit_split.gif' : ( $block_x_file == 'mx_textblock_blog.php' ? 'block_edit_admin.gif' : 'block_edit.gif' ) ); ! $block_x_show_title = ( intval($split_block_rows['show_title']) == 1 ? TRUE : FALSE ); ! $block_x_hidden = ( intval($split_block_rows['show_block']) == 0 ? TRUE : FALSE ); ! $block_x_desc = ( !empty( $split_block_rows['block_desc'] ) ? ' (' . $split_block_rows['block_desc'] . ')' : '' ); ! $block_x_title = ( !empty( $split_block_rows['block_title'] ) ? $split_block_rows['block_title'] : '' ); ! ! // // output a placement table for each single block and the optional space ! // ! echo '<td width="' . $inner_block_size . '" valign="top"><table cellspacing="0" cellpadding="0" border="0" width="100%"><tr><td>'; echo '<table width="100%" cellpadding="0" cellspacing="0" border="0" class="mx_blockline">'; ! echo '<tr>'; ! if ( $block_x_show_title ) { echo '<th class="mxthHead" align="left" width="100%"> '. $block_x_title .' </th>'; } ! echo '<th class="mxthHead" align="right">'; ! ! // // Add EDIT block nav ! // ! $is_auth_ary = block_auth(AUTH_EDIT, $inner_block_id, $userdata, $split_block_rows['auth_edit'], $split_block_rows['auth_edit_group']); ! if ( ($is_auth_ary['auth_edit'] || $is_auth_ary['auth_mod']) ) { $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; *************** *** 126,211 **** $s_hidden_fields .= '<input type="hidden" name="mode" value="setting" />'; ! $edit_url = append_sid( $mx_root_path . $admin_x_file . "?sid=" . $userdata['session_id'] ); ! $edit_img = '<input type="image" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . $block_x_edit_img . '" alt="' . $lang['Block_Edit'] . '" title="' . $lang['Block_Edit'] . ' :: ' . $split_block_rows['block_title'] . $block_x_desc . '">'; ! ! // Generate the fold/unfold categories switches ! ! if ( ( $HTTP_COOKIE_VARS['phpbbEdit_Blocks'] ) != '' ) ! { ! $edit_on = $HTTP_COOKIE_VARS['phpbbEdit_Blocks']; ! } ! else if ( $userdata['user_level'] == ADMIN ) ! { ! $edit_on = true; ! } ! else ! { ! $edit_on = false; ! } ! // output Block Edit header ! ! ! echo '<form action="' . $edit_url . '" method="post" class="mx_editform">'; ! echo '<table width="100%" cellpadding="0" cellspacing="0" border="0">'; ! ! if ( $edit_on ) ! { ! echo '<tbody id="phpbbEdit_Blocks" style="display: ;">'; ! } ! else ! { ! echo '<tbody id="phpbbEdit_Blocks" style="display: none;">'; ! } ! echo '<tr>'; ! ! if ( $block_x_hidden ) ! { ! echo '<td align="left" > '; ! echo '<span class="gensmall"><i>'. $lang['Hidden_block'] .'</i></span>'; ! echo '</td>'; ! } ! echo '<td align="right" > '; ! echo $edit_img . $s_hidden_fields; ! echo '</td>'; ! ! ! echo '</tr>'; ! echo '</tbody>'; ! echo '</table>'; ! echo '</form>'; ! } ! // End ! echo '</th>'; echo '</tr>'; echo '</table>'; ! // check visibility (code from index.php) ! ! $is_auth_ary = array(); ! $is_auth_ary = block_auth( AUTH_VIEW, $inner_block_id , $userdata, $split_block_rows['auth_view'], $split_block_rows['auth_view_group'] ); ! // output the block ! ! if ( ($is_auth_ary[auth_view] && $split_block_rows['show_block'] == 1) || $is_auth_ary[auth_mod] ) ! { // set block id and block size as this must be correctly set for the inclusion to work ! $block_id = $inner_block_id; $block_size = '100%'; ! // echo $module_root_path.$block_file; ! ! $template = new mx_Template( $template->root, $board_config, $db ); ! include( $module_root_path . $block_x_file ); ! // output additional space between blocks if it is not the last block ! if ( $cell < $nested_block_count-1 ) { --- 135,196 ---- $s_hidden_fields .= '<input type="hidden" name="mode" value="setting" />'; + $edit_url = append_sid($mx_root_path . $admin_x_file . "?sid=" . $userdata['session_id']); + $edit_img = '<input type="image" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . $block_x_edit_img . '" alt="' . $lang['Block_Edit'] . '" title="' . $lang['Block_Edit'] . ' :: ' . $split_block_rows['block_title'] . $block_x_desc . '">'; ! // // output Block Edit header ! // ! echo '<form action="' . $edit_url . '" method="post" class="mx_editform">'; ! echo '<table width="100%" cellpadding="0" cellspacing="0" border="0">'; ! echo ' <tbody id="phpbbEdit_Blocks" style="display: ' . ( $mx_show_edit_blocks_on ? 'display' : '' ) . ';">'; ! echo ' <tr>'; ! if ( $block_x_hidden ) ! { ! echo ' <td align="left" > '; ! echo ' <span class="gensmall"><i>'. $lang['Hidden_block'] .'</i></span>'; ! echo ' </td>'; ! } ! echo ' <td align="right" > '; ! echo $edit_img . $s_hidden_fields; ! echo ' </td>'; ! echo ' </tr>'; ! echo ' </tbody>'; ! echo '</table>'; ! echo '</form>'; } ! // // End ! // echo '</th>'; echo '</tr>'; echo '</table>'; ! ! // // check visibility (code from index.php) ! // ! $is_auth_ary = block_auth(AUTH_VIEW, $inner_block_id, $userdata, $split_block_rows['auth_view'], $split_block_rows['auth_view_group']); ! ! // // output the block ! // ! if ( ($is_auth_ary['auth_view'] && $split_block_rows['show_block'] == 1) || $is_auth_ary['auth_mod'] ) ! { ! // // set block id and block size as this must be correctly set for the inclusion to work ! // $block_id = $inner_block_id; $block_size = '100%'; ! ! // // echo $module_root_path.$block_file; ! // ! $template = new mx_Template($template->root, $board_config, $db); ! include($module_root_path . $block_x_file); ! ! // // output additional space between blocks if it is not the last block ! // if ( $cell < $nested_block_count-1 ) { *************** *** 213,225 **** echo '<img src="templates/spacer.gif" width="' . $block_space . '">'; } ! } // finish the inner placement table for a single block echo '</td></tr></table></td>'; } // finish the outer placement table ! echo '</tr></table>'; - ?> \ No newline at end of file --- 198,213 ---- echo '<img src="templates/spacer.gif" width="' . $block_space . '">'; } ! } ! ! // // finish the inner placement table for a single block + // echo '</td></tr></table></td>'; } + // // finish the outer placement table ! // echo '</tr></table>'; ?> \ No newline at end of file |