Log files - Bug reports - Config reports

This commit is contained in:
John Crisp 2025-05-20 13:56:26 +02:00
parent 12f8be6936
commit 6cc847b6b1
9 changed files with 352 additions and 242 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

@ -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

@ -64,13 +64,13 @@
<b>tell me if you find this!</b>
<%=$c->l("ln_REMOVE_HOSTS_DESC") %>
<%= $c->l("ln_REMOVE_HOSTS_DESC") %>
<br>
<span class="">
<%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
</span>
<span class="">
<%=check_box deletehost=>1, checked=>1 %>
<%= check_box deletehost=>1, checked=>1 %>
</span>
<br><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

@ -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 24
%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,9 @@ 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