[mxbb-commits] core/modules/mx_users/admin admin_groupcp.php, 1.5, 1.6 admin_prune_user_posts.php,

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/core/modules/mx_users/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/modules/mx_users/admin

Modified Files:
	admin_groupcp.php admin_prune_user_posts.php 
	admin_prune_users.php admin_userlist.php admin_users.php 
Log Message:
rewrite for php4 and php6 issues

Index: admin_groupcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_groupcp.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_groupcp.php	14 Jun 2008 19:17:56 -0000	1.5
--- admin_groupcp.php	30 Sep 2008 07:04:54 -0000	1.6
***************
*** 55,59 ****
  
  	$from = ( !empty($row['user_from']) ) ? $row['user_from'] : '&nbsp;';
! 	$joined = phpBB2::create_date($date_format, $row['user_regdate'], $board_config['board_timezone']);
  	$posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
  
--- 55,59 ----
  
  	$from = ( !empty($row['user_from']) ) ? $row['user_from'] : '&nbsp;';
! 	$joined = $phpBB2->create_date($date_format, $row['user_regdate'], $board_config['board_timezone']);
  	$posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
  
***************
*** 492,496 ****
  			if ($mx_request_vars->is_post('add'))
  			{
! 				$username = $mx_request_vars->is_post('username') ? phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : '';
  
  				$sql = "SELECT *
--- 492,496 ----
  			if ($mx_request_vars->is_post('add'))
  			{
! 				$username = $mx_request_vars->is_post('username') ? $phpBB2->phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : '';
  
  				$sql = "SELECT *
***************
*** 1083,1087 ****
  
  	$template->assign_vars(array(
! 		'PAGINATION' => phpBB2::generate_pagination("admin_groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id", $members_count, $board_config['topics_per_page'], $start),
  		'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), $current_page ),
  
--- 1083,1087 ----
  
  	$template->assign_vars(array(
! 		'PAGINATION' => $phpBB2->generate_pagination("admin_groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id", $members_count, $board_config['topics_per_page'], $start),
  		'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), $current_page ),
  

Index: admin_prune_users.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_prune_users.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin_prune_users.php	9 Feb 2008 21:14:27 -0000	1.3
--- admin_prune_users.php	30 Sep 2008 07:04:54 -0000	1.4
***************
*** 234,239 ****
  			$user_id = $inactive_users[$i]['user_id'];
  			$username = $inactive_users[$i]['username'];
! 			$user_lastvisit = ( !$inactive_users[$i]['user_lastvisit'] ) ? $lang['Never'] : phpBB2::create_date($board_config['default_dateformat'], $inactive_users[$i]['user_lastvisit'], $board_config['board_timezone']);
! 			$user_regdate = ( !$inactive_users[$i]['user_regdate'] ) ? $lang['Never'] : phpBB2::create_date($board_config['default_dateformat'], $inactive_users[$i]['user_regdate'], $board_config['board_timezone']);
  			$user_active = ( !$inactive_users[$i]['user_active'] ) ? $lang['No'] : $lang['Yes'];
  			$user_posts = $inactive_users[$i]['user_posts'];
--- 234,239 ----
  			$user_id = $inactive_users[$i]['user_id'];
  			$username = $inactive_users[$i]['username'];
! 			$user_lastvisit = ( !$inactive_users[$i]['user_lastvisit'] ) ? $lang['Never'] : $phpBB2->create_date($board_config['default_dateformat'], $inactive_users[$i]['user_lastvisit'], $board_config['board_timezone']);
! 			$user_regdate = ( !$inactive_users[$i]['user_regdate'] ) ? $lang['Never'] : $phpBB2->create_date($board_config['default_dateformat'], $inactive_users[$i]['user_regdate'], $board_config['board_timezone']);
  			$user_active = ( !$inactive_users[$i]['user_active'] ) ? $lang['No'] : $lang['Yes'];
  			$user_posts = $inactive_users[$i]['user_posts'];

Index: admin_prune_user_posts.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_prune_user_posts.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_prune_user_posts.php	15 Jul 2008 22:05:25 -0000	1.4
--- admin_prune_user_posts.php	30 Sep 2008 07:04:54 -0000	1.5
***************
*** 437,441 ****
  			{
  				// Encode the ip into hexademicals
! 				$ip = phpBB2::encode_ip($prune_ip);
  
  				// Because we will be deleting based on IP's, we will store the encoded IP alone
--- 437,441 ----
  			{
  				// Encode the ip into hexademicals
! 				$ip = $phpBB2->encode_ip($prune_ip);
  
  				// Because we will be deleting based on IP's, we will store the encoded IP alone
***************
*** 460,474 ****
  					case 4:
  						// We will encode the ip into hexademical quads
! 						$users[]['user_ip'] = phpBB2::encode_ip($ip_split[0].".".$ip_split[1].".".$ip_split[2].".255");
  						break;
  					// xxx.xxx.*
  					case 3:
  						// We will encode the ip into hexademical quads again..
! 						$users[]['user_ip'] = phpBB2::encode_ip($ip_split[0].".".$ip_split[1].".255.255");
  						break;
  					// xxx.*
  					case 2:
  						// We will encode the ip into hexademical quads again again....
! 						$users[]['user_ip'] = phpBB2::encode_ip($ip_split[0].".255.255.255");
  						break;
  				}
--- 460,474 ----
  					case 4:
  						// We will encode the ip into hexademical quads
! 						$users[]['user_ip'] = $phpBB2->encode_ip($ip_split[0].".".$ip_split[1].".".$ip_split[2].".255");
  						break;
  					// xxx.xxx.*
  					case 3:
  						// We will encode the ip into hexademical quads again..
! 						$users[]['user_ip'] = $phpBB2->encode_ip($ip_split[0].".".$ip_split[1].".255.255");
  						break;
  					// xxx.*
  					case 2:
  						// We will encode the ip into hexademical quads again again....
! 						$users[]['user_ip'] = $phpBB2->encode_ip($ip_split[0].".255.255.255");
  						break;
  				}
***************
*** 494,498 ****
  				{
  					// let's put it in the big array..
! 					$users[]['user_ip'] = phpBB2::encode_ip($start_range[0].".".$start_range[1].".".$start_range[2].".".$i);
  				}
  			}
--- 494,498 ----
  				{
  					// let's put it in the big array..
! 					$users[]['user_ip'] = $phpBB2->encode_ip($start_range[0].".".$start_range[1].".".$start_range[2].".".$i);
  				}
  			}

Index: admin_users.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_users.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_users.php	15 Jul 2008 22:05:25 -0000	1.8
--- admin_users.php	30 Sep 2008 07:04:55 -0000	1.9
***************
*** 272,276 ****
  		}
  
! 		$username = phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS));
  		$email = $mx_request_vars->post('email', MX_TYPE_NO_TAGS);
  
--- 272,276 ----
  		}
  
! 		$username = $phpBB2->phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS));
  		$email = $mx_request_vars->post('email', MX_TYPE_NO_TAGS);
  

Index: admin_userlist.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_userlist.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin_userlist.php	9 Feb 2008 12:51:07 -0000	1.3
--- admin_userlist.php	30 Sep 2008 07:04:55 -0000	1.4
***************
*** 953,958 ****
  				'I_AVATAR' => $avatar_img,
  
! 				'JOINED' => phpBB2::create_date('d M Y', $row['user_regdate'], $board_config['board_timezone']),
! 				'LAST_ACTIVITY' => ( !empty($row['user_session_time']) ) ? phpBB2::create_date('d M Y', $row['user_session_time'], $board_config['board_timezone']) : $lang['Never'],
  
  				'POSTS' => ( $row['user_posts'] ) ? $row['user_posts'] : 0,
--- 953,958 ----
  				'I_AVATAR' => $avatar_img,
  
! 				'JOINED' => $phpBB2->create_date('d M Y', $row['user_regdate'], $board_config['board_timezone']),
! 				'LAST_ACTIVITY' => ( !empty($row['user_session_time']) ) ? $phpBB2->create_date('d M Y', $row['user_session_time'], $board_config['board_timezone']) : $lang['Never'],
  
  				'POSTS' => ( $row['user_posts'] ) ? $row['user_posts'] : 0,
***************
*** 1047,1051 ****
  			$total_members = $total['total'];
  
! 			$pagination = phpBB2::generate_pagination($module_root_path . "admin/admin_userlist.$phpEx?sort=$sort&amp;order=$sort_order&amp;show=$show" . ( ( isset($alphanum) ) ? "&amp;alphanum=$alphanum" : '' ), $total_members, $show, $start);
  		}
  
--- 1047,1051 ----
  			$total_members = $total['total'];
  
! 			$pagination = $phpBB2->generate_pagination($module_root_path . "admin/admin_userlist.$phpEx?sort=$sort&amp;order=$sort_order&amp;show=$show" . ( ( isset($alphanum) ) ? "&amp;alphanum=$alphanum" : '' ), $total_members, $show, $start);
  		}

[mxbb-commits] core/modules/mx_users/admin admin_groupcp.php, 1.5, 1.6 admin_prune_user_posts.php,

[mxbb-commits] core/modules/mx_users/admin admin_groupcp.php, 1.5, 1.6 admin_prune_user_posts.php, 1.4, 1.5 admin_prune_users.php, 1.3, 1.4 admin_userlist.php, 1.3, 1.4 admin_users.php, 1.8, 1.9