|
From: OryNider <ory...@us...> - 2007-07-05 06:00:26
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28358 Modified Files: album_lists.php welcome.php Log Message: this will enable preview in album_list if is on album_index. Index: album_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_lists.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** album_lists.php 4 Jul 2007 15:49:31 -0000 1.18 --- album_lists.php 5 Jul 2007 06:00:21 -0000 1.19 *************** *** 68,72 **** $album_config['fullpic_popup'] = 0; $album_config['comment'] = 1; ! $album_sp_config['rate_type'] = 1; --- 68,72 ---- $album_config['fullpic_popup'] = 0; $album_config['comment'] = 1; ! $album_config['lb_preview'] = ( ($page_id == $album_config['index']) ? $album_config['lb_preview'] : 0); $album_sp_config['rate_type'] = 1; *************** *** 119,123 **** if ($allowed_cat != '') { ! $sql = "SELECT p.pic_id, p.pic_title, p.pic_desc, p.pic_user_id, p.pic_user_ip, p.pic_username, p.pic_time, p.pic_cat_id, p.pic_view_count, u.user_id, u.username, r.rate_pic_id, AVG(r.rate_point) AS rating, COUNT(DISTINCT c.comment_id) AS comments FROM ". ALBUM_TABLE ." AS p LEFT JOIN ". USERS_TABLE ." AS u ON p.pic_user_id = u.user_id --- 119,124 ---- if ($allowed_cat != '') { ! ! $sql = "SELECT p.*, u.user_id, u.username, r.rate_pic_id, AVG(r.rate_point) AS rating, COUNT(DISTINCT c.comment_id) AS comments FROM ". ALBUM_TABLE ." AS p LEFT JOIN ". USERS_TABLE ." AS u ON p.pic_user_id = u.user_id *************** *** 169,175 **** --- 170,186 ---- } + if ($album_config['lb_preview'] == 0) + { + $pic_preview = ''; + } + else + { + $pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $recentrow[$j]['pic_id'])) . '\',\'' . 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_fap_toplisturl("smartor_mode=album_pic&pic_id=". $recentrow[$j]['pic_id'], TRUE)) : append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'], TRUE)), 'THUMBNAIL' => append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $recentrow[$j]['pic_id'], TRUE)), + 'PIC_PREVIEW' => $pic_preview, 'DESC' => $recentrow[$j]['pic_desc'] ) *************** *** 281,287 **** --- 292,308 ---- } + if ($album_config['lb_preview'] == 0) + { + $pic_preview = ''; + } + else + { + $pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $mostrow[$j]['pic_id'])) . '\',\'' . addslashes($mostrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; + } + $template->assign_block_vars('most_pics_block.most_pics.most_col', array( 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $mostrow[$j]['pic_id'], TRUE)) : append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $mostrow[$j]['pic_id'], TRUE)), 'THUMBNAIL' => append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $mostrow[$j]['pic_id'], TRUE)), + 'PIC_PREVIEW' => $pic_preview, 'DESC' => $mostrow[$j]['pic_desc'] ) *************** *** 386,400 **** for ($j = $i; $j < ($i + $album_sp_config['img_cols']); $j++) { ! if( $j >= count($highestrow) ) ! { ! break; ! } ! $template->assign_block_vars('highest_pics_block.highest_pics.highest_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $highestrow[$j]['pic_id'], TRUE)) : append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'], TRUE)), ! 'THUMBNAIL' => append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $highestrow[$j]['pic_id'], TRUE)), ! 'DESC' => $highestrow[$j]['pic_desc'] ! ) ! ); if( ($highestrow[$j]['user_id'] == ALBUM_GUEST) or ($highestrow[$j]['username'] == '') ) --- 407,431 ---- for ($j = $i; $j < ($i + $album_sp_config['img_cols']); $j++) { ! if( $j >= count($highestrow) ) ! { ! break; ! } ! if ($album_config['lb_preview'] == 0) ! { ! $pic_preview = ''; ! } ! 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()"'; ! } ! ! $template->assign_block_vars('highest_pics_block.highest_pics.highest_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $highestrow[$j]['pic_id'], TRUE)) : append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'], TRUE)), ! 'THUMBNAIL' => append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $highestrow[$j]['pic_id'], TRUE)), ! 'PIC_PREVIEW' => $pic_preview, ! 'DESC' => $highestrow[$j]['pic_desc'] ! ) ! ); if( ($highestrow[$j]['user_id'] == ALBUM_GUEST) or ($highestrow[$j]['username'] == '') ) *************** *** 500,506 **** --- 531,547 ---- } + if ($album_config['lb_preview'] == 0) + { + $pic_preview = ''; + } + 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_fap_toplisturl("smartor_mode=album_pic&pic_id=". $randrow[$j]['pic_id'], TRUE)) : append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'], TRUE)), 'THUMBNAIL' => append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $randrow[$j]['pic_id'], TRUE)), + 'PIC_PREVIEW' => $pic_preview, 'DESC' => $randrow[$j]['pic_desc'] ) |