|
From: Jon O. <jon...@us...> - 2008-07-12 20:24:22
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21282 Modified Files: mx_functions.php mx_functions_bbcode.php mx_functions_core.php Removed Files: mx_functions_ch.php mx_functions_phpbb.php Log Message: Removed mx_functions_phpbb.php -> backend loaded. --- mx_functions_ch.php DELETED --- Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** mx_functions_core.php 11 Jul 2008 23:03:29 -0000 1.95 --- mx_functions_core.php 12 Jul 2008 20:24:13 -0000 1.96 *************** *** 176,180 **** global $mx_root_path, $phpbb_root_path, $phpEx, $mx_backend; ! $path = $mx_backend->_load_file($force_shared); if (file_exists($path . $file.'.'.$phpEx)) --- 176,180 ---- global $mx_root_path, $phpbb_root_path, $phpEx, $mx_backend; ! $path = $mx_backend->load_file($force_shared); if (file_exists($path . $file.'.'.$phpEx)) --- mx_functions_phpbb.php DELETED --- Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_functions_bbcode.php 10 Jul 2008 23:02:05 -0000 1.9 --- mx_functions_bbcode.php 12 Jul 2008 20:24:11 -0000 1.10 *************** *** 270,276 **** function mx_make_bbcode_uid() { // Unique ID for this message.. ! $uid = mx_dss_rand(); $uid = substr($uid, 0, BBCODE_UID_LEN); --- 270,277 ---- function mx_make_bbcode_uid() { + global $mx_backend; // Unique ID for this message.. ! $uid = $mx_backend->dss_rand(); $uid = substr($uid, 0, BBCODE_UID_LEN); Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** mx_functions.php 21 May 2008 22:08:33 -0000 1.84 --- mx_functions.php 12 Jul 2008 20:24:11 -0000 1.85 *************** *** 16,19 **** --- 16,1048 ---- /** + * General replacement for die(). + * + * This is general replacement for die(), allows templated + * output in users (or default) language, etc. + * $msg_code can be one of these constants: + * - GENERAL_MESSAGE : Use for any simple text message, eg. results of an operation, authorisation failures, etc. + * - GENERAL ERROR : Use for any error which occurs _AFTER_ the common.php include and session code, ie. most errors in pages/functions [...1004 lines suppressed...] + // + if( $page_id > 0 && $mx_pages_count > 0 ) + { + for( $i = 0; $i < $mx_pages_count; $i++ ) + { + if( $mx_pages_data[$i]['page_id'] == $page_id ) + { + return array( + $mx_pages_data[$i]['page_name'], + PORTAL_URL . "index.$phpEx?page=" . $mx_pages_data[$i]['page_id'] + ); + } + } + } + return false; + } + + /** * Return data from table. * |