brianr/SM2Gen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally crack the routing problem - html entities not allowed in mojo routing

Browse Source
This commit is contained in:
Brian Read
2024-11-13 16:45:14 +00:00
parent ece4f2f6f5
commit 1a78388e95
8 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Targets/Letsencrypt/Letsencrypt-Custom.pm
View File

@@ -6,10 +6,10 @@
# and provison of the control data for table(s)
#
use esmith::util;
use esmith::ConfigDB;
use esmith::HostsDB;
use esmith::AccountsDB;
use esmith::NetworksDB;
use esmith::HostsDB;
use esmith::DomainsDB;
#use Net::SSLeay;
@@ -81,14 +81,14 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %ret = (
'Data1'=>'Data for PARAMS', #Example
# fields from Inputs in PARAMS $fields['PARAMS']
'status'=>get_prop('letsencrypt', 'status', 'disabled',
'hookScript'=>get_prop('letsencrypt', 'hookScript', 'disabled'),
'hostOverride'=>get_prop('letsencrypt', 'hostOverride', 'disabled'),
'ACCEPT_TERMS'=>get_prop('letsencrypt', 'ACCEPT_TERMS', ''),
'API'=>get_prop('letsencrypt', 'API', '2'),
'keysize'=>get_prop('letsencrypt', 'keysize', '4096'),
'configure'=>get_prop('letsencrypt', 'configure', 'none' ),
'Email'=>get_prop('letsencrypt', 'email')
'status'=>$cdb->get_prop('letsencrypt', 'status', 'disabled'),
'hookScript'=>$cdb->get_prop('letsencrypt', 'hookScript', 'disabled'),
'hostOverride'=>$cdb->get_prop('letsencrypt', 'hostOverride', 'disabled'),
'ACCEPT_TERMS'=>$cdb->get_prop('letsencrypt', 'ACCEPT_TERMS', ''),
'API'=>$cdb->get_prop('letsencrypt', 'API', '2'),
'keysize'=>$cdb->get_prop('letsencrypt', 'keysize', '4096'),
'configure'=>$cdb->get_prop('letsencrypt', 'configure', 'none' ),
'Email'=>$cdb->get_prop('letsencrypt', 'email')
);
return %ret;
}
@@ -159,7 +159,7 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
# }
my @data = ();
my $check = $c->l('CHECK');
my $check = $c->l('Check Domain');
for ($ddb->domains)
{
@@ -167,7 +167,9 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my $le = $_->prop('letsencryptSSLcert') || 'disabled';#letsencrypt configure all
my $dname= $_->key;
my $isincert = "N";
my $check = $c->l('lets_CHECK');
my $link = $c->create_link("letsencryptd","CHECKONEDOMAIN","");
my $checklink = "<a href='".$link."&dom=".$_->key."'>".$check."</a>";
#my $checklink = "<a href=''>check</a>";
$isincert = "Y" if ( $dname ~~ @list);
# domain
push @data,
@@ -175,7 +177,7 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
$_->props,
letsencryptSSLcert => $le,
isincert => $isincert,
Check => $check,
Check => $checklink,
Nameservers => $ns,
};
#and hosts
@@ -192,7 +194,7 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
Description=>$h->prop('ExternalIP')|| $h->prop('InternalIP')||"",
Content => $h->prop('HostType'),
isincert => $isincert,
Check => $check,
Check => "", #$checklink
Nameservers => $c->l($ns),
}
}
@@ -284,7 +286,7 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
sub create_link{
# WIP
my ($c,$route, $panel, $index) = shift;
my ($c,$route, $panel, $index) = @_;
my $link = "$route?trt=$panel&Selected=$index";
return $link;
}