Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Jon O. <jon...@us...> - 2008-02-08 21:57:51
|
Update of /cvsroot/mxbb/mx_news/mx_news In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31363/mx_news Added Files: .htaccess index.htm mx_news_common.php Log Message: Ooops. this module was added to CORE by mistake, removed and readded as a module. --- NEW FILE: .htaccess --- deny from all --- NEW FILE: mx_news_common.php --- <?php /** * * @package mxBB Portal Module - mx_news * @version $Id: mx_news_common.php,v 1.1 2008/02/08 21:57:47 jonohlsson Exp $ * @copyright (c) 2002-2006 [Jon Ohlsson, Mohd Basri, wGEric, PHP Arena, pafileDB, CRLin] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ if ( !defined( 'IN_PORTAL' ) ) { die( "Hacking attempt" ); } /* // // addslashes to vars if magic_quotes_gpc is off // if ( !@function_exists( 'slash_input_data' ) ) { function slash_input_data( &$data ) { if ( is_array( $data ) ) { foreach ( $data as $k => $v ) { $data[$k] = ( is_array( $v ) ) ? slash_input_data( $v ) : addslashes( $v ); } } return $data; } } // // to make it work with php version under 4.1 and other stuff // if ( @phpversion() < '4.1' ) { $_GET = &$HTTP_GET_VARS; $_POST = &$HTTP_POST_VARS; $_COOKIE = &$HTTP_COOKIE_VARS; $_SERVER = &$HTTP_SERVER_VARS; $_ENV = &$HTTP_ENV_VARS; $_FILES = &$HTTP_POST_FILES; $_SESSION = &$HTTP_SESSION_VARS; } if ( !isset( $_REQUEST ) ) { $_REQUEST = array_merge( $_GET, $_POST, $_COOKIE ); } if ( !get_magic_quotes_gpc() ) { $_GET = slash_input_data( $_GET ); $_POST = slash_input_data( $_POST ); $_COOKIE = slash_input_data( $_COOKIE ); $_REQUEST = slash_input_data( $_REQUEST ); } */ // =================================================== // Include Files // =================================================== include_once( $module_root_path . 'mx_news/includes/mx_news_constants.' . $phpEx ); // // Load addon tools // // - Class module_cache // - Class mx_custom_fields // - Class mx_notification // - Class mx_text // - Class mx_text_formatting // include_once( $mx_root_path . 'includes/mx_functions_tools.' . $phpEx ); include_once( $module_root_path . 'mx_news/includes/functions.' . $phpEx ); include_once( $module_root_path . 'mx_news/includes/functions_auth.' . $phpEx ); include_once( $module_root_path . 'mx_news/includes/functions_mx_news.' . $phpEx ); // =================================================== // Load classes // =================================================== $mx_news_cache = new module_cache($module_root_path . 'mx_news/'); $mx_news_functions = new mx_news_functions(); if ( $mx_news_cache->exists( 'config' ) ) { $mx_news_config = $mx_news_cache->get( 'config' ); } else { $mx_news_config = $mx_news_functions->mx_news_config(); $mx_news_cache->put( 'config', $mx_news_config ); } if (defined( 'IN_ADMIN' )) { include_once( $module_root_path . 'mx_news/includes/functions_admin.' . $phpEx ); $mx_news = new mx_news_admin(); } else { $mx_news = new mx_news_public(); } ?> --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:57:50
|
Update of /cvsroot/mxbb/mx_news/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31363/admin Added Files: admin_mx_news.php index.htm Log Message: Ooops. this module was added to CORE by mistake, removed and readded as a module. --- NEW FILE: admin_mx_news.php --- <?php /** * * @package mxBB Portal Module - mx_news * @version $Id: admin_mx_news.php,v 1.1 2008/02/08 21:57:46 jonohlsson Exp $ * @copyright (c) 2002-2006 [Jon Ohlsson, Mohd Basri, wGEric, PHP Arena, pafileDB, CRLin] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ define( 'IN_PORTAL', true ); if ( !empty( $setmodules ) ) { $filename = basename( __FILE__ ); $module['mxNews_mx_news']['0_Configuration'] = 'modules/mx_news/admin/' . $filename . "?action=setting"; return; } $mx_root_path = '../../../'; $module_root_path = "../"; $phpEx = substr(strrchr(__FILE__, '.'), 1); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'mx_news/mx_news_common.' . $phpEx ); // ********************************************************************** // Read language definition // ********************************************************************** if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } else { include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } // // Get action variable other wise set it to the main // $action = ( isset( $_REQUEST['action'] ) ) ? htmlspecialchars( $_REQUEST['action'] ) : 'setting'; // // an array of all expected actions // $actions = array( 'setting' => 'setting' ); // // Lets Build the page // $mx_news->adminmodule( $actions[$action] ); $mx_news->modules[$actions[$action]]->main( $action ); $mx_news->modules[$actions[$action]]->_mx_news(); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); ?> --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:57:50
|
Update of /cvsroot/mxbb/mx_news/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31363/templates Added Files: index.htm Log Message: Ooops. this module was added to CORE by mistake, removed and readded as a module. --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:57:49
|
Update of /cvsroot/mxbb/mx_news/language In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31363/language Added Files: index.htm Log Message: Ooops. this module was added to CORE by mistake, removed and readded as a module. --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:56:43
|
Update of /cvsroot/mxbb/mx_news/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31302/admin Log Message: Directory /cvsroot/mxbb/mx_news/templates/_core/admin added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:56:29
|
Update of /cvsroot/mxbb/mx_news/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31274/_core Log Message: Directory /cvsroot/mxbb/mx_news/templates/_core added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:55:21
|
Update of /cvsroot/mxbb/mx_news/mx_news/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30835/modules Log Message: Directory /cvsroot/mxbb/mx_news/mx_news/modules added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:55:21
|
Update of /cvsroot/mxbb/mx_news/mx_news/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30835/includes Log Message: Directory /cvsroot/mxbb/mx_news/mx_news/includes added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:55:21
|
Update of /cvsroot/mxbb/mx_news/mx_news/images In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30835/images Log Message: Directory /cvsroot/mxbb/mx_news/mx_news/images added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:55:20
|
Update of /cvsroot/mxbb/mx_news/mx_news/cache In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30835/cache Log Message: Directory /cvsroot/mxbb/mx_news/mx_news/cache added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:55:20
|
Update of /cvsroot/mxbb/mx_news/mx_news/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30835/admin Log Message: Directory /cvsroot/mxbb/mx_news/mx_news/admin added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:54:55
|
Update of /cvsroot/mxbb/mx_news/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30788/lang_english Log Message: Directory /cvsroot/mxbb/mx_news/language/lang_english added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:54:28
|
Update of /cvsroot/mxbb/mx_news/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30749/admin Log Message: Directory /cvsroot/mxbb/mx_news/admin added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:54:28
|
Update of /cvsroot/mxbb/mx_news/mx_news In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30749/mx_news Log Message: Directory /cvsroot/mxbb/mx_news/mx_news added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:54:28
|
Update of /cvsroot/mxbb/mx_news/language In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30749/language Log Message: Directory /cvsroot/mxbb/mx_news/language added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-08 21:54:28
|
Update of /cvsroot/mxbb/mx_news/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30749/templates Log Message: Directory /cvsroot/mxbb/mx_news/templates added to the repository |
|
From: Culprit <cul...@us...> - 2008-02-08 15:55:27
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32614/core/includes/shared/phpbb3/includes Modified Files: functions.php Log Message: 2.9.x update :: function add_form_key bad variables Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** functions.php 8 Feb 2008 15:02:27 -0000 1.10 --- functions.php 8 Feb 2008 15:55:23 -0000 1.11 *************** *** 600,607 **** function add_form_key($form_name) { ! global $config, $template, $user; $now = time(); ! $token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : ''; ! $token = sha1($now . $user->data['user_form_salt'] . $form_name . $token_sid); $s_fields = build_hidden_fields(array( --- 600,607 ---- function add_form_key($form_name) { ! global $board_config, $template, $mx_user, $mx_acp; $now = time(); ! $token_sid = ($mx_user->data['user_id'] == ANONYMOUS && !empty($board_config['form_token_sid_guests'])) ? $mx_user->session_id : ''; ! $token = sha1($now . $mx_user->data['user_form_salt'] . $form_name . $token_sid); $s_fields = build_hidden_fields(array( |
|
From: MW <jo...@us...> - 2008-02-08 15:46:22
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28884/includes Modified Files: mx_functions_style.php Log Message: Missing quotation in constant define Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** mx_functions_style.php 8 Feb 2008 14:33:59 -0000 1.40 --- mx_functions_style.php 8 Feb 2008 15:46:18 -0000 1.41 *************** *** 1126,1130 **** $images['voting_graphic'] = $this->images('voting_graphic'); ! define(TEMPLATE_CONFIG, TRUE); break; --- 1126,1130 ---- $images['voting_graphic'] = $this->images('voting_graphic'); ! define('TEMPLATE_CONFIG', TRUE); break; |
|
From: Culprit <cul...@us...> - 2008-02-08 15:03:23
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10926/core/includes/shared/phpbb3/includes Added Files: message_parser.php Log Message: Massive update for 2.9.x --- NEW FILE: message_parser.php --- <?php /** * * @package Functions_phpBB3 * @version $Id: message_parser.php,v 1.1 2008/02/08 15:03:17 culprit_cz Exp $ * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com */ if ( !defined( 'IN_PORTAL' ) ) { die( "Hacking attempt" ); } if (!class_exists('bbcode')) { mx_page::load_file( 'bbcode', 'phpbb3'); } [...1610 lines suppressed...] unset($tmp_message); if (sizeof($poll['poll_options']) == 1) { $this->warn_msg[] = $mx_user->lang['TOO_FEW_POLL_OPTIONS']; } else if ($poll['poll_options_size'] > (int) $board_config['max_poll_options']) { $this->warn_msg[] = $mx_user->lang['TOO_MANY_POLL_OPTIONS']; } else if ($poll_max_options > $poll['poll_options_size']) { $this->warn_msg[] = $mx_user->lang['TOO_MANY_USER_OPTIONS']; } $poll['poll_max_options'] = ($poll['poll_max_options'] < 1) ? 1 : (($poll['poll_max_options'] > $board_config['max_poll_options']) ? $board_config['max_poll_options'] : $poll['poll_max_options']); } } ?> |
|
From: Culprit <cul...@us...> - 2008-02-08 15:02:34
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10500/core/includes/shared/phpbb3/includes Modified Files: functions.php Log Message: new ACP changes related. function add_form_key corrected function check_form_key added function group_create added Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** functions.php 6 Feb 2008 23:43:43 -0000 1.9 --- functions.php 8 Feb 2008 15:02:27 -0000 1.10 *************** *** 609,617 **** 'form_token' => $token, )); ! $template->assign_vars(array( ! 'S_FORM_TOKEN' => $s_fields, ! )); } } // Compatibility functions --- 609,823 ---- 'form_token' => $token, )); ! if ( defined( 'IN_ADMIN' ) && is_object( $mx_acp ) ) ! { ! $mx_acp->template->assign_var( 'S_FORM_TOKEN' , $s_fields ); ! } ! else ! { ! $template->assign_var( 'S_FORM_TOKEN', $s_fields ); ! } ! } ! ! /** ! * Check the form key. Required for all altering actions not secured by confirm_box ! * ! * @param string $form_name The name of the form; has to match the name used in add_form_key, otherwise no restrictions apply ! * @param int $timespan The maximum acceptable age for a submitted form in seconds. Defaults to the config setting. ! * @param string $return_page The address for the return link ! * @param bool $trigger If true, the function will triger an error when encountering an invalid form ! * @param int $minimum_time The minimum acceptable age for a submitted form in seconds ! */ ! function check_form_key( $form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false ) ! { ! global $board_config, $mx_user; ! if ( $timespan === false ) ! { ! // we enforce a minimum value of half a minute here. ! $timespan = ( $board_config['form_token_lifetime'] == -1 ) ? -1 : max( 30, $board_config['form_token_lifetime'] ); ! } ! if ( $minimum_time === false ) ! { ! $minimum_time = ( int ) $board_config['form_token_mintime']; ! } ! ! if ( isset( $_POST['creation_time'] ) && isset( $_POST['form_token'] ) ) ! { ! $creation_time = abs( phpBB3::request_var( 'creation_time', 0 ) ); ! $token = phpBB3::request_var( 'form_token', '' ); ! ! $diff = ( time() - $creation_time ); ! ! if ( ( $diff >= $minimum_time ) && ( ( $diff <= $timespan ) || $timespan == -1 ) ) ! { ! $token_sid = ( $mx_user->data['user_id'] == ANONYMOUS && !empty( $board_config['form_token_sid_guests'] ) ) ? $mx_user->session_id : ''; ! ! $key = sha1( $creation_time . $mx_user->data['user_form_salt'] . $form_name . $token_sid ); ! if ( $key === $token ) ! { ! return true; ! } ! } ! } ! if ( $trigger ) ! { ! trigger_error( $user->lang['FORM_INVALID'] . $return_page ); ! } ! print '<pre>'; ! print_r( $_POST ); ! die( 'here' ); ! return false; } + /** + * Add or edit a group. If we're editing a group we only update user + * parameters such as rank, etc. if they are changed + */ + function group_create( &$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false ) + { + global $phpbb_root_path, $board_config, $db, $mx_user, $file_upload; + + $error = array(); + $attribute_ary = array( 'group_colour' => 'string', + 'group_rank' => 'int', + 'group_avatar' => 'string', + 'group_avatar_type' => 'int', + 'group_avatar_width' => 'int', + 'group_avatar_height' => 'int', + + 'group_receive_pm' => 'int', + 'group_legend' => 'int', + 'group_message_limit' => 'int', + + 'group_founder_manage' => 'int', + ); + // Those are group-only attributes + $group_only_ary = array( 'group_receive_pm', 'group_legend', 'group_message_limit', 'group_founder_manage' ); + // Check data. Limit group name length. + if ( !utf8_strlen( $name ) || utf8_strlen( $name ) > 60 ) + { + $error[] = ( !utf8_strlen( $name ) ) ? $mx_user->lang['GROUP_ERR_USERNAME'] : $mx_user->lang['GROUP_ERR_USER_LONG']; + } + + $err = group_validate_groupname( $group_id, $name ); + if ( !empty( $err ) ) + { + $error[] = $mx_user->lang[$err]; + } + + if ( !in_array( $type, array( GROUP_OPEN, GROUP_CLOSED, GROUP_HIDDEN, GROUP_SPECIAL, GROUP_FREE ) ) ) + { + $error[] = $mx_user->lang['GROUP_ERR_TYPE']; + } + + if ( !sizeof( $error ) ) + { + $user_ary = array(); + $sql_ary = array( 'group_name' => ( string ) $name, + 'group_desc' => ( string ) $desc, + 'group_desc_uid' => '', + 'group_desc_bitfield' => '', + 'group_type' => ( int ) $type, + ); + // Parse description + if ( $desc ) + { + phpBB3::generate_text_for_storage( $sql_ary['group_desc'], $sql_ary['group_desc_uid'], $sql_ary['group_desc_bitfield'], $sql_ary['group_desc_options'], $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies ); + } + + if ( sizeof( $group_attributes ) ) + { + foreach ( $attribute_ary as $attribute => $_type ) + { + if ( isset( $group_attributes[$attribute] ) ) + { + settype( $group_attributes[$attribute], $_type ); + $sql_ary[$attribute] = $group_attributes[$attribute]; + } + } + } + // Setting the log message before we set the group id (if group gets added) + $log = ( $group_id ) ? 'LOG_GROUP_UPDATED' : 'LOG_GROUP_CREATED'; + + $query = ''; + + if ( $group_id ) + { + $sql = 'SELECT user_id + FROM ' . USERS_TABLE . ' + WHERE group_id = ' . $group_id; + $result = $db->sql_query( $sql ); + + while ( $row = $db->sql_fetchrow( $result ) ) + { + $user_ary[] = $row['user_id']; + } + $db->sql_freeresult( $result ); + + if ( isset( $sql_ary['group_avatar'] ) && !$sql_ary['group_avatar'] ) + { + remove_default_avatar( $group_id, $user_ary ); + } + if ( isset( $sql_ary['group_rank'] ) && !$sql_ary['group_rank'] ) + { + remove_default_rank( $group_id, $user_ary ); + } + + $sql = 'UPDATE ' . GROUPS_TABLE . ' + SET ' . $db->sql_build_array( 'UPDATE', $sql_ary ) . " + WHERE group_id = $group_id"; + $db->sql_query( $sql ); + // Since we may update the name too, we need to do this on other tables too... + $sql = 'UPDATE ' . MODERATOR_CACHE_TABLE . " + SET group_name = '" . $db->sql_escape( $sql_ary['group_name'] ) . "' + WHERE group_id = $group_id"; + $db->sql_query( $sql ); + } + else + { + $sql = 'INSERT INTO ' . GROUPS_TABLE . ' ' . $db->sql_build_array( 'INSERT', $sql_ary ); + $db->sql_query( $sql ); + } + + if ( !$group_id ) + { + $group_id = $db->sql_nextid(); + if ( isset( $sql_ary['group_avatar_type'] ) && $sql_ary['group_avatar_type'] == AVATAR_UPLOAD ) + { + group_correct_avatar( $group_id, $sql_ary['group_avatar'] ); + } + } + // Set user attributes + $sql_ary = array(); + if ( sizeof( $group_attributes ) ) + { + foreach ( $attribute_ary as $attribute => $_type ) + { + if ( isset( $group_attributes[$attribute] ) && !in_array( $attribute, $group_only_ary ) ) + { + // If we are about to set an avatar, we will not overwrite user avatars if no group avatar is set... + if ( strpos( $attribute, 'group_avatar' ) === 0 && !$group_attributes[$attribute] ) + { + continue; + } + + $sql_ary[$attribute] = $group_attributes[$attribute]; + } + } + } + + if ( sizeof( $sql_ary ) && sizeof( $user_ary ) ) + { + group_set_user_default( $group_id, $user_ary, $sql_ary ); + } + + $name = ( $type == GROUP_SPECIAL ) ? $mx_user->lang['G_' . $name] : $name; + //add_log( 'admin', $log, $name ); + + //group_update_listings( $group_id ); + } + + return ( sizeof( $error ) ) ? $error : false; + } + } // Compatibility functions |
|
From: Culprit <cul...@us...> - 2008-02-08 14:59:35
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9177/core/includes/shared/phpbb3/includes Modified Files: functions_hook.php functions_module.php Log Message: new admin ACP update phpBB3 backend Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** functions_hook.php 6 Feb 2008 15:13:40 -0000 1.7 --- functions_hook.php 8 Feb 2008 14:59:32 -0000 1.8 *************** *** 18,21 **** --- 18,25 ---- mx_page::load_file( 'functions', 'phpbb3'); mx_page::load_file( 'functions_module', 'phpbb3'); + mx_page::load_file( 'message_parser', 'phpbb3'); + //mx_page::load_file( 'functions_content', 'phpbb3'); + //mx_page::load_file( 'functions_user', 'phpbb3'); + //include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_module.' . $phpEx ); // include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); *************** *** 204,208 **** } } ! $script = preg_replace( array_keys( $preg_array ), array_values( $preg_array ), $script ); return $script; } --- 208,212 ---- } } ! $script = preg_replace( array_keys( $preg_array ), $preg_array, $script ); return $script; } *************** *** 210,216 **** function assign_content_acp( $html) { - //$html = preg_replace( '#.*\<div id="page-body"\>#si', '', $html); global $phpbb_root_path, $phpbb_admin_path; $html = trim(preg_replace('#<!-- INCLUDE overall_(header|footer)\.html -->#si', '', $html)); //$match_img_count = preg_match_all( '#img src="(adm\/[^"]*)"#s', $html, $match_img); --- 214,220 ---- function assign_content_acp( $html) { global $phpbb_root_path, $phpbb_admin_path; $html = trim(preg_replace('#<!-- INCLUDE overall_(header|footer)\.html -->#si', '', $html)); + $html = preg_replace( '#^.*\<div id="page-body"\>|<\/div>[^<]*<div id="page-footer">.*$#si', '', $html); //$match_img_count = preg_match_all( '#img src="(adm\/[^"]*)"#s', $html, $match_img); *************** *** 237,253 **** function _convert_links( $html ) { ! global $phpEx, $mx_request_vars; $panel_i = $mx_request_vars->request( 'i', ''); $menu_action = $this->mx_master->menu_actions; $admin_path = $mx_root_path. 'acp/'; ! $match_link_cnt = preg_match_all( '#(action|href)=[\'"](([^?]*)\??([^\'"]*?))[\'"]#si', $html, $match_link); ! $preg_array = array(); for( $i=0; $i<$match_link_cnt; $i++) { $params = str_replace( '&', '&', $match_link[4][$i]); $p_cnt = preg_match_all( '#([^=&]*)=([^&]*)#si', '&' . $params , $link_parts); ! $link_compare_ary = array_combine( $link_parts[1], $link_parts[2]); $eregi = 'adm/index.' . $phpEx . '?i=' . $panel_i . '&panel=' . $link_compare_ary['i'] . '&mode=' . $link_compare_ary['mode']; $panel = $menu_action[$eregi]; --- 241,258 ---- function _convert_links( $html ) { ! global $phpEx, $mx_request_vars, $mx_root_path; $panel_i = $mx_request_vars->request( 'i', ''); $menu_action = $this->mx_master->menu_actions; + array_shift( $menu_action); $admin_path = $mx_root_path. 'acp/'; ! $match_link_cnt = preg_match_all( '#(action|href)=[\'"](([^?]*)\??([^\'"]*)?)?[\'"]#si', $html, $match_link); ! $preg_array = array( '##si' => ''); for( $i=0; $i<$match_link_cnt; $i++) { $params = str_replace( '&', '&', $match_link[4][$i]); $p_cnt = preg_match_all( '#([^=&]*)=([^&]*)#si', '&' . $params , $link_parts); ! $link_compare_ary = @array_combine( $link_parts[1], $link_parts[2]); $eregi = 'adm/index.' . $phpEx . '?i=' . $panel_i . '&panel=' . $link_compare_ary['i'] . '&mode=' . $link_compare_ary['mode']; $panel = $menu_action[$eregi]; *************** *** 255,267 **** unset( $link_compare_ary['i']); unset( $link_compare_ary['mode']); ! ksort( $link_compare_ary); ! foreach( $link_compare_ary as $key => $value) { ! $link .= '&' . $key . '=' . $value; } ! $link_orig = preg_replace( '#([./\[\]\(\)?\\\\]{1})#si', "\\\\\\1", $match_link[2][$i]); ! $preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => $link)); } - return preg_replace( array_keys( $preg_array), $preg_array, $html); } --- 260,289 ---- unset( $link_compare_ary['i']); unset( $link_compare_ary['mode']); ! ! if ( is_array( $link_compare_ary)) { ! ksort( $link_compare_ary); ! $par_count = count( $link_compare_ary); ! $par_keys = array_keys( $link_compare_ary); ! for( $j=0; $j<$par_count; $j++) ! { ! $link .= '&' . $par_keys[$j] . '=' . $link_compare_ary[$par_keys[$j]]; ! } } ! $link_orig = preg_replace( '#([./\[\]\(\)?\\\\])#si', "\\\\\\1", $match_link[2][$i]); ! $link_orig = str_replace( '#', '\#', $link_orig); ! $preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => $admin_path . $link)); ! } ! //return $html; ! if( 0) ! { ! print '<pre>'; ! print htmlentities( trim($html)); ! foreach( $preg_array as $patt => $repl) ! { ! print '"' . $patt . '" => "' . $repl . '"<hr/>'; ! } ! die(); } return preg_replace( array_keys( $preg_array), $preg_array, $html); } Index: functions_module.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_module.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** functions_module.php 6 Feb 2008 23:43:43 -0000 1.9 --- functions_module.php 8 Feb 2008 14:59:32 -0000 1.10 *************** *** 45,48 **** --- 45,53 ---- var $module_ary = array(); + var $FUNCTION_REPLACE_PHPBB3_ARRAY = array( + 'request_var', 'add_form_key', 'generate_text_for_display', 'check_form_key', 'gen_sort_selects', + 'on_page', 'generate_pagination', 'generate_text_for_edit', 'generate_text_for_storage', 'group_create', + 'unique_id' + ); /** * List modules *************** *** 71,75 **** ORDER BY left_id ASC"; $result = $db->sql_query($sql); ! $rows = array(); while ($row = $db->sql_fetchrow($result)) --- 76,80 ---- ORDER BY left_id ASC"; $result = $db->sql_query($sql); ! $rows = array(); while ($row = $db->sql_fetchrow($result)) *************** *** 206,210 **** $names[$row['module_basename'] . '_' . $row['module_mode']][] = true; ! $module_row = array( 'depth' => $depth, --- 211,215 ---- $names[$row['module_basename'] . '_' . $row['module_mode']][] = true; ! $module_row = array( 'depth' => $depth, *************** *** 425,457 **** $modulecode = file_get_contents("$module_path/{$this->p_class}_$this->p_name.$phpEx"); ! $func_array = array( ! 'request_var', 'add_form_key', 'generate_text_for_display' ! ); $preg_array = array( '#^<\?(php)?|\?>$#si' => '', '#\$config#si' => '$board_config', ! '#\$cache#si' => '$mx_cache', ! '#\$user#si' => '$mx_user', ! '#\$auth#si' => '$phpbb_auth', '#append_sid\(#si' => 'mx3_append_sid(', '#get_username_string\(#si' => 'mx_get_username_string(', ! '#global#si' => 'global $mx_acp,', '#\$template-#si' => '$mx_acp->template-', '#\$mx_acp->template->assign_vars#si' => 'foreach( $mx_user->lang as $key => $value) { ! $mx_acp->template->assign_var( \'L_\' . $key, $value); } $mx_acp->template->assign_vars', ! '#(' . implode( '|', $func_array) . ')\(#si' => 'phpBB3::\1(', ! ); ! ! $modulecode = preg_replace( array_keys( $preg_array), $preg_array, $modulecode); ! //print_r( $mx_user); ! //$mx_user = new mx_user(); ! //$mx_user->add_lang('acp/groups'); ! //print_r( $mx_user->lang); ! //print '<pre style="font:10pt normal;font-family:Courier New">' .preg_replace( array("#\n#esi", "#\t#si"), array("'\n' . sprintf('%4d ', \$i++)", ' '), htmlentities( $modulecode ) ); ! //die(); eval($modulecode); --- 430,462 ---- $modulecode = file_get_contents("$module_path/{$this->p_class}_$this->p_name.$phpEx"); ! $preg_array = array( '#^<\?(php)?|\?>$#si' => '', '#\$config#si' => '$board_config', ! '#\$(cache|user)([,;])#si' => '$mx_\1\2', ! '#\$auth([,;])#si' => '$phpbb_auth\1', ! '#\$cache-#si' => '$mx_cache-', ! '#\$user-#si' => '$mx_user-', ! '#\$auth-#si' => '$phpbb_auth-', '#append_sid\(#si' => 'mx3_append_sid(', '#get_username_string\(#si' => 'mx_get_username_string(', ! '#global#si' => 'global $mx_acp,', '#\$template-#si' => '$mx_acp->template-', + '#trigger_error\(([^,)]*)([,\)])#si' => '$mx_acp->mx_message_die_acp( GENERAL_MESSAGE, \1 \2 ', '#\$mx_acp->template->assign_vars#si' => 'foreach( $mx_user->lang as $key => $value) { ! $mx_acp->template->assign_var( \'L_\' . $key, $value); } $mx_acp->template->assign_vars', ! '#(' . implode( '|', $this->FUNCTION_REPLACE_PHPBB3_ARRAY) . ')\(#si' => 'phpBB3::\1(', ! ); ! $modulecode = preg_replace( array_keys( $preg_array), $preg_array, $modulecode); ! ! if ( 0 ) ! { ! print '<pre style="font:10pt normal;font-family:Courier New">' .preg_replace( array("#\n#esi", "#\t#si"), array("'\n' . sprintf('%4d ', \$i++)", ' '), htmlentities( $modulecode ) ); ! die(); ! } eval($modulecode); *************** *** 515,519 **** $this->module->main($this->p_name, $this->p_mode); } ! return; } --- 520,524 ---- $this->module->main($this->p_name, $this->p_mode); } ! return; } |
|
From: Culprit <cul...@us...> - 2008-02-08 14:53:50
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6716/core/admin Modified Files: index_new.php Log Message: new admin acp Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index_new.php 7 Feb 2008 08:58:39 -0000 1.6 --- index_new.php 8 Feb 2008 14:53:45 -0000 1.7 *************** *** 9,13 **** * @origin This file is borrowed from phpBB, with some modifications */ - // Security and Page header define( 'IN_PORTAL', 1 ); --- 9,12 ---- *************** *** 16,20 **** $no_page_header = true; require( './pagestart.' . $phpEx ); [...969 lines suppressed...] case 3: *************** *** 829,836 **** $panel_html = ob_get_contents(); ob_end_clean(); ! $panel_html = preg_replace( array("#\n#esi", "#\t#si"), array("sprintf('%4d', \$i++) . '\n'", ' '), str_replace( "\n", "<br/>\n", htmlentities( $panel_html ) ));; break; case 4: ! eval( $script); } $mx_acp->assign_content_acp( $panel_html ); --- 834,841 ---- $panel_html = ob_get_contents(); ob_end_clean(); ! $panel_html = preg_replace( array( "#\n#esi", "#\t#si" ), array( "sprintf('%4d', \$i++) . '\n'", ' ' ), str_replace( "\n", "<br/>\n", htmlentities( $panel_html ) ) );; break; case 4: ! eval( $script ); } $mx_acp->assign_content_acp( $panel_html ); |
|
From: MW <jo...@us...> - 2008-02-08 14:34:08
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29652/includes Modified Files: mx_functions_style.php Log Message: Object var syntax error (typo) Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** mx_functions_style.php 5 Feb 2008 18:37:20 -0000 1.39 --- mx_functions_style.php 8 Feb 2008 14:33:59 -0000 1.40 *************** *** 1502,1506 **** // Inititate User data // ! $this->_init_session($user_ip, $thispage_id); $this->_init_userprefs(); --- 1502,1506 ---- // Inititate User data // ! $this->_init_session($user_ip, $this->page_id); $this->_init_userprefs(); |
Update of /cvsroot/mxbb/mx_smartor/templates/subSilver/images/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28067 Removed Files: download.gif download_all.gif guest_avatar.png icon_album.gif index.htm jupload_pic.gif manage_pic.gif normal_view.gif show_all_comments.gif show_all_pics.gif show_all_ratings.gif showall.gif simple_view.gif upload_pic.gif upload_pic_2.gif Log Message: upgrade --- show_all_ratings.gif DELETED --- --- normal_view.gif DELETED --- --- manage_pic.gif DELETED --- --- guest_avatar.png DELETED --- --- show_all_comments.gif DELETED --- --- upload_pic_2.gif DELETED --- --- download_all.gif DELETED --- --- jupload_pic.gif DELETED --- --- download.gif DELETED --- --- simple_view.gif DELETED --- --- show_all_pics.gif DELETED --- --- icon_album.gif DELETED --- --- showall.gif DELETED --- --- upload_pic.gif DELETED --- --- index.htm DELETED --- |
Update of /cvsroot/mxbb/mx_smartor/templates/subSilver/images In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27698/images Removed Files: Thumbs.db blue_dot.png default_avatar.png green_dot.png icon_dot.gif icon_left_arrow.gif icon_left_arrow2.gif icon_left_arrow3.gif icon_mini_album.gif icon_mini_album_13x13.gif icon_mini_showall.gif icon_minipost_new.gif icon_right_arrow.gif icon_right_arrow2.gif icon_right_arrow3.gif index.htm nothumbnail.jpg orange_dot.png spacer.gif yellow_dot.png Log Message: upgrade --- icon_left_arrow.gif DELETED --- --- spacer.gif DELETED --- --- icon_mini_album_13x13.gif DELETED --- --- Thumbs.db DELETED --- --- yellow_dot.png DELETED --- --- nothumbnail.jpg DELETED --- --- icon_mini_album.gif DELETED --- --- icon_right_arrow2.gif DELETED --- --- icon_left_arrow3.gif DELETED --- --- icon_mini_showall.gif DELETED --- --- green_dot.png DELETED --- --- blue_dot.png DELETED --- --- icon_right_arrow.gif DELETED --- --- icon_dot.gif DELETED --- --- orange_dot.png DELETED --- --- default_avatar.png DELETED --- --- icon_left_arrow2.gif DELETED --- --- icon_right_arrow3.gif DELETED --- --- index.htm DELETED --- --- icon_minipost_new.gif DELETED --- |
2 messages has been excluded from this view by a project administrator.
