[Customisation Database Commits] r876 - in /trunk/titania/contributions: index.php support.php

[Mickael SALFATI]

Author: Elglobo
Date: Thu Mar 25 07:18:28 2010
New Revision: 876

Log:
use $auth option in nav_ary instead and fix issue access for mod author.

Modified:
    trunk/titania/contributions/index.php
    trunk/titania/contributions/support.php

Modified: trunk/titania/contributions/index.php
==============================================================================
*** trunk/titania/contributions/index.php (original)
--- trunk/titania/contributions/index.php Thu Mar 25 07:18:28 2010
***************
*** 117,140 ****
  			'title'		=> 'CONTRIB_FAQ',
  			'url'		=> titania::$contrib->get_url('faq'),
  		),
  		'manage' => array(
  			'title'		=> 'CONTRIB_MANAGE',
  			'url'		=> titania::$contrib->get_url('manage'),
  			'auth'		=> (((titania::$contrib->is_author || titania::$contrib->is_active_coauthor) && titania::$contrib->contrib_status != TITANIA_CONTRIB_CLEANED) || phpbb::$auth->acl_get('u_titania_mod_contrib_mod') || titania_types::$types[titania::$contrib->contrib_type]->acl_get('moderate'))
  		),
  	);
- 	
- 	$nav_ary_support = array(
- 		'support' => array(
- 			'title'		=> 'CONTRIB_SUPPORT',
- 			'url'		=> titania::$contrib->get_url('support'),
- 		),
- 	);
- 	
- 	if (titania::$config->support_in_titania || (!titania::$config->support_in_titania && (titania::$access_level == TITANIA_ACCESS_TEAMS || titania::$contrib->is_author || titania::$contrib->is_active_coauthor)))
- 	{
- 		$nav_ary = array_merge($nav_ary, $nav_ary_support);
- 	}
  
  	// Display nav menu
  	$page = request_var('page', '');
--- 117,133 ----
  			'title'		=> 'CONTRIB_FAQ',
  			'url'		=> titania::$contrib->get_url('faq'),
  		),
+ 		'support' => array(
+ 			'title'		=> 'CONTRIB_SUPPORT',
+ 			'url'		=> titania::$contrib->get_url('support'),
+ 			'auth'		=> (titania::$config->support_in_titania || (!titania::$config->support_in_titania && (titania::$access_level == TITANIA_ACCESS_TEAMS || titania::$contrib->is_author || titania::$contrib->is_active_coauthor))) ? true : false,
+ 		),
  		'manage' => array(
  			'title'		=> 'CONTRIB_MANAGE',
  			'url'		=> titania::$contrib->get_url('manage'),
  			'auth'		=> (((titania::$contrib->is_author || titania::$contrib->is_active_coauthor) && titania::$contrib->contrib_status != TITANIA_CONTRIB_CLEANED) || phpbb::$auth->acl_get('u_titania_mod_contrib_mod') || titania_types::$types[titania::$contrib->contrib_type]->acl_get('moderate'))
  		),
  	);
  
  	// Display nav menu
  	$page = request_var('page', '');

Modified: trunk/titania/contributions/support.php
==============================================================================
*** trunk/titania/contributions/support.php (original)
--- trunk/titania/contributions/support.php Thu Mar 25 07:18:28 2010
***************
*** 16,26 ****
  	exit;
  }
  
- if (!titania::$config->support_in_titania && titania::$access_level == TITANIA_ACCESS_PUBLIC)
- {
- 	titania::needs_auth();
- }
- 
  $post_id = request_var('p', 0);
  $topic_id = request_var('t', 0);
  
--- 16,21 ----
***************
*** 62,67 ****
--- 57,67 ----
  // Output the simple info on the contrib
  titania::$contrib->assign_details(true);
  
+ if (!titania::$config->support_in_titania && titania::$access_level != TITANIA_ACCESS_TEAMS && !titania::$contrib->is_author && !titania::$contrib->is_active_coauthor)
+ {
+ 	titania::needs_auth();
+ }
+ 
  // Handle replying/editing/etc
  $posting_helper = new titania_posting(TITANIA_ATTACH_EXT_SUPPORT);
  $posting_helper->act('contributions/contribution_support_post.html', titania::$contrib->contrib_id, titania::$contrib->get_url('support'), TITANIA_SUPPORT);