Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F802180
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sat, Feb 22, 7:42 AM
Size
5 KB
Mime Type
text/x-diff
Expires
Mon, Feb 24, 7:42 AM (4 h, 22 m)
Engine
blob
Format
Raw Data
Handle
573200
Attached To
rINP In-Portal
in-portal
View Options
Index: branches/5.1.x/core/install/step_templates/install_setup.tpl
===================================================================
--- branches/5.1.x/core/install/step_templates/install_setup.tpl (revision 14112)
+++ branches/5.1.x/core/install/step_templates/install_setup.tpl (revision 14113)
@@ -1,55 +1,55 @@
<tr class="table-color2">
<td colspan="2">
In order to use this installation tool, please identify yourself using the root password!
</td>
</tr>
<tr class="table-color2">
<td class="text">
<b>Username<span class="error"> *</span>:</b>
</td>
<td width="80%">
<input type="text" name="login" value="<?php echo $this->GetVar('login'); ?>" class="text" />
</td>
</tr>
<tr class="table-color2">
<td class="text">
<b>Password<span class="error"> *</span>:</b>
</td>
<td>
<input type="password" name="password" class="text" />
</td>
</tr>
<?php
ob_start();
?>
<tr class="%4$s">
<td colspan="2">
<input type="radio" value="%1$s" name="next_preset" id="next_preset_%1$s"%2$s><label for="next_preset_%1$s">%3$s</label></span>
</td>
</tr>
<?php
$option_tpl = ob_get_clean();
$options = Array (
'upgrade' => 'Upgrade In-Portal',
'clean_reinstall' => 'Reinstall In-Portal',
- 2 => 'Install In-Portal to a New Database',
+ 'fresh_install' => 'Install In-Portal to a New Database',
'update_license' => 'Update License Information',
'db_reconfig' => 'Update Database Configuration',
'fix_paths' => 'Update Installation Paths',
);
$upgradable_modules = $this->GetUpgradableModules();
if (!$upgradable_modules) {
unset($options['upgrade']);
}
$td_class = 'table-color1';
foreach ($options as $option_key => $option_title) {
$checked = $this->GetVar('next_preset') == $option_key ? ' checked' : '';
echo sprintf($option_tpl, $option_key, $checked, $option_title, $td_class);
$td_class = ($td_class == 'table-color1') ? 'table-color2' : 'table-color1';
}
?>
\ No newline at end of file
Index: branches/5.1.x/core/install/step_templates/db_config.tpl
===================================================================
--- branches/5.1.x/core/install/step_templates/db_config.tpl (revision 14112)
+++ branches/5.1.x/core/install/step_templates/db_config.tpl (revision 14113)
@@ -1,74 +1,77 @@
<tr class="table-color2">
- <td class="text"><b>Database Server Type <span class="error">*</span>:</b></td>
+ <td class="text"><b>Database Server Type<span class="error">*</span>:</b></td>
<td align="left">
<select name="DBType">
<?php
$options = Array ('mysql' => 'MySQL', /*'mssql' => 'MS-SQL Server', 'pgsql' => 'pgSQL'*/);
$option_tpl = '<option value="%1$s"%2$s>%3$s</option>'."\n";
foreach ($options as $option_key => $option_title) {
$selected = $option_key == $this->toolkit->getSystemConfig('Database', 'DBType') ? ' selected' : '';
echo sprintf($option_tpl, $option_key, $selected, $option_title);
}
?>
</select>
</td>
</tr>
<tr class="table-color2">
<td class="text"><b>Database Hostname <span class="error">*</span>:</b></td>
<td align="left">
<input type="text" name="DBHost" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBHost'); ?>" />
</td>
</tr>
<tr class="table-color2">
<td class="text"><b>Database Name <span class="error">*</span>:</b></td>
<td align="left">
<input type="text" name="DBName" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBName'); ?>" />
</td>
</tr>
<tr class="table-color2">
<td class="text"><b>Database User Name <span class="error">*</span>:</b></td>
<td align="left">
<input type="text" name="DBUser" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBUser'); ?>" />
</td>
</tr>
<tr class="table-color2">
<td class="text"><b>Database User Password:</b></td>
<td align="left">
<input type="password" name="DBUserPassword" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBUserPassword'); ?>" />
</td>
</tr>
<tr class="table-color2">
<td class="text"><b>Database Collation <span class="error">*</span>:</b></td>
<td align="left">
<select name="DBCollation" class="text">
<?php
$option_tpl = '<option value="%1$s"%2$s>%1$s</option>'."\n";
$collations = Array ('utf8_general_ci', 'latin1_swedish_ci');
foreach ($collations as $collation) {
$selected = ($collation == $this->toolkit->getSystemConfig('Database', 'DBCollation')) ? ' selected="selected"' : '';
echo sprintf($option_tpl, $collation, $selected);
}
?>
</select>
</td>
</tr>
<tr class="table-color2">
<td class="text"><b>Prefix for Table Names:</b></td>
<td align="left">
<input type="text" name="TablePrefix" class="text" maxlength="7" value="<?php echo $this->toolkit->getSystemConfig('Database', 'TablePrefix'); ?>" />
</td>
</tr>
+<?php if ($this->GetVar('preset') != 'already_installed') { ?>
+<!--show this option ONLY when config.php is empty or cant connect to In-Portal installation using current DB settings -->
<tr class="table-color2">
<td class="text" width="55%"><b>Use existing In-Portal installation in this Database:</b></td>
<td align="left">
<input type="radio" name="UseExistingSetup" id="UseExistingSetup_1" value="1"/> <label for="UseExistingSetup_1">Yes</label> <input type="radio" name="UseExistingSetup" id="UseExistingSetup_0" value="0" checked/> <label for="UseExistingSetup_0">No</label>
</td>
-</tr>
\ No newline at end of file
+</tr>
+<?php } ?>
\ No newline at end of file
Event Timeline
Log In to Comment