Changeset 480 for trunk/DNSDB.pm
- Timestamp:
- 03/13/13 17:57:03 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/DNSDB.pm
r479 r480 2160 2160 } else { 2161 2161 my $logentry = "[new $zone] Added record '$host $typemap{$type} $val', TTL $ttl"; 2162 $logentry .= ", default location ". getLoc($dbh,$defloc)->{description} if $defloc;2162 $logentry .= ", default location ".$self->getLoc($defloc)->{description} if $defloc; 2163 2163 _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group, entry => $logentry) ); 2164 2164 } … … 3073 3073 # Returns ('OK',<location>) on success, ('FAIL',<failmsg>) on failure 3074 3074 sub addLoc { 3075 my $dbh = shift; 3075 my $self = shift; 3076 my $dbh = $self->{dbh}; 3076 3077 my $grp = shift; 3077 3078 my $shdesc = shift; … … 3153 3154 # Returns a result code and message 3154 3155 sub updateLoc { 3155 my $dbh = shift; 3156 my $self = shift; 3157 my $dbh = $self->{dbh}; 3156 3158 my $loc = shift; 3157 3159 my $grp = shift; … … 3169 3171 local $dbh->{RaiseError} = 1; 3170 3172 3171 my $oldloc = getLoc($dbh,$loc);3173 my $oldloc = $self->getLoc($loc); 3172 3174 my $okmsg = "Updated location (".$oldloc->{description}.", '".$oldloc->{iplist}."') to ($shdesc, '$iplist')"; 3173 3175 … … 3195 3197 ## DNSDB::delLoc() 3196 3198 sub delLoc { 3197 my $dbh = shift; 3199 my $self = shift; 3200 my $dbh = $self->{dbh}; 3198 3201 my $loc = shift; 3199 3202 … … 3203 3206 local $dbh->{RaiseError} = 1; 3204 3207 3205 my $oldloc = getLoc($dbh,$loc);3208 my $oldloc = $self->getLoc($loc); 3206 3209 my $olddesc = ($oldloc->{description} ? $oldloc->{description} : $loc); 3207 3210 my $okmsg = "Deleted location ($olddesc, '".$oldloc->{iplist}."')"; … … 3235 3238 # Returns a reference to a hash containing the group ID, IP list, description, and comments/notes 3236 3239 sub getLoc { 3237 my $dbh = shift; 3240 my $self = shift; 3241 my $dbh = $self->{dbh}; 3238 3242 my $loc = shift; 3239 3243 … … 3251 3255 # - a "Starts with" string 3252 3256 sub getLocCount { 3253 my $dbh = shift; 3257 my $self = shift; 3258 my $dbh = $self->{dbh}; 3254 3259 3255 3260 my %args = @_; … … 3274 3279 ## DNSDB::getLocList() 3275 3280 sub getLocList { 3276 my $dbh = shift; 3281 my $self = shift; 3282 my $dbh = $self->{dbh}; 3277 3283 3278 3284 my %args = @_; … … 3313 3319 # Returns a reference to a list of hashrefs suitable to feeding to HTML::Template 3314 3320 sub getLocDropdown { 3315 my $dbh = shift; 3321 my $self = shift; 3322 my $dbh = $self->{dbh}; 3316 3323 my $grp = shift; 3317 3324 my $sel = shift || ''; … … 3655 3662 if $typemap{$$rectype} eq 'SRV'; 3656 3663 $logdata{entry} .= "', TTL $ttl"; 3657 $logdata{entry} .= ", location ". getLoc($dbh,$location)->{description} if $location;3664 $logdata{entry} .= ", location ".$self->getLoc($location)->{description} if $location; 3658 3665 3659 3666 # Allow transactions, and raise an exception on errors so we can catch it later. … … 3822 3829 if $typemap{$oldrec->{type}} eq 'SRV'; 3823 3830 $logdata{entry} .= "', TTL $oldrec->{ttl}"; 3824 $logdata{entry} .= ", location ". getLoc($dbh,$oldrec->{location})->{description} if $oldrec->{location};3831 $logdata{entry} .= ", location ".$self->getLoc($oldrec->{location})->{description} if $oldrec->{location}; 3825 3832 $logdata{entry} .= "\nto\n"; 3826 3833 # More NS special … … 3833 3840 $logdata{entry} .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$$rectype} eq 'SRV'; 3834 3841 $logdata{entry} .= "', TTL $ttl"; 3835 $logdata{entry} .= ", location ". getLoc($dbh,$location)->{description} if $location;3842 $logdata{entry} .= ", location ".$self->getLoc($location)->{description} if $location; 3836 3843 3837 3844 local $dbh->{AutoCommit} = 0; … … 3949 3956 if $typemap{$oldrec->{type}} eq 'SRV'; 3950 3957 $logdata{entry} .= "', TTL $oldrec->{ttl}"; 3951 $logdata{entry} .= ", location ". getLoc($dbh,$oldrec->{location})->{description} if $oldrec->{location};3958 $logdata{entry} .= ", location ".$self->getLoc($oldrec->{location})->{description} if $oldrec->{location}; 3952 3959 3953 3960 eval {
Note:
See TracChangeset
for help on using the changeset viewer.