[Customisation Database Commits] r667 - in /trunk/titania: contributions/revision.php includes/tools/contrib_tools.php index.php

[Nathan Guse]

Author: exreaction
Date: Thu Mar  4 22:44:25 2010
New Revision: 667

Log:
Split finding the root from restoring it

Modified:
    trunk/titania/contributions/revision.php
    trunk/titania/includes/tools/contrib_tools.php
    trunk/titania/index.php

Modified: trunk/titania/contributions/revision.php
==============================================================================
*** trunk/titania/contributions/revision.php (original)
--- trunk/titania/contributions/revision.php Thu Mar  4 22:44:25 2010
***************
*** 137,143 ****
  				$contrib_tools->clean_package();
  
  				// Restore the root package directory
! 				$contrib_tools->restore_root();
  
  				$error = array_merge($error, $contrib_tools->error);
  
--- 137,144 ----
  				$contrib_tools->clean_package();
  
  				// Restore the root package directory
! 				$package_root = $this->find_root();
! 				$contrib_tools->restore_root($package_root);
  
  				$error = array_merge($error, $contrib_tools->error);
  

Modified: trunk/titania/includes/tools/contrib_tools.php
==============================================================================
*** trunk/titania/includes/tools/contrib_tools.php (original)
--- trunk/titania/includes/tools/contrib_tools.php Thu Mar  4 22:44:25 2010
***************
*** 125,140 ****
  	}
  
  	/**
! 	* Find the root directory of the mod package and place it appropriately so we have package.zip/mod_name_1_0_0/(install files)
! 	* After finding the root, moves it to be in the correct path we need
  	*
! 	* @todo This only handles mod packages (containing an install xml file)
  	*/
! 	public function restore_root()
  	{
- 		// Find the root directory
- 		$package_root = $this->find_root();
- 
  		if ($package_root === false)
  		{
  			$this->remove_temp_files();
--- 125,136 ----
  	}
  
  	/**
! 	* Place the root directory appropriately so we have package.zip/mod_name_1_0_0/(install files)
  	*
! 	* @param string $package_root the root path ($this->find_root())
  	*/
! 	public function restore_root($package_root)
  	{
  		if ($package_root === false)
  		{
  			$this->remove_temp_files();

Modified: trunk/titania/index.php
==============================================================================
*** trunk/titania/index.php (original)
--- trunk/titania/index.php Thu Mar  4 22:44:25 2010
***************
*** 140,146 ****
  			// Start up the machine
  			$contrib_tools = new titania_contrib_tools($zip_file, $new_dir_name);
  
! 			//$contrib_tools->restore_root();
  			//$contrib_tools->replace_zip();
  
  			// Prepare the phpbb files for automod
--- 140,147 ----
  			// Start up the machine
  			$contrib_tools = new titania_contrib_tools($zip_file, $new_dir_name);
  
! 			//$package_root = $this->find_root();
! 			//$contrib_tools->restore_root($package_root);
  			//$contrib_tools->replace_zip();
  
  			// Prepare the phpbb files for automod