Merge branch 'master' into exciler_pr

.htaccess

@@ -1,6 +1,6 @@
 # Generated file from class.acl.php
 # For detection of htaccess functionality
-SetEnv OPENXE_HTACCESS on
+SetEnv HTTP_OPENXE_HTACCESS on
 # Disable directory browsing 
 Options -Indexes
 # Set default page to index.php

classes/Components/MailClient/Data/MailAttachmentData.php

@@ -67,11 +67,18 @@ class MailAttachmentData implements MailAttachmentInterface
                 } else if ($split[0] === 'inline') {
                     return ('inline');
                 }
-            } else {    // Check for application/octet-stream
+            } else {    
+                // No disposition given (that is a bad thing)
+                // Check for application/octet-stream
                 $content_type = $part->getContentType();
                 if ($content_type == 'application/octet-stream') {
                     return('application/octet-stream');
-                }
+                }                
+                // Check for Content-id
+                $contentIdHeader = $part->getHeader('content-id');                                              
+                if ($contentIdHeader !== null) {
+                    return ('inline');
+                }               
             }
         }
 

classes/Components/Pdf/PdfMerger.php

@@ -49,9 +49,9 @@ final class PdfMerger
         }
 
         try {
-            $this->fpdi->mergeFiles($sourceFiles, $targetFile);
-        } catch (PdfIncompatibleException $exception) {
             $this->gs->mergeFiles($sourceFiles, $targetFile);
+        } catch (Exception $exception) {
+            $this->fpdi->mergeFiles($sourceFiles, $targetFile);
         }
 
         return $targetFile;

classes/Modules/SubscriptionCycle/Scheduler/SubscriptionCycleManualJobTask.php

@@ -15,6 +15,7 @@ use DateTimeImmutable;
 use DateTimeInterface;
 use Exception;
 use Xentral\Components\Database\Database;
+use Xentral\Components\Logger\Logger;
 use Xentral\Modules\SubscriptionCycle\Service\SubscriptionCycleJobService;
 use Xentral\Modules\SubscriptionCycle\SubscriptionCycleModuleInterface;
 use Xentral\Modules\SubscriptionCycle\SubscriptionModuleInterface;
@@ -58,15 +59,23 @@ final class SubscriptionCycleManualJobTask
         $this->taskMutexService->setMutex('rechnungslauf_manual');
         $jobs = $this->cycleJobService->listAll(100);
         foreach ($jobs as $job) {
-          switch ($job['document_type']) {
+            try {
-            case 'rechnung':
+                switch ($job['document_type']) {
-              $this->subscriptionModule->CreateInvoice((int)$job['address_id']);
+                    case 'rechnung':
-              break;
+                        $this->subscriptionModule->CreateInvoice((int)$job['address_id']);
-            case 'auftrag':
+                        break;
-              $this->subscriptionModule->CreateOrder((int)$job['address_id']);
+                    case 'auftrag':
-              break;
+                        $this->subscriptionModule->CreateOrder((int)$job['address_id']);
-          }
+                        break;
-          $this->cycleJobService->delete((int)$job['id']);
+                }
+            }
+            catch (Exception $e) {
+                /** @var Logger $logger */
+                $logger = $this->app->Container->get('Logger');
+                $logger->error($e->getMessage(), $job);
+            } finally {
+                $this->cycleJobService->delete((int)$job['id']);
+            }
         }
     }
 

classes/Modules/SubscriptionCycle/SubscriptionModule.php

@@ -61,6 +61,7 @@ class SubscriptionModule implements SubscriptionModuleInterface
         WHERE aa.dokument = :doctype
         AND greatest(aa.startdatum, aa.abgerechnetbis) <= :calcdate
         AND (aa.enddatum = '0000-00-00' OR aa.abgerechnetbis < aa.enddatum)
+        AND aa.preisart IN ('monat', 'jahr', '30tage')  
         AND aa.adresse = :address";
 
     return $this->db->fetchAll($sql, [

classes/Modules/Ticket/Task/TicketImportHelper.php

@@ -850,9 +850,9 @@ class TicketImportHelper
         if (
             $this->mailAccount->isAutoresponseEnabled()
             && $this->mailAccount->getAutoresponseText() !== ''
-            && (
+            && !(
-//                $this->erpApi->AutoresponderBlacklist($from) !== 1 ||
+                 $this->CheckAutoresponderBlacklist($from) &&
-                 $this->mailAccount->isAutoresponseLimitEnabled() === false
+                 $this->mailAccount->isAutoresponseLimitEnabled()
             )
         ) {
 
@@ -867,20 +867,38 @@ class TicketImportHelper
             $betreff = str_replace('{TICKET}', $ticketNumber, $betreff);
             $betreff = str_replace('{BETREFF}', $subject, $betreff);
 
-
             if (!$this->erpApi->isHTML($text)) {
                 $text = str_replace("\r\n", '<br>', $text);
             }
+                       
+            $this->SetAutoresponderBlacklist($from);
+                                  
             $this->erpApi->MailSend(
                 $this->mailAccount->getSenderEmailAddress(),
-                '',
+                $this->mailAccount->getSenderName(),
+                $from,
                 $from,
-                $name_sender,
                 $betreff,
                 $text
-            );
+            );                                   
         }
-
         return(true);
     } 
+    
+    // Check if the given address has already been autoresponded to
+    // True if blocked
+    function CheckAutoresponderBlacklist(string $mailaddress) : bool {
+        $blocked = $this->db->Select("SELECT * FROM autoresponder_blacklist WHERE mailaddress = '".$mailaddress."' AND cachetime > DATE_ADD(CURRENT_TIMESTAMP, INTERVAL -24 HOUR)");
+        
+        $this->logger->debug('Blacklist',['address' => $mailaddress, 'result' => $blocked]);
+        
+        return(!empty($blocked));
+    }
+    
+    function SetAutoresponderBlacklist(string $mailaddress) {
+        $this->db->Insert("INSERT INTO autoresponder_blacklist (mailaddress) VALUES ('".$mailaddress."')");
+        $this->db->Delete("DELETE FROM autoresponder_blacklist WHERE cachetime < DATE_ADD(CURRENT_TIMESTAMP, INTERVAL -24 HOUR)");
+    }
+    
+    
 }

cronjobs/shopimport.php

@@ -945,7 +945,7 @@ if($shops) {
               {
                 $onlinebestellnummer = $tmpwarenkorb['auftrag'];
               }
-              //$projekt = $app->DB->Select("SELECT projekt WHERE shopexport = '$id' LIMIT 1");
+              $projekt = $app->DB->Select("SELECT projekt FROM shopexport WHERE id = '$id' LIMIT 1");
               if(!empty($tmpwarenkorb['projekt']) && $app->DB->Select("SELECT id FROM projekt WHERE id = '".(int)$tmpwarenkorb['projekt']."' LIMIT 1"))$projekt = (int)$tmpwarenkorb['projekt'];
               if(isset($tmpwarenkorb['subshop']) && $tmpwarenkorb['subshop'])
               {

phpwf/plugins/class.acl.php

@@ -849,9 +849,10 @@ class Acl
       {
         // verbinden zum ldap server
         $ds = ldap_connect($this->app->erp->Firmendaten("ldap_host"));
+        ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+        ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
         $suche = $this->app->erp->Firmendaten("ldap_searchbase");
-        $filter = $this->app->erp->Firmendaten("ldap_filter");
+        $filter = str_replace('{USER}',$username,$this->app->erp->Firmendaten("ldap_filter"));
-        //$bind_name = str_replace('%user%',$username,$this->app->erp->Firmendaten("ldap_bindname"));
         $bind_name = str_replace('{USER}',$username,$this->app->erp->Firmendaten("ldap_bindname"));
 
         if ($ds) {
@@ -1227,7 +1228,7 @@ class Acl
   $nominal = array('
 # Generated file from class.acl.php
 # For detection of htaccess functionality
-SetEnv OPENXE_HTACCESS on
+SetEnv HTTP_OPENXE_HTACCESS on
 # Disable directory browsing 
 Options -Indexes
 # Set default page to index.php
@@ -1303,7 +1304,7 @@ Allow from all
         }
     }
 
-    if (!isset($_SERVER['OPENXE_HTACCESS'])) {
+    if (!isset($_SERVER['HTTP_OPENXE_HTACCESS'])) {
         return("htaccess nicht aktiv.");
     }
 
@@ -1312,6 +1313,7 @@ Allow from all
   }
 
   function refresh_githash() {
+    $gitinfo = array();
     $path = '../.git/';
     if (!is_dir($path)) {
       return;
@@ -1320,12 +1322,13 @@ Allow from all
     $refs = trim(substr($head,0,4));
     if ($refs == 'ref:') {
         $ref = substr($head,5);
-        $hash = trim(file_get_contents($path . $ref));
+        $gitinfo['hash'] = trim(file_get_contents($path . $ref));
+        $gitinfo['branch'] = basename($path . $ref);
     } else {
-        $hash = $head;
+        $gitinfo['hash'] = $head;
     }
-    if (!empty($hash)) {
+    if (!empty($gitinfo)) {
-      file_put_contents("../githash.txt", $hash);
+      file_put_contents("../gitinfo.json", json_encode($gitinfo));
     }
   }
 

tools/module_creator/module_creator_php_template.txt

@@ -84,11 +84,9 @@ class PLACEHOLDER_MODULECLASSNAME {
     }    
 
     public function PLACEHOLDER_DELETE() {
-        $id = (int) $this->app->Secure->GetGET('id');
+        $id = (int) $this->app->Secure->GetGET('id');     
-        
         $this->app->DB->Delete("DELETE FROM `PLACEHOLDER_MODULENAME` WHERE `id` = '{$id}'");        
-        $this->app->Tpl->Set('MESSAGE', "<div class=\"error\">Der Eintrag wurde gel&ouml;scht.</div>");        
+        $this->app->Tpl->addMessage('error', 'Der Eintrag wurde gel&ouml;scht');        
-
         $this->PLACEHOLDER_LIST();
     } 
 
@@ -112,6 +110,10 @@ class PLACEHOLDER_MODULECLASSNAME {
         $this->app->erp->MenuEintrag("index.php?module=PLACEHOLDER_MODULENAME&action=list", "Zur&uuml;ck zur &Uuml;bersicht");
         $id = $this->app->Secure->GetGET('id');
         $input = $this->GetInput();
+        
+        // Convert here
+    	// $input['prio'] = !empty($this->app->Secure->GetPOST('prio'))?"1":"0";        
+        
         $submit = $this->app->Secure->GetPOST('submit');
                 
         if (empty($id)) {
@@ -156,23 +158,26 @@ class PLACEHOLDER_MODULECLASSNAME {
                 $msg = $this->app->erp->base64_url_encode("<div class=\"success\">Das Element wurde erfolgreich angelegt.</div>");
                 header("Location: index.php?module=PLACEHOLDER_MODULENAME&action=list&msg=$msg");
             } else {
-                $this->app->Tpl->Set('MESSAGE', "<div class=\"success\">Die Einstellungen wurden erfolgreich &uuml;bernommen.</div>");
+                $this->app->Tpl->addMessage('success', 'Die Einstellungen wurden erfolgreich &uuml;bernommen.');
             }
         }
 
     
         // Load values again from database
-	$dropnbox = "PLACEHOLDER_DROPNBOX";
+        if ($id != 'NULL') {
-        $result = $this->app->DB->SelectArr("PLACEHOLDER_SQL_LIST"." WHERE id=$id");        
 
-        foreach ($result[0] as $key => $value) {
+        	$dropnbox = "PLACEHOLDER_DROPNBOX";
-            $this->app->Tpl->Set(strtoupper($key), $value);   
+            $result = $this->app->DB->SelectArr("PLACEHOLDER_SQL_LIST"." WHERE id=$id");        
-        }
 
-        if (!empty($result)) {
+            foreach ($result[0] as $key => $value) {
-            $PLACEHOLDER_MODULENAME_from_db = $result[0];
+                $this->app->Tpl->Set(strtoupper($key), $value);   
-        } else {
+            }
-            return;
+
+            if (!empty($result)) {
+                $PLACEHOLDER_MODULENAME_from_db = $result[0];
+            } else {
+                return;
+            }
         }
              
         /*
@@ -184,6 +189,8 @@ class PLACEHOLDER_MODULECLASSNAME {
         $this->app->Tpl->Add('ANGEZEIGTERNAME', $angezeigtername);         
 
         $this->app->YUI->AutoComplete("artikel", "artikelnummer");
+        $this->app->Tpl->Set('PROJEKT',$this->app->erp->ReplaceProjekt(false,$PLACEHOLDER_MODULENAME_from_db['projekt'],false));
+      	$this->app->Tpl->Set('PRIO', $PLACEHOLDER_MODULENAME_from_db['prio']==1?"checked":"");
 
          */
 

upgrade/data/db_schema.json

@@ -3660,6 +3660,28 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "etikettautodruck",
+                    "Type": "int(1)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "etikett",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -50385,6 +50407,83 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "usereditid",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "YES",
+                    "Key": "MUL",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "projekt",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "MUL",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "adresse",
+                    "Type": "int(10)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "MUL",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "belegnr",
+                    "Type": "varchar(255)",
+                    "Collation": "utf8mb3_general_ci",
+                    "Null": "NO",
+                    "Key": "MUL",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "schreibschutz",
+                    "Type": "int(1)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "ausgelagert",
+                    "Type": "int(1)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "sprache",
+                    "Type": "varchar(32)",
+                    "Collation": "utf8mb3_general_ci",
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": null,
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "zeitstempel",
                     "Type": "timestamp",
@@ -50472,6 +50571,28 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "lieferschein",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "auftrag",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
@@ -50534,6 +50655,17 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
+                {
+                    "Field": "menge",
+                    "Type": "decimal(14,4)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0.0000",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
                 {
                     "Field": "ausgeblendet",
                     "Type": "tinyint(1)",
@@ -112197,7 +112329,7 @@
                 },
                 {
                     "Field": "preis",
-                    "Type": "decimal(14,4)",
+                    "Type": "decimal(14,5)",
                     "Collation": null,
                     "Null": "NO",
                     "Key": "",

version.php

@@ -2,9 +2,19 @@
 
 $version="OSS"; 
 $version_revision="1.11";
-$githash = file_get_contents("../githash.txt");
+$gitinfo = file_get_contents("../gitinfo.json");
-if (!empty($githash)) {
+if (!empty($gitinfo)) {
-  $version_revision .= " (".substr($githash,0,8).")";
+  $gitinfo = json_decode($gitinfo);
+  
+  if ($gitinfo->branch != 'master') {
+    $version_revision .= " (".substr($gitinfo->hash,0,8)." - ".$gitinfo->branch.")";
+  }
+  else {
+      $version_revision .= " (".substr($gitinfo->hash,0,8).")";
+  }
+  
+} else {
+  $version_revision .= " (?)";
 }
 
 ?>

www/eproosystem.php

@@ -1111,10 +1111,10 @@ if (typeof document.hidden !== \"undefined\") { // Opera 12.10 and Firefox 18 an
     }
 
       // userd edit ajax call
-/*    $poll = true;
+    $poll = true;
     if($poll) {
       $this->addPollJs($module, $action, $id);
-    }*/
+    }
 
     /** @var Ajax $ajax */
     $ajax = $this->loadModule('ajax');

www/js/production/generic/.htaccess

@@ -0,0 +1,4 @@
+<FilesMatch ".">
+    Order Allow,Deny
+    Allow from all
+</FilesMatch>

www/js/production/generic/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

www/js/production/generic/info.txt

@@ -0,0 +1 @@
+This folder contains Mozilla pdfjs-4.2.67-dist added on 2024-05-15

www/js/production/generic/web/cmaps/CNS2-V.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEáCNS2-H

www/js/production/generic/web/cmaps/ETenms-B5-H.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEá	ETen-B5-H`
 ^

www/js/production/generic/web/cmaps/GB-H.bcmap

@@ -0,0 +1,4 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!<21>º]aX!!]`<60>21<32>>	<09>p<0B>z<EFBFBD>$]‚<06>"R‚d<E2809A>-Uƒ7<C692>*„
4„%<25>+ „Z „{<7B>/…%…<<3C>9K…b<E280A6>1]†.<2E>"‡‰`]‡,<2C>"]ˆ
+<EFBFBD>"]ˆh<CB86>"]‰F<E280B0>"]Š$<24>"]‹<02>"]‹`<60>"]Œ><3E>"]<5D><1C>"]<5D>z<EFBFBD>"]ŽX<C5BD>"]<5D>6<EFBFBD>"]<5D><14>"]<5D>r<EFBFBD>"]‘P<E28098>"]’.<2E>"]“<0C>"]“j<E2809C>"]”H<E2809D>"]•&<26>"]–<04>"]–b<E28093>"]—@<40>"]˜<1E>"]˜|<7C>"]™Z<E284A2>"]š8<C5A1>"]›<16>"]›t<E280BA>"]œR<C593>"]<5D>0<EFBFBD>"]ž<0E>"]žl<C5BE>"]ŸJ<C5B8>"] (<28>"]¡<06>"]¡d<C2A1>"]¢B<C2A2>"]£ <20>"X£~<7E>']¤W<C2A4>"]¥5<C2A5>"]¦<13>"]¦q<C2A6>"]§O<C2A7>"]¨-<2D>"]©<0B>"]©i<C2A9>"]ªG<C2AA>"]«%<25>"]¬<03>"]¬a<C2AC>"]­?<3F>"]®<1D>"]®{<7B>"]¯Y<C2AF>"]°7<C2B0>"]±<15>"]±s<C2B1>"]²Q<C2B2>"]³/<2F>"]´
<0A>"]´k<C2B4>"]µI<C2B5>"]¶'<27>"]·<05>"]·c<C2B7>"]¸A<C2B8>"]¹<1F>"]¹}<7D>"]º[<5B>"]»9