Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: FlorinCB <ory...@us...> - 2008-08-23 15:48:22
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26350 Modified Files: mx_functions_bbcode.php Log Message: fix Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mx_functions_bbcode.php 15 Jul 2008 22:02:45 -0000 1.12 --- mx_functions_bbcode.php 23 Aug 2008 15:48:13 -0000 1.13 *************** *** 270,274 **** --- 270,287 ---- } // bbencode_second_pass() + + /** + * This is used to change a [*] tag into a [*:$uid] tag as part + * of the first-pass bbencoding of [list] tags. It fits the + * standard required in order to be passed as a variable + * function into bbencode_first_pass_pda(). + */ + function replace_listitems($text, $uid) + { + $text = str_replace("[*]", "[*:$uid]", $text); + return $text; + } + function make_bbcode_uid() { *************** *** 528,532 **** if ($use_function_pointer) { ! $between_tags = $func($between_tags, $uid); } --- 541,545 ---- if ($use_function_pointer) { ! $between_tags = $this->$func($between_tags, $uid); } |
|
From: FlorinCB <ory...@us...> - 2008-08-19 14:35:35
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9135/includes Modified Files: mx_functions.php mx_functions_admincp.php Log Message: ready :) Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** mx_functions_admincp.php 20 Jul 2008 04:23:56 -0000 1.58 --- mx_functions_admincp.php 19 Aug 2008 14:34:58 -0000 1.59 *************** *** 304,313 **** SELECT " . $next_id . ", parameter_id, parameter_default FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id; ! if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, "Couldn't insert parameter information", "", __LINE__, __FILE__, $sql); } ! // // Update cache --- 304,330 ---- SELECT " . $next_id . ", parameter_id, parameter_default FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id; ! if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, "Couldn't insert parameter information", "", __LINE__, __FILE__, $sql); } ! /* ! $sql = "SELECT " . $next_id . ", parameter_id, parameter_default ! FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't insert row in blocks table", "", __LINE__, __FILE__, $sql); ! } ! $row = $db->sql_fetchrow($result); ! ! $sql = array( ! 'block_id' => (int) $row['block_id'], ! 'parameter_id' => (int) $row['parameter_id'], ! 'parameter_value' => $row['parameter_value'], ! ); ! ! $result = $db->sql_query("INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . $db->sql_build_array('INSERT', $sql)); ! */ ! // // Update cache *************** *** 2216,2226 **** if( $count == 0 ) ! { $sql_add = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "( block_id, parameter_id, parameter_value ) SELECT " . $block_id . ", " . $sys_param_rows[$p]['parameter_id'] . ", parameter_default FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id . " AND parameter_id = " . $sys_param_rows[$p]['parameter_id']; ! ! $result_add = $db->sql_query($sql_add); ! $output_message .= '<br /> + (' . $sys_param_rows[$p]['parameter_name'] . ', ' . $sys_param_rows[$p]['parameter_id'] . ', ' . $block_id . '),'; $output_message .= !$result_add ? '<br /><b><font color=#0000ff>[db...error]</font></b> line: ' . __LINE__ . ' , ' . $sql_add . '<br />' : ''; --- 2233,2259 ---- if( $count == 0 ) ! { $sql_add = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "( block_id, parameter_id, parameter_value ) SELECT " . $block_id . ", " . $sys_param_rows[$p]['parameter_id'] . ", parameter_default FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id . " AND parameter_id = " . $sys_param_rows[$p]['parameter_id']; ! /* ! $sql = "SELECT " . $block_id . ", " . $sys_param_rows[$p]['parameter_id'] . ", parameter_default ! FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id . " AND parameter_id = " . $sys_param_rows[$p]['parameter_id']; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't insert row in blocks table", "", __LINE__, __FILE__, $sql); ! } ! while($row = $db->sql_fetchrow($result)) ! { ! $sql_array = array( ! 'block_id' => (int) $block_id, ! 'parameter_id' => (int) $sys_param_rows[$p]['parameter_id'], ! 'parameter_value' => $row['parameter_value'], ! ); ! } ! $sql_add = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . $db->sql_build_array('INSERT', $sql_array); ! */ ! $result_add = $db->sql_query($sql_add); ! $output_message .= '<br /> + (' . $sys_param_rows[$p]['parameter_name'] . ', ' . $sys_param_rows[$p]['parameter_id'] . ', ' . $block_id . '),'; $output_message .= !$result_add ? '<br /><b><font color=#0000ff>[db...error]</font></b> line: ' . __LINE__ . ' , ' . $sql_add . '<br />' : ''; |
|
From: FlorinCB <ory...@us...> - 2008-08-19 14:35:35
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9135/install Modified Files: mx_install.php Log Message: ready :) Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** mx_install.php 19 Aug 2008 12:26:03 -0000 1.100 --- mx_install.php 19 Aug 2008 14:35:00 -0000 1.101 *************** *** 40,44 **** // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '3.0.1'); define('INSTALLER_NAME', 'MX-Publisher-IWizard'); --- 40,44 ---- // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '3.0.2'); define('INSTALLER_NAME', 'MX-Publisher-IWizard'); *************** *** 858,862 **** $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('6', '36', '', NULL, '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('6', '13', '0', NULL, '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '17', '5', NULL, '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '18', 'TRUE', NULL, '0')"; --- 858,862 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('6', '36', '', NULL, '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('6', '13', '0', NULL, '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '17', '5', NULL, '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '18', 'TRUE', NULL, '0')"; *************** *** 866,873 **** $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '22', 'TRUE', NULL, '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '37', '', NULL, '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '38', 'FALSE', NULL, '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '39', 'FALSE', NULL, '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '40', 'TRUE', NULL, '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '95', '5', NULL, '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '1', '3', '', '0')"; --- 866,874 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '22', 'TRUE', NULL, '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '37', '', NULL, '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '38', 'TRUE', NULL, '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '39', 'TRUE', NULL, '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '40', 'TRUE', NULL, '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '95', '5', NULL, '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '1', '3', '', '0')"; *************** *** 886,890 **** $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('7', 'Left', '40', NULL, '200', '4')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('4', 'Main', '50', NULL, '100%', '2')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('3', 'Left', '40', NULL, '200', '2')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "function VALUES('8', '30', 'phpBB Index', 'phpBB Index Block', 'mx_forum.php', '')"; --- 887,901 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('7', 'Left', '40', NULL, '200', '4')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('4', 'Main', '50', NULL, '100%', '2')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('3', 'Left', '40', NULL, '200', '2')"; ! ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column_block VALUES('4', '19', '20')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column_block VALUES('8', '19', '20')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column_block VALUES('4', '24', '10')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column_block VALUES('3', '16', '20')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column_block VALUES('8', '26', '10')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column_block VALUES('7', '8', '10')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column_block VALUES('5', '7', '20')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column_block VALUES('3', '13', '30')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "column_block VALUES('3', '8', '10')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "function VALUES('8', '30', 'phpBB Index', 'phpBB Index Block', 'mx_forum.php', '')"; *************** *** 896,899 **** --- 907,938 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "page VALUES('2', 'Forum', 'This is the phpBB Forum startpage', '0', '', '20', 'icon_forum.gif', '', '', '', '', '1', '0', '0', '0', '-1', '-1', '', '', '', '0', 'a:1:{i:0;s:0:\"\";}', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "page VALUES('4', 'Sitestats', 'Sitestats page', '0', '', '40', 'icon_stats.gif', '', '', '', '', '1', '0', '0', '0', '-1', '-1', '', '', '', '0', 'a:1:{i:0;s:0:\"\";}', '-1')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('1', '2', 'announce_nbr_display', 'Number', '1', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('2', '2', 'announce_nbr_days', 'Number', '14', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('3', '2', 'announce_display', 'Boolean', 'TRUE', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('4', '2', 'announce_display_sticky', 'Boolean', 'TRUE', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('5', '2', 'announce_display_normal', 'Boolean', 'FALSE', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('7', '2', 'announce_img', 'Text', 'thumb_globe.gif', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('8', '2', 'announce_img_sticky', 'Text', 'thumb_globe.gif', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('9', '2', 'announce_img_normal', 'Text', 'thumb_globe.gif', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('6', '2', 'announce_display_global', 'Boolean', 'TRUE', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('10', '2', 'announce_img_global', 'Text', 'thumb_globe.gif', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('11', '2', 'announce_forum', 'Function', '', 'get_list_multiple(\"{parameter_id}[]\", FORUMS_TABLE, \'forum_id\', \'forum_name\', \"{parameter_value}\", TRUE)', '0', '0')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('13', '14', 'Poll_Display', 'Function', '0', 'poll_select( {parameter_value}, \"{parameter_id}\" )', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('36', '14', 'poll_forum', 'Function', '', 'get_list_multiple(\"{parameter_id}[]\", FORUMS_TABLE, \'forum_id\', \'forum_name\', \"{parameter_value}\", TRUE)', '0', '0')"; + + + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('17', '31', 'Last_Msg_Number_Title', 'Number', '15', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('18', '31', 'Last_Msg_Display_Date', 'Boolean', 'TRUE', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('19', '31', 'Last_Msg_Title_Length', 'Number', '33', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('20', '31', 'Last_Msg_Target', 'Values', '_blank', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('21', '31', 'Last_Msg_Align', 'Values', 'left', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('22', '31', 'Last_Msg_Display_Forum', 'Boolean', 'TRUE', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('37', '31', 'Last_Msg_forum', 'Function', '', 'get_list_multiple(\"{parameter_id}[]\", FORUMS_TABLE, \'forum_id\', \'forum_name\', \"{parameter_value}\", TRUE)', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('38', '31', 'Last_Msg_Display_Last_Author', 'Boolean', 'TRUE', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('39', '31', 'Last_Msg_Display_Author', 'Boolean', 'TRUE', '', '0', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "parameter VALUES('40', '31', 'Last_Msg_Display_Icon_View', 'Boolean', 'TRUE', '', '0', '0')"; + } *************** *** 903,907 **** case 'phpbb2': ! $sql[] = "INSERT INTO " . $mx_table_prefix . "module VALUES('30', 'phpBB2 Blocks', 'modules/mx_phpbb2blocks/', 'MXP Portal phpBB2 blocks', '', 'MX-Publisher Core Module', 'Original MXP <i>phpBB2 Blocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\"> The MXP Development Team</a>')"; $message .= mx_install_cmd_sql($sql) . '<br />'; --- 942,946 ---- case 'phpbb2': ! $sql[] = "INSERT INTO " . $mx_table_prefix . "module VALUES('30', 'phpBB2 Blocks', 'modules/mx_phpbb2blocks/', 'MXP Portal phpBB2 blocks', '', 'MX-Publisher Core Module', 'Original MXP <i>phpBB2 Blocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\"> The MXP Development Team</a>')"; $message .= mx_install_cmd_sql($sql) . '<br />'; *************** *** 909,913 **** case 'phpbb3': ! $sql[] = "INSERT INTO " . $mx_table_prefix . "module VALUES('30', 'phpBB3 Blocks', 'modules/mx_phpbb3blocks/', 'MXP Portal phpBB3 blocks', '', 'MX-Publisher Core Module', 'Original MXP <i>phpBB3 Blocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">OryNider & Culpit</a>')"; $message .= mx_install_cmd_sql($sql) . '<br />'; --- 948,952 ---- case 'phpbb3': ! $sql[] = "INSERT INTO " . $mx_table_prefix . "module VALUES('30', 'phpBB3 Blocks', 'modules/mx_phpbb3blocks/', 'MXP Portal phpBB3 blocks', '', 'MX-Publisher Core Module', 'Original MXP <i>phpBB3 Blocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">OryNider & Culpit</a>')"; $message .= mx_install_cmd_sql($sql) . '<br />'; |
|
From: FlorinCB <ory...@us...> - 2008-08-19 14:35:34
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9135/install/includes Modified Files: functions_install.php Log Message: ready :) |
|
From: FlorinCB <ory...@us...> - 2008-08-19 14:35:09
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9135/install/schemas Modified Files: mysql_41_schema_install.sql Log Message: ready :) Index: mysql_41_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_41_schema_install.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mysql_41_schema_install.sql 19 Aug 2008 02:46:24 -0000 1.4 --- mysql_41_schema_install.sql 19 Aug 2008 14:35:02 -0000 1.5 *************** *** 63,68 **** `block_id` smallint(5) unsigned NOT NULL default '0', `parameter_id` smallint(5) unsigned NOT NULL default '0', ! `parameter_value` text NOT NULL, ! `parameter_opt` text NOT NULL, `sub_id` int(255) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`,`parameter_id`,`sub_id`) --- 63,68 ---- `block_id` smallint(5) unsigned NOT NULL default '0', `parameter_id` smallint(5) unsigned NOT NULL default '0', ! `parameter_value` text, ! `parameter_opt` text, `sub_id` int(255) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`,`parameter_id`,`sub_id`) *************** *** 758,760 **** replacement char(100) NOT NULL, PRIMARY KEY (word_id) ! ) CHARACTER SET `utf8` COLLATE `utf8_bin`; \ No newline at end of file --- 758,760 ---- replacement char(100) NOT NULL, PRIMARY KEY (word_id) ! ) CHARACTER SET `utf8` COLLATE `utf8_bin`; |
|
From: FlorinCB <ory...@us...> - 2008-08-19 12:26:09
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11864 Modified Files: mx_install.php Log Message: not finished yet :P Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** mx_install.php 19 Aug 2008 02:46:24 -0000 1.99 --- mx_install.php 19 Aug 2008 12:26:03 -0000 1.100 *************** *** 581,584 **** --- 581,586 ---- } + @define('PORTAL_BACKEND', $portal_backend); + if ($mx_request_vars->is_post('phpbb')) { *************** *** 742,746 **** if( count($schemas) > 0 ) { ! $install_title = ( $install_mode == 'install' ? $lang['Portal_intalling'] : $lang['Portal_upgrading'] ); $install_title = sprintf($install_title, $mx_portal_version); --- 744,748 ---- if( count($schemas) > 0 ) { ! $install_title = ($install_mode == 'install' ? $lang['Portal_intalling'] : $lang['Portal_upgrading']); $install_title = sprintf($install_title, $mx_portal_version); *************** *** 801,805 **** $process_msgs[] = $install_title . '...<br />'; exec_post_process($install_mode, $upgrade_mode); ! // // Update cache? Only if we really processed one or more schemas. --- 803,807 ---- $process_msgs[] = $install_title . '...<br />'; exec_post_process($install_mode, $upgrade_mode); ! // // Update cache? Only if we really processed one or more schemas. *************** *** 838,841 **** --- 840,919 ---- $message .= '<hr />'; $message .= '<p><b>' . ( $install_mode == 'install' ? $lang['Portal_intalled'] : $lang['Portal_upgraded'] ) . '</b></p>'; + + if ($install_mode == 'install') + { + $message .= '<hr />'; + + //Creating the forum page + if(PORTAL_BACKEND !== 'internal') + { + $sql = array(); + + $sql[] = "INSERT INTO " . $mx_table_prefix . "block VALUES('6', 'Poll', 'This is a Demo Block', '14', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841942', '2')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block VALUES('16', 'Last Message Post', 'This is a Demo Block', '31', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125842159', '2')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block VALUES('18', 'Announcements', 'This is a Demo Block', '2', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125868467', '2')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block VALUES('24', 'Forum', 'This is a Demo Block', '8', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841817', '2')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block VALUES('26', 'Statistics', 'This is a Demo Block', '41', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125842177', '2')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('6', '36', '', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('6', '13', '0', NULL, '0')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '17', '5', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '18', 'TRUE', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '19', '30', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '20', '_self', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '21', 'left', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '22', 'TRUE', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '37', '', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '38', 'FALSE', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '39', 'FALSE', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '40', 'TRUE', NULL, '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('16', '95', '5', NULL, '0')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '1', '3', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '2', '10', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '3', 'TRUE', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '4', 'TRUE', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '5', 'FALSE', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '7', 'thumb_news.gif', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '8', 'thumb_globe.gif', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '9', 'thumb_globe.gif', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '6', 'TRUE', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '10', 'thumb_globe.gif', '', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "block_system_parameter VALUES('18', '11', '', '', '0')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('8', 'Main', '50', NULL, '100%', '4')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('7', 'Left', '40', NULL, '200', '4')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('4', 'Main', '50', NULL, '100%', '2')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "column VALUES('3', 'Left', '40', NULL, '200', '2')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "function VALUES('8', '30', 'phpBB Index', 'phpBB Index Block', 'mx_forum.php', '')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "function VALUES('14', '30', 'MXP Polls', 'MXP Polls', 'mx_poll.php', '')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "function VALUES('2', '30', 'phpBB Announcements', 'phpBB Announcements Block', 'mx_announce.php', '')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "function VALUES('31', '30', 'Last Posts', 'phpBB Last Posts Function', 'mx_last_msg.php', '')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "function VALUES('41', '30', 'Statistics', 'Site Statistics Function', 'mx_statistics.php', '')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "page VALUES('2', 'Forum', 'This is the phpBB Forum startpage', '0', '', '20', 'icon_forum.gif', '', '', '', '', '1', '0', '0', '0', '-1', '-1', '', '', '', '0', 'a:1:{i:0;s:0:\"\";}', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "page VALUES('4', 'Sitestats', 'Sitestats page', '0', '', '40', 'icon_stats.gif', '', '', '', '', '1', '0', '0', '0', '-1', '-1', '', '', '', '0', 'a:1:{i:0;s:0:\"\";}', '-1')"; + } + + switch (PORTAL_BACKEND) + { + case 'internal': + + case 'phpbb2': + + $sql[] = "INSERT INTO " . $mx_table_prefix . "module VALUES('30', 'phpBB2 Blocks', 'modules/mx_phpbb2blocks/', 'MXP Portal phpBB2 blocks', '', 'MX-Publisher Core Module', 'Original MXP <i>phpBB2 Blocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\"> The MXP Development Team</a>')"; + $message .= mx_install_cmd_sql($sql) . '<br />'; + break; + + case 'phpbb3': + + $sql[] = "INSERT INTO " . $mx_table_prefix . "module VALUES('30', 'phpBB3 Blocks', 'modules/mx_phpbb3blocks/', 'MXP Portal phpBB3 blocks', '', 'MX-Publisher Core Module', 'Original MXP <i>phpBB3 Blocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">OryNider & Culpit</a>')"; + $message .= mx_install_cmd_sql($sql) . '<br />'; + break; + } + } + for( $i=0; $i < count($lang['Portal_install_done']); $i++ ) { |
|
From: FlorinCB <ory...@us...> - 2008-08-19 12:26:09
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11864/includes Modified Files: functions_install.php Log Message: not finished yet :P Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** functions_install.php 19 Aug 2008 02:46:23 -0000 1.11 --- functions_install.php 19 Aug 2008 12:26:00 -0000 1.12 *************** *** 1245,1248 **** --- 1245,1283 ---- } + /** + * Generate Output + * + * @access public + * @param unknown_type $sql + * @param unknown_type $main_install + * @return unknown + */ + function mx_install_cmd_sql( $sql = '', $main_install = false ) + { + global $table_prefix, $mx_table_prefix, $db; + + $inst_error = false; + $n = 0; + $message = "<b>" . "list_of_queries" . "</b><br /><br />"; + + while ( $sql[$n] ) + { + if ( !$result = $db->sql_query( $sql[$n] ) ) + { + $message .= '<b><font color=#FF0000>[' . "already_added" . ']</font></b> line: ' . ( $n + 1 ) . ' , ' . $sql[$n] . '<br />'; + $inst_error = true; + } + else + { + $message .= '<b><font color=#0000fF>[' . 'added_upgraded' . ']</font></b> line: ' . ( $n + 1 ) . ' , ' . $sql[$n] . '<br />'; + } + $n++; + } + $message .= '<br /> ' . 'upgrading'; + + return $message; + } + + /* * *************** *** 1328,1332 **** parse_cmd_sql($sql); } ! } } else --- 1363,1367 ---- parse_cmd_sql($sql); } ! } } else |
|
From: FlorinCB <ory...@us...> - 2008-08-19 02:46:58
|
Update of /cvsroot/mxbb/core/install/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9848/install/language/lang_romanian Modified Files: lang_admin.php Log Message: some bugs fixed and mysql_41 schema upgraded Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/install/language/lang_romanian/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 16 Jun 2008 14:39:55 -0000 1.1 --- lang_admin.php 19 Aug 2008 02:46:23 -0000 1.2 *************** *** 39,45 **** --- 39,51 ---- $lang['Choose_lang'] = 'Alege Limba'; $lang['Language'] = 'Limba'; + $lang['Phpbb_only'] = '[phpBBX]'; + $lang['Mxbb_only'] = '[Internal]'; + $lang['Portal_backend'] = 'Nume Backend'; + $lang['Session_backend'] = 'Users & Sessions'; + $lang['Session_backend_explain'] = 'The MX-Publisher-IWizard has detected installed phpBB boards on this server. <br />Select here if you plan to use MX-Publisher with phpBB users and sessions. <br />If you are unsure (or if you want to install MX-Publisher without phpBB), select \'Internal\' setup. <br />You may update this setting later in the MX-Publisher adminCP'; $lang['Phpbb_path'] = 'phpBB cale relativã'; $lang['Phpbb_path_explain'] = 'Cale relativã la phpBB, ex. phpBB/ or ../phpBB/<br />Noteazã slaºurile "/", ele sunt importante!'; $lang['Phpbb_url'] = 'URL phpBB Complet'; + $lang['Portal_backend'] = 'Portal Backend'; $lang['Phpbb_url_explain'] = 'Exemplu URL phpBB Complect, ex. <br />http://www.exemplu.ro/phpBB/'; $lang['Portal_url'] = 'URL Complet CMS'; |
|
From: FlorinCB <ory...@us...> - 2008-08-19 02:46:58
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9848/install/schemas Modified Files: mysql_41_schema_install.sql mysql_schema_install.sql Log Message: some bugs fixed and mysql_41 schema upgraded Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** mysql_schema_install.sql 16 Feb 2008 21:52:33 -0000 1.54 --- mysql_schema_install.sql 19 Aug 2008 02:46:24 -0000 1.55 *************** *** 338,342 **** `page_desc` varchar(255), `page_parent` int(50) DEFAULT '0', ! `parents_data` text NOT NULL DEFAULT '', `page_order` smallint(5) DEFAULT '0', `page_icon` varchar(255), --- 338,342 ---- `page_desc` varchar(255), `page_parent` int(50) DEFAULT '0', ! `parents_data` text NOT NULL, `page_order` smallint(5) DEFAULT '0', `page_icon` varchar(255), Index: mysql_41_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_41_schema_install.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mysql_41_schema_install.sql 9 Feb 2008 12:47:15 -0000 1.3 --- mysql_41_schema_install.sql 19 Aug 2008 02:46:24 -0000 1.4 *************** *** 3,7 **** # Host: localhost Database: MX-Publisher #-------------------------------------------------------- - # Server version 3.23.51-nt --- 3,6 ---- *************** *** 9,32 **** # Table structure for table 'mx_table_block' # [...1509 lines suppressed...] ! ! DROP TABLE IF EXISTS mx_table_words; ! CREATE TABLE mx_table_words ( word_id mediumint(8) UNSIGNED NOT NULL auto_increment, word char(100) NOT NULL, replacement char(100) NOT NULL, PRIMARY KEY (word_id) ! ) CHARACTER SET `utf8` COLLATE `utf8_bin`; ! --- 752,760 ---- # Table structure for table 'mx_table_words' # ! DROP TABLE IF EXISTS `mx_table_words`; ! CREATE TABLE `mx_table_words` ( word_id mediumint(8) UNSIGNED NOT NULL auto_increment, word char(100) NOT NULL, replacement char(100) NOT NULL, PRIMARY KEY (word_id) ! ) CHARACTER SET `utf8` COLLATE `utf8_bin`; \ No newline at end of file |
|
From: FlorinCB <ory...@us...> - 2008-08-19 02:46:58
|
Update of /cvsroot/mxbb/core/install/language/lang_romanian_no_diacritics In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9848/install/language/lang_romanian_no_diacritics Modified Files: lang_admin.php Log Message: some bugs fixed and mysql_41 schema upgraded Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/install/language/lang_romanian_no_diacritics/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 16 Jun 2008 14:39:57 -0000 1.1 --- lang_admin.php 19 Aug 2008 02:46:23 -0000 1.2 *************** *** 39,45 **** --- 39,51 ---- $lang['Choose_lang'] = 'Alege Limba'; $lang['Language'] = 'Limba'; + $lang['Phpbb_only'] = '[phpBBX]'; + $lang['Mxbb_only'] = '[Internal]'; + $lang['Portal_backend'] = 'Nume Backend'; + $lang['Session_backend'] = 'Users & Sessions'; + $lang['Session_backend_explain'] = 'The MX-Publisher-IWizard has detected installed phpBB boards on this server. <br />Select here if you plan to use MX-Publisher with phpBB users and sessions. <br />If you are unsure (or if you want to install MX-Publisher without phpBB), select \'Internal\' setup. <br />You may update this setting later in the MX-Publisher adminCP'; $lang['Phpbb_path'] = 'phpBB cale relativa'; $lang['Phpbb_path_explain'] = 'Cale relativa la phpBB, ex. phpBB/ or ../phpBB/<br />Noteaza slasurile "/", ele sunt importante!'; $lang['Phpbb_url'] = 'URL phpBB Complet'; + $lang['Portal_backend'] = 'Portal Backend'; $lang['Phpbb_url_explain'] = 'Exemplu URL phpBB Complect, ex. <br />http://www.exemplu.ro/phpBB/'; $lang['Portal_url'] = 'URL Complet CMS'; |
|
From: FlorinCB <ory...@us...> - 2008-08-19 02:46:30
|
Update of /cvsroot/mxbb/core/install/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9848/install/language/lang_english Modified Files: lang_admin.php Log Message: some bugs fixed and mysql_41 schema upgraded Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/install/language/lang_english/lang_admin.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_admin.php 16 Jun 2008 10:47:39 -0000 1.4 --- lang_admin.php 19 Aug 2008 02:46:23 -0000 1.5 *************** *** 41,44 **** --- 41,45 ---- $lang['Mxbb_only'] = '[Internal]'; $lang['Language'] = 'Language'; + $lang['Portal_backend'] = 'Backend Name'; $lang['Session_backend'] = 'Users & Sessions'; $lang['Session_backend_explain'] = 'The MX-Publisher-IWizard has detected installed phpBB boards on this server. <br />Select here if you plan to use MX-Publisher with phpBB users and sessions. <br />If you are unsure (or if you want to install MX-Publisher without phpBB), select \'Internal\' setup. <br />You may update this setting later in the MX-Publisher adminCP'; *************** *** 48,51 **** --- 49,53 ---- $lang['Phpbb_url_explain'] = 'Full phpBB URL, ex. <br />http://www.example.com/phpBB/'; $lang['Portal_url'] = 'Full Portal URL'; + $lang['Portal_backend'] = 'Portal Backend'; $lang['Portal_url_explain'] = 'Full Portal URL, ex. <br />http://www.example.com/'; $lang['Database_settings'] = 'Database Settings'; |
|
From: FlorinCB <ory...@us...> - 2008-08-19 02:46:29
|
Update of /cvsroot/mxbb/core/includes/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9848/includes/db Modified Files: mssql.php mysql.php mysql4.php mysqli.php Log Message: some bugs fixed and mysql_41 schema upgraded |
|
From: FlorinCB <ory...@us...> - 2008-08-19 02:46:29
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9848/install Modified Files: mx_install.php Log Message: some bugs fixed and mysql_41 schema upgraded Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** mx_install.php 30 Jul 2008 09:22:19 -0000 1.98 --- mx_install.php 19 Aug 2008 02:46:24 -0000 1.99 *************** *** 341,345 **** 'mysqli' => array( 'LABEL' => 'MySQL with MySQLi Extension', ! 'SCHEMA' => 'mysql', 'DELIM' => ';', 'DELIM_BASIC' => ';', --- 341,345 ---- 'mysqli' => array( 'LABEL' => 'MySQL with MySQLi Extension', ! 'SCHEMA' => 'mysql_41', 'DELIM' => ';', 'DELIM_BASIC' => ';', *************** *** 545,550 **** $portal_url = $mx_request_vars->post('portal_url', MX_TYPE_NO_TAGS, ''); $phpbb_path = $mx_request_vars->post('phpbb_path', MX_TYPE_NO_TAGS); //$phpbb_url = $mx_request_vars->post('phpbb_url', MX_TYPE_NO_TAGS); ! $dbms = $mx_request_vars->post('dbms_mxbb', MX_TYPE_NO_TAGS); $dbhost = $mx_request_vars->post('dbhost_mxbb', MX_TYPE_NO_TAGS); $dbname = $mx_request_vars->post('dbname_mxbb',MX_TYPE_NO_TAGS); --- 545,556 ---- $portal_url = $mx_request_vars->post('portal_url', MX_TYPE_NO_TAGS, ''); $phpbb_path = $mx_request_vars->post('phpbb_path', MX_TYPE_NO_TAGS); + $portal_backend = $mx_request_vars->post('portal_backend', MX_TYPE_NO_TAGS, 'internal'); + + //UTF-8 require to have same database in phpBB3 and mxp and mysqli is preferable + $default_dbms = ($portal_backend === 'internal') ? 'dbms_mxbb' : 'dbms'; + //$phpbb_url = $mx_request_vars->post('phpbb_url', MX_TYPE_NO_TAGS); ! $dbms = $mx_request_vars->post($default_dbms, MX_TYPE_NO_TAGS); ! $dbhost = $mx_request_vars->post('dbhost_mxbb', MX_TYPE_NO_TAGS); $dbname = $mx_request_vars->post('dbname_mxbb',MX_TYPE_NO_TAGS); *************** *** 552,561 **** $dbpasswd = $mx_request_vars->post('dbpasswd_mxbb', MX_TYPE_NO_TAGS); $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! $admin_name = !$mx_request_vars->is_empty_post('admin_name_mxbb') ? $mx_request_vars->post('admin_name_mxbb', MX_TYPE_NO_TAGS, 'admin') : 'admin'; $admin_pass1 = !$mx_request_vars->is_empty_post('admin_pass1_mxbb') ? $mx_request_vars->post('admin_pass1_mxbb', MX_TYPE_NO_TAGS, 'admin') : 'admin'; $admin_pass2 = !$mx_request_vars->is_empty_post('admin_pass2_mxbb') ? $mx_request_vars->post('admin_pass2_mxbb', MX_TYPE_NO_TAGS, 'admin') : 'admin'; - $portal_backend = 'internal'; } else --- 558,566 ---- $dbpasswd = $mx_request_vars->post('dbpasswd_mxbb', MX_TYPE_NO_TAGS); $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! $admin_name = !$mx_request_vars->is_empty_post('admin_name_mxbb') ? $mx_request_vars->post('admin_name_mxbb', MX_TYPE_NO_TAGS, 'admin') : 'admin'; $admin_pass1 = !$mx_request_vars->is_empty_post('admin_pass1_mxbb') ? $mx_request_vars->post('admin_pass1_mxbb', MX_TYPE_NO_TAGS, 'admin') : 'admin'; $admin_pass2 = !$mx_request_vars->is_empty_post('admin_pass2_mxbb') ? $mx_request_vars->post('admin_pass2_mxbb', MX_TYPE_NO_TAGS, 'admin') : 'admin'; } else *************** *** 570,582 **** $table_prefix = $mx_request_vars->post('prefix', MX_TYPE_NO_TAGS); $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! $admin_name = !$mx_request_vars->is_empty_post('admin_name') ? $mx_request_vars->post('admin_name', MX_TYPE_NO_TAGS) : 'admin'; $admin_pass1 = !$mx_request_vars->is_empty_post('admin_pass1') ? $mx_request_vars->post('admin_pass1', MX_TYPE_NO_TAGS, 'admin') : 'admin'; $admin_pass2 = !$mx_request_vars->is_empty_post('admin_pass2') ? $mx_request_vars->post('admin_pass2', MX_TYPE_NO_TAGS, 'admin') : 'admin'; - - $portal_backend = file_exists($mx_root_path . $phpbb_path . "modcp.$phpEx") ? 'phpbb2' : 'phpbb3'; } ! if( empty($portal_url) || empty($dbms) || empty($dbhost) || empty($dbname) || empty($dbuser) || empty($mx_table_prefix) ) { --- 575,597 ---- $table_prefix = $mx_request_vars->post('prefix', MX_TYPE_NO_TAGS); $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! $portal_backend = $mx_request_vars->post('portal_backend', MX_TYPE_NO_TAGS, 'internal'); $admin_name = !$mx_request_vars->is_empty_post('admin_name') ? $mx_request_vars->post('admin_name', MX_TYPE_NO_TAGS) : 'admin'; $admin_pass1 = !$mx_request_vars->is_empty_post('admin_pass1') ? $mx_request_vars->post('admin_pass1', MX_TYPE_NO_TAGS, 'admin') : 'admin'; $admin_pass2 = !$mx_request_vars->is_empty_post('admin_pass2') ? $mx_request_vars->post('admin_pass2', MX_TYPE_NO_TAGS, 'admin') : 'admin'; } + + if ($mx_request_vars->is_post('phpbb')) + { + $phpbb_info = get_phpbb_info($mx_root_path . $phpbb_path . "config.$phpEx"); ! //$portal_backend = file_exists($mx_root_path . $phpbb_path . "modcp.$phpEx") ? 'phpbb2' : 'phpbb3'; ! if( !isset($phpbb_info['dbms']) || $phpbb_info['dbms'] != $dbms || $phpbb_info['dbhost'] != $dbhost || ! $phpbb_info['dbname'] != $dbname || $phpbb_info['dbuser'] != $dbuser || ! $phpbb_info['dbpasswd'] != $dbpasswd || $phpbb_info['table_prefix'] != $table_prefix ) ! { ! install_die(sprintf($lang['phpBB_nfnd_retry'], '<a href="javascript:history.go(-1);">', '</a>')); ! } ! } ! if( empty($portal_url) || empty($dbms) || empty($dbhost) || empty($dbname) || empty($dbuser) || empty($mx_table_prefix) ) { *************** *** 592,620 **** // - // If they entered the information manually, we need to verify they did it correctly ;-) - // - if ($mx_request_vars->is_post('phpbb')) - { - $phpbb_info = get_phpbb_info($mx_root_path . $phpbb_path . "config.$phpEx"); - - if( !empty($phpbb_info['acm_type']) ) - { - @define('IN_PHPBB3', true); - $tplEx = 'html'; // Not used atm - } - else - { - $tplEx = 'tpl'; - } - - if( !isset($phpbb_info['dbms']) || $phpbb_info['dbms'] != $dbms || $phpbb_info['dbhost'] != $dbhost || - $phpbb_info['dbname'] != $dbname || $phpbb_info['dbuser'] != $dbuser || - $phpbb_info['dbpasswd'] != $dbpasswd || $phpbb_info['table_prefix'] != $table_prefix ) - { - install_die(sprintf($lang['phpBB_nfnd_retry'], '<a href="javascript:history.go(-1);">', '</a>')); - } - } - - // // Trailing slashes are very important for the URLs we need to store in the mx_portal table. // --- 607,610 ---- *************** *** 649,652 **** --- 639,643 ---- $config_data .= '$'."dbpasswd = '$dbpasswd';\n\n"; $config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n"; + $config_data .= "define('UTF_STATUS', '$portal_backend');\n\n"; $config_data .= "define('MX_INSTALLED', true);\n\n"; $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! *************** *** 710,713 **** --- 701,705 ---- $config_data .= '$'."dbpasswd = '$dbpasswd';\n\n"; $config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n"; + $config_data .= "define('UTF_STATUS', '$portal_backend');\n\n"; $config_data .= "define('MX_INSTALLED', true);\n\n"; $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! *************** *** 1051,1060 **** // First, provide the option of standalone install // - $template->assign_block_vars('datarow', array( 'INFO' => $lang['Install_Instruction_mxBB'], 'PHPBB_PATH' => '', 'PORTAL_URL' => $portal_url, ! 'PHPBB_URL' => '', 'DBMS' => '', 'DB_HOST' => 'localhost', --- 1043,1052 ---- // First, provide the option of standalone install // $template->assign_block_vars('datarow', array( 'INFO' => $lang['Install_Instruction_mxBB'], 'PHPBB_PATH' => '', 'PORTAL_URL' => $portal_url, ! 'PORTAL_BACKEND' => 'internal', ! 'PHPBB_URL' => '', 'DBMS' => '', 'DB_HOST' => 'localhost', *************** *** 1063,1071 **** 'DB_PASSWD' => '', 'DB_PREFIX' => '', ! //'ACM_TYPE' => ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ), 'PHPBB_ROOT' => '', )); ! $select_phpbb_path .= '<option value="-1">'.'Internal'.'</option>'; // --- 1055,1063 ---- 'DB_PASSWD' => '', 'DB_PREFIX' => '', ! //'ACM_TYPE' => ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ), 'PHPBB_ROOT' => '', )); ! $select_phpbb_path .= '<option value="-1">'.'internal'.'</option>'; // *************** *** 1092,1096 **** // Get the DB related information for this phpBB // ! $phpbb_info = get_phpbb_info($phpbb_root_path . "config.$phpEx"); // --- 1084,1105 ---- // Get the DB related information for this phpBB // ! if (file_exists($phpbb_root_path . "config.$phpEx")) ! { ! $phpbb_info = get_phpbb_info($phpbb_root_path . "config.$phpEx"); ! ! if(!empty($phpbb_info['acm_type'])) ! { ! $portal_backend = 'phpbb3'; ! } ! else ! { ! $portal_backend = 'phpbb2'; ! } ! } ! else ! { ! print_r("File: " . $phpbb_root_path . "config.$phpEx" . " not found."); ! $portal_backend = 'internal'; ! } // *************** *** 1105,1113 **** // - - // Check if we support the DB used for this phpBB // ! if( !isset($phpbb_info['dbms']) || !array_key_exists($phpbb_info['dbms'], $available_dbms) ) { continue; } --- 1114,1121 ---- // // Check if we support the DB used for this phpBB // ! if( !isset($phpbb_info['dbms']) || !array_key_exists($phpbb_info['dbms'], $available_dbms) ) ! { continue; } *************** *** 1121,1124 **** --- 1129,1133 ---- continue; } + // // Get the phpBB URL *************** *** 1137,1145 **** continue; } // // Note: to get the phpBB URL we have read the config table, // so it seems safe to assume this board is installed. :-) // - $template->assign_block_vars('datarow', array( 'INFO' => $lang['Install_Instruction_phpBB'], --- 1146,1154 ---- continue; } + // // Note: to get the phpBB URL we have read the config table, // so it seems safe to assume this board is installed. :-) // $template->assign_block_vars('datarow', array( 'INFO' => $lang['Install_Instruction_phpBB'], *************** *** 1147,1150 **** --- 1156,1160 ---- 'PORTAL_URL' => $portal_url, 'PHPBB_URL' => $phpbb_url, + 'PORTAL_BACKEND' => $portal_backend, 'DBMS' => $phpbb_info['dbms'], 'DB_HOST' => !empty($phpbb_info['dbhost']) ? $phpbb_info['dbhost'] : 'localhost', *************** *** 1197,1200 **** --- 1207,1211 ---- 'L_PHPBB_PATH' => $lang['Phpbb_path'], 'L_Backend' => $lang['Session_backend'], + 'L_PORTAL_BACKEND' => $lang['Portal_backend'], 'L_Backend_explain' => $phpbb_found ? $lang['Session_backend_explain'] : '', 'L_PORTAL_URL' => $lang['Portal_url'], *************** *** 1220,1232 **** 'PORTAL_URL' => $portal_url, 'PHPBB_URL' => $phpbb_url, - 'DBMS' => $phpbb_info['dbms'], - 'DB_HOST' => $phpbb_info['dbhost'], - 'DB_NAME' => $phpbb_info['dbname'], - 'DB_USER' => $phpbb_info['dbuser'], - 'DB_PASSWD' => $phpbb_info['dbpasswd'], - 'DB_PREFIX' => $phpbb_info['table_prefix'], 'ACM_TYPE' => ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ), ! ! 'DBMS_SELECT' => dbms_select('mysql'), 'S_HIDDEN_FIELDS' => $s_hidden_fields, --- 1231,1237 ---- 'PORTAL_URL' => $portal_url, 'PHPBB_URL' => $phpbb_url, 'ACM_TYPE' => ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ), ! ! 'DBMS_SELECT' => dbms_select('mysql4'), 'S_HIDDEN_FIELDS' => $s_hidden_fields, |
|
From: FlorinCB <ory...@us...> - 2008-08-19 02:46:28
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9848/install/includes Modified Files: functions_install.php Log Message: some bugs fixed and mysql_41 schema upgraded Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** functions_install.php 25 Jun 2008 23:54:46 -0000 1.10 --- functions_install.php 19 Aug 2008 02:46:23 -0000 1.11 *************** *** 842,846 **** function get_phpbb_info($config) { ! @include($config); return array( 'dbms' => $dbms, --- 842,851 ---- function get_phpbb_info($config) { ! ! if ((@include $config) === false) ! { ! install_die(GENERAL_ERROR, 'Configuration file ' . $config . ' couldn\'t be opened.'); ! } ! return array( 'dbms' => $dbms, *************** *** 860,874 **** function get_phpbb_url($table_prefix) { ! global $db; ! $sql = "SELECT * FROM ".$table_prefix."config"; if( !($result = $db->sql_query($sql)) ) { return false; } ! while( $row = $db->sql_fetchrow($result) ) { $board_config[$row['config_name']] = $row['config_value']; } $server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://'; $server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])); --- 865,882 ---- function get_phpbb_url($table_prefix) { ! global $mx_root_path, $phpEx, $db; ! $sql = 'SELECT * ! FROM ' . $table_prefix . 'config'; if( !($result = $db->sql_query($sql)) ) { return false; } ! while ($row = $db->sql_fetchrow($result)) { $board_config[$row['config_name']] = $row['config_value']; } + $db->sql_freeresult($result); + $server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://'; $server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])); *************** *** 901,906 **** require_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class ! return $db->db_connect_id; } --- 909,915 ---- require_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class ! return $db->db_connect_id; + } |
|
From: FlorinCB <ory...@us...> - 2008-08-19 02:46:28
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9848/includes Modified Files: mx_functions.php Log Message: some bugs fixed and mysql_41 schema upgraded |
|
From: FlorinCB <ory...@us...> - 2008-08-18 19:48:34
|
Update of /cvsroot/mxbb/core/includes/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20652/db Modified Files: mssql.php mysql.php mysql4.php mysqli.php Log Message: not fixed yet Index: mysql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mysql.php 30 Jul 2008 13:32:52 -0000 1.17 --- mysql.php 18 Aug 2008 19:48:23 -0000 1.18 *************** *** 62,66 **** if (version_compare($this->mysql_version, '4.1.3', '>=')) { ! if (PORTAL_BACKEND === 'phpbb3') { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); --- 62,66 ---- if (version_compare($this->mysql_version, '4.1.3', '>=')) { ! if (UTF_STATUS === 'phpbb3') { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); Index: mysql4.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql4.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mysql4.php 30 Jul 2008 13:32:52 -0000 1.18 --- mysql4.php 18 Aug 2008 19:48:24 -0000 1.19 *************** *** 67,71 **** $this->sql_layer = 'mysql4'; ! if (PORTAL_BACKEND === 'phpbb3') { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); --- 67,71 ---- $this->sql_layer = 'mysql4'; ! if (UTF_STATUS === 'phpbb3') { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); Index: mysqli.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysqli.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mysqli.php 30 Jul 2008 13:35:08 -0000 1.18 --- mysqli.php 18 Aug 2008 19:48:25 -0000 1.19 *************** *** 55,59 **** { // mysqli only supported by phpBB3 ! //if (PORTAL_BACKEND === 'phpbb3') //{ @mysqli_query($this->db_connect_id, "SET NAMES 'utf8'"); --- 55,59 ---- { // mysqli only supported by phpBB3 ! //if (UTF_STATUS === 'phpbb3') //{ @mysqli_query($this->db_connect_id, "SET NAMES 'utf8'"); Index: mssql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mssql.php 7 Mar 2008 00:59:02 -0000 1.15 --- mssql.php 18 Aug 2008 19:48:23 -0000 1.16 *************** *** 38,42 **** * Connect to server */ ! function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) { $this->persistency = $persistency; --- 38,45 ---- * Connect to server */ ! /** ! * Connect to server ! */ ! function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false) { $this->persistency = $persistency; *************** *** 45,49 **** $this->dbname = $database; ! $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword) : @mssql_connect($this->server, $this->user, $sqlpassword); if ($this->db_connect_id && $this->dbname != '') --- 48,67 ---- $this->dbname = $database; ! if (UTF_STATUS === 'phpbb3') ! { ! @ini_set('mssql.charset', 'UTF-8'); ! // enforce strict mode on databases that support it ! } ! @ini_set('mssql.textlimit', 2147483647); ! @ini_set('mssql.textsize', 2147483647); ! ! if (version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.1', '>='))) ! { ! $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mssql_connect($this->server, $this->user, $sqlpassword, $new_link); ! } ! else ! { ! $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword) : @mssql_connect($this->server, $this->user, $sqlpassword); ! } if ($this->db_connect_id && $this->dbname != '') |
|
From: FlorinCB <ory...@us...> - 2008-08-18 19:48:32
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20652 Modified Files: mx_functions.php Log Message: not fixed yet Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** mx_functions.php 10 Aug 2008 20:25:27 -0000 1.88 --- mx_functions.php 18 Aug 2008 19:48:26 -0000 1.89 *************** *** 10,16 **** */ ! if ( !defined( 'IN_PORTAL' ) ) { ! die( "Hacking attempt" ); } --- 10,16 ---- */ ! if (!defined('IN_PORTAL')) { ! die("Hacking attempt"); } *************** *** 2413,2416 **** --- 2413,2417 ---- } } + /** * update config.php values. *************** *** 2453,2457 **** $config_data .= '$'."dbpasswd = '$dbpasswd';\n\n"; $config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n"; ! $config_data .= "define('PORTAL_BACKEND', '$new_backend');\n\n"; $config_data .= "define('MX_INSTALLED', true);\n\n"; $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! --- 2454,2458 ---- $config_data .= '$'."dbpasswd = '$dbpasswd';\n\n"; $config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n"; ! $config_data .= "define('UTF_STATUS', '$new_backend');\n\n"; $config_data .= "define('MX_INSTALLED', true);\n\n"; $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! |
|
From: FlorinCB <ory...@us...> - 2008-08-16 01:46:23
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29865 Modified Files: Tag: core28x common.php Log Message: Added phpbb_auth class, not added mx_backend stuff yet Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.67.2.14 retrieving revision 1.67.2.15 diff -C2 -d -r1.67.2.14 -r1.67.2.15 *** common.php 15 Jul 2008 22:13:12 -0000 1.67.2.14 --- common.php 16 Aug 2008 01:45:49 -0000 1.67.2.15 *************** *** 23,28 **** // DEBUG AND ERROR HANDLING // ! //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php ! //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. //error_reporting(E_ALL); error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables --- 23,28 ---- // DEBUG AND ERROR HANDLING // ! //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php ! //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. //error_reporting(E_ALL); error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables *************** *** 312,315 **** --- 312,325 ---- // + // Get MX-Publisher config settings + // + $portal_config = $mx_cache->obtain_mxbb_config(); + + if (empty($portal_config['portal_version'])) + { + $portal_config = $mx_cache->obtain_mxbb_config(false); + } + + // // Instatiate the mx_bbcode class // *************** *** 317,323 **** // ! // Get mxBB config settings // ! $portal_config = $mx_cache->obtain_mxbb_config(); // --- 327,333 ---- // ! // Load backend // ! include_once($mx_root_path . 'includes/sessions/phpbb2/core.' . $phpEx); // |
|
From: FlorinCB <ory...@us...> - 2008-08-16 01:45:58
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29865/includes/sessions/phpbb2 Added Files: Tag: core28x auth.php core.php index.htm Log Message: Added phpbb_auth class, not added mx_backend stuff yet --- NEW FILE: auth.php --- <?php /** * * @package Auth * @version $Id: auth.php,v 1.3.2.2 2008/08/16 01:45:51 orynider Exp $ * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com * */ if ( !defined( 'IN_PORTAL' ) ) { die( "Hacking attempt" ); } /** * Permission/Auth class for phpBB2 forums * @package MX-Publisher */ class phpbb_auth_base { function auth($type, $forum_id, $userdata, $f_access = '') { global $db, $lang; switch( $type ) { case AUTH_ALL: $a_sql = 'a.auth_view, a.auth_read, a.auth_post, a.auth_reply, a.auth_edit, a.auth_delete, a.auth_sticky, a.auth_announce, a.auth_vote, a.auth_pollcreate'; $auth_fields = array('auth_view', 'auth_read', 'auth_post', 'auth_reply', 'auth_edit', 'auth_delete', 'auth_sticky', 'auth_announce', 'auth_vote', 'auth_pollcreate'); break; case AUTH_VIEW: $a_sql = 'a.auth_view'; $auth_fields = array('auth_view'); break; case AUTH_READ: $a_sql = 'a.auth_read'; $auth_fields = array('auth_read'); break; case AUTH_POST: $a_sql = 'a.auth_post'; $auth_fields = array('auth_post'); break; case AUTH_REPLY: $a_sql = 'a.auth_reply'; $auth_fields = array('auth_reply'); break; case AUTH_EDIT: $a_sql = 'a.auth_edit'; $auth_fields = array('auth_edit'); break; case AUTH_DELETE: $a_sql = 'a.auth_delete'; $auth_fields = array('auth_delete'); break; case AUTH_ANNOUNCE: $a_sql = 'a.auth_announce'; $auth_fields = array('auth_announce'); break; case AUTH_STICKY: $a_sql = 'a.auth_sticky'; $auth_fields = array('auth_sticky'); break; case AUTH_POLLCREATE: $a_sql = 'a.auth_pollcreate'; $auth_fields = array('auth_pollcreate'); break; case AUTH_VOTE: $a_sql = 'a.auth_vote'; $auth_fields = array('auth_vote'); break; case AUTH_ATTACH: break; default: break; } // // If f_access has been passed, or auth is needed to return an array of forums // then we need to pull the auth information on the given forum (or all forums) // if ( empty($f_access) ) { $forum_match_sql = ( $forum_id != AUTH_LIST_ALL ) ? "WHERE a.forum_id = $forum_id" : ''; $sql = "SELECT a.forum_id, $a_sql FROM " . FORUMS_TABLE . " a $forum_match_sql"; if ( !($result = $db->sql_query($sql)) ) { //mx_message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql); } $sql_fetchrow = ( $forum_id != AUTH_LIST_ALL ) ? 'sql_fetchrow' : 'sql_fetchrowset'; if ( !($f_access = $db->$sql_fetchrow($result)) ) { $db->sql_freeresult($result); return array(); } $db->sql_freeresult($result); } // // If the user isn't logged on then all we need do is check if the forum // has the type set to ALL, if yes they are good to go, if not then they // are denied access // $u_access = array(); if ( $userdata['session_logged_in'] ) { $forum_match_sql = ( $forum_id != AUTH_LIST_ALL ) ? "AND a.forum_id = $forum_id" : ''; $sql = "SELECT a.forum_id, $a_sql, a.auth_mod FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug WHERE ug.user_id = ".$userdata['user_id']. " AND ug.user_pending = 0 AND a.group_id = ug.group_id $forum_match_sql"; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql); } if ( $row = $db->sql_fetchrow($result) ) { do { if ( $forum_id != AUTH_LIST_ALL) { $u_access[] = $row; } else { $u_access[$row['forum_id']][] = $row; } } while( $row = $db->sql_fetchrow($result) ); } $db->sql_freeresult($result); } $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; $auth_user = array(); for($i = 0; $i < count($auth_fields); $i++) { $key = $auth_fields[$i]; // // If the user is logged on and the forum type is either ALL or REG then the user has access // // If the type if ACL, MOD or ADMIN then we need to see if the user has specific permissions // to do whatever it is they want to do ... to do this we pull relevant information for the // user (and any groups they belong to) // // Now we compare the users access level against the forums. We assume here that a moderator // and admin automatically have access to an ACL forum, similarly we assume admins meet an // auth requirement of MOD // if ( $forum_id != AUTH_LIST_ALL ) { $value = $f_access[$key]; switch( $value ) { case AUTH_ALL: $auth_user[$key] = TRUE; $auth_user[$key . '_type'] = $lang['Auth_Anonymous_Users']; break; case AUTH_REG: $auth_user[$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0; $auth_user[$key . '_type'] = $lang['Auth_Registered_Users']; break; case AUTH_ACL: $auth_user[$key] = ( $userdata['session_logged_in'] ) ? $this->auth_check_user(AUTH_ACL, $key, $u_access, $is_admin) : 0; $auth_user[$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: $auth_user[$key] = ( $userdata['session_logged_in'] ) ? $this->auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0; $auth_user[$key . '_type'] = $lang['Auth_Moderators']; break; case AUTH_ADMIN: $auth_user[$key] = $is_admin; $auth_user[$key . '_type'] = $lang['Auth_Administrators']; break; default: $auth_user[$key] = 0; break; } } else { for($k = 0; $k < count($f_access); $k++) { $value = $f_access[$k][$key]; $f_forum_id = $f_access[$k]['forum_id']; $u_access[$f_forum_id] = isset($u_access[$f_forum_id]) ? $u_access[$f_forum_id] : array(); switch( $value ) { case AUTH_ALL: $auth_user[$f_forum_id][$key] = TRUE; $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Anonymous_Users']; break; case AUTH_REG: $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0; $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Registered_Users']; break; case AUTH_ACL: $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? $this->auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : 0; $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? $this->auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0; $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Moderators']; break; case AUTH_ADMIN: $auth_user[$f_forum_id][$key] = $is_admin; $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Administrators']; break; default: $auth_user[$f_forum_id][$key] = 0; break; } } } } // // Is user a moderator? // if ( $forum_id != AUTH_LIST_ALL ) { $auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? $this->auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0; } else { for($k = 0; $k < count($f_access); $k++) { $f_forum_id = $f_access[$k]['forum_id']; $u_access[$f_forum_id] = isset($u_access[$f_forum_id]) ? $u_access[$f_forum_id] : array(); $auth_user[$f_forum_id]['auth_mod'] = ( $userdata['session_logged_in'] ) ? $this->auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0; } } return $auth_user; } function auth_check_user($type, $key, $u_access, $is_admin) { $auth_user = 0; if ( count($u_access) ) { for($j = 0; $j < count($u_access); $j++) { $result = 0; switch($type) { case AUTH_ACL: $result = $u_access[$j][$key]; case AUTH_MOD: $result = $result || $u_access[$j]['auth_mod']; case AUTH_ADMIN: $result = $result || $is_admin; break; } $auth_user = $auth_user || $result; } } else { $auth_user = $is_admin; } return $auth_user; } } ?> --- NEW FILE: core.php --- <?php /** * * @package Auth * @version $Id: core.php,v 1.14.2.2 2008/08/16 01:45:52 orynider Exp $ * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com * */ if ( !defined( 'IN_PORTAL' ) ) { die( "Hacking attempt" ); } // // First off, include common vanilla phpBB functions, from our shared dir // Note: These functions will later be accessible wrapped as phpBBX::orig_functionname() // //include_once($mx_root_path . 'includes/shared/phpbb2/includes/functions.' . $phpEx); //include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); // // Now load some bbcodes, to be extended for this backend (see below) // //include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions // // Finally, load some backend specific functions // //include_once($mx_root_path . 'includes/sessions/phpbb2/functions.' . $phpEx); // // phpBB Permissions // include_once($mx_root_path . 'includes/sessions/phpbb2/auth.' . $phpEx); /** * Permission/Auth class * * @package MX-Publisher * */ class phpbb_auth extends phpbb_auth_base { /** * get_auth_forum * * @param unknown_type $mode * @return unknown */ function get_auth_forum($mode = 'phpbb') { global $userdata, $mx_root_path, $phpEx; // // Try to reuse auth_view query result. // $userdata_key = 'mx_get_auth_' . $mode . $userdata['user_id']; if( !empty($userdata[$userdata_key]) ) { $auth_data_sql = $userdata[$userdata_key]; return $auth_data_sql; } // // Now, this tries to optimize DB access involved in auth(), // passing AUTH_LIST_ALL will load info for all forums at once. // $is_auth_ary = $this->auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata); // // Loop through the list of forums to retrieve the ids for // those with AUTH_VIEW allowed. // $auth_data_sql = ''; foreach( $is_auth_ary as $fid => $is_auth_row ) { if( ($is_auth_row['auth_view']) ) { $auth_data_sql .= ( $auth_data_sql != '' ) ? ', ' . $fid : $fid; } } if( empty($auth_data_sql) ) { $auth_data_sql = -1; } $userdata[$userdata_key] = $auth_data_sql; return $auth_data_sql; } /** * function acl_getfignore() * $auth_level_read can be a value or array; * $ignore_forum_ids can have this sintax: forum_id(1), forum_id(2), ..., forum_is(n); * 1st test 25.06.2008 by FlorinCB */ function acl_getfignore($auth_level_read, $ignore_forum_ids) { global $phpbb_root_path, $mx_user; $ignore_forum_ids = ($ignore_forum_ids) ? $ignore_forum_ids : -1; $auth_user = array(); if (is_array($auth_level_read)) { foreach ($auth_level_read as $auth_level) { $auth_user = $this->auth($auth_level, AUTH_LIST_ALL, $mx_user->data); if ($num_forums = count($auth_user)) { while ( list($forum_id, $auth_mod) = each($auth_user) ) { $unauthed = false; if (!$auth_mod[$auth_level] && (strstr($ignore_forum_ids,$auth_mod['forum_id']) === FALSE)) { $unauthed = true; } if (!$auth_level && !$auth_mod['auth_read'] && (strstr($ignore_forum_ids,$auth_mod['forum_id']) === FALSE)) { $unauthed = true; } if ($unauthed) { $ignore_forum_ids .= ($ignore_forum_ids) ? ',' . $forum_id : $forum_id; } } } unset($auth_level_read); } } else { $auth_user = $this->auth($auth_level_read, AUTH_LIST_ALL, $mx_user->data); foreach($auth_user as $forum_id => $is_auth_row) { $unauthed = true; if($auth_level_read && ($is_auth_row[$auth_level_read])) { $unauthed = false; } if(strstr($ignore_forum_ids, $forum_id)) { $unauthed = false; } if ($unauthed) { $ignore_forum_ids .= ($ignore_forum_ids) ? ',' . $forum_id : $forum_id; } } } $ignore_forum_ids = ($ignore_forum_ids) ? $ignore_forum_ids : -1; return $ignore_forum_ids; } } // // Init the phpbb_auth class // $phpbb_auth = new phpbb_auth(); //mx_backend here when needed ?> --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-08-16 01:45:57
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29865/includes/shared/phpbb2/includes Added Files: Tag: core28x index.htm Log Message: Added phpbb_auth class, not added mx_backend stuff yet --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-08-16 01:45:56
|
Update of /cvsroot/mxbb/core/includes/sessions In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29865/includes/sessions Added Files: Tag: core28x index.htm Log Message: Added phpbb_auth class, not added mx_backend stuff yet --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-08-16 00:38:16
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28379 Modified Files: Tag: core28x mx_install.php Log Message: 2.8.3 Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.79.2.7 retrieving revision 1.79.2.8 diff -C2 -d -r1.79.2.7 -r1.79.2.8 *** mx_install.php 16 Jun 2008 10:51:27 -0000 1.79.2.7 --- mx_install.php 16 Aug 2008 00:38:10 -0000 1.79.2.8 *************** *** 33,37 **** // $mx_portal_name = 'MX-Publisher Modular System'; ! $mx_portal_version = '2.8.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 = '2.8.3'; $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: FlorinCB <ory...@us...> - 2008-08-10 20:25:33
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22014/admin Modified Files: admin_mx_portal.php Log Message: function update_portal_backend I will explain in the forum ... Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** admin_mx_portal.php 22 Jun 2008 17:21:42 -0000 1.43 --- admin_mx_portal.php 10 Aug 2008 20:25:26 -0000 1.44 *************** *** 109,115 **** } $mx_cache->put('mxbb_config', $new); ! $message = $lang['Portal_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_portal_config'], "<a href=\"" . mx_append_sid("admin_mx_portal.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); } --- 109,118 ---- } + $message = update_portal_backend($new['portal_backend']); + $mx_cache->put('mxbb_config', $new); ! $message .= $lang['Portal_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_portal_config'], "<a href=\"" . mx_append_sid("admin_mx_portal.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } |
|
From: FlorinCB <ory...@us...> - 2008-08-10 20:25:33
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22014/includes Modified Files: mx_functions.php Log Message: function update_portal_backend I will explain in the forum ... Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** mx_functions.php 15 Jul 2008 22:22:23 -0000 1.87 --- mx_functions.php 10 Aug 2008 20:25:27 -0000 1.88 *************** *** 2413,2415 **** --- 2413,2480 ---- } } + /** + * update config.php values. + * + */ + function update_portal_backend($new_backend = PORTAL_BACKEND) + { + global $mx_root_path, $lang, $phpEx, $portal_config; + + if( @file_exists($mx_root_path . "config.$phpEx") ) + { + require($mx_root_path . "config.$phpEx"); + } + + $mx_portal_name = 'MX-Publisher Modular System'; + + /* + $config = array( + 'dbms' => $dbms, + 'dbhost' => $dbhost, + 'dbname' => $dbname, + 'dbuser' => $dbuser, + 'dbpasswd' => $dbpasswd, + 'mx_table_prefix' => $mx_table_prefix, + 'portal_backend' => (!empty($portal_backend) ? $portal_backend : 'internal'), + ); + */ + + $new_backend = ($new_backend) ? $new_backend : 'internal'; + + $process_msgs[] = 'Writing config ...<br />'; + + $config_data = "<"."?php\n\n"; + $config_data .= "// $mx_portal_name auto-generated config file\n// Do not change anything in this file!\n\n"; + $config_data .= "// This file must be put into the $mx_portal_name directory, not into the phpBB directory.\n\n"; + $config_data .= '$'."dbms = '$dbms';\n\n"; + $config_data .= '$'."dbhost = '$dbhost';\n"; + $config_data .= '$'."dbname = '$dbname';\n"; + $config_data .= '$'."dbuser = '$dbuser';\n"; + $config_data .= '$'."dbpasswd = '$dbpasswd';\n\n"; + $config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n"; + $config_data .= "define('PORTAL_BACKEND', '$new_backend');\n\n"; + $config_data .= "define('MX_INSTALLED', true);\n\n"; + $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! + + @umask(0111); + @chmod($mx_root_path . "config.$phpEx", 0644); + + if ( !($fp = @fopen($mx_root_path . 'config.' . $phpEx, 'w')) ) + { + $process_msgs[] = "Unable to write config file " . $mx_root_path . "config.$phpEx" . "<br />\n"; + } + $result = @fputs($fp, $config_data, strlen($config_data)); + @fclose($fp); + + $process_msgs[] = '<span style="color:pink;">'.str_replace("\n", "<br />\n", htmlspecialchars($config_data)).'</span>'; + + $message = '<hr />'; + for( $i=0; $i < count($process_msgs); $i++ ) + { + $message .= $process_msgs[$i] . ( $process_msgs[$i] == '<hr />' ? '' : '<br />' ) . "\n"; + } + $message .= '<hr />'; + + return $message; + } ?> \ No newline at end of file |
|
From: FlorinCB <ory...@us...> - 2008-08-10 18:27:21
|
Update of /cvsroot/mxbb/mx_act/games/pacman_gel In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19446/pacman_gel Added Files: pacman_gel.fla pacman_gel.gif pacman_gel.swf size.txt ~pacman_gel.fla Log Message: games --- NEW FILE: pacman_gel.swf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pacman_gel.fla --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pacman_gel.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ~pacman_gel.fla --- (This appears to be a binary file; contents omitted.) --- NEW FILE: size.txt --- 450x440 |
2 messages has been excluded from this view by a project administrator.
