", $c->l('END_OF_REPORT'));
return $out;
}
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Quota.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Quota.pm
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Quota.pm 2019-12-31 08:55:14.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Quota.pm 2019-12-31 10:59:44.000000000 +0400
@@ -4,7 +4,11 @@
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-use Quota;
+use esmith::FormMagick::Panel::quota;
+
+#use esmith::TestUtils;
+use Scalar::Util qw(looks_like_number);
+
use Locale::gettext;
use SrvMngr::I18N;
@@ -12,7 +16,6 @@
#our $db = esmith::ConfigDB->open || die "Couldn't open config db";
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-#our $db = esmith::ConfigDB->open('conf/test/configuration') || die "Couldn't open config db";
sub main {
@@ -60,19 +63,14 @@
if ($rec and $rec->prop('type') eq 'user') {
$quo_datas{user} = $user;
$quo_datas{userRec} = $rec;
+ my $max = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocks'));
+ $quo_datas{hardlim} = $max;
+ my $max = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocksSoftLim'));
+ $quo_datas{softlim} = $max;
}
}
- #if ( $trt eq 'LIST' ) {
- # my @userAccounts;
- # if ($adb)
- # {
- # @userAccounts = $adb->users();
- # }
- # $c->stash( userAccounts => \@userAccounts );
- #}
-
$c->stash( title => $title, modul => $modul, quo_datas => \%quo_datas );
$c->render( template => 'quota' );
@@ -87,31 +85,20 @@
my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LIST');
-# if ( $trt =~ /^([A-Z]3)$/ ) {
-# $trt = $1;
-# } else {
-# return $c->l('quo_ERR_INPUT_CODE') . ': ' . $trt;
-# }
-
my $result = '';
if ( $trt eq 'UPD' ) {
- my $name = ($c->param('Name') || '');
- my $description = ($c->param('Description') || '');
- my $location = ($c->param('Location') || '');
+ my $acct = ($c->param('user') || '');
+ my $soft = ($c->param('Soft') || '');
+ my $hard = ($c->param('Hard') || '');
# controls
- my $res = validate_printer( $c, $name, $description, $location );
+ my $res = validate_quota( $c, $acct, $soft, $hard );
$result .= $res unless $res eq 'OK';
if ( ! $result ) {
- $res = new_printer( $c, $name, $description, $location );
- #$remoteName, $address );
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $result = $c->l('quo_CREATED_SUCCESSFULLY') . ' ' . $name;
- }
+ $result = $c->l('quo_SUCCESSFULLY_MODIFY') . ' ' . $acct;
}
}
@@ -123,66 +110,60 @@
};
-sub upd_user {
-
- my ( $c, $user ) = @_;
-
- # Update the db config (1)
-
- my $prop_del = "accounts settype $user user-updated";
- system ( '/bin/sudo', '/sbin/e-smith/db', split( / /, $prop_del ) ) == 0
- or return $c->l('quo_ERR_DELETING') . ' ' . $prop_del;
-
- # Update system
-
- system ('/bin/sudo', '/sbin/e-smith/signal-event', "user-delete", $user) == 0
- or return $c->l('quo_ERR_DELETING') . " system " . $user;
-
- # Update the db config (2)
-
- $prop_del = "accounts delete $user";
- system ( '/bin/sudo', '/sbin/e-smith/db', split( / /, $prop_del ) ) == 0
- or return $c->l('quo_ERR_DELETING') . ' ' . $prop_del;
-
- return 'OK';
-}
-
-
-sub validate_printer {
-
- my ($c, $name, $description, $location, $remoteName, $address ) = @_;
+sub validate_quota {
+ my ($c, $acct, $softlim, $hardlim ) = @_;
+ my $msg;
+
+ my $rec = $adb->get($acct);
+ return $c->l('quo_ERR_NO_SUCH_ACCT') . ' : ' . $acct unless (defined $rec);
+
+ my $type = $rec->prop('type');
+ unless ($type eq "user") {
+ $msg = $c->l('quo_ERR_NOT_A_USER_ACCT').$acct.$c->l('quo_ACCOUNT_IS_TYPE').$type;
+ return $msg;
+ }
+ my $uid = getpwnam($acct);
+ return $c->l('COULD_NOT_GET_UID').$acct unless ($uid);
+
+ if (($softlim !~ /^(.+?)\s*([KMGT])?$/ ) || (!looks_like_number ($1))) {
+ return $c->l('quo_SOFT_VAL_MUST_BE_NUMBER');
+ }
+
+ my $exponent = 1; # Entries with no suffix are assumed to be in megabytes.
+ if (defined ($2)) {
+ $exponent = index("KMGT",$2);
+ }
+ $softlim = ($1 * 1024 ** $exponent);
+
+ if (($hardlim !~ /^(.+?)\s*([KMGT])?$/ ) || (!looks_like_number ($1))) {
+ return $c->l('quo_HARD_VAL_MUST_BE_NUMBER');
+ }
+ $exponent = 1; # Entries with no suffix are assumed to be in megabytes.
+ if (defined ($2))
+ {
+ $exponent = index("KMGT",$2);
+ }
+ $hardlim = ($1 * 1024 ** $exponent);
#------------------------------------------------------------
- # Validate parameters and untaint them
+ # Make sure that soft limit is less than hard limit.
#------------------------------------------------------------
- if ($name =~ /^([a-z][a-z0-9]*)$/) {
- $name = $1;
- } else {
- return $c->l('quo_ERR_UNEXPECTED_NAME') . ': ' . $name;
- }
-
- if ($description =~ /^([\'\w\s]+)$/) {
- $description = $1;
- } else {
- return $c->l('quo_ERR_UNEXPECTED_DESC') . ': ' . $description;
- }
-
- if ($location =~ /^(.*)$/) {
- $location = $1;
- } else {
- $location = "lp0";
+ unless ($hardlim == 0 or $hardlim > $softlim) {
+ return $c->l('quo_ERR_HARD_LT_SOFT');
}
#------------------------------------------------------------
- # Looks good. Find out if this printer has been taken
+ # Update accounts database and signal the user-modify event.
#------------------------------------------------------------
- my $rec = $adb->get($name);
- my $type;
- if ($rec and ($type = $rec->prop('type'))) {
- return $c->l('quo_ERR_EXISTS') . ' : ' . $name;
- }
+ $rec->set_prop('MaxBlocks', $hardlim);
+ $rec->set_prop('MaxBlocksSoftLim', $softlim);
+
+ # Untaint $acct before using in system().
+ $acct =~ /^(\w[\-\w_\.]*)$/; $acct = $1;
+ system ("/sbin/e-smith/signal-event", "user-modify", "$acct") == 0
+ or die ($c->l('quo_ERR_MODIFYING')."\n");
return 'OK';
}
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Wbl.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Wbl.pm
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Wbl.pm 2019-12-31 08:55:14.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Wbl.pm 2019-12-24 15:57:15.000000000 +0400
@@ -13,7 +13,6 @@
#use esmith::FormMagick::Panel::wbl;
use smeserver::Panel::wblNew;
-##our $db = esmith::ConfigDB->open('conf/test/configuration') || die "Couldn't open config db";
sub main {
my $c = shift;
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Workgroup.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Workgroup.pm
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Workgroup.pm 2019-12-31 08:55:14.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Workgroup.pm 2019-12-24 16:05:01.000000000 +0400
@@ -10,7 +10,6 @@
use esmith::FormMagick::Panel::workgroup;
our $db = esmith::ConfigDB->open || die "Couldn't open config db";
-#our $db = esmith::ConfigDB->open('conf/test/configuration') || die "Couldn't open config db";
sub main {
my $c = shift;
@@ -48,27 +47,15 @@
$res = validate2_servername($c, $servername);
$result .= $res unless $res eq 'OK';
- #$db->get('smb')->set_prop('Workgroup', $workgroup);
- #$db->get('smb')->set_prop('ServerRole', $serverrole);
- #$db->get('smb')->set_prop('ServerName', $servername);
- #$db->get('smb')->set_prop('RoamingProfiles', $roamingprofiles);
-
- my $prop_upd = 'configuration setprop smb ';
- $prop_upd .= "Workgroup $workgroup ServerRole $serverrole ServerName $servername RoamingProfiles $roamingprofiles";
- #
- # Update the db config
- #
-# system ('/bin/sudo', '/sbin/e-smith/db', 'configuration', 'setprop', 'smb', 'Workgroup', $workgroup,
-# 'ServerRole', $serverrole, 'ServerName', $servername, 'RoamingProfiles', $roamingprofiles) == 0
- system ( '/bin/sudo', '/sbin/e-smith/db', split( / /, $prop_upd ) ) == 0
- or $result = $c->l('ERROR_UPDATING') . " db config: " . $prop_upd;
- #
- # Update the system
- #
if ($result eq '') {
- system ('/bin/sudo', '/sbin/e-smith/signal-event', 'workgroup-update') == 0
- or $result = $c->l('ERROR_UPDATING') . " system";
+ $db->get('smb')->set_prop('Workgroup', $workgroup);
+ $db->get('smb')->set_prop('ServerRole', $serverrole);
+ $db->get('smb')->set_prop('ServerName', $servername);
+ $db->get('smb')->set_prop('RoamingProfiles', $roamingprofiles);
}
+
+ system( "/sbin/e-smith/signal-event", "workgroup-update" ) == 0
+ or $result = $c->l('ERROR_UPDATING') . " system";
my $title = $c->l('wkg_FORM_TITLE');
@@ -76,6 +63,7 @@
$c->stash( title => $title, modul => $result );
$c->render(template => 'module');
+
};
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/en.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/en.pm
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/en.pm 2019-12-31 08:55:14.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/en.pm 2019-12-26 23:18:10.000000000 +0400
@@ -974,6 +974,37 @@
'quo_SUCCESSFULLY_MODIFIED' => 'Successfully modified quota for user account: ',
'quo_Quotas' => 'Quotas',
+'grp_FORM_TITLE' => 'Create, modify, or remove user groups',
+'grp_GROUP_TOO_LONG' => 'Error: group name is too long.The maximum is {$maxLength} characters.',
+'grp_ACCOUNT_CONFLICT' => 'Error: the group "{$group}" can\'t be created because there is
+already a {$type} account of that name.',
+'grp_INVALID_GROUP_DESCRIPTION' => 'Error: unexpected or missing characters in group description',
+'grp_NO_MEMBERS' => 'Error: no members in group.Did not create new group.',
+'grp_CREATED_GROUP' => 'Successfully created user group',
+'grp_DELETED_GROUP' => 'Successfully removed user group',
+'grp_MODIFIED_GROUP' => 'Successfully modifed user group',
+'grp_CREATE_ERROR' => 'An error occurred while creating user group.',
+'grp_DELETE_ERROR' => 'An error occurred while removing user group.',
+'grp_MODIFY_ERROR' => 'An error occurred while modifying user group.',
+'grp_GROUP_NAMING' => 'The group name should contain only lower-case
+letters, numbers, hyphens, periods, and underscores,
+and should start with a lower-case letter. For
+example "sales", "beta5", and "reseller_partners" are
+all valid group names, but "3rd-event", "Marketing Team"
+and "lost&found" are not.',
+'grp_GROUP_HAS_MEMBERS' => 'This group contains the following members:',
+'grp_NOT_A_GROUP' => 'Error: That is not an existing group account.',
+'grp_GROUP_DESC' => 'Brief Description/Windows Group Alias',
+'grp_GROUP_DESC_EXPL' => 'Input a brief group description in the field below.
+ This field also designates the group name viewable by
+ Windows clients.',
+'grp_IBAYS_WILL_BE_CHANGED' => 'The following information bays were assigned to this group and
+will be changed to the Administrator group (you can change them to
+something else afterward):',
+'grp_CONFIRM_DELETE_GROUP' => 'Are you sure you wish to remove this group?',
+'grp_CURRENT_LIST' => 'Current list of User Groups',
+'grp_DELETE_DESCRIPTION' => 'You are about to remove the user group "{$group}."',
+
);
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/fr.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/fr.pm
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/fr.pm 2019-12-31 08:55:14.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/fr.pm 2019-12-26 23:18:48.000000000 +0400
@@ -672,6 +672,27 @@
'quo_SUCCESSFULLY_MODIFIED' => 'Modification réussie du quota pour compte utilisateur',
'quo_Quotas' => 'Quotas',
+'grp_FORM_TITLE' => 'Gestion des groupes d\'utilisateurs',
+'grp_GROUP_TOO_LONG' => 'ERREUR : le nom du groupe est trop long : {$maxLength} caractères au maximum.',
+'grp_ACCOUNT_CONFLICT' => 'ERREUR : le groupe "{$group}" ne peut être créé car il existe déjà un compte {$type} avec ce nom.',
+'grp_INVALID_GROUP_DESCRIPTION' => 'ERREUR : caractères inattendus ou manquants dans la description du groupe.',
+'grp_NO_MEMBERS' => 'ERREUR : aucun membre dans le groupe. Le groupe n\'a pas été créé.',
+'grp_CREATED_GROUP' => 'Le groupe d\'utilisateurs a été créé avec succès.',
+'grp_DELETED_GROUP' => 'Le groupe d\'utilisateurs a été supprimé avec succès.',
+'grp_MODIFIED_GROUP' => 'Le groupe d\'utilisateurs a été modifié avec succès.',
+'grp_CREATE_ERROR' => 'Une erreur est survenue lors de la création du groupe d\'utilisateurs.',
+'grp_DELETE_ERROR' => 'Une erreur est survenue lors de la suppression du groupe d\'utilisateurs.',
+'grp_MODIFY_ERROR' => 'Une erreur est survenue lors de la modification du groupe d\'utilisateurs.',
+'grp_GROUP_NAMING' => ' Le nom de groupe doit contenir uniquement des lettres minuscules, des chiffres, des traits d\'union, des points, des traits de soulignement et commencer par une minuscule. Par exemple, "ventes", "beta5" ou "partenaires_ventes" sont tous des noms de groupe valides, mais pas "3e-événement", "Groupe Marketing" ni "perdu&trouvé". ',
+'grp_GROUP_HAS_MEMBERS' => 'Ce groupe contient les membres suivants :',
+'grp_NOT_A_GROUP' => 'ERREUR : Compte de groupe inexistant.',
+'grp_GROUP_DESC' => 'Brève description / Alias de groupe Windows',
+'grp_GROUP_DESC_EXPL' => 'Tapez une brève description du groupe dans le champ ci-dessous. Ce champ correspond également au nom du groupe visible par les clients Windows.',
+'grp_IBAYS_WILL_BE_CHANGED' => 'Les i-bays suivantes étaient attribuées à ce groupe et vont être réattribuées au groupe de l\'administrateur (vous pourrez par la suite les attribuer à un autre groupe) :',
+'grp_CONFIRM_DELETE_GROUP' => ' Voulez-vous vraiment supprimer ce groupe ? ',
+'grp_CURRENT_LIST' => ' Liste actuelle des groupes d\'utilisateurs : ',
+'grp_DELETE_DESCRIPTION' => ' Vous êtes sur le point de supprimer le groupe d\'utilisateurs "{$group}". ',
+
);
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2019-12-31 08:55:14.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2019-12-29 23:45:41.000000000 +0400
@@ -72,32 +72,48 @@
my $r = app->routes;
$r->namespaces(['SrvMngr::Controller']);
+
$r->get('/')->to('initial#main')->name('initial');
$r->get('/bugreport')->to('bugreport#main')->name('bugreport');
$r->post('/bugreport')->to('bugreport#do_report')->name('bugreport2');
+$r->post('/bugreportD')->to('bugreport#download_config_report')->name('bugreportD');
+
$r->get('/clamav')->to('clamav#main')->name('clamav');
$r->post('/clamav')->to('clamav#do_update')->name('clamav2');
$r->get('/datetime')->to('datetime#main')->name('datetime');
$r->post('/datetime')->to('datetime#do_update')->name('datetime2');
$r->get('/directory')->to('directory#main')->name('directory');
$r->post('/directory')->to('directory#do_update')->name('directory2');
+
+$r->get('/groups')->to('groups#main')->name('groups');
+$r->post('/groups')->to('groups#do_display')->name('groupadd1');
+$r->post('/groupadd')->to('groups#do_update')->name('groupadd2');
+$r->get('/groupupd')->to('groups#do_display')->name('groupupd1');
+$r->post('/groupupd')->to('groups#do_update')->name('groupupd2');
+$r->get('/groupdel')->to('groups#do_display')->name('groupdel1');
+$r->post('/groupdel')->to('groups#do_update')->name('groupdel2');
+
$r->get('/logout')->to('main#logout')->name('logout');
$r->get('/manual')->to('manual#main')->name('manual');
+
$r->get('/printers')->to('printers#main')->name('printers');
$r->post('/printers')->to('printers#do_display')->name('printeradd');
$r->get('/printers2')->to('printers#do_update')->name('printernet');
$r->post('/printers2')->to('printers#do_update')->name('printerupd');
-#$r->post('/printers3')->to('printers#do_update')->name('printernet');
-#$r->get('/printers/:printer' => {printer => qr/^([a-z][a-z0-9]*)$/})->to('printers#do_display')->name('printerdel');
+# $r->post('/printers3')->to('printers#do_update')->name('printernet');
+# $r->get('/printers/:printer' => {printer => qr/^([a-z][a-z0-9]*)$/})->to('printers#do_display')->name('printerdel');
$r->get('/printdel')->to('printers#do_display')->name('printerdel');
$r->post('/printdel')->to('printers#do_update')->name('printerdel2');
$r->get('/proxy')->to('proxy#main')->name('proxy');
$r->post('/proxy')->to('proxy#do_update')->name('proxy2');
$r->get('/qmailanalog')->to('qmailanalog#main')->name('qmailanalog');
$r->post('/qmailanalog')->to('qmailanalog#do_update')->name('qmailanalog2');
+
$r->get('/quota')->to('quota#main')->name('quota');
$r->get('/quotaupd')->to('quota#do_display')->name('quotalist');
$r->post('/quotaupd')->to('quota#do_update')->name('quotaupd');
+$r->post('/quota2')->to('quota#do_update')->name('quotaval');
+
$r->get('/review')->to('review#main')->name('review');
$r->get('/starterwebsite')->to('starterwebsite#main')->name('starterwebsite');
$r->post('/starterwebsite')->to('starterwebsite#do_site')->name('starterwebsite2');
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js 2019-12-31 08:55:14.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js 2019-12-31 17:17:43.000000000 +0400
@@ -13,12 +13,16 @@
tA[i].className=(tA[i].className==arg[3])?arg[2]:arg[3];}
}else if(tA[i].className==arg[2]){tA[i].className=arg[3];}}}}}
+ // language en
//This swap the class of the selected item.
function swapClasses() {
var arg=swapClasses.arguments;
swapClass(0,'none','item-current','item','a');
swapClass(0,'none','warn-current','warn','a');
swapClass(0,arg[0],'item-current','item','a');
+ //swapClass(0,'none','item-current accent','item accent','a');
+ //swapClass(0,'none','warn-current accent','warn accent','a');
+ //swapClass(0,arg[0],'item-current accent','item accent','a');
}
// End script hiding -->
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/bugreport2.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/bugreport2.html.ep
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/bugreport2.html.ep 1970-01-01 04:00:00.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/bugreport2.html.ep 2019-12-26 18:11:16.000000000 +0400
@@ -0,0 +1,28 @@
+% layout 'default', title => 'Sme server 2 - Bug report 2';
+
+% content_for 'module' => begin
+
+
+
%end
\ Pas de fin de ligne à la fin du fichier
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep 1970-01-01 04:00:00.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep 2019-12-29 10:25:46.000000000 +0400
@@ -0,0 +1,29 @@
+% layout 'default', title => "Sme server 2 - groups", share_dir => './';
+
+% content_for 'module' => begin
+
\ Pas de fin de ligne à la fin du fichier
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_quo_upd.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_quo_upd.html.ep
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_quo_upd.html.ep 2019-12-31 08:55:14.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_quo_upd.html.ep 2019-12-31 10:58:40.000000000 +0400
@@ -57,6 +57,7 @@
%=l 'quo_LIMIT_WITH_GRACE', class => 'label'
+ % param 'Soft' => $quo_datas->{softlim} unless param 'Soft';
%= text_field 'Soft', class => 'input'
@@ -65,6 +66,7 @@
%=l 'quo_ABS_LIMIT', class => 'label'
+ % param 'Hard' => $quo_datas->{hardlim} unless param 'Hard';
%= text_field 'Hard', class => 'input'
@@ -75,24 +77,8 @@
%= hidden_field 'trt' => $quo_datas->{trt}
+ %= hidden_field 'user' => $quo_datas->{user}
% end
-
-
\ Pas de fin de ligne à la fin du fichier
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep 2019-12-31 08:55:14.000000000 +0400
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep 2019-12-31 11:06:38.000000000 +0400
@@ -5,11 +5,15 @@
% if ($config->{debug} == 1) {