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: MW <jo...@us...> - 2008-02-11 13:41:06
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17213/includes Modified Files: mx_functions_core.php Log Message: code styling: we use tabs and NOT spaces to indent code Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** mx_functions_core.php 11 Feb 2008 11:13:17 -0000 1.73 --- mx_functions_core.php 11 Feb 2008 13:40:27 -0000 1.74 *************** *** 336,347 **** fnc.function_file, fnc.function_id, fnc.function_admin FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, ! " . PARAMETER_TABLE . " par, ! " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc, ! " . MODULE_TABLE . " mdl WHERE sys.parameter_id = par.parameter_id ! AND sys.block_id = blk.block_id ! AND blk.function_id = fnc.function_id ! AND fnc.module_id = mdl.module_id"; $sql .= $sql_block; --- 336,347 ---- fnc.function_file, fnc.function_id, fnc.function_admin FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, ! " . PARAMETER_TABLE . " par, ! " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc, ! " . MODULE_TABLE . " mdl WHERE sys.parameter_id = par.parameter_id ! AND sys.block_id = blk.block_id ! AND blk.function_id = fnc.function_id ! AND fnc.module_id = mdl.module_id"; $sql .= $sql_block; *************** *** 451,468 **** blk.block_id FROM " . COLUMN_BLOCK_TABLE . " bct, ! " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc, ! " . MODULE_TABLE . " mdl, ! " . PAGE_TABLE . " pag, ! " . COLUMN_TABLE . " col WHERE blk.function_id = fnc.function_id ! AND pag.page_id = col.page_id ! AND blk.block_id = bct.block_id ! AND fnc.module_id = mdl.module_id ! AND bct.column_id = col.column_id "; $sql .= $sql_page; ! $sql .= " ORDER BY col.page_id, column_order, block_order"; ! if ( !$result = $db->sql_query( $sql ) ) { mx_message_die( GENERAL_ERROR, "Could not query page information", "", __LINE__, __FILE__, $sql ); --- 451,468 ---- blk.block_id FROM " . COLUMN_BLOCK_TABLE . " bct, ! " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc, ! " . MODULE_TABLE . " mdl, ! " . PAGE_TABLE . " pag, ! " . COLUMN_TABLE . " col WHERE blk.function_id = fnc.function_id ! AND pag.page_id = col.page_id ! AND blk.block_id = bct.block_id ! AND fnc.module_id = mdl.module_id ! AND bct.column_id = col.column_id "; $sql .= $sql_page; ! $sql .= " ORDER BY col.page_id, column_order, block_order"; ! if ( !$result = $db->sql_query( $sql ) ) { mx_message_die( GENERAL_ERROR, "Could not query page information", "", __LINE__, __FILE__, $sql ); *************** *** 1482,1487 **** $this->block_id = $block_id; ! $this->block_config = $mx_cache->read( $this->block_id, MX_CACHE_BLOCK_TYPE, $force_query ); ! $this->_set_all(); } --- 1482,1487 ---- $this->block_id = $block_id; ! $this->block_config = $mx_cache->read( $this->block_id, MX_CACHE_BLOCK_TYPE, $force_query ); ! $this->_set_all(); } *************** *** 1492,1496 **** function hide_me() { ! $this->show_block = false; } --- 1492,1496 ---- function hide_me() { ! $this->show_block = false; } *************** *** 1501,1505 **** function kill_me() { ! $this->_unset(); } --- 1501,1505 ---- function kill_me() { ! $this->_unset(); } *************** *** 3106,3110 **** global $mx_cache; ! $this->page_config = ''; } --- 3106,3110 ---- global $mx_cache; ! $this->page_config = ''; } *************** *** 3216,3220 **** function add_copyright($key = '') { ! $this->mxbb_copyright_addup[] = $key; } --- 3216,3220 ---- function add_copyright($key = '') { ! $this->mxbb_copyright_addup[] = $key; } *************** *** 3252,3256 **** function add_js_file($path = '') { ! $this->mxbb_js_addup[] = $mx_block->module_root_path . $path; } --- 3252,3256 ---- function add_js_file($path = '') { ! $this->mxbb_js_addup[] = $mx_block->module_root_path . $path; } *************** *** 3375,3379 **** if ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in']) { ! $this->editcp_exists = true; } } --- 3375,3379 ---- if ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in']) { ! $this->editcp_exists = true; } } *************** *** 3505,3528 **** function mx_getip() { ! if (getenv("HTTP_CLIENT_IP") && strcasecmp(getenv("HTTP_CLIENT_IP"), "unknown")) ! { ! return getenv("HTTP_CLIENT_IP"); ! } ! else if (getenv("HTTP_X_FORWARDED_FOR") && strcasecmp(getenv("HTTP_X_FORWARDED_FOR"), "unknown")) ! { ! return getenv("HTTP_X_FORWARDED_FOR"); ! } ! else if (getenv("REMOTE_ADDR") && strcasecmp(getenv("REMOTE_ADDR"), "unknown")) ! { ! return getenv("REMOTE_ADDR"); ! } ! else if (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] && strcasecmp($_SERVER['REMOTE_ADDR'], "unknown")) ! { ! return $_SERVER['REMOTE_ADDR']; ! } ! else ! { ! return "unknown"; ! } } --- 3505,3528 ---- function mx_getip() { ! if (getenv("HTTP_CLIENT_IP") && strcasecmp(getenv("HTTP_CLIENT_IP"), "unknown")) ! { ! return getenv("HTTP_CLIENT_IP"); ! } ! else if (getenv("HTTP_X_FORWARDED_FOR") && strcasecmp(getenv("HTTP_X_FORWARDED_FOR"), "unknown")) ! { ! return getenv("HTTP_X_FORWARDED_FOR"); ! } ! else if (getenv("REMOTE_ADDR") && strcasecmp(getenv("REMOTE_ADDR"), "unknown")) ! { ! return getenv("REMOTE_ADDR"); ! } ! else if (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] && strcasecmp($_SERVER['REMOTE_ADDR'], "unknown")) ! { ! return $_SERVER['REMOTE_ADDR']; ! } ! else ! { ! return "unknown"; ! } } |
|
From: MW <jo...@us...> - 2008-02-11 13:19:11
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18974/includes Modified Files: mx_functions_ch.php Log Message: code styling: we use tabs and NOT spaces to indent code Index: mx_functions_ch.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_ch.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mx_functions_ch.php 8 Feb 2008 23:35:57 -0000 1.11 --- mx_functions_ch.php 11 Feb 2008 13:18:54 -0000 1.12 *************** *** 71,80 **** if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) ) { ! $language = $board_config['default_lang']; } if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) ) { ! $language = 'english'; } --- 71,80 ---- if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) ) { ! $language = $board_config['default_lang']; } if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) ) { ! $language = 'english'; } *************** *** 86,95 **** if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) ) { ! $language = $board_config['default_lang']; } if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) ) { ! $language = 'english'; } --- 86,95 ---- if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) ) { ! $language = $board_config['default_lang']; } if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) ) { ! $language = 'english'; } |
|
From: MW <jo...@us...> - 2008-02-11 13:04:04
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12321/includes Modified Files: mx_functions_admincp.php Log Message: code styling: we use tabs and NOT spaces to indent code. Missing braces Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** mx_functions_admincp.php 10 Feb 2008 21:32:31 -0000 1.49 --- mx_functions_admincp.php 11 Feb 2008 13:03:59 -0000 1.50 *************** *** 111,118 **** $sql = "INSERT INTO " . MODULE_TABLE . " (module_name, module_desc, module_path, module_include_admin) ! VALUES( '" . $mx_request_vars->post('module_name', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('module_desc', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('module_path', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('module_include_admin', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "' )"; if( !($result = $db->sql_query($sql)) ) --- 111,118 ---- $sql = "INSERT INTO " . MODULE_TABLE . " (module_name, module_desc, module_path, module_include_admin) ! VALUES( '" . $mx_request_vars->post('module_name', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('module_desc', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('module_path', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('module_include_admin', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "' )"; if( !($result = $db->sql_query($sql)) ) *************** *** 150,158 **** $sql = "INSERT INTO " . FUNCTION_TABLE . " (module_id, function_name, function_desc, function_file, function_admin) ! VALUES( " . intval($id) . ", ! '" . $mx_request_vars->post('function_name', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('function_desc', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('function_file', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('function_admin', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "' )"; if( !($result = $db->sql_query($sql)) ) --- 150,158 ---- $sql = "INSERT INTO " . FUNCTION_TABLE . " (module_id, function_name, function_desc, function_file, function_admin) ! VALUES( " . intval($id) . ", ! '" . $mx_request_vars->post('function_name', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('function_desc', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('function_file', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('function_admin', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "' )"; if( !($result = $db->sql_query($sql)) ) *************** *** 223,232 **** // $sql = "INSERT INTO " . PARAMETER_TABLE . " (function_id, parameter_name, parameter_type, parameter_auth, parameter_default, parameter_function) ! VALUES( " . $function_id . ", ! '" . str_replace("\'", "''", $parameter_name) . "', ! '" . str_replace("\'", "''", $parameter_type) . "', ! '" . str_replace("\'", "''", $parameter_auth) . "', ! '" . str_replace("\'", "''", $parameter_default) . "', ! '" . str_replace("\'", "''", $data) . "' )"; if( !($result = $db->sql_query($sql)) ) --- 223,232 ---- // $sql = "INSERT INTO " . PARAMETER_TABLE . " (function_id, parameter_name, parameter_type, parameter_auth, parameter_default, parameter_function) ! VALUES( " . $function_id . ", ! '" . str_replace("\'", "''", $parameter_name) . "', ! '" . str_replace("\'", "''", $parameter_type) . "', ! '" . str_replace("\'", "''", $parameter_auth) . "', ! '" . str_replace("\'", "''", $parameter_default) . "', ! '" . str_replace("\'", "''", $data) . "' )"; if( !($result = $db->sql_query($sql)) ) *************** *** 627,635 **** $sql = "UPDATE " . MODULE_TABLE . " ! SET module_name = '" . $mx_request_vars->post('module_name', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! module_desc = '" . $mx_request_vars->post('module_desc', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! module_path = '" . $mx_request_vars->post('module_path', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! module_include_admin = '" . $mx_request_vars->post('module_include_admin', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "' ! WHERE module_id = " . intval($id); if( !($result = $db->sql_query($sql)) ) --- 627,635 ---- $sql = "UPDATE " . MODULE_TABLE . " ! SET module_name = '" . $mx_request_vars->post('module_name', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! module_desc = '" . $mx_request_vars->post('module_desc', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! module_path = '" . $mx_request_vars->post('module_path', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! module_include_admin = '" . $mx_request_vars->post('module_include_admin', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "' ! WHERE module_id = " . intval($id); if( !($result = $db->sql_query($sql)) ) *************** *** 2257,2261 **** --- 2257,2263 ---- $sql = "SELECT MAX(" . $table_key . ") AS max_id FROM " . $table_name; if( !($row = $this->dbFetchRow($sql)) ) + { return -1; + } return $row['max_id']; } |
|
From: MW <jo...@us...> - 2008-02-11 12:39:54
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2186/includes Modified Files: mx_functions.php Log Message: code styling: we use tabs and NOT spaces to indent code Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** mx_functions.php 9 Feb 2008 19:44:11 -0000 1.79 --- mx_functions.php 11 Feb 2008 12:39:50 -0000 1.80 *************** *** 666,675 **** $sql = "SELECT pag.page_id, pag.page_name, pag.page_desc FROM " . COLUMN_BLOCK_TABLE . " bct, ! " . PAGE_TABLE . " pag, " . COLUMN_TABLE . " col WHERE pag.page_id = col.page_id AND bct.column_id = col.column_id AND bct.block_id = '" . $search_item . "' ! ORDER BY pag.page_id LIMIT 1"; --- 666,675 ---- $sql = "SELECT pag.page_id, pag.page_name, pag.page_desc FROM " . COLUMN_BLOCK_TABLE . " bct, ! " . PAGE_TABLE . " pag, " . COLUMN_TABLE . " col WHERE pag.page_id = col.page_id AND bct.column_id = col.column_id AND bct.block_id = '" . $search_item . "' ! ORDER BY pag.page_id LIMIT 1"; *************** *** 714,718 **** $sql = "SELECT pag.page_id, pag.page_name, pag.page_desc, sys.parameter_value FROM " . COLUMN_BLOCK_TABLE . " bct, ! " . PAGE_TABLE . " pag, " . COLUMN_TABLE . " col, " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, --- 714,718 ---- $sql = "SELECT pag.page_id, pag.page_name, pag.page_desc, sys.parameter_value FROM " . COLUMN_BLOCK_TABLE . " bct, ! " . PAGE_TABLE . " pag, " . COLUMN_TABLE . " col, " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, *************** *** 723,727 **** AND sys.parameter_id = par.parameter_id AND par.parameter_name = 'block_ids' ! ORDER BY sys.block_id"; if( !($p_result = $db->sql_query($sql)) ) --- 723,727 ---- AND sys.parameter_id = par.parameter_id AND par.parameter_name = 'block_ids' ! ORDER BY sys.block_id"; if( !($p_result = $db->sql_query($sql)) ) *************** *** 859,863 **** $sql = "SELECT mdl.module_id, fnc.function_id, blk.block_id FROM " . MODULE_TABLE . " mdl, ! " . FUNCTION_TABLE . " fnc, " . BLOCK_TABLE . " blk WHERE mdl.module_id = fnc.module_id --- 859,863 ---- $sql = "SELECT mdl.module_id, fnc.function_id, blk.block_id FROM " . MODULE_TABLE . " mdl, ! " . FUNCTION_TABLE . " fnc, " . BLOCK_TABLE . " blk WHERE mdl.module_id = fnc.module_id *************** *** 1027,1051 **** * @return integer */ ! function memory_get_usage() ! { ! if ( substr(PHP_OS,0,3) == 'WIN') ! { ! $output = array(); ! exec( 'tasklist /FI "PID eq ' . getmypid() . '" /FO LIST', $output ); ! return preg_replace( '/[\D]/', '', $output[5] ) * 1024; ! } ! else ! { ! //We now assume the OS is UNIX ! //Tested on Mac OS X 10.4.6 and Linux Red Hat Enterprise 4 ! //This should work on most UNIX systems ! $pid = getmypid(); ! exec("ps -eo%mem,rss,pid | grep $pid", $output); ! $output = explode(" ", $output[0]); ! //rss is given in 1024 byte units ! return $output[1] * 1024; ! } ! } } --- 1027,1051 ---- * @return integer */ ! function memory_get_usage() ! { ! if ( substr(PHP_OS,0,3) == 'WIN') ! { ! $output = array(); ! exec( 'tasklist /FI "PID eq ' . getmypid() . '" /FO LIST', $output ); ! return preg_replace( '/[\D]/', '', $output[5] ) * 1024; ! } ! else ! { ! //We now assume the OS is UNIX ! //Tested on Mac OS X 10.4.6 and Linux Red Hat Enterprise 4 ! //This should work on most UNIX systems ! $pid = getmypid(); ! exec("ps -eo%mem,rss,pid | grep $pid", $output); ! $output = explode(" ", $output[0]); ! //rss is given in 1024 byte units ! return $output[1] * 1024; ! } ! } } |
|
From: OryNider <ory...@us...> - 2008-02-11 12:13:18
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23557 Modified Files: session.php Log Message: modifications log upgraded. Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** session.php 11 Feb 2008 12:09:00 -0000 1.11 --- session.php 11 Feb 2008 12:13:11 -0000 1.12 *************** *** 28,39 **** * $auth -> $phpbb_auth - by OryNider * -new globals: $mx_root_path, $mx_cache - by OryNider ! * $this->lang_name was redefined to use in worst case the new $board_config['phpbb_lang'] ! * wich was defined in mx_functions_style.php before lang name is expanded - by OryNider * $template = new mx_Template(); - by OryNider ! * - before $this->add_lang($lang_set); the phpBB common language is included if fails with $phpbb_root_path added * - in function set_lang() ! * - if empty $this->lang_path will be redefined from $phpbb_root_path and new $board_config['phpbb_lang'] ! * wich in this case are set as globals - by OryNider (similar check has been added in the phpBB3 version too) ! * - added function images() to help redefining $images var and indexes were is needed - by OryNider *******************************************************************/ --- 28,45 ---- * $auth -> $phpbb_auth - by OryNider * -new globals: $mx_root_path, $mx_cache - by OryNider ! * $this->lang_name was redefined to use in ! * worst case the new $board_config['phpbb_lang'] ! * wich was defined in mx_functions_style.php ! * before lang name is expanded - by OryNider * $template = new mx_Template(); - by OryNider ! * - before $this->add_lang($lang_set); the phpBB common language is included ! * if fails with $phpbb_root_path added * - in function set_lang() ! * - if empty $this->lang_path will be redefined ! * from $phpbb_root_path and new $board_config['phpbb_lang'] ! * wich in this case are set as globals - by OryNider ! * (similar check has been added in the phpBB3 version too) ! * - added function images() to help redefining $images var ! * and indexes were is needed - by OryNider *******************************************************************/ |
|
From: OryNider <ory...@us...> - 2008-02-11 12:09:06
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21088/phpbb3 Modified Files: constants.php session.php Log Message: added security check plus modifications comments Index: constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/constants.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** constants.php 9 Sep 2007 16:51:32 -0000 1.1 --- constants.php 11 Feb 2008 12:09:00 -0000 1.2 *************** *** 9,158 **** */ /** */ // User related ! define('ANONYMOUS', 1); ! define('USER_ACTIVATION_NONE', 0); ! define('USER_ACTIVATION_SELF', 1); ! define('USER_ACTIVATION_ADMIN', 2); ! define('USER_ACTIVATION_DISABLE', 3); ! define('AVATAR_UPLOAD', 1); ! define('AVATAR_REMOTE', 2); ! define('AVATAR_GALLERY', 3); ! define('USER_NORMAL', 0); ! define('USER_INACTIVE', 1); ! define('USER_IGNORE', 2); ! define('USER_FOUNDER', 3); ! define('INACTIVE_REGISTER', 1); ! define('INACTIVE_PROFILE', 2); ! define('INACTIVE_MANUAL', 3); ! define('INACTIVE_REMIND', 4); // ACL ! define('ACL_NEVER', 0); ! define('ACL_YES', 1); ! define('ACL_NO', -1); // Login error codes ! define('LOGIN_CONTINUE', 1); ! define('LOGIN_BREAK', 2); ! define('LOGIN_SUCCESS', 3); ! define('LOGIN_SUCCESS_CREATE_PROFILE', 20); ! define('LOGIN_ERROR_USERNAME', 10); ! define('LOGIN_ERROR_PASSWORD', 11); ! define('LOGIN_ERROR_ACTIVE', 12); ! define('LOGIN_ERROR_ATTEMPTS', 13); ! define('LOGIN_ERROR_EXTERNAL_AUTH', 14); ! define('LOGIN_ERROR_PASSWORD_CONVERT', 15); // Group settings ! define('GROUP_OPEN', 0); ! define('GROUP_CLOSED', 1); ! define('GROUP_HIDDEN', 2); ! define('GROUP_SPECIAL', 3); ! define('GROUP_FREE', 4); // Forum/Topic states ! define('FORUM_CAT', 0); ! define('FORUM_POST', 1); ! define('FORUM_LINK', 2); ! define('ITEM_UNLOCKED', 0); ! define('ITEM_LOCKED', 1); ! define('ITEM_MOVED', 2); // Forum Flags ! define('FORUM_FLAG_LINK_TRACK', 1); ! define('FORUM_FLAG_PRUNE_POLL', 2); ! define('FORUM_FLAG_PRUNE_ANNOUNCE', 4); ! define('FORUM_FLAG_PRUNE_STICKY', 8); ! define('FORUM_FLAG_ACTIVE_TOPICS', 16); ! define('FORUM_FLAG_POST_REVIEW', 32); // Optional text flags ! define('OPTION_FLAG_BBCODE', 1); ! define('OPTION_FLAG_SMILIES', 2); ! define('OPTION_FLAG_LINKS', 4); // Topic types ! define('POST_NORMAL', 0); ! define('POST_STICKY', 1); ! define('POST_ANNOUNCE', 2); ! define('POST_GLOBAL', 3); // Lastread types ! define('TRACK_NORMAL', 0); ! define('TRACK_POSTED', 1); // Notify methods ! define('NOTIFY_EMAIL', 0); ! define('NOTIFY_IM', 1); ! define('NOTIFY_BOTH', 2); // Email Priority Settings ! define('MAIL_LOW_PRIORITY', 4); ! define('MAIL_NORMAL_PRIORITY', 3); ! define('MAIL_HIGH_PRIORITY', 2); // Log types ! define('LOG_ADMIN', 0); ! define('LOG_MOD', 1); ! define('LOG_CRITICAL', 2); ! define('LOG_USERS', 3); // Private messaging - Do NOT change these values ! define('PRIVMSGS_HOLD_BOX', -4); ! define('PRIVMSGS_NO_BOX', -3); ! define('PRIVMSGS_OUTBOX', -2); ! define('PRIVMSGS_SENTBOX', -1); ! define('PRIVMSGS_INBOX', 0); // Full Folder Actions ! define('FULL_FOLDER_NONE', -3); ! define('FULL_FOLDER_DELETE', -2); ! define('FULL_FOLDER_HOLD', -1); // Download Modes - Attachments ! define('INLINE_LINK', 1); // This mode is only used internally to allow modders extending the attachment functionality ! define('PHYSICAL_LINK', 2); // Confirm types ! define('CONFIRM_REG', 1); ! define('CONFIRM_LOGIN', 2); ! define('CONFIRM_POST', 3); // Categories - Attachments ! define('ATTACHMENT_CATEGORY_NONE', 0); ! define('ATTACHMENT_CATEGORY_IMAGE', 1); // Inline Images ! define('ATTACHMENT_CATEGORY_WM', 2); // Windows Media Files - Streaming ! define('ATTACHMENT_CATEGORY_RM', 3); // Real Media Files - Streaming ! define('ATTACHMENT_CATEGORY_THUMB', 4); // Not used within the database, only while displaying posts ! define('ATTACHMENT_CATEGORY_FLASH', 5); // Flash/SWF files ! define('ATTACHMENT_CATEGORY_QUICKTIME', 6); // Quicktime/Mov files // BBCode UID length ! define('BBCODE_UID_LEN', 5); // Number of core BBCodes ! define('NUM_CORE_BBCODES', 12); // Magic url types ! define('MAGIC_URL_EMAIL', 1); ! define('MAGIC_URL_FULL', 2); ! define('MAGIC_URL_LOCAL', 3); ! define('MAGIC_URL_WWW', 4); // Profile Field Types ! define('FIELD_INT', 1); ! define('FIELD_STRING', 2); ! define('FIELD_TEXT', 3); ! define('FIELD_BOOL', 4); ! define('FIELD_DROPDOWN', 5); ! define('FIELD_DATE', 6); --- 9,166 ---- */ + if ( !defined('IN_PORTAL') ) + { + die("Hacking attempt"); + } + /** + * Modifications: + * define -> @define + * to supress any notices since in mx_constants.php some are allready @@defined */ // User related ! @define('ANONYMOUS', 1); ! @define('USER_ACTIVATION_NONE', 0); ! @define('USER_ACTIVATION_SELF', 1); ! @define('USER_ACTIVATION_ADMIN', 2); ! @define('USER_ACTIVATION_DISABLE', 3); ! @define('AVATAR_UPLOAD', 1); ! @define('AVATAR_REMOTE', 2); ! @define('AVATAR_GALLERY', 3); ! @define('USER_NORMAL', 0); ! @define('USER_INACTIVE', 1); ! @define('USER_IGNORE', 2); ! @define('USER_FOUNDER', 3); ! @define('INACTIVE_REGISTER', 1); ! @define('INACTIVE_PROFILE', 2); ! @define('INACTIVE_MANUAL', 3); ! @define('INACTIVE_REMIND', 4); // ACL ! @define('ACL_NEVER', 0); ! @define('ACL_YES', 1); ! @define('ACL_NO', -1); // Login error codes ! @define('LOGIN_CONTINUE', 1); ! @define('LOGIN_BREAK', 2); ! @define('LOGIN_SUCCESS', 3); ! @define('LOGIN_SUCCESS_CREATE_PROFILE', 20); ! @define('LOGIN_ERROR_USERNAME', 10); ! @define('LOGIN_ERROR_PASSWORD', 11); ! @define('LOGIN_ERROR_ACTIVE', 12); ! @define('LOGIN_ERROR_ATTEMPTS', 13); ! @define('LOGIN_ERROR_EXTERNAL_AUTH', 14); ! @define('LOGIN_ERROR_PASSWORD_CONVERT', 15); // Group settings ! @define('GROUP_OPEN', 0); ! @define('GROUP_CLOSED', 1); ! @define('GROUP_HIDDEN', 2); ! @define('GROUP_SPECIAL', 3); ! @define('GROUP_FREE', 4); // Forum/Topic states ! @define('FORUM_CAT', 0); ! @define('FORUM_POST', 1); ! @define('FORUM_LINK', 2); ! @define('ITEM_UNLOCKED', 0); ! @define('ITEM_LOCKED', 1); ! @define('ITEM_MOVED', 2); // Forum Flags ! @define('FORUM_FLAG_LINK_TRACK', 1); ! @define('FORUM_FLAG_PRUNE_POLL', 2); ! @define('FORUM_FLAG_PRUNE_ANNOUNCE', 4); ! @define('FORUM_FLAG_PRUNE_STICKY', 8); ! @define('FORUM_FLAG_ACTIVE_TOPICS', 16); ! @define('FORUM_FLAG_POST_REVIEW', 32); // Optional text flags ! @define('OPTION_FLAG_BBCODE', 1); ! @define('OPTION_FLAG_SMILIES', 2); ! @define('OPTION_FLAG_LINKS', 4); // Topic types ! @define('POST_NORMAL', 0); ! @define('POST_STICKY', 1); ! @define('POST_ANNOUNCE', 2); ! @define('POST_GLOBAL', 3); // Lastread types ! @define('TRACK_NORMAL', 0); ! @define('TRACK_POSTED', 1); // Notify methods ! @define('NOTIFY_EMAIL', 0); ! @define('NOTIFY_IM', 1); ! @define('NOTIFY_BOTH', 2); // Email Priority Settings ! @define('MAIL_LOW_PRIORITY', 4); ! @define('MAIL_NORMAL_PRIORITY', 3); ! @define('MAIL_HIGH_PRIORITY', 2); // Log types ! @define('LOG_ADMIN', 0); ! @define('LOG_MOD', 1); ! @define('LOG_CRITICAL', 2); ! @define('LOG_USERS', 3); // Private messaging - Do NOT change these values ! @define('PRIVMSGS_HOLD_BOX', -4); ! @define('PRIVMSGS_NO_BOX', -3); ! @define('PRIVMSGS_OUTBOX', -2); ! @define('PRIVMSGS_SENTBOX', -1); ! @define('PRIVMSGS_INBOX', 0); // Full Folder Actions ! @define('FULL_FOLDER_NONE', -3); ! @define('FULL_FOLDER_DELETE', -2); ! @define('FULL_FOLDER_HOLD', -1); // Download Modes - Attachments ! @define('INLINE_LINK', 1); // This mode is only used internally to allow modders extending the attachment functionality ! @define('PHYSICAL_LINK', 2); // Confirm types ! @define('CONFIRM_REG', 1); ! @define('CONFIRM_LOGIN', 2); ! @define('CONFIRM_POST', 3); // Categories - Attachments ! @define('ATTACHMENT_CATEGORY_NONE', 0); ! @define('ATTACHMENT_CATEGORY_IMAGE', 1); // Inline Images ! @define('ATTACHMENT_CATEGORY_WM', 2); // Windows Media Files - Streaming ! @define('ATTACHMENT_CATEGORY_RM', 3); // Real Media Files - Streaming ! @define('ATTACHMENT_CATEGORY_THUMB', 4); // Not used within the database, only while displaying posts ! @define('ATTACHMENT_CATEGORY_FLASH', 5); // Flash/SWF files ! @define('ATTACHMENT_CATEGORY_QUICKTIME', 6); // Quicktime/Mov files // BBCode UID length ! @define('BBCODE_UID_LEN', 5); // Number of core BBCodes ! @define('NUM_CORE_BBCODES', 12); // Magic url types ! @define('MAGIC_URL_EMAIL', 1); ! @define('MAGIC_URL_FULL', 2); ! @define('MAGIC_URL_LOCAL', 3); ! @define('MAGIC_URL_WWW', 4); // Profile Field Types ! @define('FIELD_INT', 1); ! @define('FIELD_STRING', 2); ! @define('FIELD_TEXT', 3); ! @define('FIELD_BOOL', 4); ! @define('FIELD_DROPDOWN', 5); ! @define('FIELD_DATE', 6); *************** *** 161,226 **** // Table names ! define('ACL_GROUPS_TABLE', $table_prefix . 'acl_groups'); ! define('ACL_OPTIONS_TABLE', $table_prefix . 'acl_options'); ! define('ACL_ROLES_DATA_TABLE', $table_prefix . 'acl_roles_data'); ! define('ACL_ROLES_TABLE', $table_prefix . 'acl_roles'); ! define('ACL_USERS_TABLE', $table_prefix . 'acl_users'); ! define('ATTACHMENTS_TABLE', $table_prefix . 'attachments'); ! define('BANLIST_TABLE', $table_prefix . 'banlist'); ! define('BBCODES_TABLE', $table_prefix . 'bbcodes'); ! define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); ! define('BOTS_TABLE', $table_prefix . 'bots'); ! define('CONFIG_TABLE', $table_prefix . 'config'); ! define('CONFIRM_TABLE', $table_prefix . 'confirm'); ! define('DISALLOW_TABLE', $table_prefix . 'disallow'); ! define('DRAFTS_TABLE', $table_prefix . 'drafts'); ! define('EXTENSIONS_TABLE', $table_prefix . 'extensions'); ! define('EXTENSION_GROUPS_TABLE', $table_prefix . 'extension_groups'); ! define('FORUMS_TABLE', $table_prefix . 'forums'); ! define('FORUMS_ACCESS_TABLE', $table_prefix . 'forums_access'); ! define('FORUMS_TRACK_TABLE', $table_prefix . 'forums_track'); ! define('FORUMS_WATCH_TABLE', $table_prefix . 'forums_watch'); ! define('GROUPS_TABLE', $table_prefix . 'groups'); ! define('ICONS_TABLE', $table_prefix . 'icons'); ! define('LANG_TABLE', $table_prefix . 'lang'); ! define('LOG_TABLE', $table_prefix . 'log'); ! define('MODERATOR_CACHE_TABLE', $table_prefix . 'moderator_cache'); ! define('MODULES_TABLE', $table_prefix . 'modules'); ! define('POLL_OPTIONS_TABLE', $table_prefix . 'poll_options'); ! define('POLL_VOTES_TABLE', $table_prefix . 'poll_votes'); ! define('POSTS_TABLE', $table_prefix . 'posts'); ! define('PRIVMSGS_TABLE', $table_prefix . 'privmsgs'); ! define('PRIVMSGS_FOLDER_TABLE', $table_prefix . 'privmsgs_folder'); ! define('PRIVMSGS_RULES_TABLE', $table_prefix . 'privmsgs_rules'); ! define('PRIVMSGS_TO_TABLE', $table_prefix . 'privmsgs_to'); ! define('PROFILE_FIELDS_TABLE', $table_prefix . 'profile_fields'); ! define('PROFILE_FIELDS_DATA_TABLE', $table_prefix . 'profile_fields_data'); ! define('PROFILE_FIELDS_LANG_TABLE', $table_prefix . 'profile_fields_lang'); ! define('PROFILE_LANG_TABLE', $table_prefix . 'profile_lang'); ! define('RANKS_TABLE', $table_prefix . 'ranks'); ! define('REPORTS_TABLE', $table_prefix . 'reports'); ! define('REPORTS_REASONS_TABLE', $table_prefix . 'reports_reasons'); ! define('SEARCH_RESULTS_TABLE', $table_prefix . 'search_results'); ! define('SEARCH_WORDLIST_TABLE', $table_prefix . 'search_wordlist'); ! define('SEARCH_WORDMATCH_TABLE', $table_prefix . 'search_wordmatch'); ! define('SESSIONS_TABLE', $table_prefix . 'sessions'); ! define('SESSIONS_KEYS_TABLE', $table_prefix . 'sessions_keys'); ! define('SITELIST_TABLE', $table_prefix . 'sitelist'); ! define('SMILIES_TABLE', $table_prefix . 'smilies'); ! define('STYLES_TABLE', $table_prefix . 'styles'); ! define('STYLES_TEMPLATE_TABLE', $table_prefix . 'styles_template'); ! define('STYLES_TEMPLATE_DATA_TABLE',$table_prefix . 'styles_template_data'); ! define('STYLES_THEME_TABLE', $table_prefix . 'styles_theme'); ! define('STYLES_IMAGESET_TABLE', $table_prefix . 'styles_imageset'); ! define('STYLES_IMAGESET_DATA_TABLE',$table_prefix . 'styles_imageset_data'); ! define('TOPICS_TABLE', $table_prefix . 'topics'); ! define('TOPICS_POSTED_TABLE', $table_prefix . 'topics_posted'); ! define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_track'); ! define('TOPICS_WATCH_TABLE', $table_prefix . 'topics_watch'); ! define('USER_GROUP_TABLE', $table_prefix . 'user_group'); ! define('USERS_TABLE', $table_prefix . 'users'); ! define('WARNINGS_TABLE', $table_prefix . 'warnings'); ! define('WORDS_TABLE', $table_prefix . 'words'); ! define('ZEBRA_TABLE', $table_prefix . 'zebra'); // Additional tables --- 169,234 ---- // Table names ! @define('ACL_GROUPS_TABLE', $table_prefix . 'acl_groups'); ! @define('ACL_OPTIONS_TABLE', $table_prefix . 'acl_options'); ! @define('ACL_ROLES_DATA_TABLE', $table_prefix . 'acl_roles_data'); ! @define('ACL_ROLES_TABLE', $table_prefix . 'acl_roles'); ! @define('ACL_USERS_TABLE', $table_prefix . 'acl_users'); ! @define('ATTACHMENTS_TABLE', $table_prefix . 'attachments'); ! @define('BANLIST_TABLE', $table_prefix . 'banlist'); ! @define('BBCODES_TABLE', $table_prefix . 'bbcodes'); ! @define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); ! @define('BOTS_TABLE', $table_prefix . 'bots'); ! @define('CONFIG_TABLE', $table_prefix . 'config'); ! @define('CONFIRM_TABLE', $table_prefix . 'confirm'); ! @define('DISALLOW_TABLE', $table_prefix . 'disallow'); ! @define('DRAFTS_TABLE', $table_prefix . 'drafts'); ! @define('EXTENSIONS_TABLE', $table_prefix . 'extensions'); ! @define('EXTENSION_GROUPS_TABLE', $table_prefix . 'extension_groups'); ! @define('FORUMS_TABLE', $table_prefix . 'forums'); ! @define('FORUMS_ACCESS_TABLE', $table_prefix . 'forums_access'); ! @define('FORUMS_TRACK_TABLE', $table_prefix . 'forums_track'); ! @define('FORUMS_WATCH_TABLE', $table_prefix . 'forums_watch'); ! @define('GROUPS_TABLE', $table_prefix . 'groups'); ! @define('ICONS_TABLE', $table_prefix . 'icons'); ! @define('LANG_TABLE', $table_prefix . 'lang'); ! @define('LOG_TABLE', $table_prefix . 'log'); ! @define('MODERATOR_CACHE_TABLE', $table_prefix . 'moderator_cache'); ! @define('MODULES_TABLE', $table_prefix . 'modules'); ! @define('POLL_OPTIONS_TABLE', $table_prefix . 'poll_options'); ! @define('POLL_VOTES_TABLE', $table_prefix . 'poll_votes'); ! @define('POSTS_TABLE', $table_prefix . 'posts'); ! @define('PRIVMSGS_TABLE', $table_prefix . 'privmsgs'); ! @define('PRIVMSGS_FOLDER_TABLE', $table_prefix . 'privmsgs_folder'); ! @define('PRIVMSGS_RULES_TABLE', $table_prefix . 'privmsgs_rules'); ! @define('PRIVMSGS_TO_TABLE', $table_prefix . 'privmsgs_to'); ! @define('PROFILE_FIELDS_TABLE', $table_prefix . 'profile_fields'); ! @define('PROFILE_FIELDS_DATA_TABLE', $table_prefix . 'profile_fields_data'); ! @define('PROFILE_FIELDS_LANG_TABLE', $table_prefix . 'profile_fields_lang'); ! @define('PROFILE_LANG_TABLE', $table_prefix . 'profile_lang'); ! @define('RANKS_TABLE', $table_prefix . 'ranks'); ! @define('REPORTS_TABLE', $table_prefix . 'reports'); ! @define('REPORTS_REASONS_TABLE', $table_prefix . 'reports_reasons'); ! @define('SEARCH_RESULTS_TABLE', $table_prefix . 'search_results'); ! @define('SEARCH_WORDLIST_TABLE', $table_prefix . 'search_wordlist'); ! @define('SEARCH_WORDMATCH_TABLE', $table_prefix . 'search_wordmatch'); ! @define('SESSIONS_TABLE', $table_prefix . 'sessions'); ! @define('SESSIONS_KEYS_TABLE', $table_prefix . 'sessions_keys'); ! @define('SITELIST_TABLE', $table_prefix . 'sitelist'); ! @define('SMILIES_TABLE', $table_prefix . 'smilies'); ! @define('STYLES_TABLE', $table_prefix . 'styles'); ! @define('STYLES_TEMPLATE_TABLE', $table_prefix . 'styles_template'); ! @define('STYLES_TEMPLATE_DATA_TABLE',$table_prefix . 'styles_template_data'); ! @define('STYLES_THEME_TABLE', $table_prefix . 'styles_theme'); ! @define('STYLES_IMAGESET_TABLE', $table_prefix . 'styles_imageset'); ! @define('STYLES_IMAGESET_DATA_TABLE',$table_prefix . 'styles_imageset_data'); ! @define('TOPICS_TABLE', $table_prefix . 'topics'); ! @define('TOPICS_POSTED_TABLE', $table_prefix . 'topics_posted'); ! @define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_track'); ! @define('TOPICS_WATCH_TABLE', $table_prefix . 'topics_watch'); ! @define('USER_GROUP_TABLE', $table_prefix . 'user_group'); ! @define('USERS_TABLE', $table_prefix . 'users'); ! @define('WARNINGS_TABLE', $table_prefix . 'warnings'); ! @define('WORDS_TABLE', $table_prefix . 'words'); ! @define('ZEBRA_TABLE', $table_prefix . 'zebra'); // Additional tables Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** session.php 5 Feb 2008 18:37:21 -0000 1.10 --- session.php 11 Feb 2008 12:09:00 -0000 1.11 *************** *** 9,18 **** */ ! /** ! * Modifications: ! * $config -> $board_config ! * $cache = new mx_nothing(); to disable bots() ! * removed '?' in the returned $SID string ! */ class mx_nothing { --- 9,41 ---- */ ! if ( !defined('IN_PORTAL') ) ! { ! die("Hacking attempt"); ! } ! ! /****************************************************************** ! * MODIFICATIONS ! * --------------- ! * started : Saturday, November 17, 2007 ! * copyright : © phpBB Group, mxP Development Team ! * email : ory...@rd... ! * ! * MODIFICATIONS: ! * - replaced $config -> $board_config - by Jon ! * - replaced $cache = new mx_nothing(); to disable bots() - by Jon ! * - removed '?' in the returned $SID string - by Jon ! * - in function setup() ! * $auth -> $phpbb_auth - by OryNider ! * -new globals: $mx_root_path, $mx_cache - by OryNider ! * $this->lang_name was redefined to use in worst case the new $board_config['phpbb_lang'] ! * wich was defined in mx_functions_style.php before lang name is expanded - by OryNider ! * $template = new mx_Template(); - by OryNider ! * - before $this->add_lang($lang_set); the phpBB common language is included if fails with $phpbb_root_path added ! * - in function set_lang() ! * - if empty $this->lang_path will be redefined from $phpbb_root_path and new $board_config['phpbb_lang'] ! * wich in this case are set as globals - by OryNider (similar check has been added in the phpBB3 version too) ! * - added function images() to help redefining $images var and indexes were is needed - by OryNider ! *******************************************************************/ ! class mx_nothing { *************** *** 1623,1627 **** } } ! //unset($lang_set); } elseif ($lang_set) --- 1646,1650 ---- } } ! unset($lang_set); } elseif ($lang_set) |
|
From: OryNider <ory...@us...> - 2008-02-11 12:09:06
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21088/phpbb2 Modified Files: constants.php Log Message: added security check plus modifications comments Index: constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/constants.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** constants.php 9 Sep 2007 16:51:31 -0000 1.1 --- constants.php 11 Feb 2008 12:08:59 -0000 1.2 *************** *** 26,183 **** } // Debug Level //define('DEBUG', 1); // Debugging on ! define('DEBUG', 1); // Debugging off // User Levels <- Do not change the values of USER or ADMIN ! define('DELETED', -1); ! define('ANONYMOUS', -1); ! define('USER', 0); ! define('ADMIN', 1); ! define('MOD', 2); // User related ! define('USER_ACTIVATION_NONE', 0); ! define('USER_ACTIVATION_SELF', 1); ! define('USER_ACTIVATION_ADMIN', 2); ! define('USER_AVATAR_NONE', 0); ! define('USER_AVATAR_UPLOAD', 1); ! define('USER_AVATAR_REMOTE', 2); ! define('USER_AVATAR_GALLERY', 3); // Group settings ! define('GROUP_OPEN', 0); ! define('GROUP_CLOSED', 1); ! define('GROUP_HIDDEN', 2); // Forum state ! define('FORUM_UNLOCKED', 0); ! define('FORUM_LOCKED', 1); // Topic status ! define('TOPIC_UNLOCKED', 0); ! define('TOPIC_LOCKED', 1); ! define('TOPIC_MOVED', 2); ! define('TOPIC_WATCH_NOTIFIED', 1); ! define('TOPIC_WATCH_UN_NOTIFIED', 0); // Topic types ! define('POST_NORMAL', 0); ! define('POST_STICKY', 1); ! define('POST_ANNOUNCE', 2); ! define('POST_GLOBAL_ANNOUNCE', 3); // SQL codes ! define('BEGIN_TRANSACTION', 1); ! define('END_TRANSACTION', 2); // Error codes ! define('GENERAL_MESSAGE', 200); ! define('GENERAL_ERROR', 202); ! define('CRITICAL_MESSAGE', 203); ! define('CRITICAL_ERROR', 204); // Private messaging ! define('PRIVMSGS_READ_MAIL', 0); ! define('PRIVMSGS_NEW_MAIL', 1); ! define('PRIVMSGS_SENT_MAIL', 2); ! define('PRIVMSGS_SAVED_IN_MAIL', 3); ! define('PRIVMSGS_SAVED_OUT_MAIL', 4); ! define('PRIVMSGS_UNREAD_MAIL', 5); // URL PARAMETERS ! define('POST_TOPIC_URL', 't'); ! define('POST_CAT_URL', 'c'); ! define('POST_FORUM_URL', 'f'); ! define('POST_USERS_URL', 'u'); ! define('POST_POST_URL', 'p'); ! define('POST_GROUPS_URL', 'g'); // Session parameters ! define('SESSION_METHOD_COOKIE', 100); ! define('SESSION_METHOD_GET', 101); // Page numbers for session handling ! define('PAGE_INDEX', 0); ! define('PAGE_LOGIN', -1); ! define('PAGE_SEARCH', -2); ! define('PAGE_REGISTER', -3); ! define('PAGE_PROFILE', -4); ! define('PAGE_VIEWONLINE', -6); ! define('PAGE_VIEWMEMBERS', -7); ! define('PAGE_FAQ', -8); ! define('PAGE_POSTING', -9); ! define('PAGE_PRIVMSGS', -10); ! define('PAGE_GROUPCP', -11); ! define('PAGE_TOPIC_OFFSET', 5000); // Auth settings ! define('AUTH_LIST_ALL', 0); ! define('AUTH_ALL', 0); ! define('AUTH_REG', 1); ! define('AUTH_ACL', 2); ! define('AUTH_MOD', 3); ! define('AUTH_ADMIN', 5); ! define('AUTH_VIEW', 1); ! define('AUTH_READ', 2); ! define('AUTH_POST', 3); ! define('AUTH_REPLY', 4); ! define('AUTH_EDIT', 5); ! define('AUTH_DELETE', 6); ! define('AUTH_ANNOUNCE', 7); ! define('AUTH_STICKY', 8); ! define('AUTH_POLLCREATE', 9); ! define('AUTH_VOTE', 10); ! define('AUTH_ATTACH', 11); // Table names ! define('CONFIRM_TABLE', $table_prefix.'confirm'); ! define('AUTH_ACCESS_TABLE', $table_prefix.'auth_access'); ! define('BANLIST_TABLE', $table_prefix.'banlist'); ! define('CATEGORIES_TABLE', $table_prefix.'categories'); ! define('CONFIG_TABLE', $table_prefix.'config'); ! define('DISALLOW_TABLE', $table_prefix.'disallow'); ! define('FORUMS_TABLE', $table_prefix.'forums'); ! define('GROUPS_TABLE', $table_prefix.'groups'); ! define('POSTS_TABLE', $table_prefix.'posts'); ! define('POSTS_TEXT_TABLE', $table_prefix.'posts_text'); ! define('PRIVMSGS_TABLE', $table_prefix.'privmsgs'); ! define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text'); ! define('PRIVMSGS_IGNORE_TABLE', $table_prefix.'privmsgs_ignore'); ! define('PRUNE_TABLE', $table_prefix.'forum_prune'); ! define('RANKS_TABLE', $table_prefix.'ranks'); ! define('SEARCH_TABLE', $table_prefix.'search_results'); ! define('SEARCH_WORD_TABLE', $table_prefix.'search_wordlist'); ! define('SEARCH_MATCH_TABLE', $table_prefix.'search_wordmatch'); ! define('SESSIONS_TABLE', $table_prefix.'sessions'); ! define('SESSIONS_KEYS_TABLE', $table_prefix.'sessions_keys'); ! define('SMILIES_TABLE', $table_prefix.'smilies'); ! define('THEMES_TABLE', $table_prefix.'themes'); ! define('THEMES_NAME_TABLE', $table_prefix.'themes_name'); ! define('TOPICS_TABLE', $table_prefix.'topics'); ! define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch'); ! define('USER_GROUP_TABLE', $table_prefix.'user_group'); ! define('USERS_TABLE', $table_prefix.'users'); ! define('WORDS_TABLE', $table_prefix.'words'); ! define('VOTE_DESC_TABLE', $table_prefix.'vote_desc'); ! define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results'); ! define('VOTE_USERS_TABLE', $table_prefix.'vote_voters'); ?> \ No newline at end of file --- 26,189 ---- } + /** + * Modifications: + * define -> @define + * to supress any notices since in mx_constants.php some are allready @defined + */ + // Debug Level //define('DEBUG', 1); // Debugging on ! @define('DEBUG', 1); // Debugging off // User Levels <- Do not change the values of USER or ADMIN ! @define('DELETED', -1); ! @define('ANONYMOUS', -1); ! @define('USER', 0); ! @define('ADMIN', 1); ! @define('MOD', 2); // User related ! @define('USER_ACTIVATION_NONE', 0); ! @define('USER_ACTIVATION_SELF', 1); ! @define('USER_ACTIVATION_ADMIN', 2); ! @define('USER_AVATAR_NONE', 0); ! @define('USER_AVATAR_UPLOAD', 1); ! @define('USER_AVATAR_REMOTE', 2); ! @define('USER_AVATAR_GALLERY', 3); // Group settings ! @define('GROUP_OPEN', 0); ! @define('GROUP_CLOSED', 1); ! @define('GROUP_HIDDEN', 2); // Forum state ! @define('FORUM_UNLOCKED', 0); ! @define('FORUM_LOCKED', 1); // Topic status ! @define('TOPIC_UNLOCKED', 0); ! @define('TOPIC_LOCKED', 1); ! @define('TOPIC_MOVED', 2); ! @define('TOPIC_WATCH_NOTIFIED', 1); ! @define('TOPIC_WATCH_UN_NOTIFIED', 0); // Topic types ! @define('POST_NORMAL', 0); ! @define('POST_STICKY', 1); ! @define('POST_ANNOUNCE', 2); ! @define('POST_GLOBAL_ANNOUNCE', 3); // SQL codes ! @define('BEGIN_TRANSACTION', 1); ! @define('END_TRANSACTION', 2); // Error codes ! @define('GENERAL_MESSAGE', 200); ! @define('GENERAL_ERROR', 202); ! @define('CRITICAL_MESSAGE', 203); ! @define('CRITICAL_ERROR', 204); // Private messaging ! @define('PRIVMSGS_READ_MAIL', 0); ! @define('PRIVMSGS_NEW_MAIL', 1); ! @define('PRIVMSGS_SENT_MAIL', 2); ! @define('PRIVMSGS_SAVED_IN_MAIL', 3); ! @define('PRIVMSGS_SAVED_OUT_MAIL', 4); ! @define('PRIVMSGS_UNREAD_MAIL', 5); // URL PARAMETERS ! @define('POST_TOPIC_URL', 't'); ! @define('POST_CAT_URL', 'c'); ! @define('POST_FORUM_URL', 'f'); ! @define('POST_USERS_URL', 'u'); ! @define('POST_POST_URL', 'p'); ! @define('POST_GROUPS_URL', 'g'); // Session parameters ! @define('SESSION_METHOD_COOKIE', 100); ! @define('SESSION_METHOD_GET', 101); // Page numbers for session handling ! @define('PAGE_INDEX', 0); ! @define('PAGE_LOGIN', -1); ! @define('PAGE_SEARCH', -2); ! @define('PAGE_REGISTER', -3); ! @define('PAGE_PROFILE', -4); ! @define('PAGE_VIEWONLINE', -6); ! @define('PAGE_VIEWMEMBERS', -7); ! @define('PAGE_FAQ', -8); ! @define('PAGE_POSTING', -9); ! @define('PAGE_PRIVMSGS', -10); ! @define('PAGE_GROUPCP', -11); ! @define('PAGE_TOPIC_OFFSET', 5000); // Auth settings ! @define('AUTH_LIST_ALL', 0); ! @define('AUTH_ALL', 0); ! @define('AUTH_REG', 1); ! @define('AUTH_ACL', 2); ! @define('AUTH_MOD', 3); ! @define('AUTH_ADMIN', 5); ! @define('AUTH_VIEW', 1); ! @define('AUTH_READ', 2); ! @define('AUTH_POST', 3); ! @define('AUTH_REPLY', 4); ! @define('AUTH_EDIT', 5); ! @define('AUTH_DELETE', 6); ! @define('AUTH_ANNOUNCE', 7); ! @define('AUTH_STICKY', 8); ! @define('AUTH_POLLCREATE', 9); ! @define('AUTH_VOTE', 10); ! @define('AUTH_ATTACH', 11); // Table names ! @define('CONFIRM_TABLE', $table_prefix.'confirm'); ! @define('AUTH_ACCESS_TABLE', $table_prefix.'auth_access'); ! @define('BANLIST_TABLE', $table_prefix.'banlist'); ! @define('CATEGORIES_TABLE', $table_prefix.'categories'); ! @define('CONFIG_TABLE', $table_prefix.'config'); ! @define('DISALLOW_TABLE', $table_prefix.'disallow'); ! @define('FORUMS_TABLE', $table_prefix.'forums'); ! @define('GROUPS_TABLE', $table_prefix.'groups'); ! @define('POSTS_TABLE', $table_prefix.'posts'); ! @define('POSTS_TEXT_TABLE', $table_prefix.'posts_text'); ! @define('PRIVMSGS_TABLE', $table_prefix.'privmsgs'); ! @define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text'); ! @define('PRIVMSGS_IGNORE_TABLE', $table_prefix.'privmsgs_ignore'); ! @define('PRUNE_TABLE', $table_prefix.'forum_prune'); ! @define('RANKS_TABLE', $table_prefix.'ranks'); ! @define('SEARCH_TABLE', $table_prefix.'search_results'); ! @define('SEARCH_WORD_TABLE', $table_prefix.'search_wordlist'); ! @define('SEARCH_MATCH_TABLE', $table_prefix.'search_wordmatch'); ! @define('SESSIONS_TABLE', $table_prefix.'sessions'); ! @define('SESSIONS_KEYS_TABLE', $table_prefix.'sessions_keys'); ! @define('SMILIES_TABLE', $table_prefix.'smilies'); ! @define('THEMES_TABLE', $table_prefix.'themes'); ! @define('THEMES_NAME_TABLE', $table_prefix.'themes_name'); ! @define('TOPICS_TABLE', $table_prefix.'topics'); ! @define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch'); ! @define('USER_GROUP_TABLE', $table_prefix.'user_group'); ! @define('USERS_TABLE', $table_prefix.'users'); ! @define('WORDS_TABLE', $table_prefix.'words'); ! @define('VOTE_DESC_TABLE', $table_prefix.'vote_desc'); ! @define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results'); ! @define('VOTE_USERS_TABLE', $table_prefix.'vote_voters'); ?> \ No newline at end of file |
|
From: MW <jo...@us...> - 2008-02-11 12:05:09
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19008/admin Modified Files: index.php Log Message: code styling: we use tabs and not spaces to indent code Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** index.php 10 Feb 2008 22:37:30 -0000 1.42 --- index.php 11 Feb 2008 12:05:04 -0000 1.43 *************** *** 370,375 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // END ! "L_WELCOME" => $lang['Welcome_mxBB'], ! "L_ADMIN_INTRO" => $lang['Admin_intro_mxBB'], "L_FORUM_STATS" => $lang['Forum_stats'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], --- 370,375 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // END ! "L_WELCOME" => $lang['Welcome_mxBB'], ! "L_ADMIN_INTRO" => $lang['Admin_intro_mxBB'], "L_FORUM_STATS" => $lang['Forum_stats'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], |
|
From: MW <jo...@us...> - 2008-02-11 11:57:50
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14664/admin Modified Files: admin_mx_styles.php Log Message: code styling: we use tabs and not spaces to indent code Index: admin_mx_styles.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_styles.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_mx_styles.php 11 Feb 2008 11:13:16 -0000 1.5 --- admin_mx_styles.php 11 Feb 2008 11:57:45 -0000 1.6 *************** *** 74,81 **** $sql = "INSERT INTO " . MX_THEMES_TABLE . " (template_name, style_name, head_stylesheet, portal_backend) ! VALUES( '" . $style_name . "', ! '" . $style_name . "', ! '" . $style_name . ".css', ! '" . PORTAL_BACKEND . "' )"; if( !$result = $db->sql_query($sql) ) --- 74,81 ---- $sql = "INSERT INTO " . MX_THEMES_TABLE . " (template_name, style_name, head_stylesheet, portal_backend) ! VALUES( '" . $style_name . "', ! '" . $style_name . "', ! '" . $style_name . ".css', ! '" . PORTAL_BACKEND . "' )"; if( !$result = $db->sql_query($sql) ) |
|
From: MW <jo...@us...> - 2008-02-11 11:52:40
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12622/admin Modified Files: admin_mx_smilies.php Log Message: xHTML Rule Violation: input tag must be closed for valid xHTML output Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_mx_smilies.php 11 Feb 2008 11:13:16 -0000 1.4 --- admin_mx_smilies.php 11 Feb 2008 11:52:35 -0000 1.5 *************** *** 231,235 **** $smile_paks_select .= "</select>"; ! $hidden_vars = "<input type='hidden' name='mode' value='import'>"; $template->set_filenames(array( --- 231,235 ---- $smile_paks_select .= "</select>"; ! $hidden_vars = "<input type='hidden' name='mode' value='import'/>"; $template->set_filenames(array( |
|
From: MW <jo...@us...> - 2008-02-11 11:45:49
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12157/admin Modified Files: admin_mx_phpinfo.php Log Message: xHTML Rule Violation: line break tag must be closed for valid xHTML output Index: admin_mx_phpinfo.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_phpinfo.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_mx_phpinfo.php 4 Feb 2008 15:44:45 -0000 1.13 --- admin_mx_phpinfo.php 11 Feb 2008 11:45:44 -0000 1.14 *************** *** 42,46 **** // $allowedTags = '<h1><h2><h3><hr><ul><ol><li><b><i><u>'. ! '<a><pre><blockquote><img><div><span><p><br>'. '<table><tr><td><th><thead><tbody><tfoot>'; --- 42,46 ---- // $allowedTags = '<h1><h2><h3><hr><ul><ol><li><b><i><u>'. ! '<a><pre><blockquote><img><div><span><p><br/>'. '<table><tr><td><th><thead><tbody><tfoot>'; |
|
From: MW <jo...@us...> - 2008-02-11 11:36:03
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11129/admin Modified Files: admin_mx_gen_cache.php Log Message: xHTML Rule Violation: input tag must be closed for valid xHTML output Index: admin_mx_gen_cache.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_gen_cache.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** admin_mx_gen_cache.php 4 Feb 2008 15:44:45 -0000 1.27 --- admin_mx_gen_cache.php 11 Feb 2008 11:35:57 -0000 1.28 *************** *** 42,46 **** $message = $lang['Cache_explain'] . '<br /> <br /> <br />'; $message .= '<form action="' . mx_append_sid(PORTAL_URL . "admin/admin_mx_gen_cache.$phpEx") . '" method="post">'; ! $message .= '<input type="hidden" name="generate" value="1">'; $message .= '<input type="submit" name="submit" value="' . $lang['Cache_submit'] . ' >>" class="liteoption" />'; $message .= '</form>'; --- 42,46 ---- $message = $lang['Cache_explain'] . '<br /> <br /> <br />'; $message .= '<form action="' . mx_append_sid(PORTAL_URL . "admin/admin_mx_gen_cache.$phpEx") . '" method="post">'; ! $message .= '<input type="hidden" name="generate" value="1"/>'; $message .= '<input type="submit" name="submit" value="' . $lang['Cache_submit'] . ' >>" class="liteoption" />'; $message .= '</form>'; |
|
From: MW <jo...@us...> - 2008-02-11 11:27:32
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10592/admin Modified Files: admin_mx_chkobjs.php Log Message: code styling: missing braces Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** admin_mx_chkobjs.php 11 Feb 2008 11:13:16 -0000 1.27 --- admin_mx_chkobjs.php 11 Feb 2008 11:27:26 -0000 1.28 *************** *** 316,320 **** --- 316,322 ---- $sql = "SELECT * FROM ".$tbname." WHERE ".$where; if( !($row = chkobjs_dbFetchRow($sql)) ) + { return false; + } return $row[$field]; } *************** *** 329,336 **** { global $db; ! if( !($result = $db->sql_query($sql)) ) return false; ! if( !($row = $db->sql_fetchrow($result)) ) return false; return $row; } --- 331,343 ---- { global $db; ! if (!($result = $db->sql_query($sql))) ! { return false; ! } ! ! if (!($row = $db->sql_fetchrow($result))) ! { return false; + } return $row; } *************** *** 345,350 **** { global $db; ! if( !($result = $db->sql_query($sql)) ) return false; return $result; } --- 352,359 ---- { global $db; ! if (!($result = $db->sql_query($sql))) ! { return false; + } return $result; } |
|
From: MW <jo...@us...> - 2008-02-11 11:13:22
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9731/modules/mx_phpbb2blocks Modified Files: mx_last_msg.php Log Message: code styling: replaced hard coded .php file extentions with $phpEx Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_last_msg.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_last_msg.php 9 Feb 2008 19:47:17 -0000 1.8 --- mx_last_msg.php 11 Feb 2008 11:13:17 -0000 1.9 *************** *** 175,179 **** 'U_ALIGN' => $align, 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'U_URL' => mx_append_sid(PORTAL_URL . 'index.php' . '?block_id=' . $block_id), 'U_URL_NEXT' => $url_next, 'U_URL_PREV' => $url_prev, --- 175,179 ---- 'U_ALIGN' => $align, 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'U_URL' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?block_id=' . $block_id), 'U_URL_NEXT' => $url_next, 'U_URL_PREV' => $url_prev, |
|
From: MW <jo...@us...> - 2008-02-11 11:13:22
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9731/includes Modified Files: page_header.php mx_functions_core.php Log Message: code styling: replaced hard coded .php file extentions with $phpEx Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** page_header.php 9 Feb 2008 19:44:11 -0000 1.52 --- page_header.php 11 Feb 2008 11:13:17 -0000 1.53 *************** *** 294,300 **** } ! $search_page_id_pafiledb = get_page_id('dload.php', true); ! $search_page_id_kb = get_page_id('kb.php', true); ! $search_page_id_site = get_page_id('mx_search.php', true); $option_search_site = !empty($search_page_id_site) ? '<option value="site">' . $lang['Mx_search_site'] . '</option>' : ''; --- 294,300 ---- } ! $search_page_id_pafiledb = get_page_id('dload.' . $phpEx, true); ! $search_page_id_kb = get_page_id('kb.' . $phpEx, true); ! $search_page_id_site = get_page_id('mx_search.' . $phpEx, true); $option_search_site = !empty($search_page_id_site) ? '<option value="site">' . $lang['Mx_search_site'] . '</option>' : ''; Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** mx_functions_core.php 10 Feb 2008 21:32:31 -0000 1.72 --- mx_functions_core.php 11 Feb 2008 11:13:17 -0000 1.73 *************** *** 1410,1414 **** global $mx_request_vars; ! $is_dynamic = ( ( $this->block_file == 'mx_dynamic.php' ) ? true : false ); if ( $is_dynamic ) --- 1410,1414 ---- global $mx_request_vars; ! $is_dynamic = ( ( $this->block_file == 'mx_dynamic.' . $phpEx ) ? true : false ); if ( $is_dynamic ) *************** *** 1434,1438 **** function _is_sub() { ! $is_sub = ( ( $this->block_file == 'mx_multiple_blocks.php' ) ? true : false ); if ( $is_sub ) --- 1434,1438 ---- function _is_sub() { ! $is_sub = ( ( $this->block_file == 'mx_multiple_blocks.' . $phpEx ) ? true : false ); if ( $is_sub ) *************** *** 1661,1665 **** } ! $edit_file = !empty( $this->block_edit_file ) ? $this->block_edit_file : 'modules/mx_coreblocks/mx_blockcp.php'; // --- 1661,1665 ---- } ! $edit_file = !empty( $this->block_edit_file ) ? $this->block_edit_file : 'modules/mx_coreblocks/mx_blockcp.' . $phpEx; // *************** *** 1889,1895 **** global $mx_root_path; ! if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' ) ) { ! include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' ); if (class_exists('mx_module_defs')) --- 1889,1895 ---- global $mx_root_path; ! if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ) ) { ! include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ); if (class_exists('mx_module_defs')) *************** *** 1918,1924 **** global $mx_root_path; ! if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' ) ) { ! include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' ); if (class_exists('mx_module_defs')) --- 1918,1924 ---- global $mx_root_path; ! if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ) ) { ! include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ); if (class_exists('mx_module_defs')) *************** *** 1946,1952 **** global $mx_root_path; ! if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' ) ) { ! include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' ); if (class_exists('mx_module_defs')) --- 1946,1952 ---- global $mx_root_path; ! if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ) ) { ! include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ); if (class_exists('mx_module_defs')) |
|
From: MW <jo...@us...> - 2008-02-11 11:13:22
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9731 Modified Files: common.php index.php Log Message: code styling: replaced hard coded .php file extentions with $phpEx Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** common.php 10 Feb 2008 21:04:29 -0000 1.81 --- common.php 11 Feb 2008 11:13:17 -0000 1.82 *************** *** 243,249 **** if ($portal_config['mod_rewrite']) { ! if ( file_exists( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_functions.php' ) ) { ! include_once( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_functions.php' ); if (class_exists('mx_mod_rewrite')) --- 243,249 ---- if ($portal_config['mod_rewrite']) { ! if ( file_exists( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_functions.' . $phpEx ) ) { ! include_once( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_functions.' . $phpEx ); if (class_exists('mx_mod_rewrite')) Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** index.php 4 Feb 2008 16:03:00 -0000 1.73 --- index.php 11 Feb 2008 11:13:17 -0000 1.74 *************** *** 287,291 **** if ( $mx_block->auth_view && $mx_block->show_block && $mx_block->module_root_path != 'modules/mx_phpbb/' || $mx_block->auth_mod ) { ! $layouttemplate->assign_block_vars('layout_column.blocks.block_header', array()); } --- 287,291 ---- if ( $mx_block->auth_view && $mx_block->show_block && $mx_block->module_root_path != 'modules/mx_phpbb/' || $mx_block->auth_mod ) { ! $layouttemplate->assign_block_vars('layout_column.blocks.block_header', array()); } |
|
From: MW <jo...@us...> - 2008-02-11 11:13:22
|
Update of /cvsroot/mxbb/core/modules/mx_shared/ErrorHandler In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9731/modules/mx_shared/ErrorHandler Modified Files: prepend.php Log Message: code styling: replaced hard coded .php file extentions with $phpEx Index: prepend.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_shared/ErrorHandler/prepend.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** prepend.php 5 Apr 2006 21:05:28 -0000 1.1 --- prepend.php 11 Feb 2008 11:13:18 -0000 1.2 *************** *** 1,4 **** <?php ! include_once dirname(__FILE__) . '/Handler.php'; $__ErrorHandler = new ErrorHandler; set_error_handler(array(&$__ErrorHandler, 'raiseError')); --- 1,4 ---- <?php ! include_once dirname(__FILE__) . '/Handler.' . $phpEx; $__ErrorHandler = new ErrorHandler; set_error_handler(array(&$__ErrorHandler, 'raiseError')); |
|
From: MW <jo...@us...> - 2008-02-11 11:13:22
|
Update of /cvsroot/mxbb/core/modules/mx_mod_rewrite/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9731/modules/mx_mod_rewrite/includes Modified Files: rewrite_functions.php Log Message: code styling: replaced hard coded .php file extentions with $phpEx Index: rewrite_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_mod_rewrite/includes/rewrite_functions.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** rewrite_functions.php 4 Feb 2008 16:51:35 -0000 1.9 --- rewrite_functions.php 11 Feb 2008 11:13:18 -0000 1.10 *************** *** 45,51 **** // Load Custom Defs (if any) // ! if ( file_exists( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_custom_defs.php' ) ) { ! include_once( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_custom_defs.php' ); if (class_exists('mx_mod_rewrite_custom')) --- 45,51 ---- // Load Custom Defs (if any) // ! if ( file_exists( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_custom_defs.' . $phpEx ) ) { ! include_once( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_custom_defs.' . $phpEx ); if (class_exists('mx_mod_rewrite_custom')) |
|
From: MW <jo...@us...> - 2008-02-11 11:13:21
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9731/install Modified Files: mx_install.php Log Message: code styling: replaced hard coded .php file extentions with $phpEx Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** mx_install.php 10 Feb 2008 20:58:47 -0000 1.90 --- mx_install.php 11 Feb 2008 11:13:17 -0000 1.91 *************** *** 650,654 **** @chmod($mx_root_path . "config.$phpEx", 0644); ! if ( !($fp = @fopen($mx_root_path.'config.php', 'w')) ) { $arg_mxbb_url = '<span style="color:blue;">' . $portal_url . '</span>'; --- 650,654 ---- @chmod($mx_root_path . "config.$phpEx", 0644); ! if ( !($fp = @fopen($mx_root_path.'config.' . $phpEx, 'w')) ) { $arg_mxbb_url = '<span style="color:blue;">' . $portal_url . '</span>'; *************** *** 711,715 **** @chmod($mx_root_path . "config.$phpEx", 0644); ! if ( !($fp = @fopen($mx_root_path.'config.php', 'w')) ) { $arg_mxbb_url = '<span style="color:blue;">' . $portal_url . '</span>'; --- 711,715 ---- @chmod($mx_root_path . "config.$phpEx", 0644); ! if ( !($fp = @fopen($mx_root_path.'config.' . $phpEx, 'w')) ) { $arg_mxbb_url = '<span style="color:blue;">' . $portal_url . '</span>'; |
|
From: MW <jo...@us...> - 2008-02-11 11:13:21
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9731/admin Modified Files: admin_mx_page_cp.php admin_mx_styles.php admin_mx_chkobjs.php admin_mx_module_cp.php admin_mx_portal.php index_new.php admin_mx_words.php admin_mx_module.php admin_mx_smilies.php Log Message: code styling: replaced hard coded .php file extentions with $phpEx Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** admin_mx_chkobjs.php 9 Feb 2008 12:44:32 -0000 1.26 --- admin_mx_chkobjs.php 11 Feb 2008 11:13:16 -0000 1.27 *************** *** 162,168 **** } ! include_once('./page_header_admin.php'); check_relationship($check_mode); ! include('./page_footer_admin.php'); exit; --- 162,168 ---- } ! include_once('./page_header_admin.' . $phpEx); check_relationship($check_mode); ! include('./page_footer_admin.' . $phpEx); exit; Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** admin_mx_page_cp.php 9 Feb 2008 19:45:34 -0000 1.29 --- admin_mx_page_cp.php 11 Feb 2008 11:13:16 -0000 1.30 *************** *** 618,622 **** $page_footer = $page_rows[$page_count]['page_footer']; $page_main_layout = $page_rows[$page_count]['page_main_layout']; ! $navigation_block_list = get_list_formatted('block_list', $page_rows[$page_count]['navigation_block'], 'navigation_block', 'mx_menu_nav.php'); $style_select = mx_style_select($page_rows[$page_count]['default_style'], 'mx_default_style', 'templates', true); --- 618,622 ---- $page_footer = $page_rows[$page_count]['page_footer']; $page_main_layout = $page_rows[$page_count]['page_main_layout']; ! $navigation_block_list = get_list_formatted('block_list', $page_rows[$page_count]['navigation_block'], 'navigation_block', 'mx_menu_nav.' . $phpEx); $style_select = mx_style_select($page_rows[$page_count]['default_style'], 'mx_default_style', 'templates', true); Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** admin_mx_module.php 9 Feb 2008 19:45:34 -0000 1.50 --- admin_mx_module.php 11 Feb 2008 11:13:16 -0000 1.51 *************** *** 367,372 **** // Generate Module and Function Page // ! include_once('./page_header_admin.php'); $template->pparse('body'); ! include('./page_footer_admin.php'); ?> \ No newline at end of file --- 367,372 ---- // Generate Module and Function Page // ! include_once('./page_header_admin.' . $phpEx); $template->pparse('body'); ! include('./page_footer_admin.' . $phpEx); ?> \ No newline at end of file Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** admin_mx_module_cp.php 9 Feb 2008 19:45:35 -0000 1.22 --- admin_mx_module_cp.php 11 Feb 2008 11:13:16 -0000 1.23 *************** *** 456,462 **** $type_row = array(); ! if ( file_exists( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.php' ) ) { ! include_once( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.php' ); if (class_exists('mx_module_defs')) --- 456,462 ---- $type_row = array(); ! if ( file_exists( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.' . $phpEx ) ) { ! include_once( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.' . $phpEx ); if (class_exists('mx_module_defs')) Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_smilies.php 9 Feb 2008 12:44:32 -0000 1.3 --- admin_mx_smilies.php 11 Feb 2008 11:13:16 -0000 1.4 *************** *** 71,75 **** // Load default header // ! include_once('./page_header_admin.php'); if ($cancel) --- 71,75 ---- // Load default header // ! include_once('./page_header_admin.' . $phpEx); if ($cancel) Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index_new.php 9 Feb 2008 12:44:32 -0000 1.8 --- index_new.php 11 Feb 2008 11:13:16 -0000 1.9 *************** *** 105,113 **** include_once( $phpbb_root_path . 'includes/functions_selects.' . $phpEx ); // LOAD phpbb2 file functions_select for 2.8.0 include_once( $phpbb_root_path . 'includes/functions.php' ); ! include_once( $phpbb_root_path . 'includes/functions_validate.php' ); } if ( PORTAL_BACKEND == OLYMPUS_BACKEND ) { ! include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.php' ); mx_page::load_file( 'acp/auth', 'phpbb3' ); // mx_page::load_file( 'auth', 'phpbb3'); --- 105,113 ---- include_once( $phpbb_root_path . 'includes/functions_selects.' . $phpEx ); // LOAD phpbb2 file functions_select for 2.8.0 include_once( $phpbb_root_path . 'includes/functions.php' ); ! include_once( $phpbb_root_path . 'includes/functions_validate.' . $phpEx ); } if ( PORTAL_BACKEND == OLYMPUS_BACKEND ) { ! include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); mx_page::load_file( 'acp/auth', 'phpbb3' ); // mx_page::load_file( 'auth', 'phpbb3'); *************** *** 590,594 **** continue; } ! if ( eregi( 'index.php', $match_links['LINK'][$i] ) ) { $text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text ); --- 590,594 ---- continue; } ! if ( eregi( 'index.' . $phpEx, $match_links['LINK'][$i] ) ) { $text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text ); Index: admin_mx_words.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_words.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_words.php 9 Feb 2008 12:44:32 -0000 1.2 --- admin_mx_words.php 11 Feb 2008 11:13:16 -0000 1.3 *************** *** 42,46 **** // Load default header // ! include_once('./page_header_admin.php'); if ($cancel) --- 42,46 ---- // Load default header // ! include_once('./page_header_admin.' . $phpEx); if ($cancel) Index: admin_mx_styles.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_styles.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_mx_styles.php 10 Feb 2008 22:09:34 -0000 1.4 --- admin_mx_styles.php 11 Feb 2008 11:13:16 -0000 1.5 *************** *** 44,48 **** // Load default header // ! include_once('./page_header_admin.php'); $confirm = $mx_request_vars->is_post('confirm'); --- 44,48 ---- // Load default header // ! include_once('./page_header_admin.' . $phpEx); $confirm = $mx_request_vars->is_post('confirm'); *************** *** 264,268 **** if ($mx_request_vars->is_empty_post('send_file')) { ! include('./page_footer_admin.php'); } --- 264,268 ---- if ($mx_request_vars->is_empty_post('send_file')) { ! include('./page_footer_admin.' . $phpEx); } Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** admin_mx_portal.php 10 Feb 2008 21:23:20 -0000 1.40 --- admin_mx_portal.php 11 Feb 2008 11:13:16 -0000 1.41 *************** *** 112,116 **** $template->set_filenames(array( 'admin_portal' => 'admin/admin_mx_portal.tpl') ); ! $navigation_block_list = get_list_formatted('block_list', $portal_config['navigation_block'], 'navigation_block', 'mx_menu_nav.php', false, 'mx_site_nav.php'); $portal_config['default_lang'] = $portal_config['default_lang'] == -1 ? $board_config['default_lang'] : $portal_config['default_lang']; --- 112,116 ---- $template->set_filenames(array( 'admin_portal' => 'admin/admin_mx_portal.tpl') ); ! $navigation_block_list = get_list_formatted('block_list', $portal_config['navigation_block'], 'navigation_block', 'mx_menu_nav.' . $phpEx, false, 'mx_site_nav.' . $phpEx); $portal_config['default_lang'] = $portal_config['default_lang'] == -1 ? $board_config['default_lang'] : $portal_config['default_lang']; |
|
From: MW <jo...@us...> - 2008-02-11 11:13:21
|
Update of /cvsroot/mxbb/core/modules/mx_shared/SimpleTextEditor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9731/modules/mx_shared/SimpleTextEditor Modified Files: SimpleTextEditor.css.php Log Message: code styling: replaced hard coded .php file extentions with $phpEx Index: SimpleTextEditor.css.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_shared/SimpleTextEditor/SimpleTextEditor.css.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimpleTextEditor.css.php 5 Apr 2006 21:05:28 -0000 1.1 --- SimpleTextEditor.css.php 11 Feb 2008 11:13:16 -0000 1.2 *************** *** 1,4 **** <?php ! require '../../config.php'; header('Content-type: text/css'); ?> --- 1,4 ---- <?php ! require '../../config.' . $phpEx; header('Content-type: text/css'); ?> |
|
From: MW <jo...@us...> - 2008-02-11 11:13:21
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9731/modules/mx_navmenu/admin Modified Files: mx_module_defs.php Log Message: code styling: replaced hard coded .php file extentions with $phpEx Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** mx_module_defs.php 10 Feb 2008 21:27:17 -0000 1.34 --- mx_module_defs.php 11 Feb 2008 11:13:16 -0000 1.35 *************** *** 234,238 **** // Get blockcp mode -> to set action file // ! $s_action_file = $mx_blockcp->blockcp_mode == 'mx_blockcp' ? 'modules/mx_coreblocks/mx_blockcp.php' : 'admin/admin_mx_block_cp.php'; // --- 234,238 ---- // Get blockcp mode -> to set action file // ! $s_action_file = $mx_blockcp->blockcp_mode == 'mx_blockcp' ? 'modules/mx_coreblocks/mx_blockcp.' . $phpEx : 'admin/admin_mx_block_cp.' . $phpEx; // *************** *** 795,799 **** // Get blockcp mode -> to set action file // ! $s_action_file = $mx_blockcp->blockcp_mode == 'mx_blockcp' ? 'modules/mx_coreblocks/mx_blockcp.php' : 'admin/admin_mx_block_cp.php'; // --- 795,799 ---- // Get blockcp mode -> to set action file // ! $s_action_file = $mx_blockcp->blockcp_mode == 'mx_blockcp' ? 'modules/mx_coreblocks/mx_blockcp.' . $phpEx : 'admin/admin_mx_block_cp.' . $phpEx; // |
|
From: MW <jo...@us...> - 2008-02-11 11:07:10
|
Update of /cvsroot/mxbb/core/templates/prosilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9242/templates/prosilver/admin Modified Files: mx_modulecp_admin_body.html Log Message: adjusted internal positions and proportions in panel block where labels overwrote yes/no checkboxes. In consulation with Culprit Index: mx_modulecp_admin_body.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/admin/mx_modulecp_admin_body.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_modulecp_admin_body.html 8 Jan 2008 18:01:21 -0000 1.2 --- mx_modulecp_admin_body.html 11 Feb 2008 11:07:04 -0000 1.3 *************** *** 248,260 **** <div class="inner"> <form action="{S_ACTION}" method="post" name="jumpbox"> ! <div style="float:left;width:40%;"> <fieldset> <legend>{L_INCLUDE_BLOCK}</legend> ! <div style="float:right;margin-left:10px;width:20%;text-align:right;"><br /> <input type="submit" value="{S_SUBMIT}" class="button2" /> </div> ! <div style="clear:left;width:79%;float:left;white-space:nowrap;"> <dl> ! <dt style="width:60%;"><label for="include_block_quickedit_1">{L_INCLUDE_BLOCK_QUICKEDIT}</label></dt> <dd style="border:none;padding-right:0px;"> <input type="radio" name="include_block_quickedit" id="include_block_quickedit_1" value="1" class="radio" {S_INCLUDE_BLOCK_QUICKEDIT_YES} /> <label for="include_block_quickedit_1">{L_YES}</label> --- 248,260 ---- <div class="inner"> <form action="{S_ACTION}" method="post" name="jumpbox"> ! <div style="float:left;width:45%;"> <fieldset> <legend>{L_INCLUDE_BLOCK}</legend> ! <div style="float:right;margin-left:10px;margin-top:-15px;padding-bottom:15px;width:20%;text-align:right;"><br /> <input type="submit" value="{S_SUBMIT}" class="button2" /> </div> ! <div style="clear:left;width:95%;float:left;white-space:nowrap;"> <dl> ! <dt style="width:75%;"><label for="include_block_quickedit_1">{L_INCLUDE_BLOCK_QUICKEDIT}</label></dt> <dd style="border:none;padding-right:0px;"> <input type="radio" name="include_block_quickedit" id="include_block_quickedit_1" value="1" class="radio" {S_INCLUDE_BLOCK_QUICKEDIT_YES} /> <label for="include_block_quickedit_1">{L_YES}</label> *************** *** 263,267 **** </dl> <dl> ! <dt style="width:60%"><label for="include_block_private_1">{L_INCLUDE_BLOCK_PRIVATE}</label></dt> <dd style="border:none;padding-right:0px;"> <input type="radio" name="include_block_private" id="include_block_private_1" value="1" class="radio" {S_INCLUDE_BLOCK_PRIVATE_YES} /> <label for="include_block_private_1">{L_YES}</label> --- 263,267 ---- </dl> <dl> ! <dt style="width:75%"><label for="include_block_private_1">{L_INCLUDE_BLOCK_PRIVATE}</label></dt> <dd style="border:none;padding-right:0px;"> <input type="radio" name="include_block_private" id="include_block_private_1" value="1" class="radio" {S_INCLUDE_BLOCK_PRIVATE_YES} /> <label for="include_block_private_1">{L_YES}</label> |
|
From: Culprit <cul...@us...> - 2008-02-11 09:24:29
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2175/core/modules/mx_navmenu/templates/prosilver Modified Files: prosilver.css Log Message: Fix incorrect using of properties Index: prosilver.css =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/prosilver/prosilver.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** prosilver.css 4 Feb 2008 10:54:04 -0000 1.3 --- prosilver.css 11 Feb 2008 09:24:23 -0000 1.4 *************** *** 2,6 **** li.nav-button, li.nav-button-current { border-width: 1px; ! border-color: none; border-style: solid solid none solid; padding-left: 5px; --- 2,6 ---- li.nav-button, li.nav-button-current { border-width: 1px; ! border-color: Transparent; border-style: solid solid none solid; padding-left: 5px; *************** *** 22,31 **** li.nav-button-current A:link, li.nav-button-current A:visited, li.nav-button-current A:hover { ! background-image: url("images/bg_list.gif"); color: White; } li.nav-button-current A:active { ! background-image: url("images/bg_active.gif"); color: Red; } --- 22,31 ---- li.nav-button-current A:link, li.nav-button-current A:visited, li.nav-button-current A:hover { ! background-image: url("./../../../../templates/prosilver/theme/images/bg_list.gif"); color: White; } li.nav-button-current A:active { ! background-image: url("./../../../../templates/prosilver/theme/images/bg_active.gif"); color: Red; } *************** *** 41,45 **** border-right-style: none; border-right-width: 1px; ! border-right-color: ; list-style-type : disc; padding-top: 0px; --- 41,45 ---- border-right-style: none; border-right-width: 1px; ! border-right-color: Transparent; list-style-type : disc; padding-top: 0px; *************** *** 56,63 **** li.mnu-ov, li.mnu-ov-current { float:left; ! style-list-image: none; position:relative; padding: 4px; ! background: #12A3EB url("{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/images/sitebar_bg.gif") repeat-x; background-position: 0px -23px; border: none; --- 56,63 ---- li.mnu-ov, li.mnu-ov-current { float:left; ! list-style-image: none; position:relative; padding: 4px; ! background: #12A3EB url("./../../../../templates/prosilver/theme/images/sitebar_bg.gif") repeat-x; background-position: 0px -23px; border: none; |
|
From: MW <jo...@us...> - 2008-02-10 23:05:17
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21745/includes Modified Files: template.php Log Message: restore an by me accidently overwritten fix by culpit Index: template.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/template.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** template.php 9 Feb 2008 12:37:24 -0000 1.25 --- template.php 10 Feb 2008 23:05:13 -0000 1.26 *************** *** 1551,1555 **** // remove keyword $keyword_str = substr($line, $pos1, $pos2 - $pos1 + 4); ! $params_str = ($pos2 == $pos3) ? '' : substr($line, $pos3 + 1, $pos2 - $pos3 - 1); $code_lines[$i] = substr($line, $pos2 + 4); $i--; --- 1551,1555 ---- // remove keyword $keyword_str = substr($line, $pos1, $pos2 - $pos1 + 4); ! $params_str = ($pos2 == $pos3) ? '' : trim(substr($line, $pos3 + 1, $pos2 - $pos3 - 1)); $code_lines[$i] = substr($line, $pos2 + 4); $i--; |
2 messages has been excluded from this view by a project administrator.
