[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 08a75a93f322db6b3cafc90f5d75ffb465eca80c

[Mike Robinson]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  08a75a93f322db6b3cafc90f5d75ffb465eca80c (commit)
      from  12e83f28f47df5d3d026f136ad987135b9c99a33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 08a75a93f322db6b3cafc90f5d75ffb465eca80c
Author: Mike Robinson <miker at freeside.biz>
Date:   Mon Apr 30 15:11:03 2012 -0500

    14919: make indentation and coding match expectations

diff --git a/FS/FS/option_Common.pm b/FS/FS/option_Common.pm
index 23d3187..2e2a658 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 b30951d..aa89d47 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 '';
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/option_Common.pm          |    9 ++-------
 FS/FS/part_export/netsapiens.pm |   16 ++++++++--------
 2 files changed, 10 insertions(+), 15 deletions(-)