<form id="install_update" method="post" action="{U_UPDATE_ACTION}">

<!-- ENDIF -->

<!-- ELSE -->

<dl>

<!-- ENDIF -->

<!-- ENDIF -->

<br />

<div class="errorbox">

<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>

</div>

<!-- ENDIF -->

<fieldset>

</dl>

<!-- END data -->

</fieldset>

<fieldset class="submit-buttons">

{S_HIDDEN_FIELDS}

<input class="button2" type="submit" name="check_again" value="{L_BACK}" />

<ul>

<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>

<li>[Fix] Missing read permission from calls to phpbb_chmod()</li>

</ul>

<a name="v303"></a><h3>1.ii. Changes since 3.0.3</h3>

*

* Example:

* <code>

* $rev = $diff->reverse();

* </code>

*

}

/**

*

* @param string $label1 the cvs file version/label from the original set of lines

* @param string $label2 the cvs file version/label from the new set of lines

* @param string $label_sep the explanation between label1 and label2 - more of a helper for the user

*

* @return mixed the merged output

*/

{

global $user;

$label1 = (!empty($user->lang[$label1])) ? $user->lang[$label1] : $label1;

$label2 = (!empty($user->lang[$label2])) ? $user->lang[$label2] : $label2;

$label_sep = (!empty($user->lang[$label_sep])) ? $user->lang[$label_sep] : $label_sep;

{

if ($edit->is_conflict())

{

}

else

{

}

}

}

continue;

}

'S_STATUS' => true,

'STATUS' => $status,

'L_STATUS' => $user->lang['STATUS_' . strtoupper($status)],

'TITLE' => $user->lang['FILES_' . strtoupper($status)],

'EXPLAIN' => $user->lang['FILES_' . strtoupper($status) . '_EXPLAIN'],

)

foreach ($filelist as $file_struct)

{

$diff_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check&amp;action=diff&amp;status=$status&amp;file=" . urlencode($file_struct['filename']));

'STATUS' => $status,

'FILENAME' => $filename,

default:

$diff = $this->return_diff($this->old_location . $original_filename, $phpbb_root_path . $file_struct['filename'], $this->new_location . $original_filename);

unset($diff);

break;

}

$status = request_var('status', '');

$file = request_var('file', '');

// First of all make sure the file is within our file update list with the correct status

$found_entry = array();

break;

$diff = $this->return_diff($this->old_location . $original_file, $phpbb_root_path . $file, $this->new_location . $original_file);

$tmp = array(

$this->page_title = 'VIEWING_FILE_CONTENTS';

break;

$diff = $this->return_diff($this->old_location . $original_file, $phpbb_root_path . $file, $this->new_location . $original_file);

$template->assign_vars(array(

'S_DIFF_CONFLICT_FILE' => true,

);

break;

}

unset($tmp);

{

// There is one special case... users having merged with a conflicting file... we need to check this

$tmp = array(

$tmp = array(

'file1' => file_get_contents($phpbb_root_path . $file),

);

// now compare the merged output with the original file to see if the modified file is up to date

}

}

'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', // Shown within the database update script at the end if called from the updater

'CONTINUE_UPDATE' => 'Continue update now', // Shown after file upload to indicate the update process is not yet finished

'CURRENT_VERSION' => 'Current version',

'DATABASE_TYPE' => 'Database type',

'DESTINATION' => 'Destination file',

'DIFF_INLINE' => 'Inline',

'DIFF_RAW' => 'Raw unified diff',

'DIFF_SIDE_BY_SIDE' => 'Side by Side',

'DIFF_UNIFIED' => 'Unified diff',

'DO_NOT_UPDATE' => 'Do not update this file',

'DOWNLOAD' => 'Download',

'DOWNLOAD_AS' => 'Download as',

'DOWNLOAD_UPDATE_METHOD_BUTTON' => 'Download modified files archive (recommended)',

'DOWNLOAD_UPDATE_METHOD' => 'Download modified files archive',

'DOWNLOAD_UPDATE_METHOD_EXPLAIN' => 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',

'MERGE_NO_MERGE_NEW_OPTION' => 'Do not merge - use new file',

'MERGE_NO_MERGE_MOD_OPTION' => 'Do not merge - use currently installed file',

'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_USERNAME' => 'New username',

'NO_AUTH_UPDATE' => 'Not authorised to update',

'NO_ERRORS' => 'No errors',

'TOPICS_TOPIC_TITLE' => 'Welcome to phpBB3',

));