Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: FlorinCB <ory...@us...> - 2008-09-06 02:53:29
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18528 Modified Files: mx_functions_style.php page_header.php Log Message: some modifications Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** page_header.php 29 Aug 2008 00:32:33 -0000 1.59 --- page_header.php 6 Sep 2008 02:53:20 -0000 1.60 *************** *** 304,307 **** --- 304,308 ---- 'T_PHPBB_STYLESHEET' => $theme['head_stylesheet'], + 'T_STYLESHEET_LINK' => (!$mx_user->theme['theme_storedb']) ? "{$phpbb_root_path}styles/" . $mx_user->theme['theme_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$mx_user->session_id&id=" . $mx_user->theme['style_id'] . '&lang=' . $mx_user->encode_lang($board_config['default_lang']), 'T_MXBB_STYLESHEET' => $theme['head_stylesheet'], 'T_GECKO_STYLESHEET' => 'gecko.css', Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** mx_functions_style.php 1 Sep 2008 02:14:16 -0000 1.91 --- mx_functions_style.php 6 Sep 2008 02:53:19 -0000 1.92 *************** *** 241,246 **** { //Do not include phpBB3 overall header and footer files. ! $temppath = str_replace('overall_header', 'index', $temppath); ! $temppath = str_replace('overall_footer', 'index', $temppath); } --- 241,246 ---- { //Do not include phpBB3 overall header and footer files. ! $temppath = str_replace('overall_header', 'overall_header_plugin', $temppath); ! $temppath = str_replace('overall_footer', 'overall_footer_plugin', $temppath); } *************** *** 383,388 **** if (strpos($this->files[$handle],'overall_header.')) { ! $filename3 = 'overall_header_plugin.html'; ! $filename2 = 'index.htm'; $this->debug_paths .= '<br>Module'; $fileSearch = array(); --- 383,389 ---- if (strpos($this->files[$handle],'overall_header.')) { ! //$this->files[$handle] = str_replace('overall_header', 'overall_header_plugin', $this->files[$handle]); ! $filename2 = 'overall_header_plugin.html'; ! $filename3 = 'index.htm'; $this->debug_paths .= '<br>Module'; $fileSearch = array(); *************** *** 392,401 **** $fileSearch[] = './'; // Compatibility with primitive modules ! $this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path); } if (strpos($this->files[$handle],'overall_footer.')) ! { ! $this->files[$handle] = $module_root_path . "templates/index.htm"; //Temp fix } } --- 393,411 ---- $fileSearch[] = './'; // Compatibility with primitive modules ! $this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path); } if (strpos($this->files[$handle],'overall_footer.')) ! { ! $filename2 = 'overall_footer_plugin.html'; ! $filename3 = 'index.htm'; ! $this->debug_paths .= '<br>Module'; ! $fileSearch = array(); ! $fileSearch[] = $style_path; // First check current template ! $fileSearch[] = $mx_user->cloned_template_name; // Then check Cloned template ! $fileSearch[] = $moduleDefault; // Finally check Default template ! $fileSearch[] = './'; // Compatibility with primitive modules ! ! $this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path); } } |
|
From: FlorinCB <ory...@us...> - 2008-09-05 22:58:15
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14770 Modified Files: album_integration.php Log Message: fix Index: album_integration.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_integration.php 5 Sep 2008 22:56:59 -0000 1.7 --- album_integration.php 5 Sep 2008 22:58:12 -0000 1.8 *************** *** 65,69 **** } ! $pageid = ($new_pageid) ? intval($new_pageid) : ($page_id && is_numeric($page_id)) ? intval($page_id) : $mx_request_vars->request('page', MX_TYPE_INT, 1); $args .= ($args == '' ? '' : '&' ) . 'modrewrite=no'; --- 65,69 ---- } ! $pageid = ($new_pageid) ? intval($new_pageid) : ($page_id && is_numeric($page_id)) ? intval($page_id) : $mx_request_vars->request('page', MX_TYPE_INT, $album_index); $args .= ($args == '' ? '' : '&' ) . 'modrewrite=no'; |
|
From: FlorinCB <ory...@us...> - 2008-09-05 22:57:03
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13966 Modified Files: album_integration.php Log Message: fix Index: album_integration.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** album_integration.php 1 Sep 2008 01:11:49 -0000 1.6 --- album_integration.php 5 Sep 2008 22:56:59 -0000 1.7 *************** *** 50,54 **** function this_smartor_mxurl($args = '', $force_standalone_mode = false, $new_pageid = '') { ! global $mx_root_path, $phpbb_root_path, $module_root_path, $mx_request_vars; global $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite; --- 50,54 ---- function this_smartor_mxurl($args = '', $force_standalone_mode = false, $new_pageid = '') { ! global $mx_root_path, $phpbb_root_path, $module_root_path, $mx_request_vars, $page_id; global $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite; *************** *** 65,69 **** } ! $pageid = ($new_pageid) ? intval($new_pageid) : $mx_request_vars->request('page', MX_TYPE_INT, 1); $args .= ($args == '' ? '' : '&' ) . 'modrewrite=no'; --- 65,69 ---- } ! $pageid = ($new_pageid) ? intval($new_pageid) : ($page_id && is_numeric($page_id)) ? intval($page_id) : $mx_request_vars->request('page', MX_TYPE_INT, 1); $args .= ($args == '' ? '' : '&' ) . 'modrewrite=no'; *************** *** 79,83 **** { $mxurl = $mx_root_path . 'index.' . $phpEx; ! if( is_numeric($page_id) && !empty($page_id) ) { $mxurl .= '?page=' . $pageid . $dynamicId. ($args == '' ? '' : '&' . $args); --- 79,83 ---- { $mxurl = $mx_root_path . 'index.' . $phpEx; ! if( is_numeric($pageid) && !empty($pageid) ) { $mxurl .= '?page=' . $pageid . $dynamicId. ($args == '' ? '' : '&' . $args); |
|
From: FlorinCB <ory...@us...> - 2008-09-05 16:23:54
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8848 Modified Files: mx_install.php Log Message: new release topic fixed Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** mx_install.php 24 Aug 2008 13:21:09 -0000 1.102 --- mx_install.php 5 Sep 2008 16:23:49 -0000 1.103 *************** *** 46,50 **** // These URLs are used in the footer installation panels. // ! define('U_RELEASE_NOTES', 'http://www.mx-publisher.com/phpBB2/viewtopic.php?t=10812'); //define('U_WELCOME_PACK', 'http://www.mx-publisher.com/index.php?page=136'); define('U_ONLINE_MANUAL', 'http://www.mx-publisher.com/docs/manual'); --- 46,50 ---- // These URLs are used in the footer installation panels. // ! define('U_RELEASE_NOTES', 'http://www.mx-publisher.com/phpBB2/viewtopic.php?t=10949'); //define('U_WELCOME_PACK', 'http://www.mx-publisher.com/index.php?page=136'); define('U_ONLINE_MANUAL', 'http://www.mx-publisher.com/docs/manual'); |
|
From: FlorinCB <ory...@us...> - 2008-09-05 03:18:56
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26085 Modified Files: album.php Log Message: //IE7+ Google traslate fix for Mod-Rewrite Index: album.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** album.php 29 Aug 2008 05:58:22 -0000 1.25 --- album.php 5 Sep 2008 03:18:49 -0000 1.26 *************** *** 255,258 **** --- 255,268 ---- } + //$full_uri = 'http'. ($_SERVER['HTTPS'] ? 's' : null) .'://'. $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; + + $uri = $_SERVER['REQUEST_URI']; + + //IE7+ Google traslate fix for Mod-Rewrite + if (@strpos($uri, 'page' . $page_id . '/index')) + { + mx_redirect(@str_replace('/page' . $page_id . '/', '', $uri)); //die("worng request $uri"); + } + // // Mode setting |
|
From: FlorinCB <ory...@us...> - 2008-09-04 20:55:37
|
Update of /cvsroot/mxbb/mx_music/music_box/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23850 Modified Files: music_integration.php Log Message: mod_rewrite support added Index: music_integration.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_integration.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_integration.php 29 Jan 2008 07:51:05 -0000 1.2 --- music_integration.php 4 Sep 2008 20:55:33 -0000 1.3 *************** *** 41,69 **** - // MX add-on // Generate paths for page and standalone mode // ...function based on original function written by Markus :-) ! function this_mo_mxurl($args = '', $force_standalone_mode = false) { ! global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block; ! ! if( $force_standalone_mode || !$is_block ) ! { ! $mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args); ! } ! else { ! $mxurl = $mx_root_path . 'index.' . $phpEx; ! if( is_numeric($page_id) && !empty($page_id) ) { ! $mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args); } else { ! $mxurl .= '?page=' . $music_index . ($args == '' ? '' : '&' . $args); } } - return $mxurl; } --- 41,93 ---- // MX add-on // Generate paths for page and standalone mode // ...function based on original function written by Markus :-) ! // This has mod_rewrite disabled ! if (!function_exists('this_mo_mxurl')) { ! function this_mo_mxurl($args = '', $force_standalone_mode = false, $new_pageid = '') { ! global $mx_root_path, $phpbb_root_path, $module_root_path, $mx_request_vars; ! global $music_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite; ! ! if (!$mx_request_vars->is_empty_request('dynamic_block')) { ! $dynamic_block = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, ''); ! } ! elseif (!$mx_request_vars->is_empty_get('dynamic_block')) ! { ! $dynamic_block = $mx_request_vars->get('dynamic_block', MX_TYPE_INT, 0); ! } ! { ! $dynamic_block = ''; ! } ! ! $pageid = ($new_pageid) ? intval($new_pageid) : $mx_request_vars->request('page', MX_TYPE_INT, 1); ! ! $args .= ($args == '' ? '' : '&' ) . 'modrewrite=no'; ! ! $dynamicId = !empty($dynamic_block) ? ( $non_html_amp ? '&dynamic_block=' : '&dynamic_block=' ) . $dynamic_block : ''; ! ! ! if( $force_standalone_mode || !$is_block ) ! { ! $mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args); } else { ! $mxurl = $mx_root_path . 'index.' . $phpEx; ! if( is_numeric($page_id) && !empty($page_id) ) ! { ! $mxurl .= '?page=' . $pageid . $dynamicId. ($args == '' ? '' : '&' . $args); ! } ! else ! { ! $mxurl .= '?page=' . $music_index . ($args == '' ? '' : '&' . $args); ! } } + + return $mxurl; } } |
|
From: FlorinCB <ory...@us...> - 2008-09-04 20:36:23
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3135 Modified Files: album_picm.php Log Message: fix Index: album_picm.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_picm.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** album_picm.php 13 Mar 2008 08:35:57 -0000 1.3 --- album_picm.php 4 Sep 2008 20:36:18 -0000 1.4 *************** *** 73,76 **** --- 73,85 ---- $pic_thumbnail = $thispic['pic_thumbnail']; + $pic_filetype = strtolower(substr($pic_filename, strlen($pic_filename) - 4, 4)); + $pic_fullpath = ALBUM_UPLOAD_PATH . $pic_filename; + $pic_wm_fullpath = ALBUM_WM_CACHE_PATH . 'full_' . $pic_filename; + $pic_med_fullpath = ALBUM_MED_CACHE_PATH . $pic_thumbnail; + $pic_title = $thispic['pic_title']; + $pic_title_reg = ereg_replace("[^A-Za-z0-9]", "_", $pic_title); + $apply_wm = false; + $wm_file = ALBUM_WM_FILE; + if( empty($thispic) or !file_exists(ALBUM_UPLOAD_PATH . $pic_filename) ) { *************** *** 102,106 **** if (empty($thiscat)) { ! die($lang['Category_not_exist']); } --- 111,115 ---- if (empty($thiscat)) { ! //die($lang['Category_not_exist']); } *************** *** 110,118 **** // ------------------------------------ ! $album_user_access = album_user_access($cat_id, $thiscat, 1, 0, 0, 0, 0, 0); // VIEW ! if ($album_user_access['view'] == 0) { ! die($lang['Not_Authorised']); } --- 119,127 ---- // ------------------------------------ ! $album_user_access = album_user_access($cat_id, $thiscat, 1, 0, 1, 1, 1, 1); ! if (($auth_data['view'] == 0) && ($album_user_access['view'] == false)) { ! mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } *************** *** 133,137 **** } - // ------------------------------------ // Check hotlink --- 142,145 ---- *************** *** 182,186 **** // ------------------------------------ ! if( ($pic_filetype != '.jpg') and ($pic_filetype != '.png') ) { // -------------------------------- --- 190,194 ---- // ------------------------------------ ! if( ($pic_filetype != '.jpg') && ($pic_filetype != '.JPG') && ($pic_filetype != '.png') && ($pic_filetype != '.PNG') ) { // -------------------------------- *************** *** 202,214 **** switch ($pic_filetype) { case '.jpg': ! header('Content-type: image/jpeg'); break; case '.png': ! header('Content-type: image/png'); break; } ! readfile(ALBUM_MED_CACHE_PATH . $pic_thumbnail); exit; } --- 210,247 ---- switch ($pic_filetype) { + case '.gif': + $file_header = 'Content-type: image/gif'; + break; case '.jpg': ! $file_header = 'Content-type: image/jpeg'; break; case '.png': ! $file_header = 'Content-type: image/png'; ! break; ! default: ! header('Content-type: image/jpeg'); ! header('Content-Disposition: filename=' . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); ! exit; break; } + + if ( (($pic_filetype == '.jpg') || ($pic_filetype == '.png')) && ($apply_wm == false) ) + { + header($file_header); + header('Content-Disposition: filename=' .$pic_title_reg . $pic_filetype); + readfile($pic_med_fullpath); + exit; + } ! if ( $pic_filetype == '.gif' ) ! { ! header($file_header); ! header('Content-Disposition: filename=' . $pic_title_reg . $pic_filetype); ! readfile($pic_med_fullpath); ! exit; ! } ! ! readfile($pic_med_fullpath); exit; } |
|
From: FlorinCB <ory...@us...> - 2008-09-04 18:05:31
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8996 Modified Files: mx_menu_nav.php Log Message: $mx_bbcode need to be set global on some setups Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** mx_menu_nav.php 13 Jul 2008 19:31:26 -0000 1.35 --- mx_menu_nav.php 4 Sep 2008 18:05:27 -0000 1.36 *************** *** 166,169 **** --- 166,170 ---- $cat_title = $catData[0]['cat_title']; + global $mx_bbcode; $cat = ( !empty($lang[$cat_title]) ? $lang[$cat_title] : $cat_title ); |
|
From: FlorinCB <ory...@us...> - 2008-09-04 00:40:32
|
Update of /cvsroot/mxbb/mx_phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29598 Modified Files: forum_hack.php phpbb_defs.php Removed Files: common.php Log Message: upgrade Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb3/includes/forum_hack.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** forum_hack.php 1 Sep 2008 04:00:59 -0000 1.1 --- forum_hack.php 4 Sep 2008 00:40:25 -0000 1.2 *************** *** 22,31 **** @define('MX_PHPBB3_BLOCK', true); ! ! //include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); ! //include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions_posting.' . $phpEx); ! //include_once($mx_root_path . 'includes/shared/phpbb3/includes/bbcode.' . $phpEx); ! //include_once($mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx); ! //include_once($mx_root_path . 'modules/mx_phpbb3blocks/includes/mx_functions_display.' . $phpEx); // -------------------------------------------------------------------------------- --- 22,26 ---- @define('MX_PHPBB3_BLOCK', true); ! include_once($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); // -------------------------------------------------------------------------------- *************** *** 456,460 **** case 'posting': $mode = $this->_get_mode( $url, $by_http_vars ); ! if ( $mode == 'topicreview' || $mode == 'smilies' ) { return ''; --- 451,455 ---- case 'posting': $mode = $this->_get_mode( $url, $by_http_vars ); ! if ($mode == 'topicreview' || $mode == 'smilies') { return ''; *************** *** 463,467 **** case 'search': $mode = $this->_get_mode( $url, $by_http_vars ); ! if ( $mode == 'searchuser' ) { return ''; --- 458,462 ---- case 'search': $mode = $this->_get_mode( $url, $by_http_vars ); ! if ($mode == 'searchuser') { return ''; *************** *** 470,474 **** case 'viewtopic': $mode = $this->_get_mode( $url, $by_http_vars ); ! if ( $mode == 'printertopic' || $mode == 'smilies' ) { return ''; --- 465,469 ---- case 'viewtopic': $mode = $this->_get_mode( $url, $by_http_vars ); ! if ($mode == 'printertopic' || $mode == 'smilies') { return ''; *************** *** 718,721 **** --- 713,717 ---- function smilies_pass($message) { + global $mx_bbcode; // // Replaces same function in bbcode.php *************** *** 724,728 **** //$smilies_path = $board_config['smilies_path']; //$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path']; ! $message = mx_smilies_pass( $message ); //$board_config['smilies_path'] = $smilies_path; return $message; --- 720,724 ---- //$smilies_path = $board_config['smilies_path']; //$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path']; ! $message = $mx_bbcode->smilies_pass($message); //$board_config['smilies_path'] = $smilies_path; return $message; *************** *** 734,737 **** --- 730,734 ---- function generate_smilies( $mode, $page_id ) { + global $mx_bbcode; // // Replaces same function in functions_post.php *************** *** 740,744 **** //$smilies_path = $board_config['smilies_path']; //$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path']; ! mx_generate_smilies( $mode, $page_id ); //$board_config['smilies_path'] = $smilies_path; $template->assign_vars( array( 'U_MORE_SMILIES' => $this->append_sid( "posting.$phpEx?mode=smilies" ) ) ); --- 737,741 ---- //$smilies_path = $board_config['smilies_path']; //$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path']; ! $mx_bbcode->generate_smilies($mode, $page_id); //$board_config['smilies_path'] = $smilies_path; $template->assign_vars( array( 'U_MORE_SMILIES' => $this->append_sid( "posting.$phpEx?mode=smilies" ) ) ); *************** *** 1236,1240 **** $mx_root_path = $this->mx_root_path; ! $code = file_get_contents($phpbb_root_path . $phpbb_file . ".$phpEx"); // --- 1233,1237 ---- $mx_root_path = $this->mx_root_path; ! $code = strpos($phpbb_file, $phpbb_root_path) ? file_get_contents($phpbb_root_path . $phpbb_file . ".$phpEx") : strpos($phpbb_file, $mx_root_path) ? require_once($phpbb_file . ".$phpEx") : file_get_contents($phpbb_root_path . $phpbb_file . ".$phpEx"); // *************** *** 1259,1264 **** //$code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code); $code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// mxBB: Removed include common.php' . "\n", $code); $code = preg_replace('#^(.?include).*(functions_display).*(\r\n?|\n)#m','require($mx_root_path . \'modules/mx_phpbb3blocks/includes/mx_functions_display.\' . $phpEx);' . "\n", $code); ! // // Commment out the page_header and page_tail includes --- 1256,1275 ---- //$code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code); $code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// mxBB: Removed include common.php' . "\n", $code); + + + // + // Remove some includes already included by mxBB + // + $code = preg_replace ("/include(.*)functions_select/", "//Include this from MXP", $code); + $code = preg_replace ("/include(.*)functions_post/", "//Include this from MXP", $code); + $code = preg_replace ("/include(.*)bbcode/", "//Include this from MXP", $code); + $code = preg_replace ("/include(.*)message_parser/", "//Include this from MXP: message_parser", $code); + + // + // Change some includes already exists in MXP + // + $code = preg_replace('#^(.?include).*(auth).*(\r\n?|\n)#m','require($mx_root_path . \'includes/sessions/phpbb3/auth.\' . $phpEx);' . "\n", $code); $code = preg_replace('#^(.?include).*(functions_display).*(\r\n?|\n)#m','require($mx_root_path . \'modules/mx_phpbb3blocks/includes/mx_functions_display.\' . $phpEx);' . "\n", $code); ! // // Commment out the page_header and page_tail includes *************** *** 1285,1289 **** $code = str_replace('$phpEx =', '// MXP: Removed $phpEx =', $code); $code = str_replace('$user->session_begin()', '// MXP: Removed $user->session_begin()', $code); ! $code = str_replace('$user->setup(', '// MXP: Removed $user->setup(', $code); $code = str_replace('\'body\'', '\'phpbb3_body\'', $code); --- 1296,1300 ---- $code = str_replace('$phpEx =', '// MXP: Removed $phpEx =', $code); $code = str_replace('$user->session_begin()', '// MXP: Removed $user->session_begin()', $code); ! //$code = str_replace('$user->setup(\'viewforum', '// MXP: Removed $user->setup(\'viewforum', $code); $code = str_replace('\'body\'', '\'phpbb3_body\'', $code); *************** *** 1312,1316 **** $code = str_replace('get_user_avatar(', 'mx_get_user_avatar(', $code); $code = str_replace('get_username_string(', 'mx_get_username_string(', $code); ! $code = str_replace('append_sid(', '$mx_forum->append_sid(', $code); $code = str_replace('redirect(', '$mx_forum->redirect(', $code); $code = str_replace('make_jumpbox(', '$mx_forum->make_jumpbox(', $code); --- 1323,1327 ---- $code = str_replace('get_user_avatar(', 'mx_get_user_avatar(', $code); $code = str_replace('get_username_string(', 'mx_get_username_string(', $code); ! $code = str_replace('append_sid(', 'mx3_append_sid(', $code); $code = str_replace('redirect(', '$mx_forum->redirect(', $code); $code = str_replace('make_jumpbox(', '$mx_forum->make_jumpbox(', $code); *************** *** 1331,1344 **** $code = str_replace('bbcode_nl2br(', 'phpBB3::bbcode_nl2br(', $code); $code = str_replace('smiley_text(', 'phpBB3::smiley_text(', $code); ! $code = str_replace('message_die(', 'mx_message_die(', $code); - // - // Remove some includes already included by mxBB - // - $code = preg_replace ("/include(.*)functions_select/", "//", $code); - $code = preg_replace ("/include(.*)functions_post/", "//", $code); - $code = preg_replace ("/include(.*)bbcode/", "//", $code); - $code = preg_replace ("/include(.*)auth/", "include($mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx);", $code); // --- 1342,1348 ---- $code = str_replace('bbcode_nl2br(', 'phpBB3::bbcode_nl2br(', $code); $code = str_replace('smiley_text(', 'phpBB3::smiley_text(', $code); ! $code = str_replace('add_form_key(', 'phpBB3::add_form_key(', $code); $code = str_replace('message_die(', 'mx_message_die(', $code); // *************** *** 1439,1443 **** $code = str_replace('exit;', 'return;', $code); ! break; } --- 1443,1447 ---- $code = str_replace('exit;', 'return;', $code); ! break; } *************** *** 1463,1466 **** --- 1467,1471 ---- { //die(str_replace("\n", '<br>', htmlspecialchars($code))); + //die( '<pre>'.preg_replace("#\n#esi", "'<br>' . sprintf('%4d ',\$i++)", htmlspecialchars($code)) . '</pre>'); eval($code); } *************** *** 1494,1499 **** --- 1499,1512 ---- * ================================================================================ */ + mx_cache::load_file('message_parser', 'phpbb3'); + + if(!function_exists('posting_gen_inline_attachments')) + { + mx_cache::load_file('functions_posting', 'phpbb3'); + } + $mx_forum = new mx_forum(); $mx_forum->init(); + return; Index: phpbb_defs.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb3/includes/phpbb_defs.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** phpbb_defs.php 1 Sep 2008 04:01:10 -0000 1.1 --- phpbb_defs.php 4 Sep 2008 00:40:26 -0000 1.2 *************** *** 15,19 **** define( 'NEWS_CAT_TABLE', FORUMS_TABLE ); ! $cat_extract_order = 'cat_id, forum_order'; $cool_array_category_id = 'forum_id'; --- 15,19 ---- define( 'NEWS_CAT_TABLE', FORUMS_TABLE ); ! $cat_extract_order = 'left_id'; $cool_array_category_id = 'forum_id'; --- common.php DELETED --- |
|
From: FlorinCB <ory...@us...> - 2008-09-04 00:39:21
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29129 Modified Files: session.php Log Message: missing functions required by mx_phpbb3 Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** session.php 20 Jul 2008 02:06:16 -0000 1.29 --- session.php 4 Sep 2008 00:39:17 -0000 1.30 *************** *** 1799,1802 **** --- 1799,1850 ---- /** + * Get language id currently used by the user + **/ + function get_iso_lang_id() + { + global $board_config, $db; + + if (!empty($this->lang_id)) + { + return $this->lang_id; + } + + if (!$this->lang_name) + { + $this->lang_name = $board_config['default_lang']; + } + + $sql = 'SELECT lang_id + FROM ' . LANG_TABLE . " + WHERE lang_iso = '" . $db->sql_escape($this->lang_name) . "'"; + $result = $db->sql_query($sql); + $this->lang_id = (int) $db->sql_fetchfield('lang_id'); + $db->sql_freeresult($result); + + return $this->lang_id; + } + + /** + * Get users profile fields + */ + function get_profile_fields($user_id) + { + global $db; + + if (isset($this->profile_fields)) + { + return; + } + + $sql = 'SELECT * + FROM ' . PROFILE_FIELDS_DATA_TABLE . " + WHERE user_id = $user_id"; + $result = $db->sql_query_limit($sql, 1); + $this->profile_fields = (!($row = $db->sql_fetchrow($result))) ? array() : $row; + $db->sql_freeresult($result); + } + + + /** * Specify/Get images */ |
|
From: FlorinCB <ory...@us...> - 2008-09-04 00:04:30
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10196 Modified Files: functions_posting.php Log Message: more replacements Index: functions_posting.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_posting.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** functions_posting.php 4 Sep 2008 00:02:06 -0000 1.4 --- functions_posting.php 4 Sep 2008 00:04:27 -0000 1.5 *************** *** 23,27 **** function generate_smilies($mode, $forum_id) { ! global $phpbb_auth, $db, $user, $config, $template; global $phpEx, $phpbb_root_path; --- 23,27 ---- function generate_smilies($mode, $forum_id) { ! global $phpbb_auth, $db, $mx_user, $config, $template; global $phpEx, $phpbb_root_path; *************** *** 37,48 **** $db->sql_freeresult($result); ! $user->setup('posting', (int) $row['forum_style']); } else { ! $user->setup('posting'); } ! page_header($user->lang['SMILIES']); $template->set_filenames(array( --- 37,48 ---- $db->sql_freeresult($result); ! $mx_user->setup('posting', (int) $row['forum_style']); } else { ! $mx_user->setup('posting'); } ! page_header($mx_user->lang['SMILIES']); $template->set_filenames(array( *************** *** 248,255 **** function posting_gen_topic_icons($mode, $icon_id) { ! global $phpbb_root_path, $config, $template, $cache; // Grab icons ! $icons = $cache->obtain_icons(); if (!$icon_id) --- 248,255 ---- function posting_gen_topic_icons($mode, $icon_id) { ! global $phpbb_root_path, $config, $template, $mx_cache; // Grab icons ! $icons = $mx_cache->obtain_icons(); if (!$icon_id) *************** *** 287,291 **** function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL) { ! global $phpbb_auth, $user, $template, $topic_type; $toggle = false; --- 287,291 ---- function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL) { ! global $phpbb_auth, $mx_user, $template, $topic_type; $toggle = false; *************** *** 311,315 **** 'VALUE' => $topic_value['const'], 'S_CHECKED' => ($cur_topic_type == $topic_value['const'] || ($forum_id == 0 && $topic_value['const'] == POST_GLOBAL)) ? ' checked="checked"' : '', ! 'L_TOPIC_TYPE' => $user->lang[$topic_value['lang']] ); } --- 311,315 ---- 'VALUE' => $topic_value['const'], 'S_CHECKED' => ($cur_topic_type == $topic_value['const'] || ($forum_id == 0 && $topic_value['const'] == POST_GLOBAL)) ? ' checked="checked"' : '', ! 'L_TOPIC_TYPE' => $mx_user->lang[$topic_value['lang']] ); } *************** *** 321,325 **** 'VALUE' => POST_NORMAL, 'S_CHECKED' => ($topic_type == POST_NORMAL) ? ' checked="checked"' : '', ! 'L_TOPIC_TYPE' => $user->lang['POST_NORMAL'])), $topic_type_array --- 321,325 ---- 'VALUE' => POST_NORMAL, 'S_CHECKED' => ($topic_type == POST_NORMAL) ? ' checked="checked"' : '', ! 'L_TOPIC_TYPE' => $mx_user->lang['POST_NORMAL'])), $topic_type_array *************** *** 350,354 **** function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false) { ! global $phpbb_auth, $user, $config, $db, $cache; global $phpbb_root_path, $phpEx; --- 350,354 ---- function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false) { ! global $phpbb_auth, $mx_user, $config, $db, $mx_cache; global $phpbb_root_path, $phpEx; *************** *** 371,379 **** if (!$filedata['post_attach']) { ! $filedata['error'][] = $user->lang['NO_UPLOAD_FORM_FOUND']; return $filedata; } ! $extensions = $cache->obtain_attach_extensions((($is_message) ? false : (int) $forum_id)); $upload->set_allowed_extensions(array_keys($extensions['_allowed_'])); --- 371,379 ---- if (!$filedata['post_attach']) { ! $filedata['error'][] = $mx_user->lang['NO_UPLOAD_FORM_FOUND']; return $filedata; } ! $extensions = $mx_cache->obtain_attach_extensions((($is_message) ? false : (int) $forum_id)); $upload->set_allowed_extensions(array_keys($extensions['_allowed_'])); *************** *** 395,399 **** // If this error occurs a user tried to exploit an IE Bug by renaming extensions // Since the image category is displaying content inline we need to catch this. ! trigger_error($user->lang['ATTACHED_IMAGE_NOT_IMAGE']); } --- 395,399 ---- // If this error occurs a user tried to exploit an IE Bug by renaming extensions // Since the image category is displaying content inline we need to catch this. ! trigger_error($mx_user->lang['ATTACHED_IMAGE_NOT_IMAGE']); } *************** *** 422,426 **** } ! $file->clean_filename('unique', $user->data['user_id'] . '_'); // Are we uploading an image *and* this image being within the image category? Only then perform additional image checks. --- 422,426 ---- } ! $file->clean_filename('unique', $mx_user->data['user_id'] . '_'); // Are we uploading an image *and* this image being within the image category? Only then perform additional image checks. *************** *** 450,454 **** if ($config['upload_dir_size'] + $file->get('filesize') > $config['attachment_quota']) { ! $filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED']; $filedata['post_attach'] = false; --- 450,454 ---- if ($config['upload_dir_size'] + $file->get('filesize') > $config['attachment_quota']) { ! $filedata['error'][] = $mx_user->lang['ATTACH_QUOTA_REACHED']; $filedata['post_attach'] = false; *************** *** 464,468 **** if ($free_space <= $file->get('filesize')) { ! $filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED']; $filedata['post_attach'] = false; --- 464,468 ---- if ($free_space <= $file->get('filesize')) { ! $filedata['error'][] = $mx_user->lang['ATTACH_QUOTA_REACHED']; $filedata['post_attach'] = false; *************** *** 759,763 **** function posting_gen_attachment_entry($attachment_data, &$filename_data) { ! global $template, $config, $phpbb_root_path, $phpEx, $user; $template->assign_vars(array( --- 759,763 ---- function posting_gen_attachment_entry($attachment_data, &$filename_data) { ! global $template, $config, $phpbb_root_path, $phpEx, $mx_user; $template->assign_vars(array( *************** *** 784,788 **** } ! $download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? $user->session_id : false); $template->assign_block_vars('attach_row', array( --- 784,788 ---- } ! $download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? $mx_user->session_id : false); $template->assign_block_vars('attach_row', array( *************** *** 817,821 **** function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) { ! global $user, $db, $template, $phpbb_auth; global $phpbb_root_path, $phpEx; --- 817,821 ---- function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) { ! global $mx_user, $db, $template, $phpbb_auth; global $phpbb_root_path, $phpEx; *************** *** 838,842 **** FROM ' . DRAFTS_TABLE . ' d LEFT JOIN ' . FORUMS_TABLE . ' f ON (f.forum_id = d.forum_id) ! WHERE d.user_id = ' . $user->data['user_id'] . " $sql_and ORDER BY d.save_time DESC"; --- 838,842 ---- FROM ' . DRAFTS_TABLE . ' d LEFT JOIN ' . FORUMS_TABLE . ' f ON (f.forum_id = d.forum_id) ! WHERE d.user_id = ' . $mx_user->data['user_id'] . " $sql_and ORDER BY d.save_time DESC"; *************** *** 913,917 **** $template->assign_block_vars('draftrow', array( 'DRAFT_ID' => $draft['draft_id'], ! 'DATE' => $user->format_date($draft['save_time']), 'DRAFT_SUBJECT' => $draft['draft_subject'], --- 913,917 ---- $template->assign_block_vars('draftrow', array( 'DRAFT_ID' => $draft['draft_id'], ! 'DATE' => $mx_user->format_date($draft['save_time']), 'DRAFT_SUBJECT' => $draft['draft_subject'], *************** *** 932,936 **** function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true) { ! global $user, $phpbb_auth, $db, $template, $bbcode, $cache; global $config, $phpbb_root_path, $phpEx; --- 932,936 ---- function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true) { ! global $mx_user, $phpbb_auth, $db, $template, $bbcode, $mx_cache; global $config, $phpbb_root_path, $phpEx; *************** *** 999,1003 **** if ($has_attachments && $phpbb_auth->acl_get('u_download') && $phpbb_auth->acl_get('f_download', $forum_id)) { ! $extensions = $cache->obtain_attach_extensions($forum_id); // Get attachments... --- 999,1003 ---- if ($has_attachments && $phpbb_auth->acl_get('u_download') && $phpbb_auth->acl_get('f_download', $forum_id)) { ! $extensions = $mx_cache->obtain_attach_extensions($forum_id); // Get attachments... *************** *** 1068,1078 **** 'POST_SUBJECT' => $post_subject, ! 'MINI_POST_IMG' => $user->img('icon_post_target', $user->lang['POST']), ! 'POST_DATE' => $user->format_date($row['post_time']), 'MESSAGE' => $message, 'DECODED_MESSAGE' => $decoded_message, 'POST_ID' => $row['post_id'], 'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'], ! 'U_MCP_DETAILS' => ($phpbb_auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', 'POSTER_QUOTE' => ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '') ); --- 1068,1078 ---- 'POST_SUBJECT' => $post_subject, ! 'MINI_POST_IMG' => $mx_user->img('icon_post_target', $mx_user->lang['POST']), ! 'POST_DATE' => $mx_user->format_date($row['post_time']), 'MESSAGE' => $message, 'DECODED_MESSAGE' => $decoded_message, 'POST_ID' => $row['post_id'], 'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'], ! 'U_MCP_DETAILS' => ($phpbb_auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $mx_user->session_id) : '', 'POSTER_QUOTE' => ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '') ); *************** *** 1094,1098 **** if ($mode == 'topic_review') { ! $template->assign_var('QUOTE_IMG', $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE'])); } --- 1094,1098 ---- if ($mode == 'topic_review') { ! $template->assign_var('QUOTE_IMG', $mx_user->img('icon_post_quote', $mx_user->lang['REPLY_WITH_QUOTE'])); } *************** *** 1105,1109 **** function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id) { ! global $db, $user, $config, $phpbb_root_path, $phpEx, $phpbb_auth; $topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false; --- 1105,1109 ---- function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id) { ! global $db, $mx_user, $config, $phpbb_root_path, $phpEx, $phpbb_auth; $topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false; *************** *** 1128,1132 **** $result = $db->sql_query($sql); ! $sql_ignore_users = ANONYMOUS . ', ' . $user->data['user_id']; while ($row = $db->sql_fetchrow($result)) { --- 1128,1132 ---- $result = $db->sql_query($sql); ! $sql_ignore_users = ANONYMOUS . ', ' . $mx_user->data['user_id']; while ($row = $db->sql_fetchrow($result)) { *************** *** 1208,1216 **** foreach ($phpbb_auth->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary) { ! foreach ($forum_ary as $phpbb_auth_option => $user_ary) { ! foreach ($user_ary as $user_id) { ! $notify_rows[$user_id]['allowed'] = true; } } --- 1208,1216 ---- foreach ($phpbb_auth->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary) { ! foreach ($forum_ary as $phpbb_auth_option => $mx_user_ary) { ! foreach ($mx_user_ary as $mx_user_id) { ! $notify_rows[$mx_user_id]['allowed'] = true; } } *************** *** 1220,1224 **** // Now, we have to do a little step before really sending, we need to distinguish our users a little bit. ;) $msg_users = $delete_ids = $update_notification = array(); ! foreach ($notify_rows as $user_id => $row) { if (!$row['allowed'] || !trim($row['user_email'])) --- 1220,1224 ---- // Now, we have to do a little step before really sending, we need to distinguish our users a little bit. ;) $msg_users = $delete_ids = $update_notification = array(); ! foreach ($notify_rows as $mx_user_id => $row) { if (!$row['allowed'] || !trim($row['user_email'])) *************** *** 1332,1336 **** function delete_post($forum_id, $topic_id, $post_id, &$data) { ! global $db, $user, $phpbb_auth; global $config, $phpEx, $phpbb_root_path; --- 1332,1336 ---- function delete_post($forum_id, $topic_id, $post_id, &$data) { ! global $db, $mx_user, $phpbb_auth; global $config, $phpEx, $phpbb_root_path; *************** *** 1540,1546 **** * Submit Post */ ! function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true) { ! global $db, $phpbb_auth, $user, $config, $phpEx, $template, $phpbb_root_path; // We do not handle erasing posts here --- 1540,1546 ---- * Submit Post */ ! function submit_post($mode, $subject, $mx_username, $topic_type, &$poll, &$data, $update_message = true) { ! global $db, $phpbb_auth, $mx_user, $config, $phpEx, $template, $phpbb_root_path; // We do not handle erasing posts here *************** *** 1574,1578 **** // Collect some basic information about which tables and which rows to update/insert $sql_data = $topic_row = array(); ! $poster_id = ($mode == 'edit') ? $data['poster_id'] : (int) $user->data['user_id']; // Retrieve some additional information if not present --- 1574,1578 ---- // Collect some basic information about which tables and which rows to update/insert $sql_data = $topic_row = array(); ! $poster_id = ($mode == 'edit') ? $data['poster_id'] : (int) $mx_user->data['user_id']; // Retrieve some additional information if not present *************** *** 1602,1608 **** $sql_data[POSTS_TABLE]['sql'] = array( 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], ! 'poster_id' => (int) $user->data['user_id'], 'icon_id' => $data['icon_id'], ! 'poster_ip' => $user->ip, 'post_time' => $current_time, 'post_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, --- 1602,1608 ---- $sql_data[POSTS_TABLE]['sql'] = array( 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], ! 'poster_id' => (int) $mx_user->data['user_id'], 'icon_id' => $data['icon_id'], ! 'poster_ip' => $mx_user->ip, 'post_time' => $current_time, 'post_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, *************** *** 1611,1615 **** 'enable_magic_url' => $data['enable_urls'], 'enable_sig' => $data['enable_sig'], ! 'post_username' => (!$user->data['is_registered']) ? $username : '', 'post_subject' => $subject, 'post_text' => $data['message'], --- 1611,1615 ---- 'enable_magic_url' => $data['enable_urls'], 'enable_sig' => $data['enable_sig'], ! 'post_username' => (!$mx_user->data['is_registered']) ? $mx_username : '', 'post_subject' => $subject, 'post_text' => $data['message'], *************** *** 1649,1656 **** // If the person editing this post is different to the one having posted then we will add a log entry stating the edit // Could be simplified by only adding to the log if the edit is not tracked - but this may confuse admins/mods ! if ($user->data['user_id'] != $poster_id) { $log_subject = ($subject) ? $subject : $data['topic_title']; ! add_log('mod', $data['forum_id'], $data['topic_id'], 'LOG_POST_EDITED', $log_subject, (!empty($username)) ? $username : $user->lang['GUEST']); } --- 1649,1656 ---- // If the person editing this post is different to the one having posted then we will add a log entry stating the edit // Could be simplified by only adding to the log if the edit is not tracked - but this may confuse admins/mods ! if ($mx_user->data['user_id'] != $poster_id) { $log_subject = ($subject) ? $subject : $data['topic_title']; ! add_log('mod', $data['forum_id'], $data['topic_id'], 'LOG_POST_EDITED', $log_subject, (!empty($mx_username)) ? $mx_username : $mx_user->lang['GUEST']); } *************** *** 1669,1673 **** 'enable_magic_url' => $data['enable_urls'], 'enable_sig' => $data['enable_sig'], ! 'post_username' => ($username && $data['poster_id'] == ANONYMOUS) ? $username : '', 'post_subject' => $subject, 'post_checksum' => $data['message_md5'], --- 1669,1673 ---- 'enable_magic_url' => $data['enable_urls'], 'enable_sig' => $data['enable_sig'], ! 'post_username' => ($mx_username && $data['poster_id'] == ANONYMOUS) ? $mx_username : '', 'post_subject' => $subject, 'post_checksum' => $data['message_md5'], *************** *** 1694,1698 **** case 'post': $sql_data[TOPICS_TABLE]['sql'] = array( ! 'topic_poster' => (int) $user->data['user_id'], 'topic_time' => $current_time, 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], --- 1694,1698 ---- case 'post': $sql_data[TOPICS_TABLE]['sql'] = array( ! 'topic_poster' => (int) $mx_user->data['user_id'], 'topic_time' => $current_time, 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], *************** *** 1700,1705 **** 'topic_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, 'topic_title' => $subject, ! 'topic_first_poster_name' => (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''), ! 'topic_first_poster_colour' => $user->data['user_colour'], 'topic_type' => $topic_type, 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0, --- 1700,1705 ---- 'topic_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, 'topic_title' => $subject, ! 'topic_first_poster_name' => (!$mx_user->data['is_registered'] && $mx_username) ? $mx_username : (($mx_user->data['user_id'] != ANONYMOUS) ? $mx_user->data['username'] : ''), ! 'topic_first_poster_colour' => $mx_user->data['user_colour'], 'topic_type' => $topic_type, 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0, *************** *** 1749,1753 **** 'topic_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['topic_approved'], 'topic_title' => $subject, ! 'topic_first_poster_name' => $username, 'topic_type' => $topic_type, 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0, --- 1749,1753 ---- 'topic_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['topic_approved'], 'topic_title' => $subject, ! 'topic_first_poster_name' => $mx_username, 'topic_type' => $topic_type, 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0, *************** *** 1838,1844 **** 'topic_last_post_id' => $data['post_id'], 'topic_last_post_time' => $current_time, ! 'topic_last_poster_id' => (int) $user->data['user_id'], ! 'topic_last_poster_name' => (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''), ! 'topic_last_poster_colour' => $user->data['user_colour'], ); } --- 1838,1844 ---- 'topic_last_post_id' => $data['post_id'], 'topic_last_post_time' => $current_time, ! 'topic_last_poster_id' => (int) $mx_user->data['user_id'], ! 'topic_last_poster_name' => (!$mx_user->data['is_registered'] && $mx_username) ? $mx_username : (($mx_user->data['user_id'] != ANONYMOUS) ? $mx_user->data['username'] : ''), ! 'topic_last_poster_colour' => $mx_user->data['user_colour'], ); } *************** *** 2001,2005 **** WHERE ' . $db->sql_in_set('attach_id', array_keys($orphan_rows)) . ' AND is_orphan = 1 ! AND poster_id = ' . $user->data['user_id']; $result = $db->sql_query($sql); --- 2001,2005 ---- WHERE ' . $db->sql_in_set('attach_id', array_keys($orphan_rows)) . ' AND is_orphan = 1 ! AND poster_id = ' . $mx_user->data['user_id']; $result = $db->sql_query($sql); *************** *** 2050,2054 **** WHERE attach_id = ' . $attach_row['attach_id'] . ' AND is_orphan = 1 ! AND poster_id = ' . $user->data['user_id']; $db->sql_query($sql); } --- 2050,2054 ---- WHERE attach_id = ' . $attach_row['attach_id'] . ' AND is_orphan = 1 ! AND poster_id = ' . $mx_user->data['user_id']; $db->sql_query($sql); } *************** *** 2078,2084 **** $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($subject) . "'"; $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . $current_time; ! $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $user->data['user_id']; ! $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape((!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '')) . "'"; ! $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . $db->sql_escape($user->data['user_colour']) . "'"; } else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])) --- 2078,2084 ---- $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($subject) . "'"; $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . $current_time; ! $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $mx_user->data['user_id']; ! $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape((!$mx_user->data['is_registered'] && $mx_username) ? $mx_username : (($mx_user->data['user_id'] != ANONYMOUS) ? $mx_user->data['username'] : '')) . "'"; ! $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . $db->sql_escape($mx_user->data['user_colour']) . "'"; } else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])) *************** *** 2226,2232 **** { $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_id = ' . (int) $data['post_id']; ! $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_poster_id = ' . (int) $user->data['user_id']; ! $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . $db->sql_escape((!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '')) . "'"; ! $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_colour = '" . (($user->data['user_id'] != ANONYMOUS) ? $db->sql_escape($user->data['user_colour']) : '') . "'"; $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . $db->sql_escape($subject) . "'"; $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_time = ' . (int) $current_time; --- 2226,2232 ---- { $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_id = ' . (int) $data['post_id']; ! $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_poster_id = ' . (int) $mx_user->data['user_id']; ! $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . $db->sql_escape((!$mx_user->data['is_registered'] && $mx_username) ? $mx_username : (($mx_user->data['user_id'] != ANONYMOUS) ? $mx_user->data['username'] : '')) . "'"; ! $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_colour = '" . (($mx_user->data['user_id'] != ANONYMOUS) ? $db->sql_escape($mx_user->data['user_colour']) : '') . "'"; $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . $db->sql_escape($subject) . "'"; $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_time = ' . (int) $current_time; *************** *** 2286,2290 **** // Update forum stats ! $where_sql = array(POSTS_TABLE => 'post_id = ' . $data['post_id'], TOPICS_TABLE => 'topic_id = ' . $data['topic_id'], FORUMS_TABLE => 'forum_id = ' . $data['forum_id'], USERS_TABLE => 'user_id = ' . $user->data['user_id']); foreach ($sql_data as $table => $update_ary) --- 2286,2290 ---- // Update forum stats ! $where_sql = array(POSTS_TABLE => 'post_id = ' . $data['post_id'], TOPICS_TABLE => 'topic_id = ' . $data['topic_id'], FORUMS_TABLE => 'forum_id = ' . $data['forum_id'], USERS_TABLE => 'user_id = ' . $mx_user->data['user_id']); foreach ($sql_data as $table => $update_ary) *************** *** 2314,2318 **** $sql = 'DELETE FROM ' . DRAFTS_TABLE . " WHERE draft_id = $draft_id ! AND user_id = {$user->data['user_id']}"; $db->sql_query($sql); } --- 2314,2318 ---- $sql = 'DELETE FROM ' . DRAFTS_TABLE . " WHERE draft_id = $draft_id ! AND user_id = {$mx_user->data['user_id']}"; $db->sql_query($sql); } *************** *** 2346,2355 **** // Topic Notification, do not change if moderator is changing other users posts... ! if ($user->data['user_id'] == $poster_id) { if (!$data['notify_set'] && $data['notify']) { $sql = 'INSERT INTO ' . TOPICS_WATCH_TABLE . ' (user_id, topic_id) ! VALUES (' . $user->data['user_id'] . ', ' . $data['topic_id'] . ')'; $db->sql_query($sql); } --- 2346,2355 ---- // Topic Notification, do not change if moderator is changing other users posts... ! if ($mx_user->data['user_id'] == $poster_id) { if (!$data['notify_set'] && $data['notify']) { $sql = 'INSERT INTO ' . TOPICS_WATCH_TABLE . ' (user_id, topic_id) ! VALUES (' . $mx_user->data['user_id'] . ', ' . $data['topic_id'] . ')'; $db->sql_query($sql); } *************** *** 2357,2361 **** { $sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . ' ! WHERE user_id = ' . $user->data['user_id'] . ' AND topic_id = ' . $data['topic_id']; $db->sql_query($sql); --- 2357,2361 ---- { $sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . ' ! WHERE user_id = ' . $mx_user->data['user_id'] . ' AND topic_id = ' . $data['topic_id']; $db->sql_query($sql); *************** *** 2374,2382 **** // ! if ($config['load_db_lastread'] && $user->data['is_registered']) { $sql = 'SELECT mark_time FROM ' . FORUMS_TRACK_TABLE . ' ! WHERE user_id = ' . $user->data['user_id'] . ' AND forum_id = ' . $data['forum_id']; $result = $db->sql_query($sql); --- 2374,2382 ---- // ! if ($config['load_db_lastread'] && $mx_user->data['is_registered']) { $sql = 'SELECT mark_time FROM ' . FORUMS_TRACK_TABLE . ' ! WHERE user_id = ' . $mx_user->data['user_id'] . ' AND forum_id = ' . $data['forum_id']; $result = $db->sql_query($sql); *************** *** 2384,2393 **** $db->sql_freeresult($result); } ! else if ($config['load_anon_lastread'] || $user->data['is_registered']) { $f_mark_time = false; } ! if (($config['load_db_lastread'] && $user->data['is_registered']) || $config['load_anon_lastread'] || $user->data['is_registered']) { // Update forum info --- 2384,2393 ---- $db->sql_freeresult($result); } ! else if ($config['load_anon_lastread'] || $mx_user->data['is_registered']) { $f_mark_time = false; } ! if (($config['load_db_lastread'] && $mx_user->data['is_registered']) || $config['load_anon_lastread'] || $mx_user->data['is_registered']) { // Update forum info |
|
From: FlorinCB <ory...@us...> - 2008-09-04 00:02:10
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9506 Modified Files: functions_posting.php Log Message: $auth -> $phpbb_auth Index: functions_posting.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_posting.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions_posting.php 15 Jun 2008 21:01:42 -0000 1.3 --- functions_posting.php 4 Sep 2008 00:02:06 -0000 1.4 *************** *** 23,27 **** function generate_smilies($mode, $forum_id) { ! global $auth, $db, $user, $config, $template; global $phpEx, $phpbb_root_path; --- 23,27 ---- function generate_smilies($mode, $forum_id) { ! global $phpbb_auth, $db, $user, $config, $template; global $phpEx, $phpbb_root_path; *************** *** 287,291 **** function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL) { ! global $auth, $user, $template, $topic_type; $toggle = false; --- 287,291 ---- function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL) { ! global $phpbb_auth, $user, $template, $topic_type; $toggle = false; *************** *** 299,308 **** $topic_type_array = array(); ! foreach ($topic_types as $auth_key => $topic_value) { // We do not have a special post global announcement permission ! $auth_key = ($auth_key == 'global') ? 'announce' : $auth_key; ! if ($auth->acl_get('f_' . $auth_key, $forum_id)) { $toggle = true; --- 299,308 ---- $topic_type_array = array(); ! foreach ($topic_types as $phpbb_auth_key => $topic_value) { // We do not have a special post global announcement permission ! $phpbb_auth_key = ($phpbb_auth_key == 'global') ? 'announce' : $phpbb_auth_key; ! if ($phpbb_auth->acl_get('f_' . $phpbb_auth_key, $forum_id)) { $toggle = true; *************** *** 332,337 **** $template->assign_vars(array( ! 'S_TOPIC_TYPE_STICKY' => ($auth->acl_get('f_sticky', $forum_id)), ! 'S_TOPIC_TYPE_ANNOUNCE' => ($auth->acl_get('f_announce', $forum_id))) ); } --- 332,337 ---- $template->assign_vars(array( ! 'S_TOPIC_TYPE_STICKY' => ($phpbb_auth->acl_get('f_sticky', $forum_id)), ! 'S_TOPIC_TYPE_ANNOUNCE' => ($phpbb_auth->acl_get('f_announce', $forum_id))) ); } *************** *** 350,354 **** function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false) { ! global $auth, $user, $config, $db, $cache; global $phpbb_root_path, $phpEx; --- 350,354 ---- function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false) { ! global $phpbb_auth, $user, $config, $db, $cache; global $phpbb_root_path, $phpEx; *************** *** 402,406 **** // Check Image Size, if it is an image ! if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id) && $cat_id == ATTACHMENT_CATEGORY_IMAGE) { $file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']); --- 402,406 ---- // Check Image Size, if it is an image ! if (!$phpbb_auth->acl_get('a_') && !$phpbb_auth->acl_get('m_', $forum_id) && $cat_id == ATTACHMENT_CATEGORY_IMAGE) { $file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']); *************** *** 408,412 **** // Admins and mods are allowed to exceed the allowed filesize ! if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id)) { if (!empty($extensions[$file->get('extension')]['max_filesize'])) --- 408,412 ---- // Admins and mods are allowed to exceed the allowed filesize ! if (!$phpbb_auth->acl_get('a_') && !$phpbb_auth->acl_get('m_', $forum_id)) { if (!empty($extensions[$file->get('extension')]['max_filesize'])) *************** *** 817,821 **** function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) { ! global $user, $db, $template, $auth; global $phpbb_root_path, $phpEx; --- 817,821 ---- function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) { ! global $user, $db, $template, $phpbb_auth; global $phpbb_root_path, $phpEx; *************** *** 883,889 **** if (isset($topic_rows[$draft['topic_id']]) && ( ! ($topic_rows[$draft['topic_id']]['forum_id'] && $auth->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id'])) || ! (!$topic_rows[$draft['topic_id']]['forum_id'] && $auth->acl_getf_global('f_read')) )) { --- 883,889 ---- if (isset($topic_rows[$draft['topic_id']]) && ( ! ($topic_rows[$draft['topic_id']]['forum_id'] && $phpbb_auth->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id'])) || ! (!$topic_rows[$draft['topic_id']]['forum_id'] && $phpbb_auth->acl_getf_global('f_read')) )) { *************** *** 896,900 **** $insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $topic_forum_id . '&t=' . $draft['topic_id'] . '&mode=reply&d=' . $draft['draft_id']); } ! else if ($draft['forum_id'] && $auth->acl_get('f_read', $draft['forum_id'])) { $link_forum = true; --- 896,900 ---- $insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $topic_forum_id . '&t=' . $draft['topic_id'] . '&mode=reply&d=' . $draft['draft_id']); } ! else if ($draft['forum_id'] && $phpbb_auth->acl_get('f_read', $draft['forum_id'])) { $link_forum = true; *************** *** 932,936 **** function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true) { ! global $user, $auth, $db, $template, $bbcode, $cache; global $config, $phpbb_root_path, $phpEx; --- 932,936 ---- function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true) { ! global $user, $phpbb_auth, $db, $template, $bbcode, $cache; global $config, $phpbb_root_path, $phpEx; *************** *** 939,943 **** FROM ' . POSTS_TABLE . ' p' . " WHERE p.topic_id = $topic_id ! " . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . ' ' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . ' ORDER BY p.post_time '; --- 939,943 ---- FROM ' . POSTS_TABLE . ' p' . " WHERE p.topic_id = $topic_id ! " . ((!$phpbb_auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . ' ' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . ' ORDER BY p.post_time '; *************** *** 997,1001 **** // Grab extensions $extensions = $attachments = array(); ! if ($has_attachments && $auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id)) { $extensions = $cache->obtain_attach_extensions($forum_id); --- 997,1001 ---- // Grab extensions $extensions = $attachments = array(); ! if ($has_attachments && $phpbb_auth->acl_get('u_download') && $phpbb_auth->acl_get('f_download', $forum_id)) { $extensions = $cache->obtain_attach_extensions($forum_id); *************** *** 1033,1037 **** $decoded_message = false; ! if ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) { $decoded_message = $message; --- 1033,1037 ---- $decoded_message = false; ! if ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id)) { $decoded_message = $message; *************** *** 1074,1079 **** 'POST_ID' => $row['post_id'], 'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'], ! 'U_MCP_DETAILS' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', ! 'POSTER_QUOTE' => ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '') ); --- 1074,1079 ---- 'POST_ID' => $row['post_id'], 'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'], ! 'U_MCP_DETAILS' => ($phpbb_auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', ! 'POSTER_QUOTE' => ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '') ); *************** *** 1105,1109 **** function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id) { ! global $db, $user, $config, $phpbb_root_path, $phpEx, $auth; $topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false; --- 1105,1109 ---- function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id) { ! global $db, $user, $config, $phpbb_root_path, $phpEx, $phpbb_auth; $topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false; *************** *** 1206,1212 **** // Make sure users are allowed to read the forum ! foreach ($auth->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary) { ! foreach ($forum_ary as $auth_option => $user_ary) { foreach ($user_ary as $user_id) --- 1206,1212 ---- // Make sure users are allowed to read the forum ! foreach ($phpbb_auth->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary) { ! foreach ($forum_ary as $phpbb_auth_option => $user_ary) { foreach ($user_ary as $user_id) *************** *** 1332,1336 **** function delete_post($forum_id, $topic_id, $post_id, &$data) { ! global $db, $user, $auth; global $config, $phpEx, $phpbb_root_path; --- 1332,1336 ---- function delete_post($forum_id, $topic_id, $post_id, &$data) { ! global $db, $user, $phpbb_auth; global $config, $phpEx, $phpbb_root_path; *************** *** 1458,1462 **** FROM ' . POSTS_TABLE . " WHERE topic_id = $topic_id " . ! ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : ''); $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); --- 1458,1462 ---- FROM ' . POSTS_TABLE . " WHERE topic_id = $topic_id " . ! ((!$phpbb_auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : ''); $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); *************** *** 1471,1475 **** FROM ' . POSTS_TABLE . " WHERE topic_id = $topic_id " . ! ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '') . ' AND post_time > ' . $data['post_time'] . ' ORDER BY post_time ASC'; --- 1471,1475 ---- FROM ' . POSTS_TABLE . " WHERE topic_id = $topic_id " . ! ((!$phpbb_auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '') . ' AND post_time > ' . $data['post_time'] . ' ORDER BY post_time ASC'; *************** *** 1542,1546 **** function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true) { ! global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path; // We do not handle erasing posts here --- 1542,1546 ---- function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true) { ! global $db, $phpbb_auth, $user, $config, $phpEx, $template, $phpbb_root_path; // We do not handle erasing posts here *************** *** 1606,1610 **** 'poster_ip' => $user->ip, 'post_time' => $current_time, ! 'post_approved' => (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, 'enable_bbcode' => $data['enable_bbcode'], 'enable_smilies' => $data['enable_smilies'], --- 1606,1610 ---- 'poster_ip' => $user->ip, 'post_time' => $current_time, ! 'post_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, 'enable_bbcode' => $data['enable_bbcode'], 'enable_smilies' => $data['enable_smilies'], *************** *** 1618,1622 **** 'bbcode_bitfield' => $data['bbcode_bitfield'], 'bbcode_uid' => $data['bbcode_uid'], ! 'post_postcount' => ($auth->acl_get('f_postcount', $data['forum_id'])) ? 1 : 0, 'post_edit_locked' => $data['post_edit_locked'] ); --- 1618,1622 ---- 'bbcode_bitfield' => $data['bbcode_bitfield'], 'bbcode_uid' => $data['bbcode_uid'], ! 'post_postcount' => ($phpbb_auth->acl_get('f_postcount', $data['forum_id'])) ? 1 : 0, 'post_edit_locked' => $data['post_edit_locked'] ); *************** *** 1636,1640 **** // Display edit info if edit reason given or user is editing his post, which is not the last within the topic. ! if ($data['post_edit_reason'] || (!$auth->acl_get('m_edit', $data['forum_id']) && ($post_mode == 'edit' || $post_mode == 'edit_first_post'))) { $sql_data[POSTS_TABLE]['sql'] = array( --- 1636,1640 ---- // Display edit info if edit reason given or user is editing his post, which is not the last within the topic. ! if ($data['post_edit_reason'] || (!$phpbb_auth->acl_get('m_edit', $data['forum_id']) && ($post_mode == 'edit' || $post_mode == 'edit_first_post'))) { $sql_data[POSTS_TABLE]['sql'] = array( *************** *** 1664,1668 **** 'poster_id' => $data['poster_id'], 'icon_id' => $data['icon_id'], ! 'post_approved' => (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['post_approved'], 'enable_bbcode' => $data['enable_bbcode'], 'enable_smilies' => $data['enable_smilies'], --- 1664,1668 ---- 'poster_id' => $data['poster_id'], 'icon_id' => $data['icon_id'], ! 'post_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['post_approved'], 'enable_bbcode' => $data['enable_bbcode'], 'enable_smilies' => $data['enable_smilies'], *************** *** 1698,1702 **** 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], 'icon_id' => $data['icon_id'], ! 'topic_approved' => (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, 'topic_title' => $subject, 'topic_first_poster_name' => (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''), --- 1698,1702 ---- 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], 'icon_id' => $data['icon_id'], ! 'topic_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, 'topic_title' => $subject, 'topic_first_poster_name' => (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''), *************** *** 1718,1739 **** } ! $sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : ''); if ($topic_type != POST_GLOBAL) { ! if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) { $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1'; } ! $sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) ? ', forum_topics = forum_topics + 1' : ''); } break; case 'reply': ! $sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies_real = topic_replies_real + 1, topic_bumped = 0, topic_bumper = 0' . (($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) ? ', topic_replies = topic_replies + 1' : '') . ((!empty($data['attachment_data']) || (isset($data['topic_attachment']) && $data['topic_attachment'])) ? ', topic_attachment = 1' : ''); ! $sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : ''); ! if (($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) && $topic_type != POST_GLOBAL) { $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1'; --- 1718,1739 ---- } ! $sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($phpbb_auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : ''); if ($topic_type != POST_GLOBAL) { ! if ($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])) { $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1'; } ! $sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? ', forum_topics = forum_topics + 1' : ''); } break; case 'reply': ! $sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies_real = topic_replies_real + 1, topic_bumped = 0, topic_bumper = 0' . (($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? ', topic_replies = topic_replies + 1' : '') . ((!empty($data['attachment_data']) || (isset($data['topic_attachment']) && $data['topic_attachment'])) ? ', topic_attachment = 1' : ''); ! $sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($phpbb_auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : ''); ! if (($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])) && $topic_type != POST_GLOBAL) { $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1'; *************** *** 1747,1751 **** 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], 'icon_id' => $data['icon_id'], ! 'topic_approved' => (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['topic_approved'], 'topic_title' => $subject, 'topic_first_poster_name' => $username, --- 1747,1751 ---- 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], 'icon_id' => $data['icon_id'], ! 'topic_approved' => (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['topic_approved'], 'topic_title' => $subject, 'topic_first_poster_name' => $username, *************** *** 1762,1766 **** // Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved ! if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']) && $data['topic_approved']) { // Do we need to grab some topic informations? --- 1762,1766 ---- // Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved ! if (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id']) && $data['topic_approved']) { // Do we need to grab some topic informations? *************** *** 1792,1796 **** // Correctly set back the topic replies and forum posts... but only if the post was approved before. ! if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']) && $data['post_approved']) { $sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1'; --- 1792,1796 ---- // Correctly set back the topic replies and forum posts... but only if the post was approved before. ! if (!$phpbb_auth->acl_get('f_noapprove', $data['forum_id']) && !$phpbb_auth->acl_get('m_approve', $data['forum_id']) && $data['post_approved']) { $sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1'; *************** *** 2271,2275 **** // Update total post count, do not consider moderated posts/topics ! if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) { if ($post_mode == 'post') --- 2271,2275 ---- // Update total post count, do not consider moderated posts/topics ! if ($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])) { if ($post_mode == 'post') *************** *** 2403,2407 **** // Send Notifications ! if ($mode != 'edit' && $mode != 'delete' && ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id']))) { user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']); --- 2403,2407 ---- // Send Notifications ! if ($mode != 'edit' && $mode != 'delete' && ($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id']))) { user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']); *************** *** 2410,2414 **** $params = $add_anchor = ''; ! if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) { $params .= '&t=' . $data['topic_id']; --- 2410,2414 ---- $params = $add_anchor = ''; ! if ($phpbb_auth->acl_get('f_noapprove', $data['forum_id']) || $phpbb_auth->acl_get('m_approve', $data['forum_id'])) { $params .= '&t=' . $data['topic_id']; |
|
From: FlorinCB <ory...@us...> - 2008-09-03 23:49:03
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3405 Modified Files: message_parser.php Log Message: prefixed some functions with phpBB3:: Index: message_parser.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/message_parser.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** message_parser.php 10 Jul 2008 23:02:07 -0000 1.4 --- message_parser.php 3 Sep 2008 23:48:58 -0000 1.5 *************** *** 1211,1215 **** } ! ($custom_bbcode_uid) ? decode_message($this->message, $custom_bbcode_uid) : decode_message($this->message, $this->bbcode_uid); if (!$update_this_message) --- 1211,1215 ---- } ! ($custom_bbcode_uid) ? phpBB3::decode_message($this->message, $custom_bbcode_uid) : phpBB3::decode_message($this->message, $this->bbcode_uid); if (!$update_this_message) *************** *** 1319,1323 **** $num_attachments = sizeof($this->attachment_data); ! $this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true)); $upload_file = (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none' && trim($_FILES[$form_name]['name'])) ? true : false; --- 1319,1323 ---- $num_attachments = sizeof($this->attachment_data); ! $this->filename_data['filecomment'] = utf8_normalize_nfc(phpBB3::request_var('filecomment', '', true)); $upload_file = (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none' && trim($_FILES[$form_name]['name'])) ? true : false; *************** *** 1326,1330 **** // First of all adjust comments if changed ! $actual_comment_list = utf8_normalize_nfc(request_var('comment_list', array(''), true)); foreach ($actual_comment_list as $comment_key => $comment) --- 1326,1330 ---- // First of all adjust comments if changed ! $actual_comment_list = utf8_normalize_nfc(phpBB3::request_var('comment_list', array(''), true)); foreach ($actual_comment_list as $comment_key => $comment) *************** *** 1406,1410 **** include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); ! $index = array_keys(request_var('delete_file', array(0 => 0))); $index = (!empty($index)) ? $index[0] : false; --- 1406,1410 ---- include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); ! $index = array_keys(phpBB3::request_var('delete_file', array(0 => 0))); $index = (!empty($index)) ? $index[0] : false; *************** *** 1504,1508 **** global $mx_user, $db, $phpbb_root_path, $phpEx, $board_config; ! $this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true)); $attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array(); $this->attachment_data = array(); --- 1504,1508 ---- global $mx_user, $db, $phpbb_root_path, $phpEx, $board_config; ! $this->filename_data['filecomment'] = utf8_normalize_nfc(phpBB3::request_var('filecomment', '', true)); $attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array(); $this->attachment_data = array(); |
|
From: FlorinCB <ory...@us...> - 2008-09-03 22:10:00
|
Update of /cvsroot/mxbb/mx_phpbb3/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10258 Modified Files: mx_module_defs.php Log Message: this file is outdated Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb3/admin/mx_module_defs.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_module_defs.php 1 Sep 2008 04:00:46 -0000 1.1 --- mx_module_defs.php 3 Sep 2008 22:09:52 -0000 1.2 *************** *** 83,122 **** } ! function display_edit_Phpbb_type_select( $block_id, $parameter_id, $parameter_data ) { ! global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpEx, $mx_table_prefix, $table_prefix; $module_root_path = $mx_root_path . $mx_blockcp->module_root_path; ! include_once( $module_root_path . "includes/phpbb_constants.$phpEx" ); include_once( $module_root_path . "includes/phpbb_defs.$phpEx" ); $template->set_filenames(array( 'parameter' => 'admin/mx_module_parameters.tpl') ); ! // Get number of forums in db ! $sql = "SELECT * ! FROM " . NEWS_CAT_TABLE . " ! ORDER BY $cat_extract_order"; ! if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql ); } ! $forums = $db->sql_fetchrowset( $result ); $db->sql_freeresult($result); ! // Get array of categories from the database ! $sql = "SELECT cat_id, cat_title ! FROM " . CATEGORIES_TABLE . " ! ORDER BY cat_order"; ! if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't obtain category list.", "", __LINE__, __FILE__, $sql ); } ! $categories = $db->sql_fetchrowset( $result ); ! $db->sql_freeresult($result); $phpbb_type_select_data = ( !empty( $mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value'] ) ) ? unserialize($mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value']) : array(); --- 83,172 ---- } ! function display_edit_Phpbb_type_select($block_id, $parameter_id, $parameter_data) { ! global $template, $board_config, $phpbb_auth, $mx_user, $db, $theme, $lang, $images; ! global $mx_blockcp, $mx_root_path, $phpEx, $mx_table_prefix, $table_prefix; $module_root_path = $mx_root_path . $mx_blockcp->module_root_path; ! include_once( $module_root_path . "includes/phpbb3_constants.$phpEx" ); include_once( $module_root_path . "includes/phpbb_defs.$phpEx" ); + if (!function_exists('mx_get_forum_parents')) + { + require_once($mx_root_path . 'modules/mx_phpbb3blocks/includes/mx_functions_display.' . $phpEx); + } $template->set_filenames(array( 'parameter' => 'admin/mx_module_parameters.tpl') ); + + // Get number of forums in db ! $sql = 'SELECT forum_id ! FROM ' . FORUMS_TABLE; ! ! if (sizeof($phpbb_auth->acl)) { ! $sql .= ' WHERE ' . $db->sql_in_set('forum_id', array_keys($phpbb_auth->acl), true); } + $result = $db->sql_query($sql); ! $forum_ids = array(); ! while ($row = $db->sql_fetchrow($result)) ! { ! $forum_ids[] = $row['forum_id']; ! } $db->sql_freeresult($result); ! //print_r($forum_ids); ! $sql_from = FORUMS_TABLE . ' f'; ! ! $sql = "SELECT f.* ! FROM $sql_from"; ! //WHERE forum_id <> 0"; ! $sql .= ' WHERE ' . $db->sql_in_set('forum_id', array_keys($forum_ids), true); ! $result = $db->sql_query($sql); ! $forums = $db->sql_fetchrow($result); ! $db->sql_freeresult($result); ! ! if (!$forums) { ! trigger_error('NO_FORUM'); } + + // Get array of categories from the database + $categories = array(); + + //if ($forums['parent_id'] > 0) + //{ + if ($forums['forum_parents'] == '') + { + $sql = 'SELECT forum_id, forum_name, forum_type + FROM ' . FORUMS_TABLE . ' + WHERE left_id < ' . $forums['left_id'] . ' + AND right_id > ' .$forums['right_id'] . ' + ORDER BY left_id ASC'; + $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) ! { ! $categories[$row['forum_id']] = array($row['forum_name'], (int) $row['forum_type']); ! } ! $db->sql_freeresult($result); ! ! $forums['forum_parents'] = serialize($categories); ! ! $sql = 'UPDATE ' . FORUMS_TABLE . " ! SET forum_parents = '" . $db->sql_escape($forums['forum_parents']) . "' ! WHERE parent_id = " . $forums['parent_id']; ! $db->sql_query($sql); ! } ! else ! { ! $categories = unserialize($forums['forum_parents']); ! } ! //} ! ! print_r($categories); $phpbb_type_select_data = ( !empty( $mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value'] ) ) ? unserialize($mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value']) : array(); *************** *** 125,129 **** // Check that some categories exist // ! if ( $total_categories = count( $categories ) ) { // --- 175,179 ---- // Check that some categories exist // ! if ($total_categories = count($categories)) { // *************** *** 160,164 **** $template->assign_vars(array( 'SCRIPT_PATH' => $module_root_path, ! 'MX_IMAGES_ROOT' => $mx_root_path . 'templates/subSilver/images/admin_icons/', 'MX_ROOT_PATH' => $mx_root_path, 'NAME' => $lang[$parameter_data['parameter_name']], --- 210,214 ---- $template->assign_vars(array( 'SCRIPT_PATH' => $module_root_path, ! 'MX_IMAGES_ROOT' => $mx_root_path . 'templates/_core/images/admin_icons/', 'MX_ROOT_PATH' => $mx_root_path, 'NAME' => $lang[$parameter_data['parameter_name']], |
|
From: FlorinCB <ory...@us...> - 2008-09-03 15:56:33
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5353 Modified Files: Tag: core28x mx_last_msg.php Log Message: Block_Size Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_last_msg.php,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** mx_last_msg.php 3 Jun 2008 21:01:47 -0000 1.4.2.2 --- mx_last_msg.php 3 Sep 2008 15:56:29 -0000 1.4.2.3 *************** *** 404,408 **** 'TOPIC_AUTHOR' => $topic_author, 'LAST_POST_AUTHOR' => $last_post_author, ! 'L_TOPIC_FOLDER_ALT' => $folder_alt )); } --- 404,410 ---- 'TOPIC_AUTHOR' => $topic_author, 'LAST_POST_AUTHOR' => $last_post_author, ! 'L_TOPIC_FOLDER_ALT' => $folder_alt, ! 'BLOCK_SIZE' => ($block_size ? $block_size : '100%'), ! 'L_BACK_TO_TOP' => (!empty($lang['Back_to_top']) ? $lang['Back_to_top'] : 'Back to Top') )); } |
|
From: FlorinCB <ory...@us...> - 2008-09-03 09:04:26
|
Update of /cvsroot/mxbb/core/modules/mx_rebuild_search_tables In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32040 Added Files: Rebuild_Search_Tables.pak Log Message: Linux servers do not allow spaces in files --- NEW FILE: Rebuild_Search_Tables.pak --- module=+:52=+:Rebuild Search Tables=+:modules/mx_rebuild_search_tables/=+:Search Table Optimization Tools=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: FlorinCB <ory...@us...> - 2008-09-02 21:24:20
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16617 Modified Files: mx_functions_core.php Log Message: fixed request class Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** mx_functions_core.php 2 Sep 2008 21:13:32 -0000 1.102 --- mx_functions_core.php 2 Sep 2008 21:24:15 -0000 1.103 *************** *** 3984,3988 **** function _read($var, $type = MX_TYPE_ANY, $dflt = '', $not_null = false) { ! global $_POST, $_GET; if( ($type & (MX_TYPE_POST_VARS|MX_TYPE_GET_VARS)) == 0 ) { --- 3984,3988 ---- function _read($var, $type = MX_TYPE_ANY, $dflt = '', $not_null = false) { ! //global $_POST, $_GET; //is not required? if( ($type & (MX_TYPE_POST_VARS|MX_TYPE_GET_VARS)) == 0 ) { *************** *** 4134,4138 **** function is_post($var) { ! global $_POST; // Note: _x and _y are used by (at least IE) to return the mouse position at onclick of INPUT TYPE="img" elements. return (isset($_POST[$var]) || ( isset($_POST[$var.'_x']) && isset($_POST[$var.'_y']))) ? 1 : 0; --- 4134,4138 ---- function is_post($var) { ! //global $_POST; // Note: _x and _y are used by (at least IE) to return the mouse position at onclick of INPUT TYPE="img" elements. return (isset($_POST[$var]) || ( isset($_POST[$var.'_x']) && isset($_POST[$var.'_y']))) ? 1 : 0; *************** *** 4150,4154 **** function is_get($var) { ! global $_GET; return isset($_GET[$var]) ? 1 : 0 ; } --- 4150,4154 ---- function is_get($var) { ! //global $_GET; return isset($_GET[$var]) ? 1 : 0 ; } *************** *** 4179,4183 **** function is_empty_post($var) { ! global $_POST; return (empty($_POST[$var]) && ( empty($_POST[$var.'_x']) || empty($_POST[$var.'_y']))) ? 1 : 0 ; } --- 4179,4183 ---- function is_empty_post($var) { ! //global $_POST; return (empty($_POST[$var]) && ( empty($_POST[$var.'_x']) || empty($_POST[$var.'_y']))) ? 1 : 0 ; } *************** *** 4194,4198 **** function is_empty_get($var) { ! global $_GET; return empty($_GET[$var]) ? 1 : 0 ; } --- 4194,4198 ---- function is_empty_get($var) { ! //global $_GET; return empty($_GET[$var]) ? 1 : 0 ; } |
|
From: FlorinCB <ory...@us...> - 2008-09-02 21:13:39
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3638 Modified Files: mx_functions_core.php Log Message: fixed request class Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** mx_functions_core.php 1 Sep 2008 03:27:20 -0000 1.101 --- mx_functions_core.php 2 Sep 2008 21:13:32 -0000 1.102 *************** *** 3984,3987 **** --- 3984,3988 ---- function _read($var, $type = MX_TYPE_ANY, $dflt = '', $not_null = false) { + global $_POST, $_GET; if( ($type & (MX_TYPE_POST_VARS|MX_TYPE_GET_VARS)) == 0 ) { *************** *** 4133,4136 **** --- 4134,4138 ---- function is_post($var) { + global $_POST; // Note: _x and _y are used by (at least IE) to return the mouse position at onclick of INPUT TYPE="img" elements. return (isset($_POST[$var]) || ( isset($_POST[$var.'_x']) && isset($_POST[$var.'_y']))) ? 1 : 0; *************** *** 4148,4151 **** --- 4150,4154 ---- function is_get($var) { + global $_GET; return isset($_GET[$var]) ? 1 : 0 ; } *************** *** 4176,4179 **** --- 4179,4183 ---- function is_empty_post($var) { + global $_POST; return (empty($_POST[$var]) && ( empty($_POST[$var.'_x']) || empty($_POST[$var.'_y']))) ? 1 : 0 ; } *************** *** 4190,4193 **** --- 4194,4198 ---- function is_empty_get($var) { + global $_GET; return empty($_GET[$var]) ? 1 : 0 ; } |
|
From: FlorinCB <ory...@us...> - 2008-09-02 21:05:48
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26730 Modified Files: Tag: core28x mx_functions_core.php Log Message: fixed request class Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.52.2.17 retrieving revision 1.52.2.18 diff -C2 -d -r1.52.2.17 -r1.52.2.18 *** mx_functions_core.php 10 Jul 2008 22:30:20 -0000 1.52.2.17 --- mx_functions_core.php 2 Sep 2008 21:05:41 -0000 1.52.2.18 *************** *** 3354,3357 **** --- 3354,3376 ---- /**#@-*/ + /**#@+ + * Class mx_request_vars specific definitions + * + * Following flags are options for the $type parameter in method _read() + * + */ + define('MX_TYPE_ANY' , 0); // Retrieve the get/post var as-is (only stripslashes() will be applied). + define('MX_TYPE_INT' , 1); // Be sure we get a request var of type INT. + define('MX_TYPE_FLOAT' , 2); // Be sure we get a request var of type FLOAT. + define('MX_TYPE_NO_HTML' , 4); // Be sure we get a request var of type STRING (htmlspecialchars). + define('MX_TYPE_NO_TAGS' , 8); // Be sure we get a request var of type STRING (strip_tags + htmlspecialchars). + define('MX_TYPE_NO_STRIP' , 16); // By default strings are slash stripped, this flag avoids this. + define('MX_TYPE_SQL_QUOTED' , 32); // Be sure we get a request var of type STRING, safe for SQL statements (single quotes escaped) + define('MX_TYPE_POST_VARS' , 64); // Read a POST variable. + define('MX_TYPE_GET_VARS' , 128); // Read a GET variable. + define('MX_NOT_EMPTY' , true); // + + /**#@-*/ + /** * Class: mx_request_vars. *************** *** 3407,3414 **** * @return unknown */ ! function _read($var, $type = MX_TYPE_ANY, $dflt = '') { global $HTTP_POST_VARS, $HTTP_GET_VARS; ! if( ($type & (MX_TYPE_POST_VARS|MX_TYPE_GET_VARS)) == 0 ) { --- 3426,3433 ---- * @return unknown */ ! function _read($var, $type = MX_TYPE_ANY, $dflt = '', $not_null = false) { global $HTTP_POST_VARS, $HTTP_GET_VARS; ! if( ($type & (MX_TYPE_POST_VARS|MX_TYPE_GET_VARS)) == 0 ) { *************** *** 3442,3451 **** if( $type & MX_TYPE_INT ) // integer { ! return intval($val); } if( $type & MX_TYPE_FLOAT ) // float { ! return floatval($val); } --- 3461,3470 ---- if( $type & MX_TYPE_INT ) // integer { ! return $not_null && empty($val) ? $dflt : intval($val); } if( $type & MX_TYPE_FLOAT ) // float { ! return $not_null && empty($val) ? $dflt : floatval($val); } *************** *** 3494,3498 **** } ! return $val; } --- 3513,3517 ---- } ! return $not_null && empty($val) ? $dflt : $val; } *************** *** 3512,3518 **** * @return string */ ! function post($var, $type = MX_TYPE_ANY, $dflt = '') { ! return $this->_read($var, ($type | MX_TYPE_POST_VARS), $dflt); } --- 3531,3537 ---- * @return string */ ! function post($var, $type = MX_TYPE_ANY, $dflt = '', $not_null = false) { ! return $this->_read($var, ($type | MX_TYPE_POST_VARS), $dflt, $not_null); } *************** *** 3528,3534 **** * @return string */ ! function get($var, $type = MX_TYPE_ANY, $dflt = '') { ! return $this->_read($var, ($type | MX_TYPE_GET_VARS), $dflt); } --- 3547,3553 ---- * @return string */ ! function get($var, $type = MX_TYPE_ANY, $dflt = '', $not_null = false) { ! return $this->_read($var, ($type | MX_TYPE_GET_VARS), $dflt, $not_null); } *************** *** 3544,3550 **** * @return string */ ! function request($var, $type = MX_TYPE_ANY, $dflt = '') { ! return $this->_read($var, ($type | MX_TYPE_POST_VARS | MX_TYPE_GET_VARS), $dflt); } --- 3563,3569 ---- * @return string */ ! function request($var, $type = MX_TYPE_ANY, $dflt = '', $not_null = false) { ! return $this->_read($var, ($type | MX_TYPE_POST_VARS | MX_TYPE_GET_VARS), $dflt, $not_null); } *************** *** 3562,3566 **** global $HTTP_POST_VARS; // Note: _x and _y are used by (at least IE) to return the mouse position at onclick of INPUT TYPE="img" elements. ! return ( isset($HTTP_POST_VARS[$var]) || ( isset($HTTP_POST_VARS[$var.'_x']) && isset($HTTP_POST_VARS[$var.'_y']) ) ); } --- 3581,3585 ---- global $HTTP_POST_VARS; // Note: _x and _y are used by (at least IE) to return the mouse position at onclick of INPUT TYPE="img" elements. ! return (isset($HTTP_POST_VARS[$var]) || ( isset($HTTP_POST_VARS[$var.'_x']) && isset($HTTP_POST_VARS[$var.'_y']))) ? 1 : 0; } *************** *** 3576,3581 **** function is_get($var) { ! global $HTTP_GET_VARS; ! return ( isset($HTTP_GET_VARS[$var]) ); } --- 3595,3600 ---- function is_get($var) { ! global $HTTP_GET_VARS; ! return isset($HTTP_GET_VARS[$var]) ? 1 : 0 ; } *************** *** 3591,3595 **** function is_request($var) { ! return ( $this->is_get($var) || $this->is_post($var) ); } --- 3610,3659 ---- function is_request($var) { ! return ($this->is_get($var) || $this->is_post($var)) ? 1 : 0; ! } ! /** ! * Is POST var empty? ! * ! * Boolean method to check if POST variable is empty ! * as it might be set but still be empty. ! * ! * @access public ! * @param string $var ! * @return boolean ! */ ! function is_empty_post($var) ! { ! global $HTTP_POST_VARS; ! ! return (empty($HTTP_POST_VARS[$var]) && ( empty($HTTP_POST_VARS[$var.'_x']) || empty($HTTP_POST_VARS[$var.'_y']))) ? 1 : 0 ; ! } ! /** ! * Is GET var empty? ! * ! * Boolean method to check if GET variable is empty ! * as it might be set but still be empty ! * ! * @access public ! * @param string $var ! * @return boolean ! */ ! function is_empty_get($var) ! { ! global $HTTP_GET_VARS; ! return empty($HTTP_GET_VARS[$var]) ? 1 : 0 ; ! } ! ! /** ! * Is REQUEST empty (GET and POST) var? ! * ! * Boolean method to check if REQUEST (both) variable is empty. ! * ! * @access public ! * @param string $var ! * @return boolean ! */ ! function is_empty_request($var) ! { ! return ($this->is_empty_get($var) && $this->is_empty_post($var)) ? 1 : 0; } |
|
From: FlorinCB <ory...@us...> - 2008-09-01 04:01:25
|
Update of /cvsroot/mxbb/mx_phpbb3/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12102/templates Added Files: index.htm Log Message: This is mx_phpbb3 first atemt .... --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-09-01 04:01:24
|
Update of /cvsroot/mxbb/mx_phpbb3/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12102/templates/_core Added Files: index.htm Log Message: This is mx_phpbb3 first atemt .... --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-09-01 04:01:24
|
Update of /cvsroot/mxbb/mx_phpbb3/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12102/templates/_core/admin Added Files: forum_admin_body_ext.tpl index.htm mx_module_parameters.tpl Log Message: This is mx_phpbb3 first atemt .... --- NEW FILE: forum_admin_body_ext.tpl --- <h1>{L_FORUM_TITLE}</h1> <p>{L_FORUM_EXPLAIN}</p> <form action="{S_FORUM_ACTION}" method="post"> <table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline"> <tr> <th class="thHead" colspan="2">{L_DEFAULT_PAGES_TITLE}<br /><span class="gensmall">{L_DEFAULT_PAGES_TITLE_EXPLAIN}</span></th> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_INTEGRATION_ENABLED}<br /><span class="gensmall">{L_PHPBB_INTEGRATION_ENABLED_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="enable_module" value="1" {PHPBB_INTEGRATION_ENABLED_YES} /><span class="gensmall">{L_PHPBB_INTEGRATION_ENABLED_YES} <input type="radio" name="enable_module" value="0" {PHPBB_INTEGRATION_ENABLED_NO} /><span class="gensmall">{L_PHPBB_INTEGRATION_ENABLED_NO}</span></td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_OVERRIDE_DEFAULT_PAGES}<br /><span class="gensmall">{L_PHPBB_OVERRIDE_DEFAULT_PAGES_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="override_default_pages" value="1" {OVERRIDE_DEFAULT_PAGES_CHECKBOX_YES} /><span class="gensmall">{L_PHPBB_OVERRIDE_DEFAULT_PAGES_YES} <input type="radio" name="override_default_pages" value="0" {OVERRIDE_DEFAULT_PAGES_CHECKBOX_NO} /><span class="gensmall">{L_PHPBB_OVERRIDE_DEFAULT_PAGES_NO}</span></td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_INDEX}<br /><span class="gensmall">{L_PHPBB_EXPLAIN}</span></td> <td class="row2" width="50%">{PHPBB_INDEX}</td> </tr> <tr> <th class="thHead" colspan="2">{L_DEFAULT_PAGES_MORE_TITLE}<br /><span class="gensmall">{L_DEFAULT_PAGES_MORE_TITLE_EXPLAIN}</span></th> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_MEMBERLIST}<br /><span class="gensmall">{L_DEFAULT_PAGES_PROFILECP}</span></td> <td class="row2" width="50%">{PHPBB_MEMBERLIST}</td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_PRIVMSG}<br /><span class="gensmall">{L_DEFAULT_PAGES_PROFILECP}</span></td> <td class="row2" width="50%">{PHPBB_PRIVMSG}</td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_PROFILE}<br /><span class="gensmall">{L_DEFAULT_PAGES_PROFILECP}</span></td> <td class="row2" width="50%">{PHPBB_PROFILE}</td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_GROUPCP}</td> <td class="row2" width="50%">{PHPBB_GROUPCP}</td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_SEARCH}</td> <td class="row2" width="50%">{PHPBB_SEARCH}</td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_LOGIN}</td> <td class="row2" width="50%">{PHPBB_LOGIN}</td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_FAQ}</td> <td class="row2" width="50%">{PHPBB_FAQ}</td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_VIEWONLINE}</td> <td class="row2" width="50%">{PHPBB_VIEWONLINE}</td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_OTHER}</td> <td class="row2" width="50%">{PHPBB_OTHER}</td> </tr> <tr> <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" /></td> </tr> </table> </form> --- NEW FILE: mx_module_parameters.tpl --- <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script> <tr> <td width="100%" colspan="2"> <!-- BEGIN switch_forums_phpbb --> <table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> <tr> <th align="center" class="thTop" colspan="2" nowrap="nowrap" colspan="2"> {L_NEWS_FORUMS} </th> </tr> <!-- END switch_forums_phpbb --> <!-- BEGIN catrow --> <tr> <td class="cat" align="center"><a href="#" onClick="toggle('cat_{catrow.CAT_ID}', '{MX_IMAGES_ROOT}'); return false;"><img src="{MX_IMAGES_ROOT}contract.gif" border="0" id="cat_{catrow.CAT_ID}_img" /></a> <td class="cat" ><span class="cattitle">{catrow.CAT_NAME}</span></td> </tr> <tbody id="cat_{catrow.CAT_ID}"> <!-- BEGIN forumrow_phpbb --> <tr> <td class="row1" align="center" valign="top"><input type="checkbox" name="{SELECT_NAME}[{catrow.forumrow_phpbb.FORUM_ID}]" value="1" {catrow.forumrow_phpbb.CHECKED} /></td> <td class="row1" align="left" valign="top"><span class="forumlink">{catrow.forumrow_phpbb.FORUM_NAME}</span><br /><span class="gensmall">{catrow.forumrow_phpbb.FORUM_DESC}</span></td> </tr> <!-- END forumrow_phpbb --> </tbody> <!-- END catrow --> <!-- BEGIN switch_forums_phpbb --> </table> <!-- END switch_forums_phpbb --> </td> </tr> --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-09-01 04:01:20
|
Update of /cvsroot/mxbb/mx_phpbb3/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12102/language/lang_english Added Files: index.htm lang_admin.php lang_main.php Log Message: This is mx_phpbb3 first atemt .... --- NEW FILE: lang_main.php --- <?php /** * * @package MX-Publisher Module - mx_phpbb3 * @version $Id: lang_main.php,v 1.1 2008/09/01 04:01:16 orynider Exp $ * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com * */ // // The format of this file is: // // ---> $lang['message'] = 'text'; // // Specify your language character encoding... [optional] // // setlocale(LC_ALL, 'en'); // // Last Message Block // $lang['Latest_Post'] = 'Last Message Post'; // // Statistics Block // $lang['Statistics'] = 'Statistics'; $lang['Rank'] = 'Rank'; $lang['Percent'] = 'Percent'; $lang['Graph'] = 'Graph'; $lang['Uses'] = 'Uses'; $lang['Board_Up_Days'] = 'Board Up Days'; $lang['Latest_Reg_User'] = 'Latest User Registered'; $lang['Latest_Reg_User_Date'] = 'Latest User Registered Date'; $lang['Most_Ever_Online'] = 'Most Users Ever Online'; $lang['Most_Ever_Online_Date'] = 'Most Users Ever Online Date'; $lang['Admin_Stats'] = 'Administrative Statistics'; $lang['Top_Posting_Users'] = 'Top Posting Users'; $lang['Most_Active_Topics'] = 'Most Active Topics'; $lang['Most_Viewed_Topics'] = 'Most Viewed Topics'; $lang['Top_Smilies'] = 'Top Used Smilies'; // // Polls // $lang['Surveys_Polls'] = 'Surveys/Polls'; $lang['Already_voted'] = 'You have already voted'; $lang['Click_view_voted'] = 'Click %sHere%s to view the results'; // // These Language Variables are only used if the Attachment Mod is installed // $lang['Disk_usage'] = 'Disk Usage'; // // That's all Folks! // ------------------------------------------------- ?> --- NEW FILE: lang_admin.php --- <?php /** * * @package mxBB Portal Module - mx_phpbb * @version $Id: lang_admin.php,v 1.1 2008/09/01 04:01:14 orynider Exp $ * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ $lang['mx_forum_admin'] = 'mxBB Forum Integration'; $lang['mx_forum_admin_explain'] = 'Here, you can do phpBB and mxBB page mappings.<br />If you run the module with fixed mappings, you only have to use ONE mx_phpbb block, and place this on every mxBB page with phpBB mappings. If you intend to split phpBB and run different forums on different mxBB pages, you need one mx_phpbb block for each subinstance.'; // // phpBB // $lang['Cat_all'] = 'All'; $lang['phpbb_config_updated'] = 'phpBB Plugin Configuration Updated Successfully.'; $lang['Click_return_phpbb_config'] = 'Click %sHere%s to return to phpBB Plugin Configuration'; // // Pages // $lang['phpbb_index'] = 'Index'; $lang['phpbb_viewforum'] = 'Viewforum'; $lang['phpbb_viewtopic'] = 'Viewtopic'; $lang['phpbb_faq'] = 'FAQ'; $lang['phpbb_groupcp'] = 'GroupCP'; $lang['phpbb_login'] = 'Login'; $lang['phpbb_memberlist'] = 'Memberlist'; $lang['phpbb_modcp'] = 'ModCP'; $lang['phpbb_posting'] = 'Posting'; $lang['phpbb_privmsg'] = 'Privmsg'; $lang['phpbb_profile'] = 'Profile'; $lang['phpbb_search'] = 'Search'; $lang['phpbb_viewonline'] = 'View Online'; $lang['phpbb_other'] = 'Other phpBB pages'; $lang['phpbb_explain'] = 'Fixed mapping, or default mapping (if using block settings)'; $lang['submit'] = 'Submit'; $lang['reset'] = 'Reset'; $lang['default_pages_title'] = 'mxBB and phpBB integration'; $lang['default_pages_title_explain'] = ''; $lang['default_pages_more_title'] = 'More phpBB mappings...'; $lang['default_pages_more_title_explain'] = ''; $lang['default_pages_profilecp'] = 'If you have the ProfileCP module installed, you can do the page mapping here (instead of editing the phpBB files directly)'; $lang['phpbb_integration_enabled'] = 'Activate the phpBB module?'; $lang['phpbb_integration_enabled_explain'] = 'When the phpBB module is activated, all phpBB URLs will be directed to mxBB pages. If deactivated, phpBB will operate "as usual", independently of mxBB'; $lang['phpbb_integration_enabled_yes'] = 'Activate'; $lang['phpbb_integration_enabled_no'] = 'Do not use this module'; $lang['phpbb_override'] = 'Associate phpBB and mxBB pages'; $lang['phpbb_override_explain'] = 'phpBB urls are redirected to mxBB pages following these settings.<br /> If using "Block Settings", be sure to edit the phpBB blocks themselves.'; $lang['phpbb_override_yes'] = 'Use Block Settings'; $lang['phpbb_override_no'] = 'Use fixed mappings (see below)'; $lang['Group_Home'] = 'All groups'; ?> --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-09-01 04:01:17
|
Update of /cvsroot/mxbb/mx_phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12102/includes Added Files: common.php forum_hack.php index.htm phpbb3_constants.php phpbb_defs.php phpbb_footer.php Log Message: This is mx_phpbb3 first atemt .... --- NEW FILE: phpbb_footer.php --- <?php /** * * @package mxBB Portal Module - mx_phpbb * @version $Id: phpbb_footer.php,v 1.1 2008/09/01 04:01:12 orynider Exp $ * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ if ( !defined( 'IN_PORTAL' ) ) { die( "Hacking attempt" ); } // Parse and show the overall footer. $template->set_filenames( array( 'phpbb_footer' => 'phpbb_footer.tpl' ) ); $template->assign_vars( array( 'L_MODULE_VERSION' => $phpbb_module_version, 'L_MODULE_ORIG_AUTHOR' => $phpbb_module_orig_author, 'L_MODULE_AUTHOR' => $phpbb_module_author ) ); $template->pparse( 'phpbb_footer' ); ?> --- NEW FILE: forum_hack.php --- <?php /** * * @package mxBB Portal Module - mx_phpbb3 * @version $Id: forum_hack.php,v 1.1 2008/09/01 04:00:59 orynider Exp $ * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ if (!defined('IN_PHPBB')) { die("Hacking attempt"); } if ($_GET['mode'] == 'topicreview' || $_GET['mode'] == 'smilies' || $_GET['mode'] == 'newpm') { return; } [...1522 lines suppressed...] return; } // // Send POST vars via SESSIONS // session_start(); $_SESSION['mxbb_post_vars'] = $_POST; $_SESSION['mxbb_post_files'] = $_FILES; // // Actually, redirection takes place here :-) // $mx_forum->redirect($portal_url); } } // -------------------------------------------------------------------------------- // That's all Folks! // -------------------------------------------------------------------------------- ?> --- NEW FILE: phpbb_defs.php --- <?php /** * * @package mxBB Portal Module - mx_phpbb * @version $Id: phpbb_defs.php,v 1.1 2008/09/01 04:01:10 orynider Exp $ * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ if ( !defined( 'IN_PORTAL' ) ) { die( "Hacking attempt" ); } define( 'NEWS_CAT_TABLE', FORUMS_TABLE ); $cat_extract_order = 'cat_id, forum_order'; $cool_array_category_id = 'forum_id'; $cat_table_category_id = 'f.forum_id'; $item_table_category_id = 't.forum_id'; $item_table_item_id = 't.topic_id'; $item_table_item_type = 't.topic_type'; $item_table_item_time = 't.topic_time'; $item_table_item_last_time = 't.topic_last_post_id'; $item_table_item_title = 't.topic_title'; $item_id = 'topic_id'; $item_type = 'topic_type'; $item_cat_id = 'forum_id'; $item_text = 'post_text'; $item_bbcode_uid = 'bbcode_uid'; $item_time = 'topic_time'; $item_views = 'topic_views'; $item_title = 'topic_title'; $catt_id = 'forum_id'; $catt_name = 'forum_name'; $catt_desc = 'forum_desc'; $item_types_all = 'forum_news'; $item_types_array = array( 'forum_news_announce', 'forum_news_announce', 'forum_news_sticky', 'forum_news_post' ); $item_types_id_array = array( POST_GLOBAL_ANNOUNCE, POST_ANNOUNCE, POST_STICKY, POST_NORMAL ); ?> --- NEW FILE: phpbb3_constants.php --- <?php /** * * @package mxBB Portal Module - mx_phpbb3 * @version $Id: phpbb3_constants.php,v 1.1 2008/09/01 04:01:01 orynider Exp $ * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ if (!defined('IN_PORTAL')) { exit; } if ( PORTAL_BACKEND != 'phpbb3' ) { mx_message_die(GENERAL_MESSAGE, 'There are blocks on this page designed for MX-Publisher with phpBB3 backend, thus not compatible with current setup.'); } // Forum/Topic states !defined('FORUM_CAT') ? define('FORUM_CAT', 0) : false; !defined('FORUM_POST') ? define('FORUM_POST', 1) : false; !defined('FORUM_LINK') ? define('FORUM_LINK', 2) : false; !defined('ITEM_UNLOCKED') ? define('ITEM_UNLOCKED', 0) : false; !defined('ITEM_LOCKED') ? define('ITEM_LOCKED', 1) : false; !defined('ITEM_MOVED') ? define('ITEM_MOVED', 2) : false; // Topic types !defined('POST_NORMAL') ? define('POST_NORMAL', 0) : false; !defined('POST_STICKY') ? define('POST_STICKY', 1) : false; !defined('POST_ANNOUNCE') ? define('POST_ANNOUNCE', 2) : false; !defined('POST_GLOBAL') ? define('POST_GLOBAL', 3) : false; define( 'PAGE_FORUM', -502 ); define( 'PHPBB3_CONFIG_TABLE', $mx_table_prefix . 'phpbb3_plugin_config' ); define( 'POST_ADD_TYPE', 20 ); define( 'TOPIC_ADD_TYPE_TABLE', $mx_table_prefix . 'topic_add_type' ); $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang']; if (empty($default_lang)) { // - populate $default_lang $default_lang= 'english'; } if ((@include $mx_root_path . "includes/shared/phpbb2/language/lang_" . $default_lang . "/lang_main.$phpEx") === false) { if ((@include $mx_root_path . "includes/shared/phpbb2/language/lang_english/lang_main.$phpEx") === false) { mx_message_die(CRITICAL_ERROR, 'Language file (mx_phpbb3) ' . $mx_root_path . "includes/shared/phpbb2/language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.'); } } // ------------------------------------------------------------------------- // Footer Copyrights // ------------------------------------------------------------------------- if (is_object($mx_page)) { // ------------------------------------------------------------------------- // Extend User Style with module lang and images // Usage: $mx_user->extend(LANG, IMAGES) // Switches: // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE // ------------------------------------------------------------------------- $mx_user->extend(MX_LANG_MAIN, MX_IMAGES_NONE); } // ********************************************************************** // Read theme definition // ********************************************************************** /* if ( file_exists( $module_root_path . "templates/" . $theme['template_name'] . "/images" ) ) { // ---------- $current_template_images = $module_root_path . "templates/" . $theme['template_name'] . "/images" ; // ---------- } else { // ---------- $current_template_images = $module_root_path . "templates/" . "_core" . "/images" ; // ---------- } $images['phpbb_folder_announce'] = $images['folder_announce']; $images['phpbb_folder_sticky'] = $images['folder_sticky']; $images['phpbb_folder'] = $images['folder']; */ // // get type list for adding and editing articles // function phpbb3_get_types() { $item_types_array = array( 'forum_news_announce', 'forum_news_announce', 'forum_news_sticky', 'forum_news_post' ); $item_types_id_array = array( POST_GLOBAL_ANNOUNCE, POST_ANNOUNCE, POST_STICKY, POST_NORMAL ); return array( $item_types_array, $item_types_id_array ); } if (is_object($mx_page)) { $mx_page->add_copyright('mxBB phpBB Module'); } // ---------- $phpbb_module_version = "0.9x BETA"; $phpbb_module_author = "MX Team"; $phpbb_module_orig_author = "phpBB Group"; ?> --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> --- NEW FILE: common.php --- <?php /** * * @package phpBB3 * @version $Id: common.php,v 1.1 2008/09/01 04:00:58 orynider Exp $ * @copyright (c) 2005 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * * Minimum Requirement: PHP 4.3.3 */ /** */ if (!defined('IN_PHPBB')) { exit; } $starttime = explode(' ', microtime()); $starttime = $starttime[1] + $starttime[0]; // Report all errors, except notices error_reporting(E_ALL ^ E_NOTICE); /* * Remove variables created by register_globals from the global scope * Thanks to Matt Kavanagh */ function deregister_globals() { $not_unset = array( 'GLOBALS' => true, '_GET' => true, '_POST' => true, '_COOKIE' => true, '_REQUEST' => true, '_SERVER' => true, '_SESSION' => true, '_ENV' => true, '_FILES' => true, 'phpEx' => true, 'phpbb_root_path' => true ); // Not only will array_merge and array_keys give a warning if // a parameter is not an array, array_merge will actually fail. // So we check if _SESSION has been initialised. if (!isset($_SESSION) || !is_array($_SESSION)) { $_SESSION = array(); } // Merge all into one extremely huge array; unset this later $input = array_merge( array_keys($_GET), array_keys($_POST), array_keys($_COOKIE), array_keys($_SERVER), array_keys($_SESSION), array_keys($_ENV), array_keys($_FILES) ); foreach ($input as $varname) { if (isset($not_unset[$varname])) { // Hacking attempt. No point in continuing unless it's a COOKIE if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { exit; } else { $cookie = &$_COOKIE; while (isset($cookie['GLOBALS'])) { foreach ($cookie['GLOBALS'] as $registered_var => $value) { if (!isset($not_unset[$registered_var])) { unset($GLOBALS[$registered_var]); } } $cookie = &$cookie['GLOBALS']; } } } unset($GLOBALS[$varname]); } unset($input); } // If we are on PHP >= 6.0.0 we do not need some code if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) { /** * @ignore */ define('STRIP', false); } else { set_magic_quotes_runtime(0); // Be paranoid with passed vars if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) { deregister_globals(); } define('STRIP', (get_magic_quotes_gpc()) ? true : false); } if (defined('IN_CRON')) { $phpbb_root_path = dirname(__FILE__) . DIRECTORY_SEPARATOR; } if (!file_exists($phpbb_root_path . 'config.' . $phpEx)) { die("<p>The config.$phpEx file could not be found.</p><p><a href=\"{$phpbb_root_path}install/index.$phpEx\">Click here to install phpBB</a></p>"); } require($phpbb_root_path . 'config.' . $phpEx); if (!defined('PHPBB_INSTALLED')) { // Redirect the user to the installer // We have to generate a full HTTP/1.1 header here since we can't guarantee to have any of the information // available as used by the redirect function $server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); $server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'); $secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0; $script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF'); if (!$script_name) { $script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI'); } // Replace any number of consecutive backslashes and/or slashes with a single slash // (could happen on some proxy setups and/or Windows servers) $script_path = trim(dirname($script_name)) . '/install/index.' . $phpEx; $script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path); $url = (($secure) ? 'https://' : 'http://') . $server_name; if ($server_port && (($secure && $server_port <> 443) || (!$secure && $server_port <> 80))) { // HTTP HOST can carry a port number... if (strpos($server_name, ':') === false) { $url .= ':' . $server_port; } } $url .= $script_path; header('Location: ' . $url); exit; } if (defined('DEBUG_EXTRA')) { $base_memory_usage = 0; if (function_exists('memory_get_usage')) { $base_memory_usage = memory_get_usage(); } } // Load Extensions if (!empty($load_extensions)) { $load_extensions = explode(',', $load_extensions); foreach ($load_extensions as $extension) { @dl(trim($extension)); } } // Include files require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx); require($phpbb_root_path . 'includes/cache.' . $phpEx); require($phpbb_root_path . 'includes/template.' . $phpEx); require($phpbb_root_path . 'includes/session.' . $phpEx); require($phpbb_root_path . 'includes/auth.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); require($phpbb_root_path . 'includes/functions_content.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); // Set PHP error handler to ours set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); // Instantiate some basic classes $user = new user(); $auth = new auth(); $template = new template(); $cache = new cache(); $db = new $sql_db(); // Connect to DB $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false); // We do not need this any longer, unset for safety purposes unset($dbpasswd); // Grab global variables, re-cache if necessary $config = $cache->obtain_config(); // Add own hook handler require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); foreach ($cache->obtain_hooks() as $hook) { @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx); } //+mxbb_portal if( !defined('IN_ADMIN') ) { $mx_root_path = './../'; if (file_exists($mx_root_path.'modules/mx_phpbb3/includes/forum_hack.'.$phpEx)) { include_once($mx_root_path.'modules/mx_phpbb3/includes/forum_hack.'.$phpEx); } } //-mxbb_portal ?> |
|
From: FlorinCB <ory...@us...> - 2008-09-01 04:01:16
|
Update of /cvsroot/mxbb/mx_phpbb3/language In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12102/language Added Files: index.htm Log Message: This is mx_phpbb3 first atemt .... --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
2 messages has been excluded from this view by a project administrator.
