1 |
stephdl |
1.1 |
diff -Nur e-smith-domains-2.4.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains e-smith-domains-2.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains |
2 |
|
|
--- e-smith-domains-2.4.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains 2014-04-20 20:09:50.806293459 +0200 |
3 |
|
|
+++ e-smith-domains-2.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains 2014-04-24 18:06:43.835576390 +0200 |
4 |
|
|
@@ -228,5 +228,13 @@ |
5 |
|
|
<base>corporate</base> |
6 |
|
|
<trans>Corporate DNS servers</trans> |
7 |
|
|
</entry> |
8 |
|
|
+ <entry> |
9 |
|
|
+ <base>REMOVE_DESC</base> |
10 |
|
|
+ <trans>You are about to remove the domain </trans> |
11 |
|
|
+ </entry> |
12 |
|
|
+ <entry> |
13 |
|
|
+ <base>REMOVE_DESC2</base> |
14 |
|
|
+ <trans> Are you sure you wish to remove this Domain ? </trans> |
15 |
|
|
+ </entry> |
16 |
|
|
|
17 |
|
|
</lexicon> |
18 |
|
|
diff -Nur e-smith-domains-2.4.0.old/root/etc/e-smith/web/functions/domains e-smith-domains-2.4.0/root/etc/e-smith/web/functions/domains |
19 |
|
|
--- e-smith-domains-2.4.0.old/root/etc/e-smith/web/functions/domains 2014-04-20 20:09:50.806293459 +0200 |
20 |
|
|
+++ e-smith-domains-2.4.0/root/etc/e-smith/web/functions/domains 2014-04-24 18:06:43.836576517 +0200 |
21 |
|
|
@@ -158,6 +158,8 @@ |
22 |
|
|
|
23 |
|
|
<description>REMOVE_TITLE</description> |
24 |
|
|
|
25 |
|
|
+<subroutine src="print_page_description('remove')" /> |
26 |
|
|
+ |
27 |
|
|
<subroutine src="print_button('REMOVE')" /> |
28 |
|
|
</page> |
29 |
|
|
|
30 |
|
|
diff -Nur e-smith-domains-2.4.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/domains.pm e-smith-domains-2.4.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/domains.pm |
31 |
|
|
--- e-smith-domains-2.4.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/domains.pm 2014-04-20 20:09:50.806293459 +0200 |
32 |
|
|
+++ e-smith-domains-2.4.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/domains.pm 2014-04-24 18:07:58.577032673 +0200 |
33 |
|
|
@@ -422,4 +422,36 @@ |
34 |
|
|
|
35 |
|
|
return $fm->error('ERROR_WHILE_REMOVING_DOMAIN'); |
36 |
|
|
} |
37 |
|
|
+ |
38 |
|
|
+=head2 print_page_description($self, "remove") |
39 |
|
|
+ |
40 |
|
|
+Generates the page description for the Remove Domain page. |
41 |
|
|
+ |
42 |
|
|
+=cut |
43 |
|
|
+ |
44 |
|
|
+sub print_page_description { |
45 |
|
|
+ my ($self, $pagename) = @_; |
46 |
|
|
+ unless (grep /^$pagename$/, qw(remove)) { |
47 |
|
|
+ warn "Can't generate page description for invalid pagename $pagename\n"; |
48 |
|
|
+ return; |
49 |
|
|
+ } |
50 |
|
|
+ |
51 |
|
|
+ $pagename = uc($pagename); |
52 |
|
|
+ |
53 |
|
|
+ my $desc = $self->localise("${pagename}_DESC"); |
54 |
|
|
+ my $desc2 = $self->localise("${pagename}_DESC2"); |
55 |
|
|
+ |
56 |
|
|
+ my ($fm, $action) = @_; |
57 |
|
|
+ my $q = $fm->{'cgi'}; |
58 |
|
|
+ my $domain = $q->param('Domain'); |
59 |
|
|
+ my $domain_description = $ddb->get_prop("$domain",'Description'); |
60 |
|
|
+ print qq{ |
61 |
|
|
+ <tr><td colspan="2"> |
62 |
|
|
+ <p>$desc "$domain" ($domain_description)</p> |
63 |
|
|
+ <b>$desc2</b> |
64 |
|
|
+ </td></tr> |
65 |
|
|
+ }; |
66 |
|
|
+ |
67 |
|
|
+ return; |
68 |
|
|
+} |
69 |
|
|
1; |