From 58305892cfe3c855133b20f9058229b5dfeb2de8 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Wed, 1 May 2013 01:50:41 -0700
Subject: [PATCH] Instagram and Flickr added to XURLs supported.

---
 class2.php           | 8 ++++++--
 e107_admin/prefs.php | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/class2.php b/class2.php
index 355cbe70b..2a9d5edfe 100644
--- a/class2.php
+++ b/class2.php
@@ -640,6 +640,8 @@ if(is_array($pref['xurl']))
 	define('XURL_GOOGLE', vartrue($pref['xurl']['google'], false));
 	define('XURL_LINKEDIN', vartrue($pref['xurl']['linkedin'], false));
 	define('XURL_GITHUB', vartrue($pref['xurl']['github'], false));
+	define('XURL_FLICKR', vartrue($pref['xurl']['flickr'], false));
+	define('XURL_INSTAGRAM', vartrue($pref['xurl']['instagram'], false));
 }
 else
 {
@@ -647,8 +649,10 @@ else
 	define('XURL_TWITTER', false);
 	define('XURL_YOUTUBE', false);
 	define('XURL_GOOGLE', false);
-	define('XURL_LINKEDIN', false);	
-	define('XURL_GITHUB', false);	
+	define('XURL_LINKEDIN', false);
+	define('XURL_GITHUB', false);
+	define('XURL_FLICKR', false);
+	define('XURL_INSTAGRAM', false);
 }
 
 /* Withdrawn 0.8
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 7b80f3ab5..198d9d1a1 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -975,9 +975,11 @@ $xurls = array(
 	'facebook'		=> 	array('label'=>"Facebook", "placeholder"=>"eg. https://www.facebook.com/e107CMS"),
 	'twitter'		=>	array('label'=>"Twitter",	"placeholder"=>"eg. https://twitter.com/e107"),
 	'youtube'		=>	array('label'=>"Youtube",	"placeholder"=>"eg.https://youtube.com/e107Inc"),
-	'google'		=>	array('label'=>"Google+",	"placeholder"=>"eg.. "),
+	'google'		=>	array('label'=>"Google+",	"placeholder"=>""),
 	'linkedin'		=>	array('label'=>"LinkedIn",	"placeholder"=>"eg. http://www.linkedin.com/groups?home=&gid=1782682"),
-	'github'		=>	array('label'=>"Github",	"placeholder"=>"eg. https://github.com/e107inc")
+	'github'		=>	array('label'=>"Github",	"placeholder"=>"eg. https://github.com/e107inc"),
+	'flickr'		=>	array('label'=>"Flickr",	"placeholder"=>""),
+	'instagram'		=>	array('label'=>"Instagram",	"placeholder"=>""),
 );	
 	
 	foreach($xurls as $k=>$var)