merge config.gui.inc and auth.inc

src/etc/inc/auth.inc

@@ -36,7 +36,19 @@
  * file courtesy of Michael Retterklieber.
  */
 
-require_once("config.gui.inc");
+// previous in config.gui.inc
+require_once("globals.inc");
+
+/* include globals from notices.inc /utility/XML parser files */
+require_once('config.lib.inc');
+require_once("notices.inc");
+require_once("util.inc");
+require_once("IPv6.inc");
+require_once("xmlparse.inc");
+require_once("crypt.inc");
+
+$config = parse_config();
+//
 
 // Will be changed to false if security checks fail
 $security_passed = true;

src/etc/inc/config.gui.inc

-<?php
-
-/*
-	Copyright (C) 2004-2010 Scott Ullrich
-	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once("globals.inc");
-
-/* include globals from notices.inc /utility/XML parser files */
-require_once('config.lib.inc');
-require_once("notices.inc");
-require_once("util.inc");
-require_once("IPv6.inc");
-require_once("xmlparse.inc");
-require_once("crypt.inc");
-
-$config = parse_config();
-
-
-?>