Update of /cvsroot/mxbb/mx_smartor/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22773/includes Modified Files: Tag: core28x album_allpics.php album_cat.php album_cat_sort.php album_comment.php album_comment_delete.php album_comment_edit.php album_delete.php album_edit.php album_hotornot.php album_jupload.php album_memberlist.php album_modcp.php album_nuffload.php album_otf.php album_otf_thumbnail.php album_page.php album_personal.php album_personal_cat_admin.php album_personal_index.php album_personal_old.php album_personal_random.php album_pic.php album_picm.php album_rate.php album_rdf.php album_rss.php album_search.php album_showpage.php album_thumbnail.php album_upload.php Log Message: upgrade Index: album_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_personal.php,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** album_personal.php 9 Aug 2007 13:16:57 -0000 1.8 --- album_personal.php 8 Feb 2008 10:40:56 -0000 1.8.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 55,59 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_personal")); } --- 55,59 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_personal")); } *************** *** 92,96 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_personal&user_id=$user_id")); } else --- 92,96 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_personal&user_id=$user_id")); } else *************** *** 289,294 **** $template->assign_block_vars('picrow.piccol', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $picrow[$j]['pic_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=". $picrow[$j]['pic_id'])), ! 'THUMBNAIL' => append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=". $picrow[$j]['pic_id'], TRUE)), 'DESC' => $picrow[$j]['pic_desc'] ) --- 289,294 ---- $template->assign_block_vars('picrow.piccol', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $picrow[$j]['pic_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=". $picrow[$j]['pic_id'])), ! 'THUMBNAIL' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=". $picrow[$j]['pic_id'], TRUE)), 'DESC' => $picrow[$j]['pic_desc'] ) *************** *** 307,315 **** 'COMMENTS' => ($album_config['comment'] == 1) ? ( $lang['Comments'] . ': ' . $picrow[$j]['comments'] . '<br />') : '', ! 'EDIT' => ( ($userdata['user_level'] == ADMIN) or ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_edit&pic_id=". $picrow[$j]['pic_id'])) . '">' . $lang['Edit_pic'] . '</a>' : '', ! 'DELETE' => ( ($userdata['user_level'] == ADMIN) or ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_delete&pic_id=". $picrow[$j]['pic_id'])) . '">' . $lang['Delete_pic'] . '</a>' : '', ! 'LOCK' => ($userdata['user_level'] == ADMIN) ? '<a href="'. 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 />' : '' --- 307,315 ---- 'COMMENTS' => ($album_config['comment'] == 1) ? ( $lang['Comments'] . ': ' . $picrow[$j]['comments'] . '<br />') : '', ! 'EDIT' => ( ($userdata['user_level'] == ADMIN) or ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_edit&pic_id=". $picrow[$j]['pic_id'])) . '">' . $lang['Edit_pic'] . '</a>' : '', ! 'DELETE' => ( ($userdata['user_level'] == ADMIN) or ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_delete&pic_id=". $picrow[$j]['pic_id'])) . '">' . $lang['Delete_pic'] . '</a>' : '', ! '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') ."&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 />' : '' *************** *** 325,329 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id&sort_method=$sort_method&sort_order=$sort_order")), $total_pics, $pics_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $pics_per_page ) + 1 ), ceil( $total_pics / $pics_per_page )) ) --- 325,329 ---- $template->assign_vars(array( ! 'PAGINATION' => mx_generate_pagination(mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id&sort_method=$sort_method&sort_order=$sort_order")), $total_pics, $pics_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $pics_per_page ) + 1 ), ceil( $total_pics / $pics_per_page )) ) *************** *** 386,390 **** $template->assign_vars(array( ! 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=". PERSONAL_GALLERY)), 'UPLOAD_PIC_IMG' => $images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], --- 386,390 ---- $template->assign_vars(array( ! 'U_UPLOAD_PIC' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=". PERSONAL_GALLERY)), 'UPLOAD_PIC_IMG' => $images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], *************** *** 400,404 **** 'L_POSTED' => $lang['Posted'], ! 'U_PERSONAL_GALLERY' => append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], 'L_PERSONAL_GALLERY_EXPLAIN' => $lang['Personal_Gallery_Explain'], --- 400,404 ---- 'L_POSTED' => $lang['Posted'], ! 'U_PERSONAL_GALLERY' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], 'L_PERSONAL_GALLERY_EXPLAIN' => $lang['Personal_Gallery_Explain'], Index: album_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_edit.php,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** album_edit.php 17 Jul 2007 05:38:27 -0000 1.8 --- album_edit.php 8 Feb 2008 10:40:50 -0000 1.8.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 96,100 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_edit&pic_id=$pic_id")); } else --- 96,100 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_edit&pic_id=$pic_id")); } else *************** *** 141,145 **** 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), 'L_PIC_TITLE' => $lang['Pic_Title'], --- 141,145 ---- 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), 'L_PIC_TITLE' => $lang['Pic_Title'], *************** *** 158,162 **** 'L_SUBMIT' => $lang['Submit'], ! 'S_ALBUM_ACTION' => append_sid(this_smartor_mxurl("smartor_mode=album_edit&pic_id=$pic_id")), ) ); --- 158,162 ---- 'L_SUBMIT' => $lang['Submit'], ! 'S_ALBUM_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_edit&pic_id=$pic_id")), ) ); *************** *** 221,239 **** { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>"); } else { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_smartor_mxurl("smartor_mode=album_personal")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_personal_gallery'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_personal")) . "\">", "</a>"); } ! $message .= "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 221,239 ---- { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>"); } else { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_personal_gallery'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal")) . "\">", "</a>"); } ! $message .= "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: album_comment_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_comment_edit.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** album_comment_edit.php 7 Jun 2007 20:13:28 -0000 1.7 --- album_comment_edit.php 8 Feb 2008 10:40:49 -0000 1.7.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 164,168 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_comment_edit&comment_id=$comment_id")); } else --- 164,168 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_comment_edit&comment_id=$comment_id")); } else *************** *** 202,206 **** else { ! $poster = '<a href="'. append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>'; } --- 202,206 ---- else { ! $poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>'; } *************** *** 254,261 **** $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), ! 'U_THUMBNAIL' => append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=$pic_id")), ! 'U_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=$pic_id", TRUE)), 'PIC_TITLE' => $thispic['pic_title'], --- 254,261 ---- $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), ! 'U_THUMBNAIL' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=$pic_id")), ! 'U_PIC' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=$pic_id", TRUE)), 'PIC_TITLE' => $thispic['pic_title'], *************** *** 284,288 **** 'L_SUBMIT' => $lang['Submit'], ! 'S_ALBUM_ACTION' => append_sid(this_smartor_mxurl("smartor_mode=album_comment_edit&comment_id=$comment_id")) ) ); --- 284,288 ---- 'L_SUBMIT' => $lang['Submit'], ! 'S_ALBUM_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_comment_edit&comment_id=$comment_id")) ) ); *************** *** 340,347 **** $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_smartor_mxurl("smartor_mode=album_comment&comment_id=$comment_id")) . '#'.$comment_id.'">') ); ! $message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 340,347 ---- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_comment&comment_id=$comment_id")) . '#'.$comment_id.'">') ); ! $message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: album_modcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_modcp.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** album_modcp.php 7 Jun 2007 20:13:29 -0000 1.7 --- album_modcp.php 8 Feb 2008 10:40:53 -0000 1.7.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 166,170 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_modcp&cat_id=$cat_id")); } else --- 166,170 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_modcp&cat_id=$cat_id")); } else *************** *** 344,353 **** else { ! $pic_poster = '<a href="'. append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $picrow[$i]['user_id']) .'">'. $picrow[$i]['username'] .'</a>'; } $template->assign_block_vars('picrow', array( 'PIC_ID' => $picrow[$i]['pic_id'], ! 'PIC_TITLE' => '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $picrow[$i]['pic_id'])) .'" target="_blank">'. $picrow[$i]['pic_title'] .'</a>', 'POSTER' => $pic_poster, 'TIME' => create_date($board_config['default_dateformat'], $picrow[$i]['pic_time'], $board_config['board_timezone']), --- 344,353 ---- else { ! $pic_poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $picrow[$i]['user_id']) .'">'. $picrow[$i]['username'] .'</a>'; } $template->assign_block_vars('picrow', array( 'PIC_ID' => $picrow[$i]['pic_id'], ! 'PIC_TITLE' => '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $picrow[$i]['pic_id'])) .'" target="_blank">'. $picrow[$i]['pic_title'] .'</a>', 'POSTER' => $pic_poster, 'TIME' => create_date($board_config['default_dateformat'], $picrow[$i]['pic_time'], $board_config['board_timezone']), *************** *** 361,365 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_pics, $pics_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $pics_per_page ) + 1 ), ceil( $total_pics / $pics_per_page )) ) --- 361,365 ---- $template->assign_vars(array( ! 'PAGINATION' => mx_generate_pagination(mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_pics, $pics_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $pics_per_page ) + 1 ), ceil( $total_pics / $pics_per_page )) ) *************** *** 405,409 **** $template->assign_vars(array( ! 'U_VIEW_CAT' => append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], --- 405,409 ---- $template->assign_vars(array( ! 'U_VIEW_CAT' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], *************** *** 417,421 **** 'L_POSTED' => $lang['Posted'], ! 'S_ALBUM_ACTION' => append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], --- 417,421 ---- 'L_POSTED' => $lang['Posted'], ! 'S_ALBUM_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], *************** *** 573,577 **** $template->assign_vars(array( ! 'S_ALBUM_ACTION' => append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=move&cat_id=$cat_id")), 'L_MOVE' => $lang['Move'], 'L_MOVE_TO_CATEGORY' => $lang['Move_to_Category'], --- 573,577 ---- $template->assign_vars(array( ! 'S_ALBUM_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=move&cat_id=$cat_id")), 'L_MOVE' => $lang['Move'], 'L_MOVE_TO_CATEGORY' => $lang['Move_to_Category'], *************** *** 635,639 **** } ! $message = $lang['Pics_moved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 635,639 ---- } ! $message = $lang['Pics_moved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 699,710 **** if ($cat_id != PERSONAL_GALLERY) { ! $message .= sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />"; } else { ! $message .= sprintf($lang['Click_return_personal_gallery'], "<a href=\"" . append_sid("album_personal.$phpEx") . "\">", "</a>"); } ! $message .= '<br /><br />' . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 699,710 ---- if ($cat_id != PERSONAL_GALLERY) { ! $message .= sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />"; } else { ! $message .= sprintf($lang['Click_return_personal_gallery'], "<a href=\"" . mx_append_sid("album_personal.$phpEx") . "\">", "</a>"); } ! $message .= '<br /><br />' . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 769,780 **** if ($cat_id != PERSONAL_GALLERY) { ! $message .= sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />"; } else { ! $message .= sprintf($lang['Click_return_personal_gallery'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_personal.$phpEx")) . "\">", "</a>"); } ! $message .= '<br /><br />' . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 769,780 ---- if ($cat_id != PERSONAL_GALLERY) { ! $message .= sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />"; } else { ! $message .= sprintf($lang['Click_return_personal_gallery'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal.$phpEx")) . "\">", "</a>"); } ! $message .= '<br /><br />' . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 835,839 **** } ! $message = $lang['Pics_approved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 835,839 ---- } ! $message = $lang['Pics_approved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 894,898 **** } ! $message = $lang['Pics_unapproved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 894,898 ---- } ! $message = $lang['Pics_unapproved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 961,965 **** 'L_NO' => $lang['No'], 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=delete&cat_id=$cat_id")), ) ); --- 961,965 ---- 'L_NO' => $lang['No'], 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=delete&cat_id=$cat_id")), ) ); *************** *** 1059,1063 **** } ! $message = $lang['Pics_deleted_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 1059,1063 ---- } ! $message = $lang['Pics_deleted_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: album_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_search.php,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** album_search.php 9 Aug 2007 13:17:00 -0000 1.9 --- album_search.php 8 Feb 2008 10:41:00 -0000 1.9.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 180,184 **** else { ! $pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $row['pic_id'])) . '\',\'' . addslashes($row['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } --- 180,184 ---- else { ! $pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $row['pic_id'])) . '\',\'' . addslashes($row['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } *************** *** 188,202 **** $template->assign_block_vars('switch_search_results.search_results', array( 'L_USERNAME' => $row['pic_username'], ! 'U_PROFILE' => append_sid($phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&u=' . $row['pic_user_id']), 'L_CAT' => ($row['cat_user_id'] != ALBUM_PUBLIC_GALLERY ) ? $lang['Users_Personal_Galleries'] : $row['cat_title'], ! 'U_CAT' => ($row['pic_cat_id'] == 0 ) ? append_sid(this_smartor_mxurl('smartor_mode=album_personal&user_id=' . $row['pic_user_id'])) : append_sid(this_smartor_mxurl('smartor_mode=album_cat&cat_id=' . $row['cat_id'])), ! //'U_CAT' => ($row['cat_id'] == $cat_id) ? append_sid(this_smartor_mxurl('smartor_mode=album_cat' . '&cat_id=' . $row['cat_id'])) : append_sid(this_smartor_mxurl()), 'L_PIC' => $row['pic_title'], ! 'U_PIC' => append_sid(this_smartor_mxurl('smartor_mode=album_showpage&pic_id=' . $row['pic_id'])), ! //'U_PIC' => ($album_config['fullpic_popup'] == 1) ? append_sid(this_smartor_mxurl('smartor_mode=album_pic' . '&pic_id=' . $row['pic_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $row['pic_id'])), ! 'THUMBNAIL' => append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=". $row['pic_id'], TRUE)), ! //'THUMBNAIL' => append_sid(album_append_uid($module_root_path. 'includes/album_thumbnail.' . $phpEx . '?pic_id=' . $row['pic_id'])), 'PIC_PREVIEW' => $pic_preview, 'DESC' => $row['pic_desc'], --- 188,202 ---- $template->assign_block_vars('switch_search_results.search_results', array( 'L_USERNAME' => $row['pic_username'], ! 'U_PROFILE' => mx_append_sid($phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&u=' . $row['pic_user_id']), 'L_CAT' => ($row['cat_user_id'] != ALBUM_PUBLIC_GALLERY ) ? $lang['Users_Personal_Galleries'] : $row['cat_title'], ! 'U_CAT' => ($row['pic_cat_id'] == 0 ) ? mx_append_sid(this_smartor_mxurl('smartor_mode=album_personal&user_id=' . $row['pic_user_id'])) : mx_append_sid(this_smartor_mxurl('smartor_mode=album_cat&cat_id=' . $row['cat_id'])), ! //'U_CAT' => ($row['cat_id'] == $cat_id) ? mx_append_sid(this_smartor_mxurl('smartor_mode=album_cat' . '&cat_id=' . $row['cat_id'])) : mx_append_sid(this_smartor_mxurl()), 'L_PIC' => $row['pic_title'], ! 'U_PIC' => mx_append_sid(this_smartor_mxurl('smartor_mode=album_showpage&pic_id=' . $row['pic_id'])), ! //'U_PIC' => ($album_config['fullpic_popup'] == 1) ? mx_append_sid(this_smartor_mxurl('smartor_mode=album_pic' . '&pic_id=' . $row['pic_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $row['pic_id'])), ! 'THUMBNAIL' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=". $row['pic_id'], TRUE)), ! //'THUMBNAIL' => mx_append_sid(album_append_uid($module_root_path. 'includes/album_thumbnail.' . $phpEx . '?pic_id=' . $row['pic_id'])), 'PIC_PREVIEW' => $pic_preview, 'DESC' => $row['pic_desc'], *************** *** 238,242 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_smartor_mxurl("smartor_mode=album_search&mode=" . $m . "&search=" . $s)), $total_pics, $pics_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], (floor($start / $pics_per_page) + 1), ceil($total_pics / $pics_per_page)) ) --- 238,242 ---- $template->assign_vars(array( ! 'PAGINATION' => mx_generate_pagination(mx_append_sid(this_smartor_mxurl("smartor_mode=album_search&mode=" . $m . "&search=" . $s)), $total_pics, $pics_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], (floor($start / $pics_per_page) + 1), ceil($total_pics / $pics_per_page)) ) Index: album_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_delete.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** album_delete.php 7 Jun 2007 20:13:29 -0000 1.7 --- album_delete.php 8 Feb 2008 10:40:50 -0000 1.7.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 96,100 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_delete&pic_id=$pic_id")); } else --- 96,100 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_delete&pic_id=$pic_id")); } else *************** *** 129,133 **** if( isset($HTTP_POST_VARS['cancel']) ) { ! redirect(append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id"))); exit; } --- 129,133 ---- if( isset($HTTP_POST_VARS['cancel']) ) { ! redirect(mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id"))); exit; } *************** *** 155,159 **** 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => append_sid(this_smartor_mxurl("smartor_mode=album_delete&pic_id=$pic_id")), ) ); --- 155,159 ---- 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_delete&pic_id=$pic_id")), ) ); *************** *** 229,247 **** { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>"); } else { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_smartor_mxurl("smartor_mode=album_personal")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_personal_gallery'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_personal")) . "\">", "</a>"); } ! $message .= "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 229,247 ---- { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) . "\">", "</a>"); } else { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_personal_gallery'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal")) . "\">", "</a>"); } ! $message .= "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: album_page.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_page.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** album_page.php 7 Jun 2007 20:13:29 -0000 1.7 --- album_page.php 8 Feb 2008 10:40:54 -0000 1.7.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 163,167 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_page&pic_id=$pic_id")); } else --- 163,167 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_page&pic_id=$pic_id")); } else *************** *** 215,219 **** else { ! $poster = '<a href="'. append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>'; } --- 215,219 ---- else { ! $poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>'; } *************** *** 221,227 **** $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), ! 'U_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=$pic_id")), 'PIC_TITLE' => $thispic['pic_title'], --- 221,227 ---- $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), ! 'U_PIC' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=$pic_id")), 'PIC_TITLE' => $thispic['pic_title'], *************** *** 238,246 **** 'PIC_COMMENTS' => $thispic['comments'], ! 'U_RATE' => append_sid(this_smartor_mxurl("smartor_mode=album_rate&pic_id=$pic_id")), ! 'U_COMMENT' => append_sid(this_smartor_mxurl("smartor_mode=album_comment&pic_id=$pic_id")), ! 'U_NEXT' => append_sid(this_smartor_mxurl("smartor_mode=album_page&pic_id=$pic_id&mode=next")), ! 'U_PREVIOUS' => append_sid(this_smartor_mxurl("smartor_mode=album_page&pic_id=$pic_id&mode=previous")), 'L_NEXT' => $lang['Next'], --- 238,246 ---- 'PIC_COMMENTS' => $thispic['comments'], ! 'U_RATE' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_rate&pic_id=$pic_id")), ! 'U_COMMENT' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_comment&pic_id=$pic_id")), ! 'U_NEXT' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_page&pic_id=$pic_id&mode=next")), ! 'U_PREVIOUS' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_page&pic_id=$pic_id&mode=previous")), 'L_NEXT' => $lang['Next'], Index: album_pic.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_pic.php,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** album_pic.php 5 Feb 2008 04:16:33 -0000 1.6.2.2 --- album_pic.php 8 Feb 2008 10:40:57 -0000 1.6.2.3 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Development Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] Mx-Publisher Development Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * Index: album_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_rss.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** album_rss.php 9 Aug 2007 13:16:59 -0000 1.2 --- album_rss.php 8 Feb 2008 10:40:58 -0000 1.2.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2007 [ory...@rd..., OryNider] mxBB Development Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2007 [ory...@rd..., OryNider] Mx-Publisher Development Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * Index: album_thumbnail.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_thumbnail.php,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -C2 -d -r1.7.2.2 -r1.7.2.3 *** album_thumbnail.php 5 Feb 2008 04:16:33 -0000 1.7.2.2 --- album_thumbnail.php 8 Feb 2008 10:41:01 -0000 1.7.2.3 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * Index: album_hotornot.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_hotornot.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** album_hotornot.php 7 Jun 2007 20:13:29 -0000 1.7 --- album_hotornot.php 8 Feb 2008 10:40:50 -0000 1.7.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 108,112 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_hotornot")); } else --- 108,112 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_hotornot")); } else *************** *** 161,165 **** else { ! $poster = '<a href="'. append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>'; } --- 161,165 ---- else { ! $poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>'; } *************** *** 185,191 **** $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), ! 'U_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=$pic_id")), 'PIC_TITLE' => $thispic['pic_title'], --- 185,191 ---- $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), ! 'U_PIC' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=$pic_id")), 'PIC_TITLE' => $thispic['pic_title'], *************** *** 202,206 **** 'PIC_COMMENTS' => $thispic['comments'], ! 'U_COMMENT' => append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id")), 'L_RATING' => $lang['Rating'], --- 202,206 ---- 'PIC_COMMENTS' => $thispic['comments'], ! 'U_COMMENT' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id")), 'L_RATING' => $lang['Rating'], Index: album_cat_sort.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_cat_sort.php,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** album_cat_sort.php 9 Aug 2007 13:16:55 -0000 1.10 --- album_cat_sort.php 8 Feb 2008 10:40:48 -0000 1.10.2.1 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 56,60 **** if ($cat_id == PERSONAL_GALLERY) { ! redirect(append_sid("album_personal.$phpEx")); } --- 56,60 ---- if ($cat_id == PERSONAL_GALLERY) { ! redirect(mx_append_sid("album_personal.$phpEx")); } *************** *** 159,163 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid("login.$phpEx?redirect=album_cat.$phpEx&cat_id=$cat_id")); } else --- 159,163 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(mx_append_sid("login.$phpEx?redirect=album_cat.$phpEx&cat_id=$cat_id")); } else *************** *** 195,199 **** if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Album_moderate_can'], '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) .'">', '</a>'); } --- 195,199 ---- if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Album_moderate_can'], '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&cat_id=$cat_id")) .'">', '</a>'); } *************** *** 233,237 **** for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. append_sid("groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; --- 233,237 ---- for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. mx_append_sid("groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; *************** *** 427,431 **** $approval_mode = ($picrow[$j]['pic_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link = '<a href="'. append_sid("album_modcp.$phpEx?mode=$approval_mode&pic_id=". $picrow[$j]['pic_id']) .'">'; $approval_link .= ($picrow[$j]['pic_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; --- 427,431 ---- $approval_mode = ($picrow[$j]['pic_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link = '<a href="'. mx_append_sid("album_modcp.$phpEx?mode=$approval_mode&pic_id=". $picrow[$j]['pic_id']) .'">'; $approval_link .= ($picrow[$j]['pic_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; *************** *** 436,441 **** $template->assign_block_vars('picrow.piccol', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid("album_pic.$phpEx?pic_id=". $picrow[$j]['pic_id']) : append_sid("album_page.$phpEx?pic_id=". $picrow[$j]['pic_id']), ! 'THUMBNAIL' => append_sid("album_thumbnail.$phpEx?pic_id=". $picrow[$j]['pic_id']), 'DESC' => $picrow[$j]['pic_desc'], 'APPROVAL' => $approval_link, --- 436,441 ---- $template->assign_block_vars('picrow.piccol', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid("album_pic.$phpEx?pic_id=". $picrow[$j]['pic_id']) : mx_append_sid("album_page.$phpEx?pic_id=". $picrow[$j]['pic_id']), ! 'THUMBNAIL' => mx_append_sid("album_thumbnail.$phpEx?pic_id=". $picrow[$j]['pic_id']), 'DESC' => $picrow[$j]['pic_desc'], 'APPROVAL' => $approval_link, *************** *** 449,453 **** else { ! $pic_poster = '<a href="'. append_sid("profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $picrow[$j]['user_id']) .'">'. $picrow[$j]['username'] .'</a>'; } --- 449,453 ---- else { ! $pic_poster = '<a href="'. mx_append_sid("profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $picrow[$j]['user_id']) .'">'. $picrow[$j]['username'] .'</a>'; } *************** *** 459,473 **** 'VIEW' => $picrow[$j]['pic_view_count'], ! 'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. append_sid("album_rate.$phpEx?pic_id=". $picrow[$j]['pic_id']) . '">' . $lang['Rating'] . '</a> : ' . $picrow[$j]['rating'] . '<br />') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. append_sid("album_comment.$phpEx?pic_id=". $picrow[$j]['pic_id']) . '">' . $lang['Comments'] . '</a> : ' . $picrow[$j]['comments'] . '<br />') : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($picrow[$j]['pic_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != ALBUM_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid("album_edit.$phpEx?pic_id=". $picrow[$j]['pic_id']) . '">' . $lang['Edit_pic'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($picrow[$j]['pic_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != ALBUM_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid("album_delete.$phpEx?pic_id=". $picrow[$j]['pic_id']) . '">' . $lang['Delete_pic'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. append_sid("album_modcp.$phpEx?mode=move&pic_id=". $picrow[$j]['pic_id']) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. append_sid("album_modcp.$phpEx?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 />' : '' --- 459,473 ---- 'VIEW' => $picrow[$j]['pic_view_count'], ! 'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid("album_rate.$phpEx?pic_id=". $picrow[$j]['pic_id']) . '">' . $lang['Rating'] . '</a> : ' . $picrow[$j]['rating'] . '<br />') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. mx_append_sid("album_comment.$phpEx?pic_id=". $picrow[$j]['pic_id']) . '">' . $lang['Comments'] . '</a> : ' . $picrow[$j]['comments'] . '<br />') : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($picrow[$j]['pic_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != ALBUM_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid("album_edit.$phpEx?pic_id=". $picrow[$j]['pic_id']) . '">' . $lang['Edit_pic'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($picrow[$j]['pic_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != ALBUM_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid("album_delete.$phpEx?pic_id=". $picrow[$j]['pic_id']) . '">' . $lang['Delete_pic'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid("album_modcp.$phpEx?mode=move&pic_id=". $picrow[$j]['pic_id']) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid("album_modcp.$phpEx?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 />' : '' *************** *** 481,485 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order&initial=" . ((isset($HTTP_GET_VARS['initial']) ) ? ($HTTP_GET_VARS['initial']) : 'all'))), $total_pics, $pics_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $pics_per_page ) + 1 ), ceil( $total_pics / $pics_per_page )) ) --- 481,485 ---- $template->assign_vars(array( ! 'PAGINATION' => mx_generate_pagination(mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order&initial=" . ((isset($HTTP_GET_VARS['initial']) ) ? ($HTTP_GET_VARS['initial']) : 'all'))), $total_pics, $pics_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $pics_per_page ) + 1 ), ceil( $total_pics / $pics_per_page )) ) *************** *** 498,502 **** // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $album_jumpbox = '<form name="jumpbox" action="'. append_sid("album_cat.$phpEx") .'" method="get">'; $album_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) --- 498,502 ---- // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $album_jumpbox = '<form name="jumpbox" action="'. mx_append_sid("album_cat.$phpEx") .'" method="get">'; $album_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) *************** *** 560,564 **** else { ! $initial_links .= '<a href="' . append_sid($base_url . $letter) . '">'. $letter . '</a> '; } } --- 560,564 ---- else { ! $initial_links .= '<a href="' . mx_append_sid($base_url . $letter) . '">'. $letter . '</a> '; } } *************** *** 572,576 **** else { ! $initial_links .= '<a href="' . append_sid($base_url . "other") . '">'. $l_other . '</a> '; } --- 572,576 ---- else { ! $initial_links .= '<a href="' . mx_append_sid($base_url . "other") . '">'. $l_other . '</a> '; } *************** *** 583,587 **** else { ! $initial_links .= '<a href="' . append_sid($base_url . "all") . '">'. $l_all . '</a> '; } --- 583,587 ---- else { ! $initial_links .= '<a href="' . mx_append_sid($base_url . "all") . '">'. $l_all . '</a> '; } *************** *** 594,598 **** $template->assign_vars(array( ! 'U_VIEW_CAT' => append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], --- 594,598 ---- $template->assign_vars(array( ! 'U_VIEW_CAT' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], *************** *** 600,604 **** 'MODERATORS' => $moderators_list, ! ... [truncated message content] |