|
From: OryNider <ory...@us...> - 2008-03-27 14:31:45
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22215/album_mod/includes Modified Files: album_constants.php album_functions.php album_hierarchy_sql.php Log Message: Upgrade for 2.8.2 finaly :D Index: album_hierarchy_sql.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_hierarchy_sql.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** album_hierarchy_sql.php 13 Mar 2008 08:35:54 -0000 1.3 --- album_hierarchy_sql.php 27 Mar 2008 14:31:01 -0000 1.4 *************** *** 1255,1259 **** '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://whois.sc/' . decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : '', 'AVATAR_PIC' => ( ($album_config['personal_allow_avatar_gallery'] == 1) && ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<br /><a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_avatar&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Avatar_Set'] . '</a>' : '', --- 1255,1259 ---- '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://whois.sc/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : '', 'AVATAR_PIC' => ( ($album_config['personal_allow_avatar_gallery'] == 1) && ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<br /><a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_avatar&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Avatar_Set'] . '</a>' : '', *************** *** 1443,1447 **** 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); --- 1443,1447 ---- 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); *************** *** 1619,1623 **** 'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($highestrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); --- 1619,1623 ---- 'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($highestrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); *************** *** 1782,1786 **** 'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip($mostviewed[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($mostviewed[$j]['pic_user_ip']) .'</a><br />' : '' ) ); --- 1782,1786 ---- 'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($mostviewed[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($mostviewed[$j]['pic_user_ip']) .'</a><br />' : '' ) ); *************** *** 1938,1942 **** 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip($randrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($randrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); --- 1938,1942 ---- 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($randrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($randrow[$j]['pic_user_ip']) .'</a><br />' : '' ) ); *************** *** 2134,2138 **** 'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '', 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip($commentsrow[$i]['pic_user_ip']) . '" target="_blank">' . decode_ip($commentsrow[$i]['pic_user_ip']) .'</a><br />' : '' ) ); --- 2134,2138 ---- 'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '', 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($commentsrow[$i]['pic_user_ip']) . '" target="_blank">' . decode_ip2($commentsrow[$i]['pic_user_ip']) .'</a><br />' : '' ) ); Index: album_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** album_functions.php 13 Mar 2008 08:35:54 -0000 1.3 --- album_functions.php 27 Mar 2008 14:31:01 -0000 1.4 *************** *** 19,46 **** } - if(!function_exists(create_date)) - { - function create_date($format, $gmepoch, $tz) - { - return phpBB2::create_date($format, $gmepoch, $tz); - } - } if(!function_exists(create_date2)) { ! function create_date2($format, $gmepoch, $tz) { ! return create_date($format, $gmepoch, $tz); } } ! if(!function_exists(decode_ip)) { ! function decode_ip($int_ip) { ! return phpBB2::decode_ip($int_ip); } } // ---------------------------------------------------------------------------- // This function will return the access data of the current user for a category --- 19,60 ---- } if(!function_exists(create_date2)) { ! if(!function_exists(create_date)) { ! function create_date2($format, $gmepoch, $tz) ! { ! return phpBB2::create_date($format, $gmepoch, $tz); ! } ! } ! else ! { ! function create_date2($format, $gmepoch, $tz) ! { ! return create_date($format, $gmepoch, $tz); ! } } } ! if(!function_exists(decode_ip2)) { ! if(!function_exists(decode_ip)) { ! function decode_ip2($int_ip) ! { ! return phpBB2::decode_ip($int_ip); ! } ! } ! else ! { ! function decode_ip2($int_ip) ! { ! return decode_ip($int_ip); ! } } } + // ---------------------------------------------------------------------------- // This function will return the access data of the current user for a category |