/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager-0.1.0-bz9457_bz8903_pseudo_acct_swtheme.patch
ViewVC logotype

Contents of /rpms/smeserver-manager/sme10/smeserver-manager-0.1.0-bz9457_bz8903_pseudo_acct_swtheme.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (show annotations) (download)
Sat Nov 21 08:43:40 2020 UTC (3 years, 6 months ago) by michel
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED 
* Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme
- Fix smanager-update event name
- Move smanager service to /usr/lib/systemd
- Fix Bugreport file download
- Fix translations missing in 'viewlogfiles'
- Remove Admin auth in httpd configuration
- Add an optional alias for admin sign in.
- Remove systemctl from .spec file
1 diff -urN smeserver-manager-0.1.0.old/createlinks smeserver-manager-0.1.0/createlinks
2 --- smeserver-manager-0.1.0.old/createlinks 2020-06-06 16:50:41.000000000 +0400
3 +++ smeserver-manager-0.1.0/createlinks 2020-06-12 22:38:05.635869737 +0400
4 @@ -18,14 +18,14 @@
5 }
6
7 templates2events("$mngrdir/conf/srvmngr.conf",
8 - qw( manager2-modify bootstrap-console-save console-save));
9 + qw( smanager-modify bootstrap-console-save console-save));
10 templates2events("/etc/systemd/system/smanager.service",
11 - qw( manager2-modify bootstrap-console-save console-save));
12 + qw( smanager-modify bootstrap-console-save console-save));
13
14 # services to launch on event
15
16 # actions to perform
17 -for my $event (qw( yum-install yum-update yum-remove manager2-refresh bootstrap-console-save console-save))
18 +for my $event (qw( yum-install yum-update yum-remove smanager-refresh bootstrap-console-save console-save))
19 {
20 event_link('navigation2-conf', "$event", '80');
21 event_link('routes2-conf', "$event", '80');
22 diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body
23 --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body 2020-05-31 16:09:46.000000000 +0400
24 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body 2020-06-12 22:38:43.291675967 +0400
25 @@ -1,7 +1,7 @@
26 {
27 $OUT = <<'EOF';
28
29 -/* from e-smith-manager to smeserver_manager2 */
30 +/* from e-smith-manager to smanager (smeserver_manager2) */
31
32 /*----------------------------------------------------------------------
33 * copyright (C) 1999-2003 Mitel Networks Corporation
34 diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs
35 --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs 2020-05-31 16:09:46.000000000 +0400
36 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs 2020-06-12 22:38:58.194599098 +0400
37 @@ -1,7 +1,7 @@
38 {
39 $OUT =<<'HERE';
40
41 -/* from e-smith-manager to smeserver_manager2 */
42 +/* from e-smith-manager to smanager (smeserver_manager2) */
43
44 /*----------------------------------------------------------------------
45 * copyright (C) 1999-2003 Mitel Networks Corporation
46 diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body
47 --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body 2020-05-31 16:09:46.000000000 +0400
48 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body 2020-06-12 22:39:17.459499580 +0400
49 @@ -1,7 +1,7 @@
50 {
51 $OUT = <<'EOF';
52
53 -/* from e-smith-manager to smeserver_manager2 */
54 +/* from e-smith-manager to smanager (smeserver_manager2) */
55
56 /*----------------------------------------------------------------------
57 * copyright (C) 1999-2003 Mitel Networks Corporation
58 diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs
59 --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs 2020-05-31 16:09:46.000000000 +0400
60 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs 2020-06-12 22:39:31.891427198 +0400
61 @@ -1,7 +1,7 @@
62 {
63 $OUT =<<'HERE';
64
65 -/* from e-smith-manager to smeserver_manager2 */
66 +/* from e-smith-manager to smanager (smeserver_manager2) */
67
68 /*----------------------------------------------------------------------
69 * copyright (C) 1999-2003 Mitel Networks Corporation
70 diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body
71 --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body 2020-05-31 16:09:46.000000000 +0400
72 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body 2020-06-12 22:39:48.540353738 +0400
73 @@ -1,7 +1,7 @@
74 {
75 $OUT = <<'EOF';
76
77 -/* from e-smith-manager to smeserver_manager2 */
78 +/* from e-smith-manager to smanager (smeserver_manager2) */
79
80 /*----------------------------------------------------------------------
81 * copyright (C) 1999-2003 Mitel Networks Corporation
82 diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body
83 --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body 2020-06-07 12:17:54.000000000 +0400
84 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body 2020-06-12 22:40:03.642286411 +0400
85 @@ -1,7 +1,7 @@
86 {
87 $OUT = <<'EOF';
88
89 -/* smeserver_manager2 */
90 +/* smanager (smeserver_manager2) */
91
92 /*----------------------------------------------------------------------
93 * copyright (C) 1999-2003 Mitel Networks Corporation
94 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm
95 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2020-05-30 20:49:51.000000000 +0400
96 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2020-06-12 22:35:06.612778233 +0400
97 @@ -781,7 +781,7 @@
98 $rec->set_prop('start', time);
99
100 my $sec = 10;
101 - print "Refresh: $sec; URL=/server-manager2/backup\n";
102 + print "Refresh: $sec; URL=/smanager/backup\n";
103 print $c->l('bac_NOW_RESTORING_FROM_TAPE');
104 print $c->l('bac_MUST_REBOOT_AFTER_RESTORE');
105 print $c->l('bac_PAGE_REFRESH_IN', $sec);
106 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Modules.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Modules.pm
107 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Modules.pm 2020-05-30 20:44:29.000000000 +0400
108 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Modules.pm 2020-06-12 22:51:41.055806376 +0400
109 @@ -27,21 +27,6 @@
110 };
111
112
113 -sub starterwebsite {
114 - my $c = shift;
115 -
116 - $c->app->log->info($c->log_req);
117 -
118 - my $modul = $c->render_to_string(inline => "<p># my (\$lang, <b>\$releaseVersion,</b>
119 -
120 -<br># \$c->stash\(\'lang\', \'releaseVer\'
121 -# \'navigation\'</p>");
122 -
123 - $c->stash( modul => $modul, PwdSet => '1', Unsafe => '0' );
124 -
125 -};
126 -
127 -
128 sub support {
129 my $c = shift;
130
131 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Starterwebsite.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Starterwebsite.pm
132 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Starterwebsite.pm 2020-05-30 20:45:45.000000000 +0400
133 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Starterwebsite.pm 1970-01-01 04:00:00.000000000 +0400
134 @@ -1,160 +0,0 @@
135 -package SrvMngr::Controller::Starterwebsite;
136 -
137 -#----------------------------------------------------------------------
138 -# heading : Miscellaneous
139 -# description : Create starter web site
140 -# navigation : 7000 7100
141 -#
142 -# routes : end
143 -#----------------------------------------------------------------------
144 -use strict;
145 -use warnings;
146 -use Mojo::Base 'Mojolicious::Controller';
147 -
148 -use Locale::gettext;
149 -use esmith::util qw( chownFile );
150 -
151 -use SrvMngr::I18N;
152 -use SrvMngr qw(theme_list init_session);
153 -
154 -our $db = esmith::ConfigDB->open_ro || die "Couldn't open config db";
155 -
156 -sub main {
157 - my $c = shift;
158 - $c->app->log->info($c->log_req);
159 -
160 - my $title = $c->l('sws_FORM_TITLE');
161 - my $modul = $c->render_to_string(inline => $c->l('sws_DESCRIPTION'));
162 -
163 - $c->stash( title => $title, modul => $modul );
164 - $c->render(template => 'starterwebsite');
165 -};
166 -
167 -
168 -sub do_site {
169 - my $c = shift;
170 - $c->app->log->info($c->log_req);
171 -
172 - my $companyname = $c->param('l_company');
173 - my $header1 = $c->param('l_header1');
174 - my $desc1 = $c->param('l_desc1');
175 - my $header2 = $c->param('l_header2');
176 - my $desc2 = $c->param('l_desc2');
177 -
178 - my $result = "";
179 -# if ( ( $companyname !~ /[\p{L}]+/ ) || ( $header1 !~ /[\p{L}]+/ ) || ( $desc1 !~ /[\p{L}]+/ ) ) {
180 - if (($companyname =~ /^\s*$/s) or ($header1 =~ /^\s*$/s) or ($desc1 =~ /^\s*$/s)) {
181 - $result .= 'Minimum information required !, ';
182 - }
183 -
184 - my $title = $c->l('sws_FORM_TITLE');
185 -
186 - if (change2_settings( $c, $companyname, $header1, $desc1, $header2, $desc2 ) != 0) {
187 - $result .= 'Htm file creation error !!';
188 - }
189 -
190 - if ( $result eq '' ) {
191 - my $url = "http://www.".$db->get('DomainName')->value();
192 - my $href = "<a href=\"$url\">$url</a>";
193 - $result = $c->render_to_string(inline => $c->l('sws_SUCCESS').'<br>'.$href);
194 - }
195 -
196 - $c->flash( success => $result );
197 - $c->redirect_to("/");
198 -};
199 -
200 -
201 -sub change2_settings {
202 - my ($c, $companyname, $header1, $desc1, $header2, $desc2) = @_;
203 -
204 - my $primary_location = '/home/e-smith/files/ibays/Primary/html/index.htm';
205 -
206 - if (! open (WR, ">$primary_location")) { return 1; }
207 -
208 - format_page($c, $companyname, $header1, $desc1, $header2, $desc2);
209 -
210 - close WR;
211 -
212 - esmith::util::chownFile("admin", "shared",
213 - $primary_location);
214 - chmod 0640, $primary_location;
215 - return 0;
216 -}
217 -
218 -
219 -sub format_page {
220 - my ($c, $companyname, $header1, $desc1, $header2, $desc2) = @_;
221 -
222 -
223 - print WR "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n";
224 - print WR "\n";
225 - print WR "<HTML>\n";
226 - print WR "\n";
227 - print WR "<HEAD>\n";
228 - print WR "<TITLE>$companyname</TITLE>\n";
229 - print WR "<META HTTP-EQUIV=\"Expires\" CONTENT=\"0\">\n";
230 - print WR "</HEAD>\n";
231 - print WR "\n";
232 - print WR "<BODY BGCOLOR=\"#FFFFFF\" MARGINWIDTH=\"0\" MARGINHEIGHT=\"0\" LEFTMARGIN=\"0\" TOPMARGIN=\"0\">\n";
233 - print WR "\n";
234 - print WR "<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"10\" WIDTH=\"100%\">\n";
235 - print WR "\n";
236 - print WR "<TR>\n";
237 - print WR "<TD BGCOLOR=\"#290099\" COLSPAN=\"2\"><FONT COLOR=\"#F7E0B5\"><H1>$companyname</H1></FONT></TD>\n";
238 - print WR "</TR>\n";
239 - print WR "\n";
240 - print WR "<TR>\n";
241 - print WR "<TD BGCOLOR=\"#F7E0B5\" WIDTH=\"15%\">&nbsp;</TD>\n";
242 - print WR "<TD BGCOLOR=\"#FFFFFF\" WIDTH=\"85%\">\n";
243 - print WR "\n";
244 -
245 - if ($header1 !~ /^\s*$/s)
246 - {
247 - print WR "<FONT COLOR=\"#000000\"><H2>$header1</H2></FONT>\n";
248 - print WR "\n";
249 - }
250 -
251 - if ($desc1 !~ /^\s*$/s)
252 - {
253 - $desc1 =~ s/^\s*(.*?)\s*$/$1/s;
254 - $desc1 =~ s/\r\s*\r/<P>/sg;
255 -
256 - print WR "<FONT COLOR=\"#290099\">\n";
257 - print WR "<P>\n";
258 - print WR "$desc1\n";
259 - print WR "</P>\n";
260 - print WR "</FONT>\n";
261 - print WR "\n";
262 - }
263 -
264 - if ($header2 !~ /^\s*$/s)
265 - {
266 - print WR "<FONT COLOR=\"#000000\"><H2>$header2</H2></FONT>\n";
267 - print WR "\n";
268 - }
269 -
270 - if ($desc2 !~ /^\s*$/s)
271 - {
272 - $desc2 =~ s/^\s*(.*?)\s*$/$1/s;
273 - $desc2 =~ s/\r\s*\r/<P>/sg;
274 -
275 - print WR "<FONT COLOR=\"#290099\">\n";
276 - print WR "<P>\n";
277 - print WR "$desc2\n";
278 - print WR "</P>\n";
279 - print WR "</FONT>\n";
280 - print WR "\n";
281 - }
282 -
283 - print WR "\n";
284 - print WR "</TD>\n";
285 - print WR "</TR>\n";
286 - print WR "</TABLE>\n";
287 - print WR "</BODY>\n";
288 - print WR "</HTML>\n";
289 -
290 - close WR;
291 -}
292 -
293 -
294 -1;
295 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm
296 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm 2020-05-30 20:48:00.000000000 +0400
297 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm 2020-06-12 22:34:34.661937324 +0400
298 @@ -34,8 +34,8 @@
299 # }
300 $c->session->{CurrentTheme} = $theme;
301
302 - $db->get('manager2')->set_prop('Theme', $theme);
303 - system ("/sbin/e-smith/signal-event manager2-modify") == 0
304 + $db->get('smanager')->set_prop('Theme', $theme);
305 + system ("/sbin/e-smith/signal-event smanager-modify") == 0
306 or warn "$c->l('ERROR_UPDATING')";
307 }
308
309 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm
310 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2020-05-30 20:48:54.000000000 +0400
311 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2020-06-12 23:46:57.892515085 +0400
312 @@ -785,7 +785,8 @@
313
314 $acct->merge_props(%newProperties);
315
316 - $adb->create_user_auto_pseudonyms($acctName);
317 + $adb->create_user_auto_pseudonyms($acctName)
318 + if ( ($cdb->get_prop('pseudonyms','create') || 'enabled') eq 'enabled' );
319
320 my @old_groups = $adb->user_group_list($acctName);
321 my @new_groups = @{$c->every_param("groupMemberships")};
322 @@ -826,7 +827,8 @@
323 my $acct = $adb->new_record($acctName)
324 or warn "Can't create new account for $acctName (does it already exist?)\n";
325 $acct->reset_props(%userprops);
326 - $adb->create_user_auto_pseudonyms($acctName);
327 + $adb->create_user_auto_pseudonyms($acctName)
328 + if ( ($cdb->get_prop('pseudonyms','create') || 'enabled') eq 'enabled' );
329 my @groups = @{$c->every_param("groupMemberships")};
330
331 $adb->add_user_to_groups($acctName, @groups);
332 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_en.lex
333 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_en.lex 2020-04-15 21:43:42.000000000 +0400
334 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_en.lex 1970-01-01 04:00:00.000000000 +0400
335 @@ -1,38 +0,0 @@
336 -
337 -'sws_FORM_TITLE' => 'Create a starter website',
338 -'sws_SUCCESS' => 'Successfully created starter web site (wrote file index.htm).
339 - You can visit your new website at the address below:',
340 -'sws_DESCRIPTION' => '<p>
341 -To create a simple web page for your company, fill
342 -in the fields below and click on <b>Create</b>.
343 -</p><p>
344 -You can leave any field blank if you do not need it.
345 -</p><p>
346 -The text that you enter below will be line wrapped
347 -for a nicer appearance in your web page. Leave a blank line
348 -whenever you want to start a new paragraph. If you need
349 -to force a line break without starting a new paragraph (for
350 -example after each line of a mailing address), then type
351 -the four-character sequence
352 -<blockquote>&lt;BR&gt;</blockquote>
353 -where you would like each line break.
354 -</p><p>
355 -<em>Do not use this option</em>
356 -if you have already customized your web site, since it will
357 -overwrite the "index.htm" file in your web site directory.
358 -</p>',
359 -'sws_LABEL_COMPANYNAME' => 'Company name',
360 -'sws_DESC_HEADER1' => 'First header, typically used for short phrases such
361 -as "Leader in the field of textile manufacturing"',
362 -'sws_DESC_TEXT1' => 'Text following first header, typically used for a
363 -paragraph of marketing information.',
364 -'sws_DESC_HEADER2' => 'Second header, typically used for short phrases such
365 -as "For more information" or "To order our products":',
366 -'sws_DESC_TEXT2' => 'Text following second header, typically used for contact
367 -or ordering information:',
368 -'sws_DESC_SUBMIT' => '<p>When you create this web page, the file
369 -"index.htm" will be overwritten
370 -in your web site directory.</p>
371 -<p>Do you wish to proceed?</p>',
372 -'sws_Create starter web site' => 'Create starter web site',
373 -
374 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_fr.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_fr.lex
375 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_fr.lex 2020-05-27 14:53:01.000000000 +0400
376 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_fr.lex 1970-01-01 04:00:00.000000000 +0400
377 @@ -1,21 +0,0 @@
378 -sws_FORM_TITLE => 'Création d\'un premier site Web',
379 -'sws_FORM_TITLE' =>
380 -'Création d\'un premier site Web',
381 -'sws_SUCCESS' =>
382 -'Création réussie de votre premier site Web (écriture du fichier index.htm). Vous pouvez voir ce nouveau site Web à l\'adresse suivante :',
383 -'sws_DESCRIPTION' =>
384 -' <p>Pour créer une page Web simple pour votre organisation, remplissez les champs ci-dessous et cliquez sur le bouton "Créer".</p> <p>Vous pouvez laisser n\'importe lequel de ces champs vide si vous n\'en avez pas l\'utilité.</p> <p>Le texte que vous taperez ci-dessous s\'affichera avec des retours à la ligne automatiques pour que la page Web soit conforme à ce que vous tapez. Laissez une ligne vide chaque fois que vous voulez commencer un nouveau paragraphe. Si vous avez besoin d\'imposer un retour à la ligne sans commencer un nouveau paragraphe (par exemple, après chaque ligne d\'une adresse), alors tapez la séquence de quatre caractères : <blockquote>&lt;BR&gt;</blockquote> où vous souhaitez avoir le saut de ligne.</p> <p><b>N\'utilisez pas cette fonctionnalité</b> si vous avez déjà personnalisé votre site Web, car elle écrasera le contenu du fichier "index.htm" de votre site primaire.</p> ',
385 -'sws_LABEL_COMPANYNAME' =>
386 -'Nom de votre organisation',
387 -'sws_DESC_HEADER1' =>
388 -'Le premier en-tête est généralement utilisé pour des phrases courtes comme "Leader dans le domaine de la fabrication textile" :',
389 -'sws_DESC_TEXT1' =>
390 -'Le texte qui suit le premier en-tête est généralement utilisé pour décrire votre organisation de façon détaillée :',
391 -'sws_DESC_HEADER2' =>
392 -'Le deuxième en-tête est généralement utilisé pour des phrases courtes comme "Pour de plus amples informations" ou "Pour commander nos produits" :',
393 -'sws_DESC_TEXT2' =>
394 -'Le texte qui suit le deuxième en-tête est généralement utilisé pour fournir les informations relatives au contact ou à la commande :',
395 -'sws_DESC_SUBMIT' =>
396 -' <p>Lorsque vous créerez cette page Web, le fichier "index.htm" sera écrasé dans le répertoire de votre site primaire.</p> <p><b>Voulez-vous continuer ?</b></p> ',
397 -'sws_Create starter web site' =>
398 -'Votre premier site Web',
399 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test1/test1_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test1/test1_en.lex
400 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test1/test1_en.lex 2020-04-19 22:25:19.000000000 +0400
401 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test1/test1_en.lex 1970-01-01 04:00:00.000000000 +0400
402 @@ -1,9 +0,0 @@
403 -'tst1_FORM_TITLE' => 'TEST Module 1 - simple display (\'review\')',
404 -'tst1_TEST_DESCRIPTION' => '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et dui scelerisque,
405 - scelerisque augue sit amet, dignissim risus. Maecenas non lacinia ex. Nunc tempus consequat quam eget tincidunt.
406 - In nec justo sed diam tristique lobortis vitae eget enim. Ut auctor faucibus tempor.
407 -</p><p> Pellentesque nec libero sit amet nibh pretium maximus sed a nibh. Praesent nec rutrum urna, aliquam dignissim nunc.
408 - Proin pretium accumsan tellus, ac bibendum ante faucibus id. Nulla facilisi. Sed turpis risus, gravida a sapien ac,
409 - tincidunt accumsan ex.</p>',
410 -'tst1_LABEL_DOMAIN' => 'Domain ',
411 -'tst1_LABEL_BACKUP_PROGRAM' => 'Backup program ',
412 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test2/test2_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test2/test2_en.lex
413 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test2/test2_en.lex 2020-04-25 13:30:57.000000000 +0400
414 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test2/test2_en.lex 1970-01-01 04:00:00.000000000 +0400
415 @@ -1,12 +0,0 @@
416 -'tst2_FORM_TITLE' => 'TEST Module 2 - display and change (\'directory\')',
417 -'tst2_TEST_DESCRIPTION' => '<p>Mauris nec viverra quam. Praesent at tempus dui, quis maximus nibh. Praesent sagittis ut velit placerat pharetra. Pellentesque ullamcorper metus at hendrerit rhoncus. Mauris eu lorem sem. In et mattis orci. Quisque faucibus sed leo vitae volutpat. Proin nec lobortis justo, ac consequat turpis. Etiam lectus dolor, interdum in sapien et, interdum laoreet nisi. Vivamus eget elit in eros elementum tincidunt. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et dui scelerisque,
418 - scelerisque augue sit amet, dignissim risus. Maecenas non lacinia ex. Nunc tempus consequat quam eget tincidunt.
419 - In nec justo sed diam tristique lobortis vitae eget enim. Ut auctor faucibus tempor.
420 -</p><p> Pellentesque nec libero sit amet nibh pretium maximus sed a nibh. Praesent nec rutrum urna, aliquam dignissim nunc.
421 - Proin pretium accumsan tellus, ac bibendum ante faucibus id. Nulla facilisi. Sed turpis risus, gravida a sapien ac,
422 - tincidunt accumsan ex.</p>',
423 -'tst2_LABEL_DOMAIN' => 'Domain ',
424 -'tst2_LABEL_BACKUP_PROGRAM' => 'Backup program ',
425 -'tst2_DOMAIN_ERROR' => 'Error on Domain name ',
426 -'tst2_BACKUP_PROGRAM_ERROR' => 'Error on Backup program ',
427 -'tst2_ENABLE_BACKUP' => 'Backup ',
428 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test3/test3_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test3/test3_en.lex
429 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test3/test3_en.lex 2020-04-25 13:22:34.000000000 +0400
430 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test3/test3_en.lex 1970-01-01 04:00:00.000000000 +0400
431 @@ -1,20 +0,0 @@
432 -'tst3_FORM_TITLE' => 'TEST Module 3 - multiple choices (ex: \'email\')',
433 -'tst3_TEST_DESCRIPTION' => '<p>Mauris nec viverra quam. Praesent at tempus dui, quis maximus nibh. Praesent sagittis ut velit placerat pharetra. Pellentesque ullamcorper metus at hendrerit rhoncus. Mauris eu lorem sem. In et mattis orci. Quisque faucibus sed leo vitae volutpat. Proin nec lobortis justo, ac consequat turpis. Etiam lectus dolor, interdum in sapien et, interdum laoreet nisi. Vivamus eget elit in eros elementum tincidunt. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et dui scelerisque,
434 - scelerisque augue sit amet, dignissim risus. Maecenas non lacinia ex. Nunc tempus consequat quam eget tincidunt.
435 - In nec justo sed diam tristique lobortis vitae eget enim. Ut auctor faucibus tempor.
436 -</p><p> Pellentesque nec libero sit amet nibh pretium maximus sed a nibh. Praesent nec rutrum urna, aliquam dignissim nunc.
437 - Proin pretium accumsan tellus, ac bibendum ante faucibus id. Nulla facilisi. Sed turpis risus, gravida a sapien ac,
438 - tincidunt accumsan ex.</p>',
439 -'tst3_CHOICE' => 'Choice ',
440 -'tst3_CHOICE1_DESCRIPTION' => 'The choice n°1 is the first one... yes',
441 -'tst3_CHOICE2_DESCRIPTION' => 'The choice n°2 is the second one... yes',
442 -'tst3_CHOICE1_LABEL' => 'Choice n°1',
443 -'tst3_CHOICE2_LABEL' => 'Choice n°2',
444 -'tst3_CHOICE1' => 'choice 1',
445 -'tst3_CHOICE2' => 'choice 2',
446 -'tst3_LABEL_DOMAIN' => 'Domain ',
447 -'tst3_LABEL_BACKUP_PROGRAM' => 'Backup program ',
448 -'tst3_TEST_FIN' => 'Proin pretium accumsan tellus, ac bibendum ante faucibus id.',
449 -'tst3_DOMAIN_ERROR' => 'Error on the Domain name ',
450 -'tst3_BACKUP_PROGRAM_ERROR' => 'Error on backup program ',
451 -'tst3_ENABLE_BACKUP' => 'Backup ',
452 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_en.lex
453 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_en.lex 2020-04-01 00:06:27.000000000 +0400
454 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_en.lex 1970-01-01 04:00:00.000000000 +0400
455 @@ -1,42 +0,0 @@
456 -'wbl_SAVE' => 'Save',
457 -'wbl_PERFORM' => 'Perform',
458 -'wbl_FORM_TITLE' => 'E-mail WBL',
459 -'wbl_OPERATION_STATUS_REPORT' => 'Operation status report',
460 -'wbl_WBL_DESCRIPTION' => 'E-mail traffic is scanned and may be blocked due to the various screening methods enabled.
461 -You may use this panel to define e-mail white/black lists.',
462 -'wbl_RBL_LIST_DESCRIPTION' => 'RBL\'s List is used to adjust DNSBL and RHSBL.',
463 -'wbl_RBL_LIST' => 'RBL\'s List',
464 -'wbl_BLACK_LIST_DESCRIPTION' => 'Black lists are used for rejecting e-mail traffic.',
465 -'wbl_BLACK_LIST' => 'Black List',
466 -'wbl_WHITE_LIST_DESCRIPTION' => 'White lists are used for accepting e-mail traffic.',
467 -'wbl_WHITE_LIST' => 'White List',
468 -'wbl_BLACK_TITLE' => 'This server includes built-in support for using the admin defined black lists, badhelo and
469 - badmailfrom.',
470 -'wbl_DNSBL_DESCRIPTION' => 'DNSBL is an abbreviation for "DNS blacklist".',
471 -'wbl_DNSBL_LABEL' => 'DNSBL status',
472 -'wbl_RHSBL_DESCRIPTION' => 'RHSBL is an abbreviation for "Right Hand Side Blacklist". ',
473 -'wbl_RHSBL_LABEL' => 'RHSBL status',
474 -'wbl_BADHELO_DESCRIPTION' => 'Check a HELO message delivered from a connecting host.Reject any
475 -that appear in badhelo during the \'helo\' stage.',
476 -'wbl_BADHELO_LABEL' => 'qpsmtpd badhelo',
477 -'wbl_BADMAILFROM_DESCRIPTION' => 'Check envelope sender addresses. Reject any
478 -that appear (@host or user@host) in badmailfrom during the \'mail\' stage.',
479 -'wbl_BADMAILFROM_LABEL' => 'qmail badmailfrom',
480 -'wbl_WHITE_TITLE' => 'Use this panel to modify your servers White List settings. All entries will be enabled by default',
481 -'wbl_RRFH_LABEL' => 'Whitelists status',
482 -'wbl_WHITELISTHOSTS_DESCRIPTION' => 'Any IP address listed in whitelisthosts will be exempted
483 -from any further validation during the \'connect\' stage.',
484 -'wbl_WHITELISTHOSTS_LABEL' => 'qpsmtpd whitelisthosts',
485 -'wbl_WHITELISTHELO_DESCRIPTION' => 'be exempted from further validation during the \'helo\' stage.',
486 -'wbl_WHITELISTHELO_LABEL' => 'qpsmtpd whitelisthelo',
487 -'wbl_WHITELISTSENDERS_DESCRIPTION' => 'will be exempted from further validation during the \'mail\' stage.',
488 -'wbl_WHITELISTSENDERS_LABEL' => 'qpsmtpd whitelistsenders',
489 -'wbl_WHITELISTFROM_DESCRIPTION' => 'will be exempted from spamassassin rejection.',
490 -'wbl_WHITELISTFROM_LABEL' => 'spamassassin whitelist_from',
491 -'wbl_BLACKLISTFROM_LABEL' => 'spamassassin blacklist_from',
492 -'wbl_BLACKLISTFROM_DESCRIPTION' => 'will be rejected by spamassassin.',
493 -'wbl_SBLLIST_LABEL' => 'RHSBL (qpsmtpd SBLList)',
494 -'wbl_SBLLIST_DESCRIPTION' => 'RHS block list - \'right hand side\' of senders host/domain will be checked against the following servers',
495 -'wbl_RBLLIST_LABEL' => 'DNSBL Zones (qpsmtpd RBLList)',
496 -'wbl_RBLLIST_DESCRIPTION' => 'DNS Block List - senders IP address will be checked against the following servers',
497 -'wbl_RBL_TITLE' => 'Real-time Blackhole Lists are disabled by default. To help reduce spam you can enable RBLs here.',
498 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_fr.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_fr.lex
499 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_fr.lex 2020-04-01 00:02:44.000000000 +0400
500 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_fr.lex 1970-01-01 04:00:00.000000000 +0400
501 @@ -1,37 +0,0 @@
502 -'wbl_SAVE' => 'Sauvegarder',
503 -'wbl_PERFORM' => 'Exécuter',
504 -'wbl_FORM_TITLE' => 'WBL courriel',
505 -'wbl_OPERATION_STATUS_REPORT' => 'Rapport d\'état de l\'opération',
506 -'wbl_WBL_DESCRIPTION' => 'Le trafic courriel est scanné et peut être bloqué en raison des différentes méthodes de dépistage activées. Vous pouvez utiliser ce panneau pour définir les listes blanches / noires de courriels.',
507 -'wbl_RBL_LIST_DESCRIPTION' => 'La liste RBL est utilisée pour ajuster DNSBL et RHSBL.',
508 -'wbl_RBL_LIST' => 'Liste RBL',
509 -'wbl_BLACK_LIST_DESCRIPTION' => 'Les listes noires sont utilisées pour refuser le trafic de courriels.',
510 -'wbl_BLACK_LIST' => 'Liste noire',
511 -'wbl_WHITE_LIST_DESCRIPTION' => 'Les listes blanches sont utilisées pour accepter le trafic de courriels.',
512 -'wbl_WHITE_LIST' => 'Liste blanche',
513 -'wbl_BLACK_TITLE' => 'Ce serveur inclus un support intégré permettant à l\'administrateur de définir des listes noires, badhelo et badmailfrom.',
514 -'wbl_DNSBL_DESCRIPTION' => 'DNSBL est une abréviation Anglaise pour "Liste noire DNS".',
515 -'wbl_DNSBL_LABEL' => 'Statut DNSBL',
516 -'wbl_RHSBL_DESCRIPTION' => 'RHSBL est une abréviation pour "Right Hand Side Blacklist".',
517 -'wbl_RHSBL_LABEL' => 'Rapport d\'état de RHSBL',
518 -'wbl_BADHELO_DESCRIPTION' => 'Vérifie un message HELO livré par un hôte se connectant. Ceci refuse tout ceux qui apparaissent dans badhelo au moment de la phase \'helo\'.',
519 -'wbl_BADHELO_LABEL' => 'qpsmtpd badhelo',
520 -'wbl_BADMAILFROM_DESCRIPTION' => 'Vérifie l\'adresse de l\'expéditeur. Refuse tout ce qui apparaît (@hôte ou utilisateur@hôte) dans\'badmailfrom\' pendant la phase \'mail\'',
521 -'wbl_BADMAILFROM_LABEL' => 'qmail \'badmailfrom\'',
522 -'wbl_WHITE_TITLE' => 'Utilisez cette page pour modifier les paramètres de liste blanche de de votre serveur. Toutes les entrées seront activées par default',
523 -'wbl_RRFH_LABEL' => 'État des listes blanches',
524 -'wbl_WHITELISTHOSTS_DESCRIPTION' => 'Toute IP présente dans whitelisthosts sera exemptée de toutes validations supplémentaires pendant la phase \'connexion\'',
525 -'wbl_WHITELISTHOSTS_LABEL' => 'Qpsmtpd whitelisthosts',
526 -'wbl_WHITELISTHELO_DESCRIPTION' => 'Tout hôte qui émet un HELO correspondant à une entrée dans whitelisthelo sera exempté de toute autre validation pendant la phase \'helo\'',
527 -'wbl_WHITELISTHELO_LABEL' => 'qpsmtpd whitelisthelo',
528 -'wbl_WHITELISTSENDERS_DESCRIPTION' => 'Tout expéditeur d\'un courriel (hôte.domaine ou utilisateur@hôte.domaine) correspondant à une entrée dans la liste blanche des expéditeurs (whitelistsenders) sera exempté de toutes validations supplémentaires durant la phase \'mail\'.',
529 -'wbl_WHITELISTSENDERS_LABEL' => 'qpsmtpd whitelistsenders',
530 -'wbl_WHITELISTFROM_DESCRIPTION' => 'Tout expéditeur d\'un courriel (*@hôte ou utilisateur@hôte) correspondant à une entrée dans whitelist_from sera exempté d\'un rejet par spamassassin.',
531 -'wbl_WHITELISTFROM_LABEL' => 'spamassassin whitelist_from',
532 -'wbl_BLACKLISTFROM_LABEL' => 'spamassassin blacklist_from',
533 -'wbl_BLACKLISTFROM_DESCRIPTION' => 'Tout expéditeur d\'un courriel (*@hôte ou utilisateur@hôte) correspondant à une entrée dans blacklist_from sera rejeté par spamassassin.',
534 -'wbl_SBLLIST_LABEL' => 'RHSBL (qpsmtpd SBLList)',
535 -'wbl_SBLLIST_DESCRIPTION' => 'Liste de blocage RHS - (Right Hand Side) des expéditeurs hôte / domaine sera vérifié contre les serveurs suivants',
536 -'wbl_RBLLIST_LABEL' => 'DNSBL Zones (qpsmtpd RBLList)',
537 -'wbl_RBLLIST_DESCRIPTION' => 'Liste de bloquage DNS -L\'adresse IP des expéditeurs sera vérifiée à partir des serveurs suivants.',
538 -'wbl_RBL_TITLE' => 'Les listes noires en temps réel sont désactivés par défaut. Pour aider à réduire le spam vous pouvez activer les RBLs ici.',
539 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr.pm
540 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr.pm 2020-06-11 00:07:31.000000000 +0400
541 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr.pm 2020-06-12 22:49:44.935405852 +0400
542 @@ -280,10 +280,6 @@
543 $if_admin->get('/remoteaccess')->to('remoteaccess#main')->name('remoteaccess');
544 $if_admin->post('/remoteaccess')->to('remoteaccess#do_action')->name('remoteaccessact');
545
546 -
547 - $if_admin->get('/starterwebsite')->to('starterwebsite#main')->name('starterwebsite');
548 - $if_admin->post('/starterwebsite')->to('starterwebsite#do_site')->name('starterwebsite2');
549 -
550 $if_admin->get('/support')->to('support#main')->name('support');
551 $if_admin->post('/swttheme')->to('swttheme#main')->name('swttheme');
552
553 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep
554 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep 2020-04-15 21:43:35.000000000 +0400
555 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep 2020-06-12 22:31:03.749947061 +0400
556 @@ -2,7 +2,7 @@
557
558 % my $btn = l('REMOVE');
559
560 - %= form_for '/useraccountd' => (method => 'POST') => begin
561 + %= form_for '/useraccountsd' => (method => 'POST') => begin
562 <p>
563 <h2>
564 %=l 'usr_REMOVE_ACCOUNT_TITLE'
565 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep
566 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep 2020-04-15 21:43:35.000000000 +0400
567 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep 2020-06-12 22:30:55.885982832 +0400
568 @@ -2,7 +2,7 @@
569
570 % my $btn = l('usr_LOCK');
571
572 - %= form_for '/useraccountd' => (method => 'POST') => begin
573 + %= form_for '/useraccountsd' => (method => 'POST') => begin
574 <p>
575 <h2>
576 %=l 'usr_LOCK_ACCOUNT_TITLE'
577 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep
578 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep 2020-04-15 21:43:35.000000000 +0400
579 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep 2020-06-12 22:30:46.902023483 +0400
580 @@ -2,7 +2,7 @@
581
582 % my $btn = l('SAVE');
583
584 - %= form_for '/useraccountd' => (method => 'POST') => begin
585 + %= form_for '/useraccountsd' => (method => 'POST') => begin
586 <p>
587 <h2>
588 %=l 'RESET_PASSWORD_TITLE'
589 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep
590 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep 2020-04-15 21:43:35.000000000 +0400
591 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep 2020-06-12 22:32:28.173553165 +0400
592 @@ -2,7 +2,7 @@
593
594 % my $btn = l('SAVE');
595
596 - %= form_for '/useraccountd' => (method => 'POST') => begin
597 + %= form_for '/useraccountsd' => (method => 'POST') => begin
598 <p>
599 %= l 'usr_SYSTEM_PASSWORD_DESCRIPTION'
600 </p>
601 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep
602 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2020-04-15 21:43:35.000000000 +0400
603 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2020-06-12 22:31:35.364801567 +0400
604 @@ -3,7 +3,7 @@
605
606 % my $btn = l('ADD');
607
608 - %= form_for '/useraccountd' => (method => 'POST') => begin
609 + %= form_for '/useraccountsd' => (method => 'POST') => begin
610 <p>
611 <h2>
612 %=l 'usr_P2_TITLE'
613 @@ -110,7 +110,7 @@
614 </p>
615
616 % if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
617 - % my $url = '/useraccountd?TRT=CRT&user=' . $usr_datas->{user};
618 + % my $url = '/useraccountsd?TRT=CRT&user=' . $usr_datas->{user};
619 % my $btn2 = $c->l('DOWNLOAD');
620 %= form_for $url => (method => 'GET') => begin
621 <p>
622 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep
623 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep 2020-04-15 21:43:35.000000000 +0400
624 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep 2020-06-12 22:32:18.189600593 +0400
625 @@ -2,7 +2,7 @@
626
627 % my $btn = l('SAVE');
628
629 - %= form_for '/useraccountd' => (method => 'POST') => begin
630 + %= form_for '/useraccountsd' => (method => 'POST') => begin
631 <p>
632 <h2>
633 %=l 'usr_MODIFY_ADMIN_TITLE'
634 @@ -62,7 +62,7 @@
635 </p>
636
637 % if ( $c->ipsec_for_acct eq 'OK' ) {
638 - % my $url = '/useraccountd?TRT=CRT&user=' . $usr_datas->{user};
639 + % my $url = '/useraccountsd?TRT=CRT&user=' . $usr_datas->{user};
640 % my $btn2 = $c->l('DOWNLOAD');
641 %= form_for $url => (method => 'GET') => begin
642 <p>
643 diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/starterwebsite.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/starterwebsite.html.ep
644 --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/starterwebsite.html.ep 2020-04-26 12:58:49.000000000 +0400
645 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/starterwebsite.html.ep 1970-01-01 04:00:00.000000000 +0400
646 @@ -1,41 +0,0 @@
647 -% layout 'default', title => 'Sme server 2 - Starter website';
648 -
649 -% content_for 'module' => begin
650 -<div id="module">
651 - <p>Starter website</p><br>
652 - <br>
653 - <h3><%= $title %></h3>
654 - <br><%= $modul %><br>
655 - <br>
656 - <% my $btn = l('CREATE');
657 - %>
658 - %= form_for 'starterwebsite' => (method => 'POST') => begin
659 - <b>
660 - %= label_for l_company => begin
661 - %= l('sws_LABEL_COMPANYNAME')
662 - % end
663 - </b>
664 - %= text_field 'l_company', class => 'input'
665 - <br><br>
666 - %=l 'sws_DESC_HEADER1'
667 - <br>
668 - %= text_field 'l_header1', class => 'input'
669 - <br>
670 - %=l 'sws_DESC_TEXT1'
671 - <br>
672 - %= text_area 'l_desc1', cols => 40, class => 'input'
673 - <br><br>
674 - %=l 'sws_DESC_HEADER2'
675 - %= text_field 'l_header2', class => 'input'
676 - <br>
677 - %=l 'sws_DESC_TEXT2'
678 - <br>
679 - %= text_area 'l_desc2', cols => 40, class => 'input'
680 - <br>
681 - %= $c->render_to_string(inline => (l 'sws_DESC_SUBMIT'))
682 - <br>
683 - %= submit_button "$btn", class => 'action'
684 - % end
685 -
686 -</div>
687 -%end
688 \ Pas de fin de ligne à la fin du fichier
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed