Added http:// to sitelinks to prevent errors in linking

jbroadway · May 18, 2012 · d29b8e9 · d29b8e9
1 parent a744033
commit d29b8e9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/inc/app/sitelinks/boxes/forward/index.php b/inc/app/sitelinks/boxes/forward/index.php
@@ -3,6 +3,7 @@
 // your app begins here
 
 loader_import ('sitelinks.Item');
+loader_import ('sitelinks.Functions');
 
 $item = new SiteLinks_Item;
 
@@ -11,7 +12,7 @@
 	$i = $item->get ($parameters['forward']);
 	if ($i) {
 		$item->addHit ($parameters['forward']);
-		header ('Location: ' . $i->url);
+		header ('Location: ' . AddHttp($i->url));
 		exit;
 	}
 

diff --git a/inc/app/sitelinks/lib/Functions.php b/inc/app/sitelinks/lib/Functions.php
@@ -56,4 +56,11 @@ function sitelinks_timezone ($offset) {
 	return $out . str_pad ($h, 2, '0', STR_PAD_LEFT) . ':' . str_pad ($m, 2, '0', STR_PAD_LEFT);
 }
 
+function AddHttp($url) {
+	if (!preg_match("~^(?:f|ht)tps?://~i", $url)) {
+		$url = "http://" . $url;
+	}
+	return $url;
+}
+
 ?>
diff --git a/inc/app/sitepoll/forms/comment/add/index.php b/inc/app/sitepoll/forms/comment/add/index.php
@@ -36,8 +36,14 @@ function onSubmit ($vals) {
 
 		$ce = appconf ('comments_email');
 		if ($ce) {
-			@mail ($ce, intl_get ('Poll Comment Notice'), template_simple ('comment_email.spt', $vals), 'From: ' . 'sitepoll@' . site_domain ());
-		}
+			site_mail (
+                $ce,
+                intl_get ('Poll Comment Notice'),
+                template_simple ('comment_email.spt', $vals),
+                'From: ' . 'sitepoll@' . site_domain (),
+                array ("Is_HTML" => true)
+            );
+        }
 
 		page_title (intl_get ('Comment Added'));
 		echo template_simple ('comment_added.spt', $vals);

diff --git a/inc/conf/config.ini.php b/inc/conf/config.ini.php
@@ -16,17 +16,17 @@
 
 hostname                = localhost
 
-database                = DBNAME
+database                = semlab_site02
 
-username                = USER
+username                = semlab_site02
 
-password                = PASS
+password                = 2yX6TBms02
 
 persistent              = Off
 
 [Site]
 
-domain                  = DOMAIN
+domain                  = github.semiaslab.nl
 
 usedocroot              = Off