Compare commits

...

6 Commits

Author SHA1 Message Date
John Crisp
6cc847b6b1 Log files - Bug reports - Config reports 2025-05-20 13:56:26 +02:00
John Crisp
12f8be6936 Local networks plus a few tweaks 2025-05-19 17:27:13 +02:00
John Crisp
12ea3b7c0b Domains plus a few tweaks 2025-05-19 01:12:51 +02:00
John Crisp
76fc62002e More domains 2025-05-19 00:39:15 +02:00
John Crisp
85d5927cd7 Domains nearly done and a few tweaks 2025-05-19 00:19:42 +02:00
John Crisp
266d8b279c Hosts done and a few tweaks 2025-05-18 22:58:06 +02:00
29 changed files with 1168 additions and 992 deletions

View File

@@ -5,94 +5,127 @@
<div class="card-body">
% if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
(DBG)trt: <%= $bugr_datas->{trt} %><br>
</p>
<div>
(DBG)route: <%= $c->current_route %><br>
(DBG)trt: <%= $bugr_datas->{trt} %><br>
</div>
% }
<h1><%= $title %></h1>
<!--br><%= $modul %><br-->
<b>
%=l ('bugr_DO_NOT_PANIC')
</b>
<p>
%=l ('bugr_SME_EXPERIENCE')
</p>
<p>
%=l ('bugr_USE_TEMPLATE')
: <a href="https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs"
target="_blank">https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs</a>.
</p>
<p>
%=l ('bugr_PLEASE_REPORT_HERE')
: <a href="https://bugs.koozali.org" target="_blank">https://bugs.koozali.org</a>.
</p>
<p>
%=l ('bugr_FOLLOWING_REPORT_MIGHT_HELP')
</p>
<p>
%=l ('bugr_REPORT_CONTENT')
<br>
<br>
<h2><%= l ('bugr_DO_NOT_PANIC') %></h2>
<br>
<div>
<%= l ('bugr_SME_EXPERIENCE') %>
</div>
<br>
<div>
<%= l ('bugr_USE_TEMPLATE') %>
: <a href="https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs"
target="_blank">https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs</a>
</div>
<br>
<div>
<%= l ('bugr_PLEASE_REPORT_HERE') %>
: <a href="https://bugs.koozali.org"
target="_blank">https://bugs.koozali.org</a>
</div>
<br>
<div>
<%= l ('bugr_FOLLOWING_REPORT_MIGHT_HELP') %>
</div>
<br>
<div>
<%= l ('bugr_REPORT_CONTENT') %>
<br><br>
<ul>
<li>
%=l ('bugr_SME_VERSION')
</li>
<li>
%=l ('bugr_SERVER_MODE')
</li>
<li>
%=l ('bugr_PREVIOUS_SERVER_MODE')
</li>
<li>
%=l ('bugr_KERNEL_AND_ARCH')
</li>
<li>
%=l ('bugr_INSTALLED_RPMS')
</li>
<li>
%=l ('bugr_ALTERED_TEMPLATES')
</li>
<li>
%=l ('bugr_ALTERED_EVENTS')
</li> <li>
%=l ('bugr_YUM_REPOS')
</li>
<br>
<li>
<%= l ('bugr_SME_VERSION') %>
</li>
<li>
<%= l ('bugr_SERVER_MODE') %>
</li>
<li>
<%= l ('bugr_PREVIOUS_SERVER_MODE') %>
</li>
<li>
<%= l ('bugr_KERNEL_AND_ARCH') %>
</li>
<li>
<%= l ('bugr_INSTALLED_RPMS') %>
</li>
<li>
<%= l ('bugr_ALTERED_TEMPLATES') %>
</li>
<li>
<%= l ('bugr_ALTERED_EVENTS') %>
</li> <li>
<%= l ('bugr_YUM_REPOS') %>
</li>
</ul>
%=l ('bugr_PRIVACY')
</p>
<% my $btn = l('bugr_CREATE_REPORT'); %>
%= form_for 'bugreport' => (method => 'POST') => begin
%= submit_button "$btn", class => ""
% end
<p><b>
%=l ('bugr_DONATING')
</b>
<br><br>
%=l ('bugr_AWARE_SME')
<br><br>
<b>
%=l ('bugr_YOUR_HELP')
</b>
<br><br>
%=l ('bugr_CONSIDER_DONATING')
<br><br>
</p>
%= link_to 'https://wiki.koozali.org/Donate' => begin
%= image '/images/btn_donateCC_LG.gif'
%= hidden_field 'trt' => $bugr_datas->{trt}
% end
</div>
<br>
%=l ('bugr_THANK_YOU')
<div>
<%= l ('bugr_PRIVACY') %>
</div>
<br>
% my $btn = l('bugr_CREATE_REPORT');
<form action="/smanager/bugreport" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $bugr_datas->{trt} %>
</form>
<br>
<div>
<b>
<%= l ('bugr_DONATING') %>
</b>
<br><br>
<%= l ('bugr_AWARE_SME') %>
<br><br>
<b>
<%= l ('bugr_YOUR_HELP') %>
</b>
<br><br>
<%= l ('bugr_CONSIDER_DONATING') %>
<br><br>
</div>
<br>
<div>
<a href="https://wiki.koozali.org/Donate"
target="_blank">
<img src="/smanager/images/btn_donateCC_LG.gif" />
</a>
</div>
<br>
<div>
<a href="https://wiki.koozali.org/Donate"
target="_blank">Donate
</a>
</div>
<br>
<div>
<%= l ('bugr_THANK_YOU') %>
</div>
</div>

View File

@@ -5,10 +5,10 @@
<div class="card-body">
% if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
(DBG)trt: <%= $bugr_datas->{trt} %><br>
</p>
<div>
(DBG)route: <%= $c->current_route %><br>
(DBG)trt: <%= $bugr_datas->{trt} %><br>
</div>
% }
<h1><%= $title %></h1>
@@ -17,17 +17,25 @@
<% my $btn = l('bugr_Download this report'); %>
%= form_for 'bugreportD' => (method => 'POST') => begin
%= submit_button "$btn", class => ""
%= hidden_field 'trt' => $bugr_datas->{trt}
% end
<form action="/smanager/bugreportD" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $bugr_datas->{trt} %>
</form>
% my $out = "================== <br />";
% $out .= "Boot anaysis image (right click and save image to download)<br />";
% $out .= "================== <br />";
% $out .= "<img src='images/boot.svg' alt='boot timing image' width=95% >";
<br><%= $c->render_to_string(inline=>$out) %><br>
<br>
<%= $c->render_to_string(inline=>$out) %>
<br><br>
</div>

View File

@@ -6,8 +6,8 @@
% if (config->{debug} == 1) {
<div>
%= dumper $c->current_route
%= dumper $dom_datas
<%= dumper $c->current_route %>
<%= dumper $dom_datas %>
</div>
% }

View File

@@ -21,7 +21,7 @@
%= include 'common_js'
%= include 'common_css'
<!-- Custom overrides js/css? -->
<!-- This needs refining - do contribs add in their own stuff?? -->
<!-- This needs refining -->
@@ -57,7 +57,7 @@
<!--begin::Header-->
<nav id="koozali_grad" class="app-header navbar navbar-expand bg-success-subtle" data-bs-theme="light">
<!--begin::Container-->
<div class="container-fluid">
<!--begin::Start Navbar Links-->
@@ -68,10 +68,10 @@
<i class="bi bi-list"></i>
</a>
</li>
<li class="nav-item d-none d-md-block"><a href="/smanager" class="nav-link">Home</a></li>
% if ( not defined $c->session->{username} ) {
<li class="nav-item d-none d-md-block"><a href="login" class="nav-link">Login</a></li>
<li class="nav-item d-none d-md-block"><a href="login" class="nav-link">Login</a></li>
% } else {
<li class="nav-item d-none d-md-block"><a href="logout" class="nav-link">Logout</a></li>
% }
@@ -80,12 +80,12 @@
</li>
</ul>
<!--end::Start Navbar Links-->
<!-- this can do direct to header so always available-->
% if ($c->is_logged_in && scalar @{SrvMngr::theme_list( $c )} > 1) {
%= include 'partials/_swt_theme'
% }
</div>
<!--end::Container-->
</nav>
@@ -112,23 +112,23 @@
<!--end::Brand Link-->
</div>
<!--end::Sidebar Brand-->
<!--begin::Sidebar Wrapper-->
<div class="sidebar-wrapper navbar-nav-scroll">
<nav class="mt-2">
<!--begin::Sidebar Menu-->
<ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menu" data-accordion="false">
%= include 'partials/_sidebar_support_menu'
% if ( $c->is_logged_in ) {
%= include 'partials/_sidebar_user_menu'
% }
% if ( $c->is_admin ) {
%= include 'partials/_sidebar_main_menu'
% }
</ul>
<!--end::Sidebar Menu-->
</nav>
@@ -142,10 +142,10 @@
<!--begin::App Main-->
<main class="app-main">
<!-- Can add a header row here? -->
<!-- %= include 'partials/_app_content_header' -->
<!--begin::App Content-->
<div class="app-content">
<!--begin::Container-->
@@ -153,16 +153,16 @@
<!--begin::Rows-->
<!-- Add breadcrumb here -->
%= include 'partials/_app_content_breadcrumb'
<!-- We can add extra rows in the main panel here -->
<!-- %#= include 'partials/_app_content_first_row' -->
<!-- %#= include 'partials/_app_content_demo_row' -->
<!--end::Rows-->
<!-- <br> -->
<!-- This is the main page content depening on the calling module -->
<!-- nameofpanel.html.ep -->
<!-- That will also include it's own _partials -->
@@ -171,17 +171,17 @@
%= include 'partials/_panel_card_top'
%= include 'partials/_panel_card_header'
% }
%= content 'module'
% if ($c->current_route ne 'login') {
%= include 'partials/_panel_card_footer'
%= include 'partials/_panel_card_bottom'
% }
% }
</div>
</div>
<!--end::App Content-->
</main>
<!--end::App Main-->

View File

@@ -5,16 +5,17 @@
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")
%= dumper $c->param("localnetwork");
%= dumper $c->stash("ln_datas");
%= dumper $c->param("deletehost");
</p>
<div>
<%= dumper $c->current_route %>
<%= dumper $c->stash("ret") %>
<%= dumper $c->param("localnetwork") %>
<%= dumper $c->stash("ln_datas") %>
<%= dumper $c->param("deletehost") %>
</div>
% }
<h1><%= $title%></h1>
%= $modul
% if ($ln_datas->{trt} eq 'ADD') {
@@ -30,4 +31,5 @@
%}
</div>
%end

View File

@@ -1,29 +1,38 @@
<div>
% my $btn = l('REMOVE');
%= form_for '/domains2' => (method => 'POST') => begin
<p>
<h2>
%=l 'dom_REMOVE_TITLE'
</h2>
</p>
% my $btn = l('REMOVE');
<p>
%= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description});
</p>
<p><b>
%= l('dom_ABOUT_TO_REMOVE')
<b></p>
<form action="/smanager/domain2" method="POST">
<p>
<br>
%= submit_button "$btn", class => ""
</p>
<br>
%= hidden_field 'trt' => $dom_datas->{trt}
%= hidden_field 'Domain' => $dom_datas->{domain}
<div>
<h2><%=l 'dom_REMOVE_TITLE' %></h2>
</div>
% end
<br>
<div>
<%= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description}); %>
</div>
<br>
<div class="text-danger">
<%= l('dom_ABOUT_TO_REMOVE') %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-danger"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $dom_datas->{trt} %>
<%= hidden_field 'Domain' => $dom_datas->{domain} %>
</form>
</div>

View File

@@ -1,127 +1,123 @@
<div>
% my $btn = l('dom_ADD_DOMAIN');
<%= l('dom_FORM_DESCRIPTION'); %>
%= form_for '/domains' => (method => 'POST') => begin
%= l('dom_FORM_DESCRIPTION');
<p>
<form action="/smanager/domains" method="POST">
<br>
%= submit_button "$btn", class => ""
</p>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
</div>
<%= hidden_field 'trt' => 'ADD' %>
</form>
%= hidden_field 'trt' => 'ADD'
% end
<br>
<div>
<h2><%=l 'dom_CURRENT_DOMAINS' %></h2>
</div>
<br>
<h2>
%=l 'dom_CURRENT_DOMAINS'
</h2>
<table class="table table-bordered">
<thead>
<tr>
<th class="">
%=l 'DOMAIN_NAME'
</th>
<th class="">
%=l 'DESCRIPTION_BRIEF'
</th>
<th class="">
%=l 'dom_CONTENT'
</th>
<th class="">
%=l 'dom_LABEL_NAMESERVERS'
</th>
<th class="">
%=l 'ACTION'
</th>
</tr>
</thead>
<tbody>
<thead>
<tr>
<th class="col-sm"><%=l 'DOMAIN_NAME' %></th>
<th class="col-sm"><%=l 'DESCRIPTION_BRIEF' %></th>
<th class="col-sm"><%=l 'dom_CONTENT' %></th>
<th class="col-sm"><%=l 'dom_LABEL_NAMESERVERS'%></th>
<th class="col-sm user-valign-center" colspan="2"><%=l 'ACTION' %></th>
</tr>
</thead>
% foreach my $domain ( @$domains ) {
<tr>
%= t td => (class => "") => $domain->{Domain}
%= t td => (class => "") => $domain->{'Description'}
%= t td => (class => "") => $domain->{'Content'}
%= t td => (class => "") => l('dom_' . $domain->{'Nameservers'})
<tbody>
%# my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
%my $modify_text = l('MODIFY'); # Localized text
%my $csrf_token = "TOKEN"; # CSRF token for security
%my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure
%my $actionModify = qq{
% <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
% <button type='button' class="" title='$modify_text' >
% $modify_text
% </button>
% </a>
%};
%my $removable = ($domain->{Removable} || 'yes');
%my $actionRemove = '&nbsp;';
%if ($removable eq 'yes') {
%my $remove_text = l('REMOVE'); # Localized text
%my $csrf_token = "TOKEN"; # CSRF token for security
%my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure
%$actionRemove = qq{
% <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
% <button type='button' class="" title='$remove_text' >
% $remove_text
% </button>
% </a>
% foreach my $domain ( @$domains ) {
<tr>
<td><%= $domain->{Domain} %></td>
<td><%= $domain->{'Description'} %></td>
<td><%= $domain->{'Content'} %></td>
<td><%= l('dom_' . $domain->{'Nameservers'}) %></td>
%# my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
% my $modify_text = l('MODIFY'); # Localized text
% my $csrf_token = "TOKEN"; # CSRF token for security
% my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure
% my $actionModify = qq{
% <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% $modify_text
% </button>
% </a>
%};
%# $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
%};
<td class="" style="min-width:15em">
<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
</td>
</tr>
% }
% my $removable = ($domain->{Removable} || 'yes');
% my $actionRemove = '&nbsp;';
% if ($removable eq 'yes') {
% my $remove_text = l('REMOVE'); # Localized text
% my $csrf_token = "TOKEN"; # CSRF token for security
% my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure
% $actionRemove = qq{
% <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
%# $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
%};
<td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
</tr>
% }
</tbody>
</tbody>
</table>
%= hidden_field 'trt' => 'ADD'
<%= hidden_field 'trt' => 'ADD' %>
%= form_for '/domains' => (method => 'POST') => begin
<form action="/smanager/domains" method="POST">
<!-- <HR class="">-->
<br>
% my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS');
<h3>
%= l 'dom_DESC_CORPORATE_DNS_CURRENT'
</h3>
<h3><%= l 'dom_DESC_CORPORATE_DNS_CURRENT' %></h3>
<p>
<span class="">
%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
</span>
<span class="">
%= $dom_datas->{forwarder}
</span>
</p>
% if ($dom_datas->{forwarder2}) {
<p>
<span class="">
%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
</span>
<span class="">
%= $dom_datas->{forwarder2}
</span>
</p>
% if ($dom_datas->{forwarder}) {
<div class="row g-3 align-items-center">
<div class="col-md-3">
<%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %>
</div>
<div class="col-auto">
<%= $dom_datas->{forwarder} %>
</div>
</div>
% }
<p>
%= submit_button "$btn2", class => ""
</p>
%= hidden_field 'trt' => 'UP2'
% end
% if ($dom_datas->{forwarder2}) {
<div class="row g-3 align-items-center">
<div class="col-md-3">
<%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %>
</div>
<div class="col-auto">
<%= $dom_datas->{forwarder2} %>
</div>
</div>
% }
<br>
<div class="row g-3 align-items-center">
<div class="col-md-auto">
<button type="submit" class="btn btn-primary"><%= $btn2 %></button>
</div>
</div>
<%= hidden_field 'trt' => 'UP2' %>
</form>
</div>

View File

@@ -1,39 +1,46 @@
<div>
% my $btn = l('SAVE');
% my $btn = l('SAVE');
%= form_for '/domains2' => (method => 'POST') => begin
<form action="/smanager/domains2" method="POST">
<p><br>
%=l 'dom_DESC_CORPORATE_DNS'
</p>
<div>
<%=l 'dom_DESC_CORPORATE_DNS' %>
</div>
<p>
<span class="">
%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
</span>
<span class="">
% param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
%= text_field 'Forwarder', class => ""
</span>
</p>
<br>
<p>
<span class="">
%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY', class => ""
</span>
<span class="">
% param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
%= text_field 'Forwarder2', class => ""
</span>
</p>
<div class="row g-3 align-items-center">
<div class="col-md-3">
<label for="inputCorpDNSPrimary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %></label>
</div>
<div class="col-auto">
% param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
<input type="text" name="Forwarder" id="inputCorpDNSPrimary" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{forwarder} %>">
</div>
</div>
<p>
%= submit_button "$btn", class => ""
</p>
<br>
%= hidden_field 'trt' => $dom_datas->{trt}
%end
<div class="row g-3 align-items-center">
<div class="col-md-3">
<label for="inputCorpDNSSecondary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %></label>
</div>
<div class="col-auto">
% param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
<input type="text" name="Forwarder2" id="inputCorpDNSSecondary" class="form-control" aria-describedby="inputCorpDNSSecondary" value="<%= $dom_datas->{forwarder2} %>">
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $dom_datas->{trt} %>
</form>
</div>

View File

@@ -1,74 +1,88 @@
<div>
% my $btn = l('ADD');
% my $btn = l('ADD');
%= form_for '/domains2' => (method => 'POST') => begin
<p>
<h2>
% if ( $dom_datas->{trt} eq "ADD" ) {
%=l 'dom_CREATE_TITLE'
% } else {
%=l 'dom_MODIFY_TITLE'
% $btn = l('MODIFY');
% }
</h2>
</p>
<form action="/smanager/domains2" method="POST">
<p><br>
<span class="">
%=l 'DOMAIN_NAME', class => ""
</span>
<span class="">
% if ( $dom_datas->{trt} eq "ADD" ) {
% param 'Domain' => $dom_datas->{domain} unless param 'Domain';
%= text_field 'Domain', class => ""
% } else {
%= hidden_field 'Domain' => $dom_datas->{domain}
%= $dom_datas->{domain}, class => ""
% }
</span>
</p>
<br>
<p><br>
<span class="">
%=l 'DESCRIPTION_BRIEF', class => ""
</span>
<span class="">
% param 'Description' => $dom_datas->{description} unless param 'Description';
%= text_field 'Description', class => ""
</span>
</p>
<div>
<h2>
% if ( $dom_datas->{trt} eq "ADD" ) {
<%=l 'dom_CREATE_TITLE' %>
% } else {
<%=l 'dom_MODIFY_TITLE' %>
% $btn = l('MODIFY');
% }
</h2>
</div>
<p><br>
%=l 'dom_CONTENT_FIELD_DESCRIPTION'
<br>
<span class="">
%= $c->l('dom_CONTENT', '');
</span>
<span class="">
% param 'Content' => $dom_datas->{content} unless param 'Content';
%= select_field 'Content', $c->content_options_list(), class => ""
</span>
</p>
<br>
<p><br>
%=l 'dom_DESC_NAMESERVERS'
<br>
<span class="">
%=l 'dom_LABEL_NAMESERVERS', class => ""
</span>
<span class="">
% param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
%= select_field 'Nameservers', $c->nameserver_options_list(), class => ""
</span>
</p>
<div class="row g-3 algn-items-center">
<div class="col-md-2">
<label for="Domain" class="col-form-label"><%=l 'DOMAIN_NAME' %></label>
</div>
<div class="col-auto">
% if ( $dom_datas->{trt} eq "ADD" ) {
% param 'Domain' => $dom_datas->{domain} unless param 'Domain';
<input type="text" name="Domain" id="Domain" class="form-control" aria-describedby="inputDomain" value="<%= $dom_datas->{domain} %>">
% } else {
<%= hidden_field 'Domain' => $dom_datas->{domain} %>
<%= $dom_datas->{domain} %>
% }
</div>
</div>
<p><br>
%= submit_button "$btn", class => ""
</p>
<br>
%= hidden_field 'trt' => $dom_datas->{trt}
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDomainDesc" class="col-form-label"><%=l 'DESCRIPTION_BRIEF' %></label>
</div>
<div class="col-auto">
% param 'Description' => $dom_datas->{description} unless param 'Description';
<input type="text" name="Description" id="DomainDesc" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{description} %>">
</div>
</div>
%end
<br>
<%=l 'dom_CONTENT_FIELD_DESCRIPTION' %>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDomainContent" class="col-form-label"><%= $c->l('dom_CONTENT') %></label>
</div>
<div class="col-auto">
% param 'Content' => $dom_datas->{content} unless param 'Content';
<%= select_field 'Content', $c->content_options_list(), class => "form-select", id => "inputDomainContent" %>
</div>
</div>
<br>
<%=l 'dom_DESC_NAMESERVERS' %>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDomainNameServers" class="col-form-label"><%=l 'dom_LABEL_NAMESERVERS' %></label>
</div>
<div class="col-auto">
% param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
<%= select_field 'Nameservers', $c->nameserver_options_list(), class => "form-select", id => "inputDomainNameServers" %>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $dom_datas->{trt} %>
</form>
</div>

View File

@@ -59,12 +59,12 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-danger"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $grp_datas->{trt}
%= hidden_field 'groupName' => $grp_datas->{group}
<%= hidden_field 'trt' => $grp_datas->{trt} %>
<%= hidden_field 'groupName' => $grp_datas->{group} %>
</form>

View File

@@ -4,14 +4,16 @@
<form action="/smanager/groups2" method="POST">
<br>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
</div>
<%= hidden_field 'trt' => 'ADD' %>
</form>
<br>
<h2><%=l 'grp_CURRENT_LIST' %></h2>
<h2><%= l 'grp_CURRENT_LIST' %></h2>
<br><br>
% my $numGroups = @$groups;
% if ($numGroups == 0){

View File

@@ -3,27 +3,32 @@
% my $btn = l('REMOVE');
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<div>
<h2><%= l 'hos_REMOVE_TITLE'%> </h2>
</div>
<%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname}); %>
<br>
<div>
<%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname}); %>
</div>
<br>
<b><%= l 'hos_ABOUT_TO_REMOVE' %></b>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-danger"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname}
%# end
<%= hidden_field 'trt' => $hos_datas->{trt} %>
<%= hidden_field 'Hostname' => $hos_datas->{hostname} %>
</form>
</div>

View File

@@ -3,81 +3,72 @@
% my $btn = l('hos_ADD_HOSTNAME');
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentries' => (method => 'POST') => begin
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $hos_datas->{trt}
%# end
<%= hidden_field 'trt' => $hos_datas->{trt} %>
</form>
% my %dom_hos = %{$dom_hosts};
% foreach my $domain ( sort ( keys %dom_hos ) ) {
% my %dom_hos = %{$dom_hosts};
% foreach my $domain ( sort ( keys %dom_hos ) ) {
<br>
<br>
<%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); %>
<br>
<b>
<%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); %>
</b>
<table class="table table-bordered">
<thead>
<tr class="">
<th class="col-sm"><%= l 'hos_HOSTNAME' %></th>
<th class="col-auto"><%= l 'hos_HOSTTYPE' %></th>
<th class="col-auto"><%= l 'IP_ADDRESS_OR_FQDN' %></th>
<th class="col-auto"><%= l 'hos_ETHERNET_ADDRESS' %></th>
<th class="col-auto"><%= l 'COMMENT' %></th>
<th class="user-valign-center" colspan="2"><%= l 'ACTION' %></th>
</tr>
</thead>
<br>
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'hos_HOSTNAME' %></th>
<th><%= l 'hos_HOSTTYPE' %></th>
<th><%= l 'IP_ADDRESS_OR_FQDN' %></th>
<th><%= l 'hos_ETHERNET_ADDRESS' %></th>
<th><%= l 'COMMENT' %></th>
<th><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
% foreach (@{$dom_hos{$domain}{'HOSTS'}}) {
<tr>
<td><%= $_->{'HostName'}; %></td>
<td><%= $_->{'HostType'}; %></td>
<td><%= $_->{'IP'}; %></td>
<td><%= $_->{'MACAddress'}; %></td>
<td><%= $_->{'Comment'}; %></td>
<!--Need a fix? -->
<td style="min-width:15em">
%my ($actionModify, $actionRemove) = '&nbsp;';
%my $static = $_->{'static'} || "no";
%if ($static ne 'yes') {
%my $modify_text = l('MODIFY'); # Localized text
%my $csrf_token = "TOKEN"; # CSRF token for security
%my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionModify = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% $modify_text
% </button>
% </a>
%};
%my $remove_text = l('REMOVE'); # Localized text
%$csrf_token = "TOKEN"; # CSRF token for security
%#my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionRemove = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
%}
<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
</td>
</tr>
% }
</tbody>
</table>
<tbody>
% foreach (@{$dom_hos{$domain}{'HOSTS'}}) {
<tr>
<td><%= $_->{'HostName'}; %></td>
<td><%= $_->{'HostType'}; %></td>
<td><%= $_->{'IP'}; %></td>
<td><%= $_->{'MACAddress'}; %></td>
<td><%= $_->{'Comment'}; %></td>
% my ($actionModify, $actionRemove) = '&nbsp;';
% my $static = $_->{'static'} || "no";
% if ($static ne 'yes') {
%my $modify_text = l('MODIFY'); # Localized text
%my $csrf_token = "TOKEN"; # CSRF token for security
%my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionModify = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% $modify_text
% </button>
% </a>
%};
%my $remove_text = l('REMOVE'); # Localized text
%$csrf_token = "TOKEN"; # CSRF token for security
%#my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionRemove = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
% }
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
</tbody>
</table>
% }
</div>

View File

@@ -4,61 +4,68 @@
% my $btn = l('NEXT');
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<h2>
% if ( $hos_datas->{trt} eq "ALC" ) {
%=l 'hos_CREATE_TYPE'
<h2><%= l 'hos_CREATE_TYPE' %></h2>
% } else {
%=l 'hos_MODIFY_TYPE'
% $btn = l('MODIFY');
<h2><%= l 'hos_MODIFY_TYPE' %></h2>
% $btn = l('MODIFY');
% }
</h2>
<div>
<%= l 'hos_LOCAL_PAGE_DESCRIPTION' %>
</div>
<div>
<%= l 'hos_LOCAL_IP_DESCRIPTION' %>
</div>
<div>
<%= l 'hos_LOCAL_IP' %>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'hos_LOCAL_IP' %>
</div>
<div class="col-auto">
% param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
<%= text_field 'Internalip' %>
</div>
</div>
<div>
% param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
<%= text_field 'Internalip' %>
</div>
<br>
<div>
<%= l 'hos_ETHERNET_ADDRESS_DESCRIPTION' %>
</div>
<div>
<%= l 'hos_ETHERNET_ADDRESS' %>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'hos_ETHERNET_ADDRESS' %>
</div>
<div class="col-auto">
% param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
<%= text_field 'Macaddress' %>
</div>
</div>
<div>
% param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
<%= text_field 'Macaddress' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname}
%= hidden_field 'Name' => $hos_datas->{name}
%= hidden_field 'Domain' => $hos_datas->{domain}
%= hidden_field 'Comment'=> $hos_datas->{comment}
%= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
%= hidden_field 'Externalip' => $hos_datas->{externalip}
%#end
<%= hidden_field 'trt' => $hos_datas->{trt} %>
<%= hidden_field 'Hostname' => $hos_datas->{hostname} %>
<%= hidden_field 'Name' => $hos_datas->{name} %>
<%= hidden_field 'Domain' => $hos_datas->{domain} %>
<%= hidden_field 'Comment'=> $hos_datas->{comment} %>
<%= hidden_field 'Hosttype'=> $hos_datas->{hosttype} %>
<%= hidden_field 'Externalip' => $hos_datas->{externalip} %>
</form>
</div>

View File

@@ -3,60 +3,74 @@
% my $btn = l('NEXT');
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<h2>
% if ( $hos_datas->{trt} eq "ADD" ) {
<%=l 'hos_CREATE_TITLE' %>
<h2><%=l 'hos_CREATE_TITLE' %></h2>
% } else {
<%=l 'hos_MODIFY_TITLE' %>
<h2><%=l 'hos_MODIFY_TITLE' %></h2>
% $btn = l('MODIFY');
% }
</h2>
<div><%= l 'hos_HOSTNAME_DESCRIPTION' %></div>
<div><%=l 'hos_HOSTNAME' %></div>
<div>
<%= l 'hos_HOSTNAME_DESCRIPTION' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%=l 'hos_HOSTNAME' %>
</div>
<div class="col-auto">
% if ( $hos_datas->{trt} eq "ADD" ) {
% param 'Name' => $hos_datas->{name} unless param 'Name';
<%= text_field 'Name' %>
% } else {
%= hidden_field 'Name' => $hos_datas->{name}
<%= hidden_field 'Name' => $hos_datas->{name} %>
<%= $hos_datas->{name} %>
% }
</div>
<div>
<%= l 'DOMAIN' %>
</div>
</div>
<div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'DOMAIN' %>
</div>
<div class="col-auto">
% if ( $hos_datas->{trt} eq "ADD" ) {
% param 'Domain' => $hos_datas->{domain} unless param 'Domain';
<%= select_field 'Domain', $c->domains_list() %>
% } else {
%= hidden_field 'Domain' => $hos_datas->{domain}
<%= hidden_field 'Domain' => $hos_datas->{domain} %>
<%= $hos_datas->{domain} %>
% }
</div>
<div>
<%= $c->l('COMMENT', ''); %>
</div>
</div>
<div>
% param 'Comment' => $hos_datas->{comment} unless param 'Comment';
<%= text_field 'Comment' %>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputHostComment" class="col-form-label"><%= $c->l('COMMENT', ''); %></label>
</div>
<div class="col-auto">
% param 'Comment' => $hos_datas->{comment} unless param 'Comment';
<input type="text" name="Comment" id="inputHostComment" class="form-control" aria-describedby="inputHostComment" value="<%= $hos_datas->{comment} %>">
</div>
</div>
<div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%=l 'LOCATION' %>
</div>
<div>
% param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
%= select_field 'Hosttype', $c->hosttype_list(), class => ""
</div>
<div class="col-auto">
% param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
<%= select_field 'Hosttype', $c->hosttype_list(), class => "form-select"; %>
</div>
</div>
<br>
@@ -66,14 +80,13 @@
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname}
%= hidden_field 'Internalip' => $hos_datas->{internalip}
%= hidden_field 'Externalip' => $hos_datas->{externalip}
%= hidden_field 'Macaddress' => $hos_datas->{macaddress}
%#end
<%= hidden_field 'trt' => $hos_datas->{trt} %>
<%= hidden_field 'Hostname' => $hos_datas->{hostname} %>
<%= hidden_field 'Internalip' => $hos_datas->{internalip} %>
<%= hidden_field 'Externalip' => $hos_datas->{externalip} %>
<%= hidden_field 'Macaddress' => $hos_datas->{macaddress} %>
</form>
</div>

View File

@@ -18,17 +18,14 @@
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-danger"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $iba_datas->{trt}
%= hidden_field 'ibay' => $iba_datas->{ibay}
<%= hidden_field 'trt' => $iba_datas->{trt} %>
<%= hidden_field 'ibay' => $iba_datas->{ibay} %>
</form>
<br><br>
</div>

View File

@@ -5,8 +5,10 @@
<form action="/smanager/ibays" method="POST">
<br>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
</div>
<%= hidden_field 'trt' => 'ADD'; %>
</form>
@@ -25,7 +27,7 @@
<br>
% my $numIbays = @$ibays;
% if ($numIbays == 0){
% if ($numIbays == 0) {
<%= l 'iba_NO_IBAYS' %>
% } else {
@@ -50,7 +52,7 @@
<tr>
<td><%= $ibay->key %>
<td><%= $ibay->prop('Name') %>
<td class="" style="min-width:15em">
<td class="">
% my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
% if ($modifiable eq 'yes') {
%my $modify_text = l('MODIFY'); # Localized text

View File

@@ -4,7 +4,7 @@
% my %ret;
% unless (length($retref)) {%ret = (ret=>"");}
% else {%ret = %$retref;}
% my @vars = split(",",$ret{vars});
% my $var1 = @vars[0];
% my $var2 = @vars[1];
@@ -14,63 +14,80 @@
% my $var6 = @vars[5];
%if ($ret{'ret'} eq "") {
%} elsif (index($ret{ret},"SUCCESS") != -1) {
<div class="">
<h2> Operation Status Report</h2>
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
<%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
</div>
%} else {
%} else {
<div class="">
<h2> Operation Status Report - Error</h2>
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
<%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
</div>
%}
<br />
% my $btn = l('ADD');
% my $network_db = esmith::NetworksDB->open();
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")
</p>
<div>
<%= dumper $c->current_route %>
<%= dumper $c->stash("ret") %>
</div>
% }
%= form_for '/localnetworksb' => (method => 'POST') => begin
<h2>
%=l "ln_ADD_TITLE"
</h2>
<p>
%= $c->render_to_string(inline => l('ln_ADD_DESC'));
</p>
<br>
<span class="">
%=l "NETWORK"
</span>
<span class="">
%=text_field 'networkAddress'
</span>
<br><br>
<span class="">
%=l "ln_SUBNET_MASK"
</span>
<span class="">
%=text_field 'networkMask'
</span>
<br><br>
<span class="">
%=l "ROUTER"
</span>
<span class="">
%=text_field 'networkRouter'
</span>
<br><br>
<p>
<br>
%= submit_button "$btn", class => ""
</p>
%end
<form action="/smanager/localnetworksb" method="POST">
<div>
<h2><%=l "ln_ADD_TITLE" %></h2>
</div>
<br>
<div>
<%= $c->render_to_string(inline => l('ln_ADD_DESC')); %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
</div>
<div class="col-auto">
<input type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" >
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
</div>
<div class="col-auto">
<input type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" >
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
</div>
<div class="col-auto">
<input type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" >
</div>
</div>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
</form>
</div>

View File

@@ -4,62 +4,85 @@
% my $deletehosts = $ln_datas->{deletehosts};
% my $subnet = $ln_datas->{subnet};
% my $router = $ln_datas->{router};
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")
%= dumper %$ln_datas
%= dumper $deletehosts
</p>
<div>
<%= dumper $c->current_route %>
<%= dumper $c->stash("ret") %>
<%= dumper %$ln_datas %>
<%= dumper $deletehosts %>
</div>
% }
%= form_for '/localnetworkse' => (method => 'POST') => begin
<h2>
%=l "ln_REMOVE_TITLE"
</h2>
<p>
%=l "ln_REMOVE_DESC"
</p>
<br>
<span class="">
%=l "NETWORK"
</span>
<span class="">
%=$localnetwork
</span>
<br><br>
<span class="">
%=l "ln_SUBNET_MASK"
</span>
<span class="">
%= $subnet
</span>
<br><br>
<span class="">
%=l "ROUTER"
</span>
<span class="">
%= $router
</span>
<br><br>
% if($deletehosts) {
<br>
%=$c->l("ln_REMOVE_HOSTS_DESC")
<br>
<span class="">
%= $c->l("ln_REMOVE_HOSTS_LABEL")
</span>
<span class="">
%=check_box deletehost=>1, checked=>1
</span>
<br><br>
%}
%= hidden_field localnetwork=>$localnetwork
<p>
<br>
%= submit_button "$btn", class => ""
</p>
%end
<form action="/smanager/localnetworkse" method="POST">
<div>
<h2><%=l "ln_REMOVE_TITLE" %></h2>
</div>
<div>
<%=l "ln_REMOVE_DESC" %>
</div>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
</div>
<div class="col-auto">
<input disabled type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" value="<%= $localnetwork %>" >
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
</div>
<div class="col-auto">
<input disabled type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" value="<%= $subnet %>" >
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
</div>
<div class="col-auto">
<input disabled type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" value="<%= $router %>">
</div>
</div>
<br>
% if ($deletehosts) {
<br>
<b>tell me if you find this!</b>
<%= $c->l("ln_REMOVE_HOSTS_DESC") %>
<br>
<span class="">
<%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
</span>
<span class="">
<%= check_box deletehost=>1, checked=>1 %>
</span>
<br><br>
% }
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<%= hidden_field localnetwork=>$localnetwork %>
</form>
</div>

View File

@@ -1,108 +1,100 @@
<div>
% my $btn = l('ln_LOCALNETWORK_ADD');
%= form_for '/localnetworksa' => (method => 'POST') => begin
% my $retref= $c->stash("ret");
% my %ret;
% unless (length($retref)) {%ret = (ret=>"");}
% else {%ret = %$retref;}
<form action="/smanager/localnetworksa" method="POST">
% if (config->{debug} == 1) {
<p>
%= dumper "Ret:".$ret{ret};
</p>
%}
<br>
% my @vars = split(",",$ret{vars});
% my $var1 = @vars[0];
% my $var2 = @vars[1];
% my $var3 = @vars[2];
% my $var4 = @vars[3];
% my $var5 = @vars[4];
% my $var6 = @vars[5];
% my $var7 = @vars[6];
% my $retref= $c->stash("ret");
% my %ret;
% unless (length($retref)) {%ret = (ret=>"");}
% else {%ret = %$retref;}
% if (config->{debug} == 1) {
<div>
%= dumper "Ret:".$ret{ret};
</div>
% }
%if ($ret{ret} eq "") {
%=l "ln_FIRSTPAGE_DESC"
%} elsif (index($ret{ret},"SUCCESS") != -1) {
<div class="">
<h2> Operation Status Report</h2>
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
% my @vars = split(",",$ret{vars});
% my $var1 = @vars[0];
% my $var2 = @vars[1];
% my $var3 = @vars[2];
% my $var4 = @vars[3];
% my $var5 = @vars[4];
% my $var6 = @vars[5];
% my $var7 = @vars[6];
%if ($ret{ret} eq "") {
<%= l "ln_FIRSTPAGE_DESC" %>
% } elsif (index($ret{ret},"SUCCESS") != -1) {
<br>
<div>
<h2> Operation Status Report</h2>
<%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
</div>
% } else {
<div>
<h2> Operation Status Report - Error</h2>
<%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
</div>
% }
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
%} else {
<div class="">
<h2> Operation Status Report - Error</h2>
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
</div>
%}
<p>
<br>
%= submit_button "$btn", class => ""
</p>
% end
</form>
<br>
% my $numlocalnetworks = @$localnetworks;
% if ($numlocalnetworks == 0){
%=l 'ln_LOCAL_NETWORK_NONE'
% } else {
% if ($numlocalnetworks == 0) {
<%= l 'ln_LOCAL_NETWORK_NONE' %>
% } else {
<br>
<table class="table table-bordered">
<thead>
<tr>
<th class="">
%=l 'NETWORK'
</th>
<th class="">
%=l 'ln_SUBNET_MASK'
</th>
<th class="">
%=l 'ln_NUMBER_OF_HOSTS'
</th>
<th class="">
%=l 'ROUTER'
</th>
<th class="">
%=l 'ACTION'
</th>
</tr>
</thead>
<tbody>
% foreach my $localnetwork (@$localnetworks )
% {
% my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
% my $removable = $localnetwork->prop('Removable') || "yes";
% my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
% if ( $system eq "yes" ) { $removable = "no"; }
<tr>
%= t td => (class => "") => $localnetwork->key
%= t td => (class => "") => $localnetwork->prop('Mask')
%= t td => (class => "") => $num_hosts
%= t td => (class => "") => $localnetwork->prop('Router')
%my $actionRemove = '&nbsp;';
%if ($removable eq "yes") {
%my $remove_text = l('REMOVE'); # Localized text
%my $local_network_entry = $localnetwork->key;
%my $csrf_token = "TOKEN"; # CSRF token for security
%$actionRemove = qq{
% <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
% <button type='button' class="" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
<thead>
<tr>
<th><%= l 'NETWORK' %></th>
<th><%= l 'ln_SUBNET_MASK' %></th>
<th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
<th><%= l 'ROUTER' %></th>
<th><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
% foreach my $localnetwork (@$localnetworks ) {
% my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
% my $removable = $localnetwork->prop('Removable') || "yes";
% my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
% if ( $system eq "yes" ) { $removable = "no"; }
<tr>
<td><%= $localnetwork->key %>
<td><%= $localnetwork->prop('Mask') %>
<td><%= $num_hosts %>
<td><%= $localnetwork->prop('Router') %>
% my $actionRemove = '&nbsp;';
% if ($removable eq "yes") {
%my $remove_text = l('REMOVE'); # Localized text
%my $local_network_entry = $localnetwork->key;
%my $csrf_token = "TOKEN"; # CSRF token for security
%$actionRemove = qq{
% <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
% }
<td><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
<td class=""><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
</tbody>
</tbody>
</table>
%= hidden_field 'trt' => $ln_datas->{trt}
%}
<%= hidden_field 'trt' => $ln_datas->{trt} %>
% }
</div>

View File

@@ -14,11 +14,11 @@
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-danger"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $pse_datas->{trt}
%= hidden_field 'Pseudonym' => $pse_datas->{pseudonym}
<%= hidden_field 'trt' => $pse_datas->{trt} %>
<%= hidden_field 'Pseudonym' => $pse_datas->{pseudonym} %>
</form>
</div>

View File

@@ -2,19 +2,16 @@
% my $btn = l('pse_CLICK_TO_CREATE');
%= $c->render_to_string(inline => l('pse_DESCRIPTION'));
%= form_for '/pseudonyms' => (method => 'POST') => begin
%= hidden_field 'trt' => 'ADD'
<div class="row g-3 align-items-center">
<form action="/smanager/pseudonyms" method="POST">
<%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => 'ADD' %>
</form>
% end
<br>
<h2><%= l 'pse_CURRENT_PSEUDONYMS' %></h2>
<br>

View File

@@ -2,8 +2,8 @@
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'rvw_NETWORKING_PARAMS' %></th>
<th>&nbsp</th>
<th class="col-md-2"><%= l 'rvw_NETWORKING_PARAMS' %></th>
<th class="col-auto">&nbsp</th>
</tr>
</thead>
<tbody>
@@ -11,19 +11,19 @@
<td><%= l 'rvw_SERVER_MODE' %></td>
<td><%= $rvw_datas->{servermode} %></td>
</tr>
<tr>
<td><%= l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' %></td>
<td><%= $rvw_datas->{localip} %></td>
</tr>
% if ( $rvw_datas->{publicip} ) {
<tr>
<td><%=l 'rvw_INTERNET_VISIBLE_ADDRESS' %></td>
<td><%= $rvw_datas->{publicip} %></td>
</tr>
</tr>
% }
<tr>
<td><%= l 'rvw_GATEWAY'%></td>
<td>
@@ -31,24 +31,24 @@
<%= $rvw_datas->{serveronly} %>
</td>
</tr>
<tr>
<td>Local Networks (not translated?)</td>
<td><%= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );%> </td>
<tr>
<tr>
<td><%= l 'rvw_DHCP_SERVER' %></td>
<td><%= $rvw_datas->{dhcpserver} %></td>
</tr>
</tbody>
</table>
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'rvw_SERVER_NAMES' %></th>
<th>&nbsp</th>
<th class="col-md-2"><%= l 'rvw_SERVER_NAMES' %></th>
<th class="col-auto">&nbsp</th>
</tr>
</thead>
<tbody>
@@ -56,34 +56,34 @@
<td><%= l 'rvw_DNS_SERVER' %></td>
<td><%= $rvw_datas->{dnsserver} %></td>
</tr>
<tr>
<td><%= l 'rvw_WEB_SERVER' %></td>
<td><%= $rvw_datas->{webserver} %></tr>
</tr>
<tr>
<td><%= l 'rvw_PROXY_SERVER' %></td>
<td><%= $rvw_datas->{proxyserver} %></tr>
</tr>
<tr>
<td><%= l 'rvw_FTP_SERVER' %></td>
<td><%= $rvw_datas->{ftpserver} %></tr>
</tr>
<tr>
<td><%= l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' %></td>
<td><%= $rvw_datas->{smtpserver} %></tr>
</tr>
</tbody>
</table>
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'rvw_DOMAIN_INFORMATION' %></th>
<th>&nbsp</th>
<th class="col-md-2"><%= l 'rvw_DOMAIN_INFORMATION' %></th>
<th class="col-auto">&nbsp</th>
</tr>
</thead>
<tbody>
@@ -91,7 +91,7 @@
<td><%= l 'rvw_PRIMARY_DOMAIN' %></td>
<td><%= $rvw_datas->{domainname} %></td>
</tr>
<tr>
<td><%= l 'rvw_VIRTUAL_DOMAINS' %></td>
<td><%= $rvw_datas->{virtualdomains} %></td>
@@ -100,22 +100,22 @@
<td><%= l 'rvw_PRIMARY_WEB_SITE' %></td>
<td><%= $rvw_datas->{primarywebsite} %></td>
</tr>
<tr>
<td><%= l 'rvw_SERVER_MANAGER' %></td>
<td><%= $rvw_datas->{servermanager} %></td>
</tr>
<tr>
<td><%= l 'rvw_USER_PASSWORD_PANEL' %></td>
<td><%= $rvw_datas->{usermanager} %></td>
</tr>
<tr>
<td><%= l 'rvw_EMAIL_ADDRESSES' %></td>
<td><%= $rvw_datas->{emailaddresses} %></td>
</tr>
</tbody>
</table>
</div>

View File

@@ -3,8 +3,7 @@
% my $btn = l('REMOVE');
<form action="/smanager/useraccountsd" method="POST">
%#= form_for '/useraccountsd' => (method => 'POST') => begin
<div>
<h2><%= l 'usr_REMOVE_ACCOUNT_TITLE' %></h2>
</div>
@@ -14,9 +13,9 @@
<br>
%= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
</div>
<br><br>
<table class="table table-bordered user-table-max-wdith">
<thead>
<tr>
@@ -35,22 +34,21 @@
</tr>
</tbody>
</table>
<br>
%= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2'))
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-danger"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $usr_datas->{trt}
%= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name}
%# end
<%= hidden_field 'trt' => $usr_datas->{trt} %>
<%= hidden_field 'user' => $usr_datas->{user} %>
<%= hidden_field 'name' => $usr_datas->{name} %>
</form>
</div>

View File

@@ -3,174 +3,159 @@
% my $btn = l('usr_ADD_USER');
<form action="/smanager/useraccounts" method="POST">
%#= form_for '/useraccounts' => (method => 'POST') => begin
<br>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
<br>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
</form>
%# end
<br>
%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))
<%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC')) %>
<br>
%#= dumper @$users
% my $numUsers = @$users;
% if ($numUsers == 0){
%=l 'usr_NO_USER_ACCOUNTS'
% } else {
% my $numUsers = @$users;
% if ($numUsers == 0) {
<%=l 'usr_NO_USER_ACCOUNTS' %>
% } else {
<div class="table-responsive">
<table class="table table-bordered">
<thead>
<tr>
<th>
%=l 'ACCOUNT'
</th>
<th>
%=l 'USER_NAME'
</th>
<th>
%=l 'usr_VPN_CLIENT_ACCESS'
</th>
<th>
%=l 'usr_FORWARDING_ADDRESS'
</th>
<th class="user-valign-center" colspan="5">
%=l 'ACTION'
</th>
</tr>
</thead>
<tbody>
% foreach my $user (@$users) {
<table class="table table-bordered">
<thead>
<tr class="">
<th><%=l 'ACCOUNT' %></th>
<th><%=l 'USER_NAME' %></th>
<th><%=l 'usr_VPN_CLIENT_ACCESS' %></th>
<th><%=l 'usr_FORWARDING_ADDRESS' %></th>
<th class="user-valign-center" colspan="5"><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
% my $username = $user->key();
% my $first = $user->prop('FirstName');
% my $last = $user->prop('LastName');
% my $lockable = $user->prop('Lockable') || 'yes';
% my $removable = $user->prop('Removable') || 'yes';
% my $fwd = (($user->prop('EmailForward') || 'local') =~ m/^forward|both$/) ?
% $user->prop('ForwardAddress') : '';
% my $vpnaccess = $user->prop('VPNClientAccess') || 'no';
% $vpnaccess = $vpnaccess eq 'yes' ? $c->l('YES') : $c->l('NO');
% my $password_set = $user->prop('PasswordSet');
% my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure
% my $csrf_token = "TOKEN"; # CSRF token for security
% my $modify_text = l('MODIFY'); # Localized text
% my $remove_text = l('REMOVE'); # Localized text
% my $password_text = l("PASSWORD_RESET");
% my $lock_text = l('usr_LOCK'); # Localized text
% my $roundcube_text = l('Webmail'); # Localized text
% my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
% my $thisdomain = $c->req->url->to_abs->host;
<tr>
<td><%= $username %></td>
<td><%=$first %>&nbsp<%=$last %></td>
<td><%= $vpnaccess %></td>
<td><%= $fwd %></td>
% if ($useraccounts_user_name eq 'admin') {
%$actionModify = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$modify_text'>
% $modify_text
% </button>
%</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$password_text' >
% $password_text
% </button>
%</a>
%};
% } else {
%$actionModify = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% $modify_text
% </button>
%</a>
%};
% }
% foreach my $user (@$users) {
% my $username = $user->key();
% my $first = $user->prop('FirstName');
% my $last = $user->prop('LastName');
% my $lockable = $user->prop('Lockable') || 'yes';
% my $removable = $user->prop('Removable') || 'yes';
% my $fwd = (($user->prop('EmailForward') || 'local') =~ m/^forward|both$/) ?
% $user->prop('ForwardAddress') : '';
% my $vpnaccess = $user->prop('VPNClientAccess') || 'no';
% $vpnaccess = $vpnaccess eq 'yes' ? $c->l('YES') : $c->l('NO');
% my $password_set = $user->prop('PasswordSet');
% my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure
% my $csrf_token = "TOKEN"; # CSRF token for security
% my $modify_text = l('MODIFY'); # Localized text
% my $remove_text = l('REMOVE'); # Localized text
% my $password_text = l("PASSWORD_RESET");
% my $lock_text = l('usr_LOCK'); # Localized text
% my $roundcube_text = l('Webmail'); # Localized text
% my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
% my $thisdomain = $c->req->url->to_abs->host;
<tr>
<td><%= $username %></td>
<td><%= $first %>&nbsp<%=$last %></td>
<td><%= $vpnaccess %></td>
<td><%= $fwd %></td>
% if ($useraccounts_user_name eq 'admin') {
%$actionModify = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$modify_text'>
% $modify_text
% </button>
%</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$password_text' >
% $password_text
% </button>
%</a>
%};
% } else {
%$actionModify = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% $modify_text
% </button>
%</a>
%};
% }
% if ($password_set ne 'yes') {
% if ($password_set ne 'yes') {
<!-- Needs a fix here -->
%#$actionLock = l('ACCOUNT_LOCKED');
<!-- Sets BOTH columns - possibly leave out Reset Password here?-->
%$actionLock = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-danger" title="$password_text - currently unset">
% Unlock
% </button>
%</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title="$password_text - currently unset">
% $password_text
% </button>
%</a>
<!-- Needs a fix here -->
%#$actionLock = l('ACCOUNT_LOCKED');
<!-- Sets BOTH columns - possibly leave out Reset Password here?-->
%$actionLock = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-danger" title="$password_text - currently unset">
% Unlock
% </button>
%</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title="$password_text - currently unset">
% $password_text
% </button>
%</a>
%};
% } elsif ($useraccounts_user_name ne 'admin') {
%$actionLock = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$lock_text' >
% $lock_text
% </button>
%</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$password_text' >
% $password_text
% </button>
%</a>
%};
% }
% if ( $removable eq 'yes' ) {
%$actionRemove = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
%</a>
%};
% }
<!-- If webmail disabled??? -->
% $actionroundcube = qq{
%<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
% <button type='button' class="btn btn-primary" title='$roundcube_text' >
% $roundcube_text
% </button>
%</a>
%};
% } elsif ($useraccounts_user_name ne 'admin') {
%$actionLock = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$lock_text' >
% $lock_text
% </button>
%</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$password_text' >
% $password_text
% </button>
%</a>
%};
% }
% if ( $removable eq 'yes' ) {
%$actionRemove = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
%</a>
%};
% }
<!-- If webmail disabled??? -->
% $actionroundcube = qq{
%<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
% <button type='button' class="btn btn-primary" title='$roundcube_text' >
% $roundcube_text
% </button>
%</a>
%};
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionLock) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
</tr>
% }
</tbody>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionLock) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
</tr>
% }
</tbody>
</table>
</div>
</div>
<%} %>
% }
%= hidden_field 'trt' => $usr_datas->{trt}
<%= hidden_field 'trt' => $usr_datas->{trt} %>
</div>

View File

@@ -1,4 +1,5 @@
% layout 'AdminLTE', title => "Sme server 2 - qmailanalog";
% content_for 'module' => begin
<!-- should be moved -->
@@ -7,46 +8,64 @@
<div class="card-body">
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
</p>
%}
% if (config->{debug} == 1) {
<div>
(DBG)route: <%= $c->current_route %><br>
</div>
% }
<h1><%= $title %></h1>
<br>
<%= $modul %>
<% my $btn = l('qma_GENERATE_REPORT'); %>
%= form_for 'qmailanalog' => (method => 'POST') => begin
<p>
<span class="">
%=l 'qma_REPORT_TYPE'
</span>
<span class="">
<!-- (to be sorted) -->
%= select_field 'report_type' => $c->reportType_list(), id => ""
</span>
</p>
<% my $btn = l('qma_GENERATE_REPORT'); %>
<form action="/smanager/qmailanalog" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="analysis_type" class="col-form-label"><%=l 'qma_REPORT_TYPE' %></label>
</div>
<div class="col-auto">
<!-- (to be sorted) -->
<%= select_field 'report_type' => $c->reportType_list(), class => "form-select", id => "analysis_type" %>
</div>
</div>
<br>
<!--And optional parameters, depending on the choice.-->
<div id="">
<span class="">
%= label_for message_id => 'Message ID:'
</span>
<span class="">
%= text_field 'message_id', placeholder => 'Enter Postfix Message ID', id => ""
</span>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="message_id_group" class="col-form-label">Message ID:</label>
</div>
<div class="col-auto">
<input type="text" name="message_id" id="message_id_group" class="form-control" aria-describedby="message_id_group" placeholder="Enter Postfix Message ID">
</div>
</div>
<div id="">
<span class="">
%= label_for email_address => 'Email Address:'
</span>
<span class="">
%= email_field 'email_address', placeholder => 'Enter email address', id => ""
</span>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="email_address_group" class="col-form-label">Email Address:</label>
</div>
<div class="col-auto">
<input type="email" name="email_address" id="email_address_group" class="form-control" aria-describedby="email_address_group" placeholder="Enter Email Address">
</div>
</div>
%= submit_button "$btn", class => ""
% end
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
</form>
</div>
%end

View File

@@ -5,70 +5,108 @@
<div class="card-body">
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
</p>
%}
<div>
(DBG)route: <%= $c->current_route %><br>
</div>
% }
<h1><%= $title %></h1>
<br>
<%= $notif %>
<% my $btn = l('NEXT'); %>
%= form_for 'viewlogfiles' => (method => 'POST') => begin
<p>
%=l 'log_FIRSTPAGE_DESC'
<br>
<span class="">
%=l 'log_LOG_FILE_SELECT_DESC'
</span>
<span class="">
% param 'Filename' => 'messages';
<!-- select_field 'Filename' => [['toto'], ['tata']], class => "" -->
%= select_field 'Filename' => $c->findlogFiles(), class => ""
</span>
</p>
<% my $btn = l('NEXT'); %>
<p>
%=l 'log_FILTER_PATTERN_DESC'
<br>
<span class="">
%=l 'log_FILTER_PATTERN_LABEL'
</span>
<span class="">
%= text_field 'Matchpattern', class => ""
</span>
</p>
<p>
%=l 'log_MATCH_PATTERN_DESC'
<br>
<span class="">
%=l 'log_MATCH_PATTERN_LABEL'
</span>
<span class="">
%= text_field 'Highlightpattern', class => ""
</span>
</p>
<form action="/smanager/viewlogfiles" method="POST">
<p>
%=l 'log_OP_DESC'
<br>
<span class="">
%=l 'log_OP_LABEL'
</span>
<span class="">
%if ($log_datas->{'default_op'} eq 'download') {
% param 'Operation' => 'download';
%}
%= select_field 'Operation' => [[(l 'log_VIEW') => 'view'],[(l 'DOWNLOAD') => 'download']], class => ""
</span>
</p>
<div>
<%=l 'log_FIRSTPAGE_DESC' %>
</div>
<p>
%=l 'log_END_DESC'
</p>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="LogFileSelect" class="col-form-label"><%=l 'log_LOG_FILE_SELECT_DESC' %></label>
</div>
<div class="col-auto">
% param 'Filename' => 'messages';
<!-- select_field 'Filename' => [['toto'], ['tata']], class => "" -->
%= select_field 'Filename' => $c->findlogFiles(), class => "form-select", id => "LogFileSelect"
</div>
</div>
<br>
<div>
<%= l 'log_FILTER_PATTERN_DESC' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="LogFilterPattern" class="col-form-label"><%= l 'log_FILTER_PATTERN_LABEL' %></label>
</div>
<div class="col-auto">
<input type="text" name="Matchpattern" id="LogFilterPattern" class="form-control" aria-describedby="LogFilterPattern">
</div>
</div>
<br>
<div>
<%= l 'log_MATCH_PATTERN_DESC' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="LogHighlightpattern" class="col-form-label"><%= l 'log_MATCH_PATTERN_LABEL' %></label>
</div>
<div class="col-auto">
<input type="text" name="Highlightpattern" id="LogHighlightpattern" class="form-control" aria-describedby="LogHighlightpattern">
</div>
</div>
<br>
<div>
<%= l 'log_OP_DESC' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="LogOperation" class="col-form-label"><%= l 'log_OP_LABEL' %></label>
</div>
<div class="col-auto">
%if ($log_datas->{'default_op'} eq 'download') {
% param 'Operation' => 'download';
% }
%= select_field 'Operation' => [[(l 'log_VIEW') => 'view'],[(l 'DOWNLOAD') => 'download']], class => "form-select", id => "LogOperation"
</div>
</div>
<br>
<div>
<%= l 'log_END_DESC' %>
</div>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
</form>
%= submit_button "$btn", class => ""
% end
</div>
%end

View File

@@ -5,28 +5,37 @@
<div class="card-body">
% if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
(DBG)trt: <%= $log_datas->{trt} %><br>
</p>
<div>
(DBG)route: <%= $c->current_route %><br>
(DBG)trt: <%= $log_datas->{trt} %><br>
</div>
% }
<h1><%= $title %></h1>
<br><%= $modul %><br>
<br>
<%= $modul %>
<br>
<p>
<% my $btn = l('log_REFRESH'); %>
%= form_for 'viewlogfilesr' => (method => 'POST') => begin
%= submit_button "$btn", class => ""
%= hidden_field 'trt' => $log_datas->{trt}
%= hidden_field 'Filename' => $log_datas->{filename}
%= hidden_field 'Matchpattern' => $log_datas->{matchpattern}
%= hidden_field 'Highlightpattern' => $log_datas->{highlightpattern}
%= hidden_field 'Operation' => $log_datas->{operation}
% end
</p>
<form action="/smanager/viewlogfilesr" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $log_datas->{trt}
%= hidden_field 'Filename' => $log_datas->{filename}
%= hidden_field 'Matchpattern' => $log_datas->{matchpattern}
%= hidden_field 'Highlightpattern' => $log_datas->{highlightpattern}
%= hidden_field 'Operation' => $log_datas->{operation}
</form>
</div>
%end

View File

@@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE
%define version 11.0.0
%define release 21
%define release 25
Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
Name: %{name}
Version: %{version}
@@ -26,6 +26,18 @@ AdminLTE is an html framework for admin consoles
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
%changelog
* Tue May 20 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-25.sme
- Log files - Bug reports - Config reports
* Mon May 19 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-24.sme
- Local Networks and a few odd tidies
* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-23.sme
- Domains done plus more tweaks
* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-22.sme
- Hosts done and a few tweaks
* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-21.sme
- Directory updated. More odd fixes.