1 |
stephdl |
1.1 |
diff -Nur smeserver-userpanels-1.1.old/root/etc/e-smith/web/functions/userpanel-useraccounts smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-useraccounts |
2 |
|
|
--- smeserver-userpanels-1.1.old/root/etc/e-smith/web/functions/userpanel-useraccounts 2016-06-22 12:07:11.481618554 +0200 |
3 |
|
|
+++ smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-useraccounts 2016-06-22 12:57:44.434503739 +0200 |
4 |
|
|
@@ -38,6 +38,11 @@ |
5 |
|
|
use esmith::util; |
6 |
|
|
use esmith::db; |
7 |
|
|
use esmith::event; |
8 |
|
|
+use esmith::FormMagick; |
9 |
|
|
+use esmith::cgi; |
10 |
|
|
+ |
11 |
|
|
+my $fm = esmith::FormMagick->new(); |
12 |
|
|
+ |
13 |
|
|
|
14 |
|
|
# added by lorenzo |
15 |
|
|
use Crypt::Cracklib; |
16 |
|
|
@@ -386,8 +391,10 @@ |
17 |
|
|
}#if accounts >0 |
18 |
|
|
|
19 |
|
|
print $q->endform; |
20 |
|
|
- print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme", |
21 |
|
|
- $q->a ({href => $q->url (-absolute => 1) . "?state=help"}, 'Useraccounts help'), " ...")); |
22 |
|
|
+# print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme", |
23 |
|
|
+ esmith::cgi::genFooter($fm); |
24 |
|
|
+ |
25 |
|
|
+ print $q->a ({href => $q->url (-absolute => 1) . "?state=help"}, 'Useraccounts help'), " ..."; |
26 |
|
|
print '</FONT>'; |
27 |
|
|
print '</DIV>'; |
28 |
|
|
print $q->end_html; |
29 |
|
|
@@ -598,7 +605,8 @@ |
30 |
|
|
|
31 |
|
|
print $q->endform; |
32 |
|
|
|
33 |
|
|
- print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme")); |
34 |
|
|
+# print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme")); |
35 |
|
|
+ esmith::cgi::genFooter($fm); |
36 |
|
|
|
37 |
|
|
print '</FONT>'; |
38 |
|
|
print '</DIV>'; |
39 |
|
|
@@ -1043,7 +1051,9 @@ |
40 |
|
|
|
41 |
|
|
print $q->endform; |
42 |
|
|
|
43 |
|
|
- print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme")); |
44 |
|
|
+# print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme")); |
45 |
|
|
+ esmith::cgi::genFooter($fm); |
46 |
|
|
+ |
47 |
|
|
|
48 |
|
|
print '</FONT>'; |
49 |
|
|
print '</DIV>'; |
50 |
|
|
@@ -1410,7 +1420,7 @@ |
51 |
|
|
} |
52 |
|
|
|
53 |
|
|
print $q->endform; |
54 |
|
|
- esmith::cgi5::genFooter ($q); |
55 |
|
|
+ esmith::cgi::genFooter($fm); |
56 |
|
|
return; |
57 |
|
|
} |
58 |
|
|
|
59 |
|
|
@@ -1594,7 +1604,7 @@ |
60 |
|
|
} |
61 |
|
|
|
62 |
|
|
print $q->endform; |
63 |
|
|
- esmith::cgi5::genFooter ($q); |
64 |
|
|
+ esmith::cgi::genFooter($fm); |
65 |
|
|
return; |
66 |
|
|
} |
67 |
|
|
|
68 |
|
|
@@ -1746,7 +1756,7 @@ |
69 |
|
|
-default => 'performLock'); |
70 |
|
|
|
71 |
|
|
print $q->endform; |
72 |
|
|
- esmith::cgi5::genFooter ($q); |
73 |
|
|
+ esmith::cgi::genFooter($fm); |
74 |
|
|
return; |
75 |
|
|
} |
76 |
|
|
|
77 |
|
|
@@ -1936,8 +1946,10 @@ |
78 |
|
|
</pre> '))); |
79 |
|
|
|
80 |
|
|
print $q->endform; |
81 |
|
|
- print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme ", |
82 |
|
|
- $q->a ({href => $q->url (-absolute => 1) . ""}, 'Return to main'), " ...")); |
83 |
|
|
+# print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme ", |
84 |
|
|
+ esmith::cgi::genFooter($fm); |
85 |
|
|
+ |
86 |
|
|
+ $q->a ({href => $q->url (-absolute => 1) . ""}, 'Return to main'), " ..."; |
87 |
|
|
return; |
88 |
|
|
} |
89 |
|
|
|
90 |
|
|
diff -Nur smeserver-userpanels-1.1.old/root/etc/e-smith/web/functions/userpanel-userbackup smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-userbackup |
91 |
|
|
--- smeserver-userpanels-1.1.old/root/etc/e-smith/web/functions/userpanel-userbackup 2005-09-21 12:24:18.000000000 +0200 |
92 |
|
|
+++ smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-userbackup 2016-06-22 12:18:28.273369737 +0200 |
93 |
|
|
@@ -34,6 +34,9 @@ |
94 |
|
|
use esmith::util; |
95 |
|
|
use esmith::db; |
96 |
|
|
use esmith::lockfile; |
97 |
|
|
+use esmith::FormMagick; |
98 |
|
|
+ |
99 |
|
|
+my $fm = esmith::FormMagick->new(); |
100 |
|
|
|
101 |
|
|
sub showInitial ($$); |
102 |
|
|
sub performAndShowResult ($); |
103 |
|
|
@@ -211,7 +214,9 @@ |
104 |
|
|
|
105 |
|
|
print $q->endform; |
106 |
|
|
|
107 |
|
|
- print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme")); |
108 |
|
|
+ # print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme")); |
109 |
|
|
+ esmith::cgi::genFooter($fm); |
110 |
|
|
+ |
111 |
|
|
|
112 |
|
|
print '</FONT>'; |
113 |
|
|
print '</DIV>'; |