Merge branch 'master' of bn.git:plabudda/se

SE/schema/ant-object/default_db.CRM_PROCES/PROCES_BENEFIT_INFO/PROCES_BENEFIT_INFO.xsd

@@ -13,7 +13,7 @@
    <xsd:import namespace="http://www.opengis.net/gml/3.2"
               schemaLocation="../Types/gml.xsd"/>
    <xsd:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_WSKAZNIK.xsd"
-              schemaLocation="CRM_WSKAZNIK.xsd"/>
+              schemaLocation="../../default_db.CRM_WSKAZNIK/CRM_WSKAZNIK/CRM_WSKAZNIK.xsd"/>
    <xsd:simpleType name="TYPE_Simple" id="_CRM_PROCES___d4e4668-1_TYPE_Simpl">
       <xsd:restriction base="xsd:string">
          <xsd:enumeration value="PROCES_INIT"/>

SE/schema/ant-object/default_db.CRM_WSKAZNIK/CRM_WSKAZNIK/CRM_WSKAZNIK.xsd

@@ -15,11 +15,11 @@
    <xs:import namespace="http://www.opengis.net/gml/3.2"
               schemaLocation="../Types/gml.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_LISTA_ZASOBOW.xsd"
-              schemaLocation="CRM_LISTA_ZASOBOW.xsd"/>
+              schemaLocation="../../default_db.CRM_LISTA_ZASOBOW/CRM_LISTA_ZASOBOW/CRM_LISTA_ZASOBOW.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_PRZYPADEK.xsd"
-              schemaLocation="CRM_PRZYPADEK.xsd"/>
+              schemaLocation="../../default_db.CRM_PRZYPADEK/CRM_PRZYPADEK/CRM_PRZYPADEK.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_IMAGE.xsd"
-              schemaLocation="CRM_IMAGE.xsd"/>
+              schemaLocation="../../default_db.CRM_IMAGE/CRM_IMAGE/CRM_IMAGE.xsd"/>
    <xs:complexType name="CRM_WSKAZNIK" id="RM_WSKAZNIK___d4e5330-1_CRM_WSKAZN">
       <xs:sequence id="RM_WSKAZNIK___d4e5331-1">
          <xs:element name="ID" type="xs:int" id="RM_WSKAZNIK___d4e5332-1_ID"/>

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -2371,12 +2371,13 @@ function encodePhpFiles($installer_dir, $domains = "", $domainEncodePhpFiles = [
     DEBUG_S(-3,'domainEncodePhpFiles',$domainEncodePhpFiles,__FILE__,__FUNCTION__,__LINE__);
 
     $freeEncodePhpFiles = array_filter($allPhpFiles, function ($phpFilePath) use ($domainEncodePhpFiles, $noEncodePhpFiles) {
+	if (in_array($phpFilePath, $domainEncodePhpFiles)) return false;
         preg_match('/^[[:digit:]]+\/(.*)$/', $phpFilePath, $matches);
         if (!$matches || empty($matches[1])) throw new Exception("Błąd ścieżki pliku {$phpFilePath}");
         $phpFilePath = $matches[1];
         if ('se-lib/Vendor/' === substr($phpFilePath, 0, strlen('se-lib/Vendor/'))) return false; // SKIP se-lib/Vendor/*
         if ('.ini.php' === substr($phpFilePath, -1 * strlen('.ini.php'))) return false; // SKIP *.ini.php
-        return (!in_array($phpFilePath, array_merge($domainEncodePhpFiles, $noEncodePhpFiles)));
+        return (!in_array($phpFilePath, $noEncodePhpFiles));
     });
     DEBUG_S(-3,'freeEncodePhpFiles',$freeEncodePhpFiles,__FILE__,__FUNCTION__,__LINE__);
 //    if (empty($freeEncodePhpFiles)) throw new Exception("No php files to encode");