minor updates

config/shibboleth/attribute-map.xml

 <Attributes xmlns="urn:mace:shibboleth:2.0:attribute-map" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <Attribute name="urn:mace:dir:attribute-def:cds-spci-es_oa-signed-tcs" id="spField1" />
+    <Attribute name="urn:mace:dir:attribute-def:cds-spci-es_oa-signed-tcs" id="spField1"/>
     <Attribute name="urn:mace:dir:attribute-def:cds-spci-es_oa-user-category" id="spField2"/>
 </Attributes>

config/shibboleth/dem_pass-ac.xml

 <AccessControl
 type="edu.internet2.middleware.shibboleth.sp.provider.XMLAccessControl">
   <AND>
+    <RuleRegex require="spField1">.+</RuleRegex>
     <Rule require="spField2">
       Copernicus_Services Union_Inst Union_Research_Projects_space Union_Research_Projects_non-space Public_Auth
     </Rule>
-    <RuleRegex require="spField1">.+</RuleRegex>
   </AND>
 </AccessControl>
\ No newline at end of file

config/shibboleth/emg_pass-ac.xml

 <AccessControl
 type="edu.internet2.middleware.shibboleth.sp.provider.XMLAccessControl">
   <AND>
+    <RuleRegex require="spField1">.+</RuleRegex>
     <Rule require="spField2">
       Copernicus_Services Union_Inst Union_Research_Projects_space Union_Research_Projects_non-space Public_Auth
     </Rule>
-    <RuleRegex require="spField1">.+</RuleRegex>
   </AND>
 </AccessControl>
\ No newline at end of file

config/shibboleth/shib-apache.conf

@@ -22,8 +22,6 @@ DocumentRoot "/var/www/html"
       AuthType shibboleth
       ShibRequestSetting requireSession 1
       Require shib-plugin /etc/shibboleth/pass-ac.xml
-      RequestHeader set Referer "%{X-Forwarded-Uri}e"
-      Header set Referer "%{X-Forwarded-Uri}e"
     </Else>
   </Location>
 </VirtualHost>
\ No newline at end of file

config/shibboleth/vhr18_pass-ac.xml

 <AccessControl
 type="edu.internet2.middleware.shibboleth.sp.provider.XMLAccessControl">
   <AND>
+    <RuleRegex require="spField1">.+</RuleRegex>
     <Rule require="spField2">
       Copernicus_Services Union_Inst Union_Research_Projects_space Union_Research_Projects_non-space Public_Auth
     </Rule>
-    <RuleRegex require="spField1">.+</RuleRegex>
   </AND>
 </AccessControl>
\ No newline at end of file