From 4e56c58306d3df163df5cf48fe9836dcac196e4c Mon Sep 17 00:00:00 2001
From: William Heimbigner <william.heimbigner@gmail.com>
Date: Thu, 21 Jan 2016 17:31:02 -0700
Subject: Ensure that with default configuration, the shortener will not be
 used but also won't print out any extra warnings

---
 config-default/settings.xml | 2 +-
 lib/ASM/Shortener.pm        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config-default/settings.xml b/config-default/settings.xml
index 830effa..69f2f52 100644
--- a/config-default/settings.xml
+++ b/config-default/settings.xml
@@ -30,7 +30,7 @@
     <userfile>/var/www/.htpasswd</userfile>
     <shortener>
       <apikey>look.at.shortener.godaddy.com</apikey>
-      <domain>asm.rocks</domain>
+      <domain></domain>
     </shortener>
   </web>
 </settings>
diff --git a/lib/ASM/Shortener.pm b/lib/ASM/Shortener.pm
index f2f6b29..cd3f32a 100644
--- a/lib/ASM/Shortener.pm
+++ b/lib/ASM/Shortener.pm
@@ -9,6 +9,13 @@ sub shorturl
 {
   my $module = shift;
   my ($url) = @_;
+  if ((!defined($::settings->{web}->{shortener})) ||
+      (!defined($::settings->{web}->{shortener}->{domain})) ||
+      (!defined($::settings->{web}->{shortener}->{apikey})) ||
+      ($::settings->{web}->{shortener}->{domain} eq '') ||
+      ($::settings->{web}->{shortener}->{apikey} eq '')) {
+    return $url;
+  }
   my $apikey = $::settings->{web}->{shortener}->{apikey};
   my $domain = $::settings->{web}->{shortener}->{domain};
   my $ua = LWP::UserAgent->new;
-- 
cgit v1.2.3