From 4651f02c0b3afa7db5b81b9b1c05af778cb88a99 Mon Sep 17 00:00:00 2001
From: Brian Read <brianr@koozali.org>
Date: Sat, 19 Apr 2025 11:51:09 +0100
Subject: [PATCH] * Sat Apr 19 2025 Brian Read <brianr@koozali.org>
 11.0.0-2.sme - Get the new SM2 code right - calling the old perl. - Update
 version to 11

---
 .../lib/SrvMngr/Controller/Diskusage.pm       | 34 +++++++++++++++++++
 .../I18N/Modules/Diskusage/Diskusage.lex      |  0
 .../I18N/Modules/Diskusage/diskusage_en.lex   |  2 ++
 .../default/templates/diskusage.html.ep       | 23 +++++++++++++
 smeserver-diskusage.spec                      | 11 ++++--
 5 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 root/usr/share/smanager/lib/SrvMngr/Controller/Diskusage.pm
 create mode 100644 root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Diskusage/Diskusage.lex
 create mode 100644 root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Diskusage/diskusage_en.lex
 create mode 100644 root/usr/share/smanager/themes/default/templates/diskusage.html.ep

diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Diskusage.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Diskusage.pm
new file mode 100644
index 0000000..a34ddc0
--- /dev/null
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Diskusage.pm
@@ -0,0 +1,34 @@
+package SrvMngr::Controller::Diskusage;
+
+#----------------------------------------------------------------------
+# heading     : Investigation
+# description : Disk Usage
+# navigation  : 4000 600
+#----------------------------------------------------------------------
+#----------------------------------------------------------------------
+# name   : diskusage,    method : get,   url : /diskusage,     ctlact : Diskusage#main
+#
+# routes : end
+#----------------------------------------------------------------------
+use strict;
+use warnings;
+use Mojo::Base 'Mojolicious::Controller';
+use Locale::gettext;
+use SrvMngr::I18N;
+use SrvMngr qw(theme_list init_session);
+
+#use SrvMngr::Model::Main;
+sub main {
+    my $c = shift;
+    $c->app->log->info($c->log_req);
+    my $title         = $c->l('diskusage_panel');
+    my $diskusage_height = $c->param('height') || '600';
+    my $diskusage_full_html = qx(perl -T /etc/e-smith/web/functions/diskusage);
+    my ($diskusage_html) = $diskusage_full_html =~ m{<body[^>]*>(.*?)</body>}si;
+    # Remove lines starting with the specified phrases
+	$diskusage_html =~ s/^(  SME Server|<BR>Copyright \(c\)).*\n//gmi;
+    $c->stash(title => $title, diskusage => $diskusage_html, height => $diskusage_height);
+    #die("$diskusage_html");
+    $c->render(template => 'diskusage');
+} ## end sub main
+1;
\ No newline at end of file
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Diskusage/Diskusage.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Diskusage/Diskusage.lex
new file mode 100644
index 0000000..e69de29
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Diskusage/diskusage_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Diskusage/diskusage_en.lex
new file mode 100644
index 0000000..255b775
--- /dev/null
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Diskusage/diskusage_en.lex
@@ -0,0 +1,2 @@
+'du_FUll_description' => 'Full description',
+'du_diskusage' => 'Disc Usage'
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/diskusage.html.ep b/root/usr/share/smanager/themes/default/templates/diskusage.html.ep
new file mode 100644
index 0000000..1da1f16
--- /dev/null
+++ b/root/usr/share/smanager/themes/default/templates/diskusage.html.ep
@@ -0,0 +1,23 @@
+% layout 'default', title => "Sme server 2 -  Disk usage";
+
+% content_for 'module' => begin
+
+<div id='Diskusage' class='module diskusage-panel'>
+    % if (config->{debug} == 1) {
+		<pre>
+			%= dumper $c->current_route
+			%= dumper $c->stash('diskusage')
+		</pre>
+    % }
+    % if ( stash 'error' ) {
+    	<br><div class=sme-error>
+			%= $c->render_to_string(inline => stash 'error') 
+		</div>
+    %}
+    <!--<h1>Legacy-<%#=l('du_diskusage') %></h1><br>-->
+    % my $height = $c->stash('height') | '600';
+    % if ($height !~ /px$/) { $height = $height.'px';}
+    %== $c->stash('diskusage');
+</div>
+
+%end
\ No newline at end of file
diff --git a/smeserver-diskusage.spec b/smeserver-diskusage.spec
index 7ccb9fa..decc5cd 100644
--- a/smeserver-diskusage.spec
+++ b/smeserver-diskusage.spec
@@ -5,8 +5,8 @@
 Summary: Disk usage panel for the SME Server
 %define name smeserver-diskusage
 Name: %{name}
-%define version 0.2.0
-%define release 8
+%define version 11.0.0
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -24,6 +24,13 @@ AutoReqProv: no
 Disk usage panel showing filesystem, i-bay and user statistics.
 
 %changelog
+* Sat Apr 19 2025 Brian Read <brianr@koozali.org> 11.0.0-2.sme
+- Get the new SM2 code right - calling the old perl.
+- Update version to 11
+
+* Fri Apr 18 2025 Brian Read <brianr@koozali.org> 0.2.0-9.sme
+- Add in legacy panel code into SM2
+
 * Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 0.2.0-8.sme
 - Fix e-smith references in smeserver-diskusage [SME: 12732]