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...> - 2007-08-06 21:14:17
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31279 Modified Files: functions.php Log Message: Fix for Autogenerated comments Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** functions.php 25 Jul 2007 23:14:28 -0000 1.37 --- functions.php 6 Aug 2007 21:14:10 -0000 1.38 *************** *** 1160,1164 **** function init( $item_id = 0) { ! global $db, $lang, $module_root_path, $phpbb_root_path, $phpEx, $userdata, $pafiledb; // ======================================================= --- 1160,1164 ---- function init( $item_id = 0) { ! global $db, $lang, $module_root_path, $phpbb_root_path, $mx_root_path, $phpEx, $userdata, $pafiledb; // ======================================================= *************** *** 1264,1268 **** --- 1264,1271 ---- $this->data['item_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : $lang['Guest']; + $mx_root_path_tmp = $mx_root_path; // Stupid workaround, since phpbb posts need full paths. + $mx_root_path = ''; $this->temp_url = PORTAL_URL . $pafiledb->this_mxurl("action=" . "file&file_id=" . $this->data['item_id'], false, true); + $mx_root_path = $mx_root_path_tmp; } } |
|
From: Jon O. <jon...@us...> - 2007-08-06 21:13:53
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30843 Modified Files: functions.php Log Message: Fix for Autogenerated comments Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** functions.php 25 Jul 2007 23:13:51 -0000 1.19 --- functions.php 6 Aug 2007 21:13:48 -0000 1.20 *************** *** 753,757 **** function init( $item_id = 0) { ! global $db, $lang, $module_root_path, $phpbb_root_path, $phpEx, $userdata, $linkdb; // ======================================================= --- 753,757 ---- function init( $item_id = 0) { ! global $db, $lang, $module_root_path, $phpbb_root_path, $mx_root_path, $phpEx, $userdata, $linkdb; // ======================================================= *************** *** 857,861 **** --- 857,864 ---- $this->data['item_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : $lang['Guest']; + $mx_root_path_tmp = $mx_root_path; // Stupid workaround, since phpbb posts need full paths. + $mx_root_path = ''; $this->temp_url = PORTAL_URL . $linkdb->this_mxurl("action=" . "jump&link_id=" . $this->data['item_id'], false, true); + $mx_root_path = $mx_root_path_tmp; } } |
|
From: Jon O. <jon...@us...> - 2007-08-06 21:13:33
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30755 Modified Files: kb_article_app.tpl Log Message: Fix for Autogenerated comments Cleaning up some js Index: kb_article_app.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_article_app.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_article_app.tpl 2 Jun 2007 19:56:54 -0000 1.1 --- kb_article_app.tpl 6 Aug 2007 21:13:28 -0000 1.2 *************** *** 36,39 **** --- 36,42 ---- <!-- END switch_ratings --> </td> + <td align="right" valign="top" class="row2"> + <a href="{U_PRINT}" class="gensmall">{L_PRINT}</a> + </td> </tr> </table> |
|
From: Jon O. <jon...@us...> - 2007-08-06 21:13:14
|
Update of /cvsroot/mxbb/mx_kb/kb/includes/js In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30593/js Modified Files: init_view.js Log Message: Fix for Autogenerated comments Cleaning up some js Index: init_view.js =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/js/init_view.js,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** init_view.js 2 Jun 2007 20:56:04 -0000 1.1 --- init_view.js 6 Aug 2007 21:13:10 -0000 1.2 *************** *** 34,56 **** generateParentTOC('view'); dhtmlHistory.add( treeGetId(), el(tree.active+"-text").innerHTML ); - - //queryPath = tree.getActiveNode().id; - //tree.queryPath = queryPath.replace('tree-', ""); - //tree.active = queryPath; - //tree.loadState(); - //tree.updateHtml(); - - //if (tree.getActiveNode().childNodes) { - //for (var i = 0; i < tree.getActiveNode().childNodes.length; i++) { - //if (tree.getActiveNode().childNodes[i].isDocument()) { - //queryPath = tree.getActiveNode().childNodes[i].id; - //tree.queryPath = queryPath.replace('tree-', ""); - //tree.active = queryPath; - //tree.loadState(); - //tree.updateHtml(); - //break; - //} - //} - //} } }); --- 34,37 ---- *************** *** 73,76 **** --- 54,58 ---- initialLocation = articlePath; } + // if no location specified, use the default else if ((initialLocation == '' || initialLocation == null) && tree.allNodes[0]) *************** *** 91,94 **** --- 73,77 ---- queryPath = tree.allNodes[0].id; } + initialLocation = queryPath.replace('tree-', ""); } |
|
From: Jon O. <jon...@us...> - 2007-08-06 21:13:14
|
Update of /cvsroot/mxbb/mx_kb/kb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30593 Modified Files: functions.php Log Message: Fix for Autogenerated comments Cleaning up some js Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** functions.php 25 Jul 2007 23:13:07 -0000 1.19 --- functions.php 6 Aug 2007 21:13:10 -0000 1.20 *************** *** 934,938 **** function init( $item_id = 0) { ! global $db, $lang, $module_root_path, $phpbb_root_path, $phpEx, $userdata, $mx_kb; // ======================================================= --- 934,938 ---- function init( $item_id = 0) { ! global $db, $lang, $module_root_path, $phpbb_root_path, $mx_root_path, $phpEx, $userdata, $mx_kb; // ======================================================= *************** *** 1037,1041 **** --- 1037,1044 ---- $this->data['item_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : $lang['Guest']; + $mx_root_path_tmp = $mx_root_path; // Stupid workaround, since phpbb posts need full paths. + $mx_root_path = ''; $this->temp_url = PORTAL_URL . $mx_kb->this_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true); + $mx_root_path = $mx_root_path_tmp; } } |
|
From: Jon O. <jon...@us...> - 2007-08-06 21:12:31
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29827 Modified Files: functions.php Log Message: Fix for Autogenerated comments Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/functions.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** functions.php 6 Aug 2007 13:22:56 -0000 1.7 --- functions.php 6 Aug 2007 21:12:27 -0000 1.8 *************** *** 520,524 **** function init( $item_id = 0) { ! global $db, $lang, $module_root_path, $phpbb_root_path, $phpEx, $userdata, $mx_bugsbt; // ======================================================= --- 520,524 ---- function init( $item_id = 0) { ! global $db, $lang, $module_root_path, $mx_root_path, $phpbb_root_path, $phpEx, $userdata, $mx_bugsbt; // ======================================================= *************** *** 621,625 **** --- 621,628 ---- $this->data['item_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : $lang['Guest']; + $mx_root_path_tmp = $mx_root_path; // Stupid workaround, since phpbb posts need full paths. + $mx_root_path = ''; $this->temp_url = PORTAL_URL . $mx_bugsbt->this_mxurl("mode=" . "index&k=" . $this->data['item_id'], false, true); + $mx_root_path = $mx_root_path_tmp; } } |
|
From: Jon O. <jon...@us...> - 2007-08-06 21:12:01
|
Update of /cvsroot/mxbb/core/modules/mx_shared/ErrorHandler In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29207 Modified Files: Handler.php Log Message: A few updates, - fix for installation error (Ory) - Left trash code in mx_functions_core.php Index: Handler.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_shared/ErrorHandler/Handler.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Handler.php 28 Apr 2006 14:29:38 -0000 1.2 --- Handler.php 6 Aug 2007 21:11:57 -0000 1.3 *************** *** 21,26 **** */ function ErrorHandler() { ! ini_set('docref_root', null); ! ini_set('docref_ext', null); } --- 21,26 ---- */ function ErrorHandler() { ! @ini_set('docref_root', null); ! @ini_set('docref_ext', null); } *************** *** 39,43 **** return; } ! while (ob_get_level()) { ob_end_clean(); --- 39,43 ---- return; } ! while (ob_get_level()) { ob_end_clean(); *************** *** 57,61 **** 1024 => "Php User Notice" ); ! $info = array(); --- 57,61 ---- 1024 => "Php User Notice" ); ! $info = array(); *************** *** 65,69 **** } } ! $trace = array(); --- 65,69 ---- } } ! $trace = array(); |
|
From: Jon O. <jon...@us...> - 2007-08-06 21:11:48
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29161 Modified Files: mx_functions_admincp.php mx_functions_core.php Log Message: A few updates, - fix for installation error (Ory) - Left trash code in mx_functions_core.php Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** mx_functions_core.php 22 Jul 2007 20:59:56 -0000 1.51 --- mx_functions_core.php 6 Aug 2007 21:11:42 -0000 1.52 *************** *** 3488,3806 **** } // class mx_request_vars - - class temp - { - - /** - * get_sub_cat. - * - * get all sub category in side certain category - * - used when listing files/articles/links etc - * - * @param unknown_type $cat_id - * @return unknown - */ - function get_sub_cat( $cat_id ) - { - global $mx_root_path, $module_root_path, $is_block, $phpEx; - - $cat_sub = ''; - if ( !empty( $this->subpage_rowset[$cat_id] ) ) - { - $class = "gensmall"; - $init_link_max = ( count( $this->subpage_rowset[$cat_id] ) > 3 ) ? 3 : count( $this->subpage_rowset[$cat_id] ); - $truncate = false; - $i = 0; - foreach( $this->subpage_rowset[$cat_id] as $cat_id => $cat_row ) - { - if ( $this->auth_user[$cat_row['cat_id']]['auth_view'] && ( $cat_row['cat_allow_file'] || !empty( $this->subpage_rowset[$cat_row['cat_id']] ) ) ) - { - $i++; - if ($i > $init_link_max) - { - $truncate = true; - break; - } - $cat_sub .= (!empty($cat_sub) ? '<span class=' . $class . '>, </span>' : '') . '<a href="' . append_sid( $this->this_mxurl( 'action=category&cat_id=' . $cat_row['cat_id'] ) ) . '" class=' . $class . '>' . $cat_row['cat_name'] . '</a>'; - } - /* - else - { - if ( !empty( $this->subpage_rowset[$cat_row['cat_id']] ) ) - { - foreach( $this->subpage_rowset[$cat_row['cat_id']] as $sub_cat_id => $sub_cat_row ) - { - if ( $sub_cat_row['cat_allow_file'] ) - { - $i++; - if ($i > $init_link_max) - { - $truncate = true; - break; - } - $cat_sub .= (!empty($cat_sub) ? '<span class=' . $class . '>, </span>' : '') . '<a href="' . append_sid( $this->this_mxurl( 'action=category&cat_id=' . $sub_cat_row['cat_id'] ) ) . '" class=' . $class . '>' . $sub_cat_row['cat_name'] . '</a>'; - } - } - } - } - */ - } - - if ($truncate) - { - $cat_sub .= '<span class=' . $class . '>, ...</span>'; - } - } - return $cat_sub; - } - - /** - * display_categories. - * - * @param unknown_type $cat_id - */ - function display_categories( $cat_id = PA_ROOT_CAT ) - { - global $db, $pafiledb_template, $lang, $userdata, $phpEx, $images; - global $pafiledb_config, $board_config, $debug; - - if ( $this->cat_empty() ) - { - if ( !$userdata['session_logged_in'] ) - { - $redirect = ( $cat_id != PA_ROOT_CAT ) ? $this->this_mxurl( "action=category&cat_id=$cat_id" ) : $this->this_mxurl(); - redirect( append_sid( "login.$phpEx?redirect=$redirect", true ) ); - } - mx_message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' ); - } - - $pafiledb_template->assign_vars( array( - 'CAT_NAV_SIMPLE' => true, - 'L_SUB_CAT' => $lang['Sub_category'], - 'L_CATEGORY' => $lang['Category'], - 'L_LAST_FILE' => $lang['Last_file'], - 'L_FILES' => $lang['Files'] ) - ); - - // - // Output the categories - // - if ( isset( $this->subpage_rowset[$cat_id] ) ) - { - $catnum = count($this->subpage_rowset[$cat_id]); - $catcol = $pafiledb_config['cat_col'] > 0 ? $pafiledb_config['cat_col'] : 1; - $num_of_rows = intval( $catnum / $catcol ); - - if ( $catnum % $catcol ) - { - $num_of_rows++; - } - - $pafiledb_template->assign_vars( array( 'WIDTH' => 100 / $catcol ) ); - $i = 0; - - foreach( $this->subpage_rowset[$cat_id] as $subcat_id => $subcat_row ) - { - if ( $i == 0 || $i == $catcol) - { - $pafiledb_template->assign_block_vars( 'catcol', array() ); - $i = 0; - } - $i++; - - $last_file_info = array(); - $this->last_item_in_cat( $subcat_id, $last_file_info ); - - if ( !empty( $last_file_info['file_id'] ) && $this->auth_user[$subcat_id]['auth_read'] ) - { - $last_file_time = create_date( $board_config['default_dateformat'], $last_file_info['file_time'], $board_config['board_timezone'] ); - $last_file = $last_file_time . '<br />'; - $last_file_name = ( strlen( stripslashes( $last_file_info['file_name'] ) ) > 20 ) ? substr( stripslashes( $last_file_info['file_name'] ), 0, 20 ) . '...' : stripslashes( $last_file_info['file_name'] ); - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'action=file&file_id=' . $last_file_info['file_id'] ) ) . '" alt="' . stripslashes( $last_file_info['file_name'] ) . '" title="' . stripslashes( $last_file_info['file_name'] ) . '">' . $last_file_name . '</a> '; - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'action=file&file_id=' . $last_file_info['file_id'] ) ) . '"><img src="' . $images['pa_icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_file'] . '" title="' . $lang['View_latest_file'] . '" /></a>'; - } - else - { - $last_file = $lang['No_file']; - } - - $is_new = false; - if ( $this->new_item_in_cat( $subcat_id ) ) - { - $is_new = true; - } - - $sub_cat = $this->get_sub_cat( $subcat_id ); - $pafiledb_template->assign_block_vars( 'catcol.no_cat_parent', array( - 'U_CAT' => append_sid( $this->this_mxurl( 'action=category&cat_id=' . $subcat_id ) ), - 'SUB_CAT' => ( !empty( $sub_cat ) ) ? " $sub_cat" : "", - 'CAT_IMAGE' => ( $is_new ) ? $images['pa_folder_new'] : $images['pa_folder'], - 'CAT_NAME' => $subcat_row['cat_name'], - 'FILECAT' => $this->items_in_cat( $subcat_id ) ) - ); - } - } - } - - /** - * display_categories - original. - * - * @param unknown_type $cat_id - */ - function display_categories_original( $cat_id = PA_ROOT_CAT, $action_name = 'action', $action_default = 'category', $map_xtra = '' ) - { - global $db, $pafiledb_template, $lang, $userdata, $phpEx, $images; - global $pafiledb_config, $board_config, $debug; - global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx; - - if ( $this->cat_empty() ) - { - if ( !$userdata['session_logged_in'] ) - { - $redirect = ( $cat_id != PA_ROOT_CAT ) ? $this->this_mxurl( "$action_name=$action_default&cat_id=$cat_id" ) : $this->this_mxurl(); - redirect( append_sid( "login.$phpEx?redirect=$redirect", true ) ); - } - mx_message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' ); - } - - $pafiledb_template->assign_vars( array( - 'CAT_NAV_STANDARD' => true, - 'L_SUB_CAT' => $lang['Sub_category'], - 'L_CATEGORY' => $lang['Category'], - 'L_LAST_FILE' => $lang['Last_file'], - 'L_FILES' => $lang['Files'] ) - ); - - // - // Category navigation for cat_id that allow files - // - used in cat pages without files - // - if ( isset( $this->subpage_rowset[$cat_id] ) ) - { - foreach( $this->subpage_rowset[$cat_id] as $subcat_id => $subcat_row ) - { - if ( ( $subcat_row['cat_allow_file'] == PA_CAT_ALLOW_FILE ) ) - { - $last_file_info = array(); - $this->last_item_in_cat( $subcat_id, $last_file_info ); - - if ( !empty( $last_file_info['file_id'] ) && $this->auth_user[$subcat_id]['auth_read'] ) - { - $last_file_time = create_date( $board_config['default_dateformat'], $last_file_info['file_time'], $board_config['board_timezone'] ); - $last_file = $last_file_time . '<br />'; - $last_file_name = ( strlen( stripslashes( $last_file_info['file_name'] ) ) > 20 ) ? substr( stripslashes( $last_file_info['file_name'] ), 0, 20 ) . '...' : stripslashes( $last_file_info['file_name'] ); - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'action=file&file_id=' . $last_file_info['file_id'] ) ) . '" alt="' . stripslashes( $last_file_info['file_name'] ) . '" title="' . stripslashes( $last_file_info['file_name'] ) . '">' . $last_file_name . '</a> '; - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'action=file&file_id=' . $last_file_info['file_id'] ) ) . '"><img src="' . $images['pa_icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_file'] . '" title="' . $lang['View_latest_file'] . '" /></a>'; - } - else - { - $last_file = $lang['No_file']; - } - $is_new = false; - - if ( $this->new_item_in_cat( $subcat_id ) ) - { - $is_new = true; - } - - $sub_cat = $this->get_sub_cat( $subcat_id ); - - $pafiledb_template->assign_block_vars( 'no_cat_parent', array( - 'IS_HIGHER_CAT' => false, - 'U_CAT' => append_sid( $this->this_mxurl( "$action_name=$action_default&cat_id=" . $subcat_id . $map_xtra ) ), - 'SUB_CAT' => ( !empty( $sub_cat ) ) ? '<br /><b>' . $lang['Sub_category'] . ': </b>' . $sub_cat : '', - 'CAT_IMAGE' => ( $is_new ) ? $images['pa_folder_new'] : $images['pa_folder'], - 'CAT_NEW_FILE' => ( $is_new ) ? $lang['New_file'] : $lang['No_new_file'], - 'CAT_NAME' => $subcat_row['cat_name'], - 'FILECAT' => $this->items_in_cat( $subcat_id ), - 'LAST_FILE' => $last_file, - 'CAT_DESC' => $subcat_row['cat_desc'] ) - ); - } - } - } - - // - // Category navigation for cat_id that doesn't allow files - // - used in cat pages with files - // - if ( isset( $this->subpage_rowset[$cat_id] ) ) - { - foreach( $this->subpage_rowset[$cat_id] as $subcat_id => $subcat_row ) - { - $total_sub_cat = 0; - if ( isset( $this->subpage_rowset[$subcat_id] ) ) - { - foreach( $this->subpage_rowset[$subcat_id] as $sub_no_cat_id => $sub_no_cat_row ) - { - if ( $sub_no_cat_row['cat_allow_file'] == PA_CAT_ALLOW_FILE ) - { - $sub_page_rowset[$total_sub_cat] = $sub_no_cat_row; - $total_sub_cat++; - } - } - } - - // - // This is a container category - // - if ( ( $subcat_row['cat_allow_file'] != PA_CAT_ALLOW_FILE ) ) - { - if ( $total_sub_cat ) - { - $pafiledb_template->assign_block_vars( 'no_cat_parent', array( - 'IS_HIGHER_CAT' => true, - 'U_CAT' => append_sid( $this->this_mxurl( "$action_name=$action_default&cat_id=" . $subcat_id . $map_xtra) ), - 'CAT_NAME' => $subcat_row['cat_name'] ) - ); - } - - for( $k = 0; $k < $total_sub_cat; $k++ ) - { - $last_file_info = array(); - $this->last_item_in_cat( $sub_page_rowset[$k]['cat_id'], $last_file_info ); - - if ( $sub_page_rowset[$k]['cat_parent'] == $subcat_id ) - { - if ( !empty( $last_file_info['file_id'] ) && $this->auth_user[$sub_page_rowset[$k]['cat_id']]['auth_read'] ) - { - $last_file_time = create_date( $board_config['default_dateformat'], $last_file_info['file_time'], $board_config['board_timezone'] ); - $last_file = $last_file_time . '<br />'; - $last_file_name = ( strlen( $last_file_info['file_name'] ) > 20 ) ? substr( $last_file_info['file_name'], 0, 20 ) . '...' : $last_file_info['file_name']; - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'action=file&file_id=' . $last_file_info['file_id'] ) ) . '">' . $last_file_name . '</a> '; - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'action=file&file_id=' . $last_file_info['file_id'] ) ) . '"><img src="' . $images['pa_icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_file'] . '" title="' . $lang['View_latest_file'] . '" /></a>'; - } - else - { - $last_file = $lang['No_file']; - } - - $is_new = false; - - if ( $this->new_item_in_cat( $sub_page_rowset[$k]['cat_id'] ) ) - { - $is_new = true; - } - - $sub_cat = $this->get_sub_cat( $sub_page_rowset[$k]['cat_id'] ); - - $pafiledb_template->assign_block_vars( 'no_cat_parent', array( - 'IS_HIGHER_CAT' => false, - 'U_CAT' => append_sid( $this->this_mxurl( "$action_name=$action_default&cat_id=" . $sub_page_rowset[$k]['cat_id'] . $map_xtra ) ), - 'SUB_CAT' => ( !empty( $sub_cat ) ) ? '<br /><b>' . $lang['Sub_category'] . ': </b>' . $sub_cat : '', - 'CAT_IMAGE' => ( $is_new ) ? $images['pa_folder_new'] : $images['pa_folder'], - 'CAT_NEW_FILE' => ( $is_new ) ? $lang['New_file'] : $lang['No_new_file'], - 'CAT_NAME' => $sub_page_rowset[$k]['cat_name'], - 'FILECAT' => $this->items_in_cat( $sub_page_rowset[$k]['cat_id'] ), - 'LAST_FILE' => $last_file, - 'CAT_DESC' => $sub_page_rowset[$k]['cat_desc'] ) - ); - } // Have a permission to view the category - } // It is not parent category - } - } - } //higher Category - } - } - ?> --- 3488,3490 ---- Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** mx_functions_admincp.php 21 Jul 2007 23:07:15 -0000 1.38 --- mx_functions_admincp.php 6 Aug 2007 21:11:42 -0000 1.39 *************** *** 3127,3130 **** --- 3127,3131 ---- case 'mysql': case 'mysql4': + case 'mysqli': $value_sql .= ( ( $value_sql != '' ) ? ', ' : '' ) . '(\'' . $word[$i] . '\', 0)'; break; *************** *** 3151,3154 **** --- 3152,3156 ---- case 'mysql': case 'mysql4': + case 'mysqli': $sql = "INSERT IGNORE INTO " . $search_word_table . " (word_text, word_common) VALUES $value_sql"; *************** *** 3216,3219 **** --- 3218,3222 ---- case 'mysql': case 'mysql4': + case 'mysqli': $sql = "SELECT word_id FROM " . $search_match_table . " |
Update of /cvsroot/mxbb/core/includes/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23437/db Modified Files: dbal.php firebird.php mssql.php mssql_odbc.php mysql.php mysql4.php mysqli.php oracle.php postgres.php sqlite.php Log Message: Updating core dp api Minor fix for notifications Index: mysqli.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysqli.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mysqli.php 30 Jan 2007 16:26:07 -0000 1.7 --- mysqli.php 6 Aug 2007 20:07:04 -0000 1.8 *************** *** 279,282 **** --- 279,307 ---- /** + * Build LIKE expression + * @access private + */ + function _sql_like_expression($expression) + { + return $expression; + } + + /** + * Build db-specific query data + * @access private + */ + function _sql_custom_build($stage, $data) + { + switch ($stage) + { + case 'FROM': + $data = '(' . $data . ')'; + break; + } + + return $data; + } + + /** * Escape string used in sql query */ Index: sqlite.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/sqlite.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sqlite.php 30 Jan 2007 16:26:07 -0000 1.7 --- sqlite.php 6 Aug 2007 20:07:05 -0000 1.8 *************** *** 277,280 **** --- 277,289 ---- /** + * Build db-specific query data + * @access private + */ + function _sql_custom_build($stage, $data) + { + return $data; + } + + /** * return sql error array * @private Index: postgres.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/postgres.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** postgres.php 30 Jan 2007 16:26:07 -0000 1.7 --- postgres.php 6 Aug 2007 20:07:05 -0000 1.8 *************** *** 342,345 **** --- 342,363 ---- /** + * Build LIKE expression + * @access private + */ + function _sql_like_expression($expression) + { + return $expression; + } + + /** + * Build db-specific query data + * @access private + */ + function _sql_custom_build($stage, $data) + { + return $data; + } + + /** * return sql error array * @private Index: mysql4.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql4.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mysql4.php 30 Jan 2007 16:26:07 -0000 1.7 --- mysql4.php 6 Aug 2007 20:07:04 -0000 1.8 *************** *** 298,301 **** --- 298,326 ---- /** + * Build LIKE expression + * @access private + */ + function _sql_like_expression($expression) + { + return $expression; + } + + /** + * Build db-specific query data + * @access private + */ + function _sql_custom_build($stage, $data) + { + switch ($stage) + { + case 'FROM': + $data = '(' . $data . ')'; + break; + } + + return $data; + } + + /** * return sql error array * @private Index: firebird.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/firebird.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** firebird.php 30 Jan 2007 16:26:06 -0000 1.7 --- firebird.php 6 Aug 2007 20:07:04 -0000 1.8 *************** *** 338,341 **** --- 338,359 ---- /** + * Build LIKE expression + * @access private + */ + function _sql_like_expression($expression) + { + return $expression . " ESCAPE '\\'"; + } + + /** + * Build db-specific query data + * @access private + */ + function _sql_custom_build($stage, $data) + { + return $data; + } + + /** * Close sql connection * @private Index: mssql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mssql.php 30 Jan 2007 16:26:07 -0000 1.7 --- mssql.php 6 Aug 2007 20:07:04 -0000 1.8 *************** *** 325,328 **** --- 325,345 ---- } + * Build LIKE expression + * @access private + */ + function _sql_like_expression($expression) + { + return $expression . " ESCAPE '\\'"; + } + + /** + * Build db-specific query data + * @access private + */ + function _sql_custom_build($stage, $data) + { + return $data; + } + /** * Close sql connection Index: mysql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mysql.php 10 Jun 2007 21:23:34 -0000 1.7 --- mysql.php 6 Aug 2007 20:07:04 -0000 1.8 *************** *** 315,318 **** --- 315,343 ---- /** + * Build LIKE expression + * @access private + */ + function _sql_like_expression($expression) + { + return $expression; + } + + /** + * Build db-specific query data + * @access private + */ + function _sql_custom_build($stage, $data) + { + switch ($stage) + { + case 'FROM': + $data = '(' . $data . ')'; + break; + } + + return $data; + } + + /** * Close sql connection * @private Index: dbal.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/dbal.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dbal.php 30 Jan 2007 16:26:06 -0000 1.5 --- dbal.php 6 Aug 2007 20:07:03 -0000 1.6 *************** *** 58,61 **** --- 58,79 ---- /** + * Build LIMIT query + * Doing some validation here. + */ + function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) + { + if (empty($query)) + { + return false; + } + + // Never use a negative total or offset + $total = ($total < 0) ? 0 : $total; + $offset = ($offset < 0) ? 0 : $offset; + + return $this->_sql_query_limit($query, $total, $offset, $cache_ttl); + } + + /** * DBAL garbage collection, close sql connection */ *************** *** 200,203 **** --- 218,392 ---- /** + * Build IN or NOT IN sql comparison string, uses <> or = on single element + * arrays to improve comparison speed + * + * @access public + * @param string $field name of the sql column that shall be compared + * @param array $array array of values that are allowed (IN) or not allowed (NOT IN) + * @param bool $negate true for NOT IN (), false for IN () (default) + * @param bool $allow_empty_set If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false. + */ + function sql_in_set($field, $array, $negate = false, $allow_empty_set = false) + { + if (!sizeof($array)) + { + if (!$allow_empty_set) + { + // Print the backtrace to help identifying the location of the problematic code + $this->sql_error('No values specified for SQL IN comparison'); + } + else + { + // NOT IN () actually means everything so use a tautology + if ($negate) + { + return '1=1'; + } + // IN () actually means nothing so use a contradiction + else + { + return '1=0'; + } + } + } + + if (!is_array($array)) + { + $array = array($array); + } + + if (sizeof($array) == 1) + { + @reset($array); + $var = current($array); + + return $field . ($negate ? ' <> ' : ' = ') . $this->_sql_validate_value($var); + } + else + { + return $field . ($negate ? ' NOT IN ' : ' IN ') . '(' . implode(', ', array_map(array($this, '_sql_validate_value'), $array)) . ')'; + } + } + + + /** + * Run more than one insert statement. + * + * @param string $table table name to run the statements on + * @param array &$sql_ary multi-dimensional array holding the statement data. + * + * @return bool false if no statements were executed. + * @access public + */ + function sql_multi_insert($table, &$sql_ary) + { + if (!sizeof($sql_ary)) + { + return false; + } + + if ($this->multi_insert) + { + $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('MULTI_INSERT', $sql_ary)); + } + else + { + foreach ($sql_ary as $ary) + { + if (!is_array($ary)) + { + return false; + } + + $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary)); + } + } + + return true; + } + + /** + * Function for validating values + * @access private + */ + function _sql_validate_value($var) + { + if (is_null($var)) + { + return 'NULL'; + } + else if (is_string($var)) + { + return "'" . $this->sql_escape($var) . "'"; + } + else + { + return (is_bool($var)) ? intval($var) : $var; + } + } + + /** + * Build sql statement from array for select and select distinct statements + * + * Possible query values: SELECT, SELECT_DISTINCT + */ + function sql_build_query($query, $array) + { + $sql = ''; + switch ($query) + { + case 'SELECT': + case 'SELECT_DISTINCT'; + + $sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM '; + + $table_array = array(); + foreach ($array['FROM'] as $table_name => $alias) + { + if (is_array($alias)) + { + foreach ($alias as $multi_alias) + { + $table_array[] = $table_name . ' ' . $multi_alias; + } + } + else + { + $table_array[] = $table_name . ' ' . $alias; + } + } + + $sql .= $this->_sql_custom_build('FROM', implode(', ', $table_array)); + + if (!empty($array['LEFT_JOIN'])) + { + foreach ($array['LEFT_JOIN'] as $join) + { + $sql .= ' LEFT JOIN ' . key($join['FROM']) . ' ' . current($join['FROM']) . ' ON (' . $join['ON'] . ')'; + } + } + + if (!empty($array['WHERE'])) + { + $sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']); + } + + if (!empty($array['GROUP_BY'])) + { + $sql .= ' GROUP BY ' . $array['GROUP_BY']; + } + + if (!empty($array['ORDER_BY'])) + { + $sql .= ' ORDER BY ' . $array['ORDER_BY']; + } + + break; + } + + return $sql; + } + + /** * display sql error page */ *************** *** 226,230 **** // If error occurs in initiating the session we need to use a pre-defined language string // This could happen if the connection could not be established for example (then we are not able to grab the default language) ! if (!isset($user->lang['SQL_ERROR_OCCURRED'])) { $message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persist.'; --- 415,419 ---- // If error occurs in initiating the session we need to use a pre-defined language string // This could happen if the connection could not be established for example (then we are not able to grab the default language) ! if (!isset($mx_user->_lang['An_error_occured'])) { $message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persist.'; *************** *** 232,236 **** else { ! $message .= '<br /><br />' . $user->lang['SQL_ERROR_OCCURRED']; } } --- 421,425 ---- else { ! $message .= '<br /><br />' . $mx_user->_lang['An_error_occured']; } } Index: oracle.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/oracle.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** oracle.php 30 Jan 2007 16:26:07 -0000 1.7 --- oracle.php 6 Aug 2007 20:07:05 -0000 1.8 *************** *** 363,366 **** --- 363,380 ---- /** + * Build LIKE expression + * @access private + */ + function _sql_like_expression($expression) + { + return $expression . " ESCAPE '\\'"; + } + + function _sql_custom_build($stage, $data) + { + return $data; + } + + /** * return sql error array * @private Index: mssql_odbc.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql_odbc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mssql_odbc.php 30 Jan 2007 16:26:07 -0000 1.7 --- mssql_odbc.php 6 Aug 2007 20:07:04 -0000 1.8 *************** *** 330,333 **** --- 330,350 ---- } + * Build LIKE expression + * @access private + */ + function _sql_like_expression($expression) + { + return $expression . " ESCAPE '\\'"; + } + + /** + * Build db-specific query data + * @access private + */ + function _sql_custom_build($stage, $data) + { + return $data; + } + /** * Close sql connection |
|
From: Jon O. <jon...@us...> - 2007-08-06 20:07:08
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23437 Modified Files: mx_functions_tools.php Log Message: Updating core dp api Minor fix for notifications Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mx_functions_tools.php 5 Aug 2007 22:07:27 -0000 1.14 --- mx_functions_tools.php 6 Aug 2007 20:07:05 -0000 1.15 *************** *** 2059,2062 **** --- 2059,2063 ---- case MX_EDITED_NOTIFICATION: + $this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title']; $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_edited']; $this->message = $this->langs['notify_edited_body'] . "\n\n" . $this->auto_message_update . $this->auto_message; |
|
From: Jon O. <jon...@us...> - 2007-08-06 19:59:37
|
Update of /cvsroot/mxbb/core/docs/images In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20163/images Removed Files: cellpic1.gif cellpic2.jpg cellpic3.gif li_bullet_blue.gif li_folders.gif li_small_arrow_right_black.gif li_small_arrow_right_blue.gif li_small_square_black.gif mxbb-portal.gif spacer.gif Log Message: Removing old doc --- li_folders.gif DELETED --- --- spacer.gif DELETED --- --- li_small_square_black.gif DELETED --- --- li_small_arrow_right_blue.gif DELETED --- --- li_bullet_blue.gif DELETED --- --- cellpic1.gif DELETED --- --- cellpic3.gif DELETED --- --- mxbb-portal.gif DELETED --- --- li_small_arrow_right_black.gif DELETED --- --- cellpic2.jpg DELETED --- |
|
From: Jon O. <jon...@us...> - 2007-08-06 19:59:35
|
Update of /cvsroot/mxbb/core/docs/css In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20163/css Removed Files: subSilver.css Log Message: Removing old doc --- subSilver.css DELETED --- |
|
From: Jon O. <jon...@us...> - 2007-08-06 19:59:24
|
Update of /cvsroot/mxbb/core/docs/chapters/introduction In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20141/chapters/introduction Removed Files: introduction.html Log Message: Removing old doc --- introduction.html DELETED --- |
|
From: Jon O. <jon...@us...> - 2007-08-06 19:59:24
|
Update of /cvsroot/mxbb/core/docs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20141 Removed Files: doc_navigate.html index.html main_doc_index.html Log Message: Removing old doc --- index.html DELETED --- --- doc_navigate.html DELETED --- --- main_doc_index.html DELETED --- |
|
From: Jon O. <jon...@us...> - 2007-08-06 19:46:17
|
Update of /cvsroot/mxbb/core/install/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14258 Modified Files: mx_install_body.tpl Log Message: hiding the acp switch Index: mx_install_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_install_body.tpl 6 Aug 2007 19:33:28 -0000 1.3 --- mx_install_body.tpl 6 Aug 2007 19:46:10 -0000 1.4 *************** *** 47,54 **** --- 47,56 ---- <td class="row2"><input type="text" name="mx_prefix" value="{MX_DB_PREFIX}" /></td> </tr> + <!-- <tr> <td class="row1" align="right"><span class="gen"><b>{L_ACM_TYPE}: </b></span></td> <td class="row2"><input type="text" name="acm_type" value="{ACM_TYPE}" /></td> </tr> + --> <tr> <th colspan="2">{L_PORTAL_CONFIGURATION}</th> |
|
From: Jon O. <jon...@us...> - 2007-08-06 19:33:33
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8536/includes Added Files: functions_install.php Log Message: Updating all install routines. --- NEW FILE: functions_install.php --- <?php /** * * @package mxBB Installation * @version $Id: functions_install.php,v 1.1 2007/08/06 19:33:28 jonohlsson Exp $ * @copyright (c) 2006 phpBB Group * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ /* * * Dealing with template header/footer... */ function page_header_install($title, $instruction_text = '') { global $template, $lang, $mx_root_path, $mx_portal_name, $mx_portal_version; [...1269 lines suppressed...] // // When the PHP realpath function is disabled it returns false and generates a message like: // // Warning: realpath (and maybe other functions) has been disabled for security reasons in // path-to-your/install/mx_install.php on line XXX // // This "security" measure seems somehow stupid since information of the filesystem layout // can be easily retrieved from PHP (and Apache) global variables ...as well as from the // same PHP generated warning message! :P // // Just wanted to mention I already saw the phpBB guys also created their own phpbb_realpath // function (in includes/functions.php). I never understood why they did it. Only if they // had documented the correct reason in their source code. ;-) // function mx_realpath($path) { return ( @function_exists('realpath') && @realpath(__FILE__) ? realpath($path) : $path ); } ?> |
|
From: Jon O. <jon...@us...> - 2007-08-06 19:33:31
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8536 Modified Files: mx_install.php Log Message: Updating all install routines. Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** mx_install.php 22 Jul 2007 22:28:59 -0000 1.78 --- mx_install.php 6 Aug 2007 19:33:27 -0000 1.79 *************** *** 30,34 **** // ! // Set mxBB-Portal version here! // $mx_portal_name = 'mxBB-Portal'; --- 30,34 ---- // ! // Set mxBB-Portal version here ! // [...999 lines suppressed...] - // same PHP generated warning message! :P - // - // Just wanted to mention I already saw the phpBB guys also created their own phpbb_realpath - // function (in includes/functions.php). I never understood why they did it. Only if they - // had documented the correct reason in their source code. ;-) - // - function mx_realpath($path) - { - return ( @function_exists('realpath') && @realpath(__FILE__) ? realpath($path) : $path ); - } - ?> \ No newline at end of file --- 1005,1009 ---- // ================================================================================ ! // MAIN PROCEDURE ENDS HERE. // ================================================================================ ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2007-08-06 19:33:31
|
Update of /cvsroot/mxbb/core/install/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8536/templates Modified Files: mx_install_body.tpl Log Message: Updating all install routines. Index: mx_install_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_install_body.tpl 8 Mar 2005 07:04:25 -0000 1.2 --- mx_install_body.tpl 6 Aug 2007 19:33:28 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- pathinfo[i]['dbpasswd'] = '{datarow.DB_PASSWD}'; pathinfo[i]['prefix'] = '{datarow.DB_PREFIX}'; + pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; pathinfo[i]['phpbb_root_path'] = '{datarow.PHPBB_ROOT}'; i++; *************** *** 47,50 **** --- 48,55 ---- </tr> <tr> + <td class="row1" align="right"><span class="gen"><b>{L_ACM_TYPE}: </b></span></td> + <td class="row2"><input type="text" name="acm_type" value="{ACM_TYPE}" /></td> + </tr> + <tr> <th colspan="2">{L_PORTAL_CONFIGURATION}</th> </tr> |
Update of /cvsroot/mxbb/core/install/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1025 Modified Files: mssql.php mysql.php mysql4.php postgres7.php Added Files: db2.php index.htm msaccess.php mssql-odbc.php mysqli.php Log Message: Updating the install db api. --- NEW FILE: mysqli.php --- <?php /** * * @package mxBB Installation * @version $Id: mysqli.php,v 1.1 2007/08/06 19:16:19 jonohlsson Exp $ * @copyright (c) 2001 phpBB Group * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ if(!defined("SQL_LAYER")) { define("SQL_LAYER","mysqli"); class sql_db { var $db_connect_id; var $query_result; var $row = array(); var $rowset = array(); var $num_queries = 0; var $in_transaction = 0; // // Constructor // function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { $this->persistency = $persistency; $this->user = $sqluser; $this->password = $sqlpassword; $this->server = $sqlserver; $this->dbname = $database; $this->db_connect_id = ($this->persistency) ? mysql_pconnect($this->server, $this->user, $this->password) : mysql_connect($this->server, $this->user, $this->password); if( $this->db_connect_id ) { if( $database != "" ) { $this->dbname = $database; $dbselect = mysql_select_db($this->dbname); if( !$dbselect ) { mysql_close($this->db_connect_id); $this->db_connect_id = $dbselect; } } return $this->db_connect_id; } else { return false; } } // // Other base methods // function sql_close() { if( $this->db_connect_id ) { // // Commit any remaining transactions // if( $this->in_transaction ) { mysql_query("COMMIT", $this->db_connect_id); } return mysql_close($this->db_connect_id); } else { return false; } } // // Base query method // function sql_query($query = "", $transaction = FALSE) { // // Remove any pre-existing queries // unset($this->query_result); if( $query != "" ) { $this->num_queries++; if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) { $result = mysql_query("BEGIN", $this->db_connect_id); if(!$result) { return false; } $this->in_transaction = TRUE; } $this->query_result = mysql_query($query, $this->db_connect_id); } else { if( $transaction == END_TRANSACTION && $this->in_transaction ) { $result = mysql_query("COMMIT", $this->db_connect_id); } } if( $this->query_result ) { unset($this->row[$this->query_result]); unset($this->rowset[$this->query_result]); if( $transaction == END_TRANSACTION && $this->in_transaction ) { $this->in_transaction = FALSE; if ( !mysql_query("COMMIT", $this->db_connect_id) ) { mysql_query("ROLLBACK", $this->db_connect_id); return false; } } return $this->query_result; } else { if( $this->in_transaction ) { mysql_query("ROLLBACK", $this->db_connect_id); $this->in_transaction = FALSE; } return false; } } // // Other query methods // function sql_numrows($query_id = 0) { if( !$query_id ) { $query_id = $this->query_result; } return ( $query_id ) ? mysql_num_rows($query_id) : false; } function sql_affectedrows() { return ( $this->db_connect_id ) ? mysql_affected_rows($this->db_connect_id) : false; } function sql_numfields($query_id = 0) { if( !$query_id ) { $query_id = $this->query_result; } return ( $query_id ) ? mysql_num_fields($query_id) : false; } function sql_fieldname($offset, $query_id = 0) { if( !$query_id ) { $query_id = $this->query_result; } return ( $query_id ) ? mysql_field_name($query_id, $offset) : false; } function sql_fieldtype($offset, $query_id = 0) { if( !$query_id ) { $query_id = $this->query_result; } return ( $query_id ) ? mysql_field_type($query_id, $offset) : false; } function sql_fetchrow($query_id = 0) { if( !$query_id ) { $query_id = $this->query_result; } if( $query_id ) { $this->row[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC); return $this->row[$query_id]; } else { return false; } } function sql_fetchrowset($query_id = 0) { if( !$query_id ) { $query_id = $this->query_result; } if( $query_id ) { unset($this->rowset[$query_id]); unset($this->row[$query_id]); while($this->rowset[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC)) { $result[] = $this->rowset[$query_id]; } return $result; } else { return false; } } function sql_fetchfield($field, $rownum = -1, $query_id = 0) { if( !$query_id ) { $query_id = $this->query_result; } if( $query_id ) { if( $rownum > -1 ) { $result = mysql_result($query_id, $rownum, $field); } else { if( empty($this->row[$query_id]) && empty($this->rowset[$query_id]) ) { if( $this->sql_fetchrow() ) { $result = $this->row[$query_id][$field]; } } else { if( $this->rowset[$query_id] ) { $result = $this->rowset[$query_id][0][$field]; } else if( $this->row[$query_id] ) { $result = $this->row[$query_id][$field]; } } } return $result; } else { return false; } } function sql_rowseek($rownum, $query_id = 0) { if( !$query_id ) { $query_id = $this->query_result; } return ( $query_id ) ? mysql_data_seek($query_id, $rownum) : false; } function sql_nextid() { return ( $this->db_connect_id ) ? mysql_insert_id($this->db_connect_id) : false; } function sql_freeresult($query_id = 0) { if( !$query_id ) { $query_id = $this->query_result; } if ( $query_id ) { unset($this->row[$query_id]); unset($this->rowset[$query_id]); mysql_free_result($query_id); return true; } else { return false; } } function sql_error() { $result['message'] = mysql_error($this->db_connect_id); $result['code'] = mysql_errno($this->db_connect_id); return $result; } } // class sql_db } // if ... define ?> Index: mysql4.php =================================================================== RCS file: /cvsroot/mxbb/core/install/db/mysql4.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mysql4.php 5 May 2007 20:40:25 -0000 1.2 --- mysql4.php 6 Aug 2007 19:16:19 -0000 1.3 *************** *** 4,7 **** --- 4,8 ---- * @package mxBB Installation * @version $Id$ + * @copyright (c) 2001 phpBB Group * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 *************** *** 10,19 **** */ ! if(!defined("SQL_LAYER_mysql4")) { ! define("SQL_LAYER_mysql4","mysql4"); ! class sql_db_mysql4 { --- 11,20 ---- */ ! if(!defined("SQL_LAYER")) { ! define("SQL_LAYER","mysql4"); ! class sql_db { *************** *** 28,32 **** // Constructor // ! function sql_db_mysql4($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { $this->persistency = $persistency; --- 29,33 ---- // Constructor // ! function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { $this->persistency = $persistency; *************** *** 262,266 **** if( $this->rowset[$query_id] ) { ! $result = $this->rowset[$query_id][$field]; } else if( $this->row[$query_id] ) --- 263,267 ---- if( $this->rowset[$query_id] ) { ! $result = $this->rowset[$query_id][0][$field]; } else if( $this->row[$query_id] ) --- NEW FILE: msaccess.php --- <?php /** * * @package mxBB Installation * @version $Id: msaccess.php,v 1.1 2007/08/06 19:16:19 jonohlsson Exp $ * @copyright (c) 2001 phpBB Group * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ if(!defined("SQL_LAYER")) { define("SQL_LAYER","msaccess"); class sql_db { var $db_connect_id; var $result_ids = array(); var $result; var $next_id; var $num_rows = array(); var $current_row = array(); var $field_names = array(); var $field_types = array(); var $result_rowset = array(); var $num_queries = 0; // // Constructor // function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { $this->persistency = $persistency; $this->server = $sqlserver; $this->user = $sqluser; $this->password = $sqlpassword; $this->dbname = $database; $this->db_connect_id = ($this->persistency) ? odbc_pconnect($this->server, $this->user, $this->password) : odbc_connect($this->server, $this->user, $this->password); return ( $this->db_connect_id ) ? $this->db_connect_id : false; } // // Other base methods // function sql_close() { if($this->db_connect_id) { if( $this->in_transaction ) { @odbc_commit($this->db_connect_id); } if( count($this->result_rowset) ) { unset($this->result_rowset); unset($this->field_names); unset($this->field_types); unset($this->num_rows); unset($this->current_row); } return @odbc_close($this->db_connect_id); } else { return false; } } // // Query method // function sql_query($query = "", $transaction = FALSE) { if( $query != "" ) { $this->num_queries++; if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) { if( !odbc_autocommit($this->db_connect_id, false) ) { return false; } $this->in_transaction = TRUE; } $query = str_replace("LOWER(", "LCASE(", $query); if( preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits) ) { $query = $limits[1]; if( !empty($limits[2]) ) { $row_offset = ( $limits[4] ) ? $limits[3] : ""; $num_rows = ( $limits[4] ) ? $limits[4] : $limits[3]; $query = "TOP " . ( $row_offset + $num_rows ) . $query; } $this->result = odbc_exec($this->db_connect_id, "SELECT $query"); if( $this->result ) { if( empty($this->field_names[$this->result]) ) { for($i = 1; $i < odbc_num_fields($this->result) + 1; $i++) { $this->field_names[$this->result][] = odbc_field_name($this->result, $i); $this->field_types[$this->result][] = odbc_field_type($this->result, $i); } } $this->current_row[$this->result] = 0; $this->result_rowset[$this->result] = array(); $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1; $row_outer_max = ( isset($num_rows) ) ? $row_offset + $num_rows + 1 : 1E9; $row_inner = 0; while( odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max ) { for($j = 0; $j < count($this->field_names[$this->result]); $j++) { $this->result_rowset[$this->result][$row_inner][$this->field_names[$this->result][$j]] = stripslashes(odbc_result($this->result, $j + 1)); } $row_outer++; $row_inner++; } $this->num_rows[$this->result] = count($this->result_rowset[$this->result]); odbc_free_result($this->result); } } else if( eregi("^INSERT ", $query) ) { $this->result = odbc_exec($this->db_connect_id, $query); if( $this->result ) { $result_id = odbc_exec($this->db_connect_id, "SELECT @@IDENTITY"); if( $result_id ) { if( odbc_fetch_row($result_id) ) { $this->next_id[$this->db_connect_id] = odbc_result($result_id, 1); $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result); } } } } else { $this->result = odbc_exec($this->db_connect_id, $query); if( $this->result ) { $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result); } } if( !$this->result ) { if( $this->in_transaction ) { odbc_rollback($this->db_connect_id); odbc_autocommit($this->db_connect_id, true); $this->in_transaction = FALSE; } return false; } if( $transaction == END_TRANSACTION && $this->in_transaction ) { $this->in_transaction = FALSE; if ( !@odbc_commit($this->db_connect_id) ) { odbc_rollback($this->db_connect_id); odbc_autocommit($this->db_connect_id, true); return false; } odbc_autocommit($this->db_connect_id, true); } return $this->result; } else { if( $transaction == END_TRANSACTION && $this->in_transaction ) { $this->in_transaction = FALSE; if ( !@odbc_commit($this->db_connect_id) ) { odbc_rollback($this->db_connect_id); odbc_autocommit($this->db_connect_id, true); return false; } odbc_autocommit($this->db_connect_id, true); } return true; } } // // Other query methods // function sql_numrows($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } return ( $query_id ) ? $this->num_rows[$query_id] : false; } function sql_numfields($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } return ( $query_id ) ? count($this->field_names[$query_id]) : false; } function sql_fieldname($offset, $query_id = 0) { if( !$query_id ) { $query_id = $this->result; } return ( $query_id ) ? $this->field_names[$query_id][$offset] : false; } function sql_fieldtype($offset, $query_id = 0) { if( !$query_id ) { $query_id = $this->result; } return ( $query_id ) ? $this->field_types[$query_id][$offset] : false; } function sql_fetchrow($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } if( $query_id ) { return ( $this->num_rows[$query_id] && $this->current_row[$query_id] < $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id][$this->current_row[$query_id]++] : false; } else { return false; } } function sql_fetchrowset($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } if( $query_id ) { return ( $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id] : false; } else { return false; } } function sql_fetchfield($field, $row = -1, $query_id = 0) { if( !$query_id ) { $query_id = $this->result; } if( $query_id ) { if( $row < $this->num_rows[$query_id] ) { $getrow = ($row == -1) ? $this->current_row[$query_id] - 1 : $row; return $this->result_rowset[$query_id][$getrow][$this->field_names[$query_id][$field]]; } else { return false; } } else { return false; } } function sql_rowseek($offset, $query_id = 0) { if( !$query_id ) { $query_id = $this->result; } if( $query_id ) { $this->current_row[$query_id] = $offset - 1; return true; } else { return false; } } function sql_nextid() { return ( $this->next_id[$this->db_connect_id] ) ? $this->next_id[$this->db_connect_id] : false; } function sql_affectedrows() { return ( $this->affected_rows[$this->db_connect_id] ) ? $this->affected_rows[$this->db_connect_id] : false; } function sql_freeresult($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } unset($this->num_rows[$query_id]); unset($this->current_row[$query_id]); unset($this->result_rowset[$query_id]); unset($this->field_names[$query_id]); unset($this->field_types[$query_id]); return true; } function sql_error() { $error['code'] = "";//odbc_error($this->db_connect_id); $error['message'] = "Error";//odbc_errormsg($this->db_connect_id); return $error; } } // class sql_db } // if ... define ?> --- NEW FILE: mssql-odbc.php --- <?php /** * * @package mxBB Installation * @version $Id: mssql-odbc.php,v 1.1 2007/08/06 19:16:19 jonohlsson Exp $ * @copyright (c) 2001 phpBB Group * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ if(!defined("SQL_LAYER")) { define("SQL_LAYER","mssql-odbc"); class sql_db { var $db_connect_id; var $result; var $next_id; var $num_rows = array(); var $current_row = array(); var $field_names = array(); var $field_types = array(); var $result_rowset = array(); var $num_queries = 0; // // Constructor // function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { $this->persistency = $persistency; $this->server = $sqlserver; $this->user = $sqluser; $this->password = $sqlpassword; $this->dbname = $database; $this->db_connect_id = ($this->persistency) ? odbc_pconnect($this->server, $this->user, $this->password) : odbc_connect($this->server, $this->user, $this->password); return ( $this->db_connect_id ) ? $this->db_connect_id : false; } // // Other base methods // function sql_close() { if($this->db_connect_id) { if( $this->in_transaction ) { @odbc_commit($this->db_connect_id); } if( count($this->result_rowset) ) { unset($this->result_rowset); unset($this->field_names); unset($this->field_types); unset($this->num_rows); unset($this->current_row); } return @odbc_close($this->db_connect_id); } else { return false; } } // // Query method // function sql_query($query = "", $transaction = FALSE) { if( $query != "" ) { $this->num_queries++; if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) { if( !odbc_autocommit($this->db_connect_id, false) ) { return false; } $this->in_transaction = TRUE; } if( preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits) ) { $query = $limits[1]; if( !empty($limits[2]) ) { $row_offset = ( $limits[4] ) ? $limits[3] : ""; $num_rows = ( $limits[4] ) ? $limits[4] : $limits[3]; $query = "TOP " . ( $row_offset + $num_rows ) . $query; } $this->result = odbc_exec($this->db_connect_id, "SELECT $query"); if( $this->result ) { if( empty($this->field_names[$this->result]) ) { for($i = 1; $i < odbc_num_fields($this->result) + 1; $i++) { $this->field_names[$this->result][] = odbc_field_name($this->result, $i); $this->field_types[$this->result][] = odbc_field_type($this->result, $i); } } $this->current_row[$this->result] = 0; $this->result_rowset[$this->result] = array(); $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1; $row_outer_max = ( isset($num_rows) ) ? $row_offset + $num_rows + 1 : 1E9; $row_inner = 0; while( odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max ) { for($j = 0; $j < count($this->field_names[$this->result]); $j++) { $this->result_rowset[$this->result][$row_inner][$this->field_names[$this->result][$j]] = stripslashes(odbc_result($this->result, $j + 1)); } $row_outer++; $row_inner++; } $this->num_rows[$this->result] = count($this->result_rowset[$this->result]); } } else if( eregi("^INSERT ", $query) ) { $this->result = odbc_exec($this->db_connect_id, $query); if( $this->result ) { $result_id = odbc_exec($this->db_connect_id, "SELECT @@IDENTITY"); if( $result_id ) { if( odbc_fetch_row($result_id) ) { $this->next_id[$this->db_connect_id] = odbc_result($result_id, 1); $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result); } } } } else { $this->result = odbc_exec($this->db_connect_id, $query); if( $this->result ) { $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result); } } if( !$this->result ) { if( $this->in_transaction ) { odbc_rollback($this->db_connect_id); odbc_autocommit($this->db_connect_id, true); $this->in_transaction = FALSE; } return false; } if( $transaction == END_TRANSACTION && $this->in_transaction ) { $this->in_transaction = FALSE; if ( !odbc_commit($this->db_connect_id) ) { odbc_rollback($this->db_connect_id); odbc_autocommit($this->db_connect_id, true); return false; } odbc_autocommit($this->db_connect_id, true); } odbc_free_result($this->result); return $this->result; } else { if( $transaction == END_TRANSACTION && $this->in_transaction ) { $this->in_transaction = FALSE; if ( !@odbc_commit($this->db_connect_id) ) { odbc_rollback($this->db_connect_id); odbc_autocommit($this->db_connect_id, true); return false; } odbc_autocommit($this->db_connect_id, true); } return true; } } // // Other query methods // function sql_numrows($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } return ( $query_id ) ? $this->num_rows[$query_id] : false; } function sql_numfields($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } return ( $query_id ) ? count($this->field_names[$query_id]) : false; } function sql_fieldname($offset, $query_id = 0) { if( !$query_id ) { $query_id = $this->result; } return ( $query_id ) ? $this->field_names[$query_id][$offset] : false; } function sql_fieldtype($offset, $query_id = 0) { if( !$query_id ) { $query_id = $this->result; } return ( $query_id ) ? $this->field_types[$query_id][$offset] : false; } function sql_fetchrow($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } if( $query_id ) { return ( $this->num_rows[$query_id] && $this->current_row[$query_id] < $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id][$this->current_row[$query_id]++] : false; } else { return false; } } function sql_fetchrowset($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } if( $query_id ) { return ( $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id] : false; } else { return false; } } function sql_fetchfield($field, $row = -1, $query_id = 0) { if( !$query_id ) { $query_id = $this->result; } if( $query_id ) { if( $row < $this->num_rows[$query_id] ) { $getrow = ( $row == -1 ) ? $this->current_row[$query_id] - 1 : $row; return $this->result_rowset[$query_id][$getrow][$this->field_names[$query_id][$field]]; } else { return false; } } else { return false; } } function sql_rowseek($offset, $query_id = 0) { if( !$query_id ) { $query_id = $this->result; } if( $query_id ) { $this->current_row[$query_id] = $offset - 1; return true; } else { return false; } } function sql_nextid() { return ( $this->next_id[$this->db_connect_id] ) ? $this->next_id[$this->db_connect_id] : false; } function sql_affectedrows() { return ( $this->affected_rows[$this->db_connect_id] ) ? $this->affected_rows[$this->db_connect_id] : false; } function sql_freeresult($query_id = 0) { if( !$query_id ) { $query_id = $this->result; } unset($this->num_rows[$query_id]); unset($this->current_row[$query_id]); unset($this->result_rowset[$query_id]); unset($this->field_names[$query_id]); unset($this->field_types[$query_id]); return true; } function sql_error() { $error['code'] = odbc_error($this->db_connect_id); $error['message'] = odbc_errormsg($this->db_connect_id); return $error; } } // class sql_db } // if ... define ?> Index: mssql.php =================================================================== RCS file: /cvsroot/mxbb/core/install/db/mssql.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mssql.php 5 May 2007 20:40:25 -0000 1.3 --- mssql.php 6 Aug 2007 19:16:18 -0000 1.4 *************** *** 4,7 **** --- 4,8 ---- * @package mxBB Installation * @version $Id$ + * @copyright (c) 2001 phpBB Group * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 Index: mysql.php =================================================================== RCS file: /cvsroot/mxbb/core/install/db/mysql.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mysql.php 5 May 2007 20:40:25 -0000 1.2 --- mysql.php 6 Aug 2007 19:16:18 -0000 1.3 *************** *** 4,7 **** --- 4,8 ---- * @package mxBB Installation * @version $Id$ + * @copyright (c) 2001 phpBB Group * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 *************** *** 10,19 **** */ ! if(!defined("SQL_LAYER_mysql")) { ! define("SQL_LAYER_mysql","mysql"); ! class sql_db_mysql { --- 11,20 ---- */ ! if(!defined("SQL_LAYER")) { ! define("SQL_LAYER","mysql"); ! class sql_db { *************** *** 27,31 **** // Constructor // ! function sql_db_mysql($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { --- 28,32 ---- // Constructor // ! function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { *************** *** 250,254 **** if($this->rowset[$query_id]) { ! $result = $this->rowset[$query_id][$field]; } else if($this->row[$query_id]) --- 251,255 ---- if($this->rowset[$query_id]) { ! $result = $this->rowset[$query_id][0][$field]; } else if($this->row[$query_id]) --- NEW FILE: db2.php --- <?php /** * * @package mxBB Installation * @version $Id: db2.php,v 1.1 2007/08/06 19:16:19 jonohlsson Exp $ * @copyright (c) 2001 phpBB Group * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ if(!defined("SQL_LAYER")) { define("SQL_LAYER","db2"); class sql_db { var $db_connect_id; var $query_result; var $query_resultset; var $query_numrows; var $next_id; var $row = array(); var $rowset = array(); var $row_index; var $num_queries = 0; // // Constructor // function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { $this->persistency = $persistency; $this->user = $sqluser; $this->password = $sqlpassword; $this->dbname = $database; $this->server = $sqlserver; if($this->persistency) { $this->db_connect_id = odbc_pconnect($this->server, "", ""); } else { $this->db_connect_id = odbc_connect($this->server, "", ""); } if($this->db_connect_id) { @odbc_autocommit($this->db_connect_id, off); return $this->db_connect_id; } else { return false; } } // // Other base methods // function sql_close() { if($this->db_connect_id) { if($this->query_result) { @odbc_free_result($this->query_result); } $result = @odbc_close($this->db_connect_id); return $result; } else { return false; } } // // Query method // function sql_query($query = "", $transaction = FALSE) { // // Remove any pre-existing queries // unset($this->query_result); unset($this->row); if($query != "") { $this->num_queries++; if(!eregi("^INSERT ",$query)) { if(eregi("LIMIT", $query)) { preg_match("/^(.*)LIMIT ([0-9]+)[, ]*([0-9]+)*/s", $query, $limits); $query = $limits[1]; if($limits[3]) { $row_offset = $limits[2]; $num_rows = $limits[3]; } else { $row_offset = 0; $num_rows = $limits[2]; } $query .= " FETCH FIRST ".($row_offset+$num_rows)." ROWS ONLY OPTIMIZE FOR ".($row_offset+$num_rows)." ROWS"; $this->query_result = odbc_exec($this->db_connect_id, $query); $query_limit_offset = $row_offset; $this->result_numrows[$this->query_result] = $num_rows; } else { $this->query_result = odbc_exec($this->db_connect_id, $query); $row_offset = 0; $this->result_numrows[$this->query_result] = 5E6; } $result_id = $this->query_result; if($this->query_result && eregi("^SELECT", $query)) { for($i = 1; $i < odbc_num_fields($result_id)+1; $i++) { $this->result_field_names[$result_id][] = odbc_field_name($result_id, $i); } $i = $row_offset + 1; $k = 0; while(odbc_fetch_row($result_id, $i) && $k < $this->result_numrows[$result_id]) { for($j = 1; $j < count($this->result_field_names[$result_id])+1; $j++) { $this->result_rowset[$result_id][$k][$this->result_field_names[$result_id][$j-1]] = odbc_result($result_id, $j); } $i++; $k++; } $this->result_numrows[$result_id] = $k; $this->row_index[$result_id] = 0; } else { $this->result_numrows[$result_id] = @odbc_num_rows($result_id); $this->row_index[$result_id] = 0; } } else { if(eregi("^(INSERT|UPDATE) ", $query)) { $query = preg_replace("/\\\'/s", "''", $query); } $this->query_result = odbc_exec($this->db_connect_id, $query); if($this->query_result) { $sql_id = "VALUES(IDENTITY_VAL_LOCAL())"; $id_result = odbc_exec($this->db_connect_id, $sql_id); if($id_result) { $row_result = odbc_fetch_row($id_result); if($row_result) { $this->next_id[$this->query_result] = odbc_result($id_result, 1); } } } odbc_commit($this->db_connect_id); $this->query_limit_offset[$this->query_result] = 0; $this->result_numrows[$this->query_result] = 0; } return $this->query_result; } else { return false; } } // // Other query methods // function sql_numrows($query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { return $this->result_numrows[$query_id]; } else { return false; } } function sql_affectedrows($query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { return $this->result_numrows[$query_id]; } else { return false; } } function sql_numfields($query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { $result = count($this->result_field_names[$query_id]); return $result; } else { return false; } } function sql_fieldname($offset, $query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { $result = $this->result_field_names[$query_id][$offset]; return $result; } else { return false; } } function sql_fieldtype($offset, $query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { $result = @odbc_field_type($query_id, $offset); return $result; } else { return false; } } function sql_fetchrow($query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { if($this->row_index[$query_id] < $this->result_numrows[$query_id]) { $result = $this->result_rowset[$query_id][$this->row_index[$query_id]]; $this->row_index[$query_id]++; return $result; } else { return false; } } else { return false; } } function sql_fetchrowset($query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { $this->row_index[$query_id] = $this->result_numrows[$query_id]; return $this->result_rowset[$query_id]; } else { return false; } } function sql_fetchfield($field, $row = -1, $query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { if($row < $this->result_numrows[$query_id]) { if($row == -1) { $getrow = $this->row_index[$query_id]-1; } else { $getrow = $row; } return $this->result_rowset[$query_id][$getrow][$this->result_field_names[$query_id][$field]]; } else { return false; } } else { return false; } } function sql_rowseek($offset, $query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { $this->row_index[$query_id] = 0; return true; } else { return false; } } function sql_nextid($query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { return $this->next_id[$query_id]; } else { return false; } } function sql_freeresult($query_id = 0) { if(!$query_id) { $query_id = $this->query_result; } if($query_id) { $result = @odbc_free_result($query_id); return $result; } else { return false; } } function sql_error($query_id = 0) { // $result['code'] = @odbc_error($this->db_connect_id); // $result['message'] = @odbc_errormsg($this->db_connect_id); return ""; } } // class sql_db } // if ... define ?> --- 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> Index: postgres7.php =================================================================== RCS file: /cvsroot/mxbb/core/install/db/postgres7.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** postgres7.php 5 May 2007 20:40:26 -0000 1.3 --- postgres7.php 6 Aug 2007 19:16:19 -0000 1.4 *************** *** 4,7 **** --- 4,8 ---- * @package mxBB Installation * @version $Id$ + * @copyright (c) 2001 phpBB Group * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 *************** *** 10,19 **** */ ! if(!defined("SQL_LAYER_postgres")) { ! define("SQL_LAYER_postgres","postgresql"); ! class sql_db_postgres { --- 11,20 ---- */ ! if(!defined("SQL_LAYER")) { ! define("SQL_LAYER","postgresql"); ! class sql_db { *************** *** 29,33 **** // Constructor // ! function sql_db_postgres($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { $this->connect_string = ""; --- 30,34 ---- // Constructor // ! function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) { $this->connect_string = ""; *************** *** 114,118 **** $query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query); - $query = preg_replace('#(.*WHERE.*)(username|user_email|ban_email) = \'(.*)\'#ise', "\"\\1LOWER(\\2) = '\" . strtolower('\\3') . \"'\"", $query); if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) --- 115,118 ---- |
|
From: Jon O. <jon...@us...> - 2007-08-06 14:46:54
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/js In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28419/bugsbt/includes/js Modified Files: init_main.js Log Message: further updates for url link Index: init_main.js =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/js/init_main.js,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** init_main.js 6 Aug 2007 13:22:59 -0000 1.3 --- init_main.js 6 Aug 2007 14:46:48 -0000 1.4 *************** *** 11,15 **** // This updates docs whenever a node is clicked OR updateUI() is called tree.textClickListener.add(function() { - /* if (tree.getActiveNode().isDocument()) { dhtmlHistory.add( treeGetId(), el(tree.active+"-text").innerHTML ); --- 11,14 ---- *************** *** 26,36 **** el('tabs-data').innerHTML = ""; } ! */ }); // Activate first doc in the clicked folder tree.textClickListener.add(function() { ! viewBugs(); ! document.title = el(tree.active+"-text").innerHTML; }); --- 25,47 ---- el('tabs-data').innerHTML = ""; } ! }); // Activate first doc in the clicked folder tree.textClickListener.add(function() { ! ! // The App has received a standard GET url ! if (bugPath != '') ! { ! //initialLocation = bugPath; ! current_bug_id = bugPath; ! viewBug(bugPath); ! bugPath = ''; ! } ! else ! { ! viewBugs(); ! document.title = el(tree.active+"-text").innerHTML; ! } }); *************** *** 47,60 **** var initialLocation = dhtmlHistory.getCurrentLocation(); - // The App has received a standard GET url - if (bugPath != '') - { - initialLocation = bugPath; - current_bug_id = bugPath; - viewBug(bugPath); - } - // if no location specified, use the default ! else if ((initialLocation == '' || initialLocation == null) && tree.allNodes[0]) { if (tree.allNodes[0].childNodes) { --- 58,63 ---- var initialLocation = dhtmlHistory.getCurrentLocation(); // if no location specified, use the default ! if ((initialLocation == '' || initialLocation == null) && tree.allNodes[0]) { if (tree.allNodes[0].childNodes) { *************** *** 82,85 **** --- 85,89 ---- updateUI(initialLocation, null); } + } } |
|
From: Jon O. <jon...@us...> - 2007-08-06 14:46:54
|
Update of /cvsroot/mxbb/mx_bugsbt In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28419 Modified Files: bugsbt.php Log Message: further updates for url link Index: bugsbt.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bugsbt.php 7 Jun 2007 19:58:33 -0000 1.1 --- bugsbt.php 6 Aug 2007 14:46:47 -0000 1.2 *************** *** 55,58 **** --- 55,59 ---- $actions = array( 'index' => 'index', + 'article' => 'index', // Fix for old reported bugs with wrong url ); |
|
From: Jon O. <jon...@us...> - 2007-08-06 13:23:50
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8046/bugsbt/includes Modified Files: functions.php functions_bugsbt.php Log Message: Fix for updating the Ajax API from plain url. Didn't fix the script for updating the products tree. Not needed atm. Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/functions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** functions.php 5 Aug 2007 22:07:55 -0000 1.6 --- functions.php 6 Aug 2007 13:22:56 -0000 1.7 *************** *** 621,625 **** $this->data['item_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : $lang['Guest']; ! $this->temp_url = PORTAL_URL . $mx_bugsbt->this_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true); } } --- 621,625 ---- $this->data['item_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : $lang['Guest']; ! $this->temp_url = PORTAL_URL . $mx_bugsbt->this_mxurl("mode=" . "index&k=" . $this->data['item_id'], false, true); } } Index: functions_bugsbt.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/functions_bugsbt.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** functions_bugsbt.php 12 Jul 2007 22:43:55 -0000 1.4 --- functions_bugsbt.php 6 Aug 2007 13:22:58 -0000 1.5 *************** *** 547,553 **** // Load items // ! //$cat_list .= $this->list_items($sub_cat_id, $pre, $current_bug_id); ! $cat_list .= '</div>'; } } --- 547,553 ---- // Load items // ! $cat_list .= $this->list_items($sub_cat_id, $pre, $current_bug_id); ! $cat_list .= '</div>'; } } *************** *** 722,726 **** if ($bug_id == $current_bug_id) { ! $bug_path = $pre . $cat_id . '/' . $bug_id; } } --- 722,727 ---- if ($bug_id == $current_bug_id) { ! //$bug_path = $pre . $cat_id . '/' . $bug_id; ! $bug_path = $bug_id; } } |
|
From: Jon O. <jon...@us...> - 2007-08-06 13:23:49
|
Update of /cvsroot/mxbb/mx_bugsbt/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8046/templates/subSilver Modified Files: bugsbt_index.tpl Log Message: Fix for updating the Ajax API from plain url. Didn't fix the script for updating the products tree. Not needed atm. Index: bugsbt_index.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/templates/subSilver/bugsbt_index.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bugsbt_index.tpl 12 Jul 2007 22:45:42 -0000 1.3 --- bugsbt_index.tpl 6 Aug 2007 13:23:00 -0000 1.4 *************** *** 33,36 **** --- 33,37 ---- } mxBlock = new _mxBlock('{BLOCK_ID}','{PAGE_ID}'); + bugPath = '{BUG_PATH}'; </script> |
|
From: Jon O. <jon...@us...> - 2007-08-06 13:23:49
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/js In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8046/bugsbt/includes/js Modified Files: init_main.js Log Message: Fix for updating the Ajax API from plain url. Didn't fix the script for updating the products tree. Not needed atm. Index: init_main.js =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/js/init_main.js,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** init_main.js 28 Apr 2007 19:45:17 -0000 1.2 --- init_main.js 6 Aug 2007 13:22:59 -0000 1.3 *************** *** 9,48 **** window.onload = initialize; ! /* tree.textClickListener.add(function() { ! if (document.getElementById("tree-insert-form").style.display == "block") { ! treeInsert(); ! } ! }); ! */ ! tree.textClickListener.add(function() { ! if (!tree.getActiveNode().isDocument()) { ! if (tree.getActiveNode().childNodes) { ! for (var i = 0; i < tree.getActiveNode().childNodes.length; i++) { ! if (tree.getActiveNode().childNodes[i].isDocument()) { ! //queryPath = tree.getActiveNode().childNodes[i].id; ! //tree.queryPath = queryPath.replace('tree-', ""); ! //tree.active = queryPath; ! //tree.loadState(); ! //tree.updateHtml(); ! //break; ! } ! } ! } } }); tree.textClickListener.add(function() { - //if (tree.getActiveNode().isDocument()) { - // if (getCookie('openEditBug')) editBug(); - // else viewBugs(); viewBugs(); document.title = el(tree.active+"-text").innerHTML; - //} - //else - //{ - // clearTabs(); - //} }); --- 9,36 ---- window.onload = initialize; ! // This updates docs whenever a node is clicked OR updateUI() is called tree.textClickListener.add(function() { ! /* ! if (tree.getActiveNode().isDocument()) { ! dhtmlHistory.add( treeGetId(), el(tree.active+"-text").innerHTML ); ! queryPath = tree.getActiveNode().id; ! tree.queryPath = queryPath.replace('tree-', ""); ! tree.active = queryPath; ! tree.loadState(); ! tree.updateHtml(); ! document.title = el(tree.active+"-text").innerHTML; } + else + { + el('tabs-data').innerHTML = ""; + } + */ }); + // Activate first doc in the clicked folder tree.textClickListener.add(function() { viewBugs(); document.title = el(tree.active+"-text").innerHTML; }); *************** *** 59,68 **** var initialLocation = dhtmlHistory.getCurrentLocation(); // if no location specified, use the default ! if ((initialLocation == '' || initialLocation == null) && tree.allNodes[0]) { if (tree.allNodes[0].childNodes) { // First set default, then loop to find real document queryPath = tree.allNodes[0].id; for (var i = 0; i < tree.allNodes[0].childNodes.length; i++) { if (tree.allNodes[0].childNodes[i].isDocument()) { --- 47,65 ---- var initialLocation = dhtmlHistory.getCurrentLocation(); + // The App has received a standard GET url + if (bugPath != '') + { + initialLocation = bugPath; + current_bug_id = bugPath; + viewBug(bugPath); + } + // if no location specified, use the default ! else if ((initialLocation == '' || initialLocation == null) && tree.allNodes[0]) { if (tree.allNodes[0].childNodes) { // First set default, then loop to find real document queryPath = tree.allNodes[0].id; + for (var i = 0; i < tree.allNodes[0].childNodes.length; i++) { if (tree.allNodes[0].childNodes[i].isDocument()) { |
|
From: Jon O. <jon...@us...> - 2007-08-06 13:23:49
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8046/bugsbt/modules Modified Files: bugsbt_index.php Log Message: Fix for updating the Ajax API from plain url. Didn't fix the script for updating the products tree. Not needed atm. Index: bugsbt_index.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/modules/bugsbt_index.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** bugsbt_index.php 12 Jul 2007 22:43:56 -0000 1.4 --- bugsbt_index.php 6 Aug 2007 13:22:59 -0000 1.5 *************** *** 20,24 **** { global $template, $lang, $db, $theme, $board_config, $phpEx, $bugsbt_config, $debug, $mx_root_path, $module_root_path; ! global $mx_page, $mx_block, $mx_request_vars, $article_path; $current_article_id = $mx_request_vars->is_request('k') ? $mx_request_vars->request('k', MX_TYPE_INT, '') : ''; --- 20,24 ---- { global $template, $lang, $db, $theme, $board_config, $phpEx, $bugsbt_config, $debug, $mx_root_path, $module_root_path; ! global $mx_page, $mx_block, $mx_request_vars, $bug_path; $current_article_id = $mx_request_vars->is_request('k') ? $mx_request_vars->request('k', MX_TYPE_INT, '') : ''; *************** *** 26,30 **** $template->set_filenames( array( 'body' => 'bugsbt_index.tpl' )); ! // Also sets $article_path $tree_html = $this->generate_app_tree($current_article_id); --- 26,30 ---- $template->set_filenames( array( 'body' => 'bugsbt_index.tpl' )); ! // Also sets $bug_path $tree_html = $this->generate_app_tree($current_article_id); *************** *** 36,39 **** --- 36,40 ---- 'BLOCK_ID' => $mx_block->block_id, 'PAGE_ID' => $mx_page->page_id, + 'BUG_PATH' => $bug_path, // |
2 messages has been excluded from this view by a project administrator.
