Commit 43492122 authored by Marius Burkard's avatar Marius Burkard

Merge branch '5858-aps-re-enable-ui' into 'develop'

Add option to re-enable APS (#5858)

Closes #5858

See merge request ispconfig/ispconfig3!1296
parents 2e4e4488 868e4d4f
...@@ -184,6 +184,12 @@ $form["tabs"]['sites'] = array ( ...@@ -184,6 +184,12 @@ $form["tabs"]['sites'] = array (
'default' => 'n', 'default' => 'n',
'value' => array(0 => 'n', 1 => 'y') 'value' => array(0 => 'n', 1 => 'y')
), ),
'show_aps_menu' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'default_webserver' => array ( 'default_webserver' => array (
'datatype' => 'INTEGER', 'datatype' => 'INTEGER',
'formtype' => 'SELECT', 'formtype' => 'SELECT',
......
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancelar'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancelar';
$wb['web_php_options_txt'] = 'Manipulador do php (Somente apache)'; $wb['web_php_options_txt'] = 'Manipulador do php (Somente apache)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Zrušit'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Zrušit';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -104,4 +104,7 @@ $wb['btn_cancel_txt'] = 'Abbrechen'; ...@@ -104,4 +104,7 @@ $wb['btn_cancel_txt'] = 'Abbrechen';
$wb['web_php_options_txt'] = 'PHP Handler (Nur Apache)'; $wb['web_php_options_txt'] = 'PHP Handler (Nur Apache)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -104,4 +104,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -104,4 +104,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -100,4 +100,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -103,4 +103,7 @@ $wb['btn_cancel_txt'] = 'Cancel'; ...@@ -103,4 +103,7 @@ $wb['btn_cancel_txt'] = 'Cancel';
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
$wb['client_protection_txt'] = 'Client protection'; $wb['client_protection_txt'] = 'Client protection';
$wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_support_messages_txt'] = 'Show message function in help module';
$wb['show_aps_menu_txt'] = 'Show APS menu';
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
?> ?>
...@@ -61,6 +61,12 @@ ...@@ -61,6 +61,12 @@
<div class="col-sm-9"> <div class="col-sm-9">
{tmpl_var name='reseller_can_use_options'} {tmpl_var name='reseller_can_use_options'}
</div> </div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='show_aps_menu_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='show_aps_menu'}&nbsp;{tmpl_var name='show_aps_menu_note_txt'}&nbsp;<a href="https://git.ispconfig.org/ispconfig/ispconfig3/-/issues/5676" target="_blank">{tmpl_var name='show_aps_menu_note_url_txt'}</a>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='web_php_options_txt'}</label> <label class="col-sm-3 control-label">{tmpl_var name='web_php_options_txt'}</label>
......
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