[mxbb-commits] mx_linkdb/linkdb/modules link_rate.php,1.10,1.11

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_linkdb/linkdb/modules
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13289/modules/mx_linkdb/linkdb/modules

Modified Files:
	link_rate.php 
Log Message:
working...

Index: link_rate.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_rate.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** link_rate.php	4 Jul 2006 18:09:40 -0000	1.10
--- link_rate.php	4 Jul 2006 22:34:37 -0000	1.11
***************
*** 28,38 ****
  	{
  		global $template, $lang, $board_config, $phpEx, $linkdb_config, $db, $userdata;
! 		global $_REQUEST, $_POST, $phpbb_root_path, $linkdb_functions;
  
! 		if ( isset( $_REQUEST['link_id'] ) )
! 		{
! 			$link_id = intval( $_REQUEST['link_id'] );
! 		}
! 		else
  		{
  			mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] );
--- 28,40 ----
  	{
  		global $template, $lang, $board_config, $phpEx, $linkdb_config, $db, $userdata;
! 		global $phpbb_root_path, $linkdb_user, $linkdb_functions;
! 		global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars;
  
! 		// =======================================================
! 		// Request vars
! 		// =======================================================
! 		$link_id = $mx_request_vars->request('link_id', MX_TYPE_INT, '');
! 
! 		if ( empty( $link_id ) )
  		{
  			mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] );
***************
*** 61,75 ****
  		if ( !$this->auth_user[$link_data['link_catid']]['auth_rate'] )
  		{
  			mx_message_die( GENERAL_MESSAGE, $lang['Not_allow_vote'] );
  		}
  
- 		if ( !$userdata['session_logged_in'] )
- 		{
- 			// $redirect = linkdb_this_mxurl("action=rate&link_id=$link_id");
- 			// redirect(append_sid("login.$phpEx?redirect=" . $redirect, true));
- 			mx_message_die( GENERAL_MESSAGE, 'not logged in' );
- 		}
- 
- 		$this->generate_navigation( $link_data['link_catid'] );
  		$template->assign_vars( array(
  			'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ),
--- 63,75 ----
  		if ( !$this->auth_user[$link_data['link_catid']]['auth_rate'] )
  		{
+ 			if ( !$userdata['session_logged_in'] )
+ 			{
+ 				// $redirect = linkdb_this_mxurl("action=rate&link_id=$link_id");
+ 				// redirect(append_sid("login.$phpEx?redirect=" . $redirect, true));
+ 				mx_message_die( GENERAL_MESSAGE, 'not logged in' );
+ 			}
  			mx_message_die( GENERAL_MESSAGE, $lang['Not_allow_vote'] );
  		}
  
  		$template->assign_vars( array(
  			'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ),
***************
*** 100,104 ****
  			}
  
! 			$linkdb_functions->update_voter_info( $link_id, $rating );
  
  			$rate_info = $linkdb_functions->get_rating( $link_id );
--- 100,104 ----
  			}
  
! 			$linkdb_user->update_voter_info( $link_id, $rating, $link_data['link_catid'] );
  
  			$rate_info = $linkdb_functions->get_rating( $link_id );
***************
*** 106,110 ****
  			$result_msg = str_replace( "{newrating}", $rate_info, $result_msg );
  
! 			$message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( linkdb_this_mxurl( 'action=rate&link_id=' . $link_id ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_forum'], '<a href="' . append_sid( 'index.' . $phpEx ) . '">', '</a>' );
  			mx_message_die( GENERAL_MESSAGE, $message );
  		}
--- 106,111 ----
  			$result_msg = str_replace( "{newrating}", $rate_info, $result_msg );
  
! 			$cat_id = $link_data['link_catid'];
! 			$message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . ( !empty($cat_id) ? append_sid( linkdb_this_mxurl( "action=category&amp;cat_id=$cat_id" ) ) : append_sid( linkdb_this_mxurl( "action=link&amp;link_id=$link_id" ) ) ) . "\">", "</a>" );
  			mx_message_die( GENERAL_MESSAGE, $message );
  		}
***************
*** 131,134 ****
--- 132,140 ----
  			);
  		}
+ 
+ 		// ===================================================
+ 		// assign var for navigation
+ 		// ===================================================
+ 		$this->generate_navigation( $link_data['link_catid'] );
  		$this->display( $lang['Links_Title'], 'link_rate_body.tpl' );
  	}