[Customisation Database Commits] r1058 - in /trunk/titania: includes/hooks/_hook_phpbb.com.php index.php

[Nathan Guse]

Author: exreaction
Date: Tue Apr 13 21:58:27 2010
New Revision: 1058

Log:
Display errors from retesting automod.

Don't create multiple topics when running the update_first_queue_post hook

Modified:
    trunk/titania/includes/hooks/_hook_phpbb.com.php
    trunk/titania/index.php

Modified: trunk/titania/includes/hooks/_hook_phpbb.com.php
==============================================================================
*** trunk/titania/includes/hooks/_hook_phpbb.com.php (original)
--- trunk/titania/includes/hooks/_hook_phpbb.com.php Tue Apr 13 21:58:27 2010
***************
*** 95,100 ****
--- 95,111 ----
  		return;
  	}
  
+ 	// Does a topic already exist?  If so, don't repost.
+ 	$sql = 'SELECT phpbb_topic_id FROM ' . TITANIA_TOPICS_TABLE . '
+ 		WHERE topic_id = ' . $queue_object->queue_topic_id;
+ 	phpbb::$db->sql_query($sql);
+ 	$phpbb_topic_id = phpbb::$db->sql_fetchfield('phpbb_topic_id');
+ 	phpbb::$db->sql_freeresult();
+ 	if ($phpbb_topic_id)
+ 	{
+ 		return;
+ 	}
+ 
  	$forum_id = phpbb_com_forum_id($post_object->topic->topic_category, $post_object->topic->topic_type);
  
  	if (!$forum_id)

Modified: trunk/titania/index.php
==============================================================================
*** trunk/titania/index.php (original)
--- trunk/titania/index.php Tue Apr 13 21:58:27 2010
***************
*** 129,134 ****
--- 129,139 ----
  				$queue->mpv_results_uid = $uid;
  				$queue->submit();
  			}
+ 
+ 			if (sizeof($contrib_tools->error))
+ 			{
+ 				trigger_error(implode('<br />', $contrib_tools->error));
+ 			}
  		}
  		else if ($action == 'automod')
  		{
***************
*** 142,148 ****
  
  			// Automod testing time
  			$details = '';
! 			$html_results = $bbcode_results = array();
  			$sql = 'SELECT row_id, phpbb_version_branch, phpbb_version_revision FROM ' . TITANIA_REVISIONS_PHPBB_TABLE . '
  				WHERE revision_id = ' . $revision->revision_id;
  			$result = phpbb::$db->sql_query($sql);
--- 147,153 ----
  
  			// Automod testing time
  			$details = '';
! 			$html_results = $bbcode_results = $error = array();
  			$sql = 'SELECT row_id, phpbb_version_branch, phpbb_version_revision FROM ' . TITANIA_REVISIONS_PHPBB_TABLE . '
  				WHERE revision_id = ' . $revision->revision_id;
  			$result = phpbb::$db->sql_query($sql);
***************
*** 151,156 ****
--- 156,166 ----
  				$version_string = $row['phpbb_version_branch'][0] . '.' . $row['phpbb_version_branch'][1] . '.' .$row['phpbb_version_revision'];
  				$phpbb_path = $contrib_tools->automod_phpbb_files($version_string);
  
+ 				if (sizeof($contrib_tools->error))
+ 				{
+ 					$error = array_merge($error, $contrib_tools->error);
+ 				}
+ 
  				if ($phpbb_path === false)
  				{
  					continue;
***************
*** 176,186 ****
  			$queue->submit();
  
  			$contrib_tools->remove_temp_files();
- 		}
  
! 		if (sizeof($contrib_tools->error))
! 		{
! 			trigger_error(implode('<br />', $contrib_tools->error));
  		}
  
  		redirect(titania_url::build_url('manage/queue', array('queue' => titania_types::$types[$queue->queue_type]->url, 'q' => $queue->queue_id)));
--- 186,196 ----
  			$queue->submit();
  
  			$contrib_tools->remove_temp_files();
  
! 			if (sizeof($error))
! 			{
! 				trigger_error(implode('<br />', $error));
! 			}
  		}
  
  		redirect(titania_url::build_url('manage/queue', array('queue' => titania_types::$types[$queue->queue_type]->url, 'q' => $queue->queue_id)));