Changeset 2439
- Timestamp:
- 07/20/20 19:07:40 (4 years ago)
- Location:
- trunk/LATMOS-Accounts/lib/LATMOS
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts/lib/LATMOS/Accounts.pm
r2428 r2439 74 74 75 75 $self->{_configdir} = $config; 76 $self->{_loguser} = $options{loguser}; 76 77 bless($self, $class); 77 78 78 unless ($options{noacl} || $ENV{LA_USERNAME}) {79 unless ($options{noacl}) { 79 80 if (-f (my $aclf = join('/', $self->_configdir, 'la-acls.ini'))) { 80 81 $self->{_acls} = LATMOS::Accounts::Acls->new($aclf) or do { … … 147 148 }; 148 149 $base; 150 } 151 152 =head2 LogUser 153 154 Return the username to use when no user is connected 155 156 =cut 157 158 sub LogUser { 159 my ( $self, $Login ) = @_; 160 161 my $name = $self->{_loguser} || '@Console'; 162 163 if ($Login) { 164 $self->{_loguser} = $Login; 165 } 166 167 return $name; 149 168 } 150 169 -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm
r2430 r2439 1279 1279 sub user { $_[0]->{_user} } 1280 1280 1281 =head2 LogUser 1282 1283 Return the username to use when no user is connected 1284 1285 =cut 1286 1287 sub LogUser { 1288 my ( $self ) = @_; 1289 1290 return $self->user || $self->la->LogUser; 1291 } 1292 1281 1293 =head2 check_acl($obj, $attr, $perm) 1282 1294 -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm
r2413 r2439 1011 1011 1012 1012 $sthmodifiedby->execute( 1013 $self-> user || '@Console',1013 $self->LogUser, 1014 1014 $ref, 1015 1015 ); … … 1036 1036 $name, 1037 1037 $changetype, 1038 $self-> user || '@Console',1038 $self->LogUser, 1039 1039 sprintf($message, @args), 1040 1040 $potype, $pname, $pikey, -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm
r2435 r2439 394 394 } 395 395 $first{$class->_key_field} = $id; 396 $first{createdby} = $base-> user || '@Console';397 $first{modifiedby} = $base-> user || '@Console';396 $first{createdby} = $base->LogUser; 397 $first{modifiedby} = $base->LogUser; 398 398 399 399 my $lastid; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/SyncManager.pm
r2220 r2439 61 61 sub ini { $_[0]->{ini} } 62 62 63 =head2 LA 64 65 Return a LATMOS::Accounts setup for SynchM 66 67 =cut 68 69 sub LA { 70 my ( $self ) = @_; 71 72 return LATMOS::Accounts->new($self->{config}, noacl => 1, loguser => '@SyncManager'); 73 } 74 63 75 =head2 dbrev 64 76 … … 69 81 sub dbrev { 70 82 my ($self) = @_; 71 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);83 my $LA = $self->LA; 72 84 my $base = $LA->base; 73 85 return $base->current_rev; … … 76 88 sub _load_state_ini { 77 89 my ($self) = @_; 78 my $la = LATMOS::Accounts->new($self->{config}, noacl => 1);90 my $la = $self->LA; 79 91 80 92 my $state_file = $la->val('_default_', 'state_dir', '/'); -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task.pm
r2246 r2439 37 37 } 38 38 39 sub LA { 40 my $self = shift; 41 42 return $self->{syncm}->LA(@_); 43 } 44 39 45 =head2 config($value, $default) 40 46 -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Basessynchro.pm
r2127 r2439 23 23 sub run { 24 24 my ($self) = @_; 25 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1) or do {25 my $LA = $self->LA; 26 26 la_log LA_ERR, "Cannot instantiate LA"; 27 27 return 1; … … 55 55 sub reset_savepoint { 56 56 my ($self) = @_; 57 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1) or do {57 my $LA = $self->LA; 58 58 la_log LA_ERR, "Cannot instantiate LA"; 59 59 return; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildlistes.pm
r2332 r2439 25 25 sub init { 26 26 my ($self) = @_; 27 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);27 my $LA = $self->LA; 28 28 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 29 29 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm
r2392 r2439 53 53 sub init { 54 54 my ($self) = @_; 55 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);55 my $LA = $self->LA; 56 56 57 57 $self->{_base} = $LA->base(); -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Delexpiredusers.pm
r2029 r2439 98 98 sub init { 99 99 my ($self) = @_; 100 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);100 my $LA = $self->LA; 101 101 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 102 102 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Employment.pm
r2378 r2439 23 23 sub init { 24 24 my ($self) = @_; 25 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);25 my $LA = $self->LA; 26 26 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 27 27 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Expiredaliases.pm
r1943 r2439 25 25 sub init { 26 26 my ($self) = @_; 27 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);27 my $LA = $self->LA; 28 28 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 29 29 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Iprecover.pm
r2024 r2439 45 45 sub init { 46 46 my ($self) = @_; 47 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);47 my $LA = $self->LA; 48 48 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 49 49 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Refreshexpired.pm
r1828 r2439 35 35 sub init { 36 36 my ($self) = @_; 37 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);37 my $LA = $self->LA; 38 38 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 39 39 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Setattribute.pm
r2257 r2439 49 49 sub init { 50 50 my ($self) = @_; 51 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);51 my $LA = $self->LA; 52 52 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 53 53 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Stats.pm
r2016 r2439 18 18 sub init { 19 19 my ($self) = @_; 20 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);20 my $LA = $self->LA; 21 21 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 22 22 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Unexportexpired.pm
r1880 r2439 32 32 sub init { 33 33 my ($self) = @_; 34 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);34 my $LA = $self->LA; 35 35 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 36 36 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Unusedhosts.pm
r2024 r2439 55 55 sub init { 56 56 my ($self) = @_; 57 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);57 my $LA = $self->LA; 58 58 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 59 59 $labase && $labase->load or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Update.pm
r2376 r2439 22 22 sub init { 23 23 my ($self) = @_; 24 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);24 my $LA = $self->LA; 25 25 my $basename = $LA->default_base_name; 26 26 my $labase = $LA->_load_base($basename) or die "Cannot load base"; -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Updatedyndata.pm
r2376 r2439 31 31 sub init { 32 32 my ($self) = @_; 33 my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);33 my $LA = $self->LA; 34 34 my $labase = $self->{base} ? $LA->base($self->{base}) : $LA->base; 35 35 $labase && $labase->load or die "Cannot load base";
Note: See TracChangeset
for help on using the changeset viewer.