diff options
| author | Mike Robinson <miker@freeside.biz> | 2012-04-30 15:11:03 -0500 |
|---|---|---|
| committer | Mike Robinson <miker@freeside.biz> | 2012-04-30 15:11:03 -0500 |
| commit | 08a75a93f322db6b3cafc90f5d75ffb465eca80c (patch) | |
| tree | 8aeecb672b70d607a5b31bad7e6b6ca1b96bce96 | |
| parent | 12e83f28f47df5d3d026f136ad987135b9c99a33 (diff) | |
14919: make indentation and coding match expectations
| -rw-r--r-- | FS/FS/option_Common.pm | 9 | ||||
| -rw-r--r-- | FS/FS/part_export/netsapiens.pm | 16 |
2 files changed, 10 insertions, 15 deletions
diff --git a/FS/FS/option_Common.pm b/FS/FS/option_Common.pm index 23d318755..2e2a6589d 100644 --- a/FS/FS/option_Common.pm +++ b/FS/FS/option_Common.pm @@ -68,13 +68,8 @@ sub insert { my $error; - $error = $self->check_options($options); - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return $error; - } - - $error = $self->SUPER::insert; + $error = $self->check_options($options) + || $self->SUPER::insert; if ( $error ) { $dbh->rollback if $oldAutoCommit; return $error; diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm index b30951dae..aa89d47a2 100644 --- a/FS/FS/part_export/netsapiens.pm +++ b/FS/FS/part_export/netsapiens.pm @@ -83,16 +83,16 @@ sub rebless { shift; } sub check_options { - my ($self, $options) = @_; + my ($self, $options) = @_; - my $rex = qr/$RE{URI}{HTTP}{-scheme => qr|https?|}/; # match any "http:" or "https:" URL + my $rex = qr/$RE{URI}{HTTP}{-scheme => qr|https?|}/; # match any "http:" or "https:" URL - for my $key (qw/url device_url/) { - if ($$options{$key} && ($$options{$key} !~ $rex)) { - return "Invalid (URL): " . $$options{$key}; - } - } - return ''; + for my $key (qw/url device_url/) { + if ($$options{$key} && ($$options{$key} !~ $rex)) { + return "Invalid (URL): " . $$options{$key}; + } + } + return ''; } |