[mxbb-commits] mx_smartor/album_mod/modules album_showpage.php, 1.4, 1.5

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

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

Modified Files:
	album_showpage.php 
Log Message:
related...

Index: album_showpage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_showpage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_showpage.php	27 Mar 2008 14:31:11 -0000	1.4
--- album_showpage.php	13 Jul 2008 19:39:29 -0000	1.5
***************
*** 222,226 ****
  	$row = $db->sql_fetchrow($result);
  	$db->sql_freeresult($result);
! 				
  }
  else if (($mx_cache->get('thispic'.$pic_id)) && ($use_cache))
--- 222,226 ----
  	$row = $db->sql_fetchrow($result);
  	$db->sql_freeresult($result);
! 
  }
  else if (($mx_cache->get('thispic'.$pic_id)) && ($use_cache))
***************
*** 243,247 ****
  		}
  	}
! 	
  	$row = $db->sql_fetchrow($result);
  	$db->sql_freeresult($result);
--- 243,247 ----
  		}
  	}
! 
  	$row = $db->sql_fetchrow($result);
  	$db->sql_freeresult($result);
***************
*** 719,723 ****
  if( !isset($HTTP_POST_VARS['comment']) )
  {
! 	
  	/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 Comments Screen
--- 719,723 ----
  if( !isset($HTTP_POST_VARS['comment']) )
  {
! 
  	/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 Comments Screen
***************
*** 799,803 ****
  	{
  		$template->assign_block_vars('coment_switcharo_top', array());
! 		
  		$limit_sql = ($start == 0) ? $comments_per_page : $start .','. $comments_per_page;
  
--- 799,803 ----
  	{
  		$template->assign_block_vars('coment_switcharo_top', array());
! 
  		$limit_sql = ($start == 0) ? $comments_per_page : $start .','. $comments_per_page;
  
***************
*** 855,869 ****
  				$edit_info = '';
  			}
! 			
  			// Smilies
! 			$commentrow[$i]['comment_text'] = mx_smilies_pass($commentrow[$i]['comment_text']);
  			$commentrow[$i]['comment_text'] = make_clickable($commentrow[$i]['comment_text']);
  			$commentrow[$i]['comment_text'] = nl2br($commentrow[$i]['comment_text']);
! 			
  			//email, profile, pm links
  			$email_uri = ( $board_config['board_email_form'] ) ? mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $commentrow[$i]['user_id']) : 'mailto:' . $commentrow[$i]['user_email'];
  			$profile_url = mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $commentrow[$i]['user_id'] );
  			$pm_url = mx_append_sid($phpbb_root_path ."privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $commentrow[$i]['user_id']);
! 			
  			//avatar
  			$poster_avatar = '';
--- 855,869 ----
  				$edit_info = '';
  			}
! 
  			// Smilies
! 			$commentrow[$i]['comment_text'] = $mx_bbcode->smilies_pass($commentrow[$i]['comment_text']);
  			$commentrow[$i]['comment_text'] = make_clickable($commentrow[$i]['comment_text']);
  			$commentrow[$i]['comment_text'] = nl2br($commentrow[$i]['comment_text']);
! 
  			//email, profile, pm links
  			$email_uri = ( $board_config['board_email_form'] ) ? mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $commentrow[$i]['user_id']) : 'mailto:' . $commentrow[$i]['user_email'];
  			$profile_url = mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $commentrow[$i]['user_id'] );
  			$pm_url = mx_append_sid($phpbb_root_path ."privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $commentrow[$i]['user_id']);
! 
  			//avatar
  			$poster_avatar = '';
***************
*** 883,887 ****
  				}
  			}
! 			
  			//rank & rank image
  			$sql = "SELECT *
--- 883,887 ----
  				}
  			}
! 
  			//rank & rank image
  			$sql = "SELECT *
***************
*** 937,941 ****
  				$poster_rank = $lang['Guest'];
  			}
! 			
  			$template->assign_block_vars('commentrow', array(
  				'ID' => $commentrow[$i]['comment_id'],
--- 937,941 ----
  				$poster_rank = $lang['Guest'];
  			}
! 
  			$template->assign_block_vars('commentrow', array(
  				'ID' => $commentrow[$i]['comment_id'],
***************
*** 943,947 ****
  				'TIME' => create_date2($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
  				'IP' => ($userdata['user_level'] == ADMIN) ? 'http://whois.domaintools.com/' . decode_ip2($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip2($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',
! 				
  				//users mesangers, website, email
  				'PROFILE_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$profile_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>' : '',
--- 943,947 ----
  				'TIME' => create_date2($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
  				'IP' => ($userdata['user_level'] == ADMIN) ? 'http://whois.domaintools.com/' . decode_ip2($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip2($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',
! 
  				//users mesangers, website, email
  				'PROFILE_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$profile_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>' : '',
***************
*** 953,957 ****
  				'EMAIL_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>' : '',
  				'WWW_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_website'] ) ? '<a href="' . $commentrow[$i]['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '' : '',
! 				
  				'POSTER_AVATAR' => $poster_avatar,
  				'POSTER_RANK' => $poster_rank,
--- 953,957 ----
  				'EMAIL_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>' : '',
  				'WWW_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_website'] ) ? '<a href="' . $commentrow[$i]['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '' : '',
! 
  				'POSTER_AVATAR' => $poster_avatar,
  				'POSTER_RANK' => $poster_rank,
***************
*** 960,964 ****
  				'POSTER_POSTS' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Posts'] . ': ' . $commentrow[$i]['user_posts'] : '',
  				'POSTER_FROM' => ( $commentrow[$i]['user_from'] && $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Location'] . ': ' . $commentrow[$i]['user_from'] : '',
! 				
  
  				'TEXT' => $commentrow[$i]['comment_text'],
--- 960,964 ----
  				'POSTER_POSTS' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Posts'] . ': ' . $commentrow[$i]['user_posts'] : '',
  				'POSTER_FROM' => ( $commentrow[$i]['user_from'] && $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Location'] . ': ' . $commentrow[$i]['user_from'] : '',
! 
  
  				'TEXT' => $commentrow[$i]['comment_text'],
***************
*** 1024,1028 ****
  
  		$sql = 'SELECT emoticon, code, smile_url
! 						FROM ' . SMILIES_TABLE . ' 
  						GROUP BY smile_url
  						ORDER BY smilies_id LIMIT ' . $max_smilies;
--- 1024,1028 ----
  
  		$sql = 'SELECT emoticon, code, smile_url
! 						FROM ' . SMILIES_TABLE . '
  						GROUP BY smile_url
  						ORDER BY smilies_id LIMIT ' . $max_smilies;
***************
*** 1060,1064 ****
  		{
  			for ($i = 0; $i < $album_config['rate_scale']; $i++)
! 			{   
  				$template->assign_block_vars('switch_comment_post.rate_row', array(
  					'POINT' => ($i + 1)
--- 1060,1064 ----
  		{
  			for ($i = 0; $i < $album_config['rate_scale']; $i++)
! 			{
  				$template->assign_block_vars('switch_comment_post.rate_row', array(
  					'POINT' => ($i + 1)
***************
*** 1104,1108 ****
  		$slideshow_select .= '<option value="10">10 Sec</option>';
  		$slideshow_select .= '</select>&nbsp;';
! 		$slideshow_onoff = $lang['Slideshow_On']; 
  		//$slideshow_link = mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . '&amp;full=true&amp;slideshow=' . $slideshow_delay));
  		$slideshow_link = mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . '&amp;full=true'));
--- 1104,1108 ----
  		$slideshow_select .= '<option value="10">10 Sec</option>';
  		$slideshow_select .= '</select>&nbsp;';
! 		$slideshow_onoff = $lang['Slideshow_On'];
  		//$slideshow_link = mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . '&amp;full=true&amp;slideshow=' . $slideshow_delay));
  		$slideshow_link = mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . '&amp;full=true'));
***************
*** 1179,1188 ****
  		'U_PIC_L2' => ( $picm ) ? '</a>' : '',
  		'U_PIC_CLICK' => ( $picm ) ? '' : 'Click on image to view larger image',
! 		
  		'U_PIC_THUMB' => mx_append_sid(this_smartor_mxurl('smartor_mode=album_thumbnail&pic_id=' . $pic_id . $full_size_param . $nuffimage_vars, true)),
  		'U_PIC_LINK' => mx_append_sid(this_smartor_mxurl('smartor_mode=album_showpage&pic_id=' . $pic_id . $full_size_param . $nuffimage_vars, false)),
  
  		'U_SMILEY_CREATOR' => mx_append_sid(this_smartor_mxurl('smartor_mode=smiley_creator&mode=text2shield')),
! 		
  		'NEXT_PIC' => $next_pic,
  		'PREV_PIC' => $prev_pic,
--- 1179,1188 ----
  		'U_PIC_L2' => ( $picm ) ? '</a>' : '',
  		'U_PIC_CLICK' => ( $picm ) ? '' : 'Click on image to view larger image',
! 
  		'U_PIC_THUMB' => mx_append_sid(this_smartor_mxurl('smartor_mode=album_thumbnail&pic_id=' . $pic_id . $full_size_param . $nuffimage_vars, true)),
  		'U_PIC_LINK' => mx_append_sid(this_smartor_mxurl('smartor_mode=album_showpage&pic_id=' . $pic_id . $full_size_param . $nuffimage_vars, false)),
  
  		'U_SMILEY_CREATOR' => mx_append_sid(this_smartor_mxurl('smartor_mode=smiley_creator&mode=text2shield')),
! 
  		'NEXT_PIC' => $next_pic,
  		'PREV_PIC' => $prev_pic,
***************
*** 1190,1194 ****
  		'U_NEXT' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&amp;mode=next")),
  		'U_PREVIOUS' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&amp;mode=previous")),
! 		
  		'PIC_RATING' => $image_rating,
  
--- 1190,1194 ----
  		'U_NEXT' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&amp;mode=next")),
  		'U_PREVIOUS' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&amp;mode=previous")),
! 
  		'PIC_RATING' => $image_rating,
  
***************
*** 1235,1239 ****
  
  		'S_ALBUM_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id")),
! 		
  		// Mighty Gorgon - Slideshow - BEGIN
  		'L_SLIDESHOW' => $lang['Slideshow'],
--- 1235,1239 ----
  
  		'S_ALBUM_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id")),
! 
  		// Mighty Gorgon - Slideshow - BEGIN
  		'L_SLIDESHOW' => $lang['Slideshow'],
***************
*** 1255,1259 ****
  		'PIC_TYPE' => strtoupper(substr($thispic['pic_filename'], strlen($thispic['pic_filename']) - 3, 3)),
  		// Mighty Gorgon - Pic Size - END
! 		
  		//rating
  		'S_RATE_MSG' => (  !$userdata['session_logged_in'] && $auth_data['rate'] == 0 ) ? 'Login to vote!' : ( ($already_rated) ? $lang['Already_rated'] : $lang['Rating'] ),
--- 1255,1259 ----
  		'PIC_TYPE' => strtoupper(substr($thispic['pic_filename'], strlen($thispic['pic_filename']) - 3, 3)),
  		// Mighty Gorgon - Pic Size - END
! 
  		//rating
  		'S_RATE_MSG' => (  !$userdata['session_logged_in'] && $auth_data['rate'] == 0 ) ? 'Login to vote!' : ( ($already_rated) ? $lang['Already_rated'] : $lang['Rating'] ),
***************
*** 1351,1355 ****
  
  	$comment_id = $row['max'] + 1;
! 	
  
  	// --------------------------------
--- 1351,1355 ----
  
  	$comment_id = $row['max'] + 1;
! 
  
  	// --------------------------------
***************
*** 1381,1385 ****
  	//Rating System
  	$rate_point = intval($HTTP_POST_VARS['rate']);
! 	
  	if ($rate_point != -1)//if user didnt vote, dont update database
  	{
--- 1381,1385 ----
  	//Rating System
  	$rate_point = intval($HTTP_POST_VARS['rate']);
! 
  	if ($rate_point != -1)//if user didnt vote, dont update database
  	{
***************
*** 1391,1395 ****
  		$rate_user_id = $userdata['user_id'];
  		$rate_user_ip = $userdata['session_ip'];
! 		
  		$sql = "INSERT INTO ". ALBUM_RATE_TABLE ." (rate_pic_id, rate_user_id, rate_user_ip, rate_point)
  				VALUES ('$pic_id', '$rate_user_id', '$rate_user_ip', '$rate_point')";
--- 1391,1395 ----
  		$rate_user_id = $userdata['user_id'];
  		$rate_user_ip = $userdata['session_ip'];
! 
  		$sql = "INSERT INTO ". ALBUM_RATE_TABLE ." (rate_pic_id, rate_user_id, rate_user_ip, rate_point)
  				VALUES ('$pic_id', '$rate_user_id', '$rate_user_ip', '$rate_point')";