mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

updates for the updater and the diff engine.

Browse Source 
- this update also includes an important change for including the diff engine, since we may need to include an updated engine before updating. This basically means that for a future update (B4 to another version) requires copying the new diff files first... the new include method should prevent this needed handwork for later versions then.


git-svn-id: file:///svn/phpbb/trunk@6695 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-11-29 15:51:54 +00:00
parent d417d53c0a
commit 7ed41c4de1
4 changed files with 129 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
phpBB/install/install_update.php
View File

@@ -94,7 +94,10 @@ class install_update extends module
$auth->acl($user->data);
$user->setup('install');
// Include renderer and engine
include_once($phpbb_root_path . 'includes/diff/diff.' . $phpEx);
include_once($phpbb_root_path . 'includes/diff/engine.' . $phpEx);
include_once($phpbb_root_path . 'includes/diff/renderer.' . $phpEx);
// Check for user session
if (!$user->data['is_registered'])
@@ -574,22 +577,41 @@ class install_update extends module
break;
case 'modified':
$diff = &new diff3(file($this->old_location . $original_filename), file($phpbb_root_path . $file_struct['filename']), file($this->new_location . $original_filename));
$tmp = array(
'file1' => file_get_contents($this->old_location . $original_filename),
'file2' => file_get_contents($phpbb_root_path . $file_struct['filename']),
'file3' => file_get_contents($this->new_location . $original_filename),
);
$diff = &new diff3($tmp['file1'], $tmp['file2'], $tmp['file3']);
$contents = implode("\n", $diff->merged_output());
unset($tmp, $diff);
if ($update_mode == 'download')
{
$compress->add_data($contents, $file_struct['filename']);
}
else
{
// @todo add option to specify if a backup file should be created?
$transfer->rename($file_struct['filename'], $file_struct['filename'] . '.bak');
$transfer->write_file($file_struct['filename'], $contents);
}
break;
case 'conflict':
$diff = &new diff3(file($this->old_location . $original_filename), file($phpbb_root_path . $file_struct['filename']), file($this->new_location . $original_filename));
$tmp = array(
'file1' => file_get_contents($this->old_location . $original_filename),
'file2' => file_get_contents($phpbb_root_path . $file_struct['filename']),
'file3' => file_get_contents($this->new_location . $original_filename),
);
$diff = &new diff3($tmp['file1'], $tmp['file2'], $tmp['file3']);
unset($tmp);
if ($conflicts[$file_struct['filename']] == 1)
{
@@ -601,9 +623,12 @@ class install_update extends module
}
else
{
unset($diff);
break;
}
unset($diff);
if ($update_mode == 'download')
{
$compress->add_data($contents, $file_struct['filename']);
@@ -716,7 +741,15 @@ class install_update extends module
switch ($status)
{
case 'conflict':
$diff = &new diff3(file($this->old_location . $original_file), file($phpbb_root_path . $file), file($this->new_location . $original_file));
$tmp = array(
'file1' => file_get_contents($this->old_location . $original_file),
'file2' => file_get_contents($phpbb_root_path . $file),
'file3' => file_get_contents($this->new_location . $original_file),
);
$diff = &new diff3($tmp['file1'], $tmp['file2'], $tmp['file3']);
unset($tmp);
$template->assign_vars(array(
'S_DIFF_CONFLICT_FILE' => true,
@@ -725,16 +758,39 @@ class install_update extends module
break;
case 'modified':
$diff = &new diff3(file($this->old_location . $original_file), file($phpbb_root_path . $original_file), file($this->new_location . $file));
$tmp = array(
'file1' => file_get_contents($this->old_location . $original_file),
'file2' => file_get_contents($phpbb_root_path . $original_file),
'file3' => file_get_contents($this->new_location . $file),
);
$diff = &new diff3($tmp['file1'], $tmp['file2'], $tmp['file3']);
unset($tmp);
break;
case 'not_modified':
case 'new_conflict':
$diff = &new diff(file($phpbb_root_path . $file), file($this->new_location . $original_file));
$tmp = array(
'file1' => file_get_contents($phpbb_root_path . $file),
'file2' => file_get_contents($this->new_location . $original_file),
);
$diff = &new diff($tmp['file1'], $tmp['file2']);
unset($tmp);
break;
case 'new':
$diff = &new diff(array(), file($this->new_location . $original_file));
$tmp = array(
'file1' => array(),
'file2' => file_get_contents($this->new_location . $original_file),
);
$diff = &new diff($tmp['file1'], $tmp['file2']);
unset($tmp);
$template->assign_var('S_DIFF_NEW_FILE', true);
$diff_mode = 'inline';
$this->page_title = 'VIEWING_FILE_CONTENTS';
@@ -762,6 +818,8 @@ class install_update extends module
'S_DIFF_MODE_OPTIONS' => $diff_mode_options,
'S_SHOW_DIFF' => true,
));
unset($diff, $renderer);
}
/**
@@ -868,7 +926,7 @@ class install_update extends module
);
// We need to diff the contents here to make sure the file is really the one we expect
$diff = &new diff($tmp['file1'], $tmp['file2']);
$diff = &new diff($tmp['file1'], $tmp['file2'], false);
$empty = $diff->is_empty();
unset($tmp, $diff);
@@ -897,7 +955,7 @@ class install_update extends module
);
// We need to diff the contents here to make sure the file is really the one we expect
$diff = &new diff($tmp['file1'], $tmp['file2']);
$diff = &new diff($tmp['file1'], $tmp['file2'], false);
$empty_1 = $diff->is_empty();
unset($tmp, $diff);
@@ -908,7 +966,7 @@ class install_update extends module
);
// We need to diff the contents here to make sure the file is really the one we expect
$diff = &new diff($tmp['file1'], $tmp['file2']);
$diff = &new diff($tmp['file1'], $tmp['file2'], false);
$empty_2 = $diff->is_empty();
unset($tmp, $diff);
@@ -938,12 +996,23 @@ class install_update extends module
}
// if the file is modified we try to make sure a merge succeed
$diff = &new diff3(file($this->old_location . $original_file), file($phpbb_root_path . $file), file($this->new_location . $original_file));
$tmp = array(
'file1' => file_get_contents($this->old_location . $original_file),
'file2' => file_get_contents($phpbb_root_path . $file),
'file3' => file_get_contents($this->new_location . $original_file),
);
$diff = &new diff3($tmp['file1'], $tmp['file2'], $tmp['file3'], false);
unset($tmp);
if ($diff->merged_output(false, false, false, true))
{
$update_ary['conflicts'] = $diff->_conflicting_blocks;
$update_list['conflict'][] = $update_ary;
unset($diff);
return;
}
@@ -953,7 +1022,7 @@ class install_update extends module
);
// now compare the merged output with the original file to see if the modified file is up to date
$diff = &new diff($tmp['file1'], $tmp['file2']);
$diff = &new diff($tmp['file1'], $tmp['file2'], false);
$empty = $diff->is_empty();
if ($empty)