|
From: FlorinCB <ory...@us...> - 2008-08-29 05:58:58
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10881 Modified Files: album.php album_lists.php db_install.php db_upgrade.php welcome.php Log Message: Upgrade Index: album.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** album.php 13 Mar 2008 08:35:53 -0000 1.24 --- album.php 29 Aug 2008 05:58:22 -0000 1.25 *************** *** 166,171 **** { define('IN_PORTAL', true); $mx_root_path = '../../'; ! $module_root_path = './'; // --- 166,173 ---- { define('IN_PORTAL', true); + define('MXBB_MODULE', true); + $mx_root_path = '../../'; ! $module_root_path = $mx_root_path . 'modules/mx_smartor/'; // *************** *** 173,184 **** // $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.' . $phpEx); // ! // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // ! // End session management // $block_id = ( !empty($HTTP_GET_VARS['block_id']) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id']; if( empty($block_id) ) --- 175,205 ---- // $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.' . $phpEx); ! // ! // Page selector // ! $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); ! // ! // Start user session ! // - populate $userdata and $lang ! // ! $mx_user->init($user_ip, $page_id, false); ! ! // ! // Load and instatiate CORE (page) and block classes ! // ! $mx_page->init($page_id); ! ! // ! // Initiate user style (template + theme) management ! // - populate $theme, $images and initiate $template. // + $mx_user->page_id = $page_id; + $mx_user->user_ip = $user_ip; + $mx_user->_init_userprefs(); + $mx_user->init_style(); + $block_id = ( !empty($HTTP_GET_VARS['block_id']) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id']; if( empty($block_id) ) *************** *** 195,199 **** } else ! { // // Read block Configuration --- 216,221 ---- } else ! { ! define('MXBB_MODULE', true); // // Read block Configuration *************** *** 608,615 **** $page_title = $lang['Album']; ! if ( !is_object($mx_block)) ! { ! include($mx_root_path . 'includes/page_header.'.$phpEx); ! } $template->set_filenames(array( --- 630,634 ---- $page_title = $lang['Album']; ! album_page_header(); $template->set_filenames(array( *************** *** 651,655 **** } ! $otf_link = ( $userdata['user_level'] == ADMIN ) ? append_sid(this_smartor_mxurl("smartor_mode=album_otf" . '&sid=' . $userdata['session_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_otf")); $template->assign_vars(array( --- 670,674 ---- } ! $otf_link = ( $userdata['user_level'] == ADMIN ) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf" . '&sid=' . $userdata['session_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf")); $template->assign_vars(array( *************** *** 673,677 **** 'L_ALBUM_ALLPICS' => $lang['All_Picture_List_Of_User'], 'L_ALBUM_OTF' => $lang['Pic_Gallery'], ! 'U_ALBUM_ALLPICS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics")), 'OTF_LINK' => $otf_link, 'U_ALBUM_OTF' => $otf_link, --- 692,696 ---- 'L_ALBUM_ALLPICS' => $lang['All_Picture_List_Of_User'], 'L_ALBUM_OTF' => $lang['Pic_Gallery'], ! 'U_ALBUM_ALLPICS' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_allpics")), 'OTF_LINK' => $otf_link, 'U_ALBUM_OTF' => $otf_link, *************** *** 702,709 **** $template->pparse('body'); ! if ( !is_object($mx_block)) ! { ! include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } } ?> \ No newline at end of file --- 721,725 ---- $template->pparse('body'); ! album_page_footer(); } ?> \ No newline at end of file Index: album_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_lists.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** album_lists.php 27 Mar 2008 14:30:59 -0000 1.25 --- album_lists.php 29 Aug 2008 05:58:23 -0000 1.26 *************** *** 186,195 **** 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'], false)), ! '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'] --- 186,195 ---- else { ! $pic_preview = 'onmouseover="showtrail(\''. mx_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']) ? mx_append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $recentrow[$j]['pic_id'], true)) : mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'], false)), ! 'THUMBNAIL' => mx_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'] *************** *** 203,207 **** else { ! $recent_poster = '<a href="'. append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $recentrow[$j]['user_id']) .'">'. $recentrow[$j]['username'] .'</a>'; } --- 203,207 ---- 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>'; } *************** *** 216,220 **** 'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ', ') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $recentrow[$j]['comments'] . '<br />') : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' --- 216,220 ---- 'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ', ') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $recentrow[$j]['comments'] . '<br />') : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' *************** *** 307,316 **** 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'], false)), ! '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'] --- 307,316 ---- else { ! $pic_preview = 'onmouseover="showtrail(\''. mx_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']) ? mx_append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $mostrow[$j]['pic_id'], true)) : mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $mostrow[$j]['pic_id'], false)), ! 'THUMBNAIL' => mx_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'] *************** *** 324,328 **** else { ! $most_poster = '<a href="'. append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $mostrow[$j]['user_id']) .'">'. $mostrow[$j]['username'] .'</a>'; } --- 324,328 ---- else { ! $most_poster = '<a href="'. mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $mostrow[$j]['user_id']) .'">'. $mostrow[$j]['username'] .'</a>'; } *************** *** 337,341 **** 'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ', ') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $mostrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $mostrow[$j]['comments'] . '<br />') : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' --- 337,341 ---- 'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ', ') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $mostrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $mostrow[$j]['comments'] . '<br />') : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' *************** *** 427,436 **** 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'], false)), ! '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'] --- 427,436 ---- 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()"'; } $template->assign_block_vars('highest_pics_block.highest_pics.highest_col', array( ! 'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $highestrow[$j]['pic_id'], true)) : mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'], false)), ! 'THUMBNAIL' => mx_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'] *************** *** 444,448 **** else { ! $highest_poster = '<a href="'. append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $highestrow[$j]['user_id']) .'">'. $highestrow[$j]['username'] .'</a>'; } --- 444,448 ---- 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>'; } *************** *** 456,460 **** 'H_VIEW' => $highestrow[$j]['pic_view_count'], 'H_RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ', ') : '', ! 'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $highestrow[$j]['comments'] . '<br />') : '' // 'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($highestrow[$j]['pic_user_ip']) .'</a><br />' : '' --- 456,460 ---- 'H_VIEW' => $highestrow[$j]['pic_view_count'], 'H_RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ', ') : '', ! 'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $highestrow[$j]['comments'] . '<br />') : '' // 'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($highestrow[$j]['pic_user_ip']) .'</a><br />' : '' *************** *** 546,555 **** 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'], false)), ! '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'] --- 546,555 ---- 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_fap_toplisturl("smartor_mode=album_pic&pic_id=". $randrow[$j]['pic_id'], true)) : mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'], false)), ! 'THUMBNAIL' => mx_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'] *************** *** 563,567 **** else { ! $rand_poster = '<a href="'. append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $randrow[$j]['user_id']) .'">'. $randrow[$j]['username'] .'</a>'; } --- 563,567 ---- 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>'; } *************** *** 579,583 **** 'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ', ') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $randrow[$j]['comments'] . '<br />') : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($randrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($randrow[$j]['pic_user_ip']) .'</a><br />' : '' --- 579,583 ---- 'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ', ') : '', ! 'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $randrow[$j]['comments'] . '<br />') : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($randrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($randrow[$j]['pic_user_ip']) .'</a><br />' : '' *************** *** 626,633 **** 'L_LAST_PIC' => $lang['Last_Pic'], ! 'U_YOUR_PERSONAL_GALLERY' => append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=". $userdata['user_id'])), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], ! 'U_USERS_PERSONAL_GALLERIES' => append_sid(this_fap_toplisturl("smartor_mode=album_personal_index")), 'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'], --- 626,633 ---- 'L_LAST_PIC' => $lang['Last_Pic'], ! 'U_YOUR_PERSONAL_GALLERY' => mx_append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=". $userdata['user_id'])), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], ! 'U_USERS_PERSONAL_GALLERIES' => mx_append_sid(this_fap_toplisturl("smartor_mode=album_personal_index")), 'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'], Index: welcome.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/welcome.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** welcome.php 8 Feb 2008 10:47:59 -0000 1.12 --- welcome.php 29 Aug 2008 05:58:23 -0000 1.13 *************** *** 302,306 **** } } ! $user_link = ( $user_id != ANONYMOUS ) ? '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=editprofile&".$user_id).'">'.$username.'</a>' : $lang['Guest']; if( $report_page == 0 ) --- 302,306 ---- } } ! $user_link = ( $user_id != ANONYMOUS ) ? '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=editprofile&".$user_id).'">'.$username.'</a>' : $lang['Guest']; if( $report_page == 0 ) *************** *** 312,317 **** $u_view_topics = PORTAL_URL.'index.'.$phpEx.'?page='.$report_page.'&report_id='; } ! $u_unread = append_sid($u_view_topics.'unread'); ! $u_egostarted = append_sid($u_view_topics.'egostarted'); // --- 312,317 ---- $u_view_topics = PORTAL_URL.'index.'.$phpEx.'?page='.$report_page.'&report_id='; } ! $u_unread = mx_append_sid($u_view_topics.'unread'); ! $u_egostarted = mx_append_sid($u_view_topics.'egostarted'); // *************** *** 324,328 **** 'AVATAR_IMG' => $avatar_img, ! 'S_LOGIN_ACTION' => append_sid(PORTAL_URL.'login.'.$phpEx), 'L_USERNAME' => $lang['Username'], 'L_PASSWORD' => $lang['Password'], --- 324,328 ---- 'AVATAR_IMG' => $avatar_img, ! 'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL.'login.'.$phpEx), 'L_USERNAME' => $lang['Username'], 'L_PASSWORD' => $lang['Password'], *************** *** 330,336 **** 'L_LOG_ME_IN' => $lang['Log_me_in'], 'L_FORGOTTEN_PSW' => $lang['Forgotten_password'], ! 'U_FORGOTTEN_PSW' => append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=sendpassword'), 'L_REGISTER' => $lang['Register'], ! 'U_REGISTER' => append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=register'), 'L_REGISTER_MSG' => $register_msg, --- 330,336 ---- 'L_LOG_ME_IN' => $lang['Log_me_in'], 'L_FORGOTTEN_PSW' => $lang['Forgotten_password'], ! 'U_FORGOTTEN_PSW' => mx_append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=sendpassword'), 'L_REGISTER' => $lang['Register'], ! 'U_REGISTER' => mx_append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=register'), 'L_REGISTER_MSG' => $register_msg, *************** *** 338,362 **** 'L_SEARCH_NEW' => ( isset($s_search_new) ) ? $s_search_new : $lang['Posts_since_last_visit'], ! 'U_SEARCH_NEW' => append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=newposts'), 'L_SEARCH_UNREAD' => ( isset($s_search_unread) ) ? $s_search_unread : $lang['Search_unread'], 'U_SEARCH_UNREAD' => $u_unread, 'L_SEARCH_LATEST' => $lang['View_latest'], ! 'U_SEARCH_LATEST_24' => append_sid($u_view_topics.'24h'), ! 'U_SEARCH_LATEST_48' => append_sid($u_view_topics.'48h'), ! 'U_SEARCH_LATEST_72' => append_sid($u_view_topics.'72h'), 'L_SEARCH_SELF_TOPICS' => $lang['Search_self_topics'], 'U_SEARCH_SELF_TOPICS' => $u_egostarted, 'L_SEARCH_SELF_POSTS' => $lang['Search_self_posts'], ! 'U_SEARCH_SELF_POSTS' => append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=egosearch'), 'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'], ! 'U_SEARCH_UNANSWERED' => append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=unanswered'), 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], ! 'U_MARK_READ' => append_sid(PHPBB_URL.'index.'.$phpEx . "?mark=forums"), 'L_TOTAL_PICS' => sprintf($lang['Total_Personal_Pics'], $total_pics), ! 'U_YOUR_PERSONAL_GALLERY' => append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=" . $user_id)), 'L_PRIVATE_MSGS' => $lang['Private_Messages'].' ('.$userdata['user_new_privmsg'].')', ! 'U_PRIVATE_MSGS' => append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'), 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit), --- 338,362 ---- 'L_SEARCH_NEW' => ( isset($s_search_new) ) ? $s_search_new : $lang['Posts_since_last_visit'], ! 'U_SEARCH_NEW' => mx_append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=newposts'), 'L_SEARCH_UNREAD' => ( isset($s_search_unread) ) ? $s_search_unread : $lang['Search_unread'], 'U_SEARCH_UNREAD' => $u_unread, 'L_SEARCH_LATEST' => $lang['View_latest'], ! 'U_SEARCH_LATEST_24' => mx_append_sid($u_view_topics.'24h'), ! 'U_SEARCH_LATEST_48' => mx_append_sid($u_view_topics.'48h'), ! 'U_SEARCH_LATEST_72' => mx_append_sid($u_view_topics.'72h'), 'L_SEARCH_SELF_TOPICS' => $lang['Search_self_topics'], 'U_SEARCH_SELF_TOPICS' => $u_egostarted, 'L_SEARCH_SELF_POSTS' => $lang['Search_self_posts'], ! 'U_SEARCH_SELF_POSTS' => mx_append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=egosearch'), 'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'], ! 'U_SEARCH_UNANSWERED' => mx_append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=unanswered'), 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], ! 'U_MARK_READ' => mx_append_sid(PHPBB_URL.'index.'.$phpEx . "?mark=forums"), 'L_TOTAL_PICS' => sprintf($lang['Total_Personal_Pics'], $total_pics), ! 'U_YOUR_PERSONAL_GALLERY' => mx_append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=" . $user_id)), 'L_PRIVATE_MSGS' => $lang['Private_Messages'].' ('.$userdata['user_new_privmsg'].')', ! 'U_PRIVATE_MSGS' => mx_append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'), 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit), Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/db_install.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** db_install.php 13 Mar 2008 08:35:53 -0000 1.22 --- db_install.php 29 Aug 2008 05:58:23 -0000 1.23 *************** *** 32,36 **** } ! $mx_module_version = '2.0.2'; $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>'; --- 32,36 ---- } ! $mx_module_version = '2.9.3'; $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>'; *************** *** 112,116 **** $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_img_no_gd', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('dynamic_pic_resampling', '1')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size_resampling', '1024000')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('switch_nuffload', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('path_to_bin', './modules/mx_smartor/cgi-bin/')"; --- 112,116 ---- $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_img_no_gd', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('dynamic_pic_resampling', '1')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size_resampling', '5280000')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('switch_nuffload', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('path_to_bin', './modules/mx_smartor/cgi-bin/')"; *************** *** 190,194 **** pic_user_id mediumint(8) NOT NULL, pic_username varchar(32), ! pic_user_ip char(8) NOT NULL DEFAULT '0', pic_time int(11) UNSIGNED NOT NULL, pic_cat_id mediumint(8) UNSIGNED NOT NULL DEFAULT '1', --- 190,194 ---- pic_user_id mediumint(8) NOT NULL, pic_username varchar(32), ! pic_user_ip varchar(40) DEFAULT '' NOT NULL, pic_time int(11) UNSIGNED NOT NULL, pic_cat_id mediumint(8) UNSIGNED NOT NULL DEFAULT '1', *************** *** 205,209 **** rate_pic_id int(11) UNSIGNED NOT NULL, rate_user_id mediumint(8) NOT NULL, ! rate_user_ip char(8) NOT NULL, rate_point tinyint(3) UNSIGNED NOT NULL, KEY rate_pic_id (rate_pic_id), --- 205,209 ---- rate_pic_id int(11) UNSIGNED NOT NULL, rate_user_id mediumint(8) NOT NULL, ! rate_user_ip varchar(40) DEFAULT '' NOT NULL, rate_point tinyint(3) UNSIGNED NOT NULL, KEY rate_pic_id (rate_pic_id), *************** *** 219,223 **** comment_user_id mediumint(8) NOT NULL, comment_username varchar(32), ! comment_user_ip char(8) NOT NULL, comment_time int(11) UNSIGNED NOT NULL, comment_text TEXT, --- 219,223 ---- comment_user_id mediumint(8) NOT NULL, comment_username varchar(32), ! comment_user_ip varchar(40) DEFAULT '' NOT NULL, comment_time int(11) UNSIGNED NOT NULL, comment_text TEXT, *************** *** 268,272 **** $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('user_pics_limit', '50')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('mod_pics_limit', '250')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size', '128000')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_width', '1024')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_height', '768')"; --- 268,272 ---- $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('user_pics_limit', '50')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('mod_pics_limit', '250')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size', '5280000')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_width', '1024')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_height', '768')"; *************** *** 332,336 **** $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_img_no_gd', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('dynamic_pic_resampling', '1')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size_resampling', '1024000')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('switch_nuffload', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('path_to_bin', './modules/mx_smartor/cgi-bin/')"; --- 332,336 ---- $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_img_no_gd', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('dynamic_pic_resampling', '1')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size_resampling', '5280000')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('switch_nuffload', '0')"; $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('path_to_bin', './modules/mx_smartor/cgi-bin/')"; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/db_upgrade.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** db_upgrade.php 13 Mar 2008 08:35:53 -0000 1.22 --- db_upgrade.php 29 Aug 2008 05:58:23 -0000 1.23 *************** *** 30,34 **** } ! $mx_module_version = '2.0.2'; $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>'; --- 30,34 ---- } ! $mx_module_version = '2.9.3'; $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>'; |