[mxbb-commits] mx_smartor/album_mod/modules album_allpics.php, 1.2, 1.3 album_cat.php, 1.3, 1.4 alb

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-serv22215/album_mod/modules

Modified Files:
	album_allpics.php album_cat.php album_cat_sort.php 
	album_comment.php album_memberlist.php album_personal.php 
	album_showpage.php album_thumbnail.php 
Log Message:
Upgrade for 2.8.2 finaly :D

Index: album_personal.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_personal.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_personal.php	13 Mar 2008 08:35:57 -0000	1.3
--- album_personal.php	27 Mar 2008 14:31:11 -0000	1.4
***************
*** 299,303 ****
  			$template->assign_block_vars('picrow.pic_detail', array(
  				'TITLE' => $picrow[$j]['pic_title'],
! 				'TIME' => create_date($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']),
  
  				'VIEW' => $picrow[$j]['pic_view_count'],
--- 299,303 ----
  			$template->assign_block_vars('picrow.pic_detail', array(
  				'TITLE' => $picrow[$j]['pic_title'],
! 				'TIME' => create_date2($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']),
  
  				'VIEW' => $picrow[$j]['pic_view_count'],
***************
*** 313,317 ****
  				'LOCK' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&amp;pic_id=". $picrow[$j]['pic_id'])) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);
--- 313,317 ----
  				'LOCK' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&amp;pic_id=". $picrow[$j]['pic_id'])) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.domaintools.com/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);

Index: album_showpage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_showpage.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_showpage.php	13 Mar 2008 08:35:58 -0000	1.3
--- album_showpage.php	27 Mar 2008 14:31:11 -0000	1.4
***************
*** 849,853 ****
  				$edit_info = ($commentrow[$i]['comment_edit_count'] == 1) ? $lang['Edited_time_total'] : $lang['Edited_times_total'];
  
! 				$edit_info = '<br /><br />&raquo;&nbsp;'. sprintf($edit_info, $lastedit_row['username'], create_date($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']), $commentrow[$i]['comment_edit_count']) .'<br />';
  			}
  			else
--- 849,853 ----
  				$edit_info = ($commentrow[$i]['comment_edit_count'] == 1) ? $lang['Edited_time_total'] : $lang['Edited_times_total'];
  
! 				$edit_info = '<br /><br />&raquo;&nbsp;'. sprintf($edit_info, $lastedit_row['username'], create_date2($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']), $commentrow[$i]['comment_edit_count']) .'<br />';
  			}
  			else
***************
*** 941,946 ****
  				'ID' => $commentrow[$i]['comment_id'],
  				'POSTER_NAME' => $poster,
! 				'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
! 				'IP' => ($userdata['user_level'] == ADMIN) ? '<a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',
  				
  				//users mesangers, website, email
--- 941,946 ----
  				'ID' => $commentrow[$i]['comment_id'],
  				'POSTER_NAME' => $poster,
! 				'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
***************
*** 957,961 ****
  				'POSTER_RANK' => $poster_rank,
  				'POSTER_RANK_IMGAGE' => $phpbb_root_path .$rank_image,
! 				'POSTER_JOINED' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ': ' . create_date($lang['DATE_FORMAT'], $commentrow[$i]['user_regdate'], $board_config['board_timezone']) : '',
  				'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'] : '',
--- 957,961 ----
  				'POSTER_RANK' => $poster_rank,
  				'POSTER_RANK_IMGAGE' => $phpbb_root_path .$rank_image,
! 				'POSTER_JOINED' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ': ' . create_date2($lang['DATE_FORMAT'], $commentrow[$i]['user_regdate'], $board_config['board_timezone']) : '',
  				'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'] : '',
***************
*** 1200,1204 ****
  		'POSTER' => $poster,
  
! 		'PIC_TIME' => create_date($board_config['default_dateformat'], $thispic['pic_time'], $board_config['board_timezone']),
  		'PIC_VIEW' => $thispic['pic_view_count'],
  		'PIC_COMMENTS' => $total_comments,
--- 1200,1204 ----
  		'POSTER' => $poster,
  
! 		'PIC_TIME' => create_date2($board_config['default_dateformat'], $thispic['pic_time'], $board_config['board_timezone']),
  		'PIC_VIEW' => $thispic['pic_view_count'],
  		'PIC_COMMENTS' => $total_comments,

Index: album_allpics.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_allpics.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_allpics.php	13 Mar 2008 03:44:00 -0000	1.2
--- album_allpics.php	27 Mar 2008 14:31:06 -0000	1.3
***************
*** 461,465 ****
  				'U_PIC_CAT' => $image_cat_url,
  
! 				'TIME' => create_date($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']),
  
  				'VIEW' => $picrow[$j]['pic_view_count'],
--- 461,465 ----
  				'U_PIC_CAT' => $image_cat_url,
  
! 				'TIME' => create_date2($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']),
  
  				'VIEW' => $picrow[$j]['pic_view_count'],
***************
*** 479,483 ****
  				'MOVE' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp" . '&mode=move&pic_id=' . $picrow[$j]['pic_id'])) . '">' . $lang['Move'] . '</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);
--- 479,483 ----
  				'MOVE' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp" . '&mode=move&pic_id=' . $picrow[$j]['pic_id'])) . '">' . $lang['Move'] . '</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);

Index: album_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_cat.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_cat.php	13 Mar 2008 08:35:54 -0000	1.3
--- album_cat.php	27 Mar 2008 14:31:07 -0000	1.4
***************
*** 531,535 ****
  				'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&pic_id=". $picrow[$j]['pic_id'])) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '',
  
! //				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);
--- 531,535 ----
  				'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&pic_id=". $picrow[$j]['pic_id'])) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '',
  
! //				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);

Index: album_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_comment.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_comment.php	13 Mar 2008 08:35:54 -0000	1.3
--- album_comment.php	27 Mar 2008 14:31:09 -0000	1.4
***************
*** 297,301 ****
  				$edit_info = ($commentrow[$i]['comment_edit_count'] == 1) ? $lang['Edited_time_total'] : $lang['Edited_times_total'];
  
! 				$edit_info = '<br /><br />&raquo;&nbsp;'. sprintf($edit_info, $lastedit_row['username'], create_date($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']), $commentrow[$i]['comment_edit_count']) .'<br />';
  			}
  			else
--- 297,301 ----
  				$edit_info = ($commentrow[$i]['comment_edit_count'] == 1) ? $lang['Edited_time_total'] : $lang['Edited_times_total'];
  
! 				$edit_info = '<br /><br />&raquo;&nbsp;'. sprintf($edit_info, $lastedit_row['username'], create_date2($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']), $commentrow[$i]['comment_edit_count']) .'<br />';
  			}
  			else
***************
*** 307,312 ****
  				'ID' => $commentrow[$i]['comment_id'],
  				'POSTER' => $poster,
! 				'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
! 				'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',
  
  				'TEXT' => nl2br($commentrow[$i]['comment_text']),
--- 307,312 ----
  				'ID' => $commentrow[$i]['comment_id'],
  				'POSTER' => $poster,
! 				'TIME' => create_date2($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
! 				'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://whois.domaintools.com/' . decode_ip2($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip2($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',
  
  				'TEXT' => nl2br($commentrow[$i]['comment_text']),
***************
*** 377,381 ****
  		'POSTER' => $poster,
  
! 		'PIC_TIME' => create_date($board_config['default_dateformat'], $thispic['pic_time'], $board_config['board_timezone']),
  		'PIC_VIEW' => $thispic['pic_view_count'],
  		'PIC_COMMENTS' => $total_comments,
--- 377,381 ----
  		'POSTER' => $poster,
  
! 		'PIC_TIME' => create_date2($board_config['default_dateformat'], $thispic['pic_time'], $board_config['board_timezone']),
  		'PIC_VIEW' => $thispic['pic_view_count'],
  		'PIC_COMMENTS' => $total_comments,

Index: album_cat_sort.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_cat_sort.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_cat_sort.php	13 Mar 2008 08:35:54 -0000	1.3
--- album_cat_sort.php	27 Mar 2008 14:31:07 -0000	1.4
***************
*** 471,475 ****
  				'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid("album_modcp.$phpEx?mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&amp;pic_id=". $picrow[$j]['pic_id']) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);
--- 471,475 ----
  				'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid("album_modcp.$phpEx?mode=". (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') ."&amp;pic_id=". $picrow[$j]['pic_id']) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.domaintools.com/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);

Index: album_memberlist.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_memberlist.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_memberlist.php	13 Mar 2008 08:35:55 -0000	1.3
--- album_memberlist.php	27 Mar 2008 14:31:10 -0000	1.4
***************
*** 271,275 ****
  				'MOVE' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(album_append_uid("album_modcp.$phpEx?mode=move&pic_id=". $picrow[$j]['pic_id'])) . '">' . $lang['Move'] . '</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);
--- 271,275 ----
  				'MOVE' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(album_append_uid("album_modcp.$phpEx?mode=move&pic_id=". $picrow[$j]['pic_id'])) . '">' . $lang['Move'] . '</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);

Index: album_thumbnail.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_thumbnail.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_thumbnail.php	13 Mar 2008 08:35:58 -0000	1.3
--- album_thumbnail.php	27 Mar 2008 14:31:12 -0000	1.4
***************
*** 86,90 ****
  if( empty($thispic) || !file_exists($pic_fullpath) )
  {
! 	mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist']);
  }
  
--- 86,90 ----
  if( empty($thispic) || !file_exists($pic_fullpath) )
  {
! 	mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist']  . ': ' . $pic_fullpath);
  }

[mxbb-commits] mx_smartor/album_mod/modules album_allpics.php, 1.2, 1.3 album_cat.php, 1.3, 1.4 alb

[mxbb-commits] mx_smartor/album_mod/modules album_allpics.php, 1.2, 1.3 album_cat.php, 1.3, 1.4 album_cat_sort.php, 1.3, 1.4 album_comment.php, 1.3, 1.4 album_memberlist.php, 1.3, 1.4 album_personal.php, 1.3, 1.4 album_showpage.php, 1.3, 1.4 album_thumbnail.php, 1.3, 1.4