Compare commits
	
		
			2 Commits
		
	
	
		
			11_0_0-104
			...
			11_0_0-106
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5ba77e4526 | |||
| 1d00f2aeb2 | 
@@ -255,7 +255,7 @@ sub validate_change_datetime {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (($minute < 0) || ($minute > 59)) {
 | 
			
		||||
        return $c->l('datINVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59');
 | 
			
		||||
        return $c->l('dat_INVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59');
 | 
			
		||||
    }
 | 
			
		||||
    my $second = $c->param('second');
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -132,7 +132,7 @@ sub do_update {
 | 
			
		||||
            # Untaint groupName before use in system()
 | 
			
		||||
            ($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/);
 | 
			
		||||
            system("/sbin/e-smith/signal-event", "group-create", "$groupName") == 0
 | 
			
		||||
                or $result .= $c->l('qgp_CREATE_ERROR') . "\n";
 | 
			
		||||
                or $result .= $c->l('grp_CREATE_ERROR') . "\n";
 | 
			
		||||
        } ## end if (!$result)
 | 
			
		||||
 | 
			
		||||
        if (!$result) {
 | 
			
		||||
@@ -161,7 +161,7 @@ sub do_update {
 | 
			
		||||
            # Untaint groupName before use in system()
 | 
			
		||||
            ($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/);
 | 
			
		||||
            system("/sbin/e-smith/signal-event", "group-modify", "$groupName") == 0
 | 
			
		||||
                or $result .= $c->l('qgp_MODIFY_ERROR') . "\n";
 | 
			
		||||
                or $result .= $c->l('grp_MODIFY_ERROR') . "\n";
 | 
			
		||||
        } ## end if (!$result)
 | 
			
		||||
 | 
			
		||||
        if (!$result) {
 | 
			
		||||
@@ -414,4 +414,4 @@ sub validate_description {
 | 
			
		||||
        return ($c->l('FM_ERR_UNEXPECTED_DESC'));
 | 
			
		||||
    }
 | 
			
		||||
} ## end sub validate_description
 | 
			
		||||
1
 | 
			
		||||
1
 | 
			
		||||
@@ -176,7 +176,7 @@ sub do_update {
 | 
			
		||||
            $result .= $res unless $res eq 'OK';
 | 
			
		||||
 | 
			
		||||
            if (!$result) {
 | 
			
		||||
                $result = $c->l('usrUSER_CREATED') . ' ' . $user;
 | 
			
		||||
                $result = $c->l('usr_USER_CREATED') . ' ' . $user;
 | 
			
		||||
                $usr_datas{trt} = 'SUC';
 | 
			
		||||
            }
 | 
			
		||||
        } ## end if (!$result)
 | 
			
		||||
@@ -791,4 +791,4 @@ sub system_change_password {
 | 
			
		||||
        return $c->l("Error occurred while modifying password for admin.", 'First');
 | 
			
		||||
    }
 | 
			
		||||
} ## end sub system_change_password
 | 
			
		||||
1
 | 
			
		||||
1
 | 
			
		||||
@@ -4,6 +4,12 @@ package SrvMngr::Controller::Yum;
 | 
			
		||||
# heading     : System
 | 
			
		||||
# description : Software installer
 | 
			
		||||
# navigation  : 4000 500
 | 
			
		||||
 | 
			
		||||
    #$if_admin->get('/yum')->to('yum#main')->name('yum');
 | 
			
		||||
    #$if_admin->post('/yum')->to('yum#do_display')->name('yumd1');
 | 
			
		||||
    #$if_admin->get('/yumd')->to('yum#do_display')->name('yumd');
 | 
			
		||||
    #$if_admin->post('/yumd')->to('yum#do_update')->name('yumu');
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
# routes : end
 | 
			
		||||
#----------------------------------------------------------------------
 | 
			
		||||
@@ -23,20 +29,20 @@ my $dnf_status_file = '/var/cache/dnf/dnf.status';
 | 
			
		||||
#use File::stat;
 | 
			
		||||
our %dbs;
 | 
			
		||||
 | 
			
		||||
for (qw(available installed updates)) {
 | 
			
		||||
    $dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
 | 
			
		||||
        or die "Couldn't open dnf_$_ DB\n";
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
for (qw(repositories)) {
 | 
			
		||||
    $dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
 | 
			
		||||
        or die "Couldn't open yum_$_ DB\n";
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
sub main {
 | 
			
		||||
    my $c = shift;
 | 
			
		||||
    $c->app->log->info($c->log_req);
 | 
			
		||||
    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
 | 
			
		||||
	for (qw(available installed updates)) {
 | 
			
		||||
		$dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
 | 
			
		||||
			or die "Couldn't open dnf_$_ DB\n";
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for (qw(repositories)) {
 | 
			
		||||
		$dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
 | 
			
		||||
			or die "Couldn't open yum_$_ DB\n";
 | 
			
		||||
	}
 | 
			
		||||
    my %yum_datas = ();
 | 
			
		||||
    my $title     = $c->l('yum_FORM_TITLE');
 | 
			
		||||
    my $dest      = 'yum';
 | 
			
		||||
@@ -63,6 +69,15 @@ sub do_display {
 | 
			
		||||
    my $rt        = $c->current_route;
 | 
			
		||||
    my $trt       = ($c->param('trt') || 'STAT');
 | 
			
		||||
    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
 | 
			
		||||
	for (qw(available installed updates)) {
 | 
			
		||||
		$dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
 | 
			
		||||
			or die "Couldn't open dnf_$_ DB\n";
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for (qw(repositories)) {
 | 
			
		||||
		$dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
 | 
			
		||||
			or die "Couldn't open yum_$_ DB\n";
 | 
			
		||||
	}
 | 
			
		||||
    my %yum_datas = ();
 | 
			
		||||
    my $title     = $c->l('yum_FORM_TITLE');
 | 
			
		||||
    my ($notif, $dest) = '';
 | 
			
		||||
@@ -113,6 +128,16 @@ sub do_update {
 | 
			
		||||
    $c->app->log->info($c->log_req);
 | 
			
		||||
    my $rt        = $c->current_route;
 | 
			
		||||
    my $trt       = $c->param('trt');
 | 
			
		||||
    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
 | 
			
		||||
	for (qw(available installed updates)) {
 | 
			
		||||
		$dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
 | 
			
		||||
			or die "Couldn't open dnf_$_ DB\n";
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for (qw(repositories)) {
 | 
			
		||||
		$dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
 | 
			
		||||
			or die "Couldn't open yum_$_ DB\n";
 | 
			
		||||
	}
 | 
			
		||||
    my %yum_datas = ();
 | 
			
		||||
    $yum_datas{trt} = $trt;
 | 
			
		||||
    my $title = $c->l('yum_FORM_TITLE');
 | 
			
		||||
@@ -456,4 +481,4 @@ sub show_yum_log {
 | 
			
		||||
    my $yum_log = $cdb->get_prop_and_delete('dnf', 'LogFile');
 | 
			
		||||
    return $out;
 | 
			
		||||
} ## end sub show_yum_log
 | 
			
		||||
1;
 | 
			
		||||
1;
 | 
			
		||||
@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 | 
			
		||||
%define name smeserver-manager
 | 
			
		||||
Name: %{name}
 | 
			
		||||
%define version 11.0.0
 | 
			
		||||
%define release 104
 | 
			
		||||
%define release 106
 | 
			
		||||
Version: %{version}
 | 
			
		||||
Release: %{release}%{?dist}
 | 
			
		||||
License: GPL
 | 
			
		||||
@@ -146,6 +146,14 @@ true
 | 
			
		||||
%defattr(-,root,root)
 | 
			
		||||
 | 
			
		||||
%changelog
 | 
			
		||||
* Mon Jul 14 2025 Brian Read <brianr@koozali.org> 11.0.0-106.sme
 | 
			
		||||
- Datetime panel: Typo in error message - missing _ [SME: 13078]
 | 
			
		||||
- ditto user accounts panel                         [SME: 13078]
 | 
			
		||||
- ditto groups panel                                [SME: 13078]
 | 
			
		||||
 | 
			
		||||
* Mon Jul 14 2025 Brian Read <brianr@koozali.org> 11.0.0-105.sme
 | 
			
		||||
- Adjust db opening in Software install panel [SME: 13077]
 | 
			
		||||
 | 
			
		||||
* Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-104.sme
 | 
			
		||||
- Fix DB not open in Workgrouyp panel sometimes. [SME: 13070]
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user