the file updater. This is in CVS but the file is not able to be used without the correct update packages - no need to try.

Please note that even if the file is now in CVS it does not mean we provide an update path from Beta2 to any other version. git-svn-id: file:///svn/phpbb/trunk@6349 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2006-09-02 14:34:20 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2006-09-02 14:34:20 +0000
commit: 64af84dc6b5f352f766940e70774907f240960e3 (patch)
tree: 52b0562a3701f1e21f38a6b85f5033a6c552e68c /phpBB/adm/style
parent: 609744041be8d00ab705b1cc4eec24fe717e15d9 (diff)
download: forums-64af84dc6b5f352f766940e70774907f240960e3.tar
forums-64af84dc6b5f352f766940e70774907f240960e3.tar.gz
forums-64af84dc6b5f352f766940e70774907f240960e3.tar.bz2
forums-64af84dc6b5f352f766940e70774907f240960e3.tar.xz
forums-64af84dc6b5f352f766940e70774907f240960e3.zip
2 files changed, 458 insertions, 0 deletions
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
new file mode 100644
index 0000000000..54e86ec788
--- /dev/null
+++ b/phpBB/adm/style/install_update.html
@@ -0,0 +1,278 @@
+<!-- INCLUDE install_header.html -->
+
+<!-- IF S_ERROR -->
+	<h1>{L_NOTICE}</h1>
+	<p style="color: red;">{ERROR_MSG}</p>
+<!-- ENDIF -->
+
+<!-- IF S_INTRO -->
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<h1>{L_UPDATE_INSTALLATION}</h1>
+	<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="submit" value="{L_NEXT}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_UPLOAD_SUCCESS -->
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<h1>{L_UPDATE_SUCCESS}</h1>
+	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES_AGAIN}" />
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- IF S_VERSION_CHECK -->
+
+	<h1>{L_VERSION_CHECK}</h1>
+
+	<p>{L_VERSION_CHECK_EXPLAIN}</p>
+
+	<!-- IF S_UP_TO_DATE -->
+		<div class="successbox">
+			<p>{L_VERSION_UP_TO_DATE}</p>
+		</div>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_VERSION_NOT_UP_TO_DATE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend></legend>
+	<dl>
+		<dt><label>{L_CURRENT_VERSION}</label></dt>
+		<dd><b>{CURRENT_VERSION}</b></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_LATEST_VERSION}</label></dt>
+		<dd><b>{LATEST_VERSION}</b></dd>
+	</dl>
+	</fieldset>
+
+	<!-- IF not S_UP_TO_DATE -->
+		<form id="install_update" method="post" action="{U_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_CHECK_FILES_EXPLAIN}</p>
+			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+		</fieldset>
+
+		</form>
+	<!-- ELSE -->
+		<form id="install_update" method="post" action="{U_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_CHECK_FILES_UP_TO_DATE}</p>
+			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+		</fieldset>
+
+		</form>
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_FILE_CHECK -->
+
+	<h1>{L_COLLECTED_INFORMATIONS}</h1>
+
+	<p>{L_COLLECTED_INFORMATIONS_EXPLAIN}</p>
+
+	<!-- IF S_NO_UPDATE_FILES -->
+		<div class="errorbox">
+			<h3>{L_NO_UPDATE_FILES}</h3>
+
+			<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
+
+			<strong>{NO_UPDATE_FILES}</strong>
+			
+		</div>
+	<!-- ENDIF -->
+
+	<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
+
+	<!-- IF .files -->
+		<!-- BEGIN files -->
+			<!-- IF files.S_STATUS -->
+				<!-- IF not files.S_FIRST_ROW -->
+					</fieldset>
+				<!-- ENDIF -->
+
+				<h2>{files.TITLE}</h2>
+
+				<p>{files.EXPLAIN}</p>
+
+				<!--table cellspacing="1">
+					<col class="row1" /><col class="row2" /><col class="row2" />
+				<tbody -->
+				<fieldset>
+					<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
+			<!-- ELSE -->
+				<dl>
+					<!-- IF files.STATUS eq 'up_to_date' -->
+						<dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd>
+					<!-- ELSE -->
+						<dt>
+							<strong>{files.FILENAME}</strong>
+							<!-- IF files.S_CUSTOM -->
+							<br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span>
+							<!-- ENDIF -->
+							<!-- IF files.NUM_CONFLICTS -->
+							<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
+							<!-- ENDIF -->
+						</dt>
+						<dd>[ <a href="{files.U_SHOW_DIFF}" target="diff">{files.L_SHOW_DIFF}</a> ]</dd>
+						<!-- IF files.S_CUSTOM -->
+							<dd><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" />&nbsp; {L_DO_NOT_UPDATE}</dd>
+						<!-- ENDIF -->
+						<!-- IF files.STATUS eq 'conflict' -->
+							<dd><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" />&nbsp; {L_MERGE_NEW_FILE_OPTION}<br /><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" />&nbsp; {L_MERGE_MOD_FILE_OPTION}</dd>
+						<!-- ENDIF -->
+					<!-- ENDIF -->
+				</dl>
+			<!-- ENDIF -->
+		<!-- END files -->
+
+		</fieldset>
+	<!-- ENDIF -->
+
+	<br />
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
+	</fieldset>
+
+	<br />
+
+	<!-- IF S_ALL_UP_TO_DATE -->
+		</form>
+
+		<!-- IF S_VERSION_UP_TO_DATE -->
+			<p>{L_NO_DATABASE_UPDATE_NEEDED}</p>
+		<!-- ELSE -->
+			<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+
+			<fieldset class="submit-buttons">
+				<p>{L_ALL_FILES_UP_TO_DATE}</p>
+				<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
+			</fieldset>
+		<!-- ENDIF -->
+
+	<!-- ELSE -->
+		<h1>{L_UPDATE_METHOD}</h1>
+
+		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
+
+		<fieldset class="submit-buttons">
+			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD}" />
+		</fieldset>
+
+	<!-- ENDIF -->
+
+	</form>
+
+<!-- ELSEIF S_DOWNLOAD_FILES -->
+
+	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
+
+	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
+
+	<p>{L_MAPPING_FILE_STRUCTURE}</p>
+
+	<table cellspacing="1">
+		<col class="row1" /><col class="row2" /><col class="row1" />
+	<thead>
+	<tr>
+		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
+		<th style="width: 2%">&nbsp;</th>
+		<th style="width: 49%">{L_DESTINATION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN location -->
+	<tr>
+		<td>{location.SOURCE}</td>
+		<td><strong>&raquo;</strong></td>
+		<td>{location.DESTINATION}</td>
+	</tr>
+	<!-- END location -->
+	</tbody>
+	</table>
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_DOWNLOAD_AS}</legend>
+	<dl>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dd>{RADIO_BUTTONS}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_FTP_UPLOAD -->
+
+	<h1>{L_SELECT_FTP_SETTINGS}</h1>
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<!-- IF S_CONNECTION_SUCCESS -->
+		<div class="successbox">
+			<p>{L_CONNECTION_SUCCESS}</p>
+		</div>
+	<!-- ELSEIF S_CONNECTION_FAILED -->
+		<div class="errorbox">
+			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_FTP_SETTINGS}</legend>
+	<dl>
+		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<dd><b>{UPLOAD_METHOD}</b></dd>
+	</dl>
+	<!-- BEGIN data -->
+	<dl>
+		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
+		<dd><input type="text" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
+	</dl>
+	<!-- END data -->
+	</fieldset>
+	
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
+		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
+		<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_DB_UPDATE -->
+
+	<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
+
+	<p>
+		{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
+		<br />
+		<a href="{U_DB_UPDATE}"><strong>&raquo; {L_RUN_DATABASE_SCRIPT} &laquo;</strong></a>
+	</p>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE install_footer.html -->
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
new file mode 100644
index 0000000000..293645788f
--- /dev/null
+++ b/phpBB/adm/style/install_update_diff.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="imagetoolbar" content="no" />
+<!-- IF META -->{META}<!-- ENDIF -->
+<title>{PAGE_TITLE}</title>
+
+<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+
+<style type="text/css">
+<!--
+
+#main {
+	font-size: 1.25em;
+	line-height: 0.7em;
+	margin: 0;
+	padding: 0;
+	width: 99%;
+}
+
+<!-- IF not S_DIFF_NEW_FILE -->
+
+/**
+* Unified Diff
+*/
+.file {
+	border: 1px solid #eee;
+	line-height: .7em;
+}
+
+.diff {
+	margin: 0;
+}
+
+.added {
+	background-color: #dfd;
+}
+
+.removed {
+	background-color: #fdd;
+}
+
+.info {
+	color: #888;
+}
+
+.context {
+	background-color: #eee;
+}
+
+/**
+* Inline Diff
+*/
+.ins {
+	background-color: #dfd;
+	text-decoration: underline;
+}
+
+.del {
+	background-color: #fdd;
+	text-decoration: line-through;
+}
+
+/**
+* Column Diff
+*/
+table.hrdiff {
+	width: 99%;
+	margin: 0 0 8px 5px;
+}
+
+table.hrdiff th {
+	text-align: left;
+	width: 50%;
+	color: #333;
+	font-family: Verdana,Helvetica,sans-serif;
+	font-size: 11px;
+	border-bottom: 1px solid #999;
+	background: transparent;
+}
+
+table.hrdiff thead th {
+	font-weight: bold;
+	font-size: 110%;
+	padding: 2px;
+}
+
+table.hrdiff tbody th {
+	padding: 2em 1px 1px 1px;
+	font-size: 80%;
+}
+
+table.hrdiff .unmodified {
+	background: #fff;
+}
+
+table.hrdiff .added {
+	background: #9f9;
+}
+
+table.hrdiff .added_empty {
+	background: #cfc;
+}
+
+table.hrdiff .modified {
+	background: #fd9;
+}
+
+table.hrdiff .removed {
+	background: #f99;
+}
+
+table.hrdiff .removed_empty {
+	background: #fcc;
+}
+
+table.hrdiff caption {
+	caption-side: top;
+	text-align: left;
+	margin: 0 0 8px 5px;
+	font-size: 90%;
+	font-weight: bold;
+	padding: 5px;
+}
+
+table.hrdiff caption span {
+	height: 10px;
+	width: 10px;
+	line-height: 10px;
+	letter-spacing: 10px;
+	border: 1px solid #000;
+	margin-left: 0.5em;
+	vertical-align: baseline;
+}
+
+<!-- ENDIF -->
+
+//-->
+</style>
+
+</head>
+
+<body>
+
+<div id="wrap">
+	<div id="page-header">
+<!-- IF S_DIFF_NEW_FILE -->
+		<h1>{L_VIEWING_FILE_CONTENTS}</h1>
+<!-- ELSE -->
+		<h1>{L_VIEWING_FILE_DIFF}</h1>
+<!-- ENDIF -->
+<!-- IF not S_DIFF_NEW_FILE -->
+		<br />
+		<form method="post">
+			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
+			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
+		</form>
+<!-- ENDIF -->
+	</div>
+	
+	<div id="page-body">
+		<div class="panel">
+			<span class="corners-top"><span></span></span>
+				<div id="content">
+					<div id="main">
+<!-- IF S_DIFF_CONFLICT_FILE -->
+		<div style="float: right;"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
+<!-- ENDIF -->
+					{DIFF_CONTENT}
+					</div>
+				</div>
+			<span class="corners-bottom"><span></span></span>
+		</div>
+	</div>
+	
+<!-- INCLUDE simple_footer.html -->
+\ No newline at end of file
author	Meik Sievertsen <acydburn@phpbb.com>	2006-09-02 14:34:20 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2006-09-02 14:34:20 +0000
commit	64af84dc6b5f352f766940e70774907f240960e3 (patch)
tree	52b0562a3701f1e21f38a6b85f5033a6c552e68c /phpBB/adm/style
parent	609744041be8d00ab705b1cc4eec24fe717e15d9 (diff)
download	forums-64af84dc6b5f352f766940e70774907f240960e3.tar forums-64af84dc6b5f352f766940e70774907f240960e3.tar.gz forums-64af84dc6b5f352f766940e70774907f240960e3.tar.bz2 forums-64af84dc6b5f352f766940e70774907f240960e3.tar.xz forums-64af84dc6b5f352f766940e70774907f240960e3.zip