Menu
▾
▴
[mxbb-commits] mx_smartor/album_mod album_bbconstants.php, 1.6, 1.7 album_common.php, 1.21, 1.22 album_constants.php, 1.12, 1.13 album_functions.php, 1.8, 1.9 album_hierarchy_auth.php, 1.5, 1.6 album_hierarchy_functions.php, 1.7, 1.8 album_hierarchy_sql.php, 1.9, 1.10 album_integration.php, 1.5, 1.6 album_nuffimage_box.php, 1.1, 1.2 clown_album_functions.php, 1.8, 1.9
|
From: OryNider <ory...@us...> - 2008-02-08 10:48:06
|
Update of /cvsroot/mxbb/mx_smartor/album_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27166/album_mod Modified Files: album_bbconstants.php album_common.php album_constants.php album_functions.php album_hierarchy_auth.php album_hierarchy_functions.php album_hierarchy_sql.php album_integration.php album_nuffimage_box.php clown_album_functions.php Log Message: upgrade Index: album_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_constants.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** album_constants.php 5 Feb 2008 03:51:29 -0000 1.12 --- album_constants.php 8 Feb 2008 10:47:59 -0000 1.13 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team Index: album_hierarchy_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_hierarchy_functions.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_hierarchy_functions.php 9 Aug 2007 13:16:53 -0000 1.7 --- album_hierarchy_functions.php 8 Feb 2008 10:47:59 -0000 1.8 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ * @copyright (c) 2003 [bla...@ya..., idl...@sl...] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ * @copyright (c) 2003 [bla...@ya..., idl...@sl...] mxBB Development Team *************** *** 138,146 **** 'INC_SPAN' => $max_level - $level +1 , // + $column_offset, ! 'U_CAT_EDIT' => append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")), ! 'U_CAT_DELETE' => ($is_root && $userdata['user_level'] != ADMIN) ? '' : append_sid(album_append_uid("$admin_url?action=delete&cat_id=$cat_id")), ! 'U_CAT_MOVE_UP' => ($is_root) ? '' : append_sid(album_append_uid("$admin_url?action=move&move=-15&cat_id=$cat_id")), ! 'U_CAT_MOVE_DOWN' => ($is_root) ? '' : append_sid(album_append_uid("$admin_url?action=move&move=15&cat_id=$cat_id")), ! 'U_VIEWCAT' => append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")), 'L_MOVE_UP' => ($is_root) ? '' : $lang['Move_up'], --- 138,146 ---- 'INC_SPAN' => $max_level - $level +1 , // + $column_offset, ! 'U_CAT_EDIT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")), ! 'U_CAT_DELETE' => ($is_root && $userdata['user_level'] != ADMIN) ? '' : mx_append_sid(album_append_uid("$admin_url?action=delete&cat_id=$cat_id")), ! 'U_CAT_MOVE_UP' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=-15&cat_id=$cat_id")), ! 'U_CAT_MOVE_DOWN' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=15&cat_id=$cat_id")), ! 'U_VIEWCAT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")), 'L_MOVE_UP' => ($is_root) ? '' : $lang['Move_up'], *************** *** 286,290 **** $subdesc = album_get_object_lang($subcur, 'desc'); ! $subpgm = append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=" . $album_data['id'][$subthis])); // the number of picture for the sub category (only one level down) --- 286,290 ---- $subdesc = album_get_object_lang($subcur, 'desc'); ! $subpgm = mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=" . $album_data['id'][$subthis])); // the number of picture for the sub category (only one level down) *************** *** 338,342 **** $subfolder_img = '<img src="' . $slideshow_img_xs . '" valign="middle" title="' . $sub_total_pics . '" alt="' . $sub_total_pics . '"/>'; $sub_cat_separator = ( $i != count ($sub_cats) ) ? ',':''; ! //$slideshow_link = append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $last_pic_id . "&slideshow=5")); $link = $link_spacer . $subfolder_img . ' <a href="' . $subpgm . '" title="' . $subdesc . '" class="forumlink2' . $new_images_class . '"><b>' . $subname . '</b></a><b>' . $sub_cat_separator .'</b> '; } --- 338,342 ---- $subfolder_img = '<img src="' . $slideshow_img_xs . '" valign="middle" title="' . $sub_total_pics . '" alt="' . $sub_total_pics . '"/>'; $sub_cat_separator = ( $i != count ($sub_cats) ) ? ',':''; ! //$slideshow_link = mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $last_pic_id . "&slideshow=5")); $link = $link_spacer . $subfolder_img . ' <a href="' . $subpgm . '" title="' . $subdesc . '" class="forumlink2' . $new_images_class . '"><b>' . $subname . '</b></a><b>' . $sub_cat_separator .'</b> '; } *************** *** 370,374 **** $first_pic_id = album_get_first_pic_id($cur_cat_id); $last_pic_id = album_get_last_pic_id($ss_cat_id); ! $slideshow_link = append_sid(this_fap_portalurl("smartor_mode=album_showpage" . "&pic_id=" . $last_pic_id . "&slideshow=5")); $slideshow_link_full = '[<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>]'; //$slideshow_link_full = '<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . ' ' . $slideshow_img . '</a>'; --- 370,374 ---- $first_pic_id = album_get_first_pic_id($cur_cat_id); $last_pic_id = album_get_last_pic_id($ss_cat_id); ! $slideshow_link = mx_append_sid(this_fap_portalurl("smartor_mode=album_showpage" . "&pic_id=" . $last_pic_id . "&slideshow=5")); $slideshow_link_full = '[<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>]'; //$slideshow_link_full = '<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . ' ' . $slideshow_img . '</a>'; *************** *** 395,399 **** $last_pic_id = album_get_last_pic_id($ss_cat_id); $slideshow_img = '<img src="' . $images['icon_latest_reply'] . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" align="middle" />'; ! $slideshow_link = append_sid(this_fap_portalurl("smartor_mode=album_showpage" . "&pic_id=" . $first_pic_id . "&slideshow=5")); $slideshow_link_full = '[<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>]'; //$slideshow_link_full = '<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . ' ' . $slideshow_img . '</a>'; --- 395,399 ---- $last_pic_id = album_get_last_pic_id($ss_cat_id); $slideshow_img = '<img src="' . $images['icon_latest_reply'] . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" align="middle" />'; ! $slideshow_link = mx_append_sid(this_fap_portalurl("smartor_mode=album_showpage" . "&pic_id=" . $first_pic_id . "&slideshow=5")); $slideshow_link_full = '[<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>]'; //$slideshow_link_full = '<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . ' ' . $slideshow_img . '</a>'; *************** *** 466,470 **** $slideshow_img = '<img src="' . $slideshow_img_xs . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" />'; // Bicet - XS Support - END ! $slideshow_link = append_sid(this_fap_portalurl("smartor_mode=album_showpage" . '&pic_id=' . $first_pic_id . '&slideshow=5')); //$slideshow_link_full = ' (<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>) '; $slideshow_link_full = ' [<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>] '; --- 466,470 ---- $slideshow_img = '<img src="' . $slideshow_img_xs . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" />'; // Bicet - XS Support - END ! $slideshow_link = mx_append_sid(this_fap_portalurl("smartor_mode=album_showpage" . '&pic_id=' . $first_pic_id . '&slideshow=5')); //$slideshow_link_full = ' (<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>) '; $slideshow_link_full = ' [<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>] '; *************** *** 477,481 **** $slideshow_img = '<img src="' . $slideshow_icon . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" align="middle" />'; ! $slideshow_link = append_sid(this_fap_portalurl("smartor_mode=album_showpage" . '&pic_id=' . $first_pic_id . '&slideshow=5')); $slideshow_link_full = ' [<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>] '; --- 477,481 ---- $slideshow_img = '<img src="' . $slideshow_icon . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" align="middle" />'; ! $slideshow_link = mx_append_sid(this_fap_portalurl("smartor_mode=album_showpage" . '&pic_id=' . $first_pic_id . '&slideshow=5')); $slideshow_link_full = ' [<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>] '; *************** *** 500,504 **** } global $config_mg; ! $cat_url = ( isset($config_mg['url_rw']) && ($config_mg['url_rw'] === '1') ) ? append_sid(str_replace ('--', '-', make_url_friendly(album_get_object_lang($cur_cat_id, 'name')) . "-ac" . $cat_id . ".html")) : append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")); } else --- 500,504 ---- } global $config_mg; ! $cat_url = ( isset($config_mg['url_rw']) && ($config_mg['url_rw'] === '1') ) ? mx_append_sid(str_replace ('--', '-', make_url_friendly(album_get_object_lang($cur_cat_id, 'name')) . "-ac" . $cat_id . ".html")) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")); } else *************** *** 513,517 **** } $xs_new = ''; ! $cat_url = append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")); } // send all the data to the template, except for the sub categories links --- 513,517 ---- } $xs_new = ''; ! $cat_url = mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")); } // send all the data to the template, except for the sub categories links *************** *** 524,528 **** 'XS_NEW' => $xs_new, 'U_VIEWCAT' => $cat_url, ! //'U_VIEWCAT' => append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")), 'L_MODERATORS' => empty($moderators) ? '' : $lang['Moderators'] . ' :', 'MODERATORS' => $moderators, --- 524,528 ---- 'XS_NEW' => $xs_new, 'U_VIEWCAT' => $cat_url, ! //'U_VIEWCAT' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")), 'L_MODERATORS' => empty($moderators) ? '' : $lang['Moderators'] . ' :', 'MODERATORS' => $moderators, *************** *** 612,624 **** if ($album_config['fullpic_popup'] == 0) { ! $pic_url_sid = append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $last_pic_id)); $pic_target = '_self'; } else { ! $pic_url_sid = append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $last_pic_id)); $pic_target = '_blank'; } ! $pic_thumb_sid = append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $last_pic_id)); if ($last_pic_id == 0) --- 612,624 ---- if ($album_config['fullpic_popup'] == 0) { ! $pic_url_sid = mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $last_pic_id)); $pic_target = '_self'; } else { ! $pic_url_sid = mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $last_pic_id)); $pic_target = '_blank'; } ! $pic_thumb_sid = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $last_pic_id)); if ($last_pic_id == 0) *************** *** 745,749 **** //----------------------------------------------- // Append $user_id to a url. ! // Borrowed from append_sid in session.php //----------------------------------------------- function album_append_uid($user_id, $url = '', $non_html_amp = false) --- 745,749 ---- //----------------------------------------------- // Append $user_id to a url. ! // Borrowed from mx_append_sid in session.php //----------------------------------------------- function album_append_uid($user_id, $url = '', $non_html_amp = false) *************** *** 943,951 **** if (!empty($field_name) && ( $album_data['auth'][$param_value]['view']==1) && $k == 1 ) { ! $res = '<a href="' . append_sid(album_append_uid('./' . $pgm_name . (($field_name != '') ? "&$param_type=$param_value" : ''))) . '" class="nav-current">' . $field_name . '</a>' . (($res != '') ? ALBUM_NAV_ARROW . $res : ''); } elseif (!empty($field_name) && ( $album_data['auth'][$param_value]['view']==1) ) { ! $res = '<a href="' . append_sid(album_append_uid('./' . $pgm_name . (($field_name != '') ? "&$param_type=$param_value" : ''))) . '" class="nav">' . $field_name . '</a>' . (($res != '') ? ALBUM_NAV_ARROW . $res : ''); } } --- 943,951 ---- if (!empty($field_name) && ( $album_data['auth'][$param_value]['view']==1) && $k == 1 ) { ! $res = '<a href="' . mx_append_sid(album_append_uid('./' . $pgm_name . (($field_name != '') ? "&$param_type=$param_value" : ''))) . '" class="nav-current">' . $field_name . '</a>' . (($res != '') ? ALBUM_NAV_ARROW . $res : ''); } elseif (!empty($field_name) && ( $album_data['auth'][$param_value]['view']==1) ) { ! $res = '<a href="' . mx_append_sid(album_append_uid('./' . $pgm_name . (($field_name != '') ? "&$param_type=$param_value" : ''))) . '" class="nav">' . $field_name . '</a>' . (($res != '') ? ALBUM_NAV_ARROW . $res : ''); } } *************** *** 954,958 **** if (!empty($field_name) && ( $album_data['auth'][$param_value]['view'] == 1) ) { ! $res = '<a href="' . append_sid(album_append_uid('./' . $pgm_name . (($field_name != '') ? "&$param_type=$param_value" : ''))) . '" class="' . $nav_class . '">' . $field_name . '</a>' . (($res != '') ? ALBUM_NAV_ARROW . $res : ''); } } --- 954,958 ---- if (!empty($field_name) && ( $album_data['auth'][$param_value]['view'] == 1) ) { ! $res = '<a href="' . mx_append_sid(album_append_uid('./' . $pgm_name . (($field_name != '') ? "&$param_type=$param_value" : ''))) . '" class="' . $nav_class . '">' . $field_name . '</a>' . (($res != '') ? ALBUM_NAV_ARROW . $res : ''); } } *************** *** 1276,1280 **** $res = $javascript; ! $res .= '<form name="jumpbox" action="'. append_sid(this_smartor_mxurl("smartor_mode=album_cat")) .'" method="get">'; $res .= $lang['Jump_to'] . ': <select name="cat_id" onChange="onChangeCheck()">'; $res .= album_get_tree_option($cat_id, $auth_key, ALBUM_SELECTBOX_INCLUDE_ROOT); --- 1276,1280 ---- $res = $javascript; ! $res .= '<form name="jumpbox" action="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat")) .'" method="get">'; $res .= $lang['Jump_to'] . ': <select name="cat_id" onChange="onChangeCheck()">'; $res .= album_get_tree_option($cat_id, $auth_key, ALBUM_SELECTBOX_INCLUDE_ROOT); *************** *** 1422,1430 **** //'L_PUBLIC_CATS' => (!$is_personal_gallery) ? $lang['Public_Categories'] : sprintf($lang['Personal_Gallery_Of_User'], album_get_user_name($user_id)), 'L_PUBLIC_CATS' => (!$is_personal_gallery) ? $lang['Public_Categories'] : $lang['Public_Categories'], ! 'U_YOUR_PERSONAL_GALLERY' => append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=" . $userdata['user_id'])), ! //'U_YOUR_PERSONAL_GALLERY' => append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=" . album_get_personal_root_id($userdata['user_id']) . "user_id=" . $userdata['user_id'])), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], ! 'U_USERS_PERSONAL_GALLERIES' => append_sid(this_smartor_mxurl("smartor_mode=album_personal_index")), 'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'] ) --- 1422,1430 ---- //'L_PUBLIC_CATS' => (!$is_personal_gallery) ? $lang['Public_Categories'] : sprintf($lang['Personal_Gallery_Of_User'], album_get_user_name($user_id)), 'L_PUBLIC_CATS' => (!$is_personal_gallery) ? $lang['Public_Categories'] : $lang['Public_Categories'], ! 'U_YOUR_PERSONAL_GALLERY' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=" . $userdata['user_id'])), ! //'U_YOUR_PERSONAL_GALLERY' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=" . album_get_personal_root_id($userdata['user_id']) . "user_id=" . $userdata['user_id'])), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], ! 'U_USERS_PERSONAL_GALLERIES' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal_index")), 'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'] ) *************** *** 1442,1450 **** { $template->assign_block_vars('catfooter.cat_public_footer', array( ! 'U_YOUR_PERSONAL_GALLERY' => append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=" . $userdata['user_id'])), ! //'U_YOUR_PERSONAL_GALLERY' => append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=" . album_get_personal_root_id($userdata['user_id']) . "user_id=" . $userdata['user_id'])), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], ! 'U_USERS_PERSONAL_GALLERIES' => append_sid(this_smartor_mxurl("smartor_mode=album_personal_index")), 'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'], --- 1442,1450 ---- { $template->assign_block_vars('catfooter.cat_public_footer', array( ! 'U_YOUR_PERSONAL_GALLERY' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=" . $userdata['user_id'])), ! //'U_YOUR_PERSONAL_GALLERY' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=" . album_get_personal_root_id($userdata['user_id']) . "user_id=" . $userdata['user_id'])), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], ! 'U_USERS_PERSONAL_GALLERIES' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal_index")), 'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'], Index: album_nuffimage_box.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_nuffimage_box.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_nuffimage_box.php 7 Jun 2007 20:13:18 -0000 1.1 --- album_nuffimage_box.php 8 Feb 2008 10:47:59 -0000 1.2 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ * @copyright (c) 2007 [ory...@rd..., OryNider] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ * @copyright (c) 2007 [ory...@rd..., OryNider] mxBB Development Team *************** *** 118,126 **** 'NUFF_PIC_ID' => $pic_id, ! //'HIDDEN_FIELDS_NUFF' => append_sid(album_append_uid(('album_pic_nuffed.' . $phpEx . '?pic_id=' . $pic_id . $nuff_mode)), ! //'U_NUFFIMAGE_ACTION' => append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '?pic_id=' . $pic_id . $full_size_param . '&nuffimage=true')), ! 'U_NUFFIMAGE_ACTION' => append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $pic_id . $full_size_param . '&nuffimage=true')), ! //'U_NUFFIMAGE_ACTION' => append_sid(album_append_uid('album_showpage.' . $phpEx)), // This would be required in tpl if you want to hide pic id and nuffimage var. /* --- 118,126 ---- 'NUFF_PIC_ID' => $pic_id, ! //'HIDDEN_FIELDS_NUFF' => mx_append_sid(album_append_uid(('album_pic_nuffed.' . $phpEx . '?pic_id=' . $pic_id . $nuff_mode)), ! //'U_NUFFIMAGE_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '?pic_id=' . $pic_id . $full_size_param . '&nuffimage=true')), ! 'U_NUFFIMAGE_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $pic_id . $full_size_param . '&nuffimage=true')), ! //'U_NUFFIMAGE_ACTION' => mx_append_sid(album_append_uid('album_showpage.' . $phpEx)), // This would be required in tpl if you want to hide pic id and nuffimage var. /* Index: album_hierarchy_sql.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_hierarchy_sql.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** album_hierarchy_sql.php 11 Jul 2007 14:25:27 -0000 1.9 --- album_hierarchy_sql.php 8 Feb 2008 10:47:59 -0000 1.10 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_smartor * @version $Id$ * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_smartor * @version $Id$ * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team *************** *** 797,801 **** else { ! $info .= $lang['Pic_Poster'] . ': <a href="' . append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $row['user_id']) . '">' . $row['username'] . '</a>'; } } --- 797,801 ---- else { ! $info .= $lang['Pic_Poster'] . ': <a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $row['user_id']) . '">' . $row['username'] . '</a>'; } } *************** *** 813,817 **** $info .= '<br />' . $lang['Pic_Image'] . ': <a href="'; ! $info .= ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $row['pic_id'])) . '" target="_blank">' : append_sid(this_smartor_mxurl("smartor_mode=album_pic" . '&pic_id=' . $row['pic_id'])) . '">' ; $info .= $row['pic_title'] . '</a>'; --- 813,817 ---- $info .= '<br />' . $lang['Pic_Image'] . ': <a href="'; ! $info .= ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $row['pic_id'])) . '" target="_blank">' : mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic" . '&pic_id=' . $row['pic_id'])) . '">' ; $info .= $row['pic_title'] . '</a>'; *************** *** 958,966 **** else { ! $info .= '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $row['user_id']) . '">' . $row['username'] . '</a>'; } } ! $info .= '<br />' . $lang['Pic_Image'] . ': <a href="' . append_sid(this_smartor_mxurl("smartor_mode=album_pic" . '?pic_id=' . $row['pic_id'])) . '">' . $row['pic_title'] . '</a>'; return $info; --- 958,966 ---- else { ! $info .= '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $row['user_id']) . '">' . $row['username'] . '</a>'; } } ! $info .= '<br />' . $lang['Pic_Image'] . ': <a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic" . '?pic_id=' . $row['pic_id'])) . '">' . $row['pic_title'] . '</a>'; return $info; *************** *** 1002,1006 **** for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="' . append_sid(PHPBB_URL . "groupcp.$phpEx?" . POST_GROUPS_URL . '=' . $grouprows[$j]['group_id']) . '">' . $grouprows[$j]['group_name'] . '</a>'; $moderators .= ($moderators == '') ? $group_link : ', ' . $group_link; } --- 1002,1006 ---- for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="' . mx_append_sid(PHPBB_URL . "groupcp.$phpEx?" . POST_GROUPS_URL . '=' . $grouprows[$j]['group_id']) . '">' . $grouprows[$j]['group_name'] . '</a>'; $moderators .= ($moderators == '') ? $group_link : ', ' . $group_link; } *************** *** 1088,1096 **** if (intval($cat_ids) == album_get_personal_root_id($user_id) && $user_id != ALBUM_PUBLIC_GALLERY) { ! $album_pagination_page_url = append_sid(this_smartor_mxurl()); } else { ! $album_pagination_page_url = append_sid(this_smartor_mxurl("smartor_mode=album_cat")); } --- 1088,1096 ---- if (intval($cat_ids) == album_get_personal_root_id($user_id) && $user_id != ALBUM_PUBLIC_GALLERY) { ! $album_pagination_page_url = mx_append_sid(this_smartor_mxurl()); } else { ! $album_pagination_page_url = mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat")); } *************** *** 1159,1163 **** $approval_mode = ($picrow[$j]['pic_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link = '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=$approval_mode&pic_id=" . $picrow[$j]['pic_id'])) . '">'; $approval_link .= ($picrow[$j]['pic_approval'] == 0) ? '<b>' . $lang['Approve'] . '</b>' : $lang['Unapprove']; --- 1159,1163 ---- $approval_mode = ($picrow[$j]['pic_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link = '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=$approval_mode&pic_id=" . $picrow[$j]['pic_id'])) . '">'; $approval_link .= ($picrow[$j]['pic_approval'] == 0) ? '<b>' . $lang['Approve'] . '</b>' : $lang['Unapprove']; *************** *** 1167,1171 **** } ! $thumbnail_file = append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail" . "&pic_id=". $picrow[$j]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { --- 1167,1171 ---- } ! $thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail" . "&pic_id=". $picrow[$j]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { *************** *** 1186,1195 **** else { ! $pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $picrow[$j]['pic_id'])) . '\',\'' . addslashes($picrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } $template->assign_block_vars('index_pics_block.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' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, --- 1186,1195 ---- else { ! $pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $picrow[$j]['pic_id'])) . '\',\'' . addslashes($picrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } $template->assign_block_vars('index_pics_block.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' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, *************** *** 1221,1225 **** else { ! $pic_poster = '<a href="'. append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL .'='. $picrow[$j]['user_id']) .'">'. $picrow[$j]['username'] .'</a>'; } --- 1221,1225 ---- else { ! $pic_poster = '<a href="'. mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL .'='. $picrow[$j]['user_id']) .'">'. $picrow[$j]['username'] .'</a>'; } *************** *** 1237,1241 **** 'PIC_ID' => $picrow[$j]['pic_id'], //'TITLE' => '<a href = "' . $album_show_pic_url . '?pic_id=' . $picrow[$j]['pic_id'] . '">' . $picrow[$j]['pic_title'] . '</a>', ! 'TITLE' => '<a href = "' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $picrow[$j]['pic_title'] . '</a>', 'POSTER' => $pic_poster, 'TIME' => create_date2($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']), --- 1237,1241 ---- 'PIC_ID' => $picrow[$j]['pic_id'], //'TITLE' => '<a href = "' . $album_show_pic_url . '?pic_id=' . $picrow[$j]['pic_id'] . '">' . $picrow[$j]['pic_title'] . '</a>', ! 'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $picrow[$j]['pic_title'] . '</a>', 'POSTER' => $pic_poster, 'TIME' => create_date2($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']), *************** *** 1243,1261 **** 'VIEW' => $picrow[$j]['pic_view_count'], ! 'RATING' => ($album_config['rate'] == 1) ?( '<a href="' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $picrow[$j]['pic_id'])) . '"' . $image_rating_link_style . '>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'EDIT' => ($edit_rights) ? '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_edit&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Edit_pic'] . '</a>' : '', ! 'DELETE' => ($delete_rights) ? '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_delete&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Delete_pic'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=move&pic_id=" . $picrow[$j]['pic_id'])) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<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://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="'. append_sid(this_smartor_mxurl("smartor_mode=album_avatar&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Avatar_Set'] . '</a>' : '', 'IMG_BBCODE' => ( ($userdata['user_level'] == ADMIN) || ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<br /><a href="javasript://" OnClick="window.clipboardData.setData(\'Text\', \'[albumimg]' . $picrow[$j]['pic_id'] . '[/albumimg]\'); return false;">' . $lang['BBCode_Copy'] . '</a>' : '' --- 1243,1261 ---- 'VIEW' => $picrow[$j]['pic_view_count'], ! 'RATING' => ($album_config['rate'] == 1) ?( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $picrow[$j]['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=" . $picrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '', ! 'EDIT' => ($edit_rights) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_edit&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Edit_pic'] . '</a>' : '', ! 'DELETE' => ($delete_rights) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_delete&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Delete_pic'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=move&pic_id=" . $picrow[$j]['pic_id'])) .'">'. $lang['Move'] .'</a>' : '', ! '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>' : '', 'IMG_BBCODE' => ( ($userdata['user_level'] == ADMIN) || ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<br /><a href="javasript://" OnClick="window.clipboardData.setData(\'Text\', \'[albumimg]' . $picrow[$j]['pic_id'] . '[/albumimg]\'); return false;">' . $lang['BBCode_Copy'] . '</a>' : '' *************** *** 1267,1271 **** { $last_pic_id = $picrow[$j]['pic_id']; ! $slideshow_link = append_sid(this_fap_portalurl("smartor_mode=album_showpage" . '&pic_id=' . $last_pic_id . '&slideshow=5')); $slideshow_link_full = ' [<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>] '; } --- 1267,1271 ---- { $last_pic_id = $picrow[$j]['pic_id']; ! $slideshow_link = mx_append_sid(this_fap_portalurl("smartor_mode=album_showpage" . '&pic_id=' . $last_pic_id . '&slideshow=5')); $slideshow_link_full = ' [<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>] '; } *************** *** 1286,1293 **** else { ! $album_page_url = append_sid(this_fap_portalurl("smartor_mode=album_cat")); } ! $image_cat_url = append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=" . $picrow[$j]['cat_id'] . '&user_id=' . $picrow[$j]['cat_user_id'])); $template->assign_block_vars('index_pics_block.picrow.pic_detail.cats', array( --- 1286,1293 ---- else { ! $album_page_url = mx_append_sid(this_fap_portalurl("smartor_mode=album_cat")); } ! $image_cat_url = mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=" . $picrow[$j]['cat_id'] . '&user_id=' . $picrow[$j]['cat_user_id'])); $template->assign_block_vars('index_pics_block.picrow.pic_detail.cats', array( *************** *** 1301,1305 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_smartor_mxurl('smartor_mode=album_cat&cat_id=' . intval($cat_ids) . '&sort_method=' . $sort_method . '&sort_order=' . $sort_order . $viewmode)), $total_pics, $pics_per_page, $start), 'SLIDESHOW' => $slideshow_link_full, 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $pics_per_page ) + 1 ), ceil( $total_pics / $pics_per_page )) --- 1301,1305 ---- $template->assign_vars(array( ! 'PAGINATION' => mx_generate_pagination(mx_append_sid(this_smartor_mxurl('smartor_mode=album_cat&cat_id=' . intval($cat_ids) . '&sort_method=' . $sort_method . '&sort_order=' . $sort_order . $viewmode)), $total_pics, $pics_per_page, $start), 'SLIDESHOW' => $slideshow_link_full, 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $pics_per_page ) + 1 ), ceil( $total_pics / $pics_per_page )) *************** *** 1369,1373 **** } ! $thumbnail_file = append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $recentrow[$j]['pic_id'], true)); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { --- 1369,1373 ---- } ! $thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $recentrow[$j]['pic_id'], true)); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { *************** *** 1388,1396 **** else { ! $pic_preview = 'onmouseover="showtrail(\''. append_sid(this_smartor_mxurl("smartor_mode=album_picm&pic_id=" . $recentrow[$j]['pic_id'], true)) . '\',\'' . addslashes($recentrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } $template->assign_block_vars('recent_pics_block.recent_pics.recent_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $recentrow[$j]['pic_id'], true)) : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'], false)), 'THUMBNAIL' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, --- 1388,1396 ---- else { ! $pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_smartor_mxurl("smartor_mode=album_picm&pic_id=" . $recentrow[$j]['pic_id'], true)) . '\',\'' . addslashes($recentrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } $template->assign_block_vars('recent_pics_block.recent_pics.recent_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $recentrow[$j]['pic_id'], true)) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'], false)), 'THUMBNAIL' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, *************** *** 1421,1425 **** else { ! $recent_poster = '<a href="'. append_sid(PHPBB_URL. 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL .'='. $recentrow[$j]['user_id']) .'">'. $recentrow[$j]['username'] .'</a>'; } --- 1421,1425 ---- else { ! $recent_poster = '<a href="'. mx_append_sid(PHPBB_URL. 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL .'='. $recentrow[$j]['user_id']) .'">'. $recentrow[$j]['username'] .'</a>'; } *************** *** 1433,1437 **** $template->assign_block_vars('recent_pics_block.recent_pics.recent_detail', array( 'PIC_ID' => $recentrow[$j]['pic_id'], ! 'TITLE' => '<a href = "' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'])) . '">' . $recentrow[$j]['pic_title'] . '</a>', 'POSTER' => $recent_poster, 'TIME' => create_date2($board_config['default_dateformat'], $recentrow[$j]['pic_time'], $board_config['board_timezone']), --- 1433,1437 ---- $template->assign_block_vars('recent_pics_block.recent_pics.recent_detail', array( 'PIC_ID' => $recentrow[$j]['pic_id'], ! 'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'])) . '">' . $recentrow[$j]['pic_title'] . '</a>', 'POSTER' => $recent_poster, 'TIME' => create_date2($board_config['default_dateformat'], $recentrow[$j]['pic_time'], $board_config['board_timezone']), *************** *** 1439,1445 **** 'VIEW' => $recentrow[$j]['pic_view_count'], ! 'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . 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 />' : '' --- 1439,1445 ---- 'VIEW' => $recentrow[$j]['pic_view_count'], ! 'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['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=" . $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 />' : '' *************** *** 1538,1542 **** } ! $thumbnail_file = append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $highestrow[$j]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { --- 1538,1542 ---- } ! $thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $highestrow[$j]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { *************** *** 1558,1562 **** else { ! $pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $highestrow[$j]['pic_id'])) . '\',\'' . addslashes($highestrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } --- 1558,1562 ---- else { ! $pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $highestrow[$j]['pic_id'])) . '\',\'' . addslashes($highestrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } *************** *** 1564,1568 **** { $template->assign_block_vars('highest_pics_block.highest_pics.highest_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $highestrow[$j]['pic_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])), 'THUMBNAIL' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, --- 1564,1568 ---- { $template->assign_block_vars('highest_pics_block.highest_pics.highest_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $highestrow[$j]['pic_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])), 'THUMBNAIL' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, *************** *** 1594,1598 **** else { ! $highest_poster = '<a href="' . append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $highestrow[$j]['user_id']) . '">' . $highestrow[$j]['username'] . '</a>'; } --- 1594,1598 ---- else { ! $highest_poster = '<a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $highestrow[$j]['user_id']) . '">' . $highestrow[$j]['username'] . '</a>'; } *************** *** 1609,1613 **** $template->assign_block_vars('highest_pics_block.highest_pics.highest_detail', array( 'PIC_ID' => $highestrow[$j]['pic_id'], ! 'H_TITLE' => '<a href = "' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '">' . $highestrow[$j]['pic_title'] . '</a>', 'H_POSTER' => $highest_poster, 'H_TIME' => create_date2($board_config['default_dateformat'], $highestrow[$j]['pic_time'], $board_config['board_timezone']), --- 1609,1613 ---- $template->assign_block_vars('highest_pics_block.highest_pics.highest_detail', array( 'PIC_ID' => $highestrow[$j]['pic_id'], ! 'H_TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '">' . $highestrow[$j]['pic_title'] . '</a>', 'H_POSTER' => $highest_poster, 'H_TIME' => create_date2($board_config['default_dateformat'], $highestrow[$j]['pic_time'], $board_config['board_timezone']), *************** *** 1615,1621 **** 'H_VIEW' => $highestrow[$j]['pic_view_count'], ! 'H_RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '', ! 'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . 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 />' : '' --- 1615,1621 ---- 'H_VIEW' => $highestrow[$j]['pic_view_count'], ! 'H_RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '', ! '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 />' : '' *************** *** 1707,1711 **** } ! $thumbnail_file = append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $mostviewed[$j]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { --- 1707,1711 ---- } ! $thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $mostviewed[$j]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { *************** *** 1727,1735 **** else { ! $pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $mostviewed[$j]['pic_id'])) . '\',\'' . addslashes($mostviewed[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } $template->assign_block_vars('mostviewed_pics_block.mostviewed_pics.mostviewed_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $mostviewed[$j]['pic_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])), 'THUMBNAIL' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, --- 1727,1735 ---- else { ! $pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $mostviewed[$j]['pic_id'])) . '\',\'' . addslashes($mostviewed[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } $template->assign_block_vars('mostviewed_pics_block.mostviewed_pics.mostviewed_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $mostviewed[$j]['pic_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])), 'THUMBNAIL' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, *************** *** 1760,1764 **** else { ! $mostviewed_poster = '<a href="' . append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $mostviewed[$j]['user_id']) . '">' . $mostviewed[$j]['username'] . '</a>'; } --- 1760,1764 ---- else { ! $mostviewed_poster = '<a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $mostviewed[$j]['user_id']) . '">' . $mostviewed[$j]['username'] . '</a>'; } *************** *** 1772,1776 **** $template->assign_block_vars('mostviewed_pics_block.mostviewed_pics.mostviewed_detail', array( 'PIC_ID' => $mostviewed[$j]['pic_id'], ! 'H_TITLE' => '<a href = "' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '">' . $mostviewed[$j]['pic_title'] . '</a>', 'H_POSTER' => $mostviewed_poster, 'H_TIME' => create_date2($board_config['default_dateformat'], $mostviewed[$j]['pic_time'], $board_config['board_timezone']), --- 1772,1776 ---- $template->assign_block_vars('mostviewed_pics_block.mostviewed_pics.mostviewed_detail', array( 'PIC_ID' => $mostviewed[$j]['pic_id'], ! 'H_TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '">' . $mostviewed[$j]['pic_title'] . '</a>', 'H_POSTER' => $mostviewed_poster, 'H_TIME' => create_date2($board_config['default_dateformat'], $mostviewed[$j]['pic_time'], $board_config['board_timezone']), *************** *** 1778,1784 **** 'H_VIEW' => $mostviewed[$j]['pic_view_count'], ! 'H_RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '', ! 'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . 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 />' : '' --- 1778,1784 ---- 'H_VIEW' => $mostviewed[$j]['pic_view_count'], ! 'H_RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '', ! '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 />' : '' *************** *** 1863,1867 **** } ! $thumbnail_file = append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $randrow[$j]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { --- 1863,1867 ---- } ! $thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $randrow[$j]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { *************** *** 1883,1891 **** else { ! $pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $randrow[$j]['pic_id'])) . '\',\'' . addslashes($randrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } $template->assign_block_vars('random_pics_block.rand_pics.rand_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $randrow[$j]['pic_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])), 'THUMBNAIL' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, --- 1883,1891 ---- else { ! $pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $randrow[$j]['pic_id'])) . '\',\'' . addslashes($randrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } $template->assign_block_vars('random_pics_block.rand_pics.rand_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $randrow[$j]['pic_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])), 'THUMBNAIL' => $thumbnail_file, 'PIC_PREVIEW' => $pic_preview, *************** *** 1916,1920 **** else { ! $rand_poster = '<a href="' . append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $randrow[$j]['user_id']) . '">' . $randrow[$j]['username'] . '</a>'; } --- 1916,1920 ---- else { ! $rand_poster = '<a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $randrow[$j]['user_id']) . '">' . $randrow[$j]['username'] . '</a>'; } *************** *** 1928,1932 **** $template->assign_block_vars('random_pics_block.rand_pics.rand_detail', array( 'PIC_ID' => $randrow[$j]['pic_id'], ! 'TITLE' => '<a href = "' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])) . '">' . $randrow[$j]['pic_title'] . '</a>', 'POSTER' => $rand_poster, 'TIME' => create_date2($board_config['default_dateformat'], $randrow[$j]['pic_time'], $board_config['board_timezone']), --- 1928,1932 ---- $template->assign_block_vars('random_pics_block.rand_pics.rand_detail', array( 'PIC_ID' => $randrow[$j]['pic_id'], ! 'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])) . '">' . $randrow[$j]['pic_title'] . '</a>', 'POSTER' => $rand_poster, 'TIME' => create_date2($board_config['default_dateformat'], $randrow[$j]['pic_time'], $board_config['board_timezone']), *************** *** 1934,1940 **** 'VIEW' => $randrow[$j]['pic_view_count'], ! 'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . 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 />' : '' --- 1934,1940 ---- 'VIEW' => $randrow[$j]['pic_view_count'], ! 'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['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=" . $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 />' : '' *************** *** 2048,2052 **** else { ! $poster = '<a href="' . append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $commentsrow[$i]['user_id']) . '">' . $commentsrow[$i]['username'] . '</a>'; } --- 2048,2052 ---- else { ! $poster = '<a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $commentsrow[$i]['user_id']) . '">' . $commentsrow[$i]['username'] . '</a>'; } *************** *** 2055,2063 **** } ! $info .= '<br />' . $lang['Pic_Image'] . ': <a href="' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $commentsrow[$i]['pic_title'] . '</a>'; $image_comment = ($commentsrow[$i]['comments'] == 0) ? $lang['Not_commented'] : $commentsrow[$i]['comments']; ! $thumbnail_file = append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $commentsrow[$i]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { --- 2055,2063 ---- } ! $info .= '<br />' . $lang['Pic_Image'] . ': <a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $commentsrow[$i]['pic_title'] . '</a>'; $image_comment = ($commentsrow[$i]['comments'] == 0) ? $lang['Not_commented'] : $commentsrow[$i]['comments']; ! $thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $commentsrow[$i]['pic_id'])); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { *************** *** 2079,2083 **** else { ! $pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $commentsrow[$i]['pic_id'])) . '\',\'' . addslashes($commentsrow[$i]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } --- 2079,2083 ---- else { ! $pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $commentsrow[$i]['pic_id'])) . '\',\'' . addslashes($commentsrow[$i]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } *************** *** 2122,2126 **** $template->assign_block_vars('recent_comments_block.comment_row', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=" . $commentsrow[$i]['pic_id'])) : append_sid(this_smartor_mxurl("smart... [truncated message content] |
