automatic updater supporting batch-processing diff

git-svn-id: file:///svn/phpbb/trunk@8152 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2007-10-06 11:45:30 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2007-10-06 11:45:30 +0000
commit: 26cb8253142997efeaeb6b96d16ec97eb237644f (patch)
tree: be404e84b0b5ccce4a7097437d9cb90144502cde /phpBB
parent: d282d0f8b70801ee7fd22d04515cee8c8bd26ce4 (diff)
download: forums-26cb8253142997efeaeb6b96d16ec97eb237644f.tar
forums-26cb8253142997efeaeb6b96d16ec97eb237644f.tar.gz
forums-26cb8253142997efeaeb6b96d16ec97eb237644f.tar.bz2
forums-26cb8253142997efeaeb6b96d16ec97eb237644f.tar.xz
forums-26cb8253142997efeaeb6b96d16ec97eb237644f.zip
6 files changed, 384 insertions, 142 deletions
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index a5545aad26..b1e14ba8cf 100755
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -11,6 +11,31 @@
 
 <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
+<script type="text/javascript">
+// <![CDATA[
+
+/**
+* Set display of page element
+* s[-1,0,1] = hide,toggle display,show
+*/
+function dE(n, s, type)
+{
+	if (!type)
+	{
+		type = 'block';
+	}
+
+	var e = document.getElementById(n);
+	if (!s)
+	{
+		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
+	}
+	e.style.display = (s == 1) ? type : 'none';
+}
+
+// ]]>
+</script>
+
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index e19f1fe211..2dbc0c7c47 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -17,7 +17,14 @@
 	</div>
 <!-- ENDIF -->
 
-<!-- IF S_INTRO -->
+<!-- IF S_IN_PROGRESS -->
+
+	<div class="successbox" style="margin-top: 0;">
+		<h3>{L_IN_PROGRESS}</h3>
+		<p>{L_IN_PROGRESS_EXPLAIN}</p>
+	</div>
+
+<!-- ELSEIF S_INTRO -->
 
 	<!-- IF S_WARNING -->
 	<div class="successbox" style="margin-top: 0;">
@@ -178,13 +185,16 @@
 			<!-- BEGIN files -->
 				<!-- IF files.S_STATUS -->
 					<!-- IF not files.S_FIRST_ROW -->
-						</fieldset>
+						</fieldset></div>
 					<!-- ENDIF -->
 
 					<h2>{files.TITLE}</h2>
 
+					<!-- IF files.STATUS eq 'not_modified' --><div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0);">{L_TOGGLE_DISPLAY}</a></div><!-- ENDIF -->
 					<p>{files.EXPLAIN}</p>
 
+					<div style="display: <!-- IF files.STATUS neq 'not_modified' -->block<!-- ELSE -->none<!-- ENDIF -->;" id="{files.STATUS}">
+
 					<fieldset>
 						<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
 				<!-- ELSE -->
@@ -262,7 +272,7 @@
 				<!-- ENDIF -->
 			<!-- END files -->
 
-			</fieldset>
+			</fieldset></div>
 		<!-- ENDIF -->
 
 		<br />
@@ -287,14 +297,14 @@
 
 <!-- ELSEIF S_DOWNLOAD_FILES -->
 
-	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
+	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
 
 	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
 
 	<form id="install_update" method="post" action="{U_ACTION}">
 
 	<fieldset>
-		<legend>{L_DOWNLOAD_AS}</legend>
+		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
 	<dl>
 		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
 		<dd>{RADIO_BUTTONS}</dd>
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5cc8bd114f..dafd001bff 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1006,7 +1006,10 @@ if ($exit)
 </html>
 
 <?php
-	exit_handler();
+	if (function_exists('exit_handler'))
+	{
+		exit_handler();
+	}
 }
 
 // Schema updates
@@ -1613,7 +1616,10 @@ $cache->purge();
 
 <?php
 
-exit_handler();
+if (function_exists('exit_handler'))
+{
+	exit_handler();
+}
 
 
 /**
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index f3a833a872..60265d5a29 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -426,7 +426,10 @@ class module
 			'T_IMAGE_PATH'			=> $phpbb_root_path . 'adm/images/',
 
 			'S_CONTENT_DIRECTION' 	=> $lang['DIRECTION'],
+			'S_CONTENT_FLOW_BEGIN'	=> ($lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
+			'S_CONTENT_FLOW_END'	=> ($lang['DIRECTION'] == 'ltr') ? 'right' : 'left',
 			'S_CONTENT_ENCODING' 	=> 'UTF-8',
+
 			'S_USER_LANG'			=> $lang['USER_LANG'],
 			)
 		);
@@ -454,7 +457,10 @@ class module
 			$db->sql_close();
 		}
 
-		exit_handler();
+		if (function_exists('exit_handler'))
+		{
+			exit_handler();
+		}
 	}
 
 	/**
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 1788d9aced..14f3fb368a 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -228,6 +228,7 @@ class install_update extends module
 
 				// Make sure the update list is destroyed.
 				$cache->destroy('_update_list');
+				$cache->destroy('_diff_files');
 			break;
 
 			case 'version_check':
@@ -290,6 +291,9 @@ class install_update extends module
 
 			case 'file_check':
 
+				// Make sure the previous file collection is no longer valid...
+				$cache->destroy('_diff_files');
+
 				$this->page_title = 'STAGE_FILE_CHECK';
 
 				// Now make sure our update list is correct if the admin refreshes
@@ -317,10 +321,32 @@ class install_update extends module
 					$get_new_list = true;
 				}
 
+				if (!$get_new_list && $update_list['status'] != 'finished')
+				{
+					$get_new_list = true;
+				}
+
 				if ($get_new_list)
 				{
-					$update_list = $this->get_update_structure();
+					$this->get_update_structure($update_list);
 					$cache->put('_update_list', $update_list);
+
+					// Refresh the page if we are still not finished...
+					if ($update_list['status'] != 'finished')
+					{
+						$refresh_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check");
+						meta_refresh(2, $refresh_url);
+
+						$template->assign_vars(array(
+							'S_IN_PROGRESS'		=> true,
+							'S_COLLECTED'		=> (int) $update_list['status'],
+							'S_TO_COLLECT'		=> sizeof($this->update_info['files']),
+							'L_IN_PROGRESS'				=> $user->lang['COLLECTING_FILE_DIFFS'],
+							'L_IN_PROGRESS_EXPLAIN'		=> sprintf($user->lang['NUMBER_OF_FILES_COLLECTED'], (int) $update_list['status'], sizeof($this->update_info['files'])),
+						));
+
+						return;
+					}
 				}
 
 				if ($action == 'diff')
@@ -340,7 +366,7 @@ class install_update extends module
 				// Now assign the list to the template
 				foreach ($update_list as $status => $filelist)
 				{
-					if ($status == 'no_update' || !sizeof($filelist))
+					if ($status == 'no_update' || !sizeof($filelist) || $status == 'status')
 					{
 						continue;
 					}
@@ -398,7 +424,7 @@ class install_update extends module
 				$all_up_to_date = true;
 				foreach ($update_list as $status => $filelist)
 				{
-					if ($status != 'up_to_date' && $status != 'custom' && sizeof($filelist))
+					if ($status != 'up_to_date' && $status != 'custom' && $status != 'status' && sizeof($filelist))
 					{
 						$all_up_to_date = false;
 						break;
@@ -492,12 +518,14 @@ class install_update extends module
 				$this->page_title = 'STAGE_UPDATE_FILES';
 
 				$s_hidden_fields = '';
+				$params = array();
 				$conflicts = request_var('conflict', array('' => 0));
 				$modified = request_var('modified', array('' => 0));
 
 				foreach ($conflicts as $filename => $merge_option)
 				{
 					$s_hidden_fields .= '<input type="hidden" name="conflict[' . htmlspecialchars($filename) . ']" value="' . $merge_option . '" />';
+					$params[] = 'conflict[' . urlencode($filename) . ']=' . urlencode($merge_option);
 				}
 
 				foreach ($modified as $filename => $merge_option)
@@ -507,6 +535,7 @@ class install_update extends module
 						continue;
 					}
 					$s_hidden_fields .= '<input type="hidden" name="modified[' . htmlspecialchars($filename) . ']" value="' . $merge_option . '" />';
+					$params[] = 'modified[' . urlencode($filename) . ']=' . urlencode($merge_option);
 				}
 
 				$no_update = request_var('no_update', array(0 => ''));
@@ -514,9 +543,214 @@ class install_update extends module
 				foreach ($no_update as $index => $filename)
 				{
 					$s_hidden_fields .= '<input type="hidden" name="no_update[]" value="' . htmlspecialchars($filename) . '" />';
+					$params[] = 'no_update[]=' . urlencode($filename);
+				}
+
+				// Before the user is choosing his preferred method, let's create the content list...
+				$update_list = $cache->get('_update_list');
+
+				if ($update_list === false)
+				{
+					trigger_error($user->lang['NO_UPDATE_INFO'], E_USER_ERROR);
+				}
+
+				// Check if the conflicts data is valid
+				if (sizeof($conflicts))
+				{
+					$conflict_filenames = array();
+					foreach ($update_list['conflict'] as $files)
+					{
+						$conflict_filenames[] = $files['filename'];
+					}
+
+					$new_conflicts = array();
+					foreach ($conflicts as $filename => $diff_method)
+					{
+						if (in_array($filename, $conflict_filenames))
+						{
+							$new_conflicts[$filename] = $diff_method;
+						}
+					}
+
+					$conflicts = $new_conflicts;
+				}
+
+				// Build list for modifications
+				if (sizeof($modified))
+				{
+					$modified_filenames = array();
+					foreach ($update_list['modified'] as $files)
+					{
+						$modified_filenames[] = $files['filename'];
+					}
+
+					$new_modified = array();
+					foreach ($modified as $filename => $diff_method)
+					{
+						if (in_array($filename, $modified_filenames))
+						{
+							$new_modified[$filename] = $diff_method;
+						}
+					}
+
+					$modified = $new_modified;
+				}
+
+				// Check number of conflicting files, they need to be equal. For modified files the number can differ
+				if (sizeof($update_list['conflict']) != sizeof($conflicts))
+				{
+					trigger_error($user->lang['MERGE_SELECT_ERROR'], E_USER_ERROR);
+				}
+
+				// Before we do anything, let us diff the files and store the raw file information "somewhere"
+				$get_files = false;
+				$file_list = $cache->get('_diff_files');
+
+				if ($file_list === false || $file_list['status'] != 'finished')
+				{
+					$get_files = true;
 				}
 
-				if (!empty($_POST['download']))
+				if ($get_files)
+				{
+					if ($file_list === false)
+					{
+						$file_list = array(
+							'status'	=> 0,
+						);
+					}
+
+					$processed = 0;
+					foreach ($update_list as $status => $files)
+					{
+						if (!is_array($files))
+						{
+							continue;
+						}
+
+						foreach ($files as $file_struct)
+						{
+							// Skip this file if the user selected to not update it
+							if (in_array($file_struct['filename'], $no_update))
+							{
+								continue;
+							}
+
+							// Already handled... then skip of course...
+							if (isset($file_list[$file_struct['filename']]))
+							{
+								continue;
+							}
+
+							// Refresh if we reach 5 diffs...
+							if ($processed >= 5)
+							{
+								$cache->put('_diff_files', $file_list);
+
+								if (!empty($_REQUEST['download']))
+								{
+									$params[] = 'download=1';
+								}
+
+								$redirect_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=update_files&amp;" . implode('&amp;', $params));
+								meta_refresh(3, $redirect_url);
+
+								$template->assign_vars(array(
+									'S_IN_PROGRESS'			=> true,
+									'L_IN_PROGRESS'			=> $user->lang['MERGING_FILES'],
+									'L_IN_PROGRESS_EXPLAIN'	=> $user->lang['MERGING_FILES_EXPLAIN'],
+								));
+
+								return;
+							}
+
+							$original_filename = ($file_struct['custom']) ? $file_struct['original'] : $file_struct['filename'];
+
+							switch ($status)
+							{
+								case 'modified':
+
+									$option = (isset($modified[$file_struct['filename']])) ? $modified[$file_struct['filename']] : 0;
+
+									switch ($option)
+									{
+										case MERGE_NO_MERGE_NEW:
+											$contents = file_get_contents($this->new_location . $original_filename);
+										break;
+
+										case MERGE_NO_MERGE_MOD:
+											$contents = file_get_contents($phpbb_root_path . $file_struct['filename']);
+										break;
+
+										default:
+											$diff = $this->return_diff($this->old_location . $original_filename, $phpbb_root_path . $file_struct['filename'], $this->new_location . $original_filename);
+
+											$contents = implode("\n", $diff->merged_output());
+											unset($diff);
+										break;
+									}
+
+									$file_list[$file_struct['filename']] = '_file_' . md5($file_struct['filename']);
+									$cache->put($file_list[$file_struct['filename']], base64_encode($contents));
+
+									$file_list['status']++;
+									$processed++;
+
+								break;
+
+								case 'conflict':
+
+									$option = $conflicts[$file_struct['filename']];
+									$contents = '';
+
+									switch ($option)
+									{
+										case MERGE_NO_MERGE_NEW:
+											$contents = file_get_contents($this->new_location . $original_filename);
+										break;
+
+										case MERGE_NO_MERGE_MOD:
+											$contents = file_get_contents($phpbb_root_path . $file_struct['filename']);
+										break;
+
+										default:
+
+											$diff = $this->return_diff($this->old_location . $original_filename, $phpbb_root_path . $file_struct['filename'], $this->new_location . $original_filename);
+
+											if ($option == MERGE_NEW_FILE)
+											{
+												$contents = implode("\n", $diff->merged_new_output());
+											}
+											else if ($option == MERGE_MOD_FILE)
+											{
+												$contents = implode("\n", $diff->merged_orig_output());
+											}
+											else
+											{
+												unset($diff);
+												break 2;
+											}
+
+											unset($diff);
+										break;
+									}
+
+									$file_list[$file_struct['filename']] = '_file_' . md5($file_struct['filename']);
+									$cache->put($file_list[$file_struct['filename']], base64_encode($contents));
+
+									$file_list['status']++;
+									$processed++;
+
+								break;
+							}
+						}
+					}
+				}
+
+				$file_list['status'] = 'finished';
+				$cache->put('_diff_files', $file_list);
+
+				if (!empty($_REQUEST['download']))
 				{
 					$this->include_file('includes/functions_compress.' . $phpEx);
 
@@ -558,7 +792,7 @@ class install_update extends module
 
 						foreach ($update_list as $status => $files)
 						{
-							if ($status == 'up_to_date' || $status == 'no_update')
+							if ($status == 'up_to_date' || $status == 'no_update' || $status == 'status')
 							{
 								continue;
 							}
@@ -576,7 +810,6 @@ class install_update extends module
 								));
 							}
 						}
-
 						return;
 					}
 
@@ -592,11 +825,11 @@ class install_update extends module
 					$this->include_file('includes/functions_transfer.' . $phpEx);
 
 					// Choose FTP, if not available use fsock...
-					$method = request_var('method', '');
+					$method = basename(request_var('method', ''));
 					$submit = (isset($_POST['submit'])) ? true : false;
 					$test_ftp_connection = request_var('test_connection', '');
 
-					if (!$method)
+					if (!$method || !class_exists($method))
 					{
 						$method = 'ftp';
 						$methods = transfer::methods();
@@ -633,6 +866,8 @@ class install_update extends module
 						}
 					}
 
+					$s_hidden_fields .= build_hidden_fields(array('method' => $method));
+
 					if (!$submit)
 					{
 						$this->page_title = 'SELECT_FTP_SETTINGS';
@@ -653,8 +888,6 @@ class install_update extends module
 							));
 						}
 
-						$s_hidden_fields .= build_hidden_fields(array('method' => $method));
-
 						$template->assign_vars(array(
 							'S_CONNECTION_SUCCESS'		=> ($test_ftp_connection && $test_connection === true) ? true : false,
 							'S_CONNECTION_FAILED'		=> ($test_ftp_connection && $test_connection !== true) ? true : false,
@@ -676,63 +909,6 @@ class install_update extends module
 				$download_filename = 'update_' . $this->update_info['version']['from'] . '_to_' . $this->update_info['version']['to'];
 				$archive_filename = $download_filename . '_' . time() . '_' . unique_id();
 
-				$update_list = $cache->get('_update_list');
-				$conflicts = request_var('conflict', array('' => 0));
-				$modified = request_var('modified', array('' => 0));
-
-				if ($update_list === false)
-				{
-					trigger_error($user->lang['NO_UPDATE_INFO'], E_USER_ERROR);
-				}
-
-				// Check if the conflicts data is valid
-				if (sizeof($conflicts))
-				{
-					$conflict_filenames = array();
-					foreach ($update_list['conflict'] as $files)
-					{
-						$conflict_filenames[] = $files['filename'];
-					}
-
-					$new_conflicts = array();
-					foreach ($conflicts as $filename => $diff_method)
-					{
-						if (in_array($filename, $conflict_filenames))
-						{
-							$new_conflicts[$filename] = $diff_method;
-						}
-					}
-
-					$conflicts = $new_conflicts;
-				}
-
-				// Build list for modifications
-				if (sizeof($modified))
-				{
-					$modified_filenames = array();
-					foreach ($update_list['modified'] as $files)
-					{
-						$modified_filenames[] = $files['filename'];
-					}
-
-					$new_modified = array();
-					foreach ($modified as $filename => $diff_method)
-					{
-						if (in_array($filename, $modified_filenames))
-						{
-							$new_modified[$filename] = $diff_method;
-						}
-					}
-
-					$modified = $new_modified;
-				}
-
-				// Check number of conflicting files, they need to be equal. For modified files the number can differ
-				if (sizeof($update_list['conflict']) != sizeof($conflicts))
-				{
-					trigger_error($user->lang['MERGE_SELECT_ERROR'], E_USER_ERROR);
-				}
-
 				// Now init the connection
 				if ($update_mode == 'download')
 				{
@@ -754,6 +930,11 @@ class install_update extends module
 				// Ok, go through the update list and do the operations based on their status
 				foreach ($update_list as $status => $files)
 				{
+					if (!is_array($files))
+					{
+						continue;
+					}
+
 					foreach ($files as $file_struct)
 					{
 						// Skip this file if the user selected to not update it
@@ -769,6 +950,7 @@ class install_update extends module
 							case 'new':
 							case 'new_conflict':
 							case 'not_modified':
+
 								if ($update_mode == 'download')
 								{
 									$compress->add_custom_file($this->new_location . $original_filename, $file_struct['filename']);
@@ -779,31 +961,22 @@ class install_update extends module
 									{
 										$transfer->rename($file_struct['filename'], $file_struct['filename'] . '.bak');
 									}
+
+									// New directory too?
+									$dirname = dirname($file_struct['filename']);
+
+									if ($dirname && !file_exists($phpbb_root_path . $dirname))
+									{
+										$transfer->make_dir($dirname);
+									}
+
 									$transfer->copy_file($this->new_location . $original_filename, $file_struct['filename']);
 								}
 							break;
 
 							case 'modified':
 
-								$option = (isset($modified[$file_struct['filename']])) ? $modified[$file_struct['filename']] : 0;
-
-								switch ($option)
-								{
-									case MERGE_NO_MERGE_NEW:
-										$contents = file_get_contents($this->new_location . $original_filename);
-									break;
-
-									case MERGE_NO_MERGE_MOD:
-										$contents = file_get_contents($phpbb_root_path . $file_struct['filename']);
-									break;
-
-									default:
-										$diff = $this->return_diff($this->old_location . $original_filename, $phpbb_root_path . $file_struct['filename'], $this->new_location . $original_filename);
-
-										$contents = implode("\n", $diff->merged_output());
-										unset($diff);
-									break;
-								}
+								$contents = base64_decode($cache->get($file_list[$file_struct['filename']]));
 
 								if ($update_mode == 'download')
 								{
@@ -819,40 +992,7 @@ class install_update extends module
 
 							case 'conflict':
 
-								$option = $conflicts[$file_struct['filename']];
-								$contents = '';
-
-								switch ($option)
-								{
-									case MERGE_NO_MERGE_NEW:
-										$contents = file_get_contents($this->new_location . $original_filename);
-									break;
-
-									case MERGE_NO_MERGE_MOD:
-										$contents = file_get_contents($phpbb_root_path . $file_struct['filename']);
-									break;
-
-									default:
-
-										$diff = $this->return_diff($this->old_location . $original_filename, $phpbb_root_path . $file_struct['filename'], $this->new_location . $original_filename);
-
-										if ($option == MERGE_NEW_FILE)
-										{
-											$contents = implode("\n", $diff->merged_new_output());
-										}
-										else if ($option == MERGE_MOD_FILE)
-										{
-											$contents = implode("\n", $diff->merged_orig_output());
-										}
-										else
-										{
-											unset($diff);
-											break 2;
-										}
-
-										unset($diff);
-									break;
-								}
+								$contents = base64_decode($cache->get($file_list[$file_struct['filename']]));
 
 								if ($update_mode == 'download')
 								{
@@ -1058,23 +1198,50 @@ class install_update extends module
 	/**
 	* Collect all file status infos we need for the update by diffing all files
 	*/
-	function get_update_structure()
+	function get_update_structure(&$update_list)
 	{
 		global $phpbb_root_path, $phpEx, $user;
 
-		$update_list = array(
-			'up_to_date'	=> array(),
-			'new'			=> array(),
-			'not_modified'	=> array(),
-			'modified'		=> array(),
-			'new_conflict'	=> array(),
-			'conflict'		=> array(),
-			'no_update'		=> array(),
-		);
+		if ($update_list === false)
+		{
+			$update_list = array(
+				'up_to_date'	=> array(),
+				'new'			=> array(),
+				'not_modified'	=> array(),
+				'modified'		=> array(),
+				'new_conflict'	=> array(),
+				'conflict'		=> array(),
+				'no_update'		=> array(),
+				'status'		=> 0,
+			);
+		}
+
+		/* if (!empty($this->update_info['custom']))
+		{
+			foreach ($this->update_info['custom'] as $original_file => $file_ary)
+			{
+				foreach ($file_ary as $index => $file)
+				{
+					$this->make_update_diff($update_list, $original_file, $file, true);
+				}
+			}
+		} */
 
 		// Get a list of those files which are completely new by checking with file_exists...
+		$num_bytes_processed = 0;
+
 		foreach ($this->update_info['files'] as $index => $file)
 		{
+			if (is_int($update_list['status']) && $index <= $update_list['status'])
+			{
+				continue;
+			}
+
+			if ($num_bytes_processed >= 500 * 1024)
+			{
+				return;
+			}
+
 			if (!file_exists($phpbb_root_path . $file))
 			{
 				// Make sure the update files are consistent by checking if the file is in new_files...
@@ -1090,7 +1257,7 @@ class install_update extends module
 				//		$update_list['removed'][] = $file;
 				//	}
 
-				// Only include a new file as new if the underlying path exist
+				/* Only include a new file as new if the underlying path exist
 				// The path normally do not exist if the original style or language has been removed
 				if (file_exists($phpbb_root_path . dirname($file)))
 				{
@@ -1104,12 +1271,28 @@ class install_update extends module
 					{
 						$update_list['no_update'][] = $file;
 					}
+				}*/
+
+				if (file_exists($phpbb_root_path . dirname($file)) || (strpos($file, 'styles/') !== 0 && strpos($file, 'language/') !== 0))
+				{
+					$this->get_custom_info($update_list['new'], $file);
+					$update_list['new'][] = array('filename' => $file, 'custom' => false);
 				}
-				unset($this->update_info['files'][$index]);
+
+				// unset($this->update_info['files'][$index]);
 			}
+			else
+			{
+				// not modified?
+				$this->make_update_diff($update_list, $file, $file);
+			}
+
+			$num_bytes_processed += (file_exists($this->new_location . $file)) ? filesize($this->new_location . $file) : 100 * 1024;
+			$update_list['status']++;
 		}
 
-		if (!sizeof($this->update_info['files']))
+		$update_list['status'] = 'finished';
+/*		if (!sizeof($this->update_info['files']))
 		{
 			return $update_list;
 		}
@@ -1136,7 +1319,7 @@ class install_update extends module
 			}
 		}
 
-		return $update_list;
+		return $update_list;*/
 	}
 
 	/**
@@ -1180,6 +1363,12 @@ class install_update extends module
 			return;
 		}
 
+		// Old file removed?
+		if (file_exists($this->old_location . $original_file) && !file_exists($this->new_location . $original_file))
+		{
+			return;
+		}
+
 		// Check for existance, else abort immediately
 		if (!file_exists($this->old_location . $original_file) || !file_exists($this->new_location . $original_file))
 		{
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 34a8f2140a..16bd8b963a 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -380,6 +380,7 @@ $lang = array_merge($lang, array(
 	'CHECK_UPDATE_DATABASE'			=> 'Continue update process',
 	'COLLECTED_INFORMATION'			=> 'File information',
 	'COLLECTED_INFORMATION_EXPLAIN'	=> 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
+	'COLLECTING_FILE_DIFFS'			=> 'Collecting file differences',
 	'COMPLETE_LOGIN_TO_BOARD'		=> 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
 	'CONTINUE_UPDATE_NOW'			=> 'Continue the update process now',
 	'CURRENT_FILE'					=> 'Current original file',
@@ -446,6 +447,8 @@ $lang = array_merge($lang, array(
 	'MERGE_MOD_FILE_OPTION'		=> 'Merge differences and use modified code within conflicting block',
 	'MERGE_NEW_FILE_OPTION'		=> 'Merge differences and use new file code within conflicting block',
 	'MERGE_SELECT_ERROR'		=> 'Conflicting file merge modes are not correctly selected.',
+	'MERGING_FILES'				=> 'Merging differences',
+	'MERGING_FILES_EXPLAIN'		=> 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',
 
 	'NEW_FILE'						=> 'New updated file',
 	'NEW_USERNAME'					=> 'New username',
@@ -460,6 +463,7 @@ $lang = array_merge($lang, array(
 	'NO_VISIBLE_CHANGES'			=> 'No visible changes',
 	'NOTICE'						=> 'Notice',
 	'NUM_CONFLICTS'					=> 'Number of conflicts',
+	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently having differences about %1$d from %2$d files collected.<br />Please wait until file collection finished.',
 
 	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
 
@@ -495,6 +499,8 @@ $lang = array_merge($lang, array(
 	'STATUS_NOT_MODIFIED'		=> 'Not modified file',
 	'STATUS_UP_TO_DATE'			=> 'Already updated file',
 
+	'TOGGLE_DISPLAY'			=> 'View/Hide file list',
+
 	'UPDATE_COMPLETED'				=> 'Update completed',
 	'UPDATE_DATABASE'				=> 'Update database',
 	'UPDATE_DATABASE_EXPLAIN'		=> 'Within the next step the database will be updated.',
author	Meik Sievertsen <acydburn@phpbb.com>	2007-10-06 11:45:30 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2007-10-06 11:45:30 +0000
commit	26cb8253142997efeaeb6b96d16ec97eb237644f (patch)
tree	be404e84b0b5ccce4a7097437d9cb90144502cde /phpBB
parent	d282d0f8b70801ee7fd22d04515cee8c8bd26ce4 (diff)
download	forums-26cb8253142997efeaeb6b96d16ec97eb237644f.tar forums-26cb8253142997efeaeb6b96d16ec97eb237644f.tar.gz forums-26cb8253142997efeaeb6b96d16ec97eb237644f.tar.bz2 forums-26cb8253142997efeaeb6b96d16ec97eb237644f.tar.xz forums-26cb8253142997efeaeb6b96d16ec97eb237644f.zip