From aeeaabb22e87b605d8a11660e50d6e9e02595ef6 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 6 Jun 2016 12:12:25 +0100
Subject: [PATCH] allow both http: and mailto: contact links

---
 core/util.inc.php                 | 25 +++++++++++++++++++++++++
 ext/home/main.php                 |  2 +-
 ext/home/theme.php                |  2 +-
 ext/ipban/main.php                |  2 +-
 themes/danbooru/layout.class.php  |  4 ++--
 themes/danbooru2/layout.class.php |  4 ++--
 themes/default/layout.class.php   |  4 ++--
 themes/futaba/layout.class.php    |  4 ++--
 themes/lite/layout.class.php      |  4 ++--
 themes/material/layout.class.php  |  4 ++--
 themes/warm/layout.class.php      |  4 ++--
 11 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index 11aa9ae0..c6450997 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -591,6 +591,31 @@ function zglob($pattern) {
 	}
 }
 
+/**
+ * Gets contact link as mailto: or http:
+ */
+function contact_link() {
+	global $config;
+	$text = $config->get_string('contact_link');
+	if(
+		startsWith($text, "http:") ||
+		startsWith($text, "https:") ||
+		startsWith($text, "mailto:")
+	) {
+		return $text;
+	}
+
+	if(strpos($text, "@")) {
+		return "mailto:$text";
+	}
+
+	if(strpos($text, "/")) {
+		return "http://$text";
+	}
+
+	return $text;
+}
+
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * CAPTCHA abstraction                                                       *
diff --git a/ext/home/main.php b/ext/home/main.php
index fb1269db..566c1d6e 100644
--- a/ext/home/main.php
+++ b/ext/home/main.php
@@ -49,7 +49,7 @@ class Home extends Extension {
 		global $config;
 		$base_href = get_base_href();
 		$sitename = $config->get_string('title');
-	    $contact_link = $config->get_string('contact_link');
+	    $contact_link = contact_link();
 		$counter_dir = $config->get_string('home_counter', 'default');
 
 		$total = Image::count_images();
diff --git a/ext/home/theme.php b/ext/home/theme.php
index e34b8ca4..6c51c73d 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -37,7 +37,7 @@ EOD
 		$main_links_html = empty($main_links) ? "" : "<div class='space' id='links'>$main_links</div>";
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='space' id='counter'>$counter_text</div>";
-		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> &ndash;";
+		$contact_link = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a> &ndash;";
 		$search_html = "
 			<div class='space' id='search'>
 				<form action='".make_link("post/list")."' method='GET'>
diff --git a/ext/ipban/main.php b/ext/ipban/main.php
index b3f01a25..2c96d536 100644
--- a/ext/ipban/main.php
+++ b/ext/ipban/main.php
@@ -222,7 +222,7 @@ class IPBan extends Extension {
 				print "IP <b>$ip</b> has been banned until <b>$date</b> by <b>{$admin->name}</b> because of <b>$reason</b>\n";
 				print "<p>If you couldn't possibly be guilty of what you're banned for, the person we banned probably had a dynamic IP address and so do you. See <a href='http://whatismyipaddress.com/dynamic-static'>http://whatismyipaddress.com/dynamic-static</a> for more information.\n";
 
-				$contact_link = $config->get_string("contact_link");
+				$contact_link = contact_link();
 				if(!empty($contact_link)) {
 					print "<p><a href='$contact_link'>Contact The Admin</a>";
 				}
diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index 521ecf3c..7ad90f2e 100644
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@@ -49,7 +49,7 @@ class Layout {
 		$theme_name = $config->get_string('theme');
 		//$base_href = $config->get_string('base_href');
 		$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 
 		$header_html = "";
@@ -88,7 +88,7 @@ class Layout {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 
 		if(empty($this->subheading)) {
 			$subheading = "";
diff --git a/themes/danbooru2/layout.class.php b/themes/danbooru2/layout.class.php
index 4f459893..ffc00731 100644
--- a/themes/danbooru2/layout.class.php
+++ b/themes/danbooru2/layout.class.php
@@ -49,7 +49,7 @@ class Layout {
 		//$theme_name = $config->get_string('theme');
 		//$base_href = $config->get_string('base_href');
 		//$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 
 		$header_html = "";
@@ -88,7 +88,7 @@ class Layout {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 
 		if(empty($this->subheading)) {
 			$subheading = "";
diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php
index e4bf2de2..a8c8ac7c 100644
--- a/themes/default/layout.class.php
+++ b/themes/default/layout.class.php
@@ -13,7 +13,7 @@ class Layout {
 
 		//$theme_name = $config->get_string('theme', 'default');
 		//$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 		$header_html = "";
 		ksort($page->html_headers);
@@ -44,7 +44,7 @@ class Layout {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 
 		$wrapper = "";
 		if(strlen($page->heading) > 100) {
diff --git a/themes/futaba/layout.class.php b/themes/futaba/layout.class.php
index 96440238..350f5dc7 100644
--- a/themes/futaba/layout.class.php
+++ b/themes/futaba/layout.class.php
@@ -6,7 +6,7 @@ class Layout {
 
 		$theme_name = $config->get_string('theme', 'default');
 		$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 		$header_html = "";
 		ksort($page->html_headers);
@@ -37,7 +37,7 @@ class Layout {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 
 		if(empty($page->subheading)) {
 			$subheading = "";
diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php
index fe2fc5e9..0ce85a65 100644
--- a/themes/lite/layout.class.php
+++ b/themes/lite/layout.class.php
@@ -20,7 +20,7 @@ class Layout {
 		$theme_name = $config->get_string('theme', 'lite');
 		$site_name = $config->get_string('title');
 		$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 		$header_html = "";
 		ksort($page->html_headers);
@@ -152,7 +152,7 @@ class Layout {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:{$contact_link}'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='{$contact_link}'>Contact</a>";
 		//$subheading = empty($page->subheading) ? "" : "<div id='subtitle'>{$page->subheading}</div>";
 
 		/*$wrapper = "";
diff --git a/themes/material/layout.class.php b/themes/material/layout.class.php
index 5d88d965..d2431c9b 100644
--- a/themes/material/layout.class.php
+++ b/themes/material/layout.class.php
@@ -13,7 +13,7 @@ class Layout {
 		$site_name = $config->get_string('title');
 		$data_href = get_base_href();
 		$main_page = $config->get_string('main_page');
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
     $site_link = make_link();
 
 		$header_html = "";
@@ -86,7 +86,7 @@ class Layout {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 		/*$subheading = empty($page->subheading) ? "" : "<div id='subtitle'>{$page->subheading}</div>";
 
 		$wrapper = "";
diff --git a/themes/warm/layout.class.php b/themes/warm/layout.class.php
index 79a980f7..4458ccfc 100644
--- a/themes/warm/layout.class.php
+++ b/themes/warm/layout.class.php
@@ -15,7 +15,7 @@ class Layout {
 		$site_name = $config->get_string('title');
 		$data_href = get_base_href();
 		$main_page = $config->get_string('main_page');
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 		$header_html = "";
 		ksort($page->html_headers);
@@ -50,7 +50,7 @@ class Layout {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 		/*$subheading = empty($page->subheading) ? "" : "<div id='subtitle'>{$page->subheading}</div>";
 
 		$wrapper = "";