makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-13 06:48:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

some tiny changes

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6656 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-11-26 12:22:56 +00:00
parent 870a3a1d8a
commit 52717466fb
5 changed files with 71 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
phpBB/adm/style/install_update.html
View file

@ -1,5 +1,15 @@
<!-- INCLUDE install_header.html -->
<script type="text/javascript">
<!--
function popup(url, width, height)
{
window.open(url.replace(/&amp;/g, '&'), '_popup', 'height=' + height + ',resizable=yes,scrollbars=yes,width=' + width);
return false;
}
//-->
</script>
<!-- IF S_ERROR -->
<h1>{L_NOTICE}</h1>
<p style="color: red;">{ERROR_MSG}</p>
@ -110,9 +120,6 @@
<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 -->
@ -129,7 +136,7 @@
<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
<!-- ENDIF -->
</dt>
<dd>[ <a href="{files.U_SHOW_DIFF}" onclick="popup({files.UA_SHOW_DIFF}, 700, 500);">{files.L_SHOW_DIFF}</a> ]</dd>
<dd>[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{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 -->
@ -185,6 +192,25 @@
<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
<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>
<br /><br />
<p>{L_MAPPING_FILE_STRUCTURE}</p>
<table cellspacing="1">
@ -207,23 +233,6 @@
</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>

3
phpBB/install/database_update.php
View file

@ -301,6 +301,9 @@ $database_update_info = array(
GROUPS_TABLE => array(
'group_founder_manage' => array('BOOL', 0),
),
USERS_TABLE => array(
'user_pass_convert' => array('BOOL', 0),
),
),
),
// Latest version

34
phpBB/install/install_update.php
View file

@ -58,6 +58,9 @@ class install_update extends module
var $latest_version;
var $current_version;
// Set to false
var $test_update = false;
function install_update(&$p_master)
{
$this->p_master = &$p_master;
@ -93,7 +96,9 @@ class install_update extends module
include_once($phpbb_root_path . 'includes/diff/diff.' . $phpEx);
// Check for user session
/**
* Check for user session
* - commented out for beta3 with "broken" install check routine
if (!$user->data['is_registered'])
{
login_box('', $user->lang['LOGIN_UPDATE_EXPLAIN']);
@ -103,6 +108,7 @@ class install_update extends module
{
trigger_error($user->lang['NO_AUTH_UPDATE']);
}
*/
// If we are within the intro page we need to make sure we get up-to-date version info
if ($sub == 'intro')
@ -164,6 +170,20 @@ class install_update extends module
return;
}
// Got the updater template itself updated? If so, we are able to directly use it - but only if all three files are present
if (in_array('adm/style/install_update.html', $this->update_info['files']))
{
$this->tpl_name = '../../install/update/new/adm/style/install_update';
}
// What about the language file? Got it updated?
if (in_array('language/en/install.php', $this->update_info['files']))
{
$lang = array();
include('./update/new/language/en/install.php');
$user->lang = array_merge($user->lang, $lang);
}
// Make sure we stay at the file check if checking the files again
if (!empty($_POST['check_again']))
{
@ -670,7 +690,7 @@ class install_update extends module
$status = request_var('status', '');
$file = request_var('file', '');
$diff_mode = request_var('diff_mode', 'side_by_side');
$diff_mode = request_var('diff_mode', 'inline');
// First of all make sure the file is within our file update list with the correct status
$found_entry = array();
@ -684,7 +704,7 @@ class install_update extends module
if (empty($found_entry))
{
trigger_error('File not allowed to be diffed', E_USER_ERROR);
trigger_error($user->lang['FILE_DIFF_NOT_ALLOWED'], E_USER_ERROR);
}
// If the status is 'up_to_date' then we do not need to show a diff
@ -947,6 +967,11 @@ class install_update extends module
$info = explode("\n", $info);
$info = trim($info[0]);
}
if ($this->test_update !== false)
{
$info = $this->test_update;
}
break;
case 'update_info':
@ -963,7 +988,7 @@ class install_update extends module
// Adjust the update info file to hold some specific style-related information
$info['custom'] = array();
// Get custom installed styles...
/* Get custom installed styles...
$sql = 'SELECT template_name, template_path
FROM ' . STYLES_TEMPLATE_TABLE . "
WHERE template_name NOT IN ('subSilver', 'BLABLA')";
@ -990,6 +1015,7 @@ class install_update extends module
}
}
}
*/
}
break;

1
phpBB/language/en/install.php
View file

@ -325,6 +325,7 @@ $lang = array_merge($lang, array(
'ERROR' => 'Error',
'FILE_ALREADY_UP_TO_DATE' => 'File is already up to date',
'FILE_DIFF_NOT_ALLOWED' => 'File not allowed to be diffed',
'FILE_USED' => 'Information used from', // Single file
'FILES_CONFLICT' => 'Conflict files',
'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified the them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.',