Move redirect stuff outside the Converter class

.travis.yml

@@ -5,9 +5,7 @@ branches:
 language: php
 
 php:
-  - 5.2
   - 5.3
-  - 5.4
 
 before_script:
   - "mkdir fluxbb && cd fluxbb"

converter.php

@@ -107,7 +107,7 @@
 if (defined('CONV_LOG') && file_exists(CONV_LOG))
 	@unlink(CONV_LOG);
 
-conv_log('Running command line based converter for: '.$forum_config['type'].' ('.gmdate('Y-m-d').')');
+conv_log('Running command line based converter for: '.$forum_config['type'].' ('.gmdate('Y-m-d H:i:s').')');
 conv_log('PHP version: '.PHP_VERSION.', OS: '.PHP_OS);
 
 // Create a wrapper for fluxbb (has easy functions for adding users etc.)
@@ -125,7 +125,13 @@
 $converter = new Converter($fluxbb, $forum);
 
 // Start the converter
-$converter->convert();
+$redirect = array(null);
+while ($redirect !== false)
+{
+	conv_message();
+	conv_log('-----------------'."\n");
+	$redirect = $converter->convert($redirect[0], isset($redirect[1]) ? $redirect[1] : 0);
+}
 
 // We're done
 $alerts = array($lang_convert['Rebuild search index note']);

forums/Merge_FluxBB.php

@@ -44,6 +44,9 @@ function initialize()
 	{
 		$this->db->set_names('utf8');
 
+		if (!session_id())
+			session_start();
+
 		if (isset($_SESSION['converter']['last_id']))
 			$this->last_id = $_SESSION['converter']['last_id'];
 		else

include/converter.class.php

@@ -66,52 +66,56 @@ function convert($step = null, $start_at = 0)
 			// Validate only first time we run converter (check whether database configuration is valid)
 			$this->validate();
 
+			$_SESSION['fluxbb_converter']['count'] = array();
+			foreach ($this->forum->steps as $cur_step)
+			{
+				if (is_callable(array($this->forum, 'count_'.$cur_step)))
+					$_SESSION['fluxbb_converter']['count'][$cur_step] = call_user_func(array($this->forum, 'count_'.$cur_step));
+			}
+			print_r($_SESSION['fluxbb_converter']);
+
 			// Drop the FluxBB database tables (when there is no NO_DB_CLEANUP constant defined for forum)
 			if (!defined(get_class($this->forum).'::NO_DB_CLEANUP'))
 				$this->cleanup_database();
 
 			$step = $this->forum->steps[0];
 
-			return conv_redirect($step);
+			return array($step);
 		}
 
 		$start = get_microtime();
-		$redirect_to = false;
+		$redirect_to = null;
 
 		conv_message('Converting', $step);
 		if (is_callable(array($this->forum, 'convert_'.$step)))
 			$redirect_to = call_user_func(array($this->forum, 'convert_'.$step), $start_at);
 		else if (is_callable(array($this, $step)))
 			$redirect_to = call_user_func(array($this, $step));
+		else
+			conv_message('Not implemented', $step);
 
 		conv_message('Done in', round(get_microtime() - $start, 6));
 
-		// Process same step starting from the $start_at row
-		if ($redirect_to != false)
-			conv_redirect($step, $redirect_to);
+		// Process same step starting from $start_at
+		if ($redirect_to != null)
+			return array($step, $redirect_to);
 
 		// Are we done?
 		if ($step == 'finish')
-			conv_redirect('results');
-		else
-		{
-			$current_step = array_search($step, $this->forum->steps);
+			return false;
 
-			// Basically should never happen
-			if ($current_step === false)
-				return false;
+		$current_step = array_search($step, $this->forum->steps);
 
-			// No more tables to process?
-			if (!isset($this->forum->steps[++$current_step]))
-				conv_redirect('finish');
+		// Basically should never happen
+		if ($current_step === false)
+			return false;
 
-			else
-			{
-				// Redirect to the next step
-				$next_step = $this->forum->steps[$current_step];
-				conv_redirect($next_step);
-			}
-		}
+		// No more tables to process?
+		if (!isset($this->forum->steps[++$current_step]))
+			return array('finish');
+
+		// Redirect to the next step
+		return array($this->forum->steps[$current_step]);
 	}
 
 	/**

include/functions_cli.php

@@ -17,6 +17,8 @@ function conv_message()
 
 	$args = func_get_args();
 
+	conv_log($args[0].': '.implode(', ', array_slice($args, 1)));
+
 	// Do not show proccessing rows range
 	if (count($args) && $args[0] == 'Processing range')
 		$args[0] = 'Processing num';
@@ -29,7 +31,6 @@ function conv_message()
 
 	$output = vsprintf($message, $args);
 	echo $output."\n";
-	conv_log($output);
 }
 
 /**
@@ -60,17 +61,3 @@ function conv_error($message, $file = null, $line = null, $dberror = false)
 
 	exit(1);
 }
-
-
-/**
- * Redirect to the next stage
- */
-function conv_redirect($step, $start_at = 0, $time = 0)
-{
-	global $converter;
-
-	conv_message();
-	conv_log('-----------------'."\n");
-
-	$converter->convert($step, $start_at);
-}

include/functions_web.php

@@ -17,6 +17,8 @@ function conv_message()
 
 	$args = func_get_args();
 
+	conv_log($args[0].': '.implode(', ', array_slice($args, 1)));
+
 	// Translate message
 	if (count($args) && isset($lang_convert[$args[0]]))
 		$args[0] = $lang_convert[$args[0]];
@@ -25,7 +27,6 @@ function conv_message()
 
 	$output = vsprintf($message, $args);
 	echo $output."\n".'<br />';
-	conv_log($output);
 }
 
 
@@ -67,13 +68,15 @@ function conv_redirect($step, $start_at = 0, $time = 0)
 
 	$contents = ob_get_clean();
 
+	$url = 'index.php?step='.htmlspecialchars($step).($start_at > 0 ? '&start_at='.$start_at : '');
+
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="refresh" content="<?php echo $time ?>; url=index.php?step=<?php echo htmlspecialchars($step).($start_at > 0 ? '&start_at='.$start_at : '') ?>">
+<meta http-equiv="refresh" content="<?php echo $time ?>; url=<?php echo $url ?>">
 <title><?php echo sprintf($lang_convert['FluxBB converter'], CONV_VERSION) ?></title>
 <link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
 </head>
@@ -111,5 +114,4 @@ function conv_redirect($step, $start_at = 0, $time = 0)
 	conv_log('-----------------');
 	conv_log('', false, true);
 	exit;
-
 }

index.php

@@ -74,7 +74,7 @@
 	if (defined('CONV_LOG') && file_exists(CONV_LOG))
 		@unlink(CONV_LOG);
 
-	conv_log('Running web based converter for: '.$forum_config['type'].' ('.gmdate('Y-m-d').')');
+	conv_log('Running web based converter for: '.$forum_config['type'].' ('.gmdate('Y-m-d H:i:s').')');
 	conv_log('PHP version: '.PHP_VERSION.', OS: '.PHP_OS);
 }
 
@@ -130,7 +130,12 @@
 	if (!isset($step) || $step != 'results')
 	{
 		// Start the converter. When it do its work, it redirects to the next page
-		$converter->convert($step, $start_at, true);
+		$redirect = $converter->convert($step, $start_at);
+
+		if ($redirect === false)
+			conv_redirect('results');
+		else
+			conv_redirect($redirect[0], isset($redirect[1]) ? $redirect[1] : 0);
 	}
 
 	if (empty($_SESSION['converter']['dupe_users']))