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: Jon O. <jon...@us...> - 2008-06-15 21:04:45
|
Update of /cvsroot/mxbb/mx_news In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27132 Modified Files: mx_news.php mx_news_list.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: mx_news_list.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/mx_news_list.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_news_list.php 3 Jun 2008 20:12:17 -0000 1.2 --- mx_news_list.php 15 Jun 2008 21:04:40 -0000 1.3 *************** *** 60,65 **** $tplEx = 'tpl'; ! include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management --- 60,67 ---- $tplEx = 'tpl'; ! mx_page::load_file('bbcode', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! mx_page::load_file('functions_post', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management *************** *** 75,81 **** $tplEx = 'html'; - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx ); - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx ); - // // Start session management --- 77,80 ---- Index: mx_news.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/mx_news.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_news.php 3 Jun 2008 20:12:17 -0000 1.5 --- mx_news.php 15 Jun 2008 21:04:40 -0000 1.6 *************** *** 60,65 **** $tplEx = 'tpl'; ! include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management --- 60,67 ---- $tplEx = 'tpl'; ! mx_page::load_file('bbcode', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! mx_page::load_file('functions_post', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management *************** *** 75,81 **** $tplEx = 'html'; - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx ); - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx ); - // // Start session management --- 77,80 ---- |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:04:26
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27103/linkdb/admin Modified Files: admin_auth_manage.php admin_custom_manage.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: admin_custom_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_custom_manage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_custom_manage.php 3 Jun 2008 20:10:05 -0000 1.4 --- admin_custom_manage.php 15 Jun 2008 21:04:21 -0000 1.5 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $this_custom_field = new mx_custom_field(LINK_CUSTOM_TABLE, LINK_CUSTOM_DATA_TABLE); --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $this_custom_field = new mx_custom_field(LINK_CUSTOM_TABLE, LINK_CUSTOM_DATA_TABLE); Index: admin_auth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_auth_manage.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin_auth_manage.php 3 Jun 2008 20:10:04 -0000 1.8 --- admin_auth_manage.php 15 Jun 2008 21:04:21 -0000 1.9 *************** *** 23,27 **** // Includes // ! include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:04:25
|
Update of /cvsroot/mxbb/mx_linkdb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27103 Modified Files: linkdb.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: linkdb.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** linkdb.php 3 Jun 2008 20:08:42 -0000 1.17 --- linkdb.php 15 Jun 2008 21:04:20 -0000 1.18 *************** *** 60,65 **** $tplEx = 'tpl'; ! include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management --- 60,67 ---- $tplEx = 'tpl'; ! mx_page::load_file('bbcode', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! mx_page::load_file('functions_post', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management *************** *** 75,81 **** $tplEx = 'html'; - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx ); - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx ); - // // Start session management --- 77,80 ---- |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:04:14
|
Update of /cvsroot/mxbb/mx_kb/kb/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26734/kb/admin Modified Files: admin_auth_manage.php admin_cat_manage.php admin_custom_manage.php admin_settings.php admin_types_manage.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: admin_custom_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_custom_manage.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_custom_manage.php 3 Jun 2008 20:10:13 -0000 1.5 --- admin_custom_manage.php 15 Jun 2008 21:04:08 -0000 1.6 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $this_custom_field = new mx_custom_field(KB_CUSTOM_TABLE, KB_CUSTOM_DATA_TABLE); --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $this_custom_field = new mx_custom_field(KB_CUSTOM_TABLE, KB_CUSTOM_DATA_TABLE); Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_cat_manage.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_cat_manage.php 3 Jun 2008 20:10:12 -0000 1.7 --- admin_cat_manage.php 15 Jun 2008 21:04:08 -0000 1.8 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); Index: admin_types_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_types_manage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_types_manage.php 3 Jun 2008 20:10:14 -0000 1.6 --- admin_types_manage.php 15 Jun 2008 21:04:08 -0000 1.7 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // Index: admin_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_settings.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_settings.php 3 Jun 2008 20:10:14 -0000 1.6 --- admin_settings.php 15 Jun 2008 21:04:08 -0000 1.7 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // Index: admin_auth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_auth_manage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_auth_manage.php 3 Jun 2008 20:10:12 -0000 1.6 --- admin_auth_manage.php 15 Jun 2008 21:04:07 -0000 1.7 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:04:12
|
Update of /cvsroot/mxbb/mx_kb/kb/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26734/kb/modules Modified Files: kb_search.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: kb_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_search.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** kb_search.php 3 Jun 2008 20:10:35 -0000 1.12 --- kb_search.php 15 Jun 2008 21:04:08 -0000 1.13 *************** *** 30,34 **** global $phpbb_root_path, $userdata, $mx_root_path, $module_root_path, $is_block; ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); if ( isset( $_REQUEST['search_keywords'] ) ) --- 30,35 ---- global $phpbb_root_path, $userdata, $mx_root_path, $module_root_path, $is_block; ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); if ( isset( $_REQUEST['search_keywords'] ) ) |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:04:12
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26734 Modified Files: kb.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** kb.php 3 Jun 2008 20:08:21 -0000 1.49 --- kb.php 15 Jun 2008 21:04:07 -0000 1.50 *************** *** 59,64 **** $tplEx = 'tpl'; ! include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management --- 59,66 ---- $tplEx = 'tpl'; ! mx_page::load_file('bbcode', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! mx_page::load_file('functions_post', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management *************** *** 74,80 **** $tplEx = 'html'; - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx ); - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx ); - // // Start session management --- 76,79 ---- |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:03:40
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26502 Modified Files: admin_auth_manage.php admin_cat_manage.php admin_custom_manage.php admin_settings.php admin_types_manage.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: admin_custom_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_custom_manage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_custom_manage.php 3 Jun 2008 20:07:44 -0000 1.4 --- admin_custom_manage.php 15 Jun 2008 21:03:34 -0000 1.5 *************** *** 24,28 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $this_custom_field = new mx_custom_field(BUGSBT_CUSTOM_TABLE, BUGSBT_CUSTOM_DATA_TABLE); --- 24,29 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $this_custom_field = new mx_custom_field(BUGSBT_CUSTOM_TABLE, BUGSBT_CUSTOM_DATA_TABLE); Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_cat_manage.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_cat_manage.php 3 Jun 2008 20:07:44 -0000 1.7 --- admin_cat_manage.php 15 Jun 2008 21:03:34 -0000 1.8 *************** *** 24,28 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); --- 24,29 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); Index: admin_types_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_types_manage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_types_manage.php 3 Jun 2008 20:07:44 -0000 1.4 --- admin_types_manage.php 15 Jun 2008 21:03:34 -0000 1.5 *************** *** 24,28 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // --- 24,29 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // Index: admin_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_settings.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_settings.php 3 Jun 2008 20:07:44 -0000 1.5 --- admin_settings.php 15 Jun 2008 21:03:34 -0000 1.6 *************** *** 24,28 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // --- 24,29 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // Index: admin_auth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_auth_manage.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_auth_manage.php 3 Jun 2008 20:07:44 -0000 1.5 --- admin_auth_manage.php 15 Jun 2008 21:03:34 -0000 1.6 *************** *** 24,28 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // --- 24,29 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:02:37
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25617 Modified Files: Tag: core28x mx_functions_core.php Log Message: updated load_file() method Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.52.2.14 retrieving revision 1.52.2.15 diff -C2 -d -r1.52.2.14 -r1.52.2.15 *** mx_functions_core.php 3 Jun 2008 21:00:25 -0000 1.52.2.14 --- mx_functions_core.php 15 Jun 2008 21:02:29 -0000 1.52.2.15 *************** *** 3072,3075 **** --- 3072,3084 ---- * Load additional functions/classes. * + * The $force_shared parameter will ensure we include the mxp shared version of the file. + * If you need to include a shared version from a different backend, pass this info. + * + * Examples + * + * mx_page::load_file('functions_post'), will include the phpbb version of the file + * mx_page::load_file('functions_post', true), will include the shared phpbb version of the file + * mx_page::load_file('functions_post', 'phpbb2'), will include the shared phpbb2 version of the file, even though we are running in internal/phpbb3 mode + * * @param unknown_type $file * @param unknown_type $backend *************** *** 3080,3085 **** --- 3089,3115 ---- global $mx_root_path, $phpbb_root_path, $phpEx; + /* $path = PORTAL_BACKEND == 'internal' || $force_shared ? $mx_root_path . 'includes/shared/' . PORTAL_BACKEND . '/includes/' : $phpbb_root_path . 'includes/'; + if (file_exists($path . $file.'.'.$phpEx)) + { + @include_once($path . $file.'.'.$phpEx); + } + */ + if (PORTAL_BACKEND == 'internal' || $force_shared) + { + $backend = in_array($force_shared, array('internal', 'phpbb2', 'phpbb3')) ? $force_shared : PORTAL_BACKEND; + switch ($backend) + { + case 'internal': + case 'phpbb2': + $path = $mx_root_path . 'includes/shared/phpbb2/includes/'; + break; + } + } + else + { + $path = $phpbb_root_path . 'includes/'; + } if (file_exists($path . $file.'.'.$phpEx)) |
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24843 Modified Files: bbcode.php functions.php functions_admin.php functions_hook.php functions_module.php functions_posting.php Log Message: 2.9.x -> 3.0.0 b1 updated load_file() method new panel admincp (in development), index_jon.php some code cleanup Many updates for phpbb3 backend. Details are given in our current To-DO discussion Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** functions.php 3 Jun 2008 20:04:14 -0000 1.16 --- functions.php 15 Jun 2008 21:01:41 -0000 1.17 *************** *** 18,21 **** --- 18,22 ---- // + // MODIFICATIONS: // Common global functions // Fixes for MX-Publisher: *************** *** 102,106 **** { reset($default); ! list($sub_key_type, $sub_type) = each(current($default)); $sub_type = gettype($sub_type); $sub_type = ($sub_type == 'array') ? 'NULL' : $sub_type; --- 103,108 ---- { reset($default); ! $default = current($default); ! list($sub_key_type, $sub_type) = each($default); $sub_type = gettype($sub_type); $sub_type = ($sub_type == 'array') ? 'NULL' : $sub_type; *************** *** 211,214 **** --- 213,236 ---- /** + * Return formatted string for filesizes + */ + function get_formatted_filesize($bytes, $add_size_lang = true) + { + global $user; + + if ($bytes >= pow(2, 20)) + { + return ($add_size_lang) ? round($bytes / 1024 / 1024, 2) . ' ' . $user->lang['MIB'] : round($bytes / 1024 / 1024, 2); + } + + if ($bytes >= pow(2, 10)) + { + return ($add_size_lang) ? round($bytes / 1024, 2) . ' ' . $user->lang['KIB'] : round($bytes / 1024, 2); + } + + return ($add_size_lang) ? ($bytes) . ' ' . $user->lang['BYTES'] : ($bytes); + } + + /** * Determine whether we are approaching the maximum execution time. Should be called once * at the beginning of the script in which it's used. *************** *** 225,229 **** if (empty($max_execution_time)) { ! $max_execution_time = (function_exists('ini_get')) ? (int) ini_get('max_execution_time') : (int) get_cfg_var('max_execution_time'); // If zero, then set to something higher to not let the user catch the ten seconds barrier. --- 247,251 ---- if (empty($max_execution_time)) { ! $max_execution_time = (function_exists('ini_get')) ? (int) @ini_get('max_execution_time') : (int) @get_cfg_var('max_execution_time'); // If zero, then set to something higher to not let the user catch the ten seconds barrier. *************** *** 608,615 **** function add_form_key($form_name) { ! global $board_config, $template, $mx_user, $mx_acp; $now = time(); ! $token_sid = ($mx_user->data['user_id'] == ANONYMOUS && !empty($board_config['form_token_sid_guests'])) ? $mx_user->session_id : ''; ! $token = sha1($now . $mx_user->data['user_form_salt'] . $form_name . $token_sid); $s_fields = build_hidden_fields(array( --- 630,637 ---- function add_form_key($form_name) { ! global $board_config, $template, $user, $mx_acp; $now = time(); ! $token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($board_config['form_token_sid_guests'])) ? $user->session_id : ''; ! $token = sha1($now . $user->data['user_form_salt'] . $form_name . $token_sid); $s_fields = build_hidden_fields(array( *************** *** 617,628 **** 'form_token' => $token, )); ! if ( defined( 'IN_ADMIN' ) && is_object( $mx_acp ) ) ! { ! $mx_acp->template->assign_var( 'S_FORM_TOKEN' , $s_fields ); ! } ! else ! { ! $template->assign_var( 'S_FORM_TOKEN', $s_fields ); ! } } --- 639,643 ---- 'form_token' => $token, )); ! $template->assign_var( 'S_FORM_TOKEN', $s_fields ); } *************** *** 638,642 **** function check_form_key( $form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false ) { ! global $board_config, $mx_user; if ( $timespan === false ) { --- 653,657 ---- function check_form_key( $form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false ) { ! global $board_config, $user; if ( $timespan === false ) { *************** *** 658,664 **** if ( ( $diff >= $minimum_time ) && ( ( $diff <= $timespan ) || $timespan == -1 ) ) { ! $token_sid = ( $mx_user->data['user_id'] == ANONYMOUS && !empty( $board_config['form_token_sid_guests'] ) ) ? $mx_user->session_id : ''; ! $key = sha1( $creation_time . $mx_user->data['user_form_salt'] . $form_name . $token_sid ); if ( $key === $token ) { --- 673,679 ---- if ( ( $diff >= $minimum_time ) && ( ( $diff <= $timespan ) || $timespan == -1 ) ) { ! $token_sid = ( $user->data['user_id'] == ANONYMOUS && !empty( $board_config['form_token_sid_guests'] ) ) ? $user->session_id : ''; ! $key = sha1( $creation_time . $user->data['user_form_salt'] . $form_name . $token_sid ); if ( $key === $token ) { *************** *** 683,687 **** function group_create( &$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false ) { ! global $phpbb_root_path, $board_config, $db, $mx_user, $file_upload; $error = array(); --- 698,702 ---- function group_create( &$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false ) { ! global $phpbb_root_path, $board_config, $db, $user, $file_upload; $error = array(); *************** *** 704,708 **** if ( !utf8_strlen( $name ) || utf8_strlen( $name ) > 60 ) { ! $error[] = ( !utf8_strlen( $name ) ) ? $mx_user->lang['GROUP_ERR_USERNAME'] : $mx_user->lang['GROUP_ERR_USER_LONG']; } --- 719,723 ---- if ( !utf8_strlen( $name ) || utf8_strlen( $name ) > 60 ) { ! $error[] = ( !utf8_strlen( $name ) ) ? $user->lang['GROUP_ERR_USERNAME'] : $user->lang['GROUP_ERR_USER_LONG']; } *************** *** 710,719 **** if ( !empty( $err ) ) { ! $error[] = $mx_user->lang[$err]; } if ( !in_array( $type, array( GROUP_OPEN, GROUP_CLOSED, GROUP_HIDDEN, GROUP_SPECIAL, GROUP_FREE ) ) ) { ! $error[] = $mx_user->lang['GROUP_ERR_TYPE']; } --- 725,734 ---- if ( !empty( $err ) ) { ! $error[] = $user->lang[$err]; } if ( !in_array( $type, array( GROUP_OPEN, GROUP_CLOSED, GROUP_HIDDEN, GROUP_SPECIAL, GROUP_FREE ) ) ) { ! $error[] = $user->lang['GROUP_ERR_TYPE']; } *************** *** 819,823 **** } ! $name = ( $type == GROUP_SPECIAL ) ? $mx_user->lang['G_' . $name] : $name; //add_log( 'admin', $log, $name ); --- 834,838 ---- } ! $name = ( $type == GROUP_SPECIAL ) ? $user->lang['G_' . $name] : $name; //add_log( 'admin', $log, $name ); *************** *** 1763,1767 **** while ($row = $db->sql_fetchrow($result)) { ! if (!in_array(base_convert($row['topic_id'], 10, 36), array_keys($check_forum))) { $unread = true; --- 1778,1782 ---- while ($row = $db->sql_fetchrow($result)) { ! if (!isset($check_forum[base_convert($row['topic_id'], 10, 36)])) { $unread = true; *************** *** 1984,1987 **** --- 1999,2003 ---- $template->assign_vars(array( $tpl_prefix . 'BASE_URL' => $base_url, + 'A_' . $tpl_prefix . 'BASE_URL' => addslashes($base_url), $tpl_prefix . 'PER_PAGE' => $per_page, *************** *** 2110,2114 **** global $board_config, $user; ! $server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'); $server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'); --- 2126,2130 ---- global $board_config, $user; ! $server_name = $user->host; $server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'); *************** *** 3266,3272 **** function smiley_text($text, $force_option = false) { ! global $board_config, $mx_user, $phpbb_root_path; ! if ($force_option || !$board_config['allow_smilies'] || !$mx_user->optionget('viewsmilies')) { return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text); --- 3282,3288 ---- function smiley_text($text, $force_option = false) { ! global $board_config, $user, $phpbb_root_path; ! if ($force_option || !$board_config['allow_smilies'] || !$user->optionget('viewsmilies')) { return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text); Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** functions_hook.php 22 Feb 2008 23:03:55 -0000 1.12 --- functions_hook.php 15 Jun 2008 21:01:41 -0000 1.13 *************** *** 17,24 **** } - mx_page::load_file( 'functions'); - mx_page::load_file( 'functions_module'); - mx_page::load_file( 'message_parser'); - class mx_phpbb3_admin { --- 17,20 ---- *************** *** 139,142 **** --- 135,139 ---- { global $phpbb_root_path, $phpEx, $mx_request_vars, $phpbb_admin_path, $template; + $admin_panel_script_path = $phpbb_root_path . 'includes/acp/acp_'. $this->action_scripts[$panel] . '.' . $phpEx; *************** *** 145,154 **** return "echo '<div class=\"errorbox\">phpbb3 admin nanel not found<br/>$admin_panel_script_path</div>';"; } $script = trim( file_get_contents( $phpbb_root_path . 'adm/index.' . $phpEx ) ); $preg_array = array( '#(<\?(php)?|\?>)#si' => '', '#\$php(Ex|bb_root_path|bb_admin_path) = [^;]*;#si' => '// MX_ACP_REPLACE \0', ! '#(include|require)\(([^)]*)\)[^;]*#s' => 'mx_page::load_file(\2)', '#\$user#si' => '$mx_user', '#\$auth#si' => '$phpbb_auth', '#([^_])append_sid#si' => '\1mx_append_sid', '#\$module_id[ \t][^;]*;#si' => "\$module_id = '" . $this->action_scripts[$panel] . "';", --- 142,157 ---- return "echo '<div class=\"errorbox\">phpbb3 admin nanel not found<br/>$admin_panel_script_path</div>';"; } + $script = trim( file_get_contents( $phpbb_root_path . 'adm/index.' . $phpEx ) ); + $preg_array = array( '#(<\?(php)?|\?>)#si' => '', '#\$php(Ex|bb_root_path|bb_admin_path) = [^;]*;#si' => '// MX_ACP_REPLACE \0', ! '#\$user->session_begin[^;]*;#si' => '// MX_ACP_REPLACE \0', ! '#\$auth->acl\(\$user->data\)[^;]*;#si' => '// MX_ACP_REPLACE \0', ! '#\$user->setup[^;]*;#si' => '// MX_ACP_REPLACE \0', ! '#(include|require)\(([^)]*)\)[^;]*#s' => '// MX_ACP_REPLACE mx_page::load_file(\2, \'phpbb3\')', '#\$user#si' => '$mx_user', '#\$auth#si' => '$phpbb_auth', + '#\$config#si' => '$board_config', '#([^_])append_sid#si' => '\1mx_append_sid', '#\$module_id[ \t][^;]*;#si' => "\$module_id = '" . $this->action_scripts[$panel] . "';", *************** *** 162,172 **** '#display\(\'body\'\);#si' => "display('panel');", '#(garbage_collection|exit_handler)\(\);#si' => 'phpBB3::\1();', ! '#\$template->#si' => '$mx_acp->template->', ! '#adm_page_footer\(\);#si' => '$mx_acp->_template_assign_vars();$mx_acp->template->pparse(\'panel\');', '#global #si' => 'global $mx_acp, ', ); $func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match ); mx_page::load_file( 'utf/utf_tools'); for( $i = 0; $i < $func_cnt; $i++ ) { --- 165,177 ---- '#display\(\'body\'\);#si' => "display('panel');", '#(garbage_collection|exit_handler)\(\);#si' => 'phpBB3::\1();', ! //'#\$template->#si' => '$mx_acp->template->', ! '#adm_page_footer\(\);#si' => '$mx_acp->_template_assign_vars();$template->pparse(\'panel\');', '#global #si' => 'global $mx_acp, ', ); + $func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match ); mx_page::load_file( 'utf/utf_tools'); + for( $i = 0; $i < $func_cnt; $i++ ) { *************** *** 178,181 **** --- 183,187 ---- } } + $script = preg_replace( array_keys( $preg_array ), $preg_array, $script ); return $script; Index: functions_module.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_module.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** functions_module.php 12 Feb 2008 06:29:31 -0000 1.11 --- functions_module.php 15 Jun 2008 21:01:42 -0000 1.12 *************** *** 446,450 **** '#get_username_string\(#si' => 'mx_get_username_string(', '#global#si' => 'global $mx_acp,', ! '#\$template-#si' => '$mx_acp->template-', '#trigger_error\(([^,)]*)([,\)])#si' => '$mx_acp->mx_message_die_acp( GENERAL_MESSAGE, \1 \2 ', '#\$mx_acp->template->assign_vars#si' => 'foreach( $mx_user->lang as $key => $value) --- 446,450 ---- '#get_username_string\(#si' => 'mx_get_username_string(', '#global#si' => 'global $mx_acp,', ! //'#\$template-#si' => '$mx_acp->template-', '#trigger_error\(([^,)]*)([,\)])#si' => '$mx_acp->mx_message_die_acp( GENERAL_MESSAGE, \1 \2 ', '#\$mx_acp->template->assign_vars#si' => 'foreach( $mx_user->lang as $key => $value) *************** *** 732,736 **** // Select first id we can get ! if (!$current_id && (in_array($item_ary['id'], array_keys($this->module_cache['parents'])) || $item_ary['id'] == $this->p_id)) { $current_id = $item_ary['id']; --- 732,736 ---- // Select first id we can get ! if (!$current_id && (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id)) { $current_id = $item_ary['id']; *************** *** 765,769 **** $tpl_ary = array( 'L_TITLE' => $item_ary['lang'], ! 'S_SELECTED' => (in_array($item_ary['id'], array_keys($this->module_cache['parents'])) || $item_ary['id'] == $this->p_id) ? true : false, 'U_TITLE' => $u_title ); --- 765,769 ---- $tpl_ary = array( 'L_TITLE' => $item_ary['lang'], ! 'S_SELECTED' => (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id) ? true : false, 'U_TITLE' => $u_title ); *************** *** 774,778 **** $tpl_ary = array( 'L_TITLE' => $item_ary['lang'], ! 'S_SELECTED' => (in_array($item_ary['id'], array_keys($this->module_cache['parents'])) || $item_ary['id'] == $this->p_id) ? true : false, 'U_TITLE' => $u_title ); --- 774,778 ---- $tpl_ary = array( 'L_TITLE' => $item_ary['lang'], ! 'S_SELECTED' => (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id) ? true : false, 'U_TITLE' => $u_title ); *************** *** 838,842 **** } ! $mx_acp->template->set_filenames(array( 'body' => $this->get_tpl_name()) ); --- 838,842 ---- } ! $template->set_filenames(array( 'body' => $this->get_tpl_name()) ); Index: functions_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions_admin.php 5 Feb 2008 14:51:27 -0000 1.3 --- functions_admin.php 15 Jun 2008 21:01:41 -0000 1.4 *************** *** 18,26 **** // ! // Fixes for MX-Publisher: // $config -> $board_config // $cache -> $mx_cache - // $user -> $mx_user // $auth -> $phpbb_auth // append_sid -> mx3_append_sid // get_username_string -> mx_get_username_string --- 18,26 ---- // ! // MODIFICATIONS: // $config -> $board_config // $cache -> $mx_cache // $auth -> $phpbb_auth + // $user -> $mx_user // append_sid -> mx3_append_sid // get_username_string -> mx_get_username_string *************** *** 108,112 **** $item_data['right_id'] = $row['right_id'] + 2; } ! $sql = "UPDATE $sql_table SET left_id = {$item_data['left_id']}, right_id = {$item_data['right_id']} --- 108,112 ---- $item_data['right_id'] = $row['right_id'] + 2; } ! $sql = "UPDATE $sql_table SET left_id = {$item_data['left_id']}, right_id = {$item_data['right_id']} *************** *** 207,211 **** global $mx_user; ! $size_types_text = array($mx_user->lang['BYTES'], $mx_user->lang['KB'], $mx_user->lang['MB']); $size_types = array('b', 'kb', 'mb'); --- 207,211 ---- global $mx_user; ! $size_types_text = array($mx_user->lang['BYTES'], $mx_user->lang['KIB'], $mx_user->lang['MIB']); $size_types = array('b', 'kb', 'mb'); *************** *** 927,931 **** while ($row = $db->sql_fetchrow($result)) { ! $remaining[] = $row['post_msg_id']; } $db->sql_freeresult($result); --- 927,931 ---- while ($row = $db->sql_fetchrow($result)) { ! $remaining[] = $row['post_msg_id']; } $db->sql_freeresult($result); *************** *** 951,955 **** while ($row = $db->sql_fetchrow($result)) { ! $remaining[] = $row['post_msg_id']; } $db->sql_freeresult($result); --- 951,955 ---- while ($row = $db->sql_fetchrow($result)) { ! $remaining[] = $row['post_msg_id']; } $db->sql_freeresult($result); *************** *** 989,993 **** while ($row = $db->sql_fetchrow($result)) { ! $remaining[] = $row['topic_id']; } $db->sql_freeresult($result); --- 989,993 ---- while ($row = $db->sql_fetchrow($result)) { ! $remaining[] = $row['topic_id']; } $db->sql_freeresult($result); *************** *** 1026,1030 **** $db->sql_query($sql); break; ! default: $sql = 'SELECT t.topic_id --- 1026,1030 ---- $db->sql_query($sql); break; ! default: $sql = 'SELECT t.topic_id *************** *** 1093,1102 **** // Now add the information... $sql_ary = array(); ! foreach ($posted as $mx_user_id => $topic_row) { foreach ($topic_row as $topic_id) { $sql_ary[] = array( ! 'user_id' => (int) $mx_user_id, 'topic_id' => (int) $topic_id, 'topic_posted' => 1, --- 1093,1102 ---- // Now add the information... $sql_ary = array(); ! foreach ($posted as $user_id => $topic_row) { foreach ($topic_row as $topic_id) { $sql_ary[] = array( ! 'user_id' => (int) $user_id, 'topic_id' => (int) $topic_id, 'topic_posted' => 1, *************** *** 1224,1228 **** $db->sql_query($sql); break; ! default: $sql = 'SELECT t1.topic_id --- 1224,1228 ---- $db->sql_query($sql); break; ! default: $sql = 'SELECT t1.topic_id *************** *** 2246,2259 **** $result = $db->sql_query($sql); ! $mx_usernames_ary = array(); while ($row = $db->sql_fetchrow($result)) { ! $mx_usernames_ary[$row['user_id']] = $row['username']; } ! foreach ($hold_ary as $mx_user_id => $forum_id_ary) { // Do not continue if user does not exist ! if (!isset($mx_usernames_ary[$mx_user_id])) { continue; --- 2246,2259 ---- $result = $db->sql_query($sql); ! $usernames_ary = array(); while ($row = $db->sql_fetchrow($result)) { ! $usernames_ary[$row['user_id']] = $row['username']; } ! foreach ($hold_ary as $user_id => $forum_id_ary) { // Do not continue if user does not exist ! if (!isset($usernames_ary[$user_id])) { continue; *************** *** 2264,2269 **** $sql_ary[] = array( 'forum_id' => (int) $forum_id, ! 'user_id' => (int) $mx_user_id, ! 'username' => (string) $mx_usernames_ary[$mx_user_id], 'group_id' => 0, 'group_name' => '' --- 2264,2269 ---- $sql_ary[] = array( 'forum_id' => (int) $forum_id, ! 'user_id' => (int) $user_id, ! 'username' => (string) $usernames_ary[$user_id], 'group_id' => 0, 'group_name' => '' *************** *** 2342,2346 **** * View log */ ! function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $mx_user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC') { global $db, $mx_user, $phpbb_auth, $phpEx, $phpbb_root_path, $phpbb_admin_path; --- 2342,2346 ---- * View log */ ! function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC') { global $db, $mx_user, $phpbb_auth, $phpEx, $phpbb_root_path, $phpbb_admin_path; *************** *** 2376,2382 **** case 'user': $log_type = LOG_USERS; ! $sql_forum = 'AND l.reportee_id = ' . (int) $mx_user_id; break; ! case 'users': $log_type = LOG_USERS; --- 2376,2382 ---- case 'user': $log_type = LOG_USERS; ! $sql_forum = 'AND l.reportee_id = ' . (int) $user_id; break; ! case 'users': $log_type = LOG_USERS; *************** *** 2388,2392 **** $sql_forum = ''; break; ! default: return; --- 2388,2392 ---- $sql_forum = ''; break; ! default: return; *************** *** 2567,2579 **** * Update foes - remove moderators and administrators from foe lists... */ ! function update_foes($group_id = false, $mx_user_id = false) { global $db, $phpbb_auth; // update foes for some user ! if (is_array($mx_user_id) && sizeof($mx_user_id)) { $sql = 'DELETE FROM ' . ZEBRA_TABLE . ' ! WHERE ' . $db->sql_in_set('zebra_id', $mx_user_id) . ' AND foe = 1'; $db->sql_query($sql); --- 2567,2579 ---- * Update foes - remove moderators and administrators from foe lists... */ ! function update_foes($group_id = false, $user_id = false) { global $db, $phpbb_auth; // update foes for some user ! if (is_array($user_id) && sizeof($user_id)) { $sql = 'DELETE FROM ' . ZEBRA_TABLE . ' ! WHERE ' . $db->sql_in_set('zebra_id', $user_id) . ' AND foe = 1'; $db->sql_query($sql); *************** *** 2638,2652 **** $result = $db->sql_query($sql); ! $mx_users = array(); while ($row = $db->sql_fetchrow($result)) { ! $mx_users[] = (int) $row['user_id']; } $db->sql_freeresult($result); ! if (sizeof($mx_users)) ! { $sql = 'DELETE FROM ' . ZEBRA_TABLE . ' ! WHERE ' . $db->sql_in_set('zebra_id', $mx_users) . ' AND foe = 1'; $db->sql_query($sql); --- 2638,2652 ---- $result = $db->sql_query($sql); ! $users = array(); while ($row = $db->sql_fetchrow($result)) { ! $users[] = (int) $row['user_id']; } $db->sql_freeresult($result); ! if (sizeof($users)) ! { $sql = 'DELETE FROM ' . ZEBRA_TABLE . ' ! WHERE ' . $db->sql_in_set('zebra_id', $users) . ' AND foe = 1'; $db->sql_query($sql); *************** *** 2662,2668 **** foreach ($phpbb_auth->acl_get_list(false, array('a_', 'm_'), false) as $forum_id => $forum_ary) { ! foreach ($forum_ary as $phpbb_auth_option => $mx_user_ary) { ! $perms = array_merge($perms, $mx_user_ary); } } --- 2662,2668 ---- foreach ($phpbb_auth->acl_get_list(false, array('a_', 'm_'), false) as $forum_id => $forum_ary) { ! foreach ($forum_ary as $phpbb_auth_option => $user_ary) { ! $perms = array_merge($perms, $user_ary); } } *************** *** 2681,2685 **** * Lists inactive users */ ! function view_inactive_users(&$mx_users, &$mx_user_count, $limit = 0, $offset = 0, $limit_days = 0, $sort_by = 'user_inactive_time DESC') { global $db, $mx_user; --- 2681,2685 ---- * Lists inactive users */ ! function view_inactive_users(&$users, &$user_count, $limit = 0, $offset = 0, $limit_days = 0, $sort_by = 'user_inactive_time DESC') { global $db, $mx_user; *************** *** 2690,2697 **** (($limit_days) ? " AND user_inactive_time >= $limit_days" : ''); $result = $db->sql_query($sql); ! $mx_user_count = (int) $db->sql_fetchfield('user_count'); $db->sql_freeresult($result); ! if ($offset >= $mx_user_count) { $offset = ($offset - $limit < 0) ? 0 : $offset - $limit; --- 2690,2697 ---- (($limit_days) ? " AND user_inactive_time >= $limit_days" : ''); $result = $db->sql_query($sql); ! $user_count = (int) $db->sql_fetchfield('user_count'); $db->sql_freeresult($result); ! if ($offset >= $user_count) { $offset = ($offset - $limit < 0) ? 0 : $offset - $limit; *************** *** 2726,2731 **** break; } ! ! $mx_users[] = $row; } --- 2726,2731 ---- break; } ! ! $users[] = $row; } *************** *** 2736,2740 **** * Lists warned users */ ! function view_warned_users(&$mx_users, &$mx_user_count, $limit = 0, $offset = 0, $limit_days = 0, $sort_by = 'user_warnings DESC') { global $db; --- 2736,2740 ---- * Lists warned users */ ! function view_warned_users(&$users, &$user_count, $limit = 0, $offset = 0, $limit_days = 0, $sort_by = 'user_warnings DESC') { global $db; *************** *** 2746,2750 **** ORDER BY $sort_by"; $result = $db->sql_query_limit($sql, $limit, $offset); ! $mx_users = $db->sql_fetchrowset($result); $db->sql_freeresult($result); --- 2746,2750 ---- ORDER BY $sort_by"; $result = $db->sql_query_limit($sql, $limit, $offset); ! $users = $db->sql_fetchrowset($result); $db->sql_freeresult($result); *************** *** 2754,2758 **** ' . (($limit_days) ? "AND user_last_warning >= $limit_days" : ''); $result = $db->sql_query($sql); ! $mx_user_count = (int) $db->sql_fetchfield('user_count'); $db->sql_freeresult($result); --- 2754,2758 ---- ' . (($limit_days) ? "AND user_last_warning >= $limit_days" : ''); $result = $db->sql_query($sql); ! $user_count = (int) $db->sql_fetchfield('user_count'); $db->sql_freeresult($result); *************** *** 2889,2900 **** } ! if ($database_size !== false) ! { ! $database_size = ($database_size >= 1048576) ? sprintf('%.2f ' . $mx_user->lang['MB'], ($database_size / 1048576)) : (($database_size >= 1024) ? sprintf('%.2f ' . $mx_user->lang['KB'], ($database_size / 1024)) : sprintf('%.2f ' . $mx_user->lang['BYTES'], $database_size)); ! } ! else ! { ! $database_size = $mx_user->lang['NOT_AVAILABLE']; ! } return $database_size; --- 2889,2893 ---- } ! $database_size = ($database_size !== false) ? get_formatted_filesize($database_size) : $mx_user->lang['NOT_AVAILABLE']; return $database_size; *************** *** 2913,2917 **** @fputs($fsock, "HOST: $host\r\n"); @fputs($fsock, "Connection: close\r\n\r\n"); ! $file_info = ''; $get_info = false; --- 2906,2910 ---- @fputs($fsock, "HOST: $host\r\n"); @fputs($fsock, "Connection: close\r\n\r\n"); ! $file_info = ''; $get_info = false; *************** *** 2952,2956 **** } } ! return $file_info; } --- 2945,2949 ---- } } ! return $file_info; } *************** *** 2968,2972 **** $expire_date = time() - ($board_config['warnings_expire_days'] * 86400); ! $warning_list = $mx_user_list = array(); $sql = 'SELECT * FROM ' . WARNINGS_TABLE . " --- 2961,2965 ---- $expire_date = time() - ($board_config['warnings_expire_days'] * 86400); ! $warning_list = $user_list = array(); $sql = 'SELECT * FROM ' . WARNINGS_TABLE . " *************** *** 2977,2981 **** { $warning_list[] = $row['warning_id']; ! $mx_user_list[$row['user_id']] = isset($mx_user_list[$row['user_id']]) ? ++$mx_user_list[$row['user_id']] : 1; } $db->sql_freeresult($result); --- 2970,2974 ---- { $warning_list[] = $row['warning_id']; ! $user_list[$row['user_id']] = isset($user_list[$row['user_id']]) ? ++$user_list[$row['user_id']] : 1; } $db->sql_freeresult($result); *************** *** 2988,2996 **** WHERE ' . $db->sql_in_set('warning_id', $warning_list); $db->sql_query($sql); ! ! foreach ($mx_user_list as $mx_user_id => $value) { $sql = 'UPDATE ' . USERS_TABLE . " SET user_warnings = user_warnings - $value ! WHERE user_id = $mx_user_id"; $db->sql_query($sql); } --- 2981,2989 ---- WHERE ' . $db->sql_in_set('warning_id', $warning_list); $db->sql_query($sql); ! ! foreach ($user_list as $user_id => $value) { $sql = 'UPDATE ' . USERS_TABLE . " SET user_warnings = user_warnings - $value ! WHERE user_id = $user_id"; $db->sql_query($sql); } *************** *** 3009,3012 **** --- 3002,3028 ---- global $db; + // Here we check permission consistency + + // Sometimes, it can happen permission tables having forums listed which do not exist + $sql = 'SELECT forum_id + FROM ' . FORUMS_TABLE; + $result = $db->sql_query($sql); + + $forum_ids = array(0); + while ($row = $db->sql_fetchrow($result)) + { + $forum_ids[] = $row['forum_id']; + } + $db->sql_freeresult($result); + + // Delete those rows from the acl tables not having listed the forums above + $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . ' + WHERE ' . $db->sql_in_set('forum_id', $forum_ids, true); + $db->sql_query($sql); + + $sql = 'DELETE FROM ' . ACL_USERS_TABLE . ' + WHERE ' . $db->sql_in_set('forum_id', $forum_ids, true); + $db->sql_query($sql); + set_config('database_last_gc', time(), true); } Index: functions_posting.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_posting.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functions_posting.php 12 Feb 2008 10:54:05 -0000 1.2 --- functions_posting.php 15 Jun 2008 21:01:42 -0000 1.3 *************** *** 10,14 **** /** ! * @ignore */ if (!defined('IN_PORTAL')) --- 10,14 ---- /** ! * @ignore */ if (!defined('IN_PORTAL')) *************** *** 620,623 **** --- 620,628 ---- if ($config['img_imagick'] && function_exists('passthru')) { + if (substr($config['img_imagick'], -1) !== '/') + { + $config['img_imagick'] .= '/'; + } + @passthru(escapeshellcmd($config['img_imagick']) . 'convert' . ((defined('PHP_OS') && preg_match('#^win#i', PHP_OS)) ? '.exe' : '') . ' -quality 85 -antialias -sample ' . $new_width . 'x' . $new_height . ' "' . str_replace('\\', '/', $source) . '" +profile "*" "' . str_replace('\\', '/', $destination) . '"'); *************** *** 662,665 **** --- 667,676 ---- { $new_image = imagecreate($new_width, $new_height); + + if ($new_image === false) + { + return false; + } + imagecopyresized($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height); } *************** *** 667,670 **** --- 678,687 ---- { $new_image = imagecreatetruecolor($new_width, $new_height); + + if ($new_image === false) + { + return false; + } + imagecopyresampled($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height); } *************** *** 767,774 **** } ! $download_link = append_sid("{$phpbb_root_path}download.$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( 'FILENAME' => basename($attach_row['real_filename']), 'FILE_COMMENT' => $attach_row['attach_comment'], 'ATTACH_ID' => $attach_row['attach_id'], --- 784,792 ---- } ! $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( 'FILENAME' => basename($attach_row['real_filename']), + 'A_FILENAME' => addslashes(basename($attach_row['real_filename'])), 'FILE_COMMENT' => $attach_row['attach_comment'], 'ATTACH_ID' => $attach_row['attach_id'], *************** *** 923,927 **** " . ((!$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 DESC'; $result = $db->sql_query_limit($sql, $config['posts_per_page']); --- 941,946 ---- " . ((!$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 '; ! $sql .= ($mode == 'post_review') ? 'ASC' : 'DESC'; $result = $db->sql_query_limit($sql, $config['posts_per_page']); Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/bbcode.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bbcode.php 12 Feb 2008 10:54:05 -0000 1.2 --- bbcode.php 15 Jun 2008 21:01:41 -0000 1.3 *************** *** 1,14 **** <?php ! /** * * @package phpBB3 * @version $Id$ ! * @copyright (c) 2005 phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ /** ! * @ignore */ if (!defined('IN_PORTAL')) --- 1,14 ---- <?php ! /** * * @package phpBB3 * @version $Id$ ! * @copyright (c) 2005 phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ /** ! * @ignore */ if (!defined('IN_PORTAL')) *************** *** 17,20 **** --- 17,25 ---- } + // + // MODIFICATIONS: + // None + // + /** * BBCode class *************** *** 81,84 **** --- 86,90 ---- $bbcodes_set = $bitfield->get_all_set(); + $undid_bbcode_specialchars = false; foreach ($bbcodes_set as $bbcode_id) { *************** *** 101,104 **** --- 107,118 ---- if (sizeof($preg['search'])) { + // we need to turn the entities back into their original form to allow the + // search patterns to work properly + if (!$undid_bbcode_specialchars) + { + $message = str_replace(array(':', '.'), array(':', '.'), $message); + $undid_bbcode_specialchars = true; + } + $message = preg_replace($preg['search'], $preg['replace'], $message); $preg = array('search' => array(), 'replace' => array()); *************** *** 165,172 **** { // To circumvent replacing newlines with <br /> for the generated html, ! // we just remove newlines here. We do not do this within the admin panel to ! // let the admin lay out his html code nicely ! $row['bbcode_tpl'] = str_replace(array("\n", "\r"), '', $row['bbcode_tpl']); ! $row['second_pass_replace'] = str_replace(array("\n", "\r"), '', $row['second_pass_replace']); $rowset[$row['bbcode_id']] = $row; --- 179,185 ---- { // To circumvent replacing newlines with <br /> for the generated html, ! // we use carriage returns here. They are later changed back to newlines ! $row['bbcode_tpl'] = str_replace("\n", "\r", $row['bbcode_tpl']); ! $row['second_pass_replace'] = str_replace("\n", "\r", $row['second_pass_replace']); $rowset[$row['bbcode_id']] = $row; *************** *** 342,346 **** // to replace all {VARS} to corresponding backreferences // Note that backreferences are numbered from bbcode_match ! if (preg_match_all('/\{(URL|EMAIL|TEXT|COLOR|NUMBER)[0-9]*\}/', $rowset[$bbcode_id]['bbcode_match'], $m)) { foreach ($m[0] as $i => $tok) --- 355,359 ---- // to replace all {VARS} to corresponding backreferences // Note that backreferences are numbered from bbcode_match ! if (preg_match_all('/\{(URL|LOCAL_URL|EMAIL|TEXT|SIMPLETEXT|IDENTIFIER|COLOR|NUMBER)[0-9]*\}/', $rowset[$bbcode_id]['bbcode_match'], $m)) { foreach ($m[0] as $i => $tok) *************** *** 392,396 **** { global $user; ! $bbcode_hardtpl = array( 'b_open' => '<span style="font-weight: bold">', --- 405,409 ---- { global $user; ! $bbcode_hardtpl = array( 'b_open' => '<span style="font-weight: bold">', |
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23138/includes Modified Files: mx_functions_admincp.php mx_functions_bbcode.php mx_functions_core.php mx_functions_style.php mx_functions_tools.php Log Message: 2.9.x -> 3.0.0 b1 updated load_file() method new panel admincp (in development), index_jon.php some code cleanup Many updates for phpbb3 backend. Details are given in our current To-DO discussion Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** mx_functions_core.php 27 Apr 2008 18:42:56 -0000 1.88 --- mx_functions_core.php 15 Jun 2008 21:00:01 -0000 1.89 *************** *** 3516,3519 **** --- 3516,3528 ---- * Load additional functions/classes. * + * The $force_shared parameter will ensure we include the mxp shared version of the file. + * If you need to include a shared version from a different backend, pass this info. + * + * Examples + * + * mx_page::load_file('functions_post'), will include the phpbb version of the file + * mx_page::load_file('functions_post', true), will include the shared phpbb version of the file + * mx_page::load_file('functions_post', 'phpbb2'), will include the shared phpbb2 version of the file, even though we are running in internal/phpbb3 mode + * * @param unknown_type $file * @param unknown_type $backend *************** *** 3526,3530 **** if (PORTAL_BACKEND == 'internal' || $force_shared) { ! switch (PORTAL_BACKEND) { case 'internal': --- 3535,3540 ---- if (PORTAL_BACKEND == 'internal' || $force_shared) { ! $backend = in_array($force_shared, array('internal', 'phpbb2', 'phpbb3')) ? $force_shared : PORTAL_BACKEND; ! switch ($backend) { case 'internal': *************** *** 3544,3548 **** if (file_exists($path . $file.'.'.$phpEx)) { ! include_once($path . $file.'.'.$phpEx); } } --- 3554,3558 ---- if (file_exists($path . $file.'.'.$phpEx)) { ! @include_once($path . $file.'.'.$phpEx); } } Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** mx_functions_style.php 15 Jun 2008 09:15:43 -0000 1.71 --- mx_functions_style.php 15 Jun 2008 21:00:03 -0000 1.72 *************** *** 963,967 **** @include($mx_root_path . $this->current_template_path . '/' . $this->template_name . '.cfg'); ! /* Removed since in 2.9.x+ our default template is no style if ( !$mx_template_config ) { --- 963,967 ---- @include($mx_root_path . $this->current_template_path . '/' . $this->template_name . '.cfg'); ! /* Removed since in 3.0.x+ our default template is no style if ( !$mx_template_config ) { Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** mx_functions_admincp.php 9 Mar 2008 23:38:00 -0000 1.53 --- mx_functions_admincp.php 15 Jun 2008 21:00:00 -0000 1.54 *************** *** 3128,3132 **** global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! include_once($phpbb_root_path . 'includes/functions_search.' . $phpEx); $search_match_table = MX_MATCH_TABLE; --- 3128,3133 ---- global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once($phpbb_root_path . 'includes/functions_search.' . $phpEx); $search_match_table = MX_MATCH_TABLE; Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** mx_functions_tools.php 22 May 2008 21:08:30 -0000 1.28 --- mx_functions_tools.php 15 Jun 2008 21:00:03 -0000 1.29 *************** *** 3153,3157 **** // Includes // ! include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); // --- 3153,3158 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); // Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_functions_bbcode.php 11 Jun 2008 21:41:00 -0000 1.2 --- mx_functions_bbcode.php 15 Jun 2008 21:00:01 -0000 1.3 *************** *** 128,132 **** if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post'); } --- 128,132 ---- if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:00:40
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23138/admin Modified Files: pagestart.php Added Files: index_jon.php Log Message: 2.9.x -> 3.0.0 b1 updated load_file() method new panel admincp (in development), index_jon.php some code cleanup Many updates for phpbb3 backend. Details are given in our current To-DO discussion Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** pagestart.php 15 Jun 2008 11:42:20 -0000 1.35 --- pagestart.php 15 Jun 2008 20:59:59 -0000 1.36 *************** *** 27,36 **** mx_page::load_file('functions_post'); } - mx_page::load_file('functions_admin'); - - if (PORTAL_BACKEND == 'phpbb3') - { - mx_page::load_file('functions_module'); - } // --- 27,30 ---- *************** *** 40,43 **** --- 34,40 ---- $mx_user->init($user_ip, PAGE_INDEX); + // + // Temp fix for loading the olympus stylish adminCP + // if (PORTAL_BACKEND == 'phpbb3') { --- NEW FILE: index_jon.php --- <?php /** * * @package MX-Publisher Core * @version $Id: index_jon.php,v 1.1 2008/06/15 21:00:00 jonohlsson 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 * */ /** * MX-Publisher Notes: * This file is borrowed from phpBB, with some modifications */ // // Security and Page header // define('IN_PORTAL', 1); define('ADMIN_START', true); define('NEED_SID', true); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); $no_page_header = TRUE; require('./pagestart.' . $phpEx); define( 'MAIN_CATEGORY', 'portal' ); define( 'MODULE_CATEGORY', 'modules' ); define( 'PHPBB2X_CATEGORY', 'phpbb2' ); define( 'OLYMPUS_CATEGORY', 'phpbb3' ); // ------------------------------ // DEBUG ONLY ;-) // //error_reporting(E_ALL); // ------------------------------ /** * Enter description here... * * @param unknown_type $needle * @param unknown_type $haystack * @return unknown */ function inarray( $needle, $haystack ) { for( $i = 0; $i < sizeof( $haystack ); $i++ ) { if ( $haystack[$i] == $needle ) { return true; } } return false; } /** * Enter description here... * * @param unknown_type $needle * @param unknown_type $haystack * @return unknown */ function inarray_dec_( $needle, $haystack ) { return inarray( $needle, $haystack ); } /** * Enter description here... * * @param unknown_type $dir_module * @return unknown */ function read_admin( $dir_module ) { global $phpEx, $template, $lang, $board_config, $phpbb_root_path, $mx_user; $module = array(); if ( $dir = @opendir( $dir_module ) ) { $setmodules = 1; while ( $file = @readdir( $dir ) ) { if ( preg_match( "/^admin_.*?\." . $phpEx . "$/", $file ) ) { include( $dir_module . '/' . $file ); } } @closedir( $dir ); unset( $setmodules ); } return $module; } // End functions // ------------- /** * Enter description here... * */ class mx_acp { var $panel_html = ''; var $category = ''; var $panel = ''; var $tabs = array(); var $menu_complete = array(); var $menu_actions = array(); var $menu = array(); var $category_title = ''; var $panel_title = ''; var $action_script = ''; var $phpbb3_hook = null; var $phpbb3_i = null; /** * Constructor * * @access protected */ function mx_acp() { global $template, $db, $lang, $phpEx, $mx_root_path, $phpbb_root_path, $phpbb_auth, $mx_user; $this->_template_set_filenames(); $this->category = MAIN_CATEGORY; $this->category_title = $lang['MX_Portal']; // // Some includes // if ( PORTAL_BACKEND == 'phpbb2' ) { mx_page::load_file( 'functions', true ); mx_page::load_file( 'functions_selects', true ); mx_page::load_file( 'functions_validate', true ); } if ( PORTAL_BACKEND == 'phpbb3' ) { include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); mx_page::load_file( 'functions_admin', 'phpbb3' ); mx_page::load_file( 'acp/auth', 'phpbb3' ); mx_page::load_file( 'auth', 'phpbb3'); mx_page::load_file( 'functions', 'phpbb3' ); mx_page::load_file( 'functions', 'phpbb2' ); mx_page::load_file( 'functions_module', 'phpbb3' ); mx_page::load_file( 'message_parser' , 'phpbb3' ); $phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/'; include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_hook.' . $phpEx ); $this->phpbb3_hook = new mx_phpbb3_admin( $this ); } } /** * Parsing params for display * * @param string $params query string */ function decode_url( $params ) { global $lang, $mx_user ; if ( isset( $params['cat'] ) ) { $this->category = $params['cat']; switch ( $this->category ) { case MAIN_CATEGORY: $this->category_title = $lang['MX_Portal']; break; case MODULE_CATEGORY: $this->category_title = $lang['MX_Modules']; break; case PHPBB2X_CATEGORY: $this->category_title = $lang['Phpbb']; break; case OLYMPUS_CATEGORY: $this->category_title = ''; $this->phpbb3_i = @$params['i']; break; } // switch } if ( isset( $params['panel'] ) ) { $this->panel = $params['panel']; } } /** * get current tabs */ function assign_tabs() { global $lang, $mx_user, $db, $template; // MX PORTAL MAIN CATEGORY $this->tabs = array(); $this->tabs[] = array( // # 'ACTIVE_TAB' => ( $this->category == MAIN_CATEGORY )?'activetab':'', 'CATEGORY' => MAIN_CATEGORY, 'PARAMS' => '', 'L_TAB' => $lang['MX_Portal'], ); // MX PORTAL MODULE CATEGORY $this->tabs[] = array( // # 'ACTIVE_TAB' => ( $this->category == MODULE_CATEGORY )?'activetab':'', 'CATEGORY' => MODULE_CATEGORY, 'PARAMS' => '', 'L_TAB' => $lang['MX_Modules'], ); // PHPBB TABS switch ( PORTAL_BACKEND ) { case 'phpbb2': // phpBB2 Backend TABS $this->tabs[] = array( // # 'ACTIVE_TAB' => ( $this->category == PHPBB2X_CATEGORY )?'activetab':'', 'CATEGORY' => PHPBB2X_CATEGORY, 'PARAMS' => '', 'L_TAB' => $lang['Phpbb'], ); break; case 'phpbb3': // phpBB3 Backend TABS $phpbb3_tabs = $this->phpbb3_hook->get_tabs( $this->phpbb3_i ); if ( $this->category == OLYMPUS_CATEGORY ) { $this->category_title = $lang['Phpbb'] . ' • ' . $phpbb3_tabs['CATEGORY_TITLE']; } $this->tabs = array_merge( $this->tabs, $phpbb3_tabs['TABS'] ); break; } foreach( $this->tabs as $key => $tab ) { $template->assign_block_vars( 'tab', $tab ); } } function _read_menu_actions( $menu_array, $category = MAIN_CATEGORY ) { if ( !is_array( $menu_array ) ) { return; } switch ( $category ) { case MAIN_CATEGORY: case MODULE_CATEGORY: case PHPBB2X_CATEGORY: $cat_keys = array_keys( $menu_array ); for( $i = 0; $i < count( $menu_array ); $i++ ) { while ( list( $menu, $action ) = each( $menu_array[$cat_keys[$i]] ) ) { $this->menu_actions[$action] = 'panel=' . $menu; } } break; case OLYMPUS_CATEGORY: $cat_main = array_keys( $menu_array ); for( $i = 0; $i < count( $menu_array ); $i++ ) { $cat_keys = array_keys( $menu_array[$cat_main[$i]] ); for( $j = 0; $j < count( $menu_array[$cat_main[$i]] ); $j++ ) { while ( list( $menu, $action ) = each( $menu_array[$cat_main[$i]][$cat_keys[$j]] ) ) { $this->menu_actions[$action] = $menu; } } } break; } } function assign_menu() { global $lang, $db, $template, $mx_user, $mx_root_path, $phpbb_root_path, $phpEx; $allow_menu_sort = true; // # // # Load Main Portal Menu // # $this->menu_complete[MAIN_CATEGORY] = read_admin( './' ); $this->_read_menu_actions( $this->menu_complete[MAIN_CATEGORY], MAIN_CATEGORY ); // # // # Load Main Modules Menu // # $sql = "SELECT * FROM " . MODULE_TABLE . " WHERE module_include_admin = 1 ORDER BY module_name"; if ( !( $q_modules = $db->sql_query( $sql ) ) ) { mx_message_die( GENERAL_ERROR, "Could not query modules information", '', __LINE__, __FILE__, $sql ); } if ( $total_modules = $db->sql_numrows( $q_modules ) ) { $module_rows = $db->sql_fetchrowset( $q_modules ); } $db->sql_freeresult( $result ); $menu_array = array(); for( $module_cnt = 0; $module_cnt < $total_modules; $module_cnt++ ) { $module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/"; $module_path_root = $mx_root_path . $module_rows[$module_cnt]['module_path']; // ********************************************************************** // Read language definition // ********************************************************************** $board_langfile = $module_path_root . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx; $main_langfile = $module_path_root . 'language/lang_english/lang_admin.' . $phpEx; if ( file_exists( $board_langfile ) ) { include( $board_langfile ); } else if ( file_exists( $main_langfile ) ) { include( $main_langfile ); } $menu_array = array_merge_recursive( $menu_array, read_admin( $module_path_admin ) ); } $this->menu_complete[MODULE_CATEGORY] = $menu_array; $this->_read_menu_actions( $this->menu_complete[MODULE_CATEGORY], MODULE_CATEGORY ); switch ( PORTAL_BACKEND ) { case 'phpbb2': $mnu_ary = read_admin( $phpbb_root_path . 'admin/' ); $menu_array = array(); foreach( $mnu_ary as $key => $menu ) { $i = 0; foreach( $menu as $menu_id => $action_file ) { $menu_array[$key][$menu_id . '_' . $key] = substr( $phpbb_root_path, strlen( $mx_root_path ) ) . 'admin/' . $action_file; $lang[ $menu_id . '_' . $key ] = $lang[ $menu_id]; $i++; } } $this->menu_complete[PHPBB2X_CATEGORY] = $menu_array; $this->_read_menu_actions( $menu_array, PHPBB2X_CATEGORY ); break; case 'phpbb3': $this->menu_complete[OLYMPUS_CATEGORY] = $this->phpbb3_hook->get_menu_complete(); $this->_read_menu_actions( $this->menu_complete[OLYMPUS_CATEGORY], OLYMPUS_CATEGORY ); break; } $menu_array = $this->menu_complete[$this->category]; switch ( $this->category ) { case MAIN_CATEGORY: case MODULE_CATEGORY: case PHPBB2X_CATEGORY: if ( empty( $this->panel ) ) { $mnu_ary = $menu_array; ksort( $mnu_ary ); $menu_array_keys = array_keys( $mnu_ary ); ksort( $mnu_ary[$menu_array_keys[0]] ); $panel_keys = array_keys( $mnu_ary[$menu_array_keys[0]] ); $this->panel = $panel_keys[0]; } break; case OLYMPUS_CATEGORY: $allow_menu_sort = false; $menu_array = $this->phpbb3_hook->get_menu( $this->phpbb3_i ); if ( empty( $this->panel ) ) { $menu_keys = array_keys( $menu_array ); $p_keys = array_keys( $menu_array[$menu_keys[0]] ); $this->panel = $p_keys[0]; } break; } if ( sizeOf( $menu_array ) == 0 ) { return; } $this->menu = $menu_array; if ( $allow_menu_sort ) { ksort( $menu_array ); } $menu_cat_id = 0; while ( list( $category, $action_array ) = each( $menu_array ) ) { $lang_category = ( !empty( $lang[$category] ) ) ? $lang[$category] : preg_replace( "/_/", " ", $category ); $template->assign_block_vars( 'category', array( // +MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count( $action_array ), // -MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $lang_category ) ); if ( $allow_menu_sort ) { ksort( $action_array ); } $row_count = 0; while ( list( $panel, $file ) = each( $action_array ) ) { $lang_menu = isset( $mx_user->lang[$panel] )?$mx_user->lang[$panel]:( !empty( $lang[$panel] ) ? $lang[$panel] : preg_replace( "/_/", " ", $panel ) ); $file_part = explode( '?', $file ); if ( $this->panel == $panel ) { if ( strpos( $file, 'http://' ) !== false ) { header( 'Location: ' . $file ); } $this->action_script = $file_part[0]; $this->panel_title = $lang_menu; } switch ( $this->category ) { case OLYMPUS_CATEGORY: $menu_link_params = preg_replace( '#panel=[^&]*#', '&cat=' . $this->category . '&panel=' . $panel, $file_part[1] ); break; case PHPBB2X_CATEGORY: case MODULE_CATEGORY: case MAIN_CATEGORY: $menu_link_params = str_replace( '?', '', '&cat=' . $this->category . '&panel=' . $panel . '&' . $file_part[1] ); break; } $menu_link_params = explode( '&', $menu_link_params ); sort( $menu_link_params, SORT_STRING ); reset( $menu_link_params ); $menu_link = basename( __FILE__ ) . '?' . implode( '&', $menu_link_params ); $menu_link = str_replace( '&&', '&', $menu_link ); $menu_link = str_replace( '?&', '?', $menu_link ); if ( strpos( $menu_link, 'sid=' ) === false ) { $menu_link = mx_append_sid( $menu_link ); } $template->assign_block_vars( 'category.panel', array( "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, // +MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, // -MOD: DHTML Menu for ACP "L_PANEL" => $lang_menu, 'U_PANEL' => $menu_link, 'A_PANEL' => $this->panel == $panel?'activemenu':'', ) ); $row_count++; } // +MOD: DHTML Menu for ACP $menu_cat_id++; // -MOD: DHTML Menufor ACP } $this->menu_actions = array_merge( array( $this->action_script => $this->menu_actions[$this->action_script] ), $this->menu_actions ); } function prepare_action_script() { if ( empty( $this->action_script ) ) { mx_message_die( GENERAL_INFO, 'No action script to place in panel' ); } global $mx_root_path, $phpbb_root_path, $phpEx; switch ( $this->category ) { case MAIN_CATEGORY: case MODULE_CATEGORY: case PHPBB2X_CATEGORY: $script = trim( file_get_contents( $mx_root_path . $this->action_script ) ); $folders = explode( '/' , dirname( $this->action_script ) ); $module_root_path = ''; for( $i = 0; $i < sizeOf( $folders ); $i++ ) { if ( $folders[$i] == 'admin' ) { unset( $folders[$i] ); } } $module_root_path = implode( '/', $folders ) . '/'; $preg_array = array( '#^<\?(php)?#' => '', '#\?>$#' => '', "#define\('IN_PORTAL', 1\);#si" => '', '#\$mx_root_path = [^;]*;#si' => '', '#([^_]{1})append_sid#si' => '\1mx_append_sid', '#([^_]{1})mx_message_die#si' => '\1$mx_acp->mx_message_die_acp', '#([^_]{1})message_die#si' => '\1$mx_acp->mx_message_die_acp', '#\$phpEx = [^;]*;#' => '', '#(include|require)(_once)?.*(pagestart|footer|header)(_admin)?[^;]*;#' => '', "#\\\$module_root_path = ['\\\"]([^']*)['\\\"];#" => '$module_root_path = "' . $mx_root_path . $module_root_path . '";', '#.*(\$HTTP_GET_VARS\[\'pane\'\] == \'right\')#si' => 'if ( 1==1', '#\$db->sql_close\(\);#si' => '', '#->assign_vars\([^(]*\(#si' => '\0 ' . "'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,'U_PORTAL_ROOT_PATH' => PORTAL_URL,", '#\$phpbb_root_path =[^;]*;#si' => '// \0 //<= has been allready defined $phpbb_root_path', '#require[^;]*;#si' => '// \0', '#\sexit;#si' => 'return;// exit;', ); $preg_array = array_merge( $preg_array, array( // # "#([\n\t ](@?(include|require)\\(\\\$phpbb_root_path[^;]*;))#si" => '// \2 // <<== PHPBB2 INCLUDE', "#([\n\t ](@?(include|require)[^(lang)]*;))#si" => "\n" . '// \2 //<= has been allready defined INCLUDE', ) ); // PHPBB2 FUNCTIONS REPLACE $functions_ary = array( // # 'get_userdata', 'phpbb_clean_username', phpbb_realpath ); $preg_array = array_merge( $preg_array, array( // # '#(' . implode( '|', $functions_ary ) . ')\(#si' => 'phpBB2::\1(', ) ); // REPLACE FUNCTIONS that ARE ALLREADY DECLARED $func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match ); for( $i = 0; $i < $func_cnt; $i++ ) { if ( function_exists( $func_match[1][$i] ) ) { $preg_array = array_merge( $preg_array, array( // # "#" . $func_match[1][$i] . '([^)]*?\()#si' => "" . $func_match[1][$i] . '_dec_\1', ) ); } } $script = preg_replace( array_keys( $preg_array ), $preg_array, $script ); $script = str_replace( 'phpBB2::phpBB2::', 'PHPBB2::', $script ); break; case OLYMPUS_CATEGORY: $script = $this->phpbb3_hook->prepare_action_script( $this->panel ); break; } // switch return $script; } function display() { global $template; $this->_template_assign_vars(); $template->pparse( 'adm_header' ); $template->pparse( 'adm_body' ); $template->pparse( 'adm_footer' ); } function _template_set_filenames() { global $template; $template->set_filenames( array( 'adm_header' => 'admin/mainpage_header.html', 'adm_body' => 'admin/mainpage_body.html', 'adm_footer' => 'admin/mainpage_footer.html', ) ); } function _convert_links( &$text, $match_links = array() ) { global $phpEx, $mx_root_path; $match_count = count( $match_links['LINK'] ); $values = array_keys( $this->menu_actions ); $values_cnt = count( $values ); $admin_path = substr( str_replace( dirname( realpath( $mx_root_path . 'index.' . $phpEx ) ) , '', dirname( __FILE__ ) ), 1 ) . '/'; switch ( $this->category ) { case MAIN_CATEGORY: case MODULE_CATEGORY: case PHPBB2X_CATEGORY: default: for( $i = 0; $i < $match_count; $i++ ) { if ( eregi( 'javascript:', $match_links['LINK'][$i] ) || empty( $match_links['SCRIPT'][$i] ) || eregi( $mx_root_path . 'index.' . $phpEx, $match_links['LINK'][$i] ) || eregi( $admin_path . 'index.' . $phpEx, $match_links['LINK'][$i] ) ) { continue; } if ( eregi( 'index.' . $phpEx, $match_links['LINK'][$i] ) ) { $text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text ); continue; } // if END for( $j = 0; $j < $values_cnt; $j++ ) { if ( strpos( $values[$j], $match_links['SCRIPT'][$i] ) !== false ) { $text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . 'index.' . $phpEx . '?cat=' . $this->category . '&' . $this->menu_actions[$values[$j]] . '&' . $match_links['PARAMS'][$i], $text ); break; } // if END } // for END } // for END break; case OLYMPUS_CATEGORY: $text = $this->phpbb3_hook->_convert_links( $text ); /*print '<pre>'; print htmlentities( $text); print '<hr/>'; print_r( $match_links); //die( 'here');*/ break; } } function mx_message_die_acp( $error_type, $message, $title = '', $line = '', $file = '', $sql = '' ) { $match_count = preg_match_all( '#(href|action)="(((' . PORTAL_URL . '|' . PHPBB_URL . ')?((' . $mx_root_path . ')?(admin/|adm/)?([^"?]*)?))\??([^"]*?))"#si', $message, $match_links ); $matched_links['LINK'] = $match_links[2]; $matched_links['SCRIPT'] = $match_links[8]; $matched_links['PARAMS'] = $match_links[9]; $this->_convert_links( $message, $matched_links ); if ( $error_type == GENERAL_INFO || $error_type == GENERAL_MESSAGE ) { $this->assign_content_acp( '<div class="successbox">' . $message . '</div>' ); $this->display(); die(); } else { mx_message_die( $error_type, $message, $title, $line, $file, $sql ); } } function assign_content_acp( $acp_html ) { global $mx_root_path, $phpbb_root_path, $phpEx, $template; $preg_pattern = $preg_replace = array(); switch ( $this->category ) { case MAIN_CATEGORY: case MODULE_CATEGORY: case PHPBB2X_CATEGORY: default: $match_count = preg_match_all( '#(href|action)="(((' . PORTAL_URL . '|' . PHPBB_URL . ')?((' . $mx_root_path . ')?(admin/|adm/)?([^"?]*)?))\??([^"]*?))"#si', $acp_html, $match_links ); $menu_actions = $this->menu_actions; $matched_links['LINK'] = $match_links[2]; $matched_links['SCRIPT'] = $match_links[8]; $matched_links['PARAMS'] = $match_links[9]; $this->_convert_links( $acp_html, $matched_links ); break; case OLYMPUS_CATEGORY: $acp_html = $this->phpbb3_hook->assign_content_acp( $acp_html ); // $acp_html = '<h1>' . $this->panel_title . '</h1><p>Panel: ' . $this->panel . '</p>' . $acp_html; break; } // switch $forms_cnt = preg_match_all( "#<form([^>]*)>#si", $acp_html, $forms ); for( $f_i = 0; $f_i < $forms_cnt; $f_i++ ) { $form_cnt = preg_match_all( "#([^=]*)=[\"']([^\"']*)[\"']#si", $forms[1][$f_i], $form ); $form_action = ''; $form_method = ''; for( $i = 0; $i < $form_cnt; $i++ ) { if ( strtolower( trim( $form[1][$i] ) ) == 'method' ) { $form_method = strtoupper( $form[2][$i] ); } else if ( strtolower( trim( $form[1][$i] ) ) == 'action' ) { $form_action = $form[2][$i]; } } $html_add = "\n"; if ( $form_method == 'GET' ) { $action = explode( '?', $form_action ); $params = explode( '&', $action[1] ); for( $i = 0; $i < count( $params ); $i++ ) { $param = explode( '=', $params[$i] ); $html_add .= '<input type="hidden" name="' . $param[0] . '" value="' . $param[1] . '" />' . "\n"; } } $acp_html = str_replace( $forms[1][$f_i] . '>', $forms[1][$f_i] . '>' . $html_add, $acp_html ); } $template->assign_var( 'CONTENT_ACP', $acp_html ); } function _template_assign_vars() { global $board_config, $userdata, $lang, $mx_user, $admincp_nav_icon_url; global $theme, $images, $mx_starttime, $db, $phpEx, $template; $l_timezone = explode( '.', $board_config['board_timezone'] ); $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $board_config['board_timezone'] )] : $lang[number_format( $board_config['board_timezone'] )]; // Generate stats $endtime = explode( ' ', microtime() ); $stime = ( $endtime[1] + $endtime[0] ) - $mx_starttime; $execution_stats = sprintf( $lang['Execution_Stats'], $db->num_queries, round( $stime, 4 ) ); switch ( PORTAL_BACKEND ) { case 'internal': case 'phpbb2': $current_phpbb_version = '2' . $board_config['version']; break; case 'phpbb3': $current_phpbb_version = $board_config['version']; break; } // isset( $mx_user->lang[$action_file_id] )?$mx_user->lang[$action_file_id]:( isset( $lang[$action_file_id] )?$lang[$action_file_id]:str_replace( '_' , ' ', $action_file_id ) ) $global_vars = array( // +MOD: DHTML Menu for ACP 'COOKIE_NAME' => $board_config['cookie_name'], 'COOKIE_PATH' => $board_config['cookie_path'], 'COOKIE_DOMAIN' => $board_config['cookie_domain'], 'COOKIE_SECURE' => $board_config['cookie_secure'], 'IMG_URL_CONTRACT' => $admincp_nav_icon_url . '/contract.gif', 'IMG_URL_EXPAND' => $admincp_nav_icon_url . '/expand.gif', // -MOD: DHTML Menu for ACP 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'T_PHPBB_STYLESHEET' => $theme['head_stylesheet'], 'T_MXBB_STYLESHEET' => $theme['head_stylesheet'], 'T_GECKO_STYLESHEET' => 'gecko.css', 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], 'LOGO' => !empty( $images['mx_logo_acp'] ) ? @$images['mx_logo_acp']: @$images['mx_logo'], "U_PORTAL_INDEX" => mx_append_sid( PORTAL_URL . basename( __FILE__ ) ), "U_FORUM_INDEX" => mx_append_sid( PHPBB_URL . "index.$phpEx" ), "U_PORTAL_ADMIN_INDEX" => mx_append_sid( basename( __FILE__ ) ), "U_ADMIN_INDEX" => mx_append_sid( basename( __FILE__ ) ), 'U_LOGOUT' => mx_append_sid( PORTAL_URL . 'login.' . $phpEx . '?logout=1' ), 'ADMIN_TITLE' => $lang['mxBB_adminCP'], 'USERNAME' => $mx_user->data['username'], 'CATEGORY' => $this->category, 'L_LOGGED_IN_AS' => $lang['Logged_in_as'], "L_PORTAL_INDEX" => $lang['Portal_index'], "L_PREVIEW_PORTAL" => $lang['Preview_portal'], 'L_LOGOUT' => @$lang['Log_out'], "L_FORUM_INDEX" => $lang['Main_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], "L_PREVIEW_FORUM" => $lang['Preview_forum'], 'L_ADMIN_CATEGORY' => $this->category_title, 'L_ADMIN_PART' => $this->panel_title, 'ACTION_SCRIPT' => $this->action_script, 'SITENAME' => $board_config['sitename'], 'L_ADMIN' => $lang['Admin'], 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), 'L_FAQ' => $lang['FAQ'], 'U_INDEX' => mx_append_sid( '../index.' . $phpEx ), 'S_TIMEZONE' => sprintf( $lang['All_times'], $l_timezone ), 'S_LOGIN_ACTION' => mx_append_sid( '../login.' . $phpEx ), 'S_JUMPBOX_ACTION' => mx_append_sid( '../viewforum.' . $phpEx ), 'S_CURRENT_TIME' => ( PORTAL_BACKEND == 'phpbb3' )? sprintf( $lang['Current_time'], phpBB2::create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ): sprintf( $lang['Current_time'], create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ), 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], 'S_CONTENT_ENCODING' => $lang['ENCODING'], 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], 'S_USER_LANG' => $mx_user->lang['default_lang'], 'PHPBB_VERSION' => ( $userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS ) ? $current_phpbb_version : '', 'MX_VERSION' => ( $userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS ) ? PORTAL_VERSION : '', 'TRANSLATION_INFO' => ( isset( $lang['TRANSLATION_INFO'] ) ) ? $lang['TRANSLATION_INFO'] : ( ( isset( $lang['TRANSLATION'] ) ) ? $lang['TRANSLATION'] : '' ), 'POWERED_BY' => $lang['Powered_by'], 'EXECUTION_STATS' => $execution_stats ); $template->assign_vars( $global_vars ); } } $mx_acp = new mx_acp(); $mx_acp->decode_url( $HTTP_GET_VARS ); $mx_acp->assign_tabs(); $mx_acp->assign_menu(); $script = $mx_acp->prepare_action_script(); $i = 1; // VERSION mx v2.8 // $script = str_replace( 'phpBB2::', '', $script); // VERSION mxP v2.9 //$script = str_replace( 'mx_phpBB2::', 'phpBB2::', $script ); switch ( 0 ) { case 0: ob_start(); eval( $script ); $panel_html = ob_get_contents(); ob_end_clean(); break; case 1: $panel_html = preg_replace( array( "#\n#esi", "#\t#si" ), array( "sprintf('%4d', \$i++) . '\n'", ' ' ), str_replace( "\n", "<br/>\n", htmlentities( $script ) ) ); break; case 2: ob_start(); eval( $script ); $panel_html = ob_get_contents(); ob_end_clean(); print_r( $HTTP_POST_VARS ); $panel_html .= preg_replace( array( "#\n#esi", "#\t#si" ), array( "sprintf('%4d', \$i++) . '\n'", ' ' ), str_replace( "\n", "<br/>\n", htmlentities( $script ) ) ); break; case 3: ob_start(); eval( $script ); $panel_html = ob_get_contents(); ob_end_clean(); $panel_html = preg_replace( array( "#\n#esi", "#\t#si" ), array( "sprintf('%4d', \$i++) . '\n'", ' ' ), str_replace( "\n", "<br/>\n", htmlentities( $panel_html ) ) );; break; case 4: eval( $script ); } $mx_acp->assign_content_acp( $panel_html ); $mx_acp->display(); ?> |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:00:25
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23138/install Modified Files: mx_install.php Log Message: 2.9.x -> 3.0.0 b1 updated load_file() method new panel admincp (in development), index_jon.php some code cleanup Many updates for phpbb3 backend. Details are given in our current To-DO discussion Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** mx_install.php 15 Feb 2008 22:10:19 -0000 1.95 --- mx_install.php 15 Jun 2008 21:00:06 -0000 1.96 *************** *** 33,37 **** // $mx_portal_name = 'MX-Publisher Modular System'; ! $mx_portal_version = '2.9.2'; $mx_portal_copy = '<b>MX-Publisher Modular System!</b> <br /><br/> MX-Publisher is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001 (originally named MX-Publisher). <br /><br />Authors: The MX-Publisher Development Team. <br />Please visit <a href="http://www.mx-publisher.com/">www.mx-publisher.com</a> for further information.'; --- 33,37 ---- // $mx_portal_name = 'MX-Publisher Modular System'; ! $mx_portal_version = '3.0.0-b1'; $mx_portal_copy = '<b>MX-Publisher Modular System!</b> <br /><br/> MX-Publisher is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001 (originally named MX-Publisher). <br /><br />Authors: The MX-Publisher Development Team. <br />Please visit <a href="http://www.mx-publisher.com/">www.mx-publisher.com</a> for further information.'; |
|
From: Jon O. <jon...@us...> - 2008-06-15 11:46:56
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30942/phpbb3 Modified Files: session.php Log Message: Fixing the adminCP for phpbb3 backend. Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** session.php 15 Jun 2008 09:15:44 -0000 1.15 --- session.php 15 Jun 2008 11:46:49 -0000 1.16 *************** *** 1918,1922 **** } } - - ?> \ No newline at end of file --- 1918,1920 ---- |
|
From: Jon O. <jon...@us...> - 2008-06-15 11:42:24
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28545 Modified Files: pagestart.php Log Message: Fixing the adminCP for phpbb3 backend. Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** pagestart.php 15 Jun 2008 00:03:28 -0000 1.34 --- pagestart.php 15 Jun 2008 11:42:20 -0000 1.35 *************** *** 70,78 **** $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; ! mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_admin']); } break; case 'phpbb3': ! if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $user->session_id) { $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $_SERVER['REQUEST_URI']); --- 70,78 ---- $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; ! mx_redirect($url); } break; case 'phpbb3': ! if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $mx_user->session_id) { $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $_SERVER['REQUEST_URI']); *************** *** 81,87 **** $url = preg_replace('/sid=([^&]*)(&?)/i', '', $url); $url = preg_replace('/\?$/', '', $url); ! $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $user->session_id; ! mx_redirect("admin/index.$phpEx?sid=" . $user->session_id); } break; --- 81,87 ---- $url = preg_replace('/sid=([^&]*)(&?)/i', '', $url); $url = preg_replace('/\?$/', '', $url); ! $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $mx_user->session_id; ! mx_redirect($url); } break; |
|
From: Jon O. <jon...@us...> - 2008-06-15 09:16:16
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12672 Modified Files: common.php index.php Log Message: No panic, only cosmetics, file headers and newlines etc... ;) Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** common.php 10 Jun 2008 03:35:19 -0000 1.91 --- common.php 15 Jun 2008 09:15:42 -0000 1.92 *************** *** 15,21 **** --- 15,27 ---- } + // + // To be able to include phpBB functions/methods + // define('IN_PHPBB', 1); define('PHPBB_INSTALLED', true); + // + // Reset stats + // $mx_starttime = explode(' ', microtime()); $mx_starttime = $mx_starttime[1] + $mx_starttime[0]; *************** *** 367,370 **** --- 373,379 ---- define('PHPBB_URL', $server_url_phpbb); + // + // In phpBB mode, we rely on native phpBB configs, thus we need to sync mxp and phpbb settings + // mx_page::sync_configs(); Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** index.php 27 Apr 2008 18:44:42 -0000 1.76 --- index.php 15 Jun 2008 09:15:42 -0000 1.77 *************** *** 43,56 **** // - // Handy switch, when recostructing the site. Only admin is able to view pages and browse around normally - // - /* - if( !($mx_user->data['user_level'] == ADMIN && $mx_user->data['session_logged_in']) ) - { - mx_message_die(GENERAL_MESSAGE, 'We are currently upgrading this site with latest MX-Publisher software. Hopefully everything will run smoothly again later tonight (GMT). /Jon', 'Information'); - } - */ - - // // Site under reconstruction // --- 43,46 ---- *************** *** 96,100 **** // ! // Start output of page blocks // ------------------------------------------------------------------------------------------------------------ // --- 86,90 ---- // ! // Start output of page // ------------------------------------------------------------------------------------------------------------ // *************** *** 184,188 **** } - // // View Auth ------------------------------------------------------------------------------- --- 174,177 ---- *************** *** 327,331 **** } - } // for ... subblocks --- 316,319 ---- |
|
From: Jon O. <jon...@us...> - 2008-06-15 09:15:51
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12672/includes/shared/phpbb2/includes Modified Files: functions.php Log Message: No panic, only cosmetics, file headers and newlines etc... ;) Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functions.php 14 Jun 2008 19:17:28 -0000 1.2 --- functions.php 15 Jun 2008 09:15:45 -0000 1.3 *************** *** 187,192 **** if (!is_numeric($user) || $force_str) { ! //$user = self::phpbb_clean_username($user); ! $user = phpBB2::phpbb_clean_username($user); // php4 } else --- 187,192 ---- if (!is_numeric($user) || $force_str) { ! $user = $this->phpbb_clean_username($user); ! //$user = phpBB2::phpbb_clean_username($user); // php4 } else |
|
From: Jon O. <jon...@us...> - 2008-06-15 09:15:51
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12672/includes/sessions/phpbb3 Modified Files: constants.php session.php Log Message: No panic, only cosmetics, file headers and newlines etc... ;) Index: constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/constants.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** constants.php 11 Feb 2008 12:09:00 -0000 1.2 --- constants.php 15 Jun 2008 09:15:44 -0000 1.3 *************** *** 1,21 **** <?php ! /** * ! * @package phpBB3 * @version $Id$ ! * @copyright (c) 2005 phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ - if ( !defined('IN_PORTAL') ) - { - die("Hacking attempt"); - } - /** * Modifications: * define -> @define ! * to supress any notices since in mx_constants.php some are allready @@defined */ --- 1,17 ---- <?php ! /** * ! * @package Style * @version $Id$ ! * @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 * */ /** * Modifications: * define -> @define ! * to supress any notices since in mx_constants.php some are allready @@defined */ *************** *** 164,171 **** @define('FIELD_DATE', 6); - // Additional constants - // Table names @define('ACL_GROUPS_TABLE', $table_prefix . 'acl_groups'); --- 160,165 ---- *************** *** 234,237 **** // Additional tables - ?> \ No newline at end of file --- 228,230 ---- Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** session.php 15 Jun 2008 00:12:21 -0000 1.14 --- session.php 15 Jun 2008 09:15:44 -0000 1.15 *************** *** 2,9 **** /** * ! * @package phpBB3 * @version $Id$ ! * @copyright (c) 2005 phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ --- 2,10 ---- /** * ! * @package Style * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2005 The phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com * */ *************** *** 14,25 **** } ! /****************************************************************** ! * MODIFICATIONS ! * --------------- ! * started : Saturday, November 17, 2007 ! * copyright : © phpBB Group, mxP Development Team ! * email : ory...@rd... ! * ! * MODIFICATIONS: * - replaced $config -> $board_config - by Jon * - replaced $cache = new mx_nothing(); to disable bots() - by Jon --- 15,20 ---- } ! /** ! * Modifications: * - replaced $config -> $board_config - by Jon * - replaced $cache = new mx_nothing(); to disable bots() - by Jon *************** *** 28,47 **** * $auth -> $phpbb_auth - by OryNider * -new globals: $mx_root_path, $mx_cache - by OryNider ! * $this->lang_name was redefined to use in ! * worst case the new $board_config['phpbb_lang'] ! * wich was defined in mx_functions_style.php * before lang name is expanded - by OryNider * $template = new mx_Template(); - by OryNider ! * - before $this->add_lang($lang_set); the phpBB common language is included * if fails with $phpbb_root_path added * - in function set_lang() ! * - if empty $this->lang_path will be redefined ! * from $phpbb_root_path and new $board_config['phpbb_lang'] ! * wich in this case are set as globals - by OryNider * (similar check has been added in the phpBB3 version too) ! * - added function images() to help redefining $images var * and indexes were is needed - by OryNider ! *******************************************************************/ class mx_nothing { --- 23,46 ---- * $auth -> $phpbb_auth - by OryNider * -new globals: $mx_root_path, $mx_cache - by OryNider ! * $this->lang_name was redefined to use in ! * worst case the new $board_config['phpbb_lang'] ! * wich was defined in mx_functions_style.php * before lang name is expanded - by OryNider * $template = new mx_Template(); - by OryNider ! * - before $this->add_lang($lang_set); the phpBB common language is included * if fails with $phpbb_root_path added * - in function set_lang() ! * - if empty $this->lang_path will be redefined ! * from $phpbb_root_path and new $board_config['phpbb_lang'] ! * wich in this case are set as globals - by OryNider * (similar check has been added in the phpBB3 version too) ! * - added function images() to help redefining $images var * and indexes were is needed - by OryNider ! */ + /** + * Disable bots + * + */ class mx_nothing { |
|
From: Jon O. <jon...@us...> - 2008-06-15 09:15:51
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12672/includes/sessions/phpbb2 Modified Files: constants.php session.php Log Message: No panic, only cosmetics, file headers and newlines etc... ;) Index: constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/constants.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** constants.php 11 Feb 2008 12:08:59 -0000 1.2 --- constants.php 15 Jun 2008 09:15:43 -0000 1.3 *************** *** 1,23 **** <?php ! /*************************************************************************** ! * constants.php ! * ------------------- ! * begin : Saturday', Feb 13', 2001 ! * copyright : ('C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * ! * ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License', or ! * ('at your option) any later version. ! * ! ***************************************************************************/ if ( !defined('IN_PHPBB') ) --- 1,12 ---- <?php ! /** ! * ! * @package Style ! * @version $Id$ ! * @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 ! * ! */ if ( !defined('IN_PHPBB') ) *************** *** 29,39 **** * Modifications: * define -> @define ! * to supress any notices since in mx_constants.php some are allready @defined */ // Debug Level //define('DEBUG', 1); // Debugging on ! @define('DEBUG', 1); // Debugging off ! // User Levels <- Do not change the values of USER or ADMIN --- 18,27 ---- * Modifications: * define -> @define ! * to supress any notices since in mx_constants.php some are allready @defined */ // Debug Level //define('DEBUG', 1); // Debugging on ! @define('DEBUG', 0); // Debugging off // User Levels <- Do not change the values of USER or ADMIN *************** *** 45,49 **** @define('MOD', 2); - // User related @define('USER_ACTIVATION_NONE', 0); --- 33,36 ---- *************** *** 56,60 **** @define('USER_AVATAR_GALLERY', 3); - // Group settings @define('GROUP_OPEN', 0); --- 43,46 ---- *************** *** 62,71 **** @define('GROUP_HIDDEN', 2); - // Forum state @define('FORUM_UNLOCKED', 0); @define('FORUM_LOCKED', 1); - // Topic status @define('TOPIC_UNLOCKED', 0); --- 48,55 ---- *************** *** 75,79 **** @define('TOPIC_WATCH_UN_NOTIFIED', 0); - // Topic types @define('POST_NORMAL', 0); --- 59,62 ---- *************** *** 82,91 **** @define('POST_GLOBAL_ANNOUNCE', 3); - // SQL codes @define('BEGIN_TRANSACTION', 1); @define('END_TRANSACTION', 2); - // Error codes @define('GENERAL_MESSAGE', 200); --- 65,72 ---- *************** *** 94,98 **** @define('CRITICAL_ERROR', 204); - // Private messaging @define('PRIVMSGS_READ_MAIL', 0); --- 75,78 ---- *************** *** 103,107 **** @define('PRIVMSGS_UNREAD_MAIL', 5); - // URL PARAMETERS @define('POST_TOPIC_URL', 't'); --- 83,86 ---- *************** *** 116,120 **** @define('SESSION_METHOD_GET', 101); - // Page numbers for session handling @define('PAGE_INDEX', 0); --- 95,98 ---- *************** *** 131,135 **** @define('PAGE_TOPIC_OFFSET', 5000); - // Auth settings @define('AUTH_LIST_ALL', 0); --- 109,112 ---- *************** *** 153,157 **** @define('AUTH_ATTACH', 11); - // Table names @define('CONFIRM_TABLE', $table_prefix.'confirm'); --- 130,133 ---- *************** *** 186,189 **** @define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results'); @define('VOTE_USERS_TABLE', $table_prefix.'vote_voters'); - ?> \ No newline at end of file --- 162,164 ---- Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/session.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** session.php 9 Feb 2008 19:42:38 -0000 1.5 --- session.php 15 Jun 2008 09:15:44 -0000 1.6 *************** *** 1,23 **** <?php ! /*************************************************************************** ! * sessions.php ! * ------------------- ! * begin : Saturday, Feb 13, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * ! * ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ /** --- 1,12 ---- <?php ! /** ! * ! * @package Style ! * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2001 The phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com ! * ! */ /** *************** *** 250,263 **** } ! if ( !$db->sql_query($sql) ) ! { ! $sql2 = 'UPDATE ' . SESSIONS_KEYS_TABLE . " ! SET last_login = $current_time ! WHERE key_id = '" . md5($sessiondata['autologinid']) . "'"; ! if ( !$db->sql_query($sql2) ) ! { ! mx_message_die(CRITICAL_ERROR, 'Error updating session key', '', __LINE__, __FILE__, $sql); ! } ! } $sessiondata['autologinid'] = $auto_login_key; unset($auto_login_key); --- 239,252 ---- } ! if ( !$db->sql_query($sql) ) ! { ! $sql2 = 'UPDATE ' . SESSIONS_KEYS_TABLE . " ! SET last_login = $current_time ! WHERE key_id = '" . md5($sessiondata['autologinid']) . "'"; ! if ( !$db->sql_query($sql2) ) ! { ! mx_message_die(CRITICAL_ERROR, 'Error updating session key', '', __LINE__, __FILE__, $sql); ! } ! } $sessiondata['autologinid'] = $auto_login_key; unset($auto_login_key); |
|
From: Jon O. <jon...@us...> - 2008-06-15 09:15:49
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12672/includes/sessions/internal Modified Files: constants.php session.php Log Message: No panic, only cosmetics, file headers and newlines etc... ;) Index: constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/constants.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** constants.php 13 Sep 2007 09:12:49 -0000 1.2 --- constants.php 15 Jun 2008 09:15:43 -0000 1.3 *************** *** 1,23 **** <?php ! /*************************************************************************** ! * constants.php ! * ------------------- ! * begin : Saturday', Feb 13', 2001 ! * copyright : ('C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * ! * ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License', or ! * ('at your option) any later version. ! * ! ***************************************************************************/ if ( !defined('IN_PHPBB') ) --- 1,12 ---- <?php ! /** ! * ! * @package Style ! * @version $Id$ ! * @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 ! * ! */ if ( !defined('IN_PHPBB') ) *************** *** 28,33 **** // Debug Level //define('DEBUG', 1); // Debugging on ! define('DEBUG', 1); // Debugging off ! // User Levels <- Do not change the values of USER or ADMIN --- 17,21 ---- // Debug Level //define('DEBUG', 1); // Debugging on ! define('DEBUG', 0); // Debugging off // User Levels <- Do not change the values of USER or ADMIN *************** *** 39,43 **** define('MOD', 2); - // User related define('USER_ACTIVATION_NONE', 0); --- 27,30 ---- *************** *** 50,54 **** define('USER_AVATAR_GALLERY', 3); - // Group settings define('GROUP_OPEN', 0); --- 37,40 ---- *************** *** 56,65 **** define('GROUP_HIDDEN', 2); - // Forum state define('FORUM_UNLOCKED', 0); define('FORUM_LOCKED', 1); - // Topic status define('TOPIC_UNLOCKED', 0); --- 42,49 ---- *************** *** 69,73 **** define('TOPIC_WATCH_UN_NOTIFIED', 0); - // Topic types define('POST_NORMAL', 0); --- 53,56 ---- *************** *** 76,85 **** define('POST_GLOBAL_ANNOUNCE', 3); - // SQL codes define('BEGIN_TRANSACTION', 1); define('END_TRANSACTION', 2); - // Error codes define('GENERAL_MESSAGE', 200); --- 59,66 ---- *************** *** 88,92 **** define('CRITICAL_ERROR', 204); - // Private messaging define('PRIVMSGS_READ_MAIL', 0); --- 69,72 ---- *************** *** 97,101 **** define('PRIVMSGS_UNREAD_MAIL', 5); - // URL PARAMETERS define('POST_TOPIC_URL', 't'); --- 77,80 ---- *************** *** 110,114 **** define('SESSION_METHOD_GET', 101); - // Page numbers for session handling define('PAGE_INDEX', 0); --- 89,92 ---- *************** *** 125,129 **** define('PAGE_TOPIC_OFFSET', 5000); - // Auth settings define('AUTH_LIST_ALL', 0); --- 103,106 ---- *************** *** 147,151 **** define('AUTH_ATTACH', 11); - // Table names //define('CONFIRM_TABLE', $table_prefix.'confirm'); --- 124,127 ---- *************** *** 180,183 **** //define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results'); //define('VOTE_USERS_TABLE', $table_prefix.'vote_voters'); - ?> \ No newline at end of file --- 156,158 ---- Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** session.php 9 Feb 2008 19:42:38 -0000 1.6 --- session.php 15 Jun 2008 09:15:43 -0000 1.7 *************** *** 1,23 **** <?php ! /*************************************************************************** ! * sessions.php ! * ------------------- ! * begin : Saturday, Feb 13, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * ! * ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ /** --- 1,12 ---- <?php ! /** ! * ! * @package Style ! * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2001 The phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com ! * ! */ /** |
|
From: Jon O. <jon...@us...> - 2008-06-15 09:15:47
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12672/includes Modified Files: mx_functions_style.php Log Message: No panic, only cosmetics, file headers and newlines etc... ;) Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** mx_functions_style.php 14 Jun 2008 22:49:25 -0000 1.70 --- mx_functions_style.php 15 Jun 2008 09:15:43 -0000 1.71 *************** *** 16,20 **** // ! // Load sessions class // include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/session.' . $phpEx); --- 16,20 ---- // ! // Load session class, based on mxp backend // include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/session.' . $phpEx); *************** *** 79,83 **** $this->data['user_level'] = 0; } ! $this->data['session_id'] = $this->session_id; --- 79,83 ---- $this->data['user_level'] = 0; } ! $this->data['session_id'] = $this->session_id; |
|
From: FlorinCB <ory...@us...> - 2008-06-15 00:12:24
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6719 Modified Files: session.php Log Message: $SID = (defined('NEED_SID')) ? 'sid=' . $this->session_id : 'sid='; -> $SID = (defined('NEED_SID')) ? 'sid=' . $this->session_id : ''; couse all url's have a "&sid= " if this is not fixed... Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** session.php 14 Feb 2008 02:34:24 -0000 1.13 --- session.php 15 Jun 2008 00:12:21 -0000 1.14 *************** *** 234,238 **** $this->session_id = phpBB3::request_var($board_config['cookie_name'] . '_sid', '', false, true); ! $SID = (defined('NEED_SID')) ? 'sid=' . $this->session_id : 'sid='; $_SID = (defined('NEED_SID')) ? $this->session_id : ''; --- 234,239 ---- $this->session_id = phpBB3::request_var($board_config['cookie_name'] . '_sid', '', false, true); ! // original code: $SID = (defined('NEED_SID')) ? 'sid=' . $this->session_id : 'sid='; ! $SID = (defined('NEED_SID')) ? 'sid=' . $this->session_id : ''; $_SID = (defined('NEED_SID')) ? $this->session_id : ''; |
|
From: FlorinCB <ory...@us...> - 2008-06-15 00:03:34
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31840 Modified Files: pagestart.php Log Message: temporary fix Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** pagestart.php 14 Jun 2008 21:50:18 -0000 1.33 --- pagestart.php 15 Jun 2008 00:03:28 -0000 1.34 *************** *** 56,69 **** } ! if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $userdata['session_id'] ) { ! $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $_SERVER['REQUEST_URI']); ! $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])), '', $url); ! $url = str_replace('//', '/', $url); ! $url = preg_replace('/sid=([^&]*)(&?)/i', '', $url); ! $url = preg_replace('/\?$/', '', $url); ! $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; ! mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_id']); } --- 56,89 ---- } ! //Do we realy need this? ! switch (PORTAL_BACKEND) { ! case 'internal': ! case 'phpbb2': ! if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $userdata['session_id']) ! { ! $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $_SERVER['REQUEST_URI']); ! $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])), '', $url); ! $url = str_replace('//', '/', $url); ! $url = preg_replace('/sid=([^&]*)(&?)/i', '', $url); ! $url = preg_replace('/\?$/', '', $url); ! $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; ! mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_admin']); ! } ! break; ! case 'phpbb3': ! if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $user->session_id) ! { ! $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $_SERVER['REQUEST_URI']); ! $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])), '', $url); ! $url = str_replace('//', '/', $url); ! $url = preg_replace('/sid=([^&]*)(&?)/i', '', $url); ! $url = preg_replace('/\?$/', '', $url); ! $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $user->session_id; ! ! mx_redirect("admin/index.$phpEx?sid=" . $user->session_id); ! } ! break; } |
|
From: FlorinCB <ory...@us...> - 2008-06-14 22:49:33
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv709 Modified Files: mx_functions_style.php Log Message: populated string Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** mx_functions_style.php 27 Apr 2008 18:42:57 -0000 1.69 --- mx_functions_style.php 14 Jun 2008 22:49:25 -0000 1.70 *************** *** 79,82 **** --- 79,84 ---- $this->data['user_level'] = 0; } + + $this->data['session_id'] = $this->session_id; break; |
|
From: Jon O. <jon...@us...> - 2008-06-14 21:50:24
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8505 Modified Files: pagestart.php Log Message: security Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** pagestart.php 22 Feb 2008 23:02:49 -0000 1.32 --- pagestart.php 14 Jun 2008 21:50:18 -0000 1.33 *************** *** 65,69 **** $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; ! //mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_id']); } --- 65,69 ---- $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; ! mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_id']); } |
|
From: Jon O. <jon...@us...> - 2008-06-14 20:41:47
|
Update of /cvsroot/mxbb/core/modules/mx_users/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9963 Modified Files: user_edit_body.tpl Log Message: mx_users, now handles admin users. Index: user_edit_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/templates/_core/admin/user_edit_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** user_edit_body.tpl 15 Sep 2007 20:32:22 -0000 1.1 --- user_edit_body.tpl 14 Jun 2008 20:41:44 -0000 1.2 *************** *** 245,248 **** --- 245,256 ---- <span class="gen">{L_NO}</span></td> </tr> + <tr> + <td class="row1"><span class="gen">{L_USER_ADMIN}</span></td> + <td class="row2"> + <input type="radio" name="user_admin" value="1" {USER_ADMIN_YES} /> + <span class="gen">{L_YES}</span> + <input type="radio" name="user_admin" value="0" {USER_ADMIN_NO} /> + <span class="gen">{L_NO}</span></td> + </tr> <!-- <tr> |
2 messages has been excluded from this view by a project administrator.
