Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.9.0",
"version": "2.0.0",
"name": "Virtualmin.name",
"description": "Virtualmin.description",
"authors": [
Expand All @@ -21,8 +21,19 @@
"group": "Virtualmin.module_group"
},
"email_tags": {
"module": ["host_name", "port"],
"package": ["template", "plan"],
"service": ["virtualmin_username", "virtualmin_password", "virtualmin_domain"]
}
}
"module": [
"host_name",
"port"
],
"package": [
"template",
"plan"
],
"service": [
"virtualmin_username",
"virtualmin_password",
"virtualmin_domain"
]
},
"icon": "bi-server"
}
1 change: 1 addition & 0 deletions config/virtualmin.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

Configure::set('Virtualmin.email_templates', [
'en_us' => [
'lang' => 'en_us',
Expand Down
2 changes: 2 additions & 0 deletions language/en_us/virtualmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
$lang['Virtualmin.tab_stats'] = "Statistics";
$lang['Virtualmin.tab_client_actions'] = "Actions";

$lang['Virtualmin.back_to_manage'] = 'Back';

// Module management
$lang['Virtualmin.add_module_row'] = "Add Server";
$lang['Virtualmin.add_module_group'] = "Add Server Group";
Expand Down
152 changes: 89 additions & 63 deletions views/default/add_row.pdt
Original file line number Diff line number Diff line change
@@ -1,63 +1,89 @@
<?php
$this->Widget->clear();
$this->Widget->setLinkButtons(array());
$this->Widget->create($this->_("Virtualmin.add_row.box_title", true));
?>
<div class="inner">
<?php
$this->Form->create();
$this->Form->fieldHidden("account_count", (isset($vars->account_count) ? $vars->account_count : 0));
?>
<div class="title_row first">
<h3><?php $this->_("Virtualmin.add_row.basic_title");?></h3>
</div>
<div class="pad">
<ul>
<li>
<?php
$this->Form->label($this->_("Virtualmin.row_meta.server_name", true), "server_name");
$this->Form->fieldText("server_name", (isset($vars->server_name) ? $vars->server_name : null));
?>
</li>
<li>
<?php
$this->Form->label($this->_("Virtualmin.row_meta.host_name", true), "host_name");
$this->Form->fieldText("host_name", (isset($vars->host_name) ? $vars->host_name : null));
?>
</li>
<li>
<?php
$this->Form->label($this->_("Virtualmin.row_meta.user_name", true), "user_name");
$this->Form->fieldText("user_name", (isset($vars->user_name) ? $vars->user_name : null));
?>
</li>
<li>
<?php
$this->Form->label($this->_("Virtualmin.row_meta.port", true), "port");
$this->Form->fieldText("port", (isset($vars->port) ? $vars->port : null));
?>
</li>
<li>
<?php
$this->Form->fieldCheckbox("use_ssl", "true", (isset($vars->use_ssl) ? $vars->use_ssl : "true") == "true", array('id'=>"use_ssl"));
$this->Form->label($this->_("Virtualmin.row_meta.use_ssl", true), "use_ssl", array('class'=>"inline"));
?>
</li>
<li>
<?php
$this->Form->label($this->_("Virtualmin.row_meta.password", true), "password");
$this->Form->fieldPassword("password", (isset($vars->password) ? $vars->password : null));
?>
</li>
</ul>
</div>


<div class="button_row"><a class="btn btn-primary float-right submit" href="#"><?php $this->_("Virtualmin.add_row.add_btn");?></a></div>
<?php
$this->Form->end();
?>
</div>
<?php
$this->Widget->end();
?>
<?php /** @var View $this **/ ?>

<?php
$this->Widget->clear();
$this->Widget->setLinkButtons([
[
'name' => $this->_('Virtualmin.back_to_manage', true),
'icon' => 'bi bi-arrow-left me-1',
'attributes' => ['href' => $this->base_uri . 'settings/company/modules/manage/' . $module->id],
],
]);
$this->Widget->create($this->_('Virtualmin.add_row.box_title', true));

$this->Form->create(null, ['class' => 'disable-on-submit']);
$this->Form->fieldHidden('account_count', $vars->account_count ?? 0);
?>

<h6 class="form-section-header"><?php $this->_('Virtualmin.add_row.basic_title'); ?></h6>

<div class="mb-3">
<label for="server_name" class="form-label">
<?php $this->_('Virtualmin.row_meta.server_name'); ?>
</label>
<?php $this->Form->fieldText('server_name', $vars->server_name ?? null, [
'id' => 'server_name',
'class' => 'form-control',
]); ?>
</div>

<div class="mb-3">
<label for="host_name" class="form-label">
<?php $this->_('Virtualmin.row_meta.host_name'); ?>
</label>
<?php $this->Form->fieldText('host_name', $vars->host_name ?? null, [
'id' => 'host_name',
'class' => 'form-control',
]); ?>
</div>

<div class="mb-3">
<label for="user_name" class="form-label">
<?php $this->_('Virtualmin.row_meta.user_name'); ?>
</label>
<?php $this->Form->fieldText('user_name', $vars->user_name ?? null, [
'id' => 'user_name',
'class' => 'form-control',
]); ?>
</div>

<div class="mb-3">
<label for="port" class="form-label">
<?php $this->_('Virtualmin.row_meta.port'); ?>
</label>
<?php $this->Form->fieldText('port', $vars->port ?? null, ['id' => 'port', 'class' => 'form-control']); ?>
</div>

<div class="mb-3">
<div class="form-check">
<?php $this->Form->fieldCheckbox('use_ssl', 'true', ($vars->use_ssl ?? 'true') == 'true', [
'id' => 'use_ssl',
'class' => 'form-check-input',
]); ?>
<label for="use_ssl" class="form-check-label">
<?php $this->_('Virtualmin.row_meta.use_ssl'); ?>
</label>
</div>
</div>

<div class="mb-3">
<label for="password" class="form-label">
<?php $this->_('Virtualmin.row_meta.password'); ?>
</label>
<?php $this->Form->fieldPassword('password', $vars->password ?? null, [
'id' => 'password',
'class' => 'form-control',
]); ?>
</div>

<?php $this->Widget->footer(); ?>
<div class="d-flex justify-content-end">
<a class="btn btn-primary submit" href="#"><?php $this->_('Virtualmin.add_row.add_btn'); ?></a>
</div>

<?php
$this->Form->end();
$this->Widget->end();


?>
98 changes: 64 additions & 34 deletions views/default/admin_service_info.pdt
Original file line number Diff line number Diff line change
@@ -1,35 +1,65 @@
<table class="table">
<tr class="heading_row">
<td class="fixed_small center border_none"><i class="fas fa-share fa-flip-vertical"></i></td>
<td class="border_left"><?php $this->_("Virtualmin.service_info.username");?></td>
<td><?php $this->_("Virtualmin.service_info.password");?></td>
<td><?php $this->_("Virtualmin.service_info.server");?></td>
<td class="last"><?php $this->_("Virtualmin.service_info.options");?></td>
</tr>
<tr>
<td></td>
<td><?php echo (isset($service_fields->virtualmin_username) ? $this->Html->safe($service_fields->virtualmin_username) : null);?></td>
<td><?php echo (isset($service_fields->virtualmin_password) ? $this->Html->safe($service_fields->virtualmin_password) : null);?></td>
<td><?php echo (isset($module_row->meta->host_name) ? $this->Html->safe($module_row->meta->host_name) : null);?></td>
<td>
<?php
$this->Form->create($this->Html->safe(((isset($module_row->meta->use_ssl) ? $module_row->meta->use_ssl : null) == 'true' ? "https://" : "http://") . (isset($module_row->meta->host_name) ? $module_row->meta->host_name : null) . ":".(isset($module_row->meta->port) ? $module_row->meta->port : null)), array('target' => "_blank"));
$this->Form->fieldHidden("user", (isset($service_fields->virtualmin_username) ? $service_fields->virtualmin_username : null));
$this->Form->fieldHidden("password", (isset($service_fields->virtualmin_password) ? $service_fields->virtualmin_password : null));
?>
<a id="virtualmin_login<?php echo (isset($service->id) ? $this->Html->safe($service->id) : null);?>" href="#"><?php $this->_("Virtualmin.service_info.option_login");?></a>
<?php
$this->Form->end();
?>
</td>
</tr>
</table>
<script type="text/javascript">
$(document).ready(function() {
$('#virtualmin_login<?php echo (isset($service->id) ? $this->Html->safe($service->id) : null);?>').click(function(e) {
e.preventDefault();
<?php /** @var View $this **/ ?>

$(this).closest('form').submit();
});
});
</script>
<table class="table">
<thead>
<tr>
<th><i class="bi bi-share"></i></th>
<th><?php $this->_('Virtualmin.service_info.username'); ?></th>
<th><?php $this->_('Virtualmin.service_info.password'); ?></th>
<th><?php $this->_('Virtualmin.service_info.server'); ?></th>
<th><?php $this->_('Virtualmin.service_info.options'); ?></th>
</tr>
</thead>
<tbody>
<tr>
<td></td>
<td><?php echo isset($service_fields->virtualmin_username)
? $this->Html->safe($service_fields->virtualmin_username)
: null; ?></td>
<td><?php echo isset($service_fields->virtualmin_password)
? $this->Html->safe($service_fields->virtualmin_password)
: null; ?></td>
<td><?php echo isset($module_row->meta->host_name)
? $this->Html->safe($module_row->meta->host_name)
: null; ?></td>
<td>
<?php
$this->Form->create(
$this->Html->safe(
((isset($module_row->meta->use_ssl) ? $module_row->meta->use_ssl : null) == 'true'
? 'https://'
: 'http://') .
(isset($module_row->meta->host_name) ? $module_row->meta->host_name : null) .
':' .
(isset($module_row->meta->port) ? $module_row->meta->port : null),
),
['target' => '_blank'],
);
$this->Form->fieldHidden(
'user',
isset($service_fields->virtualmin_username) ? $service_fields->virtualmin_username : null,
);
$this->Form->fieldHidden(
'password',
isset($service_fields->virtualmin_password) ? $service_fields->virtualmin_password : null,
);
?>
<a id="virtualmin_login<?php echo isset($service->id)
? $this->Html->safe($service->id)
: null; ?>" href="#"><?php $this->_('Virtualmin.service_info.option_login'); ?></a>
<?php $this->Form->end(); ?>
</td>
</tr>
</tbody>
</table>
<script type="text/javascript">
document.addEventListener('DOMContentLoaded', function() {
document.getElementById('virtualmin_login<?php echo isset($service->id)
? $this->Html->safe($service->id)
: null; ?>').addEventListener('click', function(e) {
e.preventDefault();

this.closest('form').submit();
});
});
</script>
Loading