From 1b64ccc99628fa9f2824242138ada950e1d6b2a1 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 31 Oct 2017 11:22:47 -0600
Subject: [PATCH] Admin ACL export - Suppress 'All customfields' field, it's
 not applicable - Add default definition

---
 .../class.admin_wizard_export_acl_csv.inc.php | 18 +++++++++
 admin/setup/importexport_default.xml          | 38 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 admin/setup/importexport_default.xml

diff --git a/admin/inc/class.admin_wizard_export_acl_csv.inc.php b/admin/inc/class.admin_wizard_export_acl_csv.inc.php
index ad125f23bf..5b963e74cb 100644
--- a/admin/inc/class.admin_wizard_export_acl_csv.inc.php
+++ b/admin/inc/class.admin_wizard_export_acl_csv.inc.php
@@ -36,4 +36,22 @@ class admin_wizard_export_acl_csv extends importexport_wizard_basic_export_csv
 		// Custom fields - not possible for ACL
 		unset($this->export_fields['customfields']);
 	}
+
+	/**
+	 * Choose fields to export - overridden from parent to remove 'All custom fields',
+	 * which does not apply here
+	 */
+	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
+	{
+		$result = parent::wizard_step30($content, $sel_options, $readonlys, $preserv);
+		unset($this->export_fields['all_custom_fields']);
+		foreach($content['fields'] as $field_id => $field)
+		{
+			if($field['field'] == 'all_custom_fields')
+			{
+				unset($content['fields'][$field_id]);
+			}
+		}
+		return $result;
+	}
 }
diff --git a/admin/setup/importexport_default.xml b/admin/setup/importexport_default.xml
new file mode 100644
index 0000000000..c3b7558bc3
--- /dev/null
+++ b/admin/setup/importexport_default.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry type="array" name="importExportDefinitions">
+  <entry type="array" name="metainfo">
+    <entry type="string" name="type">importexport definitions</entry>
+    <entry type="string" name="charset">utf-8</entry>
+    <entry type="integer" name="entries">1</entry>
+  </entry>
+  <entry type="array" name="definitions">
+    <entry type="array" name="export-ACL">
+      <entry type="string" name="name">export-ACL</entry>
+      <entry type="string" name="application">admin</entry>
+      <entry type="string" name="plugin">admin_export_acl_csv</entry>
+      <entry type="string" name="type">export</entry>
+      <entry type="NULL" name="allowed_users"/>
+      <entry type="array" name="plugin_options">
+        <entry type="array" name="mapping">
+          <entry type="string" name="acl_account">acl_account</entry>
+          <entry type="string" name="acl_appname">acl_appname</entry>
+          <entry type="string" name="acl_location">acl_location</entry>
+          <entry type="string" name="acl1">acl1</entry>
+          <entry type="string" name="acl2">acl2</entry>
+          <entry type="string" name="acl4">acl4</entry>
+          <entry type="string" name="acl8">acl8</entry>
+          <entry type="string" name="acl16">acl16</entry>
+          <entry type="string" name="acl64">acl64</entry>
+          <entry type="string" name="acl128">acl128</entry>
+          <entry type="string" name="acl256">acl256</entry>
+        </entry>
+        <entry type="string" name="delimiter">;</entry>
+        <entry type="string" name="charset">utf-8</entry>
+        <entry type="string" name="begin_with_fieldnames">label</entry>
+        <entry type="string" name="convert">1</entry>
+      </entry>
+      <entry type="string" name="modified">2017-10-31 11:20:14</entry>
+      <entry type="string" name="filter"/>
+    </entry>
+  </entry>
+</entry>