Revert "(legacy) move ipsec_idinfo_to_text into vpn_ipsec.conf, move copyright...

Revert "(legacy) move ipsec_idinfo_to_text into vpn_ipsec.conf, move copyright notice with it and cleanup some spacing"

This reverts commit 96e8bd4c.

src/etc/inc/ipsec.inc

@@ -156,6 +156,34 @@ function ipsec_idinfo_to_cidr(& $idinfo, $addrbits = false, $mode = "") {
 }
 
 
+/*
+ *  Return phase2 idinfo in text format
+ */
+function ipsec_idinfo_to_text(& $idinfo) {
+	global $config;
+
+	switch ($idinfo['type']) {
+        case "address":
+		return $idinfo['address'];
+		break; /* NOTREACHED */
+        case "network":
+		return $idinfo['address']."/".$idinfo['netbits'];
+		break; /* NOTREACHED */
+	case "mobile":
+		return gettext("Mobile Client");
+		break; /* NOTREACHED */
+	case "none":
+		return gettext("None");
+		break; /* NOTREACHED */
+        default:
+		if (!empty($config['interfaces'][$idinfo['type']]))
+			return convert_friendly_interface_to_friendly_descr($idinfo['type']);
+		else
+			return strtoupper($idinfo['type']);
+		break; /* NOTREACHED */
+	}
+}
+
 /*
  * Return phase1 association for phase2
  */

src/www/vpn_ipsec.php

 <?php
 
 /*
-    Copyright (C) 2014-2016 Deciso B.V.
+	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
-    Copyright (C) 2007 Scott Ullrich
 	Copyright (C) 2008 Shrew Soft Inc
 	All rights reserved.
 
@@ -36,36 +35,6 @@ require_once("services.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
-/*
- *  Return phase2 idinfo in text format
- */
-function ipsec_idinfo_to_text(& $idinfo) {
-    global $config;
-
-    switch ($idinfo['type']) {
-        case "address":
-            return $idinfo['address'];
-            break; /* NOTREACHED */
-        case "network":
-            return $idinfo['address']."/".$idinfo['netbits'];
-            break; /* NOTREACHED */
-        case "mobile":
-            return gettext("Mobile Client");
-            break; /* NOTREACHED */
-        case "none":
-            return gettext("None");
-            break; /* NOTREACHED */
-        default:
-            if (!empty($config['interfaces'][$idinfo['type']])) {
-                return convert_friendly_interface_to_friendly_descr($idinfo['type']);
-            } else {
-                return strtoupper($idinfo['type']);
-            }
-            break; /* NOTREACHED */
-    }
-}
-
-
 if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {
     $config['ipsec'] = array();
 }