1 |
michel |
1.1 |
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex |
2 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex 2021-06-14 12:13:15.000000000 +0400 |
3 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex 2021-06-14 22:52:28.801000000 +0400 |
4 |
|
|
@@ -17,7 +17,7 @@ |
5 |
|
|
'log_MATCH_PATTERN_LABEL' => 'Highlight Pattern (optional)', |
6 |
|
|
'log_END_DESC' => 'Please note that it may take quite some time to generate these |
7 |
|
|
reports.', |
8 |
|
|
-'VIEW' => 'View log file', |
9 |
|
|
+'log_VIEW' => 'View log file', |
10 |
|
|
'log_LOG_FILE_EMPTY' => 'Log file "[_1]" is empty!', |
11 |
|
|
'log_VIEWING_TIME' => 'Viewed at [_1].', |
12 |
|
|
'log_MATCH_HEADER' => 'Displaying lines matching: "[_1]".', |
13 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_fr.lex smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_fr.lex |
14 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_fr.lex 2021-06-14 12:13:15.000000000 +0400 |
15 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_fr.lex 2021-06-14 18:07:09.000000000 +0400 |
16 |
|
|
@@ -1,4 +1,5 @@ |
17 |
|
|
'View log files' => 'Visualisation des fichiers journaux', |
18 |
|
|
+'log_FORM_TITLE' => 'Visualisation des fichiers journaux', |
19 |
|
|
'log_FIRSTPAGE_DESC' => ' Cette page vous permet de visualiser ou de télécharger les fichiers journaux générés par les services en cours de fonctionnement sur votre serveur. ', |
20 |
|
|
'log_LOG_FILE_SELECT_DESC' => 'Choisissez le fichier journal à afficher', |
21 |
|
|
'log_FILTER_PATTERN_DESC' => ' <p>Vous avez la possibilité de spécifier un modèle de filtre afin de n\'afficher que les lignes du fichier journal qui correspondent à ce modèle. Si vous laissez ce champ vide, le fichier journal sera affiché dans son intégralité. Veuillez noter que cette option est ignorée en cas de téléchargement du fichier.</p> ', |
22 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr.pm smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr.pm |
23 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr.pm 2021-06-14 12:13:15.000000000 +0400 |
24 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr.pm 2021-06-14 21:08:30.880000000 +0400 |
25 |
|
|
@@ -23,7 +23,7 @@ |
26 |
|
|
use SrvMngr::Model::Main; |
27 |
|
|
|
28 |
|
|
|
29 |
|
|
-our $VERSION = '1.211'; |
30 |
|
|
+our $VERSION = '1.212'; |
31 |
|
|
$VERSION = eval $VERSION; |
32 |
|
|
|
33 |
|
|
use Exporter 'import'; |
34 |
|
|
@@ -261,21 +261,21 @@ |
35 |
|
|
$if_admin->post('/emailsettings')->to('emailsettings#do_display')->name('emailsetting'); |
36 |
|
|
$if_admin->post('/emailsettingd')->to('emailsettings#do_update')->name('emailsettingu'); |
37 |
|
|
|
38 |
|
|
- $if_admin->get('/groups')->to('groups#main')->name('groupsg'); |
39 |
|
|
- $if_admin->get('/groups2')->to('groups#do_display')->name('groups2g'); |
40 |
|
|
- $if_admin->post('/groups2')->to('groups#do_update')->name('groups2p'); |
41 |
|
|
+ $if_admin->get('/groups')->to('groups#main')->name('groupsl'); |
42 |
|
|
+ $if_admin->post('/groups')->to('groups#do_display')->name('groupa'); |
43 |
|
|
+ $if_admin->get('/groups2')->to('groups#do_display')->name('groupd'); |
44 |
|
|
+ $if_admin->post('/groups2')->to('groups#do_update')->name('groupu'); |
45 |
|
|
|
46 |
|
|
$if_admin->get('/hostentries')->to('hostentries#main')->name('hostentries'); |
47 |
|
|
$if_admin->post('/hostentries')->to('hostentries#do_display')->name('hostentryadd'); |
48 |
|
|
- $if_admin->get('/hostentryd')->to('hostentries#do_display')->name('hostentrydis'); |
49 |
|
|
- $if_admin->post('/hostentryd')->to('hostentries#do_update')->name('hostentryupd'); |
50 |
|
|
+ $if_admin->get('/hostentriesd')->to('hostentries#do_display')->name('hostentrydis'); |
51 |
|
|
+ $if_admin->post('/hostentriesd')->to('hostentries#do_update')->name('hostentryupd'); |
52 |
|
|
|
53 |
|
|
$if_admin->get('/ibays')->to('ibays#main')->name('ibays'); |
54 |
|
|
$if_admin->post('/ibays')->to('ibays#do_display')->name('ibayadd'); |
55 |
|
|
$if_admin->get('/ibaysd')->to('ibays#do_display')->name('ibaydis'); |
56 |
|
|
$if_admin->post('/ibaysd')->to('ibays#do_update')->name('ibayupd'); |
57 |
|
|
|
58 |
|
|
- |
59 |
|
|
$if_admin->get('/localnetworks')->to('localnetworks#main')->name('localnetworks'); |
60 |
|
|
$if_admin->post('/localnetworks')->to('localnetworks#do_display')->name('localnetworks'); |
61 |
|
|
$if_admin->post('/localnetworksa')->to('localnetworks#do_display')->name('localnetworksadd'); |
62 |
|
|
@@ -291,15 +291,17 @@ |
63 |
|
|
$if_admin->post('/portforwardinge')->to('portforwarding#do_display')->name('portforwardingdel1'); |
64 |
|
|
|
65 |
|
|
$if_admin->get('/printers')->to('printers#main')->name('printersg'); |
66 |
|
|
- $if_admin->get('/printers2')->to('printers#do_display')->name('printers2g'); |
67 |
|
|
+ $if_admin->post('/printers')->to('printers#do_display')->name('printera'); |
68 |
|
|
+ $if_admin->get('/printers2')->to('printers#do_display')->name('printer2g'); |
69 |
|
|
$if_admin->post('/printers2')->to('printers#do_update')->name('printers2p'); |
70 |
|
|
|
71 |
|
|
$if_admin->get('/proxy')->to('proxy#main')->name('proxy'); |
72 |
|
|
$if_admin->post('/proxy')->to('proxy#do_update')->name('proxy2'); |
73 |
|
|
|
74 |
|
|
- $if_admin->get('/pseudonyms')->to('pseudonyms#main')->name('pseudonymsg'); |
75 |
|
|
- $if_admin->get('/pseudonyms2')->to('pseudonyms#do_display')->name('pseudonyms2g'); |
76 |
|
|
- $if_admin->post('/pseudonyms2')->to('pseudonyms#do_update')->name('pseudonyms2p'); |
77 |
|
|
+ $if_admin->get('/pseudonyms')->to('pseudonyms#main')->name('pseudonymsl'); |
78 |
|
|
+ $if_admin->post('/pseudonyms')->to('pseudonyms#do_display')->name('pseudonyma'); |
79 |
|
|
+ $if_admin->get('/pseudonyms2')->to('pseudonyms#do_display')->name('pseudonymd'); |
80 |
|
|
+ $if_admin->post('/pseudonyms2')->to('pseudonyms#do_update')->name('pseudonymu'); |
81 |
|
|
|
82 |
|
|
$if_admin->get('/qmailanalog')->to('qmailanalog#main')->name('qmailanalog'); |
83 |
|
|
$if_admin->post('/qmailanalog')->to('qmailanalog#do_update')->name('qmailanalog2'); |
84 |
|
|
@@ -321,14 +323,14 @@ |
85 |
|
|
$if_admin->post('/useraccounts')->to('useraccounts#do_display')->name('useraccountadd'); |
86 |
|
|
$if_admin->get('/useraccountsd')->to('useraccounts#do_display')->name('useraccountdis'); |
87 |
|
|
$if_admin->post('/useraccountsd')->to('useraccounts#do_update')->name('useraccountupd'); |
88 |
|
|
+ $if_admin->post('/useraccountso')->to('useraccounts#do_display')->name('useraccountvpn'); |
89 |
|
|
|
90 |
|
|
$if_admin->get('/viewlogfiles')->to('viewlogfiles#main')->name('viewlogfiles'); |
91 |
|
|
$if_admin->post('/viewlogfiles')->to('viewlogfiles#do_action')->name('viewlogfiles2'); |
92 |
|
|
- $if_admin->get('/viewlogfilesr')->to('viewlogfiles#do_action')->name('viewlogfilesr'); |
93 |
|
|
+ $if_admin->post('/viewlogfilesr')->to('viewlogfiles#do_action')->name('viewlogfilesr'); |
94 |
|
|
|
95 |
|
|
$if_admin->get('/yum')->to('yum#main')->name('yum'); |
96 |
|
|
$if_admin->post('/yum')->to('yum#do_display')->name('yumd1'); |
97 |
|
|
- $if_admin->get('/yumd')->to('yum#do_display')->name('yumd'); |
98 |
|
|
$if_admin->post('/yumd')->to('yum#do_update')->name('yumu'); |
99 |
|
|
|
100 |
|
|
$if_admin->get('/welcome')->to('welcome#main')->name('welcome'); |
101 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/script/daily.sh smeserver-manager-0.1.2/root/usr/share/smanager/script/daily.sh |
102 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/script/daily.sh 2021-06-14 12:13:15.000000000 +0400 |
103 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/script/daily.sh 2021-06-13 20:57:18.000000000 +0400 |
104 |
|
|
@@ -2,18 +2,24 @@ |
105 |
|
|
|
106 |
|
|
#> unshift secrets values |
107 |
|
|
#> refresh Routes base |
108 |
|
|
+#> refresh Navigation menu bases |
109 |
|
|
+### refresh Rest password base |
110 |
|
|
#> expand smanager.conf et reload service |
111 |
|
|
+### smanager activity test |
112 |
|
|
|
113 |
|
|
-SCRIPT_DIR='/usr/share/smanager/script' |
114 |
|
|
+SMANAGER_DIR='/usr/share/smanager' |
115 |
|
|
|
116 |
|
|
# unshift secrets value |
117 |
|
|
-$SCRIPT_DIR/secrets.pl |
118 |
|
|
+$SMANAGER_DIR/script/secrets.pl |
119 |
|
|
|
120 |
|
|
# refresh routes database |
121 |
|
|
-$SCRIPT_DIR/routes.pl |
122 |
|
|
+$SMANAGER_DIR/script/routes.pl |
123 |
|
|
+ |
124 |
|
|
+# refresh Navigation menu database |
125 |
|
|
+#$SMANAGER_DIR/script/navigation.pl |
126 |
|
|
|
127 |
|
|
# smanager config files and databases |
128 |
|
|
-/sbin/e-smith/expand-template $SCRIPT_DIR/../conf/srvmngr.conf |
129 |
|
|
+/sbin/e-smith/expand-template $SMANAGER_DIR/conf/srvmngr.conf |
130 |
|
|
/sbin/e-smith/signal-event smanager-refresh |
131 |
|
|
|
132 |
|
|
exit 0 |
133 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/script/secrets.pl smeserver-manager-0.1.2/root/usr/share/smanager/script/secrets.pl |
134 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/script/secrets.pl 2021-06-14 12:13:15.000000000 +0400 |
135 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/script/secrets.pl 2021-06-14 12:14:49.778000000 +0400 |
136 |
|
|
@@ -42,7 +42,7 @@ |
137 |
|
|
$secrets[0] = $newpwd; |
138 |
|
|
my $secret = join ',', @secrets; |
139 |
|
|
$cdb->get('smanager')->set_prop('Secrets', $secret); |
140 |
|
|
- print("Secret values unshifted\n"); |
141 |
|
|
+ #print("Secret values unshifted\n"); |
142 |
|
|
} else { |
143 |
|
|
print("Secret generation error\n"); |
144 |
|
|
} |
145 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep |
146 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2020-11-19 11:53:26.000000000 +0400 |
147 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2021-06-14 19:49:24.000000000 +0400 |
148 |
|
|
@@ -2,7 +2,7 @@ |
149 |
|
|
|
150 |
|
|
% my $btn = l('GROUP_ADD'); |
151 |
|
|
|
152 |
|
|
- %= form_for '/groups2' => (method => 'GET') => begin |
153 |
|
|
+ %= form_for '/groups' => (method => 'POST') => begin |
154 |
|
|
|
155 |
|
|
%= hidden_field 'trt' => 'ADD' |
156 |
|
|
|
157 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep |
158 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep 2020-11-19 11:53:26.000000000 +0400 |
159 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep 2021-06-14 19:22:38.000000000 +0400 |
160 |
|
|
@@ -1,7 +1,7 @@ |
161 |
|
|
<div id='hos_del'> |
162 |
|
|
|
163 |
|
|
% my $btn = l('REMOVE'); |
164 |
|
|
- %= form_for '/hostentryd' => (method => 'POST') => begin |
165 |
|
|
+ %= form_for '/hostentriesd' => (method => 'POST') => begin |
166 |
|
|
<p> |
167 |
|
|
<h2> |
168 |
|
|
%=l 'hos_REMOVE_TITLE' |
169 |
|
|
@@ -14,7 +14,7 @@ |
170 |
|
|
|
171 |
|
|
<p><b> |
172 |
|
|
%=l 'hos_ABOUT_TO_REMOVE' |
173 |
|
|
- <b></p> |
174 |
|
|
+ </b></p> |
175 |
|
|
|
176 |
|
|
<p> |
177 |
|
|
<br> |
178 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep |
179 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2020-11-19 11:53:26.000000000 +0400 |
180 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2021-06-14 19:02:48.000000000 +0400 |
181 |
|
|
@@ -46,8 +46,8 @@ |
182 |
|
|
%= t td => (class => 'sme-border') => $_->{'Comment'}; |
183 |
|
|
% my ($actionModify, $actionRemove) = ' '; |
184 |
|
|
% if ($_->{'static'} ne 'yes') { |
185 |
|
|
- % $actionModify = "<a href='hostentryd?trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . l('MODIFY') . "</a>"; |
186 |
|
|
- % $actionRemove = "<a href='hostentryd?trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . l('REMOVE') . "</a>"; |
187 |
|
|
+ % $actionModify = "<a href='hostentriesd?trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . l('MODIFY') . "</a>"; |
188 |
|
|
+ % $actionRemove = "<a href='hostentriesd?trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . l('REMOVE') . "</a>"; |
189 |
|
|
% } |
190 |
|
|
<td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td> |
191 |
|
|
<td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td> |
192 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep |
193 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep 2020-11-19 11:53:26.000000000 +0400 |
194 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep 2021-06-14 19:03:23.000000000 +0400 |
195 |
|
|
@@ -3,7 +3,7 @@ |
196 |
|
|
|
197 |
|
|
% my $btn = l('NEXT'); |
198 |
|
|
|
199 |
|
|
- %= form_for '/hostentryd' => (method => 'POST') => begin |
200 |
|
|
+ %= form_for '/hostentriesd' => (method => 'POST') => begin |
201 |
|
|
<p><h2> |
202 |
|
|
% if ( $hos_datas->{trt} eq "ALC" ) { |
203 |
|
|
%=l 'hos_CREATE_TYPE' |
204 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep |
205 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep 2020-11-19 11:53:26.000000000 +0400 |
206 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep 2021-06-14 19:03:04.000000000 +0400 |
207 |
|
|
@@ -2,7 +2,7 @@ |
208 |
|
|
|
209 |
|
|
% my $btn = l('NEXT'); |
210 |
|
|
|
211 |
|
|
- %= form_for '/hostentryd' => (method => 'POST') => begin |
212 |
|
|
+ %= form_for '/hostentriesd' => (method => 'POST') => begin |
213 |
|
|
<p><h2> |
214 |
|
|
% if ( $hos_datas->{trt} eq "ADD" ) { |
215 |
|
|
%=l 'hos_CREATE_TITLE' |
216 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep |
217 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep 2020-11-19 11:53:26.000000000 +0400 |
218 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep 2021-06-14 19:03:13.000000000 +0400 |
219 |
|
|
@@ -3,7 +3,7 @@ |
220 |
|
|
|
221 |
|
|
% my $btn = l('MODIFY'); |
222 |
|
|
|
223 |
|
|
- %= form_for '/hostentryd' => (method => 'POST') => begin |
224 |
|
|
+ %= form_for '/hostentriesd' => (method => 'POST') => begin |
225 |
|
|
|
226 |
|
|
<p> |
227 |
|
|
%=l 'hos_REMOTE_PAGE_DESCRIPTION' |
228 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep |
229 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2020-11-19 11:53:26.000000000 +0400 |
230 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2021-06-14 18:52:38.000000000 +0400 |
231 |
|
|
@@ -3,7 +3,7 @@ |
232 |
|
|
|
233 |
|
|
% my $btn = l('prt_INITIAL_BTN'); |
234 |
|
|
|
235 |
|
|
- %= form_for '/printers2' => (method => 'GET') => begin |
236 |
|
|
+ %= form_for '/printers' => (method => 'POST') => begin |
237 |
|
|
|
238 |
|
|
%= hidden_field 'trt' => 'ADD' |
239 |
|
|
|
240 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep |
241 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2020-11-19 11:53:26.000000000 +0400 |
242 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2021-06-14 19:27:09.000000000 +0400 |
243 |
|
|
@@ -4,7 +4,7 @@ |
244 |
|
|
|
245 |
|
|
%= $c->render_to_string(inline => l('pse_DESCRIPTION')); |
246 |
|
|
|
247 |
|
|
- %= form_for '/pseudonyms2' => (method => 'GET') => begin |
248 |
|
|
+ %= form_for '/pseudonyms' => (method => 'POST') => begin |
249 |
|
|
|
250 |
|
|
%= hidden_field 'trt' => 'ADD' |
251 |
|
|
|
252 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep |
253 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2020-11-19 11:53:26.000000000 +0400 |
254 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2021-06-14 20:16:16.000000000 +0400 |
255 |
|
|
@@ -110,9 +110,8 @@ |
256 |
|
|
</p> |
257 |
|
|
|
258 |
|
|
% if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) { |
259 |
|
|
- % my $url = '/useraccountsd?TRT=CRT&user=' . $usr_datas->{user}; |
260 |
|
|
% my $btn2 = $c->l('DOWNLOAD'); |
261 |
|
|
- %= form_for $url => (method => 'GET') => begin |
262 |
|
|
+ %= form_for '/useraccountso' => (method => 'POST') => begin |
263 |
|
|
<p> |
264 |
|
|
<span class=label> |
265 |
|
|
%=l 'usr_LABEL_IPSECRW_DOWNLOAD' |
266 |
|
|
@@ -120,6 +119,8 @@ |
267 |
|
|
%= submit_button $btn2, class => 'action' |
268 |
|
|
</span> |
269 |
|
|
</p> |
270 |
|
|
+ %= hidden_field 'trt' => 'CRT' |
271 |
|
|
+ %= hidden_field 'user' => $usr_datas->{user} |
272 |
|
|
%end |
273 |
|
|
% } |
274 |
|
|
|
275 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep |
276 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep 2021-06-14 12:13:15.000000000 +0400 |
277 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep 2021-06-14 20:20:18.000000000 +0400 |
278 |
|
|
@@ -62,9 +62,8 @@ |
279 |
|
|
</p> |
280 |
|
|
|
281 |
|
|
% if ( $c->ipsec_for_acct eq 'OK' ) { |
282 |
|
|
- % my $url = '/useraccountsd?TRT=CRT&user=' . $usr_datas->{user}; |
283 |
|
|
% my $btn2 = $c->l('DOWNLOAD'); |
284 |
|
|
- %= form_for $url => (method => 'GET') => begin |
285 |
|
|
+ %= form_for '/useraccountso' => (method => 'POST') => begin |
286 |
|
|
<p> |
287 |
|
|
<span class=label> |
288 |
|
|
%=l 'usr_LABEL_IPSECRW_DOWNLOAD' |
289 |
|
|
@@ -72,6 +71,8 @@ |
290 |
|
|
%= submit_button $btn2, class => 'action' |
291 |
|
|
</span> |
292 |
|
|
</p> |
293 |
|
|
+ %= hidden_field 'trt' => 'CRT' |
294 |
|
|
+ %= hidden_field 'user' => $usr_datas->{user} |
295 |
|
|
%end |
296 |
|
|
% } |
297 |
|
|
|
298 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep |
299 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep 2021-06-14 12:13:14.000000000 +0400 |
300 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep 2021-06-14 17:57:32.000000000 +0400 |
301 |
|
|
@@ -18,7 +18,7 @@ |
302 |
|
|
<p> |
303 |
|
|
<% my $btn = l('log_REFRESH'); %> |
304 |
|
|
|
305 |
|
|
- %= form_for 'viewlogfilesr' => (method => 'GET') => begin |
306 |
|
|
+ %= form_for 'viewlogfilesr' => (method => 'POST') => begin |
307 |
|
|
%= submit_button "$btn", class => 'action' |
308 |
|
|
%= hidden_field 'trt' => $log_datas->{trt} |
309 |
|
|
%= hidden_field 'Filename' => $log_datas->{filename} |
310 |
|
|
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/yum.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/yum.html.ep |
311 |
|
|
--- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/yum.html.ep 2020-11-19 11:53:26.000000000 +0400 |
312 |
|
|
+++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/yum.html.ep 2021-06-15 12:26:09.204000000 +0400 |
313 |
|
|
@@ -18,11 +18,6 @@ |
314 |
|
|
</span> |
315 |
|
|
%} |
316 |
|
|
|
317 |
|
|
- <!-- br>Still incomplete click here for previous version |
318 |
|
|
- <a href="/server-manager/cgi-bin/yum" target='_blank'><b>(Previous Yum version)</b></a> |
319 |
|
|
- <br --> |
320 |
|
|
- |
321 |
|
|
- |
322 |
|
|
% if ( $c->is_empty('updates') ) { |
323 |
|
|
<br><div class=success><h2> |
324 |
|
|
%=l 'yum_TITLE_UPTODATE' |
325 |
|
|
@@ -38,25 +33,25 @@ |
326 |
|
|
%=l 'yum_DESC_UPDATES_AVAILABLE' |
327 |
|
|
</div><br> |
328 |
|
|
|
329 |
|
|
- %= form_for 'yumu' => (method => 'GET') => begin |
330 |
|
|
+ %= form_for 'yum' => (method => 'POST') => begin |
331 |
|
|
%= hidden_field 'trt' => 'UPDT' |
332 |
|
|
- %= submit_button $c->l('yum_BUTTON_INSTALL_UPDATES'), class => 'action2' |
333 |
|
|
+ %= submit_button $c->l('yum_BUTTON_INSTALL_UPDATES'), class => 'action' |
334 |
|
|
% end |
335 |
|
|
%} |
336 |
|
|
|
337 |
|
|
% if ( $c->non_empty('available') ) { |
338 |
|
|
- %= form_for 'yumu' => (method => 'GET') => begin |
339 |
|
|
+ %= form_for 'yum' => (method => 'POST') => begin |
340 |
|
|
<br> |
341 |
|
|
%= hidden_field 'trt' => 'INST' |
342 |
|
|
- %= submit_button $c->l('yum_BUTTON_INSTALL_AVAILABLE'), class => 'action2' |
343 |
|
|
+ %= submit_button $c->l('yum_BUTTON_INSTALL_AVAILABLE'), class => 'action' |
344 |
|
|
% end |
345 |
|
|
%} |
346 |
|
|
|
347 |
|
|
% if ( $c->non_empty('installed') ) { |
348 |
|
|
- %= form_for 'yumu' => (method => 'GET') => begin |
349 |
|
|
+ %= form_for 'yum' => (method => 'POST') => begin |
350 |
|
|
<br> |
351 |
|
|
%= hidden_field 'trt' => 'REMO' |
352 |
|
|
- %= submit_button $c->l('yum_BUTTON_REMOVE'), class => 'action2' |
353 |
|
|
+ %= submit_button $c->l('yum_BUTTON_REMOVE'), class => 'action' |
354 |
|
|
% end |
355 |
|
|
%} |
356 |
|
|
|
357 |
|
|
@@ -96,7 +91,7 @@ |
358 |
|
|
|
359 |
|
|
%= hidden_field 'trt' => 'CONF' |
360 |
|
|
<br> |
361 |
|
|
- %= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => 'action2' |
362 |
|
|
+ %= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => 'action' |
363 |
|
|
|
364 |
|
|
% end |
365 |
|
|
|