Menu
▾
▴
[mxbb-commits] core/includes mx_functions_admincp.php, 1.36, 1.37 mx_functions_core.php, 1.47, 1.48 page_header.php, 1.43, 1.44
|
From: Jon O. <jon...@us...> - 2007-07-09 21:57:10
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3269/includes Modified Files: mx_functions_admincp.php mx_functions_core.php page_header.php Log Message: Added custom icons for nav menu, and pages. New db fields Added postgreSQL schema Updated pak files Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** page_header.php 19 Jun 2007 18:30:43 -0000 1.43 --- page_header.php 9 Jul 2007 21:57:06 -0000 1.44 *************** *** 198,202 **** $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $board_config['board_timezone'] )] : $lang[number_format( $board_config['board_timezone'] )]; ! $page_icon_img = ( !empty($mx_page->page_icon) && $mx_page->page_icon != 'none' && file_exists($mx_root_path . $images['mx_graphics']['page_icons'] . '/' . $mx_page->page_icon) ) ? '<img valign="middle" src="' . PORTAL_URL . $images['mx_graphics']['page_icons'] . '/' . $mx_page->page_icon . '" alt="" /> ' : ''; $search_page_id_pafiledb = get_page_id('dload.php', true); --- 198,209 ---- $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $board_config['board_timezone'] )] : $lang[number_format( $board_config['board_timezone'] )]; ! if (empty($mx_page->page_alt_icon)) ! { ! $page_icon_img = ( !empty($mx_page->page_icon) && $mx_page->page_icon != 'none' && file_exists($mx_root_path . $images['mx_graphics']['page_icons'] . '/' . $mx_page->page_icon) ) ? '<img valign="middle" src="' . PORTAL_URL . $images['mx_graphics']['page_icons'] . '/' . $mx_page->page_icon . '" alt="" /> ' : ''; ! } ! else ! { ! $page_icon_img = '<img valign="middle" src="' . $mx_page->page_alt_icon . '" alt="" /> '; ! } $search_page_id_pafiledb = get_page_id('dload.php', true); Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** mx_functions_admincp.php 4 Jun 2007 21:14:01 -0000 1.36 --- mx_functions_admincp.php 9 Jul 2007 21:57:05 -0000 1.37 *************** *** 334,337 **** --- 334,338 ---- $page_desc = $mx_request_vars->post('page_desc', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, ''); $page_icon = $mx_request_vars->post('menuicons', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, ''); + $page_alt_icon = $mx_request_vars->post('page_alt_icon', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, ''); $default_style = $mx_request_vars->post('mx_default_style', MX_TYPE_INT, '-1'); $override_user_style = $mx_request_vars->post('mx_override_user_style', MX_TYPE_INT, '-1'); *************** *** 370,378 **** } ! $sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, auth_view, default_style, override_user_style, page_header, page_footer, page_main_layout, navigation_block, ip_filter, phpbb_stats ) VALUES ( '" . $page_id_new . "', '" . $page_name . "', '" . $page_desc . "', '" . $page_icon . "', '" . $auth_view . "', '" . $default_style . "', --- 371,380 ---- } ! $sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_alt_icon, auth_view, default_style, override_user_style, page_header, page_footer, page_main_layout, navigation_block, ip_filter, phpbb_stats ) VALUES ( '" . $page_id_new . "', '" . $page_name . "', '" . $page_desc . "', '" . $page_icon . "', + '" . $page_alt_icon . "', '" . $auth_view . "', '" . $default_style . "', *************** *** 926,929 **** --- 928,932 ---- $page_desc = $mx_request_vars->post('page_desc', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, ''); $page_icon = $mx_request_vars->post('menuicons', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, ''); + $page_alt_icon = $mx_request_vars->post('page_alt_icon', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, ''); $default_style = $mx_request_vars->post('mx_default_style', MX_TYPE_INT, '-1'); $override_user_style = $mx_request_vars->post('mx_override_user_style', MX_TYPE_INT, '-1'); *************** *** 951,954 **** --- 954,958 ---- page_desc = '$page_desc', page_icon = '$page_icon', + page_alt_icon = '$page_alt_icon', default_style = '$default_style', override_user_style = '$override_user_style', Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** mx_functions_core.php 19 Jun 2007 19:42:25 -0000 1.47 --- mx_functions_core.php 9 Jul 2007 21:57:05 -0000 1.48 *************** *** 366,369 **** --- 366,370 ---- pag.page_name, pag.page_icon, + pag.page_alt_icon, pag.default_style, pag.override_user_style, *************** *** 412,415 **** --- 413,417 ---- "page_name" => $row['page_name'], "page_icon" => $row['page_icon'], + "page_alt_icon" => $row['page_alt_icon'], "default_style" => $row['default_style'], "override_user_style" => $row['override_user_style'], *************** *** 2540,2543 **** --- 2542,2546 ---- $this->page_title = !empty($lang['pagetitle_' . $this->info['page_name']]) ? $lang['pagetitle_' . $this->info['page_name']] : $this->info['page_name']; $this->page_icon = $this->info['page_icon']; + $this->page_alt_icon = $this->info['page_alt_icon']; $this->default_style = $this->info['default_style'] == -1 ? ($portal_config['default_style']) : ( $this->info['default_style'] ); |
