";
-
- open (my $cfgrep, '<', $configreportfile) or die "Could not find temporary config report file!";
+ open(my $cfgrep, '<', $configreportfile) or die "Could not find temporary config report file!";
while (<$cfgrep>) {
- $out .= sprintf("%s", $_);
+ $out .= sprintf("%s", $_);
}
-
$out .= sprintf "";
-
return $out;
-
-}
-
+} ## end sub show_config_report
sub download_config_report {
my $c = shift;
-
$c->render_file(
- 'filepath' => "$configreportfile",
- 'format' => 'x-download',
- 'content_disposition' => 'attachment',
- 'cleanup' => 1,
+ 'filepath' => "$configreportfile",
+ 'format' => 'x-download',
+ 'content_disposition' => 'attachment',
+ 'cleanup' => 1,
);
-}
-
-
+} ## end sub download_config_report
1;
-
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm
index d458573..4fa374d 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm
@@ -7,107 +7,84 @@ package SrvMngr::Controller::Clamav;
#
# routes : end
#------------------------------
-
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session);
#package esmith::FormMagick::Panel::clamav;
-
our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
-
my %clm_datas = ();
- my $title = $c->l('clm_FORM_TITLE');
- my $modul = $c->render_to_string(inline => $c->l('clm_DESC_FILESYSTEM_SCAN_PERIOD'));
-
- $clm_datas{'FilesystemScan'} = ($db->get_prop('clamav','FilesystemScan')) || 'disabled';
- $clm_datas{'Quarantine'} = ($db->get_prop('clamav','Quarantine')) || 'disabled';
-
- $clm_datas{'clam_versions'} = get_clam_versions();
-
- $c->stash( title => $title, modul => $modul, clm_datas => \%clm_datas );
+ my $title = $c->l('clm_FORM_TITLE');
+ my $modul = $c->render_to_string(inline => $c->l('clm_DESC_FILESYSTEM_SCAN_PERIOD'));
+ $clm_datas{'FilesystemScan'} = ($db->get_prop('clamav', 'FilesystemScan')) || 'disabled';
+ $clm_datas{'Quarantine'} = ($db->get_prop('clamav', 'Quarantine')) || 'disabled';
+ $clm_datas{'clam_versions'} = get_clam_versions();
+ $c->stash(title => $title, modul => $modul, clm_datas => \%clm_datas);
$c->render(template => 'clamav');
-};
-
+} ## end sub main
sub do_update {
my $c = shift;
$c->app->log->info($c->log_req);
-
my $http_clamav_status = $c->param('http_clamav_status') || 'disabled';
my $smtp_clamav_status = $c->param('smtp_clamav_status') || '';
-
- my $result = "";
-
+ my $result = "";
$c->change_settings();
# Update the system
system("/sbin/e-smith/signal-event clamav-update") == 0
or $result = $c->l('clm_ERROR_UPDATING_CONFIGURATION');
- if ( ! $result ) {
- $result = $c->l('clm_SUCCESS') ;
- $c->flash( success => $result );
+ if (!$result) {
+ $result = $c->l('clm_SUCCESS');
+ $c->flash(success => $result);
} else {
- $c->flash( error => $result );
+ $c->flash(error => $result);
}
-
$c->redirect_to('/clamav');
-};
-
+} ## end sub do_update
sub change_settings {
- my $c = shift;
-
- my $status = $c->param('status');
-
- my $FilesystemScan = ( $c->param('FilesystemScan') || 'disabled' );
- my $Quarantine = ( $c->param('Quarantine') || 'disabled' );
-
- my $DatabaseMirror = ( $c->param('DatabaseMirror') || 'db.us.clamav.net' );
- my $UpdateOfficeHrs = ( $c->param('UpdateOfficeHrs') || 'disabled' );
- my $UpdateNonOfficeHrs = ( $c->param('UpdateNonOfficeHrs') || 'disabled' );
- my $UpdateWeekend = ( $c->param('UpdateWeekend') || 'disabled' );
-
- my $HTTPProxyServer = ( $c->param('HTTPProxyServer') || '' );
- my $HTTPProxyPort = ( $c->param('HTTPProxyPort') || '' );
- my $HTTPProxyUsername = ( $c->param('HTTPProxyUsername') || '' );
- my $HTTPProxyPassword = ( $c->param('HTTPProxyPassword') || '' );
-
- my $clamav = $db->get('clamav') || $db->new_record('clamav', {type=>'service'});
+ my $c = shift;
+ my $status = $c->param('status');
+ my $FilesystemScan = ($c->param('FilesystemScan') || 'disabled');
+ my $Quarantine = ($c->param('Quarantine') || 'disabled');
+ my $DatabaseMirror = ($c->param('DatabaseMirror') || 'db.us.clamav.net');
+ my $UpdateOfficeHrs = ($c->param('UpdateOfficeHrs') || 'disabled');
+ my $UpdateNonOfficeHrs = ($c->param('UpdateNonOfficeHrs') || 'disabled');
+ my $UpdateWeekend = ($c->param('UpdateWeekend') || 'disabled');
+ my $HTTPProxyServer = ($c->param('HTTPProxyServer') || '');
+ my $HTTPProxyPort = ($c->param('HTTPProxyPort') || '');
+ my $HTTPProxyUsername = ($c->param('HTTPProxyUsername') || '');
+ my $HTTPProxyPassword = ($c->param('HTTPProxyPassword') || '');
+ my $clamav = $db->get('clamav') || $db->new_record('clamav', { type => 'service' });
$status ||= $clamav->prop('status');
-
$clamav->merge_props(
- status => $status,
- FilesystemScan => $FilesystemScan,
- Quarantine => $Quarantine,
- DatabaseMirror => $DatabaseMirror,
- UpdateOfficeHrs => $UpdateOfficeHrs,
- UpdateNonOfficeHrs => $UpdateNonOfficeHrs,
- UpdateWeekend => $UpdateWeekend,
- HTTPProxyServer => $HTTPProxyServer,
- HTTPProxyPort => $HTTPProxyPort,
- HTTPProxyUsername => $HTTPProxyUsername,
- HTTPProxyPassword => $HTTPProxyPassword,
- );
+ status => $status,
+ FilesystemScan => $FilesystemScan,
+ Quarantine => $Quarantine,
+ DatabaseMirror => $DatabaseMirror,
+ UpdateOfficeHrs => $UpdateOfficeHrs,
+ UpdateNonOfficeHrs => $UpdateNonOfficeHrs,
+ UpdateWeekend => $UpdateWeekend,
+ HTTPProxyServer => $HTTPProxyServer,
+ HTTPProxyPort => $HTTPProxyPort,
+ HTTPProxyUsername => $HTTPProxyUsername,
+ HTTPProxyPassword => $HTTPProxyPassword,
+ );
+} ## end sub change_settings
-
-}
-
-sub get_clam_versions
-{
+sub get_clam_versions {
my $version = `/usr/bin/freshclam -V`;
chomp $version;
$version =~ s/^ClamAV //;
-
return $version;
-}
+} ## end sub get_clam_versions
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
index 32a180a..8e8b69b 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
@@ -4,191 +4,162 @@ package SrvMngr::Controller::Datetime;
# heading : System
# description : Date and time
# navigation : 4000 400
-
# routes : end
#------------------------------
-
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session);
-
use esmith::FormMagick;
use esmith::util;
-
our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
-
my %dat_datas = ();
- my $title = $c->l('dat_FORM_TITLE');
- my $modul = $c->l('dat_INITIAL_DESC');
-
-
+ my $title = $c->l('dat_FORM_TITLE');
+ my $modul = $c->l('dat_INITIAL_DESC');
$dat_datas{ntpstatus} = 'disabled';
-
my $rec = $cdb->get('ntpd');
+
if ($rec) {
$dat_datas{'ntpserver'} = $rec->prop('NTPServer') || '';
- if ( $rec->prop('status') eq 'enabled' ) {
- $dat_datas{ntpstatus} = 'enabled'
- unless ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' and $dat_datas{ntpserver} =~ m#^\s*$#;
- }
- }
- ($dat_datas{weekday}, $dat_datas{monthname},
- $dat_datas{month}, $dat_datas{day}, $dat_datas{year},
- $dat_datas{hour}, $dat_datas{minute}, $dat_datas{second},
- $dat_datas{ampm}) = split /\|/,
- `/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
+ if ($rec->prop('status') eq 'enabled') {
+ $dat_datas{ntpstatus} = 'enabled'
+ unless ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' and $dat_datas{ntpserver} =~ m#^\s*$#;
+ }
+ } ## end if ($rec)
+ ( $dat_datas{weekday}, $dat_datas{monthname}, $dat_datas{month}, $dat_datas{day}, $dat_datas{year},
+ $dat_datas{hour}, $dat_datas{minute}, $dat_datas{second}, $dat_datas{ampm}
+ )
+ = split /\|/,
+ `/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
# get rid of trailing carriage return on last field
- chop ($dat_datas{ampm});
-
+ chop($dat_datas{ampm});
$dat_datas{'now_string'} = esmith::FormMagick->gen_locale_date_string();
-
- $c->stash( title => $title, modul => $modul, dat_datas => \%dat_datas );
+ $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
$c->render('datetime');
-};
-
+} ## end sub main
sub do_update {
-
- my $c = shift;
-
+ my $c = shift;
my %dat_datas = ();
- my $title = $c->l('dat_FORM_TITLE');
- my $modul = $c->l('dat_INITIAL_DESC');
+ my $title = $c->l('dat_FORM_TITLE');
+ my $modul = $c->l('dat_INITIAL_DESC');
my $result;
my $success;
-
my $old_ntpstatus = $c->param('Old_ntpstatus');
$dat_datas{ntpstatus} = $c->param('Ntpstatus');
+ if ($dat_datas{ntpstatus} ne $old_ntpstatus) {
+ if ($dat_datas{ntpstatus} eq 'disabled') {
+ ( $dat_datas{weekday}, $dat_datas{monthname}, $dat_datas{month},
+ $dat_datas{day}, $dat_datas{year}, $dat_datas{hour},
+ $dat_datas{minute}, $dat_datas{second}, $dat_datas{ampm}
+ )
+ = split /\|/,
+ `/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
- if ( $dat_datas{ntpstatus} ne $old_ntpstatus) {
+ # get rid of trailing carriage return on last field
+ chop($dat_datas{ampm});
+ } else {
+ $dat_datas{ntpserver} = ($cdb->get_prop('ntpd', 'NTPServer')) || '';
+ }
+ $dat_datas{now_string} = esmith::FormMagick->gen_locale_date_string();
+ $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
+ return $c->render('datetime');
+ } ## end if ($dat_datas{ntpstatus...})
- if ( $dat_datas{ntpstatus} eq 'disabled' ) {
- ($dat_datas{weekday},
- $dat_datas{monthname},
- $dat_datas{month},
- $dat_datas{day},
- $dat_datas{year},
- $dat_datas{hour},
- $dat_datas{minute},
- $dat_datas{second},
- $dat_datas{ampm}) = split /\|/,
- `/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
-
- # get rid of trailing carriage return on last field
- chop ($dat_datas{ampm});
-
- } else {
-
- $dat_datas{ntpserver} = ($cdb->get_prop('ntpd','NTPServer')) || '';
- }
-
- $dat_datas{now_string} = esmith::FormMagick->gen_locale_date_string();
-
- $c->stash( title => $title, modul => $modul, dat_datas => \%dat_datas );
- return $c->render('datetime');
- }
-
- if ( $dat_datas{ntpstatus} eq 'enabled' ) {
-
- # update ntpserver
+ if ($dat_datas{ntpstatus} eq 'enabled') {
+ # update ntpserver
$dat_datas{ntpserver} = $c->param('Ntpserver') || '';
- if ( $dat_datas{ntpserver} eq "pool.ntp.org" ) {
+ if ($dat_datas{ntpserver} eq "pool.ntp.org") {
$result .= $c->l('dat_INVALID_NTP_ADDR');
- } elsif ( $dat_datas{ntpserver} =~ /^([a-zA-Z0-9\.\-]+)$/ ) {
+ } elsif ($dat_datas{ntpserver} =~ /^([a-zA-Z0-9\.\-]+)$/) {
$dat_datas{ntpserver} = $1;
-# } elsif ( $dat_datas{ntpserver} =~ /^\s*$/ ) {
-# $dat_datas{ntpserver} = "";
+
+ # } elsif ( $dat_datas{ntpserver} =~ /^\s*$/ ) {
+ # $dat_datas{ntpserver} = "";
} else {
$result .= $c->l('dat_INVALID_NTP_ADDR');
}
- if ( ! $result ) {
- $success = update_ntpserver( $c, $dat_datas{ntpserver} );
- }
-
+ if (!$result) {
+ $success = update_ntpserver($c, $dat_datas{ntpserver});
+ }
} else {
- # set Locale time & clean ntpserver
+ # set Locale time & clean ntpserver
+ #my $servername = ($c->param('ServerName') || 'WS');
+ if (!$result) {
+ $result = validate_change_datetime($c);
- #my $servername = ($c->param('ServerName') || 'WS');
- if ( ! $result ) {
- $result = validate_change_datetime( $c );
- if ( $result eq 'OK' ) {
- $success = $c->l('dat_UPDATING_CLOCK');
- $result = '';
- disable_ntp();
- $success .= '# my (\$lang, \$releaseVersion, + my $modul = $c->render_to_string( + inline => "
# my (\$lang, \$releaseVersion,
# \$c->stash\(\'lang\', \'releaseVer\'
-# \'navigation\'
"; -# $| = 1; + while ("; + $out .= sprintf(") { + $out .= sprintf("%s", $_); + } + close QMAILQUEUEREPORT; + $out .= sprintf "
";
- my $now_string = $c->gen_locale_date_string();
- $out .= sprintf("%s %s
", $c->l('REPORT_GENERATED'), $now_string);
-
- if ($report_type =~ /^qmail-q/)
- {
- open(QMAILQUEUEREPORT, "/var/qmail/bin/$report_type |");
-
- $out .= sprintf "";
-
- while ()
- {
- $out .= sprintf("%s", $_);
- }
-
- close QMAILQUEUEREPORT;
- $out .= sprintf "
";
-
- $out .= sprintf("%s
", $c->l('END_OF_REPORT'));
- return '';
- }
-
- chdir "/var/log/qmail";
-
- open(QMAILANALOG,
- "/bin/cat \@* current 2>/dev/null"
- . "| /usr/local/bin/tai64nunix"
- . "| /usr/local/qmailanalog/bin/matchup 5>/dev/null"
- . "| /usr/local/qmailanalog/bin/$report_type |"
- );
-
- $out .= sprintf "";
-
- while ()
- {
- # Cook any special HTML characters
-
- s/\&/\&/g;
- s/\"/\"/g;
- s/\>/\>/g;
- s/\";
-
-
- $out .= sprintf("%s
", $c->l('END_OF_REPORT'));
- return $out;
-
-}
+ while () {
+ # Cook any special HTML characters
+ s/\&/\&/g;
+ s/\"/\"/g;
+ s/\>/\>/g;
+ s/\)
+ close QMAILANALOG;
+ $out .= sprintf "
";
+ $out .= sprintf("%s
", $c->l('END_OF_REPORT'));
+ return $out;
+} ## end sub generateReport
sub reportType_list {
-
- my $c = shift;
-
+ my $c = shift;
my @array = (
-# [ $c->l('qma_LIST_OUTGOING') => 'qmail-qread' ],
-# [ $c->l('qma_SUMMARIZE_QUEUE') => 'qmail-qstat' ],
+
+ # [ $c->l('qma_LIST_OUTGOING') => 'qmail-qread' ],
+ # [ $c->l('qma_SUMMARIZE_QUEUE') => 'qmail-qstat' ],
[ $c->l('qma_SUCCESSFUL_DELIVERY_DELAY') => 'zddist' ],
- [ $c->l('qma_REASONS_DEFERRAL') => 'zdeferrals' ],
- [ $c->l('qma_REASONS_FAILURE') => 'zfailures' ],
- [ $c->l('qma_BASIC_STATS') => 'zoverall' ],
- [ $c->l('qma_RECIP_STATS') => 'zrecipients' ],
- [ $c->l('qma_RECIP_HOSTS') => 'zrhosts' ],
- [ $c->l('qma_RECIP_ORDERED') => 'zrxdelay' ],
- [ $c->l('qma_SENDER_STATS') => 'zsenders' ],
- [ $c->l('qma_SENDMAIL_STYLE') => 'zsendmail' ],
- [ $c->l('qma_REASONS_SUCCESS') => 'zsuccesses' ],
- [ $c->l('qma_SENDER_UIDS') => 'zsuids' ]
+ [ $c->l('qma_REASONS_DEFERRAL') => 'zdeferrals' ],
+ [ $c->l('qma_REASONS_FAILURE') => 'zfailures' ],
+ [ $c->l('qma_BASIC_STATS') => 'zoverall' ],
+ [ $c->l('qma_RECIP_STATS') => 'zrecipients' ],
+ [ $c->l('qma_RECIP_HOSTS') => 'zrhosts' ],
+ [ $c->l('qma_RECIP_ORDERED') => 'zrxdelay' ],
+ [ $c->l('qma_SENDER_STATS') => 'zsenders' ],
+ [ $c->l('qma_SENDMAIL_STYLE') => 'zsendmail' ],
+ [ $c->l('qma_REASONS_SUCCESS') => 'zsuccesses' ],
+ [ $c->l('qma_SENDER_UIDS') => 'zsuids' ]
);
my @sorted_array = sort { $a->[0] cmp $b->[0] } @array;
return \@sorted_array;
-}
-
+} ## end sub reportType_list
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm
index 46643b4..f3c7e5c 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm
@@ -11,183 +11,149 @@ package SrvMngr::Controller::Quota;
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use esmith::FormMagick::Panel::quota;
#use esmith::TestUtils;
use Scalar::Util qw(looks_like_number);
-
use Locale::gettext;
use SrvMngr::I18N;
-
use SrvMngr qw(theme_list init_session);
#our $db = esmith::ConfigDB->open || die "Couldn't open config db";
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-
sub main {
-
my $c = shift;
$c->app->log->info($c->log_req);
-
my %quo_datas = ();
- my $title = $c->l('quo_FORM_TITLE');
-
+ my $title = $c->l('quo_FORM_TITLE');
$quo_datas{'trt'} = 'LIST';
-
my @userAccounts;
+
if ($adb) {
@userAccounts = $adb->users();
}
-
- $c->stash( title => $title, quo_datas => \%quo_datas, userAccounts => \@userAccounts );
+ $c->stash(title => $title, quo_datas => \%quo_datas, userAccounts => \@userAccounts);
$c->render(template => 'quota');
-
-};
-
+} ## end sub main
sub do_display {
-
- my $c = shift;
-
- my $rt = $c->current_route;
- my $trt = ($c->param('trt') || 'LIST');
+ my $c = shift;
+ my $rt = $c->current_route;
+ my $trt = ($c->param('trt') || 'LIST');
my $user = $c->param('user') || '';
-
- $trt = 'UPD' if ( $user );
-
+ $trt = 'UPD' if ($user);
my %quo_datas = ();
- my $title = $c->l('quo_FORM_TITLE');
-
+ my $title = $c->l('quo_FORM_TITLE');
$quo_datas{'trt'} = $trt;
- if ( $trt eq 'UPD' ) {
-
- my $rec = $adb->get($user);
- 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;
- $max = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocksSoftLim'));
- $quo_datas{softlim} = $max;
- }
-
- }
-
- $c->stash( title => $title, quo_datas => \%quo_datas );
- $c->render( template => 'quota' );
-
-};
+ if ($trt eq 'UPD') {
+ my $rec = $adb->get($user);
+ 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;
+ $max = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocksSoftLim'));
+ $quo_datas{softlim} = $max;
+ } ## end if ($rec and $rec->prop...)
+ } ## end if ($trt eq 'UPD')
+ $c->stash(title => $title, quo_datas => \%quo_datas);
+ $c->render(template => 'quota');
+} ## end sub do_display
sub do_update {
-
my $c = shift;
$c->app->log->info($c->log_req);
-
- my $title = $c->l('quo_FORM_TITLE');
+ my $title = $c->l('quo_FORM_TITLE');
my %quo_datas = ();
-
- my $rt = $c->current_route;
- my $trt = ($c->param('trt') || 'LIST');
-
+ my $rt = $c->current_route;
+ my $trt = ($c->param('trt') || 'LIST');
$quo_datas{trt} = $trt;
my $result = '';
my $res;
- if ( $trt eq 'UPD' ) {
-
- $quo_datas{user} = ($c->param('user') || '');
- $quo_datas{softlim} = ($c->param('Soft') || '');
+ if ($trt eq 'UPD') {
+ $quo_datas{user} = ($c->param('user') || '');
+ $quo_datas{softlim} = ($c->param('Soft') || '');
$quo_datas{hardlim} = ($c->param('Hard') || '');
- # controls
- $res = validate_quota( $c, $quo_datas{user}, $quo_datas{softlim}, $quo_datas{hardlim} );
- $result .= $res unless $res eq 'OK';
+ # controls
+ $res = validate_quota($c, $quo_datas{user}, $quo_datas{softlim}, $quo_datas{hardlim});
+ $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $result = $c->l('quo_SUCCESSFULLY_MODIFIED') . ' ' . $quo_datas{user};
- } else {
- $quo_datas{userRec} = $adb->get($quo_datas{user}) || undef;
- }
- }
+ if (!$result) {
+ $result = $c->l('quo_SUCCESSFULLY_MODIFIED') . ' ' . $quo_datas{user};
+ } else {
+ $quo_datas{userRec} = $adb->get($quo_datas{user}) || undef;
+ }
+ } ## end if ($trt eq 'UPD')
# common parts
-
if ($res ne 'OK') {
- $c->stash( error => $result );
- $c->stash( title => $title, quo_datas => \%quo_datas );
- return $c->render('quota');
+ $c->stash(error => $result);
+ $c->stash(title => $title, quo_datas => \%quo_datas);
+ return $c->render('quota');
}
-
my $message = "'Quota' updates ($trt) DONE";
$c->app->log->info($message);
- $c->flash( success => $result );
-
+ $c->flash(success => $result);
$c->redirect_to('/quota');
-
-};
-
+} ## end sub do_update
sub validate_quota {
- my ($c, $acct, $softlim, $hardlim ) = @_;
+ my ($c, $acct, $softlim, $hardlim) = @_;
my $msg;
-
my $rec = $adb->get($acct);
- return $c->l('quo_ERR_NO_SUCH_ACCT') . ' : ' . $acct unless (defined $rec);
-
+ 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;
+ $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);
+ 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');
+ 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);
+ my $exponent = 1; # Entries with no suffix are assumed to be in megabytes.
- if (($hardlim !~ /^(.+?)\s*([KMGT])?$/ ) || (!looks_like_number ($1))) {
- return $c->l('quo_HARD_VAL_MUST_BE_NUMBER');
+ if (defined($2)) {
+ $exponent = index("KMGT", $2);
}
- $exponent = 1; # Entries with no suffix are assumed to be in megabytes.
- if (defined ($2))
- {
- $exponent = index("KMGT",$2);
- }
- $hardlim = ($1 * 1024 ** $exponent);
+ $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);
#------------------------------------------------------------
# Make sure that soft limit is less than hard limit.
#------------------------------------------------------------
-
unless ($hardlim == 0 or $hardlim > $softlim) {
- return $c->l('quo_ERR_HARD_LT_SOFT');
+ return $c->l('quo_ERR_HARD_LT_SOFT');
}
#------------------------------------------------------------
# Update accounts database and signal the user-modify event.
#------------------------------------------------------------
-
- $rec->set_prop('MaxBlocks', $hardlim);
+ $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");
-
+ $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';
-}
-
-
+} ## end sub validate_quota
1
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm
index f1c9a51..60e4029 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm
@@ -1,87 +1,77 @@
package SrvMngr::Controller::Reboot;
#----------------------------------------------------------------------
-# heading : System
+# heading : System
# description : Reboot or shutdown
-# navigation : 4000 700
+# navigation : 4000 700
#
# routes : end
#----------------------------------------------------------------------
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
-
use SrvMngr qw(theme_list init_session);
-
sub main {
-
my $c = shift;
$c->app->log->info($c->log_req);
-
my $title = $c->l('rbo_FORM_TITLE');
my $modul = '';
-
- $c->stash( title => $title, modul => $modul );
+ $c->stash(title => $title, modul => $modul);
$c->render(template => 'reboot');
-
-};
-
+} ## end sub main
sub do_action {
-
my $c = shift;
$c->app->log->info($c->log_req);
-
- my $title = $c->l('rbo_FORM_TITLE');
- my $result = "";
-
- my $function = $c->param ('function');
-
- my $debug = $c->param('debug');
+ my $title = $c->l('rbo_FORM_TITLE');
+ my $result = "";
+ my $function = $c->param('function');
+ my $debug = $c->param('debug');
if ($function eq "reboot") {
- $result = $c->l('rbo_REBOOT_SUCCEEDED') . '
' . $c->l('rbo_DESC_REBOOT');
+ $result = $c->l('rbo_REBOOT_SUCCEEDED') . '
' . $c->l('rbo_DESC_REBOOT');
+
unless ($debug) {
- esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "reboot" );
- # system( "/sbin/e-smith/signal-event", "reboot" ) == 0
- # or die ("Error occurred while rebooting.\n");
- }
+ esmith::util::backgroundCommand(1, "/sbin/e-smith/signal-event", "reboot");
+
+ # system( "/sbin/e-smith/signal-event", "reboot" ) == 0
+ # or die ("Error occurred while rebooting.\n");
+ } ## end unless ($debug)
} elsif ($function eq 'shutdown') {
- $result = $c->l('rbo_SHUTDOWN_SUCCEEDED') . '
' . $c->l('rbo_DESC_SHUTDOWN');
+ $result = $c->l('rbo_SHUTDOWN_SUCCEEDED') . '
' . $c->l('rbo_DESC_SHUTDOWN');
+
unless ($debug) {
- esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "halt" );
- # system( "/sbin/e-smith/signal-event", "halt" ) == 0
- # or die ("Error occurred while halting.\n");
- }
+ esmith::util::backgroundCommand(1, "/sbin/e-smith/signal-event", "halt");
+
+ # system( "/sbin/e-smith/signal-event", "halt" ) == 0
+ # or die ("Error occurred while halting.\n");
+ } ## end unless ($debug)
} elsif ($function eq 'reconfigure') {
- $result = $c->l('rbo_RECONFIGURE_SUCCEEDED') . '
' . $c->l('rbo_DESC_RECONFIGURE');
+ $result = $c->l('rbo_RECONFIGURE_SUCCEEDED') . '
' . $c->l('rbo_DESC_RECONFIGURE');
+
unless ($debug) {
- # esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade",
- # "; ", "/sbin/e-smith/signal-event", "reboot" );
- system( "/sbin/e-smith/signal-event", "post-upgrade" ) == 0
- or die ("Error occurred while running post-upgrade.\n");
- system( "/sbin/e-smith/signal-event", "reboot" ) == 0
- or die ("Error occurred while rebooting.\n");
- }
- }
- $c->stash( title => $title, modul => $result );
+ # esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade",
+ # "; ", "/sbin/e-smith/signal-event", "reboot" );
+ system("/sbin/e-smith/signal-event", "post-upgrade") == 0
+ or die("Error occurred while running post-upgrade.\n");
+ system("/sbin/e-smith/signal-event", "reboot") == 0
+ or die("Error occurred while rebooting.\n");
+ } ## end unless ($debug)
+ } ## end elsif ($function eq 'reconfigure')
+ $c->stash(title => $title, modul => $result);
$c->render(template => 'module');
-
-};
-
+} ## end sub do_action
sub rebootFunction_list {
-
my $c = shift;
- return [[ $c->l('rbo_REBOOT') => 'reboot' ],
- [ $c->l('RECONFIGURE') => 'reconfigure' ],
- [ $c->l('SHUTDOWN') => 'shutdown' ]];
-}
-
-
+ return [
+ [ $c->l('rbo_REBOOT') => 'reboot' ],
+ [ $c->l('RECONFIGURE') => 'reconfigure' ],
+ [ $c->l('SHUTDOWN') => 'shutdown' ]
+ ];
+} ## end sub rebootFunction_list
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm
index 4528444..668b8f2 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm
@@ -11,12 +11,9 @@ package SrvMngr::Controller::Remoteaccess;
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
-
use SrvMngr qw(theme_list init_session ip_number subnet_mask get_reg_mask);
-
use esmith::ConfigDB;
use esmith::util;
use File::Basename;
@@ -25,29 +22,23 @@ use Carp;
use Socket qw( inet_aton );
#our @ISA = qw(esmith::FormMagick Exporter);
-
-our @EXPORT =
- qw( networkAccess_list passwordLogin_list get_ssh_permit_root_login get_ssh_access get_telnet_mode
- get_ftp_access get_ftp_password_login_access
- get_value get_prop get_ssh_password_auth
- validate_network_and_mask ip_number_or_blank subnet_mask_or_blank
- get_ipsecrw_sessions pptp_and_dhcp_range
- );
+our @EXPORT = qw( networkAccess_list passwordLogin_list get_ssh_permit_root_login get_ssh_access get_telnet_mode
+ get_ftp_access get_ftp_password_login_access
+ get_value get_prop get_ssh_password_auth
+ validate_network_and_mask ip_number_or_blank subnet_mask_or_blank
+ get_ipsecrw_sessions pptp_and_dhcp_range
+);
# get_pptp_sessions
-
our $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
sub main {
-
my $c = shift;
- $c->app->log->info( $c->log_req );
-
+ $c->app->log->info($c->log_req);
my $title = $c->l('rma_FORM_TITLE');
my $notif = '';
my %rma_datas = ();
-
- $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+ $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
#$rma_datas{ipsecrwSess} = $c->get_ipsecrw_sessions();
#$rma_datas{pptpSessions} = $c->get_pptp_sessions();
@@ -59,106 +50,84 @@ sub main {
$rma_datas{ftpPasswordAccess} = $c->get_ftp_password_login_access();
#$rma_datas{telnetAccess} = $c->get_telnet_access;
-
- $c->stash( title => $title, notif => $notif, rma_datas => \%rma_datas );
- $c->render( template => 'remoteaccess' );
-
-}
+ $c->stash(title => $title, notif => $notif, rma_datas => \%rma_datas);
+ $c->render(template => 'remoteaccess');
+} ## end sub main
sub do_action {
-
my $c = shift;
- $c->app->log->info( $c->log_req );
-
+ $c->app->log->info($c->log_req);
my $title = $c->l('rma_FORM_TITLE');
- my ( $result, $res, $trt ) = '';
+ my ($result, $res, $trt) = '';
my %rma_datas = ();
-
- $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
-
- $rma_datas{ipsecrwSess} = ( $c->param('IpsecrwSess') || '' );
- $rma_datas{ipsecrwReset} = ( $c->param('IpsecrwReset') || '' );
+ $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+ $rma_datas{ipsecrwSess} = ($c->param('IpsecrwSess') || '');
+ $rma_datas{ipsecrwReset} = ($c->param('IpsecrwReset') || '');
#$rma_datas{pptpSessions} = ($c->param ('PptpSessions') || '0');
-
- $rma_datas{validFromNetwork} = ( $c->param('ValidFromNetwork') || '' );
- $rma_datas{validFromMask} = ( $c->param('ValidFromMask') || '' );
+ $rma_datas{validFromNetwork} = ($c->param('ValidFromNetwork') || '');
+ $rma_datas{validFromMask} = ($c->param('ValidFromMask') || '');
## my @remove = $q->param('validFromRemove'); ???????? the first one only !!
my @vals = $c->param('Remove_nets');
$rma_datas{remove_nets} = join ',', @vals;
-
- $rma_datas{sshaccess} = ( $c->param('SshAccess') || 'off' );
- $rma_datas{sshPermitRootLogin} =
- ( $c->param('SshPermitRootLogin') || 'no' );
- $rma_datas{sshPasswordAuthentication} =
- ( $c->param('SshPasswordAuthentication') || 'no' );
- $rma_datas{sshTCPPort} = ( $c->param('SshTCPPort') || '22' );
-
- $rma_datas{ftpAccess} = ( $c->param('FtpAccess') || 'off' );
- $rma_datas{ftpPasswordAccess} =
- ( $c->param('FtpPasswordAccess') || 'private' );
-
- $rma_datas{telnetAccess} = ( $c->param('TelnetAccess') || 'off' );
+ $rma_datas{sshaccess} = ($c->param('SshAccess') || 'off');
+ $rma_datas{sshPermitRootLogin} = ($c->param('SshPermitRootLogin') || 'no');
+ $rma_datas{sshPasswordAuthentication} = ($c->param('SshPasswordAuthentication') || 'no');
+ $rma_datas{sshTCPPort} = ($c->param('SshTCPPort') || '22');
+ $rma_datas{ftpAccess} = ($c->param('FtpAccess') || 'off');
+ $rma_datas{ftpPasswordAccess} = ($c->param('FtpPasswordAccess') || 'private');
+ $rma_datas{telnetAccess} = ($c->param('TelnetAccess') || 'off');
# validate
my $v = $c->validation;
return $c->render('remoteaccess') unless $v->has_data;
#$v->optional('PptpSessions')->num(0, 999)->is_valid;
- if ( $c->param('ValidFromNetwork') ne "" ) {
- $v->optional('ValidFromNetwork')->size( 7, 15 )->is_valid;
+ if ($c->param('ValidFromNetwork') ne "") {
+ $v->optional('ValidFromNetwork')->size(7, 15)->is_valid;
}
- if ( $c->param('ValidFromMask') ne "" ) {
- $v->optional('ValidFromMask')->size( 7, 15 )->is_valid;
- }
- $v->required('SshTCPPort')->num( 1, 65535 )->is_valid;
+ if ($c->param('ValidFromMask') ne "") {
+ $v->optional('ValidFromMask')->size(7, 15)->is_valid;
+ }
+ $v->required('SshTCPPort')->num(1, 65535)->is_valid;
$result .= 'field validation error' if $v->has_error;
- if ( !$result ) {
+ if (!$result) {
# controls
#$res = pptp_and_dhcp_range( $c, $rma_datas{pptpSessions} );
#$result .= $res . ' ' unless $res eq 'OK';
-
- $res = ip_number_or_blank( $c, $rma_datas{validFromNetwork} );
+ $res = ip_number_or_blank($c, $rma_datas{validFromNetwork});
$result .= $res . ' ' unless $res eq 'OK';
-
- $res = subnet_mask_or_blank( $c, $rma_datas{validFromMask} );
+ $res = subnet_mask_or_blank($c, $rma_datas{validFromMask});
$result .= $res . ' ' unless $res eq 'OK';
-
- $res = validate_network_and_mask(
- $c,
- $rma_datas{validFromNetwork},
- $rma_datas{validFromMask}
- );
+ $res = validate_network_and_mask($c, $rma_datas{validFromNetwork}, $rma_datas{validFromMask});
$result .= $res . ' ' unless $res eq 'OK';
#$result .= ' blocked for testing !' . $rma_datas{remove_nets};
- }
+ } ## end if (!$result)
- if ( !$result ) {
- $res = change_settings( $c, %rma_datas );
+ if (!$result) {
+ $res = change_settings($c, %rma_datas);
$result .= $res unless $res eq 'OK';
}
-
- if ( $result eq "" ) {
+
+ if ($result eq "") {
$result = $c->l('rma_SUCCESS');
$trt = 'SUC';
}
- $c->stash( title => $title, notif => $result, rma_datas => \%rma_datas );
+ $c->stash(title => $title, notif => $result, rma_datas => \%rma_datas);
#return $c->render( template => 'remoteaccess' );
-
- if ( $trt eq 'SUC' ) {
- $c->stash( title => $title,modul => $result);
- return $c->render( template => 'module' );
+ if ($trt eq 'SUC') {
+ $c->stash(title => $title, modul => $result);
+ return $c->render(template => 'module');
}
+ return $c->render(template => 'remoteaccess');
- return $c->render( template => 'remoteaccess' );
#$c->redirect_to('/remoteaccess');
-
-}
+} ## end sub do_action
sub networkAccess_list {
my $c = shift;
@@ -167,40 +136,33 @@ sub networkAccess_list {
[ $c->l('NETWORKS_ALLOW_LOCAL') => 'private' ],
[ $c->l('NETWORKS_ALLOW_PUBLIC') => 'public' ]
];
-}
+} ## end sub networkAccess_list
sub passwordLogin_list {
my $c = shift;
- return [
- [ $c->l('rma_PASSWORD_LOGIN_PRIVATE') => 'private' ],
- [ $c->l('rma_PASSWORD_LOGIN_PUBLIC') => 'public' ]
- ];
+ return [ [ $c->l('rma_PASSWORD_LOGIN_PRIVATE') => 'private' ], [ $c->l('rma_PASSWORD_LOGIN_PUBLIC') => 'public' ] ];
}
sub get_prop {
-
- my ( $c, $item, $prop ) = @_;
+ my ($c, $item, $prop) = @_;
warn "You must specify a record key" unless $item;
warn "You must specify a property name" unless $prop;
my $record = $db->get($item) or warn "Couldn't get record for $item";
return $record ? $record->prop($prop) : undef;
-}
+} ## end sub get_prop
sub get_value {
-
my $c = shift;
my $item = shift;
- return ( $db->get($item)->value() );
-}
+ return ($db->get($item)->value());
+} ## end sub get_value
sub get_ftp_access {
-
- my $status = get_prop( '', 'ftp', 'status' ) || 'disabled';
+ my $status = get_prop('', 'ftp', 'status') || 'disabled';
return 'off' unless $status eq 'enabled';
-
- my $access = get_prop( '', 'ftp', 'access' ) || 'private';
- return ( $access eq 'public' ) ? 'normal' : 'private';
-}
+ my $access = get_prop('', 'ftp', 'access') || 'private';
+ return ($access eq 'public') ? 'normal' : 'private';
+} ## end sub get_ftp_access
#sub get_pptp_sessions {
# my $status = get_prop('','pptpd','status');
@@ -208,188 +170,160 @@ sub get_ftp_access {
# return(get_prop('','pptpd','sessions') || 'no');
# return '0';
#}
-
sub get_ssh_permit_root_login {
- return ( get_prop( '', 'sshd', 'PermitRootLogin' ) || 'no' );
+ return (get_prop('', 'sshd', 'PermitRootLogin') || 'no');
}
sub get_ssh_password_auth {
- return ( get_prop( '', 'sshd', 'PasswordAuthentication' ) || 'yes' );
+ return (get_prop('', 'sshd', 'PasswordAuthentication') || 'yes');
}
sub get_ssh_access {
+ my $status = get_prop('', 'sshd', 'status');
- my $status = get_prop( '', 'sshd', 'status' );
- if ( defined($status) && ( $status eq 'enabled' ) ) {
- my $access = get_prop( '', 'sshd', 'access' );
- $access = ( $access eq 'public' ) ? 'public' : 'private';
+ if (defined($status) && ($status eq 'enabled')) {
+ my $access = get_prop('', 'sshd', 'access');
+ $access = ($access eq 'public') ? 'public' : 'private';
return ($access);
- }
- else {
+ } else {
return ('off');
}
-}
+} ## end sub get_ssh_access
sub get_ssh_port {
- return ( get_prop( '$c', 'sshd', 'TCPPort' ) || '22' );
+ return (get_prop('$c', 'sshd', 'TCPPort') || '22');
}
sub get_ftp_password_login_access {
-
- my $status = get_prop( '', 'ftp', 'status' ) || 'disabled';
+ my $status = get_prop('', 'ftp', 'status') || 'disabled';
return 'private' unless $status eq 'enabled';
-
- my $access = get_prop( '', 'ftp', 'LoginAccess' ) || 'private';
-
- return ( $access eq 'public' ) ? 'public' : 'private';
-}
+ my $access = get_prop('', 'ftp', 'LoginAccess') || 'private';
+ return ($access eq 'public') ? 'public' : 'private';
+} ## end sub get_ftp_password_login_access
sub get_telnet_mode {
-
my $telnet = $db->get('telnet');
return ('off') unless $telnet;
my $status = $telnet->prop('status') || 'disabled';
return ('off') unless $status eq 'enabled';
my $access = $telnet->prop('access') || 'private';
- return ( $access eq "public" ) ? "public" : "private";
-}
+ return ($access eq "public") ? "public" : "private";
+} ## end sub get_telnet_mode
sub get_ipsecrw_sessions {
-
my $status = $db->get('ipsec')->prop('RoadWarriorStatus');
- if ( defined($status) && ( $status eq 'enabled' ) ) {
- return ( $db->get('ipsec')->prop('RoadWarriorSessions') || '0' );
- }
- else {
+
+ if (defined($status) && ($status eq 'enabled')) {
+ return ($db->get('ipsec')->prop('RoadWarriorSessions') || '0');
+ } else {
return ('0');
}
-}
+} ## end sub get_ipsecrw_sessions
sub get_ipsecrw_status {
-
- return undef unless ( $db->get('ipsec') );
+ return undef unless ($db->get('ipsec'));
return $db->get('ipsec')->prop('RoadWarriorStatus');
-
}
sub pptp_and_dhcp_range {
-
my $c = shift;
my $val = shift || 0;
- my $dhcp_status = $db->get_prop( 'dhcpd', 'status' ) || 'disabled';
- my $dhcp_end = $db->get_prop( 'dhcpd', 'end' ) || '';
- my $dhcp_start = $db->get_prop( 'dhcpd', 'start' ) || '';
+ my $dhcp_status = $db->get_prop('dhcpd', 'status') || 'disabled';
+ my $dhcp_end = $db->get_prop('dhcpd', 'end') || '';
+ my $dhcp_start = $db->get_prop('dhcpd', 'start') || '';
- if ( $dhcp_status eq 'enabled' ) {
+ if ($dhcp_status eq 'enabled') {
my $ip_start = unpack 'N', inet_aton($dhcp_start);
my $ip_end = unpack 'N', inet_aton($dhcp_end);
my $ip_count = $ip_end - $ip_start;
- return 'OK' if ( $val < $ip_count );
- return $c->l(
-'rma_NUMBER_OF_PPTP_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE'
- );
- }
- else {
+ return 'OK' if ($val < $ip_count);
+ return $c->l('rma_NUMBER_OF_PPTP_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE');
+ } else {
return 'OK';
}
-}
+} ## end sub pptp_and_dhcp_range
sub _get_valid_from {
-
- my $c = shift;
-
+ my $c = shift;
my $rec = $db->get('httpd-admin');
return undef unless ($rec);
- my @vals = ( split ',', ( $rec->prop('ValidFrom') || '' ) );
+ my @vals = (split ',', ($rec->prop('ValidFrom') || ''));
return @vals;
-}
+} ## end sub _get_valid_from
sub ip_number_or_blank {
-
my $c = shift;
my $ip = shift;
- if ( !defined($ip) || $ip eq "" ) {
+ if (!defined($ip) || $ip eq "") {
return 'OK';
}
- return ip_number( $c, $ip );
-}
+ return ip_number($c, $ip);
+} ## end sub ip_number_or_blank
sub subnet_mask_or_blank {
-
my $c = shift;
my $mask = shift;
- if ( !defined($mask) || $mask eq "" ) {
+ if (!defined($mask) || $mask eq "") {
return "OK";
}
-
chomp $mask;
-
- return ( subnet_mask($mask) ne 'OK' )
- ? $c->l('rma_INVALID_SUBNET_MASK') . " (" . $mask . ")"
- : 'OK';
-}
+ return (subnet_mask($mask) ne 'OK')
+ ? $c->l('rma_INVALID_SUBNET_MASK') . " (" . $mask . ")"
+ : 'OK';
+} ## end sub subnet_mask_or_blank
sub validate_network_and_mask {
-
my $c = shift;
my $net = shift || "";
my $mask = shift || "";
- if ( $net xor $mask ) {
- return $c->l(
- 'rma_ERR_INVALID_PARAMS' . " (" . $net . "/" . $mask . ")" );
+ if ($net xor $mask) {
+ return $c->l('rma_ERR_INVALID_PARAMS' . " (" . $net . "/" . $mask . ")");
}
return 'OK';
-}
+} ## end sub validate_network_and_mask
sub change_settings {
-
- my ( $c, %rma_datas ) = @_;
+ my ($c, %rma_datas) = @_;
#------------------------------------------------------------
# good; go ahead and change the access.
#------------------------------------------------------------
-
my $rec = $db->get('telnet');
+
if ($rec) {
- if ( $rma_datas{telnetAccess} eq "off" ) {
- $rec->set_prop( 'status', 'disabled' );
+ if ($rma_datas{telnetAccess} eq "off") {
+ $rec->set_prop('status', 'disabled');
+ } else {
+ $rec->set_prop('status', 'enabled');
+ $rec->set_prop('access', $rma_datas{telnetAccess});
}
- else {
- $rec->set_prop( 'status', 'enabled' );
- $rec->set_prop( 'access', $rma_datas{telnetAccess} );
- }
- }
-
- $rec = $db->get('sshd') || $db->new_record( 'sshd', { type => 'service' } );
- $rec->set_prop( 'TCPPort', $rma_datas{sshTCPPort} );
- $rec->set_prop( 'status',
- ( $rma_datas{sshaccess} eq "off" ? 'disabled' : 'enabled' ) );
- $rec->set_prop( 'access', $rma_datas{sshaccess} );
- $rec->set_prop( 'PermitRootLogin', $rma_datas{sshPermitRootLogin} );
- $rec->set_prop( 'PasswordAuthentication',
- $rma_datas{sshPasswordAuthentication} );
-
+ } ## end if ($rec)
+ $rec = $db->get('sshd') || $db->new_record('sshd', { type => 'service' });
+ $rec->set_prop('TCPPort', $rma_datas{sshTCPPort});
+ $rec->set_prop('status', ($rma_datas{sshaccess} eq "off" ? 'disabled' : 'enabled'));
+ $rec->set_prop('access', $rma_datas{sshaccess});
+ $rec->set_prop('PermitRootLogin', $rma_datas{sshPermitRootLogin});
+ $rec->set_prop('PasswordAuthentication', $rma_datas{sshPasswordAuthentication});
$rec = $db->get('ftp');
+
if ($rec) {
- if ( $rma_datas{ftpAccess} eq "off" ) {
- $rec->set_prop( 'status', 'disabled' );
- $rec->set_prop( 'access', 'private' );
- $rec->set_prop( 'LoginAccess', 'private' );
+ if ($rma_datas{ftpAccess} eq "off") {
+ $rec->set_prop('status', 'disabled');
+ $rec->set_prop('access', 'private');
+ $rec->set_prop('LoginAccess', 'private');
+ } elsif ($rma_datas{ftpAccess} eq "normal") {
+ $rec->set_prop('status', 'enabled');
+ $rec->set_prop('access', 'public');
+ $rec->set_prop('LoginAccess', $rma_datas{ftpPasswordAccess});
+ } else {
+ $rec->set_prop('status', 'enabled');
+ $rec->set_prop('access', 'private');
+ $rec->set_prop('LoginAccess', $rma_datas{ftpPasswordAccess});
}
- elsif ( $rma_datas{ftpAccess} eq "normal" ) {
- $rec->set_prop( 'status', 'enabled' );
- $rec->set_prop( 'access', 'public' );
- $rec->set_prop( 'LoginAccess', $rma_datas{ftpPasswordAccess} );
- }
- else {
- $rec->set_prop( 'status', 'enabled' );
- $rec->set_prop( 'access', 'private' );
- $rec->set_prop( 'LoginAccess', $rma_datas{ftpPasswordAccess} );
- }
- }
+ } ## end if ($rec)
# if ($rma_datas{pptpSessions} == 0) {
# $db->get('pptpd')->set_prop('status', 'disabled');
@@ -397,107 +331,85 @@ sub change_settings {
# $db->get('pptpd')->set_prop('status', 'enabled');
# $db->get('pptpd')->set_prop('sessions', $rma_datas{pptpSessions});
# }
+ if ($rma_datas{validFromNetwork} && $rma_datas{validFromMask}) {
- if ( $rma_datas{validFromNetwork} && $rma_datas{validFromMask} ) {
- unless (
- add_new_valid_from(
- $c,
- $rma_datas{validFromNetwork},
- $rma_datas{validFromMask}
- )
- )
- {
+ unless (add_new_valid_from($c, $rma_datas{validFromNetwork}, $rma_datas{validFromMask})) {
return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'new net';
}
- }
+ } ## end if ($rma_datas{validFromNetwork...})
- if ( $rma_datas{remove_nets} ) {
- unless ( remove_valid_from( $c, $rma_datas{remove_nets} ) ) {
+ if ($rma_datas{remove_nets}) {
+ unless (remove_valid_from($c, $rma_datas{remove_nets})) {
return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'del net';
}
- }
+ } ## end if ($rma_datas{remove_nets...})
# reset ipsec roadwarrior CA,server,client certificates
- if ( $rma_datas{ipsecrwReset} ) {
- system( '/sbin/e-smith/roadwarrior', 'reset_certs' ) == 0
- or return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'rst ipsec';
+ if ($rma_datas{ipsecrwReset}) {
+ system('/sbin/e-smith/roadwarrior', 'reset_certs') == 0
+ or return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'rst ipsec';
}
- if ( $rma_datas{ipsecrwSess} ) {
- set_ipsecrw_sessions( $c, $rma_datas{ipsecrwSess} );
+ if ($rma_datas{ipsecrwSess}) {
+ set_ipsecrw_sessions($c, $rma_datas{ipsecrwSess});
}
- unless (
- system( "/sbin/e-smith/signal-event", "remoteaccess-update" ) == 0 )
- {
+ unless (system("/sbin/e-smith/signal-event", "remoteaccess-update") == 0) {
return $c->l('rma_ERROR_UPDATING_CONFIGURATION');
}
-
return 'OK';
-}
+} ## end sub change_settings
sub set_ipsecrw_sessions {
-
my $c = shift;
my $sessions = shift;
- if ( defined $sessions ) {
- $db->get('ipsec')->set_prop( 'RoadWarriorSessions', $sessions );
- if ( int($sessions) > 0 ) {
- $db->get('ipsec')->set_prop( 'RoadWarriorStatus', 'enabled' );
+ if (defined $sessions) {
+ $db->get('ipsec')->set_prop('RoadWarriorSessions', $sessions);
+
+ if (int($sessions) > 0) {
+ $db->get('ipsec')->set_prop('RoadWarriorStatus', 'enabled');
}
- }
+ } ## end if (defined $sessions)
return '';
-}
+} ## end sub set_ipsecrw_sessions
sub add_new_valid_from {
-
my $c = shift;
my $net = shift;
my $mask = shift;
# we transform bit mask to regular mask
- $mask = get_reg_mask( $net, $mask );
-
+ $mask = get_reg_mask($net, $mask);
my $rec = $db->get('httpd-admin');
return $c->error('ERR_NO_RECORD') unless $rec;
-
my $prop = $rec->prop('ValidFrom') || '';
-
my @vals = split /,/, $prop;
- return '' if ( grep /^$net\/$mask$/, @vals ); # already have this entry
+ return '' if (grep /^$net\/$mask$/, @vals); # already have this entry
- if ( $prop ne '' ) {
+ if ($prop ne '') {
$prop .= ",$net/$mask";
- }
- else {
+ } else {
$prop = "$net/$mask";
}
-
- $rec->set_prop( 'ValidFrom', $prop );
-
+ $rec->set_prop('ValidFrom', $prop);
return 1;
-}
+} ## end sub add_new_valid_from
sub remove_valid_from {
-
my $c = shift;
my $remove_nets = shift;
-
- my @remove = split /,/, $remove_nets;
+ my @remove = split /,/, $remove_nets;
# my @remove = $c->param('Remove_nets');
my @vals = $c->_get_valid_from();
foreach my $entry (@remove) {
-
return undef unless $entry;
-
- my ( $net, $mask ) = split( /\//, $entry );
+ my ($net, $mask) = split(/\//, $entry);
unless (@vals) {
- print STDERR
- "ERROR: unable to load ValidFrom property from conf db\n";
+ print STDERR "ERROR: unable to load ValidFrom property from conf db\n";
return undef;
}
@@ -506,20 +418,16 @@ sub remove_valid_from {
# added a 32 bit mask, so we don't know for sure if the value in db
# is $net alone or $net/255.255.255.255. we have to check for both
# in this special case...
- @vals = ( grep { $entry ne $_ && $net ne $_ } @vals );
- }
-
+ @vals = (grep { $entry ne $_ && $net ne $_ } @vals);
+ } ## end foreach my $entry (@remove)
my $prop;
+
if (@vals) {
$prop = join ',', @vals;
- }
- else {
+ } else {
$prop = '';
}
-
- $db->get('httpd-admin')->set_prop( 'ValidFrom', $prop );
-
+ $db->get('httpd-admin')->set_prop('ValidFrom', $prop);
return 1;
-}
-
-1;
\ No newline at end of file
+} ## end sub remove_valid_from
+1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Request.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Request.pm
index e10643a..62e38c5 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Request.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Request.pm
@@ -1,56 +1,46 @@
package SrvMngr::Controller::Request;
-
#
# routes : end
#----------------------------------------------------------------------
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
-
use SrvMngr qw(theme_list init_session);
# retrieve a configuration db record
sub getconfig {
- my $c = shift;
+ my $c = shift;
my $key = $c->param('key');
-
$c->app->log->info($c->log_req . ' ' . $key);
if ($key) {
- use esmith::ConfigDB qw(open_ro);
- my $cdb = esmith::ConfigDB->open_ro;
- return getdb( $c, $cdb, $key);
- }
-}
-
+ use esmith::ConfigDB qw(open_ro);
+ my $cdb = esmith::ConfigDB->open_ro;
+ return getdb($c, $cdb, $key);
+ } ## end if ($key)
+} ## end sub getconfig
# retrieve an accounts db record, given its name
sub getaccount {
- my $c = shift;
+ my $c = shift;
my $key = $c->param('key');
-
$c->app->log->info($c->log_req . ' ' . $key);
if ($key) {
- use esmith::AccountsDB qw(open_ro);
- my $adb = esmith::AccountsDB->open_ro;
- return getdb( $c, $adb, $key);
- }
-}
-
+ use esmith::AccountsDB qw(open_ro);
+ my $adb = esmith::AccountsDB->open_ro;
+ return getdb($c, $adb, $key);
+ } ## end if ($key)
+} ## end sub getaccount
sub getdb {
-
my ($c, $db, $key) = @_;
- if ( my $rec = $db->get($key) ) {
- return $c->render(json => { $key => { $rec->props }} );
+ if (my $rec = $db->get($key)) {
+ return $c->render(json => { $key => { $rec->props } });
}
return undef;
-}
-
-
+} ## end sub getdb
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm
index 1132e2d..2209796 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm
@@ -7,76 +7,59 @@ package SrvMngr::Controller::Review;
# menu : N
# routes : end
#----------------------------------------------------------------------
-# heading-o : Configuration
+# heading-o : Configuration
# description-o : Review configuration
# navigation-o : 6000 6800
-
#----------------------------------------------------------------------
use strict;
use warnings;
-
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
-
use SrvMngr qw(theme_list init_session);
#use SrvMngr::Review_sub qw(print_page);
#use smeserver::Panel::review;
use esmith::FormMagick::Panel::review;
-
-our $db = esmith::ConfigDB->open_ro || die "Couldn't open config db";
-our $domains = esmith::DomainsDB->open_ro || die "Couldn't open domains";
+our $db = esmith::ConfigDB->open_ro || die "Couldn't open config db";
+our $domains = esmith::DomainsDB->open_ro || die "Couldn't open domains";
our $networks = esmith::NetworksDB->open_ro || die "Couldn't open networks";
-
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
-
- my $title = $c->l('rvw_FORM_TITLE');
- my $modul = $c->render_to_string(inline => $c->l('rvw_DESCRIPTION'));
+ my $title = $c->l('rvw_FORM_TITLE');
+ my $modul = $c->render_to_string(inline => $c->l('rvw_DESCRIPTION'));
my %rvw_datas = ();
-
- $rvw_datas{'servermode'} = (get_value('','SystemMode' )|| '');
- $rvw_datas{'localip'} = get_value('$c','LocalIP' )
- .'/'.get_value('$c','LocalNetmask');
- $rvw_datas{'publicip'} =
- esmith::FormMagick::Panel::review->get_public_ip_address($c);
- $rvw_datas{'gateway'} =
- $c->render_to_string(inline => print2_gateway_stanza($c));
- $rvw_datas{'serveronly'} =
- $c->render_to_string(inline => print2_serveronly_stanza($c));
+ $rvw_datas{'servermode'} = (get_value('', 'SystemMode') || '');
+ $rvw_datas{'localip'} = get_value('$c', 'LocalIP') . '/' . get_value('$c', 'LocalNetmask');
+ $rvw_datas{'publicip'} = esmith::FormMagick::Panel::review->get_public_ip_address($c);
+ $rvw_datas{'gateway'} = $c->render_to_string(inline => print2_gateway_stanza($c));
+ $rvw_datas{'serveronly'} = $c->render_to_string(inline => print2_serveronly_stanza($c));
$rvw_datas{'addlocalnetworks'} = get_local_networks($c);
- $rvw_datas{'dhcpserver'} =
- $c->render_to_string(inline => print2_dhcp_stanza($c));
-
- $rvw_datas{'dnsserver'} = (get_value('','LocalIP' )|| '');
- $rvw_datas{'webserver'} = 'www.'.(get_local_domain());
+ $rvw_datas{'dhcpserver'} = $c->render_to_string(inline => print2_dhcp_stanza($c));
+ $rvw_datas{'dnsserver'} = (get_value('', 'LocalIP') || '');
+ $rvw_datas{'webserver'} = 'www.' . (get_local_domain());
my $port = $db->get_prop("squid", "TransparentPort") || 3128;
- $rvw_datas{'proxyserver'} = 'proxy.'.get_local_domain().":$port";
- $rvw_datas{'ftpserver'} = 'ftp.'.get_local_domain();
- $rvw_datas{'smtpserver'} = 'mail.'.get_local_domain();
-
- $rvw_datas{'domainname'} = (get_value('','DomainName' )|| '');
- $rvw_datas{'virtualdomains'} =
- $c->render_to_string(inline => gen2_domains($c));
- $rvw_datas{'primarywebsite'} = 'http://www.'.get_value('','DomainName');
- $rvw_datas{'servermanager'} = 'https://'. (get_value('','SystemName') || 'localhost').'/server-manager/';
- $rvw_datas{'usermanager'} = 'https://'. (get_value('','SystemName') || 'localhost').'/user-password/';
- $rvw_datas{'emailaddresses'} =
- $c->render_to_string(inline => gen2_email_addresses($c));
+ $rvw_datas{'proxyserver'} = 'proxy.' . get_local_domain() . ":$port";
+ $rvw_datas{'ftpserver'} = 'ftp.' . get_local_domain();
+ $rvw_datas{'smtpserver'} = 'mail.' . get_local_domain();
+ $rvw_datas{'domainname'} = (get_value('', 'DomainName') || '');
+ $rvw_datas{'virtualdomains'} = $c->render_to_string(inline => gen2_domains($c));
+ $rvw_datas{'primarywebsite'} = 'http://www.' . get_value('', 'DomainName');
+ $rvw_datas{'servermanager'} = 'https://' . (get_value('', 'SystemName') || 'localhost') . '/server-manager/';
+ $rvw_datas{'usermanager'} = 'https://' . (get_value('', 'SystemName') || 'localhost') . '/user-password/';
+ $rvw_datas{'emailaddresses'} = $c->render_to_string(inline => gen2_email_addresses($c));
#$c->stash( releaseVersion => $c->session->{releaseVersion}, copyRight => $c->session->{copyRight},
- #PwdSet => $c->session->{PwdSet}, Unsafe => $c->session->{Unsafe},
- $c->stash( title => $title, modul => $modul, rvw_datas => \%rvw_datas,
- );
-
+ #PwdSet => $c->session->{PwdSet}, Unsafe => $c->session->{Unsafe},
+ $c->stash(
+ title => $title,
+ modul => $modul,
+ rvw_datas => \%rvw_datas,
+ );
$c->render(template => 'review');
-
-}
-
+} ## end sub main
=head2 gen2_email_addresses
@@ -86,20 +69,28 @@ sub main {
=cut
sub gen2_email_addresses {
- my $c = shift;
-
- my $domain = get_value($c,'DomainName');
+ my $c = shift;
+ my $domain = get_value($c, 'DomainName');
my $useraccount = $c->l("rvw_EMAIL_USERACCOUNT");
- my $firstname = $c->l("rvw_EMAIL_FIRSTNAME");
- my $lastname = $c->l("rvw_EMAIL_LASTNAME");
-
- my $out = "" . $useraccount . "\@" . $domain . "
"
- . "" . $firstname . "." . $lastname . "\@" . $domain . "
"
- . "" . $firstname . "_" . $lastname . "\@" . $domain . "
";
-
- return $out;
-}
-
+ my $firstname = $c->l("rvw_EMAIL_FIRSTNAME");
+ my $lastname = $c->l("rvw_EMAIL_LASTNAME");
+ my $out
+ = ""
+ . $useraccount
+ . "\@"
+ . $domain . "
" . ""
+ . $firstname
+ . "."
+ . $lastname
+ . "\@"
+ . $domain . "
" . ""
+ . $firstname
+ . "_"
+ . $lastname
+ . "\@"
+ . $domain . "
";
+ return $out;
+} ## end sub gen2_email_addresses
=head2 gen2_domains
@@ -109,26 +100,25 @@ sub gen2_email_addresses {
=cut
sub gen2_domains {
- my $c = shift;
-
- my @virtual = $domains->get_all_by_prop( type => 'domain');
+ my $c = shift;
+ my @virtual = $domains->get_all_by_prop(type => 'domain');
my $numvirtual = @virtual;
+
if ($numvirtual == 0) {
$c->localise("NO_VIRTUAL_DOMAINS");
- }
- else {
+ } else {
my $out = "";
my $domain;
+
foreach $domain (sort @virtual) {
if ($out ne "") {
$out .= "
";
}
$out .= $domain->key;
- }
+ } ## end foreach $domain (sort @virtual)
return $out;
- }
-}
-
+ } ## end else [ if ($numvirtual == 0) ]
+} ## end sub gen2_domains
=head2 get2_local_networks
@@ -138,33 +128,28 @@ serving. (mojo ver)
=cut
sub get2_local_networks {
- my $c = shift;
-
- my @nets = $networks->get_all_by_prop('type' => 'network');
-
+ my $c = shift;
+ my @nets = $networks->get_all_by_prop('type' => 'network');
my $numNetworks = @nets;
+
if ($numNetworks == 0) {
- return $c->l('rvw_NO_NETWORKS');
- }
- else {
+ return $c->l('rvw_NO_NETWORKS');
+ } else {
my $out = "";
+
foreach my $network (sort @nets) {
if ($out ne "") {
$out .= "
";
}
+ $out .= $network->key . "/" . get_net_prop($c, $network->key, 'Mask');
- $out .= $network->key."/" . get_net_prop($c, $network->key, 'Mask');
-
- if ( defined get_net_prop($c, $network->key, 'Router') ) {
- $out .= " via " . get_net_prop ($c, $network->key, 'Router');
+ if (defined get_net_prop($c, $network->key, 'Router')) {
+ $out .= " via " . get_net_prop($c, $network->key, 'Router');
}
- }
+ } ## end foreach my $network (sort @nets)
return $out;
- }
-
-}
-
-
+ } ## end else [ if ($numNetworks == 0)]
+} ## end sub get2_local_networks
=head2 print2_gateway_stanza
@@ -172,28 +157,28 @@ If this system is a server gateway, show the external ip and gateway ip (mojo ve
=cut
-sub print2_gateway_stanza
-{
+sub print2_gateway_stanza {
my $c = shift;
- if (get_value($c,'SystemMode') =~ /servergateway/)
- {
- my $ip = get_value($c,'ExternalIP');
- my $static =
- (get_value($c, 'AccessType') eq 'dedicated') &&
- (get_value($c, 'ExternalDHCP') eq 'off') &&
- (get_prop($c, 'pppoe', 'status') eq 'disabled');
- if ($static)
- {
- $ip .= "/".get_value($c,'ExternalNetmask');
- }
- my $out = $c->l('rvw_EXTERNAL_IP_ADDRESS_SUBNET_MASK').':'.$ip;
- if ($static)
- {
- $out .= $c->l('rvw_GATEWAY').':'.get_value($c,'GatewayIP');
- }
- return $out
- }
-}
+
+ if (get_value($c, 'SystemMode') =~ /servergateway/) {
+ my $ip = get_value($c, 'ExternalIP');
+ my $static
+ = (get_value($c, 'AccessType') eq 'dedicated')
+ && (get_value($c, 'ExternalDHCP') eq 'off')
+ && (get_prop($c, 'pppoe', 'status') eq 'disabled');
+
+ if ($static) {
+ $ip .= "/" . get_value($c, 'ExternalNetmask');
+ }
+ my $out = $c->l('rvw_EXTERNAL_IP_ADDRESS_SUBNET_MASK') . ':' . $ip;
+
+ if ($static) {
+ $out .= $c->l('rvw_GATEWAY') . ':' . get_value($c, 'GatewayIP');
+ }
+ return $out;
+ } ## end if (get_value($c, 'SystemMode'...))
+} ## end sub print2_gateway_stanza
+
=head2 print2_serveronly_stanza
If this system is a standalone server with net access, show the external
@@ -202,14 +187,15 @@ gateway IP (mojo ver)
=cut
sub print2_serveronly_stanza {
- my $c = shift;
- if ( (get_value($c,'SystemMode') eq 'serveronly') &&
- get_value($c,'AccessType') &&
- (get_value($c,'AccessType') ne "off")) {
- return ( get_value($c,'GatewayIP') );
- }
-
-}
+ my $c = shift;
+
+ if ( (get_value($c, 'SystemMode') eq 'serveronly')
+ && get_value($c, 'AccessType')
+ && (get_value($c, 'AccessType') ne "off"))
+ {
+ return (get_value($c, 'GatewayIP'));
+ } ## end if ((get_value($c, 'SystemMode'...)))
+} ## end sub print2_serveronly_stanza
=head2 print2_dhcp_stanza
@@ -220,16 +206,14 @@ Prints out the current state of dhcp service (mojo ver)
sub print2_dhcp_stanza {
my $c = shift;
- my $out = (get_prop($c,'dhcpd','status') || 'disabled' );
+ my $out = (get_prop($c, 'dhcpd', 'status') || 'disabled');
- if (get_prop($c,'dhcpd', 'status') eq 'enabled') {
- $out .= '
'.$c->l('rvw_BEGINNING_OF_DHCP_ADDRESS_RANGE').':';
- $out .= (get_prop($c,'dhcpd','start') || '' ).'
';
- $out .= $c->l('rvw_END_OF_DHCP_ADDRESS_RANGE').':';
- $out .= (get_prop($c,'dhcpd','end') || '' );
- }
+ if (get_prop($c, 'dhcpd', 'status') eq 'enabled') {
+ $out .= '
' . $c->l('rvw_BEGINNING_OF_DHCP_ADDRESS_RANGE') . ':';
+ $out .= (get_prop($c, 'dhcpd', 'start') || '') . '
';
+ $out .= $c->l('rvw_END_OF_DHCP_ADDRESS_RANGE') . ':';
+ $out .= (get_prop($c, 'dhcpd', 'end') || '');
+ } ## end if (get_prop($c, 'dhcpd'...))
return $out;
-}
-
-
+} ## end sub print2_dhcp_stanza
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Roundcubepanel.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Roundcubepanel.pm
index b6d5550..9d3cba3 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Roundcubepanel.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Roundcubepanel.pm
@@ -10,37 +10,27 @@ package SrvMngr::Controller::Roundcubepanel;
#
# routes : end
#----------------------------------------------------------------------
-
use strict;
use warnings;
-
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session);
#use SrvMngr::Model::Main;
-
-
sub main {
-
my $c = shift;
$c->app->log->info($c->log_req);
-
- my $title = $c->l('Roundcube Webmail');
- my $roundcube_url = $c->param('url');
+ my $title = $c->l('Roundcube Webmail');
+ my $roundcube_url = $c->param('url');
my $roundcube_height = $c->param('height') | 600;
- $c->stash( title => $title, modul => $roundcube_url, height => $roundcube_height );
+ $c->stash(title => $title, modul => $roundcube_url, height => $roundcube_height);
$c->render(template => 'roundcube');
-
-}
+} ## end sub main
sub getroundcubeurl {
- my $c = shift;
- my $url = shift;
- return "/smanager/roundcube?url=$url";
-}
-
-
+ my $c = shift;
+ my $url = shift;
+ return "/smanager/roundcube?url=$url";
+} ## end sub getroundcubeurl
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm
index 4fad51c..0f73805 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm
@@ -11,34 +11,25 @@ package SrvMngr::Controller::Support;
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use SrvMngr qw(theme_list init_session);
-
use esmith::util;
-
sub display_licenses {
+ my $lang = shift;
+ my $lic = '';
- my $lang = shift;
-
- my $lic = '';
- foreach my $license (esmith::util::getLicenses($lang)) {
-
- $lic .= $license . '
';
- }
- return $lic;
-}
+ foreach my $license (esmith::util::getLicenses($lang)) {
+ $lic .= $license . '
';
+ }
+ return $lic;
+} ## end sub display_licenses
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
-
my $title = $c->l('support_FORM_TITLE');
my $modul = $c->render_to_string(inline => display_licenses($c->session->{lang}));
-
- $c->stash( title => $title, modul => $modul );
+ $c->stash(title => $title, modul => $modul);
$c->render(template => 'module');
-};
-
-
+} ## end sub main
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm
index 2b039a5..5b59755 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm
@@ -1,51 +1,39 @@
package SrvMngr::Controller::Swttheme;
-
#
# routes : end
#----------------------------------------------------------------------
use strict;
use warnings;
-
use Mojo::Base 'Mojolicious::Controller';
#use SrvMngr qw(theme_list init_session);
-
our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main {
-
- my $c = shift;
-
- my $from = $c->param('From') || '/';
+ my $c = shift;
+ my $from = $c->param('From') || '/';
my $theme = $c->param('Theme');
-
$c->app->log->info(" swt theme '$from' '$theme' ");
-
my $oldTheme = $c->session->{CurrentTheme};
- if ( $theme ne $oldTheme ) {
-# $c->app->renderer->paths([$c->app->home->rel_file('themes/default/templates')]);
-# $c->app->static->paths([$c->app->home->rel_file('themes/default/public')]);
-# if ( $theme ne 'default' ) {
-# # Put the new theme first
-# my $t_path = $c->app->home->rel_file('themes/'.$theme);
-# unshift @{$c->app->renderer->paths}, $t_path.'/templates' if -d $t_path.'/templates';
-# unshift @{$c->app->static->paths}, $t_path.'/public' if -d $t_path.'/public';
-# }
+ if ($theme ne $oldTheme) {
+
+ # $c->app->renderer->paths([$c->app->home->rel_file('themes/default/templates')]);
+ # $c->app->static->paths([$c->app->home->rel_file('themes/default/public')]);
+ # if ( $theme ne 'default' ) {
+ # # Put the new theme first
+ # my $t_path = $c->app->home->rel_file('themes/'.$theme);
+ # unshift @{$c->app->renderer->paths}, $t_path.'/templates' if -d $t_path.'/templates';
+ # unshift @{$c->app->static->paths}, $t_path.'/public' if -d $t_path.'/public';
+ # }
$c->session->{CurrentTheme} = $theme;
-
- $db->get('smanager')->set_prop('Theme', $theme);
- system ("/sbin/e-smith/signal-event smanager-theme-change") == 0
- or warn "$c->l('ERROR_UPDATING')";
- }
-
+ $db->get('smanager')->set_prop('Theme', $theme);
+ system("/sbin/e-smith/signal-event smanager-theme-change") == 0
+ or warn "$c->l('ERROR_UPDATING')";
+ } ## end if ($theme ne $oldTheme)
## (not sure) $c->flash( warning => $c->l('swt_LOGIN_AGAIN') );
- $from = '/initial' if $from eq '/';
- $from = '/' . $from if ( $from !~ m|^\/| );
-
- $c->redirect_to( $from);
-
-}
-
-
+ $from = '/initial' if $from eq '/';
+ $from = '/' . $from if ($from !~ m|^\/|);
+ $c->redirect_to($from);
+} ## end sub main
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm
index 5d661ce..968c335 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm
@@ -11,15 +11,13 @@ package SrvMngr::Controller::Useraccounts;
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
-use SrvMngr qw(theme_list init_session
- is_normal_password email_simple);
+use SrvMngr qw(theme_list init_session
+ is_normal_password email_simple);
#use esmith::FormMagick qw( validate_password );
#use CGI::FormMagick::Validator qw( call_fm_validation );
-
use esmith::AccountsDB;
use esmith::ConfigDB;
use esmith::util;
@@ -29,415 +27,369 @@ use esmith::util;
#use File::Basename;
#use Exporter;
#use Carp qw(verbose);
-
#use esmith::FormMagick::Panel::useraccounts;
-
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main {
-
my $c = shift;
$c->app->log->info($c->log_req);
-
- my $notif = '';
+ my $notif = '';
my %usr_datas = ();
- my $title = $c->l('usr_FORM_TITLE');
-
+ my $title = $c->l('usr_FORM_TITLE');
$usr_datas{'trt'} = 'LIST';
-
my @users = $adb->get('admin');
push @users, $adb->users();
-
- $c->stash( title => $title, notif => $notif, usr_datas => \%usr_datas, users => \@users );
+ $c->stash(title => $title, notif => $notif, usr_datas => \%usr_datas, users => \@users);
$c->render(template => 'useraccounts');
-
-};
-
+} ## end sub main
sub do_display {
-
- my $c = shift;
-
- my $rt = $c->current_route;
- my $trt = ($c->param('trt') || 'ADD');
- my $user = ($c->param('user') || '');
-
+ my $c = shift;
+ my $rt = $c->current_route;
+ my $trt = ($c->param('trt') || 'ADD');
+ my $user = ($c->param('user') || '');
my %usr_datas = ();
- my $title = $c->l('usr_FORM_TITLE');
+ my $title = $c->l('usr_FORM_TITLE');
my ($notif, $modul) = '';
-
$usr_datas{'trt'} = $trt;
- if ( $trt eq 'ADD' ) {
+ if ($trt eq 'ADD') {
+ $usr_datas{user} = '';
+ $usr_datas{firstname} = '';
+ $usr_datas{lastname} = '';
+ $usr_datas{dept} = $c->get_ldap_value('Dept');
+ $usr_datas{company} = $c->get_ldap_value('Company');
+ $usr_datas{street} = $c->get_ldap_value('Street');
+ $usr_datas{city} = $c->get_ldap_value('City');
+ $usr_datas{phone} = $c->get_ldap_value('Phone');
+ } ## end if ($trt eq 'ADD')
- $usr_datas{user} = '';
- $usr_datas{firstname} = '';
- $usr_datas{lastname} = '';
- $usr_datas{dept} = $c->get_ldap_value('Dept');
- $usr_datas{company} = $c->get_ldap_value('Company');
- $usr_datas{street} = $c->get_ldap_value('Street');
- $usr_datas{city} = $c->get_ldap_value('City');
- $usr_datas{phone} = $c->get_ldap_value('Phone');
+ if ($trt eq 'UPD' or $trt eq 'UPS') {
+ my $rec = $adb->get($user);
+ my $type = ($trt eq 'UPS') ? 'system' : 'user';
+
+ if ($rec and $rec->prop('type') eq $type) {
+ $usr_datas{user} = $user;
+ $usr_datas{firstname} = $rec->prop('FirstName');
+ $usr_datas{lastname} = $rec->prop('LastName');
+ $usr_datas{vpnclientaccess} = $rec->prop('VPNClientAccess');
+ $usr_datas{emailforward} = $rec->prop('EmailForward');
+ $usr_datas{forwardaddress} = $rec->prop('ForwardAddress');
+
+ if ($trt eq 'UPD') {
+ $usr_datas{dept} = $rec->prop('Dept');
+ $usr_datas{company} = $rec->prop('Company');
+ $usr_datas{street} = $rec->prop('Street');
+ $usr_datas{city} = $rec->prop('City');
+ $usr_datas{phone} = $rec->prop('Phone');
+ } ## end if ($trt eq 'UPD')
+ } ## end if ($rec and $rec->prop...)
+ } ## end if ($trt eq 'UPD' or $trt...)
+
+ if ($trt eq 'DEL') {
+ my $rec = $adb->get($user);
+
+ if ($rec and $rec->prop('type') eq 'user') {
+ $usr_datas{user} = $user;
+ $usr_datas{name} = $c->get_user_name($user);
}
+ } ## end if ($trt eq 'DEL')
- if ( $trt eq 'UPD' or $trt eq 'UPS' ) {
+ if ($trt eq 'PWD' or $trt eq 'PWS') {
+ my $rec = $adb->get($user);
+ my $type = ($trt eq 'PWS') ? 'system' : 'user';
- my $rec = $adb->get($user);
- my $type = ( $trt eq 'UPS' ) ? 'system' : 'user';
- if ($rec and $rec->prop('type') eq $type) {
- $usr_datas{user} = $user;
- $usr_datas{firstname} = $rec->prop('FirstName');
- $usr_datas{lastname} = $rec->prop('LastName');
- $usr_datas{vpnclientaccess} = $rec->prop('VPNClientAccess');
- $usr_datas{emailforward} = $rec->prop('EmailForward');
- $usr_datas{forwardaddress} = $rec->prop('ForwardAddress');
- if ( $trt eq 'UPD' ) {
- $usr_datas{dept} = $rec->prop('Dept');
- $usr_datas{company} = $rec->prop('Company');
- $usr_datas{street} = $rec->prop('Street');
- $usr_datas{city} = $rec->prop('City');
- $usr_datas{phone} = $rec->prop('Phone');
- }
- }
+ if ($rec and $rec->prop('type') eq $type) {
+ $usr_datas{user} = $user;
+ $usr_datas{name} = $c->get_user_name($user);
}
+ } ## end if ($trt eq 'PWD' or $trt...)
- if ( $trt eq 'DEL' ) {
-
- my $rec = $adb->get($user);
- if ($rec and $rec->prop('type') eq 'user') {
- $usr_datas{user} = $user;
- $usr_datas{name} = $c->get_user_name($user);
- }
+ if ($trt eq 'LCK') {
+ my $rec = $adb->get($user);
+ if ($rec and $rec->prop('type') eq 'user') {
+ $usr_datas{user} = $user;
+ $usr_datas{name} = $c->get_user_name($user);
}
+ } ## end if ($trt eq 'LCK')
- if ( $trt eq 'PWD' or $trt eq 'PWS' ) {
-
- my $rec = $adb->get($user);
- my $type = ( $trt eq 'PWS' ) ? 'system' : 'user';
- if ($rec and $rec->prop('type') eq $type) {
- $usr_datas{user} = $user;
- $usr_datas{name} = $c->get_user_name($user);
- }
+ if ($trt eq 'LIST') {
+ my @useraccounts;
+ if ($adb) {
+ @useraccounts = $adb->useraccounts();
}
-
- if ( $trt eq 'LCK' ) {
-
- my $rec = $adb->get($user);
- if ($rec and $rec->prop('type') eq 'user') {
- $usr_datas{user} = $user;
- $usr_datas{name} = $c->get_user_name($user);
- }
-
- }
-
- if ( $trt eq 'LIST' ) {
- my @useraccounts;
- if ($adb)
- {
- @useraccounts = $adb->useraccounts();
- }
- $c->stash( useraccounts => \@useraccounts );
-
- }
-
- $c->stash( title => $title, notif => $notif, usr_datas => \%usr_datas );
- $c->render( template => 'useraccounts' );
-
-};
-
+ $c->stash(useraccounts => \@useraccounts);
+ } ## end if ($trt eq 'LIST')
+ $c->stash(title => $title, notif => $notif, usr_datas => \%usr_datas);
+ $c->render(template => 'useraccounts');
+} ## end sub do_display
sub do_update {
-
my $c = shift;
$c->app->log->info($c->log_req);
-
- my $rt = $c->current_route;
- my $trt = ($c->param('trt') || 'LIST');
- my $user = ($c->param('user') || '');
- my $name = ($c->param('name') || '');
-
+ my $rt = $c->current_route;
+ my $trt = ($c->param('trt') || 'LIST');
+ my $user = ($c->param('user') || '');
+ my $name = ($c->param('name') || '');
my %usr_datas = ();
$usr_datas{trt} = $trt;
-
my $title = $c->l('usr_FORM_TITLE');
-
-
my ($res, $result) = '';
+ if ($trt eq 'ADD') {
- if ( $trt eq 'ADD' ) {
-
- # controls
-
- my $first = $c->param('FirstName');
- my $last = $c->param('LastName');
- my $mail = $c->param('ForwardAddress');
-
- unless ( $first ) {
- $result .= $c->l('FM_NONBLANK') . ' - ';
- }
- unless ( $last ) {
- $result .= $c->l('FM_NONBLANK') . ' - ';
- }
- #unless ( $mail ) {
- # $result .= $c->l('FM_NONBLANK') . ' - ';
- #}
-
- $res = $c->validate_acctName( $user );
- $result .= $res unless $res eq 'OK';
-
- $res = $c->validate_acctName_length( $user );
- $result .= $res unless $res eq 'OK';
-
- $res = $c->validate_acctName_conflict( $user );
- $result .= $res unless $res eq 'OK';
-
- $res = $c->pseudonym_clash( $first );
- $result .= $res unless $res eq 'OK';
-
- if ( $mail ) {
- $res = $c->emailforward( $mail );
- $result .= $res unless $res eq 'OK';
- }
-
- #$result .= 'Blocked for testing';
-
- if ( ! $result ) {
- $res = create_user( $c, $user );
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $result = $c->l('usrUSER_CREATED') . ' ' . $user;
- $usr_datas{trt} = 'SUC';
- }
- }
- }
-
-
- if ( $trt eq 'UPD' or $trt eq 'UPS') {
-
- # controls
-
- my $first = $c->param('FirstName');
- my $last = $c->param('LastName');
+ # controls
+ my $first = $c->param('FirstName');
+ my $last = $c->param('LastName');
my $mail = $c->param('ForwardAddress');
- unless ( $first ) {
+ unless ($first) {
$result .= $c->l('FM_NONBLANK') . ' - ';
- }
- unless ( $last ) {
+ }
+
+ unless ($last) {
$result .= $c->l('FM_NONBLANK') . ' - ';
- }
+ }
#unless ( $mail ) {
# $result .= $c->l('FM_NONBLANK') . ' - ';
- #}
+ #}
+ $res = $c->validate_acctName($user);
+ $result .= $res unless $res eq 'OK';
+ $res = $c->validate_acctName_length($user);
+ $result .= $res unless $res eq 'OK';
+ $res = $c->validate_acctName_conflict($user);
+ $result .= $res unless $res eq 'OK';
+ $res = $c->pseudonym_clash($first);
+ $result .= $res unless $res eq 'OK';
- $res = $c->pseudonym_clash( $first );
- $result .= $res unless $res eq 'OK';
+ if ($mail) {
+ $res = $c->emailforward($mail);
+ $result .= $res unless $res eq 'OK';
+ }
- if ( $mail ) {
- $res = $c->emailforward( $mail );
- $result .= $res unless $res eq 'OK';
- }
+ #$result .= 'Blocked for testing';
+ if (!$result) {
+ $res = create_user($c, $user);
+ $result .= $res unless $res eq 'OK';
+ if (!$result) {
+ $result = $c->l('usrUSER_CREATED') . ' ' . $user;
+ $usr_datas{trt} = 'SUC';
+ }
+ } ## end if (!$result)
+ } ## end if ($trt eq 'ADD')
-
- #$result .= 'Blocked for testing';
+ if ($trt eq 'UPD' or $trt eq 'UPS') {
- if ( ! $result ) {
- if ( $trt eq 'UPS' ) {
- $res = $c->modify_admin();
- } else {
- $res = $c->modify_user( $user );
- }
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $result = $c->l('usr_USER_MODIFIED') . ' ' . $user;
- $usr_datas{trt} = 'SUC';
- }
- }
- }
+ # controls
+ my $first = $c->param('FirstName');
+ my $last = $c->param('LastName');
+ my $mail = $c->param('ForwardAddress');
+ unless ($first) {
+ $result .= $c->l('FM_NONBLANK') . ' - ';
+ }
- if ( $trt eq 'PWD' ) {
+ unless ($last) {
+ $result .= $c->l('FM_NONBLANK') . ' - ';
+ }
+ #unless ( $mail ) {
+ # $result .= $c->l('FM_NONBLANK') . ' - ';
+ #}
+ $res = $c->pseudonym_clash($first);
+ $result .= $res unless $res eq 'OK';
+
+ if ($mail) {
+ $res = $c->emailforward($mail);
+ $result .= $res unless $res eq 'OK';
+ }
+
+ #$result .= 'Blocked for testing';
+ if (!$result) {
+
+ if ($trt eq 'UPS') {
+ $res = $c->modify_admin();
+ } else {
+ $res = $c->modify_user($user);
+ }
+ $result .= $res unless $res eq 'OK';
+
+ if (!$result) {
+ $result = $c->l('usr_USER_MODIFIED') . ' ' . $user;
+ $usr_datas{trt} = 'SUC';
+ }
+ } ## end if (!$result)
+ } ## end if ($trt eq 'UPD' or $trt...)
+
+ if ($trt eq 'PWD') {
my $pass1 = $c->param('newPass');
my $pass2 = $c->param('newPassVerify');
- # controls
+ # controls
unless ($pass1) {
$result .= $c->l('FM_NONBLANK') . ' - ';
- }
+ }
+
unless ($pass1 eq $pass2) {
$result .= $c->l('PASSWORD_VERIFY_ERROR') . ' - ';
- }
+ }
- if ( ! $result ) {
- $res = check_password( $c, $pass1 );
- $result .= $res unless $res eq 'OK';
- }
+ if (!$result) {
+ $res = check_password($c, $pass1);
+ $result .= $res unless $res eq 'OK';
+ }
- if ( $user eq 'admin' ) {
- $result .= "System password should not be reset here !";
- }
- #$result .= 'Blocked for testing';
-
- if ( ! $result ) {
- my $res = $c->reset_password( $user, $pass1 );
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $result = $c->l('usr_PASSWORD_CHANGE_SUCCEEDED', $user);
- $usr_datas{trt} = 'SUC';
- }
- }
- }
+ if ($user eq 'admin') {
+ $result .= "System password should not be reset here !";
+ }
- if ( $trt eq 'PWS' ) { # system password reset (admin)
+ #$result .= 'Blocked for testing';
+ if (!$result) {
+ my $res = $c->reset_password($user, $pass1);
+ $result .= $res unless $res eq 'OK';
+ if (!$result) {
+ $result = $c->l('usr_PASSWORD_CHANGE_SUCCEEDED', $user);
+ $usr_datas{trt} = 'SUC';
+ }
+ } ## end if (!$result)
+ } ## end if ($trt eq 'PWD')
+
+ if ($trt eq 'PWS') { # system password reset (admin)
my $curpass = $c->param('CurPass');
- my $pass1 = $c->param('Pass');
- my $pass2 = $c->param('PassVerify');
+ my $pass1 = $c->param('Pass');
+ my $pass2 = $c->param('PassVerify');
- # controls
+ # controls
if ($curpass) {
- $res = $c->system_authenticate_password( $curpass );
- $result .= $res unless $res eq 'OK';
- } else {
+ $res = $c->system_authenticate_password($curpass);
+ $result .= $res unless $res eq 'OK';
+ } else {
$result .= $c->l('FM_NONBLANK') . ' - ';
- }
+ }
unless ($pass1 and $pass2) {
$result .= $c->l('FM_NONBLANK') . ' - ';
- }
+ }
unless ($pass1 eq $pass2) {
$result .= $c->l('usr_SYSTEM_PASSWORD_VERIFY_ERROR') . ' - ';
- }
+ }
- if ( ! $result ) {
- $res = $c->system_validate_password( $pass1 );
- $result .= $res unless $res eq 'OK';
+ if (!$result) {
+ $res = $c->system_validate_password($pass1);
+ $result .= $res unless $res eq 'OK';
+ $res = $c->system_check_password($pass1);
+ $result .= $res unless $res eq 'OK';
+ } ## end if (!$result)
- $res = $c->system_check_password( $pass1 );
- $result .= $res unless $res eq 'OK';
- }
+ #$result .= 'Blocked for testing';
+ if (!$result) {
+ my $res = $c->system_change_password();
+ $result .= $res unless $res eq 'OK';
- #$result .= 'Blocked for testing';
-
- if ( ! $result ) {
- my $res = $c->system_change_password();
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $result = $c->l('usr_SYSTEM_PASSWORD_CHANGED', $user);
- $usr_datas{trt} = 'SUC';
- }
- }
- }
+ if (!$result) {
+ $result = $c->l('usr_SYSTEM_PASSWORD_CHANGED', $user);
+ $usr_datas{trt} = 'SUC';
+ }
+ } ## end if (!$result)
+ } ## end if ($trt eq 'PWS')
+ if ($trt eq 'LCK') {
- if ( $trt eq 'LCK' ) {
+ # controls
+ #$res = xxxxxxxxxxx();
+ #$result .= $res unless $res eq 'OK';
+ #$result .= 'Blocked for testing';
+ if (!$result) {
+ my $res = $c->lock_account($user);
+ $result .= $res unless $res eq 'OK';
- # controls
+ if (!$result) {
+ $result = $c->l('usr_LOCKED_ACCOUNT', $user);
+ $usr_datas{trt} = 'SUC';
+ }
+ } ## end if (!$result)
+ } ## end if ($trt eq 'LCK')
- #$res = xxxxxxxxxxx();
- #$result .= $res unless $res eq 'OK';
-
- #$result .= 'Blocked for testing';
+ if ($trt eq 'DEL') {
- if ( ! $result ) {
- my $res = $c->lock_account( $user );
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $result = $c->l('usr_LOCKED_ACCOUNT', $user);
- $usr_datas{trt} = 'SUC';
- }
- }
- }
-
- if ( $trt eq 'DEL' ) {
-
- # controls
-
- #$res = xxxxxxxxxxx();
- #$result .= $res unless $res eq 'OK';
-
- #$result .= 'Blocked for testing';
-
- if ( ! $result ) {
- my $res = $c->remove_account( $user );
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $result = $c->l('usr_SUCCESSFULLY_DELETED_USER') . ' ' . $user;
- $usr_datas{trt} = 'SUC';
- }
- }
- }
+ # controls
+ #$res = xxxxxxxxxxx();
+ #$result .= $res unless $res eq 'OK';
+ #$result .= 'Blocked for testing';
+ if (!$result) {
+ my $res = $c->remove_account($user);
+ $result .= $res unless $res eq 'OK';
+ if (!$result) {
+ $result = $c->l('usr_SUCCESSFULLY_DELETED_USER') . ' ' . $user;
+ $usr_datas{trt} = 'SUC';
+ }
+ } ## end if (!$result)
+ } ## end if ($trt eq 'DEL')
$usr_datas{'user'} = $user;
$usr_datas{'name'} = $name;
+ $c->stash(title => $title, notif => $result, usr_datas => \%usr_datas);
- $c->stash( title => $title, notif => $result, usr_datas => \%usr_datas );
if ($usr_datas{trt} ne 'SUC') {
- return $c->render(template => 'useraccounts');
+ return $c->render(template => 'useraccounts');
}
$c->redirect_to('/useraccounts');
-
-};
-
+} ## end sub do_update
sub lock_account {
- my $c = shift;
-
+ my $c = shift;
my $user = $c->param('user');
my $acct = $adb->get($user);
+
if ($acct->prop('type') eq "user") {
undef $adb;
- # Untaint the username before use in system()
- $user =~ /^(\w[\-\w_\.]*)$/;
- $user = $1;
+ # Untaint the username before use in system()
+ $user =~ /^(\w[\-\w_\.]*)$/;
+ $user = $1;
+
if (system("/sbin/e-smith/signal-event", "user-lock", $user)) {
$adb = esmith::AccountsDB->open();
return $c->l("usr_ERR_OCCURRED_LOCKING");
}
$adb = esmith::AccountsDB->open();
- return 'OK';
+ return 'OK';
} else {
return $c->l('NO_SUCH_USER', $user);
}
-}
-
+} ## end sub lock_account
sub remove_account {
- my ($c) = @_;
+ my ($c) = @_;
my $user = $c->param('user');
-
my $acct = $adb->get($user);
+
if ($acct->prop('type') eq 'user') {
$acct->set_prop('type', 'user-deleted');
-
undef $adb;
- # Untaint the username before use in system()
- $user =~ /^(\w[\-\w_\.]*)$/;
- $user = $1;
- if (system ("/sbin/e-smith/signal-event", "user-delete", $user))
- {
+ # Untaint the username before use in system()
+ $user =~ /^(\w[\-\w_\.]*)$/;
+ $user = $1;
+
+ if (system("/sbin/e-smith/signal-event", "user-delete", $user)) {
$adb = esmith::AccountsDB->open();
return $c->l("ERR_OCCURRED_DELETING");
}
-
$adb = esmith::AccountsDB->open();
$adb->get($user)->delete;
- return 'OK';
+ return 'OK';
} else {
return $c->l('NO_SUCH_USER', $user);
}
-}
-
+} ## end sub remove_account
sub reset_password {
my ($c, $user, $passw1) = @_;
@@ -446,87 +398,70 @@ sub reset_password {
return $c->l('usr_TAINTED_USER');
}
$user = $1;
-
my $acct = $adb->get($user);
- if ( $acct->prop('type') eq "user") {
- esmith::util::setUserPassword ($user, $passw1);
-
+ if ($acct->prop('type') eq "user") {
+ esmith::util::setUserPassword($user, $passw1);
$acct->set_prop("PasswordSet", "yes");
undef $adb;
- if (system("/sbin/e-smith/signal-event", "password-modify", $user))
- {
+ if (system("/sbin/e-smith/signal-event", "password-modify", $user)) {
$adb = esmith::AccountsDB->open();
return $c->l("usr_ERR_OCCURRED_MODIFYING_PASSWORD");
}
$adb = esmith::AccountsDB->open();
-
return 'OK';
} else {
return $c->l('NO_SUCH_USER', $user);
}
-}
-
-
+} ## end sub reset_password
sub check_password {
- my $c = shift;
+ my $c = shift;
my $pass1 = shift;
-
my $check_type;
my $rec = $cdb->get('passwordstrength');
$check_type = ($rec ? ($rec->prop('Users') || 'none') : 'none');
-
return validate_password($c, $check_type, $pass1);
-}
-
+} ## end sub check_password
sub validate_password {
my ($c, $strength, $pass) = @_;
-
use Crypt::Cracklib;
-
my $reason;
if ($strength eq "none") {
return $c->l("Passwords must be at least 7 characters long") unless (length($pass) > 6);
return "OK";
}
-
$reason = is_normal_password($c, $pass, undef);
-
return $reason unless ($reason eq "OK");
return "OK" unless ($strength eq "strong");
- if ( -f '/usr/lib64/cracklib_dict.pwd' ) {
+ if (-f '/usr/lib64/cracklib_dict.pwd') {
$reason = fascist_check($pass, '/usr/lib64/cracklib_dict');
} else {
$reason = fascist_check($pass, '/usr/lib/cracklib_dict');
}
$reason ||= "Software error: password check failed";
-
return "OK" if ($reason eq "ok");
-
- return $c->l("Bad Password Choice") . ": "
- . $c->l("The password you have chosen is not a good choice, because")
- . " " . $c->($reason) . ".";
-}
-
+ return
+ $c->l("Bad Password Choice") . ": "
+ . $c->l("The password you have chosen is not a good choice, because") . " "
+ . $c->($reason) . ".";
+} ## end sub validate_password
sub emailForward_list {
my $c = shift;
-
- return [[ $c->l('usr_DELIVER_EMAIL_LOCALLY') => 'local'],
- [ $c->l('usr_FORWARD_EMAIL') => 'forward'],
- [ $c->l('usr_DELIVER_AND_FORWARD') => 'both']];
-}
-
+ return [
+ [ $c->l('usr_DELIVER_EMAIL_LOCALLY') => 'local' ],
+ [ $c->l('usr_FORWARD_EMAIL') => 'forward' ],
+ [ $c->l('usr_DELIVER_AND_FORWARD') => 'both' ]
+ ];
+} ## end sub emailForward_list
sub max_user_name_length {
-
my ($c, $data) = @_;
-
$cdb->reload();
my $max = $cdb->get('maxuserNameLength')->value;
@@ -535,40 +470,33 @@ sub max_user_name_length {
} else {
return $c->l('usr_MAX_user_NAME_LENGTH_ERROR', $data, $max, $max);
}
-}
-
+} ## end sub max_user_name_length
sub validate_acctName {
-
my ($c, $acctName) = @_;
unless ($adb->validate_account_name($acctName)) {
return $c->l('usr_ACCT_NAME_HAS_INVALID_CHARS', $acctName);
}
return "OK";
-}
+} ## end sub validate_acctName
sub validate_acctName_length {
+ my $c = shift;
+ my $acctName = shift;
+ my $maxAcctNameLength = ($cdb->get('maxAcctNameLength') ? $cdb->get('maxAcctNameLength')->prop('type') : "") || 12;
- my $c = shift;
- my $acctName = shift;
-
- my $maxAcctNameLength = ($cdb->get('maxAcctNameLength')
- ? $cdb->get('maxAcctNameLength')->prop('type') : "") || 12;
-
- if ( length $acctName > $maxAcctNameLength ) {
+ if (length $acctName > $maxAcctNameLength) {
return $c->l('usr_ACCOUNT_TOO_LONG', $maxAcctNameLength);
} else {
return ('OK');
}
-}
+} ## end sub validate_acctName_length
sub validate_acctName_conflict {
-
my $c = shift;
my $acctName = shift;
-
- my $account = $adb->get($acctName);
+ my $account = $adb->get($acctName);
my $type;
if (defined $account) {
@@ -576,26 +504,17 @@ sub validate_acctName_conflict {
} elsif (defined getpwnam($acctName) || defined getgrnam($acctName)) {
$type = "system";
} else {
- return('OK');
+ return ('OK');
}
return $c->l('usr_ACCOUNT_CONFLICT', $acctName, $type);
-
-}
-
-
+} ## end sub validate_acctName_conflict
sub get_user_name {
-
my ($c, $acctName) = @_;
-
my $usr = $adb->get($acctName);
-
return '' unless $usr;
-
- return $usr->prop('FirstName') ." ". $usr->prop('LastName');
-
-}
-
+ return $usr->prop('FirstName') . " " . $usr->prop('LastName');
+} ## end sub get_user_name
sub get_ldap_value {
my ($c, $field) = @_;
@@ -604,7 +523,6 @@ sub get_ldap_value {
if ($c->param('user')) {
return $c->param($field);
}
-
my %CGIParam2DBfield = (
Dept => 'defaultDepartment',
Company => 'defaultCompany',
@@ -612,54 +530,47 @@ sub get_ldap_value {
City => 'defaultCity',
Phone => 'defaultPhoneNumber'
);
-
return $cdb->get('ldap')->prop($CGIParam2DBfield{$field});
-}
+} ## end sub get_ldap_value
sub get_pptp_value {
return $cdb->get('pptpd')->prop('AccessDefault') || 'no';
}
-
sub pseudonym_clash {
my ($c, $first) = @_;
$first ||= "";
my $last = $c->param('LastName') || "";
- my $acctName = $c->param('user') || "";
-
- my $up = "$first $last";
-
- $up =~ s/^\s+//;
- $up =~ s/\s+$//;
- $up =~ s/\s+/ /g;
- $up =~ s/\s/_/g;
-
- my $dp = $up;
+ my $acctName = $c->param('user') || "";
+ my $up = "$first $last";
+ $up =~ s/^\s+//;
+ $up =~ s/\s+$//;
+ $up =~ s/\s+/ /g;
+ $up =~ s/\s/_/g;
+ my $dp = $up;
$dp =~ s/_/./g;
-
$dp = $adb->get($dp);
$up = $adb->get($up);
-
my $da = $dp->prop('Account') if $dp;
my $ua = $up->prop('Account') if $up;
+
if ($dp and $da and $da ne $acctName) {
- return $c->l('usr_PSEUDONYM_CLASH',
- $acctName, $da, $dp->key);
+ return $c->l('usr_PSEUDONYM_CLASH', $acctName, $da, $dp->key);
} elsif ($up and $ua and $ua ne $acctName) {
- return $c->l('usr_PSEUDONYM_CLASH',
- $acctName, $ua, $up->key );
+ return $c->l('usr_PSEUDONYM_CLASH', $acctName, $ua, $up->key);
} else {
return "OK";
}
-}
-
+} ## end sub pseudonym_clash
sub emailforward {
my ($c, $data) = @_;
my $response = $c->email_simple($data);
+
if ($response eq "OK") {
return "OK";
} elsif ($data eq "") {
+
# Blank is ok, only if we're not forwarding, which means that the
# EmailForward param must be set to 'local'.
my $email_forward = $c->param('EmailForward') || '';
@@ -668,91 +579,75 @@ sub emailforward {
return $c->l('usr_CANNOT_CONTAIN_WHITESPACE');
} else {
return $c->l('usr_CANNOT_CONTAIN_WHITESPACE')
- if ( $data =~ /\s+/ );
+ if ($data =~ /\s+/);
+
# Permit a local address.
return "OK" if $data =~ /^[a-zA-Z][a-zA-Z0-9\._\-]*$/;
return $c->l('usr_UNACCEPTABLE_CHARS');
- }
-}
-
+ } ## end else [ if ($response eq "OK")]
+} ## end sub emailforward
sub get_groups {
my ($c) = shift;
-
my @groups = $adb->groups();
return \@groups;
-}
-
+} ## end sub get_groups
sub ipsec_for_acct {
-
my $c = shift;
# Don't show ipsecrw setting unless the status property exists
- return '' unless ($cdb->get('ipsec')
+ return '' unless ($cdb->get('ipsec')
&& $cdb->get('ipsec')->prop('RoadWarriorStatus'));
# Don't show ipsecrw setting unless /sbin/e-smith/roadwarrior exists
return '' unless -x '/sbin/e-smith/roadwarrior';
-
my $user = $c->param('user');
return '' unless $user;
-
my $rec = $adb->get($user);
- if ( $rec ) {
- my $pwset = $rec->prop('PasswordSet') || 'no';
- my $VPNaccess = $rec->prop('VPNClientAccess') || 'no';
- if ($pwset eq 'yes' and $VPNaccess eq 'yes') {
- return 'OK';
- }
- }
- return '';
-}
+ if ($rec) {
+ my $pwset = $rec->prop('PasswordSet') || 'no';
+ my $VPNaccess = $rec->prop('VPNClientAccess') || 'no';
+
+ if ($pwset eq 'yes' and $VPNaccess eq 'yes') {
+ return 'OK';
+ }
+ } ## end if ($rec)
+ return '';
+} ## end sub ipsec_for_acct
sub is_user_in_group {
-
- my $c = shift;
- my $user = shift || '';
+ my $c = shift;
+ my $user = shift || '';
my $group = shift || '';
-
- return '' unless ( $user and $group );
-
- return ( $adb->is_user_in_group($user, $group) ) ? 'OK' : '';
-
-}
-
+ return '' unless ($user and $group);
+ return ($adb->is_user_in_group($user, $group)) ? 'OK' : '';
+} ## end sub is_user_in_group
sub get_ipsec_client_cert {
- my $c = shift;
+ my $c = shift;
my $user = $c->param('user');
($user) = ($user =~ /^(.*)$/);
-
die "Invalid user: $user\n" unless getpwnam($user);
-
- open (KID, "/sbin/e-smith/roadwarrior get_client_cert $user |")
+ open(KID, "/sbin/e-smith/roadwarrior get_client_cert $user |")
or die "Can't fork: $!";
my $certfile = ;
close KID;
-
require File::Basename;
my $certname = File::Basename::basename($certfile);
-
print "Expires: 0\n";
print "Content-type: application/x-pkcs12\n";
print "Content-disposition: inline; filename=$certname\n";
print "\n";
+ open(CERT, "<$certfile");
- open (CERT, "<$certfile");
- while ()
- {
+ while () {
print;
}
close CERT;
-
return '';
-}
-
+} ## end sub get_ipsec_client_cert
sub modify_user {
my ($c) = @_;
@@ -761,193 +656,159 @@ sub modify_user {
unless (($acctName) = ($acctName =~ /^(\w[\-\w_\.]*)$/)) {
return $c->l('usr_TAINTED_USER', $acctName);
}
+
# Untaint the username before use in system()
$acctName = $1;
-
- my $acct = $adb->get($acctName);
+ my $acct = $adb->get($acctName);
my $acctType = $acct->prop('type');
- if ($acctType eq "user")
- {
+ if ($acctType eq "user") {
$adb->remove_user_auto_pseudonyms($acctName);
my %newProperties = (
- 'FirstName' => $c->param('FirstName'),
- 'LastName' => $c->param('LastName'),
- 'Phone' => $c->param('Phone'),
- 'Company' => $c->param('Company'),
- 'Dept' => $c->param('Dept'),
- 'City' => $c->param('City'),
- 'Street' => $c->param('Street'),
- 'EmailForward' => $c->param('EmailForward'),
- 'ForwardAddress' => $c->param('ForwardAddress'),
- 'VPNClientAccess'=> $c->param('VPNClientAccess'),
+ 'FirstName' => $c->param('FirstName'),
+ 'LastName' => $c->param('LastName'),
+ 'Phone' => $c->param('Phone'),
+ 'Company' => $c->param('Company'),
+ 'Dept' => $c->param('Dept'),
+ 'City' => $c->param('City'),
+ 'Street' => $c->param('Street'),
+ 'EmailForward' => $c->param('EmailForward'),
+ 'ForwardAddress' => $c->param('ForwardAddress'),
+ 'VPNClientAccess' => $c->param('VPNClientAccess'),
);
-
$acct->merge_props(%newProperties);
-
$adb->create_user_auto_pseudonyms($acctName)
- if ( ($cdb->get_prop('pseudonyms','create') || 'enabled') eq 'enabled' );
-
+ if (($cdb->get_prop('pseudonyms', 'create') || 'enabled') eq 'enabled');
my @old_groups = $adb->user_group_list($acctName);
- my @new_groups = @{$c->every_param("groupMemberships")};
-
-# $c->app->log->info($c->dumper("groups: Old " . @old_groups .' New '. @new_groups));
+ my @new_groups = @{ $c->every_param("groupMemberships") };
+ # $c->app->log->info($c->dumper("groups: Old " . @old_groups .' New '. @new_groups));
$adb->remove_user_from_groups($acctName, @old_groups);
$adb->add_user_to_groups($acctName, @new_groups);
-
undef $adb;
- unless (system ("/sbin/e-smith/signal-event", "user-modify",
- $acctName) == 0) {
+ unless (system("/sbin/e-smith/signal-event", "user-modify", $acctName) == 0) {
$adb = esmith::AccountsDB->open();
return $c->l('usr_CANNOT_MODIFY_USER');
}
$adb = esmith::AccountsDB->open();
- }
+ } ## end if ($acctType eq "user")
return 'OK';
-}
-
+} ## end sub modify_user
sub create_user {
-
- my $c = shift;
-
+ my $c = shift;
my $acctName = $c->param('user');
my %userprops;
- foreach my $field ( qw( FirstName LastName Phone Company Dept
- City Street EmailForward ForwardAddress VPNClientAccess) )
+ foreach my $field (
+ qw( FirstName LastName Phone Company Dept
+ City Street EmailForward ForwardAddress VPNClientAccess)
+ )
{
$userprops{$field} = $c->param($field);
- }
+ } ## end foreach my $field (qw( FirstName LastName Phone Company Dept...))
$userprops{'PasswordSet'} = "no";
$userprops{'type'} = 'user';
-
my $acct = $adb->new_record($acctName)
or warn "Can't create new account for $acctName (does it already exist?)\n";
$acct->reset_props(%userprops);
$adb->create_user_auto_pseudonyms($acctName)
- if ( ($cdb->get_prop('pseudonyms','create') || 'enabled') eq 'enabled' );
- my @groups = @{$c->every_param("groupMemberships")};
-
+ if (($cdb->get_prop('pseudonyms', 'create') || 'enabled') eq 'enabled');
+ my @groups = @{ $c->every_param("groupMemberships") };
$adb->add_user_to_groups($acctName, @groups);
-
undef $adb;
# Untaint the username before use in system()
$acctName =~ /^(\w[\-\w_\.]*)$/;
$acctName = $1;
- if (system ("/sbin/e-smith/signal-event", "user-create", $acctName))
- {
+ if (system("/sbin/e-smith/signal-event", "user-create", $acctName)) {
$adb = esmith::AccountsDB->open();
return $c->l("usr_ERR_OCCURRED_CREATING");
}
-
$adb = esmith::AccountsDB->open();
-
$c->set_groups();
return 'OK';
-
-}
-
+} ## end sub create_user
sub set_groups {
-
- my $c = shift;
-
+ my $c = shift;
my $acctName = $c->param('user');
-
- my @groups = @{$c->every_param("groupMemberships")};
-
+ my @groups = @{ $c->every_param("groupMemberships") };
$adb->set_user_groups($acctName, @groups);
-
-}
-
+} ## end sub set_groups
sub modify_admin {
-
- my ($c) = @_;
-
- my $acct = $adb->get('admin');
-
+ my ($c) = @_;
+ my $acct = $adb->get('admin');
my %newProperties = (
- 'FirstName' => $c->param('FirstName'),
- 'LastName' => $c->param('LastName'),
- 'EmailForward' => $c->param('EmailForward'),
- 'ForwardAddress' => $c->param('ForwardAddress'),
- 'VPNClientAccess'=> $c->param('VPNClientAccess'),
+ 'FirstName' => $c->param('FirstName'),
+ 'LastName' => $c->param('LastName'),
+ 'EmailForward' => $c->param('EmailForward'),
+ 'ForwardAddress' => $c->param('ForwardAddress'),
+ 'VPNClientAccess' => $c->param('VPNClientAccess'),
);
-
$acct->merge_props(%newProperties);
-
undef $adb;
-
- my $status =
- system ("/sbin/e-smith/signal-event", "user-modify-admin", 'admin');
-
+ my $status = system("/sbin/e-smith/signal-event", "user-modify-admin", 'admin');
$adb = esmith::AccountsDB->open();
if ($status == 0) {
return 'OK';
} else {
- return$c->l('usr_CANNOT_MODIFY_USER', 'First');
+ return $c->l('usr_CANNOT_MODIFY_USER', 'First');
}
-}
-
+} ## end sub modify_admin
sub system_validate_password {
-
- my $c = shift;
+ my $c = shift;
my $pass1 = shift;
+
# If the password contains one or more printable character
if ($pass1 =~ /^([ -~]+)$/) {
- return('OK');
+ return ('OK');
} else {
return $c->l('usr_SYSTEM_PASSWORD_UNPRINTABLES_IN_PASS');
}
-}
-
+} ## end sub system_validate_password
sub system_check_password {
-
- my $c = shift;
+ my $c = shift;
my $pass1 = shift;
-
use esmith::ConfigDB;
my $conf = esmith::ConfigDB->open();
my ($check_type, $rec);
+
if ($conf) {
$rec = $conf->get('passwordstrength');
}
$check_type = ($rec ? ($rec->prop('Admin') || 'strong') : 'strong');
-
return $c->validate_password($check_type, $pass1);
-}
-
+} ## end sub system_check_password
sub system_authenticate_password {
-
- my $c = shift;
+ my $c = shift;
my $pass = shift;
- if (esmith::util::authenticateUnixPassword( ($cdb->get_value("AdminIsNotRoot") eq 'enabled') ? 'admin' : 'root', $pass)) {
+ if (esmith::util::authenticateUnixPassword(
+ ($cdb->get_value("AdminIsNotRoot") eq 'enabled') ? 'admin' : 'root', $pass
+ )
+ )
+ {
return "OK";
} else {
return $c->l("usr_SYSTEM_PASSWORD_AUTH_ERROR");
}
-}
-
+} ## end sub system_authenticate_password
sub system_change_password {
-
my ($c) = @_;
my $pass = $c->param('Pass');
-
- ($cdb->get_value("AdminIsNotRoot") eq 'enabled') ? esmith::util::setUnixPassword('admin',$pass) : esmith::util::setUnixSystemPassword($pass);
+ ($cdb->get_value("AdminIsNotRoot") eq 'enabled')
+ ? esmith::util::setUnixPassword('admin', $pass)
+ : esmith::util::setUnixSystemPassword($pass);
esmith::util::setServerSystemPassword($pass);
-
my $result = system("/sbin/e-smith/signal-event password-modify admin");
if ($result == 0) {
@@ -955,7 +816,5 @@ sub system_change_password {
} else {
return $c->l("Error occurred while modifying password for admin.", 'First');
}
-}
-
-
+} ## end sub system_change_password
1
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm
index 6b4ffd4..5f1d399 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm
@@ -8,182 +8,165 @@ package SrvMngr::Controller::Userpassword;
#
# routes : end
#----------------------------------------------------------------------
-
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use esmith::util;
use esmith::ConfigDB;
use esmith::AccountsDB;
-
use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw( theme_list init_session is_normal_password );
-
our $cdb = esmith::ConfigDB->open_ro || die "Couldn't open configuration db";
-
sub main {
- my $c = shift;
-
+ my $c = shift;
my %pwd_datas = ();
- if ( $c->is_logged_in ) {
- $pwd_datas{Account} = $c->session->{username};
- $pwd_datas{trt} = 'NORM';
+ if ($c->is_logged_in) {
+ $pwd_datas{Account} = $c->session->{username};
+ $pwd_datas{trt} = 'NORM';
} else {
- my $rt = $c->current_route;
- my $mess = '';
- my $jwt = $c->param('jwt') || '';
- my $name = $c->jwt->decode($jwt)->{username} || '';
+ my $rt = $c->current_route;
+ my $mess = '';
+ my $jwt = $c->param('jwt') || '';
+ my $name = $c->jwt->decode($jwt)->{username} || '';
+ $mess = 'Invalid state' unless ($jwt and $name and $rt eq 'upwdreset');
- $mess = 'Invalid state' unless ($jwt and $name and $rt eq 'upwdreset');
-
# request already treated or outdated
- if ( $c->pwdrst->{$name}{confirmed} != 1 or $c->pwdrst->{$name}{date} < time() ) {
- $mess = $c->l('use_INVALID_REQUEST').' -step 1-';
- }
+ if ($c->pwdrst->{$name}{confirmed} != 1 or $c->pwdrst->{$name}{date} < time()) {
+ $mess = $c->l('use_INVALID_REQUEST') . ' -step 1-';
+ }
+
+ if ($mess) {
+ $c->stash(error => $mess);
+ return $c->redirect_to($c->home_page);
+ }
- if ( $mess ) {
- $c->stash( error => $mess );
- return $c->redirect_to ( $c->home_page );
- }
-
# ok for reset password for this account - step 2
- $c->pwdrst->{$name}{confirmed} = 2;
- $pwd_datas{Account} = $name;
- $pwd_datas{trt} = 'RESET';
- $pwd_datas{jwt} = $jwt;
- $c->flash( success => $c->l('use_OK_FOR_RESET') );
- }
-
- $c->stash( pwd_datas => \%pwd_datas );
- $c->render( 'userpassword' );
-}
-
+ $c->pwdrst->{$name}{confirmed} = 2;
+ $pwd_datas{Account} = $name;
+ $pwd_datas{trt} = 'RESET';
+ $pwd_datas{jwt} = $jwt;
+ $c->flash(success => $c->l('use_OK_FOR_RESET'));
+ } ## end else [ if ($c->is_logged_in) ]
+ $c->stash(pwd_datas => \%pwd_datas);
+ $c->render('userpassword');
+} ## end sub main
sub change_password {
my $c = shift;
-
my $result;
my $res;
- my %pwd_datas = ();
-
- my $trt = $c->param('Trt');
- my $acctName = $c->param('User');
- my $oldPass = $c->param('Oldpass') || '';
- my $pass = $c->param('Pass');
+ my %pwd_datas = ();
+ my $trt = $c->param('Trt');
+ my $acctName = $c->param('User');
+ my $oldPass = $c->param('Oldpass') || '';
+ my $pass = $c->param('Pass');
my $passVerify = $c->param('Passverify');
-
- my $jwt = $c->param('jwt') || '';
- my $rt = $c->current_route;
- my $mess = ''; my $name = '';
+ my $jwt = $c->param('jwt') || '';
+ my $rt = $c->current_route;
+ my $mess = '';
+ my $name = '';
$name = $c->jwt->decode($jwt)->{username} if $jwt;
- if ( $trt eq 'RESET' ) {
- $mess = 'Invalid state' unless ($jwt and $name and ($rt eq 'upwdreset2'));
- # request already treated or outdated
- if ( $c->pwdrst->{$name}{confirmed} != 2 or $c->pwdrst->{$name}{date} < time() ) {
- $mess = $c->l('use_INVALID_REQUEST').' -step 2-';
- }
- if ( ! $name or $c->is_logged_in or $name ne $acctName ) {
- $mess = 'Invalid reset state';
+ if ($trt eq 'RESET') {
+ $mess = 'Invalid state' unless ($jwt and $name and ($rt eq 'upwdreset2'));
+
+ # request already treated or outdated
+ if ($c->pwdrst->{$name}{confirmed} != 2 or $c->pwdrst->{$name}{date} < time()) {
+ $mess = $c->l('use_INVALID_REQUEST') . ' -step 2-';
+ }
+
+ if (!$name or $c->is_logged_in or $name ne $acctName) {
+ $mess = 'Invalid reset state';
}
} else {
- if ( $name or $jwt or ! $c->is_logged_in ) {
- $mess = 'Invalid update state';
- }
- }
- if ( $mess ) {
- $c->stash( error => $mess );
- return $c->redirect_to ( $c->home_page );
- }
+ if ($name or $jwt or !$c->is_logged_in) {
+ $mess = 'Invalid update state';
+ }
+ } ## end else [ if ($trt eq 'RESET') ]
+ if ($mess) {
+ $c->stash(error => $mess);
+ return $c->redirect_to($c->home_page);
+ }
$pwd_datas{Account} = $acctName;
- $pwd_datas{trt} = $trt;
+ $pwd_datas{trt} = $trt;
# common controls
- if ( $acctName eq 'admin' ) {
+ if ($acctName eq 'admin') {
$result .= "Admin password should not be reset here !";
} else {
- unless ( $pass && $passVerify ) {
- $result .= $c->l('pwd_FIELDS_REQUIRED') . "
";
- } else {
- $result .= $c->l('pwd_PASSWORD_INVALID_CHARS') . "
" unless (($pass) = ($pass =~ /^([ -~]+)$/ ));
- $result .= $c->l('pwd_PASSWORD_VERIFY_ERROR') . "
" unless ( $pass eq $passVerify );
- }
- }
- if ( $result ne '' ) {
- $c->stash( error => $result, pwd_datas => \%pwd_datas );
- return $c->render( 'userpassword' );
+ unless ($pass && $passVerify) {
+ $result .= $c->l('pwd_FIELDS_REQUIRED') . "
";
+ } else {
+ $result .= $c->l('pwd_PASSWORD_INVALID_CHARS') . "
" unless (($pass) = ($pass =~ /^([ -~]+)$/));
+ $result .= $c->l('pwd_PASSWORD_VERIFY_ERROR') . "
" unless ($pass eq $passVerify);
+ }
+ } ## end else [ if ($acctName eq 'admin')]
+
+ if ($result ne '') {
+ $c->stash(error => $result, pwd_datas => \%pwd_datas);
+ return $c->render('userpassword');
}
# validate new password
- $res = $c->check_password( $pass );
- $result .= $res . "
" unless ( $res eq 'OK' );
+ $res = $c->check_password($pass);
+ $result .= $res . "
" unless ($res eq 'OK');
# controls old password
- if ( $trt ne 'RESET' ) {
- unless ( $oldPass ) {
- $result .= $c->l('pwd_FIELDS_REQUIRED') . "
" unless $trt eq 'RESET';
+ if ($trt ne 'RESET') {
+
+ unless ($oldPass) {
+ $result .= $c->l('pwd_FIELDS_REQUIRED') . "
" unless $trt eq 'RESET';
} else {
- $result .= $c->l('pwd_PASSWORD_OLD_INVALID_CHARS') . "
" unless (($oldPass) = ($oldPass =~ /^(\S+)$/ ));
+ $result .= $c->l('pwd_PASSWORD_OLD_INVALID_CHARS') . "
" unless (($oldPass) = ($oldPass =~ /^(\S+)$/));
}
- if ( $result ne '' ) {
- $c->stash( error => $result, pwd_datas => \%pwd_datas );
- return $c->render( 'userpassword' );
+ if ($result ne '') {
+ $c->stash(error => $result, pwd_datas => \%pwd_datas);
+ return $c->render('userpassword');
}
# verify old password
- if ( $trt ne 'RESET') {
- $result .= $c->l('pwd_ERROR_PASSWORD_CHANGE') . "
"
- unless (SrvMngr::Model::Main->check_credentials($acctName, $oldPass));
- }
- }
+ if ($trt ne 'RESET') {
+ $result .= $c->l('pwd_ERROR_PASSWORD_CHANGE') . "
"
+ unless (SrvMngr::Model::Main->check_credentials($acctName, $oldPass));
+ }
+ } ## end if ($trt ne 'RESET')
# $result .= 'Blocked for test (prevents updates)
';
-
- if ( ! $result ) {
- my $res = $c->reset_password( $trt, $acctName, $pass, $oldPass );
+ if (!$result) {
+ my $res = $c->reset_password($trt, $acctName, $pass, $oldPass);
$result .= $res unless $res eq 'OK';
}
- if ( $result ) {
- record_password_change_attempt($c, 'FAILED');
- $c->stash( error => $result, pwd_datas => \%pwd_datas );
- return $c->render( 'userpassword' );
- }
-
+ if ($result) {
+ record_password_change_attempt($c, 'FAILED');
+ $c->stash(error => $result, pwd_datas => \%pwd_datas);
+ return $c->render('userpassword');
+ } ## end if ($result)
$c->pwdrst->{$name}{confirmed} = 9 if $trt eq 'RESET';
record_password_change_attempt($c, 'SUCCESS');
$result .= $c->l('pwd_PASSWORD_CHANGE_SUCCESS');
- $c->flash( success => $result );
- $c->redirect_to( $c->home_page );
-}
-
+ $c->flash(success => $result);
+ $c->redirect_to($c->home_page);
+} ## end sub change_password
sub reset_password {
-
my ($c, $trt, $user, $password, $oldpassword) = @_;
my $ret;
-
return $c->l('usr_TAINTED_USER') unless (($user) = ($user =~ /^(\w[\-\w_\.]*)$/));
$user = $1;
-
- my $adb = esmith::AccountsDB->open();
-
+ my $adb = esmith::AccountsDB->open();
my $acct = $adb->get($user);
- return $c->l('NO_SUCH_USER', $user) unless ( $acct->prop('type') eq 'user' );
-
- $ret = esmith::util::setUserPasswordRequirePrevious( $user, $oldpassword, $password ) if $trt ne 'RESET';
- $ret = esmith::util::setUserPassword( $user, $password ) if $trt eq 'RESET';
-
- return $c->l('pwd_ERROR_PASSWORD_CHANGE') .' '. $trt unless $ret;
-
+ return $c->l('NO_SUCH_USER', $user) unless ($acct->prop('type') eq 'user');
+ $ret = esmith::util::setUserPasswordRequirePrevious($user, $oldpassword, $password) if $trt ne 'RESET';
+ $ret = esmith::util::setUserPassword($user, $password) if $trt eq 'RESET';
+ return $c->l('pwd_ERROR_PASSWORD_CHANGE') . ' ' . $trt unless $ret;
$acct->set_prop("PasswordSet", "yes");
undef $adb;
@@ -192,66 +175,52 @@ sub reset_password {
return $c->l("usr_ERR_OCCURRED_MODIFYING_PASSWORD");
}
$adb = esmith::AccountsDB->open();
-
return 'OK';
-}
-
+} ## end sub reset_password
sub record_password_change_attempt {
+ my ($c, $result) = @_;
+ my $user = $c->param('User');
+ my $ip_address = $c->tx->remote_address;
- my ($c, $result) = @_;
-
- my $user = $c->param('User');
- my $ip_address = $c->tx->remote_address;
-
- if ($result eq 'SUCCESS') {
- $c->app->log->info(join "\t", "Password change succeeded: $user", $ip_address);
- } else {
- $c->app->log->info(join "\t", "Password change FAILED: $user", $ip_address);
- }
-}
-
+ if ($result eq 'SUCCESS') {
+ $c->app->log->info(join "\t", "Password change succeeded: $user", $ip_address);
+ } else {
+ $c->app->log->info(join "\t", "Password change FAILED: $user", $ip_address);
+ }
+} ## end sub record_password_change_attempt
sub check_password {
- my $c = shift;
- my $password = shift;
-
- my $strength;
- my $rec = $cdb->get('passwordstrength');
- $strength = ($rec ? ($rec->prop('Users') || 'none') : 'none');
-
- return validate_password( $c, $strength, $password );
-}
-
+ my $c = shift;
+ my $password = shift;
+ my $strength;
+ my $rec = $cdb->get('passwordstrength');
+ $strength = ($rec ? ($rec->prop('Users') || 'none') : 'none');
+ return validate_password($c, $strength, $password);
+} ## end sub check_password
sub validate_password {
-
my ($c, $strength, $pass) = @_;
-
use Crypt::Cracklib;
if ($strength eq "none") {
- return $c->l("Passwords must be at least 7 characters long") unless ( length( $pass ) > 6 );
+ return $c->l("Passwords must be at least 7 characters long") unless (length($pass) > 6);
return "OK";
}
-
my $reason = is_normal_password($c, $pass, undef);
return $reason unless ($reason eq "OK");
return "OK" unless ($strength eq "strong");
- if ( -f '/usr/lib64/cracklib_dict.pwd' ) {
+ if (-f '/usr/lib64/cracklib_dict.pwd') {
$reason = fascist_check($pass, '/usr/lib64/cracklib_dict');
} else {
$reason = fascist_check($pass, '/usr/lib/cracklib_dict');
}
$reason ||= "Software error: password check failed";
-
return "OK" if ($reason eq "ok");
-
- return $c->l("Bad Password Choice") . ": "
- . $c->l("The password you have chosen is not a good choice, because")
- . " " . $c->($reason) . ".";
-}
-
-
+ return
+ $c->l("Bad Password Choice") . ": "
+ . $c->l("The password you have chosen is not a good choice, because") . " "
+ . $c->($reason) . ".";
+} ## end sub validate_password
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
index d583b2b..e9ee9e2 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
@@ -13,145 +13,121 @@ use warnings;
use Mojo::Base 'Mojolicious::Controller';
#use esmith::FormMagick qw(gen_locale_date_string);
-
use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session);
-
use esmith::ConfigDB;
use Time::TAI64;
use File::Basename;
use HTML::Entities;
use esmith::FormMagick qw(gen_locale_date_string);
use File::Temp qw(tempfile);
-
use constant TRUE => 1;
use constant FALSE => 0;
-
our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
-
-our @logfiles = (); # with array
-
+our @logfiles = (); # with array
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
-
my %log_datas = ();
- my $title = $c->l('log_FORM_TITLE');
- my $notif = '';
-
- $log_datas{default_op} =
- ($cdb->get('viewlogfiles')->prop('DefaultOperation')) || 'view';
-
- $c->stash( title => $title, notif => $notif, log_datas => \%log_datas);
+ my $title = $c->l('log_FORM_TITLE');
+ my $notif = '';
+ $log_datas{default_op} = ($cdb->get('viewlogfiles')->prop('DefaultOperation')) || 'view';
+ $c->stash(title => $title, notif => $notif, log_datas => \%log_datas);
$c->render(template => 'viewlogfiles');
-};
-
+} ## end sub main
sub do_action {
my $c = shift;
$c->app->log->info($c->log_req);
-
- my $title = $c->l('log_FORM_TITLE');
- my $notif = '';
- my $result = "";
+ my $title = $c->l('log_FORM_TITLE');
+ my $notif = '';
+ my $result = "";
my %log_datas = ();
-
- $log_datas{filename} = $c->param('Filename');
- $log_datas{matchpattern} = $c->param('Matchpattern');
+ $log_datas{filename} = $c->param('Filename');
+ $log_datas{matchpattern} = $c->param('Matchpattern');
$log_datas{highlightpattern} = $c->param('Highlightpattern');
- $log_datas{operation} = $c->param('Operation');
- if ($log_datas{operation} eq 'download') {
- $log_datas{'trt'} = "DOWN"
- } else {
- $log_datas{'trt'} = "SHOW"
- }
+ $log_datas{operation} = $c->param('Operation');
+ if ($log_datas{operation} eq 'download') {
+ $log_datas{'trt'} = "DOWN";
+ } else {
+ $log_datas{'trt'} = "SHOW";
+ }
if ($log_datas{filename} =~ /^([\S\s]+)$/) {
- $log_datas{filename} = $1;
+ $log_datas{filename} = $1;
} elsif ($log_datas{filename} =~ /^$/) {
- $log_datas{filename} = "messages";
+ $log_datas{filename} = "messages";
} else {
- $result .= $c->l("log_FILENAME_ERROR", $log_datas{filename} )
- . " ";
- }
-
- if ($log_datas{matchpattern} =~ /^(\S+)$/) {
- $log_datas{matchpattern} = $1;
- } else {
- $log_datas{matchpattern} = ".";
- }
-
- if ($log_datas{highlightpattern} =~ /^(\S+)$/) {
- $log_datas{highlightpattern} = $1;
- } else {
- $log_datas{highlightpattern} = '';
+ $result .= $c->l("log_FILENAME_ERROR", $log_datas{filename}) . " ";
}
+ if ($log_datas{matchpattern} =~ /^(\S+)$/) {
+ $log_datas{matchpattern} = $1;
+ } else {
+ $log_datas{matchpattern} = ".";
+ }
+
+ if ($log_datas{highlightpattern} =~ /^(\S+)$/) {
+ $log_datas{highlightpattern} = $1;
+ } else {
+ $log_datas{highlightpattern} = '';
+ }
my $fullpath = "/var/log/$log_datas{filename}";
+
if (-z $fullpath) {
- $result .= $c->l("log_LOG_FILE_EMPTY", "$log_datas{filename}" );
+ $result .= $c->l("log_LOG_FILE_EMPTY", "$log_datas{filename}");
}
if ($log_datas{trt} eq "SHOW") {
- if ( ! $result ) {
- $result = $c->render_to_string(inline => showlogFile( $c, %log_datas ));
- }
+ if (!$result) {
+ $result = $c->render_to_string(inline => showlogFile($c, %log_datas));
+ }
- if ( $result ) {
- $c->stash(title => $title, modul => $result, log_datas => \%log_datas);
- return $c->render(template => 'viewlogfiles2');
- }
- }
+ if ($result) {
+ $c->stash(title => $title, modul => $result, log_datas => \%log_datas);
+ return $c->render(template => 'viewlogfiles2');
+ }
+ } ## end if ($log_datas{trt} eq...)
-
- if ( $log_datas{trt} eq 'DOWN' ) {
-
- my $modul = 'Log file download';
-
- $notif = download_logFile( $c, %log_datas );
- return undef unless defined $notif;
- }
-
- $c->stash( title => $title, notif => $notif, log_datas => \%log_datas);
+ if ($log_datas{trt} eq 'DOWN') {
+ my $modul = 'Log file download';
+ $notif = download_logFile($c, %log_datas);
+ return undef unless defined $notif;
+ } ## end if ($log_datas{trt} eq...)
+ $c->stash(title => $title, notif => $notif, log_datas => \%log_datas);
$c->render(template => 'viewlogfiles');
+} ## end sub do_action
-};
-
-
-sub timestamp2local
-{
+sub timestamp2local {
$_ = shift;
- if (/^(\@[0-9a-f]{24})(.*)/s)
- {
- return Time::TAI64::tai64nlocal($1) . $2;
- }
- elsif (/^([0-9]{10}\.[0-9]{3})(.*)/s)
- {
- return localtime($1) . $2;
+
+ if (/^(\@[0-9a-f]{24})(.*)/s) {
+ return Time::TAI64::tai64nlocal($1) . $2;
+ } elsif (/^([0-9]{10}\.[0-9]{3})(.*)/s) {
+ return localtime($1) . $2;
}
return $_;
-}
-
+} ## end sub timestamp2local
sub findlogFiles {
-
my $c = shift;
-
use File::Find;
- sub findlogfiles
- {
+
+ sub findlogfiles {
my $path = $File::Find::name;
- if (-f)
- {
+ if (-f) {
+
# Remove leading /var/log/messages
$path =~ s:^/var/log/::;
+
# don't bother to collect files known to be non-text
# or not log files
- foreach (qw(
+ foreach (
+ qw(
lastlog
btmp$
wtmp
@@ -161,176 +137,160 @@ sub findlogFiles {
httpd/ssl_scache.pag
httpd/ssl_scache.dir
\/config$
- ))
+ )
+ )
{
return if $path =~ /$_/;
- }
-
+ } ## end foreach (qw( lastlog btmp$ wtmp...))
my ($file_base, $file_path, $file_type) = fileparse($path);
- if ( $file_base =~ /@.*/ )
- {
+ if ($file_base =~ /@.*/) {
+
#$logfiles{$path} = $file_path . timestamp2local($file_base);
- push @logfiles, [ $file_path . timestamp2local($file_base), $path ];
- }
- else
- {
+ push @logfiles, [ $file_path . timestamp2local($file_base), $path ];
+ } else {
+
#$logfiles{$path} = $path;
- push @logfiles, [ $path, $path ];
+ push @logfiles, [ $path, $path ];
}
- }
- }
-
+ } ## end if (-f)
+ } ## end sub findlogfiles
@logfiles = ();
+
# Now go and find all the files under /var/log
- find({wanted => \&findlogfiles, no_chdir => 1}, '/var/log');
-
+ find({ wanted => \&findlogfiles, no_chdir => 1 }, '/var/log');
my @logf = sort { $a->[0] cmp $b->[0] } @logfiles;
-
return \@logf;
-}
-
+} ## end sub findlogFiles
sub showlogFile {
-
my ($c, %log_datas) = @_;
-
my $fullpath = "/var/log/$log_datas{filename}";
- my $out = '';
-
+ my $out = '';
$out .= sprintf("$fullpath: \n");
+ $out .= sprintf($c->l("log_VIEWING_TIME", $c->gen_locale_date_string()));
- $out .= sprintf($c->l("log_VIEWING_TIME", $c->gen_locale_date_string() ));
+ unless ($log_datas{matchpattern} eq '.') {
- unless ( $log_datas{matchpattern} eq '.' )
- {
#$out .= sprintf("\n");
- $out .= sprintf($c->l("log_MATCH_HEADER", $log_datas{matchpattern} ));
- }
+ $out .= sprintf($c->l("log_MATCH_HEADER", $log_datas{matchpattern}));
+ } ## end unless ($log_datas{matchpattern...})
+
+ if ($log_datas{highlightpattern}) {
- if ( $log_datas{highlightpattern} )
- {
#$out .= sprintf("
\n");
- $out .= sprintf($c->l("log_HIGHLIGHT_HEADER", "$log_datas{highlightpattern}" ));
- }
+ $out .= sprintf($c->l("log_HIGHLIGHT_HEADER", "$log_datas{highlightpattern}"));
+ } ## end if ($log_datas{highlightpattern...})
if ($log_datas{filename} =~ /\.gz$/) {
my $pid = open(LOGFILE, "-|");
die "Couldn't fork: $!" unless defined $pid;
+
unless ($pid) {
+
# Child
exec("/bin/zcat", $fullpath)
- || die "Can't exec zcat: $!";
+ || die "Can't exec zcat: $!";
+
# NOTREACHED
- }
+ } ## end unless ($pid)
} else {
open(LOGFILE, "$fullpath");
}
-
my $somethingMatched = 0;
- my $fileEmpty = 1;
+ my $fileEmpty = 1;
$out .= sprintf("
");
- while()
- {
+
+ while () {
$fileEmpty = 0;
next unless /$log_datas{matchpattern}/;
$somethingMatched = 1;
-
- $_ = timestamp2local($_);
- $_ = HTML::Entities::encode_entities($_);
+ $_ = timestamp2local($_);
+ $_ = HTML::Entities::encode_entities($_);
($log_datas{highlightpattern} && /$log_datas{highlightpattern}/)
- ? $out .= sprintf( "$_" )
- : $out .= sprintf("$_");
- }
+ ? $out .= sprintf("$_")
+ : $out .= sprintf("$_");
+ } ## end while ()
$out .= sprintf("
");
if ($fileEmpty) {
$out .= sprintf("\n");
$out .= sprintf($c->l("log_LOG_FILE_EMPTY"));
} else {
- unless ($somethingMatched)
- {
+
+ unless ($somethingMatched) {
$out .= sprintf("
\n");
$out .= sprintf($c->l("log_NO_MATCHING_LINES"));
}
- }
-
+ } ## end else [ if ($fileEmpty) ]
close LOGFILE;
-
return $out;
-}
-
+} ## end sub showlogFile
sub download_logFile {
-
my ($c, %log_datas) = @_;
-
my $fullpath = "/var/log/$log_datas{filename}";
# Save this information for later.
-
$cdb->get('viewlogfiles')->merge_props('DefaultOperation', $log_datas{operation});
# If the client is on windows, we must handle this a little differently.
my $win32 = FALSE;
my $mac = FALSE;
my $agent = $ENV{HTTP_USER_AGENT} || "";
+
if ($agent =~ /win32|windows/i) {
$win32 = TRUE;
- } elsif ($agent =~ /mac/i) {
+ } elsif ($agent =~ /mac/i) {
$mac = TRUE;
}
# Check for errors first. Once we start sending the file it's too late to
# report them.
my $error = "";
- unless (-f $fullpath) {
+
+ unless (-f $fullpath) {
$error = $c->l("log_ERR_NOEXIST_FILE") . $fullpath;
}
-
local *FILE;
open(FILE, "<$fullpath")
or $error = $c->l("log_ERR_NOOPEN_FILE");
- # Put other error checking here.
+
+ # Put other error checking here.
return $error if $error;
- # Fix the filename, as it might have a directory prefixed to it.
+ # Fix the filename, as it might have a directory prefixed to it.
my $filename = $log_datas{filename};
- if ( $filename =~ m#/# ) {
+
+ if ($filename =~ m#/#) {
$filename = (split /\//, $filename)[-1];
}
# And send the file.
my $nl = "\n";
- if ($win32) { $nl = "\r\n" }
- elsif ($mac) { $nl = "\r" }
+ if ($win32) { $nl = "\r\n" }
+ elsif ($mac) { $nl = "\r" }
# Otherwise, send the file. Start with the headers.
# Note: The Content-disposition must be attachment, or IE will view the
# file inline like it's told. It ignores the Content-type, but it likes
# the Content-disposition (an officially unsupported header) for some
# reason. Yay Microsoft.
-
- my $file2 = new File::Temp( UNLINK => 0 );
+ my $file2 = new File::Temp(UNLINK => 0);
while (my $line = ) {
chomp $line;
my $linew = timestamp2local($line) . $nl;
print $file2 $linew;
- }
+ } ## end while (my $line = )
close(FILE);
-
$c->render_file(
- 'filepath' => "$file2",
- 'filename' => "$filename",
- 'format' => 'x-download',
- 'content_disposition' => 'attachment',
- 'cleanup' => 1,
+ 'filepath' => "$file2",
+ 'filename' => "$filename",
+ 'format' => 'x-download',
+ 'content_disposition' => 'attachment',
+ 'cleanup' => 1,
);
-
return undef;
-}
-
-
+} ## end sub download_logFile
1;
-
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm
index 9a073ab..5bdc7b2 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm
@@ -10,94 +10,71 @@ package SrvMngr::Controller::Workgroup;
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
-
use SrvMngr qw(theme_list init_session);
-
use esmith::FormMagick::Panel::workgroup;
-
our $db = esmith::ConfigDB->open || die "Couldn't open config db";
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
-
my %wkg_datas = ();
- my $title = $c->l('wkg_FORM_TITLE');
- my $modul = '';
-
- $wkg_datas{'Workgroup'} = ($db->get_prop('smb','Workgroup')) || '';
- $wkg_datas{'ServerName'} = ($db->get_prop('smb','ServerName')) || '';
- $wkg_datas{'ServerRole'} = ($db->get_prop('smb','ServerRole')) || '';
- $wkg_datas{'RoamingProfiles'} = ($db->get_prop('smb','RoamingProfiles')) || '';
-
- $c->stash( title => $title, modul => $modul, wkg_datas => \%wkg_datas );
+ my $title = $c->l('wkg_FORM_TITLE');
+ my $modul = '';
+ $wkg_datas{'Workgroup'} = ($db->get_prop('smb', 'Workgroup')) || '';
+ $wkg_datas{'ServerName'} = ($db->get_prop('smb', 'ServerName')) || '';
+ $wkg_datas{'ServerRole'} = ($db->get_prop('smb', 'ServerRole')) || '';
+ $wkg_datas{'RoamingProfiles'} = ($db->get_prop('smb', 'RoamingProfiles')) || '';
+ $c->stash(title => $title, modul => $modul, wkg_datas => \%wkg_datas);
$c->render(template => 'workgroup');
-};
-
+} ## end sub main
sub do_update {
my $c = shift;
$c->app->log->info($c->log_req);
-
- my $result = "";
-
- my $workgroup = ($c->param('Workgroup') || 'no');
- my $servername = ($c->param('ServerName') || 'WS');
+ my $result = "";
+ my $workgroup = ($c->param('Workgroup') || 'no');
+ my $servername = ($c->param('ServerName') || 'WS');
my $roamingprofiles = ($c->param('RoamingProfiles') || 'no');
- my $serverrole = ($c->param('ServerRole') || 'WS');
+ my $serverrole = ($c->param('ServerRole') || 'WS');
# controls
my $res = validate2_workgroup($c, $workgroup, $servername);
$result .= $res unless $res eq 'OK';
-
$res = validate2_servername($c, $servername);
$result .= $res unless $res eq 'OK';
if ($result eq '') {
- $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('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";
-
+ } ## end if ($result eq '')
+ system("/sbin/e-smith/signal-event", "workgroup-update") == 0
+ or $result = $c->l('ERROR_UPDATING') . " system";
my $title = $c->l('wkg_FORM_TITLE');
-
- if ( $result eq '' ) { $result = $c->l('wkg_SUCCESS'); }
-
- $c->stash( title => $title, modul => $result );
+ if ($result eq '') { $result = $c->l('wkg_SUCCESS'); }
+ $c->stash(title => $title, modul => $result);
$c->render(template => 'module');
-
-};
-
+} ## end sub do_update
sub validate2_servername {
- my $c = shift;
+ my $c = shift;
my $servername = shift;
-
- return ('OK') if ( $servername =~ /^([a-zA-Z][\-\w]*)$/ );
-
+ return ('OK') if ($servername =~ /^([a-zA-Z][\-\w]*)$/);
return $c->l('INVALID_SERVERNAME');
-}
-
+} ## end sub validate2_servername
sub validate2_workgroup {
- my $c = shift;
- my $workgroup = lc(shift);
+ my $c = shift;
+ my $workgroup = lc(shift);
my $servername = lc(shift);
-# my $workgroup = $c->l(shift);
-# my $servername = $c->l(shift);
-
- return $c->l('INVALID_WORKGROUP') unless ( $workgroup =~ /^([a-zA-Z0-9][\-\w\.]*)$/ );
- return $c->l('INVALID_WORKGROUP_MATCHES_SERVERNAME') if ( $servername eq $workgroup);
- return ('OK');
-
-}
-
+ # my $workgroup = $c->l(shift);
+ # my $servername = $c->l(shift);
+ return $c->l('INVALID_WORKGROUP') unless ($workgroup =~ /^([a-zA-Z0-9][\-\w\.]*)$/);
+ return $c->l('INVALID_WORKGROUP_MATCHES_SERVERNAME') if ($servername eq $workgroup);
+ return ('OK');
+} ## end sub validate2_workgroup
1;
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm
index 7a3c8e3..5874864 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm
@@ -10,270 +10,238 @@ package SrvMngr::Controller::Yum;
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
-
use Locale::gettext;
use SrvMngr::I18N;
-
use SrvMngr qw(theme_list init_session ip_number_or_blank);
-
use esmith::ConfigDB;
-
use esmith::util;
use File::Basename;
-
our $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
-
-my $dnf_status_file = '/var/cache/dnf/dnf.status';
+my $dnf_status_file = '/var/cache/dnf/dnf.status';
#use File::stat;
-
our %dbs;
-for ( qw(available installed updates) )
-{
- $dbs{$_} = esmith::ConfigDB->open_ro("dnf_$_") or
- die "Couldn't open dnf_$_ DB\n";
+for (qw(available installed updates)) {
+ $dbs{$_} = esmith::ConfigDB->open_ro("dnf_$_")
+ or die "Couldn't open dnf_$_ DB\n";
}
-for ( qw(repositories) )
-{
- $dbs{$_} = esmith::ConfigDB->open("yum_$_") or
- die "Couldn't open yum_$_ DB\n";
+for (qw(repositories)) {
+ $dbs{$_} = esmith::ConfigDB->open("yum_$_")
+ or die "Couldn't open yum_$_ DB\n";
}
-
sub main {
-
my $c = shift;
$c->app->log->info($c->log_req);
-
my %yum_datas = ();
- my $title = $c->l('yum_FORM_TITLE');
- my $dest = 'yum';
- my $notif = '';
-
+ my $title = $c->l('yum_FORM_TITLE');
+ my $dest = 'yum';
+ my $notif = '';
$yum_datas{'trt'} = 'STAT';
-
- if ( $c->is_dnf_running()) {
- $yum_datas{'trt'} = 'LOGF';
- $dest = 'yumlogfile';
+ if ($c->is_dnf_running()) {
+ $yum_datas{'trt'} = 'LOGF';
+ $dest = 'yumlogfile';
} elsif ($cdb->get_prop('dnf', 'LogFile')) {
- $yum_datas{'trt'} = 'PSTU';
- $yum_datas{'reconf'} = $cdb->get_value('UnsavedChanges', 'yes');
- $dest = 'yumpostupg';
+ $yum_datas{'trt'} = 'PSTU';
+ $yum_datas{'reconf'} = $cdb->get_value('UnsavedChanges', 'yes');
+ $dest = 'yumpostupg';
} else {
- # normal other trt
+
+ # normal other trt
}
-
- $c->stash( title => $title, notif => $notif, yum_datas => \%yum_datas );
- return $c->render( template => $dest );
-
-}
-
+ $c->stash(title => $title, notif => $notif, yum_datas => \%yum_datas);
+ return $c->render(template => $dest);
+} ## end sub main
sub do_display {
-
- my $c = shift;
-
- my $rt = $c->current_route;
- my $trt = ($c->param('trt') || 'STAT');
-
+ my $c = shift;
+ my $rt = $c->current_route;
+ my $trt = ($c->param('trt') || 'STAT');
my %yum_datas = ();
- my $title = $c->l('yum_FORM_TITLE');
+ my $title = $c->l('yum_FORM_TITLE');
my ($notif, $dest) = '';
-
$yum_datas{'trt'} = $trt;
# force $trt if current logfile
- if ( $c->is_dnf_running() ) {
- $trt = 'LOGF';
+ if ($c->is_dnf_running()) {
+ $trt = 'LOGF';
} elsif ($cdb->get_prop('dnf', 'LogFile')) {
- $trt = 'PSTU';
+ $trt = 'PSTU';
}
- if ( $trt eq 'UPDT' ) {
- $dest = 'yumupdate';
+ if ($trt eq 'UPDT') {
+ $dest = 'yumupdate';
+ }
+
+ if ($trt eq 'INST') {
+ $dest = 'yuminstall';
+ }
+
+ if ($trt eq 'REMO') {
+ $dest = 'yumremove';
+ }
+
+ if ($trt eq 'CONF') {
+ $dest = 'yumconfig';
+ }
+
+ if ($trt eq 'LOGF') {
+ if ($c->is_dnf_running()) {
+ $dest = 'yumlogfile';
}
+ } ## end if ($trt eq 'LOGF')
- if ( $trt eq 'INST' ) {
- $dest = 'yuminstall';
+ if ($trt eq 'PSTU') {
+ if ($cdb->get_prop('dnf', 'LogFile')) {
+ $dest = 'yumpostupg';
+ $yum_datas{'reconf'} = $cdb->get_value('UnsavedChanges', 'yes');
}
-
- if ( $trt eq 'REMO' ) {
- $dest = 'yumremove';
- }
-
- if ( $trt eq 'CONF' ) {
- $dest = 'yumconfig';
- }
-
- if ( $trt eq 'LOGF' ) {
- if ($c->is_dnf_running()) {
- $dest = 'yumlogfile';
- }
- }
-
- if ( $trt eq 'PSTU') {
- if ($cdb->get_prop('dnf', 'LogFile')) {
- $dest = 'yumpostupg';
- $yum_datas{'reconf'} = $cdb->get_value('UnsavedChanges', 'yes');
- }
- }
-
- if ( ! $dest ) { $dest = 'yum'; }
-
- $c->stash( title => $title, notif => $notif, yum_datas => \%yum_datas );
- return $c->render( template => $dest );
-
-};
-
+ } ## end if ($trt eq 'PSTU')
+ if (!$dest) { $dest = 'yum'; }
+ $c->stash(title => $title, notif => $notif, yum_datas => \%yum_datas);
+ return $c->render(template => $dest);
+} ## end sub do_display
sub do_update {
-
my $c = shift;
$c->app->log->info($c->log_req);
-
- my $rt = $c->current_route;
- my $trt = $c->param('trt');
-
+ my $rt = $c->current_route;
+ my $trt = $c->param('trt');
my %yum_datas = ();
$yum_datas{trt} = $trt;
-
my $title = $c->l('yum_FORM_TITLE');
-
my ($dest, $res, $result) = '';
- if ( $trt eq 'UPDT' ) {
+ if ($trt eq 'UPDT') {
+ $dest = 'yumupdate';
- $dest = 'yumupdate';
+ if (!$result) {
+ $res = $c->do_yum('update');
+ $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $res = $c->do_yum('update');
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $yum_datas{trt} = 'SUC';
- #$result = $c->l('yum_SUCCESS');
- }
- }
- }
+ if (!$result) {
+ $yum_datas{trt} = 'SUC';
- if ( $trt eq 'INST' ) {
+ #$result = $c->l('yum_SUCCESS');
+ } ## end if (!$result)
+ } ## end if (!$result)
+ } ## end if ($trt eq 'UPDT')
- $dest = 'yuminstall';
+ if ($trt eq 'INST') {
+ $dest = 'yuminstall';
- if ( ! $result ) {
- $res = $c->do_yum('install');
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $yum_datas{trt} = 'SUC';
- #$result = $c->l('yum_SUCCESS');
- }
- }
- }
+ if (!$result) {
+ $res = $c->do_yum('install');
+ $result .= $res unless $res eq 'OK';
- if ( $trt eq 'REMO' ) {
+ if (!$result) {
+ $yum_datas{trt} = 'SUC';
- $dest = 'yumremove';
+ #$result = $c->l('yum_SUCCESS');
+ } ## end if (!$result)
+ } ## end if (!$result)
+ } ## end if ($trt eq 'INST')
- if ( ! $result ) {
- $res = $c->do_yum('remove');
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $yum_datas{trt} = 'SUC';
- #$result = $c->l('yum_SUCCESS');
- }
- }
- }
+ if ($trt eq 'REMO') {
+ $dest = 'yumremove';
- if ( $trt eq 'CONF' ) {
+ if (!$result) {
+ $res = $c->do_yum('remove');
+ $result .= $res unless $res eq 'OK';
- $dest = 'yumconfig';
+ if (!$result) {
+ $yum_datas{trt} = 'SUC';
- if ( ! $result ) {
- $res = $c->change_settings();
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $yum_datas{trt} = 'SUC';
- $result = $c->l('yum_SUCCESS');
- }
- }
- }
+ #$result = $c->l('yum_SUCCESS');
+ } ## end if (!$result)
+ } ## end if (!$result)
+ } ## end if ($trt eq 'REMO')
+ if ($trt eq 'CONF') {
+ $dest = 'yumconfig';
- if ( $trt eq 'PSTU') {
+ if (!$result) {
+ $res = $c->change_settings();
+ $result .= $res unless $res eq 'OK';
- my $reconf = $c->param('reconf') || 'yes';
- $dest = 'yumpostupg';
+ if (!$result) {
+ $yum_datas{trt} = 'SUC';
+ $result = $c->l('yum_SUCCESS');
+ }
+ } ## end if (!$result)
+ } ## end if ($trt eq 'CONF')
- # effective reconfigure and reboot required
- if ( $reconf eq 'yes' ) {
- $res = $c->post_upgrade_reboot();
- $result .= $res unless $res eq 'OK';
- if ( ! $result ) {
- $yum_datas{trt} = 'SUC';
- $result = $c->l('yum_SYSTEM_BEING_RECONFIGURED');
- }
- } else {
- $yum_datas{trt} = 'SUC';
- $result = $c->l('yum_UPDATE_SUCCESS');
- }
- }
+ if ($trt eq 'PSTU') {
+ my $reconf = $c->param('reconf') || 'yes';
+ $dest = 'yumpostupg';
+ # effective reconfigure and reboot required
+ if ($reconf eq 'yes') {
+ $res = $c->post_upgrade_reboot();
+ $result .= $res unless $res eq 'OK';
- if ( $trt eq 'LOGF' ) {
-
- $dest = 'yumlogfile';
- if ( ! $c->is_dnf_running()) {
- $yum_datas{trt} = 'SUC';
- $result = $c->l('yum_SUCCESS');
+ if (!$result) {
+ $yum_datas{trt} = 'SUC';
+ $result = $c->l('yum_SYSTEM_BEING_RECONFIGURED');
+ }
+ } else {
+ $yum_datas{trt} = 'SUC';
+ $result = $c->l('yum_UPDATE_SUCCESS');
}
- }
+ } ## end if ($trt eq 'PSTU')
+
+ if ($trt eq 'LOGF') {
+ $dest = 'yumlogfile';
+
+ if (!$c->is_dnf_running()) {
+ $yum_datas{trt} = 'SUC';
+ $result = $c->l('yum_SUCCESS');
+ }
+ } ## end if ($trt eq 'LOGF')
# do_yum ended (no message) --> forced to LOGFile
- if ( ! $result ) {
- $dest = 'yumlogfile';
- $yum_datas{trt} = 'LOGF';
+ if (!$result) {
+ $dest = 'yumlogfile';
+ $yum_datas{trt} = 'LOGF';
}
+ $c->stash(title => $title, notif => $result, yum_datas => \%yum_datas);
-
- $c->stash( title => $title, notif => $result, yum_datas => \%yum_datas );
if ($yum_datas{trt} ne 'SUC') {
- return $c->render(template => $dest);
+ return $c->render(template => $dest);
}
-
my $message = "'Yum' $trt update DONE";
$c->app->log->info($message);
$c->flash(success => $result) if $result;
-
$c->redirect_to("/yum");
-
-};
+} ## end sub do_update
sub get_dnf_status {
+
#interrogate status file created and maintained by smeserver.py plugin for dnf.
- my ($c) = @_;
+ my ($c) = @_;
my $file_name = $dnf_status_file;
- my $content = "resolved";
- if ( -e "$file_name") {
- open my $fh, '<', $file_name or die "Can't open file: $!";
- $content = <$fh>;
- close $fh;
- }
+ my $content = "resolved";
+
+ if (-e "$file_name") {
+ open my $fh, '<', $file_name or die "Can't open file: $!";
+ $content = <$fh>;
+ close $fh;
+ } ## end if (-e "$file_name")
return $content;
-}
+} ## end sub get_dnf_status
sub is_dnf_running {
my ($c) = @_;
my $dnf_status = $c->get_dnf_status();
return $dnf_status ne "resolved" && $dnf_status ne "config" && $dnf_status ne "sack";
-}
+} ## end sub is_dnf_running
sub is_empty {
-
my ($c, $yumdb) = @_;
-
- my $groups = $dbs{$yumdb}->get_all_by_prop(type => 'group') || 'none';
+ my $groups = $dbs{$yumdb}->get_all_by_prop(type => 'group') || 'none';
my $packages = $dbs{$yumdb}->get_all_by_prop(type => 'package') || 'none';
#Show no updates if both = none
@@ -281,283 +249,194 @@ sub is_empty {
#else return here
return;
-}
-
+} ## end sub is_empty
sub non_empty {
-
my ($c, $yumdb, $type) = @_;
-
$type ||= 'both';
-
return 0 unless (exists $dbs{$yumdb});
-
- my $groups = scalar $dbs{$yumdb}->get_all_by_prop(type => 'group');
+ my $groups = scalar $dbs{$yumdb}->get_all_by_prop(type => 'group');
return $groups if ($type eq 'group');
-
my $packages = scalar $dbs{$yumdb}->get_all_by_prop(type => 'package');
- if ($type eq 'package')
- {
- return $c->package_functions_enabled ? $packages : 0;
+
+ if ($type eq 'package') {
+ return $c->package_functions_enabled ? $packages : 0;
}
-
- return ($c->package_functions_enabled or $yumdb eq 'updates') ?
- ($groups || $packages) : $groups;
-}
-
+ return ($c->package_functions_enabled or $yumdb eq 'updates') ? ($groups || $packages) : $groups;
+} ## end sub non_empty
sub package_functions_enabled {
-
my ($c) = @_;
-
return ($cdb->get_prop("dnf", "PackageFunctions") eq "enabled");
-
}
-
sub get_status {
-
my ($c, $prop, $localise) = @_;
-
my $status = $cdb->get_prop("dnf", $prop) || 'disabled';
-
return $status unless $localise;
-
return $c->l($status eq 'enabled' ? 'ENABLED' : 'DISABLED');
-}
-
+} ## end sub get_status
sub get_options {
-
my ($c, $yumdb, $type) = @_;
-
my %options;
- for ($dbs{$yumdb}->get_all_by_prop(type => $type))
- {
- $options{$_->key} = $_->key . " " . $_->prop("Version") . " - " .
- $_->prop("Repo");
+ for ($dbs{$yumdb}->get_all_by_prop(type => $type)) {
+ $options{ $_->key } = $_->key . " " . $_->prop("Version") . " - " . $_->prop("Repo");
}
-
return \%options;
-}
-
+} ## end sub get_options
sub get_options2 {
-
my ($c, $yumdb, $type) = @_;
-
my @options;
- for ($dbs{$yumdb}->get_all_by_prop(type => $type))
- {
- push @options, [ $_->key . " " . $_->prop("Version") . " - " .
- $_->prop("Repo") => $_->key ];
+ for ($dbs{$yumdb}->get_all_by_prop(type => $type)) {
+ push @options, [ $_->key . " " . $_->prop("Version") . " - " . $_->prop("Repo") => $_->key ];
}
-
return \@options;
-}
-
+} ## end sub get_options2
sub get_names {
-
- return [ keys %{get_options(@_)} ];
+ return [ keys %{ get_options(@_) } ];
}
-
sub get_names2 {
-
my ($c, $yumdb, $type) = @_;
my @selected;
for ($dbs{$yumdb}->get_all_by_prop(type => $type)) {
push @selected, $_->key;
}
-
return \@selected;
-# return [ values @{get_options2(@_)} ];
-}
+ # return [ values @{get_options2(@_)} ];
+} ## end sub get_names2
sub get_repository_options2 {
-
my $c = shift;
-
my @options;
- foreach my $repos (
- $dbs{repositories}->get_all_by_prop(type => "repository") )
- {
- next unless ($repos->prop('Visible') eq 'yes'
- or $repos->prop('status') eq 'enabled');
-
+ foreach my $repos ($dbs{repositories}->get_all_by_prop(type => "repository")) {
+ next unless ($repos->prop('Visible') eq 'yes'
+ or $repos->prop('status') eq 'enabled');
push @options, [ $repos->prop('Name') => $repos->key ];
- }
-
+ } ## end foreach my $repos ($dbs{repositories...})
my @opts = sort { $a->[0] cmp $b->[0] } @options;
-
return \@opts;
-}
+} ## end sub get_repository_options2
-
-sub get_repository_current_options
-{
+sub get_repository_current_options {
my $c = shift;
-
my @selected;
- foreach my $repos (
- $dbs{repositories}->get_all_by_prop( type => "repository" ) )
- {
- next unless ($repos->prop('Visible') eq 'yes'
- or $repos->prop('status') eq 'enabled');
-
+ foreach my $repos ($dbs{repositories}->get_all_by_prop(type => "repository")) {
+ next unless ($repos->prop('Visible') eq 'yes'
+ or $repos->prop('status') eq 'enabled');
push @selected, $repos->key if ($repos->prop('status') eq 'enabled');
- }
-
+ } ## end foreach my $repos ($dbs{repositories...})
return \@selected;
-}
-
+} ## end sub get_repository_current_options
sub get_avail2 {
-
my ($c, $yumdb, $type) = @_;
-
return $c->get_options2("available", "package");
}
-
sub get_check_freq_opt {
-
my ($c) = @_;
-
- return [[ $c->l('DISABLED') => 'disabled'],
- [ $c->l('yum_1DAILY') => 'daily'],
- [ $c->l('yum_2WEEKLY') => 'weekly'],
- [ $c->l('yum_3MONTHLY') => 'monthly']];
-}
-
+ return [
+ [ $c->l('DISABLED') => 'disabled' ],
+ [ $c->l('yum_1DAILY') => 'daily' ],
+ [ $c->l('yum_2WEEKLY') => 'weekly' ],
+ [ $c->l('yum_3MONTHLY') => 'monthly' ]
+ ];
+} ## end sub get_check_freq_opt
sub print_skip_header {
-
my ($c) = shift;
-
return "\n";
}
-
sub change_settings {
-
my ($c) = @_;
- for my $param ( qw(
- PackageFunctions
- ) )
+ for my $param (
+ qw(
+ PackageFunctions
+ )
+ )
{
- $cdb->set_prop("dnf", $param, $c->param("yum_$param"));
- }
-
+ $cdb->set_prop("dnf", $param, $c->param("yum_$param"));
+ } ## end for my $param (qw( PackageFunctions...))
my $check4updates = $c->param("yum_check4updates");
- my $status = 'disabled';
-
+ my $status = 'disabled';
if ($check4updates ne 'disabled') { $status = 'enabled'; }
-
$cdb->set_prop("dnf", 'check4updates', $check4updates);
-
my $deltarpm = $c->param("yum_DeltaRpmProcess");
$cdb->set_prop("dnf", 'DeltaRpmProcess', $deltarpm);
-
my $downloadonly = $c->param("yum_DownloadOnly");
if ($downloadonly ne 'disabled') { $status = 'enabled'; }
-
$cdb->set_prop("dnf", 'DownloadOnly', $downloadonly);
-
my $AutoInstallUpdates = $c->param("yum_AutoInstallUpdates");
if ($AutoInstallUpdates ne 'disabled') { $status = 'enabled'; }
-
$cdb->set_prop("dnf", 'AutoInstallUpdates', $AutoInstallUpdates);
- $cdb->set_prop("dnf", 'status', $status);
-
- my %selected = map {$_ => 1} @{$c->every_param('SelectedRepositories')};
-
- foreach my $repos (
- $dbs{repositories}->get_all_by_prop(type => "repository") )
- {
- $repos->set_prop("status",
- exists $selected{$repos->key} ? 'enabled' : 'disabled');
+ $cdb->set_prop("dnf", 'status', $status);
+ my %selected = map { $_ => 1 } @{ $c->every_param('SelectedRepositories') };
+ foreach my $repos ($dbs{repositories}->get_all_by_prop(type => "repository")) {
+ $repos->set_prop("status", exists $selected{ $repos->key } ? 'enabled' : 'disabled');
}
-
$dbs{repositories}->reload;
- unless ( system( "/sbin/e-smith/signal-event", "dnf-modify" ) == 0 )
- {
- return $c->l('yum_ERROR_UPDATING_CONFIGURATION');
+ unless (system("/sbin/e-smith/signal-event", "dnf-modify") == 0) {
+ return $c->l('yum_ERROR_UPDATING_CONFIGURATION');
}
-
return 'OK';
-}
-
+} ## end sub change_settings
sub do_yum {
-
my ($c, $function) = @_;
- for ( qw(SelectedGroups SelectedPackages) )
- {
- $cdb->set_prop("dnf", $_, join(',', (@{$c->every_param($_)} )));
+ for (qw(SelectedGroups SelectedPackages)) {
+ $cdb->set_prop("dnf", $_, join(',', (@{ $c->every_param($_) })));
}
+ esmith::util::backgroundCommand(0, "/sbin/e-smith/signal-event", "dnf-$function");
- esmith::util::backgroundCommand(0,
- "/sbin/e-smith/signal-event", "dnf-$function");
-
- for ( qw(available installed updates) ) {
- $dbs{$_}->reload;
+ for (qw(available installed updates)) {
+ $dbs{$_}->reload;
}
-
return 'OK';
-}
-
+} ## end sub do_yum
sub get_yum_status_page {
-
my ($c) = @_;
my $yum_status;
-
open(YUM_STATUS, ";
close(YUM_STATUS);
-
return $yum_status;
-}
-
+} ## end sub get_yum_status_page
sub format_yum_log {
-
my $c = shift;
-
$cdb->reload;
-
my $filepage = $cdb->get_prop('dnf', 'LogFile');
- return '' unless $filepage and ( -e "$filepage" );
-
+ return '' unless $filepage and (-e "$filepage");
my $out = sprintf "";
- open (FILE, "$filepage");
+ open(FILE, "$filepage");
+
while () {
- $out .= sprintf("%s", $_);
+ $out .= sprintf("%s", $_);
}
close FILE;
$out .= sprintf " ";
-
undef $filepage;
return $out;
-}
-
+} ## end sub format_yum_log
sub post_upgrade_reboot {
-
my $c = shift;
-
$cdb->get_prop_and_delete('dnf', 'LogFile');
$cdb->reload;
@@ -565,17 +444,13 @@ sub post_upgrade_reboot {
exec "/sbin/e-smith/signal-event post-upgrade; /sbin/e-smith/signal-event reboot";
die "Exec failed";
}
-
- return 'OK'
-}
-
+ return 'OK';
+} ## end sub post_upgrade_reboot
sub show_yum_log {
- my $c = shift;
- my $out = $c->format_yum_log();
+ my $c = shift;
+ my $out = $c->format_yum_log();
my $yum_log = $cdb->get_prop_and_delete('dnf', 'LogFile');
return $out;
-}
-
-
+} ## end sub show_yum_log
1;
diff --git a/smeserver-manager.spec b/smeserver-manager.spec
index b11998e..30a2b0e 100644
--- a/smeserver-manager.spec
+++ b/smeserver-manager.spec
@@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager
Name: %{name}
%define version 11.0.0
-%define release 38
+%define release 39
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -115,6 +115,9 @@ true
%defattr(-,root,root)
%changelog
+* Tue Jan 14 2025 Brian Read 11.0.0-39.sme
+- Apply perltidy to all Controller files, add .perltidy to directory and .gitignore for .tdy files (just incase) [SME: 12485]
+
* Sat Jan 11 2025 Brian Read 11.0.0-38.sme
- Fix password reset for admin in user panel [SME: 12655]