[mxbb-commits] mx_smartor welcome.php,1.3,1.4

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21143

Modified Files:
	welcome.php 
Log Message:
Added new option to welcome block to see how many pictures are in personal gallery with url.

Index: welcome.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/welcome.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** welcome.php	14 Jun 2007 10:13:08 -0000	1.3
--- welcome.php	14 Jun 2007 16:55:58 -0000	1.4
***************
*** 88,92 ****
  // ------------------------------------
  
! $sql = "SELECT username
  		FROM ". USERS_TABLE ."
  		WHERE user_id = $user_id";
--- 88,92 ----
  // ------------------------------------
  
! $sql = "SELECT *
  		FROM ". USERS_TABLE ."
  		WHERE user_id = $user_id";
***************
*** 100,116 ****
  
  $username = $row['username'];
  
  if( empty($username) )
  {
  	$username = ( !empty($userdata['username']) ? $userdata['username'] : $lang['Guest'] );
  }
  
- 
- // --------------------------------------------------------------------------------
- // Block Procedure
- // --------------------------------------------------------------------------------
- 
- 
- 
  // ------------------------------------
  // Check Permissions
--- 100,117 ----
  
  $username = $row['username'];
+ $user_avatar_type = $row['user_avatar_type'];
+ $user_allowavatar = $row['user_allowavatar'];
+ $user_avatar = $row['user_avatar'];
+ $user_lastvisit = $row['user_lastvisit'];
  
  if( empty($username) )
  {
  	$username = ( !empty($userdata['username']) ? $userdata['username'] : $lang['Guest'] );
+ 	$user_avatar_type = ( !empty($userdata['user_avatar_type']) ? $userdata['user_avatar_type'] : '' );
+ 	$user_allowavatar = ( !empty($userdata['user_allowavatar']) ? $userdata['user_allowavatar'] : '' );
+ 	$user_avatar = ( !empty($userdata['user_avatar']) ? $userdata['user_avatar'] : '' );
+ 	$user_lastvisit = ( !empty($userdata['user_lastvisit']) ? $userdata['user_lastvisit'] : '' );
  }
  
  // ------------------------------------
  // Check Permissions
***************
*** 166,176 ****
  {
  	$avatar_img = '<img src="' . this_smartor_mxurl("smartor_mode=random_personal_thumbnail&user_id=". $user_id, TRUE) . '" alt="" border="0" />';
  }
! elseif (  $userdata['user_avatar_type'] && $userdata['user_allowavatar'] )
  {
! 	switch( $userdata['user_avatar_type'] )
  	{
  	case USER_AVATAR_UPLOAD:
! 		$avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_path'].'/'.$userdata['user_avatar'].'" alt="" border="0" />' : '';
  		break;
  	case USER_AVATAR_REMOTE:
--- 167,178 ----
  {
  	$avatar_img = '<img src="' . this_smartor_mxurl("smartor_mode=random_personal_thumbnail&user_id=". $user_id, TRUE) . '" alt="" border="0" />';
+ 	$template->assign_block_vars('switch_total_pics', array());
  }
! elseif (  $user_avatar_type && $user_allowavatar )
  {
! 	switch( $user_avatar_type )
  	{
  	case USER_AVATAR_UPLOAD:
! 		$avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_path'].'/'.$user_avatar.'" alt="" border="0" />' : '';
  		break;
  	case USER_AVATAR_REMOTE:
***************
*** 183,190 ****
  			}
  		}
! 		$avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="'.$userdata['user_avatar'].'"'.$img_width.' alt="" border="0" />' : '';
  		break;
  	case USER_AVATAR_GALLERY:
! 		$avatar_img = ( $board_config['allow_avatar_local']  ) ? '<img src="'.PHPBB_URL.$board_config['avatar_gallery_path'].'/'.$userdata['user_avatar'].'" alt="" border="0" />' : '';
  		break;
  	}
--- 185,192 ----
  			}
  		}
! 		$avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="'.$user_avatar.'"'.$img_width.' alt="" border="0" />' : '';
  		break;
  	case USER_AVATAR_GALLERY:
! 		$avatar_img = ( $board_config['allow_avatar_local']  ) ? '<img src="'.PHPBB_URL.$board_config['avatar_gallery_path'].'/'.$user_avatar.'" alt="" border="0" />' : '';
  		break;
  	}
***************
*** 227,231 ****
  if( $userdata['session_logged_in'] )
  {
! 	$s_last_visit = create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']);
  
  	if( $view_postcount )
--- 229,233 ----
  if( $userdata['session_logged_in'] )
  {
! 	$s_last_visit = create_date($board_config['default_dateformat'], $user_lastvisit, $board_config['board_timezone']);
  
  	if( $view_postcount )
***************
*** 300,304 ****
  	}
  }
! $user_link = ( $user_id != ANONYMOUS ) ? '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=editprofile&amp;".$userdata['user_id']).'">'.$username.'</a>' : $lang['Guest'];
  
  if( $report_page == 0 )
--- 302,306 ----
  	}
  }
! $user_link = ( $user_id != ANONYMOUS ) ? '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=editprofile&amp;".$user_id).'">'.$username.'</a>' : $lang['Guest'];
  
  if( $report_page == 0 )
***************
*** 352,355 ****
--- 354,360 ----
  	'U_MARK_READ'			=> append_sid(PHPBB_URL.'index.'.$phpEx . "?mark=forums"),
  
+ 	'L_TOTAL_PICS'			=> sprintf($lang['Total_Personal_Pics'], $total_pics),
+ 	'U_YOUR_PERSONAL_GALLERY' 	=> append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=" . $user_id)),
+ 
  	'L_PRIVATE_MSGS'		=> $lang['Private_Messages'].'&nbsp;('.$userdata['user_new_privmsg'].')',
  	'U_PRIVATE_MSGS'		=> append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'),