From adaccb1ca8e3954a7899ef36bb23c05893ebbc81 Mon Sep 17 00:00:00 2001
From: Mike Robinson <miker@freeside.biz>
Date: Mon, 30 Apr 2012 15:09:19 -0500
Subject: [PATCH] 14919: make indentation and coding match expectations

---
 FS/FS/option_Common.pm          |  9 ++-------
 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 40b12cf57..c1dda22af 100644
--- a/FS/FS/option_Common.pm
+++ b/FS/FS/option_Common.pm
@@ -67,13 +67,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 '';
 }
 
 
-- 
2.11.0