Menu
▾
▴
[mxbb-commits] mx_smartor album_lists.php, 1.27, 1.28 db_install.php, 1.24, 1.25 welcome.php, 1.14, 1.15
|
From: FlorinCB <ory...@us...> - 2008-09-01 01:12:26
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7189 Modified Files: album_lists.php db_install.php welcome.php Log Message: some solved issues Index: album_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_lists.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** album_lists.php 31 Aug 2008 13:40:28 -0000 1.27 --- album_lists.php 1 Sep 2008 01:11:47 -0000 1.28 *************** *** 15,20 **** ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); // --- 15,20 ---- ! //$phpEx = substr(strrchr(__FILE__, '.'), 1); ! //include_once($mx_root_path . 'common.'.$phpEx); // *************** *** 32,35 **** --- 32,39 ---- $title = $mx_block->block_info['block_title']; $block_size = ( !empty($block_size) ? $block_size : '100%' ); + $description = $mx_block->block_info['block_desc']; + $show_block = $mx_block->block_info['show_block']; + $show_title = ($userdata['user_level'] == ADMIN) ? true : $mx_block->block_info['show_title']; + $show_stats = $mx_block->block_info['show_stats']; *************** *** 79,114 **** if (($mx_cache->get('album_cat_list')) && ($use_cache)) { ! $catrows = $mx_cache->get('album_cat_list'); } - else - { - $sql = "SELECT c.*, COUNT(p.pic_id) AS count - FROM ". ALBUM_CAT_TABLE ." AS c - LEFT JOIN ". ALBUM_TABLE ." AS p ON c.cat_id = p.pic_cat_id - WHERE cat_id <> 0 - GROUP BY cat_id - ORDER BY cat_order ASC"; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql); - } - - $catrows = array(); ! while( $row = $db->sql_fetchrow($result) ) ! { ! $album_user_access = album_user_access($row['cat_id'], $row, 1, 0, 0, 0, 0, 0); // VIEW ! if ($album_user_access['view'] == 1) ! { ! $catrows[] = $row; ! } ! } ! if ($use_cache) ! { ! $mx_cache->put('album_cat_list', $catrows); ! } } $allowed_cat = ''; // For Recent Public Pics below // $catrows now stores all categories which this user can view. Dump them out! --- 83,118 ---- if (($mx_cache->get('album_cat_list')) && ($use_cache)) { ! $catrows_cache = $mx_cache->get('album_cat_list'); } ! $sql = "SELECT c.*, COUNT(p.pic_id) AS count ! FROM ". ALBUM_CAT_TABLE ." AS c ! LEFT JOIN ". ALBUM_TABLE ." AS p ON c.cat_id = p.pic_cat_id ! WHERE cat_id <> 0 ! GROUP BY cat_id ! ORDER BY cat_order ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql); ! } ! ! $catrows = array(); ! while( $row = $db->sql_fetchrow($result) ) ! { ! $album_user_access = album_user_access($row['cat_id'], $row, 1, 0, 0, 0, 0, 0); // VIEW ! if ($album_user_access['view'] == 1) ! { ! $catrows[] = $row; ! } ! } ! ! if (intval($catrows['count']) <> count($catrows_cache)) ! { ! $use_cache = false; ! $mx_cache->put('album_cat_list', $catrows); } + $allowed_cat = ''; // For Recent Public Pics below // $catrows now stores all categories which this user can view. Dump them out! *************** *** 197,208 **** ); ! if( ($recentrow[$j]['user_id'] == ALBUM_GUEST) or ($recentrow[$j]['username'] == '') ) ! { ! $recent_poster = ($recentrow[$j]['pic_username'] == '') ? $lang['Guest'] : $recentrow[$j]['pic_username']; ! } ! 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>'; ! } $rating_image = ImageRating($recentrow[$j]['rating']); --- 201,205 ---- ); ! $recent_poster = album_get_profile_url('full', $recentrow[$j]['user_id'], $recentrow[$j]['username'], false); $rating_image = ImageRating($recentrow[$j]['rating']); *************** *** 318,329 **** ); ! if( ($mostrow[$j]['user_id'] == ALBUM_GUEST) or ($mostrow[$j]['username'] == '') ) ! { ! $most_poster = ($mostrow[$j]['pic_username'] == '') ? $lang['Guest'] : $mostrow[$j]['pic_username']; ! } ! 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>'; ! } $rating_image = ImageRating($mostrow[$j]['rating']); --- 315,319 ---- ); ! $most_poster = album_get_profile_url('full', $mostrow[$j]['user_id'], $mostrow[$j]['username'], false); $rating_image = ImageRating($mostrow[$j]['rating']); *************** *** 438,449 **** ); ! if( ($highestrow[$j]['user_id'] == ALBUM_GUEST) or ($highestrow[$j]['username'] == '') ) ! { ! $highest_poster = ($highestrow[$j]['pic_username'] == '') ? $lang['Guest'] : $highestrow[$j]['pic_username']; ! } ! 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>'; ! } $rating_image = ImageRating($highestrow[$j]['rating']); --- 428,432 ---- ); ! $highest_poster = album_get_profile_url('full', $highestrow[$j]['user_id'], $highestrow[$j]['username'], false); $rating_image = ImageRating($highestrow[$j]['rating']); *************** *** 556,568 **** ) ); ! ! if( ($randrow[$j]['user_id'] == ALBUM_GUEST) or ($randrow[$j]['username'] == '') ) ! { ! $rand_poster = ($randrow[$j]['pic_username'] == '') ? $lang['Guest'] : $randrow[$j]['pic_username']; ! } ! 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>'; ! } --- 539,544 ---- ) ); ! ! $rand_poster = album_get_profile_url('full', $randrow[$j]['user_id'], $randrow[$j]['username'], false); *************** *** 632,635 **** --- 608,614 ---- 'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'], + 'L_DESCRIPTION' => $description, + 'S_SHOW_TITLE' => $show_title, + 'BLOCK_SIZE' => $block_size, 'S_COLS' => $album_sp_config['img_cols'], 'S_COL_WIDTH' => (100/$album_sp_config['img_cols']) . '%', Index: welcome.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/welcome.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** welcome.php 31 Aug 2008 13:40:29 -0000 1.14 --- welcome.php 1 Sep 2008 01:11:48 -0000 1.15 *************** *** 18,23 **** } ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); // --- 18,23 ---- } ! //$phpEx = substr(strrchr(__FILE__, '.'), 1); ! //include_once($mx_root_path . 'common.'.$phpEx); // *************** *** 79,83 **** // ------------------------------------ ! if( ($user_id < 1) and (!$userdata['session_logged_in']) ) { $user_id = ANONYMOUS; --- 79,83 ---- // ------------------------------------ ! if( ($user_id < 2) || ($mx_user->data['user_id'] == ANONYMOUS) ) { $user_id = ANONYMOUS; *************** *** 88,91 **** --- 88,93 ---- // ------------------------------------ + $row = album_get_userdata($user_id, false); + $sql = "SELECT * FROM ". USERS_TABLE ." *************** *** 105,117 **** $user_lastvisit = $row['user_lastvisit']; ! if( empty($username) ) { ! $username = ( !empty($userdata['username']) ? $userdata['username'] : $lang['Guest'] ); ! $user_avatar_type = ( !empty($userdata['user_avatar_type']) ? $userdata['user_avatar_type'] : '' ); ! $user_allowavatar = ( !empty($userdata['user_allowavatar']) ? $userdata['user_allowavatar'] : '' ); ! $user_avatar = ( !empty($userdata['user_avatar']) ? $userdata['user_avatar'] : '' ); ! $user_lastvisit = ( !empty($userdata['user_lastvisit']) ? $userdata['user_lastvisit'] : '' ); } // ------------------------------------ // Check Permissions --- 107,120 ---- $user_lastvisit = $row['user_lastvisit']; ! if(empty($username) || ($lang['Guest'])) { ! $username = ( !empty($mx_user->data['username']) ? $mx_user->data['username'] : $lang['Guest'] ); ! $user_avatar_type = ( !empty($mx_user->data['user_avatar_type']) ? $mx_user->data['user_avatar_type'] : '' ); ! $user_allowavatar = ( !empty($mx_user->data['user_allowavatar']) ? $mx_user->data['user_allowavatar'] : '' ); ! $user_avatar = ( !empty($mx_user->data['user_avatar']) ? $mx_user->data['user_avatar'] : '' ); ! $user_lastvisit = ($mx_user->data['user_id'] != ANONYMOUS) ? album_create_date($board_config['default_dateformat'], $mx_user->data['user_lastvisit'], $board_config['board_timezone']) : ''; } + // ------------------------------------ // Check Permissions *************** *** 173,199 **** switch( $user_avatar_type ) { ! case USER_AVATAR_UPLOAD: ! $avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_path'].'/'.$user_avatar.'" alt="" border="0" />' : ''; ! break; ! case USER_AVATAR_REMOTE: ! $img_width = ''; ! if( ($img_info = @getimagesize($userdata['user_avatar'])) !== FALSE ) ! { ! if( $img_info[0] > $board_config['avatar_max_width'] ) { ! $img_width = ' width="'.$board_config['avatar_max_width'].'"'; } ! } ! $avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="'.$user_avatar.'"'.$img_width.' alt="" border="0" />' : ''; ! break; ! case USER_AVATAR_GALLERY: ! $avatar_img = ( $board_config['allow_avatar_local'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_gallery_path'].'/'.$user_avatar.'" alt="" border="0" />' : ''; ! break; } } ! if( empty($avatar_img) && !empty($default_avatar) ) { ! if( $user_id == ANONYMOUS ) { $avatar_img = '<img src="' . $guest_avatar . '" alt="" border="0" />'; --- 176,202 ---- switch( $user_avatar_type ) { ! case USER_AVATAR_UPLOAD: ! $avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_path'].'/'.$user_avatar.'" alt="" border="0" />' : ''; ! break; ! case USER_AVATAR_REMOTE: ! $img_width = ''; ! if( ($img_info = @getimagesize($userdata['user_avatar'])) !== FALSE ) { ! if( $img_info[0] > $board_config['avatar_max_width'] ) ! { ! $img_width = ' width="'.$board_config['avatar_max_width'].'"'; ! } } ! $avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="'.$user_avatar.'"'.$img_width.' alt="" border="0" />' : ''; ! break; ! case USER_AVATAR_GALLERY: ! $avatar_img = ( $board_config['allow_avatar_local'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_gallery_path'].'/'.$user_avatar.'" alt="" border="0" />' : ''; ! break; } } ! if(!($avatar_img)) { ! if ($mx_user->data['user_id'] == ANONYMOUS) { $avatar_img = '<img src="' . $guest_avatar . '" alt="" border="0" />'; *************** *** 212,215 **** --- 215,244 ---- ); + switch (PORTAL_BACKEND) + { + case 'internal': + + $u_phpbb_sendpass = ''; + $u_phpbb_register = ''; + $u_privatemsgs = ''; + break; + case 'phpbb2': + + $u_phpbb_sendpass = mx_append_sid(PHPBB_URL . 'profile.'.$phpEx.'?mode=sendpassword'); + $u_phpbb_register = mx_append_sid(PHPBB_URL . 'profile.'.$phpEx.'?mode=register'); + $u_privatemsgs = mx_append_sid(PHPBB_URL . 'profile.'.$phpEx.'?i=pm&folder=inbox'); + break; + + case 'phpbb3': + + $u_phpbb_sendpass = ($board_config['email_enable']) ? mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : ''; + $u_phpbb_register = mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'); + $u_privatemsgs = mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", '?i=pm&folder=inbox'); + break; + } + + $l_timezone = explode( '.', $portal_config['board_timezone'] ); + $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $portal_config['board_timezone'] )] : $lang[number_format( $portal_config['board_timezone'] )]; + // // Activate template switches for Vertical/Horizontal Layout... *************** *** 227,234 **** // Get User Dependent Information... // ! if( $userdata['session_logged_in'] ) { - $s_last_visit = album_create_date($board_config['default_dateformat'], $user_lastvisit, $board_config['board_timezone']); - if( $view_postcount ) { --- 256,261 ---- // Get User Dependent Information... // ! if($mx_user->data['user_id'] != ANONYMOUS) { if( $view_postcount ) { *************** *** 237,242 **** ' WHERE p.post_id = t.topic_first_post_id' . ' AND p2.post_id = t.topic_last_post_id' . ! ' AND p2.post_time > ' . $userdata['user_lastvisit'] . ! ' AND t.forum_id IN (' . get_auth_forum() . ')'; if( ($result = $db->sql_query($sql)) == TRUE ) { --- 264,269 ---- ' WHERE p.post_id = t.topic_first_post_id' . ' AND p2.post_id = t.topic_last_post_id' . ! ' AND p2.post_time > ' . $mx_user->data['user_lastvisit'] . ! ' AND t.forum_id IN (' . $phpbb_auth->get_auth_forum() . ')'; if( ($result = $db->sql_query($sql)) == TRUE ) { *************** *** 244,249 **** $rowset = $db->sql_fetchrowset($result); ! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); ! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array(); for( $i = 0; $i < count($rowset); $i++ ) --- 271,276 ---- $rowset = $db->sql_fetchrowset($result); ! $tracking_topics = ( isset($_COOKIE[$board_config['cookie_name'] . '_t']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_t']) : array(); ! $tracking_forums = ( isset($_COOKIE[$board_config['cookie_name'] . '_f']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . '_f']) : array(); for( $i = 0; $i < count($rowset); $i++ ) *************** *** 253,257 **** continue; } ! if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { $topic_id = $rowset[$i]['topic_id']; --- 280,284 ---- continue; } ! if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { $topic_id = $rowset[$i]['topic_id']; *************** *** 271,277 **** } } ! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { ! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $rowset[$i]['post_time'] ) { continue; --- 298,304 ---- } } ! if( isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { ! if( $_COOKIE[$board_config['cookie_name'] . '_f_all'] > $rowset[$i]['post_time'] ) { continue; *************** *** 291,295 **** { $s_last_visit = ''; ! $register_msg = sprintf($register_msg, '<a href="'.append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=register').'">', '</a>'); $template->assign_block_vars('welcome_user_logged_out', array()); --- 318,322 ---- { $s_last_visit = ''; ! $register_msg = sprintf($register_msg, '<a href="'.$u_phpbb_register.'">', '</a>'); $template->assign_block_vars('welcome_user_logged_out', array()); *************** *** 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 ) --- 329,333 ---- } } ! $user_link = album_get_profile_url('full', $user_id, $username, false); if( $report_page == 0 ) *************** *** 315,318 **** --- 342,347 ---- $u_egostarted = mx_append_sid($u_view_topics.'egostarted'); + + // // Setup common template vars and display the block. *************** *** 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, --- 359,365 ---- 'L_LOG_ME_IN' => $lang['Log_me_in'], 'L_FORGOTTEN_PSW' => $lang['Forgotten_password'], ! 'U_FORGOTTEN_PSW' => $u_phpbb_sendpass, 'L_REGISTER' => $lang['Register'], ! 'U_REGISTER' => $u_phpbb_register, 'L_REGISTER_MSG' => $register_msg, *************** *** 360,370 **** 'U_PRIVATE_MSGS' => mx_append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'), ! 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit), ! 'CURRENT_TIME' => sprintf($lang['Current_time'], album_create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), ! 'S_TIMEZONE' => sprintf($lang['All_times'], $lang[number_format($board_config['board_timezone'])])) ); if( $view_jump_to ) { ! make_jumpbox(PHPBB_URL.'viewforum.'.$phpEx); } $template->pparse('welcome_body'); --- 389,399 ---- 'U_PRIVATE_MSGS' => mx_append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'), ! 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $user_lastvisit), ! 'CURRENT_TIME' => sprintf($lang['Current_time'], album_create_date($portal_config['default_dateformat'], time(), $portal_config['board_timezone'])), ! 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone )) ); if( $view_jump_to ) { ! phpBB2::make_jumpbox(PHPBB_URL.'viewforum.'.$phpEx); } $template->pparse('welcome_body'); Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/db_install.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** db_install.php 31 Aug 2008 13:30:06 -0000 1.24 --- db_install.php 1 Sep 2008 01:11:47 -0000 1.25 *************** *** 32,36 **** } ! global $mx_user, $client_ip; $mx_module_version = '2.9.3'; --- 32,54 ---- } ! global $mx_user; ! ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! ! case 'phpbb2': ! ! $pic_user_id = $userdata['user_id']; ! $pic_user_ip = $userdata['session_ip']; ! break; ! ! case 'phpbb3': ! ! $pic_user_id = $mx_user->data['user_id']; ! $pic_user_ip = album_encode_ip($mx_user->data['session_ip']); ! break; ! } $mx_module_version = '2.9.3'; *************** *** 403,407 **** $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_cat VALUES ('1', 'Test Category', 'Just a test category.', '', '10', '-1', '2', '0', '0', '3', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2', '0', '0')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album VALUES ('1', 'mx_publisher_cms_testimage.png', 'mx_publisher_cms_testimage.png', 'Mxp Pic', 'Mx-Publisher Image', '" . $mx_user->data['user_id'] . "', '" . $mx_user->data['username'] . "', '" . $client_ip . "', '" . time() . "', '1', '1', '0', '1')"; --- 421,425 ---- $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_cat VALUES ('1', 'Test Category', 'Just a test category.', '', '10', '-1', '2', '0', '0', '3', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2', '0', '0')"; ! $sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album VALUES ('1', 'mx_publisher_cms_testimage.png', 'mx_publisher_cms_testimage.png', 'Mxp Pic', 'Mx-Publisher Image', '" . $pic_user_id . "', '" . $mx_user->data['username'] . "', '" . $pic_user_ip. "', '" . time() . "', '1', '1', '0', '1')"; |
