Periodic merge upstream (#1)

public/lucidAuth.setXDomainCookie.php

@@ -1,24 +1,24 @@
-<?php
-	error_reporting(E_ALL ^ E_NOTICE);
-
-	include_once('../include/lucidAuth.functions.php');
-	
-
-	// Start with checking $_REQUEST['ref']
-	// What do we need?
-	//   token again?
-  
-	// approach 1:
-	//   origin domain, so we can intersect with $settings->Session['CookieDomains'] and iterate through the remaining domains, serving them in one page (which contains iframes already)
-	//   this might be slower because it means one additional roundtrip between client and server
-  
-	// approach 2:
-	//   let the client setup multiple iframes for all domains other than origin domains
-	//   this requires passing an array of domains to the client in asynchronous reply; which feels insecure
-  
-	include_once('../include/lucidAuth.template.php');
-	
-	echo sprintf($pageLayout['bare',
-		'// iFrames go here'
-	);  
+<?php
+	error_reporting(E_ALL ^ E_NOTICE);
+
+	include_once('../include/lucidAuth.functions.php');
+
+
+	// Start with checking $_REQUEST['ref']
+	// What do we need?
+	//   token again?
+
+	// approach 1:
+	//   origin domain, so we can intersect with $settings->Session['CookieDomains'] and iterate through the remaining domains, serving them in one page (which contains iframes already)
+	//   this might be slower because it means one additional roundtrip between client and server
+
+	// approach 2:
+	//   let the client setup multiple iframes for all domains other than origin domains
+	//   this requires passing an array of domains to the client in asynchronous reply; which feels insecure
+
+	include_once('../include/lucidAuth.template.php');
+
+	echo sprintf($pageLayout['bare'],
+		'// iFrames go here'
+	);
 ?>