Commit 9abbe8f7 authored by tbrehm's avatar tbrehm

- Added apache directives field.

- Updated ToDo list.
parent 4585cf2c
......@@ -11,6 +11,7 @@ Installer
--------------------------------------
- Load and update system config from file into sql database during installation.
- Add a function to let a server join a existing installation.
Server
......@@ -55,9 +56,6 @@ Sites (web) module
- Add a function to the Sites module to create SSL certificates or upload
existing SSL certs and SSL chain files. It might be a good idea to add
this as a new tab named "SSL" to the exiting domain settings form.
- Add a "httpd includes" field to the options tab of the domain settings form
like it is implemented in ISPConfig 2.
- Make sure that changes in the domain name do not break the configuration.
......@@ -68,6 +66,8 @@ BE-Designer module
WARNING: Please do not use the BE Designer at the moment, the serializing function
of the module editor may break some of the existing modules.
- Add a language file editor.
Remoting framework
--------------------------------------
......@@ -78,8 +78,9 @@ Interface
--------------------------------------
- Enhance the list function to allow soorting by column
- Enhance the paging in lists (e.g. like this: [1 2 3 4 ... 10])
- Use graphical Icons in the lists for on / off columns.
- Add a graphical delete button to the lists.
General tasks
......
......@@ -858,6 +858,7 @@ CREATE TABLE `web_domain` (
`ssl_cert` mediumtext NULL,
`ssl_bundle` mediumtext NULL,
`ssl_action` varchar(10) NULL,
`apache_directives` text,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
......
......@@ -339,6 +339,14 @@ $form["tabs"]['advanced'] = array (
'width' => '30',
'maxlength' => '255'
),
'apache_directives' => array (
'datatype' => 'TEXT',
'formtype' => 'TEXT',
'default' => '',
'value' => '',
'width' => '30',
'maxlength' => '255'
),
##################################
# ENDE Datatable fields
##################################
......
......@@ -33,4 +33,5 @@ $wb["client_txt"] = 'Client';
$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
$wb["apache_directives_txt"] = 'Apache directives';
?>
\ No newline at end of file
......@@ -10,7 +10,12 @@
<tr>
<td class="frmText11">{tmpl_var name='system_group_txt'}:</td>
<td class="frmText11"><input name="system_group" type="text" class="text" value="{tmpl_var name='system_group'}" size="30" maxlength="255"></td>
</tr> <tr>
</tr>
<tr>
<td class="frmText11">{tmpl_var name='apache_directives_txt'}:</td>
<td class="frmText11"><textarea name="apache_directives" class="text" rows="10" cols="30">{tmpl_var name='apache_directives'}</textarea></td>
</tr>
<tr>
<td class="frmText11">&nbsp;</td>
<td class="frmText11">&nbsp;</td>
</tr>
......@@ -19,6 +24,6 @@
<td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><div class="buttonEnding"></div>&nbsp;
<input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><div class="buttonEnding"></div>
</td>
</tr>
</table>
</tr>
</table>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
......@@ -55,6 +55,8 @@
</tmpl_loop>
</tmpl_if>
<tmpl_var name='apache_directives'>
</VirtualHost>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment