[Customisation Database Commits] r825 - in /trunk/titania: contributions/revision.php manage/index.php

[Nathan Guse]

Author: exreaction
Date: Mon Mar 22 16:40:56 2010
New Revision: 825

Log:
A few checks for titania::$config->use_queue

Modified:
    trunk/titania/contributions/revision.php
    trunk/titania/manage/index.php

Modified: trunk/titania/contributions/revision.php
==============================================================================
*** trunk/titania/contributions/revision.php (original)
--- trunk/titania/contributions/revision.php Mon Mar 22 16:40:56 2010
***************
*** 55,61 ****
  		'S_REPACK'			=> true,
  	));
  }
! else
  {
  	$queue = new titania_queue();
  	// Load the message object
--- 55,61 ----
  		'S_REPACK'			=> true,
  	));
  }
! else if (titania::$config->use_queue)
  {
  	$queue = new titania_queue();
  	// Load the message object
***************
*** 152,158 ****
  						$revision->revision_submitted = true;
  						$revision->submit();
  
! 						if ($repack)
  						{
  							redirect(titania_url::build_url('manage/queue', array('q' => $revision->revision_queue_id)));
  						}
--- 152,158 ----
  						$revision->revision_submitted = true;
  						$revision->submit();
  
! 						if ($repack && titania::$config->use_queue)
  						{
  							redirect(titania_url::build_url('manage/queue', array('q' => $revision->revision_queue_id)));
  						}
***************
*** 200,206 ****
  		break;
  
  		case 2 :
! 			if (!titania_types::$types[titania::$contrib->contrib_type]->mpv_test)
  			{
  				$step = 3;
  				$try_again = true;
--- 200,206 ----
  		break;
  
  		case 2 :
! 			if (!titania_types::$types[titania::$contrib->contrib_type]->mpv_test || !titania::$config->use_queue)
  			{
  				$step = 3;
  				$try_again = true;
***************
*** 250,255 ****
--- 250,261 ----
  		break;
  	/* No Automod test for now, have to figure out how to best handle phpBB versions and some other issues
  		case 3 :
+ 			if (!titania_types::$types[titania::$contrib->contrib_type]->automod_test || !titania::$config->use_queue)
+ 			{
+ 				$step = 4;
+ 				$try_again = true;
+ 			}
+ 
  			$revision = new titania_revision(titania::$contrib, $revision_id);
  			if (!$revision->load())
  			{
***************
*** 290,296 ****
  			$revision->revision_submitted = true;
  			$revision->submit();
  
! 			if ($repack)
  			{
  				redirect(titania_url::build_url('manage/queue', array('q' => $revision->revision_queue_id)));
  			}
--- 296,302 ----
  			$revision->revision_submitted = true;
  			$revision->submit();
  
! 			if ($repack && titania::$config->use_queue)
  			{
  				redirect(titania_url::build_url('manage/queue', array('q' => $revision->revision_queue_id)));
  			}

Modified: trunk/titania/manage/index.php
==============================================================================
*** trunk/titania/manage/index.php (original)
--- trunk/titania/manage/index.php Mon Mar 22 16:40:56 2010
***************
*** 40,51 ****
  	'queue' => array(
  		'title'		=> 'VALIDATION_QUEUE',
  		'url'		=> titania_url::build_url('manage/queue'),
! 		'auth'		=> (sizeof(titania_types::find_authed('view'))) ? true : false,
  	),
  	'queue_discussion' => array(
  		'title'		=> 'QUEUE_DISCUSSION',
  		'url'		=> titania_url::build_url('manage/queue_discussion'),
! 		'auth'		=> (sizeof(titania_types::find_authed('queue_discussion'))) ? true : false,
  	),
  );
  
--- 40,51 ----
  	'queue' => array(
  		'title'		=> 'VALIDATION_QUEUE',
  		'url'		=> titania_url::build_url('manage/queue'),
! 		'auth'		=> (sizeof(titania_types::find_authed('view')) && titania::$config->use_queue) ? true : false,
  	),
  	'queue_discussion' => array(
  		'title'		=> 'QUEUE_DISCUSSION',
  		'url'		=> titania_url::build_url('manage/queue_discussion'),
! 		'auth'		=> (sizeof(titania_types::find_authed('queue_discussion')) && titania::$config->use_queue) ? true : false,
  	),
  );
  
***************
*** 76,79 ****
  		include(TITANIA_ROOT . 'manage/queue.' . PHP_EXT);
  		exit;
  	break;
! }
\ No newline at end of file
--- 76,79 ----
  		include(TITANIA_ROOT . 'manage/queue.' . PHP_EXT);
  		exit;
  	break;
! }