archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve the install confirmation page: dedicated button to download the

Browse source 
database.inc.php file.

git-svn-id: http://piwigo.org/svn/trunk@5571 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-04-02 13:05:53 +00:00
parent 783c21a8fd
commit e0317e195b
2 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
admin/themes/default/template/install.tpl
View file

@ -91,6 +91,16 @@ TD {
.sql_content, .infos a {
color: #ff3363;
}
.config_creation_failed {
text-align:left;
border:3px solid #F20D00;
color:#999;
margin:20px;
padding:0px 20px 5px 20px;
background-image:url(admin/themes/default/icon/errors.png);
background-repeat:no-repeat;
}
</style>
{/literal}
<title>Piwigo {$RELEASE} - {'Installation'|@translate}</title>
@ -104,6 +114,26 @@ TD {
<h2>Piwigo {$RELEASE} - {'Installation'|@translate}</h2>
{if isset($config_creation_failed)}
<div class="config_creation_failed">
<p style="margin-left:30px;">
<strong>{'Creation of config file local/config/database.inc.php failed.'|@translate}</strong>
</p>
<ul>
<li>
<p>{'You can download the config file and upload it to local/config directory of your installation.'|@translate}</p>
<p style="text-align:center">
<input type="button" value="{'Download the config file'|@translate}" onClick="window.open('{$config_url}');">
</p>
</li>
<li>
<p>{'An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'|@translate}</p>
<textarea rows="15" cols="70">{$config_file_content}</textarea>
</li>
</ul>
</div>
{/if}
{if isset($errors)}
<div class="errors">
<ul>

27
install.php
View file

@ -335,17 +335,13 @@ define(\'DB_COLLATE\', \'\');
@fputs($fh, $file_content, strlen($file_content));
@fclose($fh);
$error_copy = l10n('Creation of config file local/config/database.inc.php failed.');
$error_copy .= sprintf('<br><a href="install.php?dl=%s">%s</a> %s',
$tmp_filename,
l10n('You can download the config file'),
l10n('and upload it to local/config directory of your installation.')
$template->assign(
array(
'config_creation_failed' => true,
'config_url' => 'install.php?dl='.$tmp_filename,
'config_file_content' => $file_content,
)
);
$error_copy .= '<br><br>';
$error_copy .= l10n('An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)');
$error_copy .= '<br><br>';
$error_copy .= '<textarea rows="15" cols="70">' . $file_content . '</textarea>';
}
@fputs($fp, $file_content, strlen($file_content));
@fclose($fp);
@ -443,10 +439,10 @@ if ($step == 3)
{
$html_content = htmlentities( $file_content, ENT_QUOTES );
$html_content = nl2br( $html_content );
$error_copy = l10n('Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)');
$error_copy .= '<br>--------------------------------------------------------------------<br>';
$error_copy .= '<span class="sql_content">' . $html_content . '</span>';
$error_copy .= '<br>--------------------------------------------------------------------<br>';
$error_copy = l10n('An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)');
$error_copy .= '<br><br>';
$error_copy .= '<textarea rows="15" cols="70">'.$html_content.'</textarea>';
}
else
{
@ -462,7 +458,8 @@ if ($step == 3)
array(
'T_CONTENT_ENCODING' => 'utf-8',
'migration' => true
));
)
);
}
else
{