Menu
▾
▴
[mxbb-commits] core/includes mx_functions.php, 1.80, 1.81 mx_functions_core.php, 1.74, 1.75
|
From: Jon O. <jon...@us...> - 2008-02-11 22:53:12
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8694 Modified Files: mx_functions.php mx_functions_core.php Log Message: Updated portal vs phpbb config sync Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** mx_functions_core.php 11 Feb 2008 13:40:27 -0000 1.74 --- mx_functions_core.php 11 Feb 2008 22:52:57 -0000 1.75 *************** *** 2916,2920 **** $s_hidden_fields .= $mx_request_vars->is_get('f') ? '<input type="hidden" name="f" value="' . $mx_request_vars->get('f', MX_TYPE_INT) . '" />' : ''; $s_hidden_fields .= $mx_request_vars->is_get('t') ? '<input type="hidden" name="t" value="' . $mx_request_vars->get('t', MX_TYPE_INT) . '" />' : ''; ! $s_hidden_fields .= $mx_request_vars->get('p') ? '<input type="hidden" name="p" value="' . $mx_request_vars->get('p', MX_TYPE_INT) . '" />' : ''; $this->s_hidden_fields = $s_hidden_fields; --- 2916,2920 ---- $s_hidden_fields .= $mx_request_vars->is_get('f') ? '<input type="hidden" name="f" value="' . $mx_request_vars->get('f', MX_TYPE_INT) . '" />' : ''; $s_hidden_fields .= $mx_request_vars->is_get('t') ? '<input type="hidden" name="t" value="' . $mx_request_vars->get('t', MX_TYPE_INT) . '" />' : ''; ! $s_hidden_fields .= $mx_request_vars->is_get('p') ? '<input type="hidden" name="p" value="' . $mx_request_vars->get('p', MX_TYPE_INT) . '" />' : ''; $this->s_hidden_fields = $s_hidden_fields; *************** *** 2976,2982 **** case 'default_lang': - $do = false; - break; - // // Keep portal settings --- 2976,2979 ---- *************** *** 2988,2994 **** case 'smilies_path': - $do = false; - break; - // // Keep portal settings --- 2985,2988 ---- *************** *** 3002,3008 **** case 'smtp_auth_method': - $do = false; - break; - // // Keep portal settings --- 2996,2999 ---- *************** *** 3012,3018 **** case 'gzip_compress': - $do = false; - break; - // // Keep portal settings --- 3003,3006 ---- *************** *** 3036,3040 **** case 'rand_seed': - $do = false; break; --- 3024,3027 ---- *************** *** 3841,3845 **** * Boolean method to check if POST variable is empty * as it might be set but still be empty. ! * * @access public * @param string $var --- 3828,3832 ---- * Boolean method to check if POST variable is empty * as it might be set but still be empty. ! * * @access public * @param string $var *************** *** 3860,3864 **** * Boolean method to check if GET variable is empty * as it might be set but still be empty ! * * @access public * @param string $var --- 3847,3851 ---- * Boolean method to check if GET variable is empty * as it might be set but still be empty ! * * @access public * @param string $var Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** mx_functions.php 11 Feb 2008 12:39:50 -0000 1.80 --- mx_functions.php 11 Feb 2008 22:52:56 -0000 1.81 *************** *** 790,794 **** function post_icons( $icon_dir = '', $file_posticon = '', $modules_path = '') { ! global $lang, $phpbb_root_path, $module_root_path, $mx_root_path, $is_block, $phpEx; $curicons = 1; --- 790,794 ---- function post_icons( $icon_dir = '', $file_posticon = '', $modules_path = '') { ! global $lang, $phpbb_root_path, $module_root_path, $mx_root_path, $is_block, $phpEx, $images; $curicons = 1; *************** *** 810,815 **** } ! $current_template_path = file_exists($mx_root_path . $modules_path . TEMPLATE_ROOT_PATH . 'images/' . $icon_dir) ? TEMPLATE_ROOT_PATH : 'templates/subSilver/'; ! $handle = @opendir( $mx_root_path . $modules_path . $current_template_path . 'images/' . $icon_dir ); while ( $icon = @readdir( $handle ) ) { --- 810,828 ---- } ! switch ($icon_dir) ! { ! case 'menu_icons/': ! $current_template_path = $images['mx_graphics']['menu_icons'] . '/'; ! break; ! ! case 'page_icons/': ! $current_template_path = $images['mx_graphics']['menu_icons'] . '/'; ! break; ! ! default: ! $current_template_path = file_exists($mx_root_path . $modules_path . TEMPLATE_ROOT_PATH . 'images/' . $icon_dir) ? TEMPLATE_ROOT_PATH . 'images/' . $icon_dir : 'templates/_core/images' . $icon_dir ; ! } ! ! $handle = @opendir( $mx_root_path . $modules_path . $current_template_path ); while ( $icon = @readdir( $handle ) ) { *************** *** 818,826 **** if ( $file_posticon == $icon ) { ! $posticons .= '<input type="radio" name="menuicons" value="' . $icon . '" checked><img src="' . PORTAL_URL . $modules_path . $current_template_path . 'images/' . $icon_dir . $icon . '"> '; } else { ! $posticons .= '<input type="radio" name="menuicons" value="' . $icon . '"><img src="' . PORTAL_URL . $modules_path . $current_template_path . 'images/' . $icon_dir . $icon . '"> '; } --- 831,839 ---- if ( $file_posticon == $icon ) { ! $posticons .= '<input type="radio" name="menuicons" value="' . $icon . '" checked><img src="' . PORTAL_URL . $modules_path . $current_template_path . $icon . '"> '; } else { ! $posticons .= '<input type="radio" name="menuicons" value="' . $icon . '"><img src="' . PORTAL_URL . $modules_path . $current_template_path . $icon . '"> '; } |
