Merge pull request #95 from RETROTEC-AG/pr/locale-des-gui-users-ermitteln

Locale des GUI-Users ermitteln

SERVER_INSTALL.md

@@ -54,11 +54,14 @@ memory_limit = 256M
 ## Install additional zip
 `sudo apt-get install zip`
 
+## Install mysql client
+`sudo apt-get install mysql-client`
+
 ## Install database server
 `sudo apt-get install mariadb-server`
 
 ## Configure database server
-`sudo mariadb-secure-installation`
+`sudo mysql_secure_installation`
 ```
 NOTE: RUNNING ALL PARTS OF THIS SCRIPT IS RECOMMENDED FOR ALL MariaDB
       SERVERS IN PRODUCTION USE!  PLEASE READ EACH STEP CAREFULLY!

classes/Components/I18n/Bootstrap.php

@@ -0,0 +1,151 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+use Xentral\Components\Database\Database;
+use Xentral\Components\Http\Request;
+use Xentral\Components\Http\Session\Session;
+use Xentral\Core\DependencyInjection\ServiceContainer;
+
+/**
+ * Factory for localization object.
+ *
+ * @see Localization
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+final class Bootstrap
+{
+    /**
+     * @return array
+     */
+    public static function registerServices(): array
+    {
+        return [
+            'Localization' => 'onInitLocalization',
+        ];
+    }
+    
+    
+    
+    /**
+     * Replaces umlauts with their 2 character representation.
+     *
+     * @param string $string
+     *
+     * @return array|string|string[]
+     */
+    public static function replaceUmlauts(string $string)
+    {
+        $search = ['ä', 'ö', 'ü', 'Ä', 'Ö', 'Ü', 'ß'];
+        $replace = ['ae', 'oe', 'ue', 'Ae', 'Oe', 'Ue', 'ss'];
+        return str_replace($search, $replace, $string);
+    }
+    
+    
+    
+    /**
+     * Find the language information from the given string.
+     *
+     * @param string $lang
+     *
+     * @return array|null
+     */
+    public static function findLanguage(string $lang): ?array
+    {
+        $subject = strtolower($lang);
+        foreach ((new Iso639()) as $key => $val) {
+            if (array_filter($val, function ($str) use ($subject) {
+                return $str && ((strtolower($str) == $subject) || (self::replaceUmlauts(strtolower($str)) == $subject));
+            })) {
+                return $val;
+            }
+        }
+        return null;
+    }
+    
+    
+    
+    /**
+     * Find the region information from the given string.
+     *
+     * @param string $region
+     *
+     * @return array|null
+     */
+    public static function findRegion(string $region): ?array
+    {
+        $subject = strtolower($region);
+        foreach ((new Iso3166()) as $key => $val) {
+            if (array_filter($val, function ($str) use ($subject) {
+                return $str && ((strtolower($str) == $subject) || (self::replaceUmlauts(strtolower($str)) == $subject));
+            })) {
+                return $val;
+            }
+        }
+        return null;
+    }
+    
+    
+    
+    /**
+     * This is the factory for the Localization object.
+     *
+     * @param ServiceContainer $container
+     *
+     * @return Localization
+     */
+    public static function onInitLocalization(ServiceContainer $container): Localization
+    {
+        /** @var Request $request */
+        $request = $container->get('Request');
+        /** @var Session $session */
+        $session = $container->get('Session');
+        /** @var \erpooSystem $app */
+        $app = $container->get('LegacyApplication');
+        /** @var Database $db */
+        $db = $container->get('Database');
+        
+        $config=[];
+        $firmaLang=null;
+        $firmaRegion=null;
+        // Get language from system settings and normalize to 3-letter-code and 2-letter-code
+        if ($firmaLang = self::findLanguage($app->erp->Firmendaten('preferredLanguage'))) {
+            $config[Localization::LANGUAGE_DEFAULT] = $firmaLang[Iso639\Key::ALPHA_3];
+        }
+        
+        // Get region from system settings and normalize to 2-letter-code
+        if ($firmaLang && ($firmaRegion = self::findRegion($app->erp->Firmendaten('land')))) {
+            $config[Localization::LOCALE_DEFAULT] = "{$firmaLang[Iso639\Key::ALPHA_2]}_{$firmaRegion[Iso3166\Key::ALPHA_2]}";
+        }
+        
+        
+        // Get User
+        $usersettings = [];
+        if ($user = $app->User) {
+            // Get User's address from user
+            $userAddress = $db->fetchRow(
+                $db->select()->cols(['*'])->from('adresse')->where('id=:id'),
+                ['id' => $user->GetAdresse()]
+            );
+            
+            // Get language from user account and normalize to 3-letter-code and 2-letter-code
+            if ($userLang = self::findLanguage($user->GetSprache())) {
+                $usersettings['language'] = $userLang[Iso639\Key::ALPHA_3];
+            }
+            
+            // Get region from user account and normalize to 2-letter-code
+            if ($userLang && ($userRegion = self::findRegion($userAddress['land']))) {
+                $usersettings['locale'] = "{$userLang[Iso639\Key::ALPHA_2]}_{$userRegion[Iso3166\Key::ALPHA_2]}";
+            }
+        }
+        
+        // Create Localization object
+        return new Localization($request, $session, $usersettings, $config);
+    }
+}

classes/Components/I18n/Dataaccess/ArrayAccessTrait.php

@@ -0,0 +1,73 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+/**
+ * Provides array access functions to the data provider.
+ *
+ * @see      \ArrayAccess
+ * @see      DataProvider
+ * @see      DataProviderInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+trait ArrayAccessTrait
+{
+    /**
+     * Whether an offset exists.
+     *
+     * @param string $offset
+     *
+     * @return bool
+     */
+    public function offsetExists($offset): bool
+    {
+        return array_key_exists($offset, $this->DataProvider_DATA);
+    }
+    
+    
+    
+    /**
+     * Offset to retrieve.
+     *
+     * @param string $offset
+     *
+     * @return array
+     */
+    public function offsetGet($offset): array
+    {
+        return $this->DataProvider_DATA[$offset];
+    }
+    
+    
+    
+    /**
+     * Assign a value to the specified offset.
+     * No function since data set is read only.
+     *
+     * @param string $offset
+     * @param array  $value
+     */
+    public function offsetSet($offset, $value)
+    {
+// $this->DataProvider_DATA[$offset]=$value;
+    }
+    
+    
+    
+    /**
+     * Unset an offset.
+     * No function since data set is read only.
+     *
+     * @param string $offset
+     */
+    public function offsetUnset($offset)
+    {
+// unset($this->DataProvider_DATA[$offset]);
+    }
+}

classes/Components/I18n/Dataaccess/CountableTrait.php

@@ -0,0 +1,30 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+/**
+ * Provides countable functions to the data provider.
+ *
+ * @see      \Countable
+ * @see      DataProvider
+ * @see      DataProviderInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+trait CountableTrait
+{
+    /**
+     * Counts the number of records in the private $data array.
+     *
+     * @return int Number of records
+     */
+    public function count(): int
+    {
+        return count($this->DataProvider_DATA);
+    }
+}

classes/Components/I18n/Dataaccess/DataFilter.php

@@ -0,0 +1,80 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+
+/**
+ * Abstract filter class.
+ *
+ * @see      DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class DataFilter implements DataFilterInterface
+{
+    /**
+     * Pointer to next filter in chain.
+     *
+     * @var DataFilterInterface
+     */
+    private $nextFilter = null;
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::then()
+     */
+    public function then(DataFilterInterface $filter): DataFilterInterface
+    {
+        if (!$this->nextFilter) {
+            $this->nextFilter = $filter;
+        } else {
+            $this->nextFilter->then($filter);
+        }
+        return $this;
+    }
+    
+    
+    
+    /**
+     * Applies the filter to the data and executes the next filter
+     * if present.
+     *
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::__invoke()
+     */
+    public function __invoke(array $data): array
+    {
+// 		echo get_called_class()."::__invoke(\$data)".PHP_EOL;
+        
+        $filteredData = [];
+        foreach ($data as $key => $val) {
+            if ($this->selectItem($key, $val)) {
+                $filteredData[$key] = $val;
+            }
+        }
+        
+        if ($this->nextFilter) {
+            $filteredData = ($this->nextFilter)($filteredData);
+        }
+        return $filteredData;
+    }
+    
+    
+    
+    /**
+     * Check if the current item is to be selected for
+     * the dataset.
+     *
+     * @param mixed $key
+     * @param mixed $val
+     *
+     * @return bool
+     */
+    abstract protected function selectItem(&$key, &$val): bool;
+}

classes/Components/I18n/Dataaccess/DataFilterInterface.php

@@ -0,0 +1,38 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+
+/**
+ * Filter Interface.
+ *
+ * @see      DataFilter
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+interface DataFilterInterface
+{
+    /**
+     * Add a filter to the end of the filter chain.
+     *
+     * @param DataFilterInterface $filter Filter to add
+     *
+     * @return DataFilterInterface Start of filter chain
+     */
+    function then(DataFilterInterface $filter): DataFilterInterface;
+    
+    
+    
+    /**
+     * Applies the filter to the data and executes the next filter
+     * if present.
+     *
+     * @see \Ruga\I18n\Dataaccess\DataFilterInterface::__invoke()
+     */
+    function __invoke(array $data): array;
+}

classes/Components/I18n/Dataaccess/DataProvider.php

@@ -0,0 +1,125 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+use ArrayAccess;
+use Countable;
+use Iterator;
+
+/**
+ * Abstract implementation of a general data provider.
+ *
+ * @see      DataProviderInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class DataProvider implements Countable, Iterator, ArrayAccess, DataProviderInterface
+{
+    use CountableTrait;
+    use IteratorTrait;
+    use ArrayAccessTrait;
+    
+    
+    /**
+     * Holds filtered data.
+     *
+     * @var mixed
+     */
+    private $DataProvider_DATA = null;
+    
+    
+    
+    /**
+     * Create the object and apply data filter.
+     *
+     * @param DataFilterInterface|null $filter
+     */
+    public function __construct(DataFilterInterface $filter = null)
+    {
+        if ($filter) {
+            $this->DataProvider_DATA = $filter($this->getOriginalData());
+        } else {
+            $this->DataProvider_DATA = $this->getOriginalData();
+        }
+    }
+    
+    
+    
+    /**
+     * Returns the original data array).
+     * Raw data before any filtering takes place.
+     *
+     * @return array
+     */
+    abstract protected function getOriginalData(): array;
+    
+    
+    
+    /**
+     * Returns an array suitable for select fields.
+     * The key of the filtered data set is used as key of the
+     * array and $desiredName field is used as value.
+     *
+     * @param string $desiredName
+     *
+     * @return array;
+     */
+    public function getMultiOptions($desiredName = 'NAME_deu'): array
+    {
+        $a = [];
+        foreach ($this as $key => $l) {
+            $a[$key] = $l[$desiredName];
+        }
+        return $a;
+    }
+    
+    
+    
+    /**
+     * Returns the field $desiredName from the record $id.
+     *
+     * @param mixed  $id
+     * @param string $desiredName
+     *
+     * @return string
+     */
+    public function getString($id, $desiredName): string
+    {
+        if (!isset($this[$id])) {
+            throw new Exception\OutOfRangeException("Index '{$id}' not found");
+        }
+        $d = $this[$id];
+        if ($desiredName) {
+            if ($desiredName == 'POST') {
+                return strtoupper($this->getString($id, 'NAME_eng'));
+            }
+            return $d[$desiredName];
+        }
+        throw new Exception\OutOfRangeException("No '{$desiredName}' data for '{$id}'");
+    }
+    
+    
+    
+    /**
+     * Returns the item at position $id.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function getData($id)
+    {
+        if (empty($id)) {
+            return null;
+        }
+        if (!isset($this[$id])) {
+            throw new Exception\OutOfRangeException("Index '{$id}' not found.");
+        }
+        return $this[$id];
+    }
+}

classes/Components/I18n/Dataaccess/DataProviderInterface.php

@@ -0,0 +1,53 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+
+/**
+ * Interface to the general data provider class.
+ *
+ * @see      DataProvider
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+interface DataProviderInterface
+{
+    /**
+     * Returns an array suitable for select fields.
+     * The key of the filtered data set is used as key of the
+     * array and $desiredName field is used as value.
+     *
+     * @param string $desiredName
+     *
+     * @return array;
+     */
+    public function getMultiOptions($desiredName): array;
+    
+    
+    
+    /**
+     * Returns the field $desiredName from the record $id.
+     *
+     * @param mixed  $id
+     * @param string $desiredName
+     *
+     * @return string
+     */
+    public function getString($id, $desiredName): string;
+    
+    
+    
+    /**
+     * Returns the item at position $id.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function getData($id);
+}

classes/Components/I18n/Dataaccess/Exception/OutOfRangeException.php

@@ -0,0 +1,14 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess\Exception;
+
+class OutOfRangeException extends \OutOfRangeException
+{
+    
+}

classes/Components/I18n/Dataaccess/IteratorTrait.php

@@ -0,0 +1,100 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Dataaccess;
+
+/**
+ * Provides iterator functions to the data provider.
+ *
+ * @see      \Iterator
+ * @see      DataProvider
+ * @see      DataProviderInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+trait IteratorTrait
+{
+    /**
+     * Index of the current element's key.
+     *
+     * @var string
+     */
+    private $IteratorTrait_index = null;
+    
+    /**
+     * Array of keys of the data set.
+     *
+     * @var array
+     */
+    private $IteratorTrait_keys = null;
+    
+    
+    
+    /**
+     * Return the current element.
+     *
+     * @return mixed
+     */
+    public function current()
+    {
+        return $this->valid() ? $this->DataProvider_DATA[$this->key()] : null;
+    }
+    
+    
+    
+    /**
+     * Return the key of the current element.
+     *
+     * @return mixed
+     */
+    public function key()
+    {
+        return static::valid() ? $this->IteratorTrait_keys[$this->IteratorTrait_index] : null;
+    }
+    
+    
+    
+    /**
+     * Move forward to next element.
+     *
+     * @return bool false if invalid
+     */
+    public function next()
+    {
+        $this->IteratorTrait_index++;
+        if (!$this->valid()) {
+            $this->IteratorTrait_index = null;
+        }
+        return $this->valid();
+    }
+    
+    
+    
+    /**
+     * Rewind the Iterator to the first element.
+     */
+    public function rewind()
+    {
+        $this->IteratorTrait_keys = array_keys($this->DataProvider_DATA);
+        sort($this->IteratorTrait_keys);
+        $this->IteratorTrait_index = 0;
+    }
+    
+    
+    
+    /**
+     * Checks if current position is valid.
+     *
+     * @return bool
+     */
+    public function valid(): bool
+    {
+        return ($this->IteratorTrait_index !== null)
+            && array_key_exists($this->IteratorTrait_index, $this->IteratorTrait_keys)
+            && array_key_exists($this->IteratorTrait_keys[$this->IteratorTrait_index], $this->DataProvider_DATA);
+    }
+}

classes/Components/I18n/Exception/LanguageNotInitializedException.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Exception;
+
+class LanguageNotInitializedException extends \RuntimeException
+{
+    
+}

classes/Components/I18n/Exception/UnsupportedLocaleStringException.php

@@ -0,0 +1,14 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Exception;
+
+class UnsupportedLocaleStringException extends \RuntimeException
+{
+    
+}

classes/Components/I18n/Iso3166.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+use Xentral\Components\I18n\Dataaccess\DataProvider;
+
+/**
+ * Country Codes - ISO 3166.
+ * Loads the data and holds the filtered (if desired) list.
+ *
+ * @see      https://www.iso.org/iso-3166-country-codes.html
+ * @see      DataProvider
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * @license  AGPL-3.0-only
+ */
+class Iso3166 extends DataProvider
+{
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataProvider::getOriginalData()
+     */
+    protected function getOriginalData(): array
+    {
+        return include(__DIR__ . '/data/Iso3166data.php');
+    }
+}

classes/Components/I18n/Iso3166/Filter/All.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+
+/**
+ * This filter returns all records from the data set (aka dummy filter).
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class All extends DataFilter implements DataFilterInterface
+{
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    function selectItem(&$key, &$val): bool
+    {
+        return true;
+    }
+}

classes/Components/I18n/Iso3166/Filter/CentralEurope.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Iso3166\Key;
+
+
+/**
+ * Applies a filter to only select central european countries.
+ *
+ * @see      Custom
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class CentralEurope extends Custom implements DataFilterInterface
+{
+    /**
+     * Countries in Europe.
+     *
+     * @var array
+     */
+    const CentralEurope_Countries = ['CHE', 'DEU', 'AUT', 'ITA', 'FRA', 'ESP', 'PRT', 'GBR'];
+    
+    
+    
+    /**
+     * Set predefined values.
+     */
+    public function __construct()
+    {
+        parent::__construct(static::CentralEurope_Countries, Key::ALPHA_3);
+    }
+}

classes/Components/I18n/Iso3166/Filter/ChangeKey.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+
+
+/**
+ * This filter can be used to change the main key
+ * of the data set.
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class ChangeKey extends DataFilter implements DataFilterInterface
+{
+    /**
+     * New key to use for the data set.
+     *
+     * @var string
+     */
+    private $ChangeKey_key = null;
+    
+    
+    
+    /**
+     * Initialize filter and set the new key.
+     *
+     * @param mixed $key
+     */
+    public function __construct($key)
+    {
+        $this->ChangeKey_key = $key;
+    }
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    protected function selectItem(&$key, &$val): bool
+    {
+        $key = $val[$this->ChangeKey_key];
+        return true;
+    }
+}

classes/Components/I18n/Iso3166/Filter/Custom.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+
+
+/**
+ * Apply a custom filter to the data set.
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class Custom extends DataFilter implements DataFilterInterface
+{
+    /**
+     * Array of wanted values.
+     *
+     * @var array
+     */
+    private $Custom_values = null;
+    
+    /**
+     * Key to check for the values in $this->Custom_values.
+     *
+     * @var string
+     */
+    private $Custom_key = null;
+    
+    
+    
+    /**
+     * Set values for filter.
+     *
+     * @param array $values
+     * @param mixed $key
+     */
+    public function __construct(array $values, $key)
+    {
+        $this->Custom_values = $values;
+        $this->Custom_key = $key;
+    }
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    protected function selectItem(&$key, &$val): bool
+    {
+        $needle = $val[$this->Custom_key];
+        return in_array($needle, $this->Custom_values);
+    }
+}

classes/Components/I18n/Iso3166/Filter/Europe.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Iso3166\Key;
+
+
+/**
+ * Applies a filter to only select european countries.
+ *
+ * @see      Custom
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class Europe extends Custom implements DataFilterInterface
+{
+    /**
+     * Set predefined values.
+     */
+    public function __construct()
+    {
+        parent::__construct(['150'], Key::REGION_CODE);
+    }
+}

classes/Components/I18n/Iso3166/Key.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166;
+
+
+/**
+ * Keys for the iso3166 list.
+ *
+ * @see      \Xentral\Components\I18n\Iso3166
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class Key/* extends Ruga_Enum*/
+{
+    /** Key: Alpha-2 code */
+    const ALPHA_2 = 'A2';
+    
+    /** Key: Alpha-3 code */
+    const ALPHA_3 = 'A3';
+    
+    /** Key: Numeric code */
+    const NUMERIC = 'NUM';
+    
+    /** Key: Top Level Domain */
+    const TLD = 'TLD';
+    
+    /** Key: Currency Code */
+    const CURRENCY_CODE = 'CURRENCY_CODE';
+    const TELEPHONE_CODE = 'TEL_CODE';
+    const REGION = 'REGION';
+    const REGION_CODE = 'REGION_CODE';
+    const SUBREGION = 'SUBREGION';
+    const SUBREGION_CODE = 'SUBREGION_CODE';
+    const INTERMEDIATEREGION = 'INTERMEDIATEREGION';
+    const INTERMEDIATEREGION_CODE = 'INTERMEDIATEREGION_CODE';
+    const NAME_eng = 'NAME_eng';
+    const NAME_fra = 'NAME_fra';
+    const NAME_deu = 'NAME_deu';
+    
+    
+    /** Key: Postal country name */
+    const POST = 'POST';
+    
+    
+    const DEFAULT = self::ALPHA_3;
+    
+    
+    protected static $fullnameMap = [
+        self::ALPHA_2 => 'ISO 3166 Alpha-2',
+        self::ALPHA_3 => 'ISO 3166 Alpha-3',
+        self::NUMERIC => 'ISO 3166 Numerisch',
+        self::TLD => 'Top Level Domain',
+        self::CURRENCY_CODE => 'Währung',
+        self::TELEPHONE_CODE => 'Landesvorwahl',
+        self::REGION => 'Region',
+        self::REGION_CODE => 'Region Code',
+        self::SUBREGION => 'Unter-Region',
+        self::SUBREGION_CODE => 'Unter-Region Code',
+        self::INTERMEDIATEREGION => 'Intermediate-Region',
+        self::INTERMEDIATEREGION_CODE => 'Intermediate-Region Code',
+        self::NAME_eng => 'Englische Bezeichnung',
+        self::NAME_fra => 'Französische Bezeichnung',
+        self::NAME_deu => 'Deutsche Bezeichnung',
+        
+        self::POST => 'Landesbezeichung Postadresse',
+    ];
+    
+    
+}
+

classes/Components/I18n/Iso3166/Name.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso3166;
+
+/**
+ * Names for the iso3166 list.
+ *
+ * @see      \Xentral\Components\I18n\Iso3166
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class Name/* extends Ruga_Enum */
+{
+    /** Englisch */
+    const ENG = 'NAME_eng';
+    /** Französisch */
+    const FRA = 'NAME_fra';
+    /** Deutsch */
+    const DEU = 'NAME_deu';
+    
+    
+    protected static $fullnameMap = [
+        self::ENG => 'Englische Bezeichnung',
+        self::FRA => 'Französische Bezeichnung',
+        self::DEU => 'Deutsche Bezeichnung',
+    ];
+}

classes/Components/I18n/Iso639.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+use Xentral\Components\I18n\Dataaccess\DataProvider;
+use Xentral\Components\I18n\Dataaccess\Exception\OutOfRangeException;
+
+/**
+ * Codes for the Representation of Names of Languages - ISO 639.
+ * Loads the data and holds the filtered (if desired) list.
+ *
+ * @see      https://www.iso.org/iso-639-language-codes.html
+ * @see      DataProvider
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class Iso639 extends DataProvider
+{
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataProvider::getOriginalData()
+     */
+    protected function getOriginalData(): array
+    {
+        return include(__DIR__ . '/data/Iso639data.php');
+    }
+    
+    
+    
+    /**
+     * Returns the field $desiredName from the record $id.
+     *
+     * @param mixed  $id
+     * @param string $desiredName
+     * @param null   $default
+     *
+     * @return string
+     */
+    public function find($id, $desiredName, $default = null): string
+    {
+        $id = strtolower($id);
+        try {
+            return $this->getString($id, $desiredName);
+        } catch (OutOfRangeException $e) {
+            try {
+                return (new \Xentral\Components\I18n\Iso639(
+                    (new \Xentral\Components\I18n\Iso639\Filter\All())
+                        ->then(new \Xentral\Components\I18n\Iso639\Filter\ChangeKey(\Xentral\Components\I18n\Iso639\Key::ALPHA_2))
+                ))->getString($id, $desiredName);
+            } catch (OutOfRangeException $e) {
+                try {
+                    $id = strtoupper($id);
+                    return (new \Xentral\Components\I18n\Iso639(
+                        (new \Xentral\Components\I18n\Iso639\Filter\All())
+                            ->then(new \Xentral\Components\I18n\Iso639\Filter\ChangeKey(\Xentral\Components\I18n\Iso639\Key::ONELETTER))
+                    ))->getString($id, $desiredName);
+                } catch (OutOfRangeException $e) {
+                    if ($default === null) {
+                        throw $e;
+                    } else {
+                        return $this->getString($default, $desiredName);
+                    }
+                }
+            }
+        }
+    }
+    
+}

classes/Components/I18n/Iso639/Filter/All.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+
+
+/**
+ * This filter returns all records from the data set (aka dummy filter).
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class All extends DataFilter implements DataFilterInterface
+{
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    function selectItem(&$key, &$val): bool
+    {
+        return true;
+    }
+}

classes/Components/I18n/Iso639/Filter/CentralEurope.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Iso639\Key;
+
+
+/**
+ * Applies a filter to only select central european countries.
+ *
+ * @see      Custom
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class CentralEurope extends Custom implements DataFilterInterface
+{
+    /**
+     * Countries in Europe.
+     *
+     * @var array
+     */
+    const CentralEurope_Languages = ['deu', 'fra', 'ita', 'roh', 'spa', 'por', 'eng'];
+    
+    
+    
+    /**
+     * Set predefined values.
+     */
+    public function __construct()
+    {
+        parent::__construct(static::CentralEurope_Languages, Key::ALPHA_3);
+    }
+}

classes/Components/I18n/Iso639/Filter/ChangeKey.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+
+
+/**
+ * This filter can be used to change the main key
+ * of the data set.
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class ChangeKey extends DataFilter implements DataFilterInterface
+{
+    /**
+     * New key to use for the data set.
+     *
+     * @var string
+     */
+    private $ChangeKey_key = null;
+    
+    
+    
+    /**
+     * Initialize filter and set the new key.
+     *
+     * @param mixed $key
+     */
+    public function __construct($key)
+    {
+        $this->ChangeKey_key = $key;
+    }
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    protected function selectItem(&$key, &$val): bool
+    {
+        $key = $val[$this->ChangeKey_key] ?? null;
+        return true;
+    }
+}

classes/Components/I18n/Iso639/Filter/Custom.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639\Filter;
+
+use Xentral\Components\I18n\Dataaccess\DataFilter;
+use Xentral\Components\I18n\Dataaccess\DataFilterInterface;
+
+
+/**
+ * Apply a custom filter to the data set.
+ *
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilter
+ * @see      \Xentral\Components\I18n\Dataaccess\DataFilterInterface
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+class Custom extends DataFilter implements DataFilterInterface
+{
+    /**
+     * Array of wanted values.
+     *
+     * @var array
+     */
+    private $Custom_values = null;
+    
+    /**
+     * Key to check for the values in $this->Custom_values.
+     *
+     * @var string
+     */
+    private $Custom_key = null;
+    
+    
+    
+    /**
+     * Set values for filter.
+     *
+     * @param array $values
+     * @param mixed $key
+     */
+    public function __construct(array $values, $key)
+    {
+        $this->Custom_values = $values;
+        $this->Custom_key = $key;
+    }
+    
+    
+    
+    /**
+     * {@inheritDoc}
+     * @see \Xentral\Components\I18n\Dataaccess\DataFilterInterface::selectItem()
+     */
+    protected function selectItem(&$key, &$val): bool
+    {
+        $needle = $val[$this->Custom_key];
+        return in_array($needle, $this->Custom_values);
+    }
+}

classes/Components/I18n/Iso639/Key.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639;
+
+
+/**
+ * Keys for the iso639 list.
+ *
+ * @see      \Xentral\Components\I18n\Iso639
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class Key/* extends Ruga_Enum*/
+{
+    /** Key: Alpha-2 code */
+    const ALPHA_2 = '639-1';
+    const ISO639_1 = '639-1';
+    
+    /** Key: Alpha-3 code */
+    const ALPHA_3 = '639-2';
+    const ISO639_2 = '639-2';
+    
+    /** Key: Top Level Domain */
+    const ONELETTER = '1L';
+    
+    /** Key: Name */
+    const NAME_eng = 'NAME_eng';
+    const NAME_fra = 'NAME_fra';
+    const NAME_deu = 'NAME_deu';
+    
+    
+    const DEFAULT = self::ALPHA_3;
+    
+    
+    protected static $fullnameMap = [
+        self::ALPHA_2 => 'ISO 639 Alpha-2',
+        self::ALPHA_3 => 'ISO 639 Alpha-3',
+        self::ONELETTER => 'ISO 639 Alpha-1',
+        self::NAME_eng => 'Englische Bezeichnung',
+        self::NAME_fra => 'Französische Bezeichnung',
+        self::NAME_deu => 'Deutsche Bezeichnung',
+    ];
+    
+    
+}
+

classes/Components/I18n/Iso639/Name.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n\Iso639;
+
+
+/**
+ * Names for the iso639 list.
+ *
+ * @see      \Xentral\Components\I18n\Iso639
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+abstract class Name/* extends Ruga_Enum */
+{
+    /** Englisch */
+    const ENG = 'NAME_eng';
+    /** Französisch */
+    const FRA = 'NAME_fra';
+    /** Deutsch */
+    const DEU = 'NAME_deu';
+    
+    
+    protected static $fullnameMap = [
+        self::ENG => 'Englische Bezeichnung',
+        self::FRA => 'Französische Bezeichnung',
+        self::DEU => 'Deutsche Bezeichnung',
+    ];
+}

classes/Components/I18n/Localization.php

@@ -0,0 +1,244 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+use Locale;
+use Xentral\Components\Http\Request;
+use Xentral\Components\Http\Session\Session;
+use Xentral\Components\I18n\Exception\LanguageNotInitializedException;
+use Xentral\Components\I18n\Exception\UnsupportedLocaleStringException;
+
+/**
+ * Provides a central service for localization.
+ *
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+final class Localization implements LocalizationInterface
+{
+    private array $config;
+    
+    private ?Request $request;
+    
+    private ?Session $session;
+    
+    private array $usersettings = [];
+    
+    private array $language = [];
+    
+    private array $locale = [];
+    
+    
+    
+    public function __construct(?Request $request, ?Session $session, array $usersettings = [], array $config = [])
+    {
+        $this->request = $request;
+        $this->session = $session;
+        $this->usersettings = $usersettings;
+        $this->config = $config;
+        $this->process();
+    }
+    
+    
+    
+    public function process()
+    {
+        // Hardcoded defaults if config is not available
+        $localeDefault = $this->config[Localization::LOCALE_DEFAULT] ?? 'de_DE';
+        $localeAttrName = $this->config[Localization::LOCALE_ATTRIBUTE_NAME] ?? 'locale';
+        $langDefault = $this->config[Localization::LANGUAGE_DEFAULT] ?? 'deu';
+        $langAttrName = $this->config[Localization::LANGUAGE_ATTRIBUTE_NAME] ?? 'language';
+        
+        $segmentName = 'i18n';
+        
+        // Get the locale from the session, if available
+        if ($this->session && ($locale = $this->session->getValue($segmentName, $localeAttrName))) {
+        } else {
+            // Get locale from request, fallback to the user's browser preference
+            if ($this->request) {
+                $locale = $this->request->attributes->get(
+                    $localeAttrName,
+                    Locale::acceptFromHttp(
+                        $this->request->getHeader('Accept-Language', $localeDefault)
+                    ) ?? $localeDefault
+                );
+            } else {
+                $locale = Locale::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? $localeDefault);
+            }
+        }
+        // Get locale from user
+        // This overrides all previous attempts to find a locale
+        if (array_key_exists('locale', $this->usersettings)) {
+            $locale = $this->usersettings['locale'];
+        }
+        // Get locale from query string
+        // This overrides all previous attempts to find a locale
+        if ($this->request) {
+            $locale = $this->request->getParam($localeAttrName, $locale ?? $localeDefault);
+        } else {
+            $locale = $_GET[$localeAttrName] ?? $locale ?? $localeDefault;
+        }
+        
+        
+        // Get the language from the session, if available
+        if ($this->session && ($language = $this->session->getValue($segmentName, $langAttrName))) {
+        } else {
+            // Get language from request, fallback to the current locale
+            if ($this->request) {
+                $language = $this->request->attributes->get($langAttrName, Locale::getPrimaryLanguage($locale));
+            } else {
+                $language = Locale::getPrimaryLanguage($locale);
+            }
+        }
+        // Get language from user
+        // This overrides all previous attempts to find a language
+        if (array_key_exists('language', $this->usersettings)) {
+            $language = $this->usersettings['language'];
+        }
+        // Get language from query string
+        // This overrides all previous attempts to find a language
+        if ($this->request) {
+            $language = $this->request->getParam($langAttrName, $language ?? $langDefault);
+        } else {
+            $language = $language ?? $langDefault;
+        }
+        
+        // Check language against the data from Iso639 (and normalize to 3-letter-code)
+        $language = (new Iso639())->find($language, Iso639\Key::DEFAULT, $langDefault);
+        
+        
+        // Store the locale and language to the LocalizationInterface
+        $this->setLanguage($language);
+        $this->setLocale($locale);
+        
+        // Store the locale and language to the session
+        if ($this->session) {
+            $this->session->setValue($segmentName, $localeAttrName, $locale);
+            $this->session->setValue($segmentName, $langAttrName, $language);
+        }
+        
+        // Store the locale and language as a request attribute
+        if ($this->request) {
+            $this->request->attributes->set($localeAttrName, $locale);
+            $this->request->attributes->set($langAttrName, $language);
+        }
+        
+        // Set the default locale
+        Locale::setDefault($locale);
+//        error_log(self::class . ": {$locale}");
+    }
+    
+    
+    
+    /**
+     * Set the language.
+     *
+     * @param string $language
+     */
+    public function setLanguage(string $language)
+    {
+        $this->language[Iso639\Key::DEFAULT] = (new \Xentral\Components\I18n\Iso639())->find(
+            $language,
+            Iso639\Key::DEFAULT
+        );
+    }
+    
+    
+    
+    /**
+     * Return the language string as defined by $key.
+     *
+     * @param string|null $key A constant from Iso639\Key
+     *
+     * @return string
+     */
+    public function getLanguage(string $key = null): string
+    {
+        if (!$key) {
+            $key = Iso639\Key::DEFAULT;
+        }
+        if (!($this->language[$key] ?? null)) {
+            if (!($this->language[Iso639\Key::DEFAULT] ?? null)) {
+                throw new LanguageNotInitializedException("Language is not set for key '" . Iso639\Key::DEFAULT . "'");
+            }
+            $this->language[$key] = (new \Xentral\Components\I18n\Iso639())->find(
+                $this->language[Iso639\Key::DEFAULT],
+                $key
+            );
+        }
+        return $this->language[$key];
+    }
+    
+    
+    
+    /**
+     * Set the locale.
+     *
+     * @param string $locale
+     */
+    public function setLocale(string $locale)
+    {
+        $parsedLocale = Locale::parseLocale($locale);
+        $locale = Locale::composeLocale([
+                                            'language' => $parsedLocale['language'],
+                                            'region' => $parsedLocale['region'],
+                                        ]);
+        
+        if(!$locale) throw new UnsupportedLocaleStringException("The given locale string '{$locale}' is not supported");
+        
+        $this->locale[Iso3166\Key::DEFAULT] = $locale;
+    }
+    
+    
+    
+    /**
+     * Return the locale string as defined by $key.
+     *
+     * @param string|null $key A constant from Iso3166\Key
+     *
+     * @return string
+     */
+    public function getLocale(string $key = null): string
+    {
+        return $this->locale[Iso3166\Key::DEFAULT];
+    }
+    
+    
+    
+    /**
+     * Return a new localization object using the given adresse array as source for language and region.
+     *
+     * @param array $adresse
+     *
+     * @return $this
+     */
+    public function withAdresse(array $adresse): self
+    {
+        $localization = clone $this;
+        
+        // Find language from address array or keep current language
+        if (!$lang = Bootstrap::findLanguage($adresse['sprache'])) {
+            $lang = Bootstrap::findLanguage($this->getLanguage());
+        }
+        if ($lang) {
+            $localization->setLanguage($lang[Iso639\Key::ALPHA_3]);
+        }
+        
+        // Find region from address or keep current region
+        if (!$region = Bootstrap::findRegion($adresse['land'])) {
+            $parsedLocale = Locale::parseLocale($this->getLocale());
+            $region = Bootstrap::findRegion($parsedLocale['region']);
+        }
+        if ($lang && $region) {
+            $localization->setLocale("{$lang[Iso639\Key::ALPHA_2]}_{$region[Iso3166\Key::ALPHA_2]}");
+        }
+        
+        return $localization;
+    }
+    
+}

classes/Components/I18n/LocalizationInterface.php

@@ -0,0 +1,62 @@
+<?php
+/*
+ * SPDX-FileCopyrightText: 2023 Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare(strict_types=1);
+
+namespace Xentral\Components\I18n;
+
+/**
+ * Interface LocalizationInterface
+ *
+ * @author   Roland Rusch, easy-smart solution GmbH <roland.rusch@easy-smart.ch>
+ */
+interface LocalizationInterface
+{
+    const LOCALE_DEFAULT = 'locale_default';
+    const LOCALE_ATTRIBUTE_NAME = 'locale_attr_name';
+    const LANGUAGE_DEFAULT = 'language_default';
+    const LANGUAGE_ATTRIBUTE_NAME = 'language_attr_name';
+    
+    
+    
+    /**
+     * Set the language.
+     *
+     * @param string $language
+     */
+    public function setLanguage(string $language);
+    
+    
+    
+    /**
+     * Return the language string as defined by $key.
+     *
+     * @param string|null $key A constant from Iso639\Key
+     *
+     * @return string
+     */
+    public function getLanguage(string $key = null): string;
+    
+    
+    
+    /**
+     * Set the locale.
+     *
+     * @param string $locale
+     */
+    public function setLocale(string $locale);
+    
+    
+    
+    /**
+     * Return the locale string as defined by $key.
+     *
+     * @param string|null $key A constant from Iso3166\Key
+     *
+     * @return string
+     */
+    public function getLocale(string $key = null): string;
+}

classes/Components/I18n/data/Iso639data.php

@@ -0,0 +1,159 @@
+<?php
+/*
+ * Data extracted from https://www.iso.org/iso-639-language-codes.html
+ */
+return [
+    
+    'aar' => [
+        '639-2' => 'aar',
+        '639-1' => 'aa',
+        'NAME_eng' => 'Afar',
+        'NAME_fra' => 'afar',
+        'NAME_deu' => 'Danakil-Sprache',
+    ],
+    'abk' => [
+        '639-2' => 'abk',
+        '639-1' => 'ab',
+        'NAME_eng' => 'Abkhazian',
+        'NAME_fra' => 'abkhaze',
+        'NAME_deu' => 'Abchasisch',
+    ],
+    'ace' => [
+        '639-2' => 'ace',
+        '639-1' => null,
+        'NAME_eng' => 'Achinese',
+        'NAME_fra' => 'aceh',
+        'NAME_deu' => 'Aceh-Sprache',
+    ],
+    'ach' => [
+        '639-2' => 'ach',
+        '639-1' => null,
+        'NAME_eng' => 'Acoli',
+        'NAME_fra' => 'acoli',
+        'NAME_deu' => 'Acholi-Sprache',
+    ],
+    'ada' => [
+        '639-2' => 'ada',
+        '639-1' => null,
+        'NAME_eng' => 'Adangme',
+        'NAME_fra' => 'adangme',
+        'NAME_deu' => 'Adangme-Sprache',
+    ],
+    'ady' => [
+        '639-2' => 'ady',
+        '639-1' => null,
+        'NAME_eng' => 'Adyghe',
+        'NAME_fra' => 'adyghé',
+        'NAME_deu' => 'Adygisch',
+    ],
+    'afa' => [
+        '639-2' => 'afa',
+        '639-1' => null,
+        'NAME_eng' => 'Afro-Asiatic languages',
+        'NAME_fra' => 'afro-asiatiques, langues',
+        'NAME_deu' => 'Hamitosemitische Sprachen (Andere)',
+    ],
+    'afh' => [
+        '639-2' => 'afh',
+        '639-1' => null,
+        'NAME_eng' => 'Afrihili',
+        'NAME_fra' => 'afrihili',
+        'NAME_deu' => 'Afrihili',
+    ],
+    'afr' => [
+        '639-2' => 'afr',
+        '639-1' => 'af',
+        'NAME_eng' => 'Afrikaans',
+        'NAME_fra' => 'afrikaans',
+        'NAME_deu' => 'Afrikaans',
+    ],
+    'ain' => [
+        '639-2' => 'ain',
+        '639-1' => null,
+        'NAME_eng' => 'Ainu',
+        'NAME_fra' => 'aïnou',
+        'NAME_deu' => 'Ainu-Sprache',
+    ],
+    'aka' => [
+        '639-2' => 'aka',
+        '639-1' => 'ak',
+        'NAME_eng' => 'Akan',
+        'NAME_fra' => 'akan',
+        'NAME_deu' => 'Akan-Sprache',
+    ],
+    'akk' => [
+        '639-2' => 'akk',
+        '639-1' => null,
+        'NAME_eng' => 'Akkadian',
+        'NAME_fra' => 'akkadien',
+        'NAME_deu' => 'Akkadisch',
+    ],
+    'sqi' => [
+        '639-2' => 'sqi',
+        '639-1' => 'sq',
+        'NAME_eng' => 'Albanian',
+        'NAME_fra' => 'albanais',
+        'NAME_deu' => 'Albanisch',
+        '639-2-B' => 'alb',
+    ],
+    
+    'deu' => [
+        '639-2' => 'deu',
+        '639-1' => 'de',
+        'NAME_eng' => 'German',
+        'NAME_fra' => 'allemand',
+        'NAME_deu' => 'Deutsch',
+        '639-2-B' => 'ger',
+        '1L' => 'D',
+    ],
+    'eng' => [
+        '639-2' => 'eng',
+        '639-1' => 'en',
+        'NAME_eng' => 'English',
+        'NAME_fra' => 'anglais',
+        'NAME_deu' => 'Englisch',
+        '1L' => 'E',
+    ],
+    'fra' => [
+        '639-2' => 'fra',
+        '639-1' => 'fr',
+        'NAME_eng' => 'French',
+        'NAME_fra' => 'français',
+        'NAME_deu' => 'Französisch',
+        '639-2-B' => 'fre',
+        '1L' => 'F',
+    ],
+    'ita' => [
+        '639-2' => 'ita',
+        '639-1' => 'it',
+        'NAME_eng' => 'Italian',
+        'NAME_fra' => 'italien',
+        'NAME_deu' => 'Italienisch',
+        '1L' => 'I',
+    ],
+    'spa' => [
+        '639-2' => 'spa',
+        '639-1' => 'es',
+        'NAME_eng' => 'Spanish',
+        'NAME_fra' => 'espagnol',
+        'NAME_deu' => 'Spanisch',
+    ],
+    'por' => [
+        '639-2' => 'por',
+        '639-1' => 'pt',
+        'NAME_eng' => 'Portuguese',
+        'NAME_fra' => 'portugais',
+        'NAME_deu' => 'Portugiesisch',
+    ],
+    'roh' => [
+        '639-2' => 'roh',
+        '639-1' => 'rm',
+        'NAME_eng' => 'Romansh',
+        'NAME_fra' => 'romanche',
+        'NAME_deu' => 'Rätoromanisch',
+    ],
+    'dut' => ['639-2' => 'dut', '639-1' => 'nl', 'NAME_eng' => 'Dutch', 'NAME_fra' => 'néerlandais', 'NAME_deu' => 'Niederländisch', 'NAME_deu_alt' => 'Holländisch'],
+    'swe' => ['639-2' => 'swe', '639-1' => 'sv', 'NAME_eng' => 'Swedish', 'NAME_fra' => 'suédois', 'NAME_deu' => 'Schwedisch'],
+    'dan' => ['639-2' => 'dan', '639-1' => 'da', 'NAME_eng' => 'Danish', 'NAME_fra' => 'danois', 'NAME_deu' => 'Dänisch'],
+    'nor' => ['639-2' => 'nor', '639-1' => 'no', 'NAME_eng' => 'Norwegian', 'NAME_fra' => 'norvégien', 'NAME_deu' => 'Norwegisch'],
+];

classes/Modules/Ticket/Task/TicketImportHelper.php

@@ -285,7 +285,6 @@ class TicketImportHelper
             tr.dsgvo AS `is_gdpr_relevant`,
             tr.prio AS `priority`,
             tr.persoenlich AS `is_private`,
-            tr.adresse,
             tr.warteschlange AS `queue_id`
         FROM `ticket_regeln` AS `tr`
         WHERE
@@ -465,7 +464,7 @@ class TicketImportHelper
                 $status = 'neu';
             }
 
-            $sql = "UPDATE `ticket` SET `dsgvo` = '".$rule['is_gdpr_relevant']."', `privat` = '".$rule['is_private']."', `prio` = '".$rule['priority']."',`adresse` = '".$rule['adresse']."', `warteschlange` = '".$rule['queue_id']."', `status` = '".$status."' WHERE `id` = '".$ticketId."'";
+            $sql = "UPDATE `ticket` SET `dsgvo` = '".$rule['is_gdpr_relevant']."', `privat` = '".$rule['is_private']."', `prio` = '".$rule['priority']."', `warteschlange` = '".$rule['queue_id']."', `status` = '".$status."' WHERE `id` = '".$ticketId."'";
 
             $this->logger->debug('ticket rule sql',['sql' => $sql]);
 

phpwf/plugins/class.stringcleaner.php

@@ -1,453 +1,451 @@
 <?php
-/*
-**** COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
-* 
-* Xentral (c) Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg, * Germany 2019
-*
-* This file is licensed under the Embedded Projects General Public License *Version 3.1. 
-*
-* You should have received a copy of this license from your vendor and/or *along with this file; If not, please visit www.wawision.de/Lizenzhinweis 
-* to obtain the text of the corresponding license version.  
-*
-**** END OF COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
+/*
+**** COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
+* 
+* Xentral (c) Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg, * Germany 2019
+*
+* This file is licensed under the Embedded Projects General Public License *Version 3.1. 
+*
+* You should have received a copy of this license from your vendor and/or *along with this file; If not, please visit www.wawision.de/Lizenzhinweis 
+* to obtain the text of the corresponding license version.  
+*
+**** END OF COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
 */
 ?>
-<?php
-
-  class StringCleaner
-  {
-    private $elements;
-    private $htmlpuriferconfig;
-    private $htmlpurifer;
-    private $ruleregexps;
-    /** @var Application */
-    private $app;
-
-    /**
-     * StringCleaner constructor.
-     *
-     * @param null|Application $app
-     */
-    public function __construct($app = null)
-    {
-      $this->app = $app;
-      if(class_exists('HTMLPurifier_Config')) {
-        $this->htmlpuriferconfig = HTMLPurifier_Config::createDefault();
-        $this->htmlpuriferconfig->set('Core.Encoding', 'UTF-8');
-        $this->htmlpuriferconfig->set('Attr.AllowedFrameTargets', ['_blank']); // Allow hyperlinks with target="_blank"
-        //$this->htmlpuriferconfig->set('HTML.AllowedElements', 'h1,h2,h3,h4,h5,h6,p,a,strong,em,ol,ul,li,img,param,div,br,form,label,fieldset,input,textarea,select,option');
-        $this->htmlpurifer = new HTMLPurifier($this->htmlpuriferconfig);
-      }
-      $this->elements = array('nohtml'=> array('ust_befreit','abweichendelieferadresse','bestellungsart','bearbeiter','datum','lieferdatum','name','anrede','partner','packstation_inhaber','packstation_station','packstation_ident','packstation_plz','packstation_ort','partnerid','kennen','ihrebestellnummer'
-                                        ,'abteilung','unterabteilung','ansprechpartner','adresszusatz','strasse','land','bundesstaat','plz','ort','versandart','internet','transaktionsnummer','vertrieb','zahlungsweise'
-                                        ,'lieferabteilung','lieferunterabteilung','lieferansprechpartner','lieferadresszusatz','lieferstrasse','lieferland','lieferbundesstaat','lieferplz','lieferort'
-                                        ,'bank_inhaber','bank_institut','bank_blz','bank_konto'
-                                        ,'email','telefon','telefax','ustid','partner','projekt','herstellernummer','ean','nummer','name_de','name_ean'),
-                          'nojs' => array('anabregstext','anabregstext_en','uebersicht_de','uebersicht_en','kurztext_de','kurztext_en','internebemerkung','internebezeichnung','freitext'));
-
-      $this->rulechecks = array('digit'=>'/^[0-9]+$/'
-                               ,'alpha'=>'/^[a-zA-Z]+$/'
-                               ,'alphadigit'=>'/^[0-9a-zA-Z]+$/'
-                               ,'username'=>'/^[0-9a-zA-Z\.\-]+$/'
-                               ,'space'=>'/^[\x20]+$/'
-                               ,'module'=>'/^[0-9a-zA-Z\_]$/'
-                               ,'password'=>'/^[^\s\n]{1}[^\n]{5}.*$/'
-                               ,'email'=>'/^[^@\s\x00-\x20]+@[^@\s\x00-\x20\.]+\.[^@\s\x00-\x20\.]+[^@\s\x00-\x20]*$/'
-                               );
-
-      $this->ruleregexps = array(
-                                 'digit'=>'/[^0-9]/'
-                                 ,'username'=>'/[^0-9a-zA-Z\.\-]/'
-                                 ,'alpha'=>'/[^a-zA-Z]/'
-                                 ,'alphadigits'=>'/[^0-9a-zA-Z]/'
-                                 ,'module'=>'/[^0-9a-zA-Z\_]/'
-                                 ,'moduleminus'=>'/[^0-9a-zA-Z\_\-]/'
-                                 ,'alphadigitsspecial'=>'/[^0-9a-zA-Z\_\.\(\)]/'
-                                 ,'base64'=>'/[^0-9a-zA-Z\=\+\-\_\/]/'
-                                );
-    }
-
-    function SyntaxByElement($key, $default = '')
-    {
-      foreach($this->elements as $type => $arr) {
-        if(in_array($key, $arr)) {
-          return $type;
-        }
-      }
-      return $default;
-    }
-
-    function CleanSQLReturn($value, $columnname, $default = '')
-    {
-      if($value == '' || is_numeric($value))
-      {
-        return $value;
-      }
-      if(in_array($columnname, array('nummer','name','kundennummer','bezeichnung','bezeichnunglieferant','lieferantennummer','mitarbeiternummer','name_de','name_en',
-                                     'kurzbezeichnung','abkuerzung',
-                                     'strasse','plz','ort','land','ansprechpartner','abteilung','unterabteilung',
-                                 'liefername','lieferstrasse','lieferplz','lieferort','lieferland','lieferansprechpartner','lieferabteilung','lieferunterabteilung'))){
-        return strip_tags($value);
-      }
-      if($default == 'xss_clean')
-      {
-        return $this->xss_clean($value, false);
-      }
-      if($this->htmlpurifer)
-      {
-        return $this->htmlpurifer->purify($value);
-      }
-      return $value;
-    }
-
-    function RuleCheck($string, $rule = null, &$found = false)
-    {
-      if(isset($this->rulechecks[$rule]))
-      {
-        $found = true;
-        return preg_match_all($this->rulechecks[$rule], $string, $dummy);
-      }
-      switch($rule)
-      {
-        case 'datum':
-          $found = true;
-
-          if(preg_match_all('/([0-9]+)\.([0-9]+)\.$/', $string, $matches))
-          {
-            $string = $matches[1][0].'.'.$matches[2][0].'.'.date('Y');
-          }
-
-          try {
-            if($x = new DateTime($string)) {
-              return $x->format('Y') > 0;
-            }
-          }
-          catch (Exception $e) {
-            return false;
-          }
-          return false;
-        break;
-      }
-    }
-
-    function CheckSQLHtml($sql)
-    {
-      $start = 0;
-      $len = strlen($sql);
-      $lvl = 0;
-      $col = 0;
-      $ret = array(0);
-      $instring = false;
-      for($i = $start; $i < $len; $i++)
-      {
-        $char = $sql[$i];
-        switch($char)
-        {
-          case "'":
-            if($instring)
-            {
-              if($sql[$i-1] != '\\')
-              {
-                $instring = false;
-              }
-            }else{
-              if($sql[$i-1] != '\\'){
-                $instring = true;
-              }
-            }
-          break;
-          case "(":
-            if($instring)
-            {
-
-            }else{
-              $lvl++;
-            }
-          break;
-          case ")":
-            if($instring)
-            {
-
-            }else{
-              $lvl--;
-            }
-          break;
-          case "<":
-            if($instring)
-            {
-              if(preg_match('/<[a-zA-Z]/',$char.$sql[$i+1]))
-              {
-                if($ret[$col] != 2)
-                {
-                  $ret[$col] = 1;
-                }
-              }
-            }
-          break;
-          case ',':
-            if($instring)
-            {
-
-            }else{
-              if($lvl == 0)
-              {
-                $col++;
-                $ret[$col] = 0;
-              }
-            }
-          break;
-          case 'o':
-          case 'O':
-            if($instring)
-            {
-              if($i < $len -4)
-              {
-                if(strtolower(substr($sql, $i, 2)) == 'on')
-                {
-                  if(preg_match('/^on[a-z]+(\s*)=/', substr($sql, $i)))
-                  {
-                    $ret[$col] = 2;
-                  }
-                }
-              }
-            }
-          break;
-          case 'F':
-          case 'f':
-            if($instring)
-            {
-
-            }else{
-              if($lvl == 0)
-              {
-                if($i < $len - 4)
-                {
-                  if(strtolower(substr($sql, $i, 4)) == 'from')
-                  {
-                    break 2;
-                  }
-                }
-              }
-            }
-          break;
-        }
-      }
-      $where = strripos($sql, 'where');
-      $restsql = substr($sql, $i, $where - $i);
-      if(preg_match('/<[a-zA-Z]/', $restsql))
-      {
-        if(preg_match('/on[a-z]+(\s*)=/',$restsql))
-        {
-          if($ret)
-          {
-            foreach($ret as $k => $v)
-            {
-              $ret[$k] = 2;
-            }
-          }
-        }else{
-          if($ret)
-          {
-            foreach($ret as $k => $v)
-            {
-              if($v != 2)
-              {
-                $ret[$k] = 1;
-              }
-            }
-          }
-        }
-      }
-      return $ret;
-    }
-
-    public function CleanString($string, $rule = null, &$found = false)
-    {
-      if(is_null($rule))
-      {
-        $rule = 'nothml';
-      }
-      switch($rule)
-      {
-        case 'email':
-          if($this->RuleCheck($string, $rule))
-          {
-            return $string;
-          }
-          return '';
-        break;
-        case 'nohtml':
-          $found = true;
-          if($string == '' || is_numeric($string))
-          {
-            return $string;
-          }
-          if(strpos($string,'<') === false)
-          {
-            return $string;
-          }
-          return strip_tags($string);
-        break;
-        case 'datum':
-          $found = true;
-          $string_ = $string;
-          if(preg_match_all('/([0-9]+)\.([0-9]+)\.$/', $string, $matches))
-          {
-            $string_ = $matches[1][0].'.'.$matches[2][0].'.'.date('Y');
-          }
-          try
-          {
-            if($x = new DateTime($string_))
-            {
-              if($x->format('Y') <= 0)
-              {
-                return '';
-              }
-              return $string;
-            }
-          } catch (Exception $e) {
-            return '';
-          }
-          return '';
-        break;
-        case 'xss_clean':
-          $found = true;
-          if($string == '' || is_numeric($string))
-          {
-            return $string;
-          }
-          if(strpos($string,'<') === false){
-            return $string;
-          }
-          return $this->xss_clean($string, false);
-        break;
-        case 'nojs':
-          $found = true;
-          if($string == '' || is_numeric($string))return $string;
-          if(strpos($string,'<') === false)return $string;
-          if($this->htmlpurifer)
-          {
-            return $this->htmlpurifer->purify($string);
-          }
-          return $this->xss_clean($string);
-        break;
-        case 'id':
-          $found = true;
-          if((String)$string === '')
-          {
-            return $string;
-          }
-          return (int)$string;
-        break;
-        case 'doppelid':
-          $found = true;
-          if((String)$string === '')
-          {
-            return $string;
-          }
-          $stringa = explode('-', $string, 2);
-          if(count($stringa) == 1)return (int)$stringa[0];
-          return ($stringa[0]===''?'':(int)$stringa[0]).'-'.(int)$stringa[1];
-        break;
-        case 'module':
-          $found = true;
-          return preg_replace ($this->ruleregexps[$rule], '' , $string);
-        break;
-        default:
-          if(isset($this->ruleregexps[$rule]))
-          {
-            $found = true;
-            return preg_replace ($this->ruleregexps[$rule], '' , $string);
-          }
-        break;
-      }
-      return $string;
-    }
-
-    public function xss_clean($data, $usepurify = true)
-    {
-      if($usepurify && !empty($this->htmlpurifer))
-      {
-        return $this->htmlpurifer->purify($data);
-      }
-      // Fix &entity\n;
-      $data = str_replace(array('&amp;','&lt;','&gt;'), array('&amp;amp;','&amp;lt;','&amp;gt;'), $data);
-      $data = preg_replace('/(&#*\w+)[\x00-\x20]+;/u', '$1;', $data);
-      $data = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $data);
-      $data = html_entity_decode($data, ENT_COMPAT, 'UTF-8');
-      return $data;
-      // Remove any attribute starting with "on" or xmlns
-      $data = preg_replace('#(<[^>]+?[\x00-\x20"\'])(?:on|xmlns)[^>]*+>#iu', '$1>', $data);
-
-      // Remove javascript: and vbscript: protocols
-      $data = preg_replace('#([a-z]*)[\x00-\x20]*=[\x00-\x20]*([`\'"]*)[\x00-\x20]*j[\x00-\x20]*a[\x00-\x20]*v[\x00-\x20]*a[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', '$1=$2nojavascript...', $data);
-      $data = preg_replace('#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*v[\x00-\x20]*b[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', '$1=$2novbscript...', $data);
-      $data = preg_replace('#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*-moz-binding[\x00-\x20]*:#u', '$1=$2nomozbinding...', $data);
-
-      // Only works in IE: <span style="width: expression(alert('Ping!'));"></span>
-      $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?expression[\x00-\x20]*\([^>]*+>#i', '$1>', $data);
-      $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?behaviour[\x00-\x20]*\([^>]*+>#i', '$1>', $data);
-      $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:*[^>]*+>#iu', '$1>', $data);
-
-      // Remove namespaced elements (we do not need them)
-      $data = preg_replace('#</*\w+:\w[^>]*+>#i', '', $data);
-
-      do
-      {
-          // Remove really unwanted tags
-          $old_data = $data;
-          $data = preg_replace('#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*+>#i', '', $data);
-      }
-      while ($old_data !== $data);
-
-      return $data;
-    }
-
-    function XMLArray_clean(&$xml, $lvl = 0)
-    {
-      if(is_string($xml))
-      {
-
-      }elseif(is_array($xml))
-      {
-        if(count($xml) > 0)
-        {
-          foreach($xml as $k => $v)
-          {
-            if(is_string($v))
-            {
-              $xml[$k] = $this->CleanString($v, $this->SyntaxByElement($k,'nojs'));
-            }
-            if($lvl < 10)
-            {
-              $this->XMLArray_clean($v, $lvl + 1);
-            }
-          }
-        }
-      }elseif(is_object($xml))
-      {
-        $xml = (array) $xml;
-        if(count($xml) > 0)
-        {
-          foreach($xml as $k => $v)
-          {
-            $v = (array) $v;
-            if(count($v) > 0)
-            {
-              if($lvl < 10)
-              {
-                $this->XMLArray_clean($v, $lvl + 1);
-              }
-            }elseif((String)$v != '')
-            {
-              if(isset($xml->$k))
-              {
-                //$xml->$k = $this->CleanString($v, $this->SyntaxByElement($k,'nojs'));
-              }
-            }
-          }
-        }
-      }
-      return $xml;
-    }
-  }
+<?php
+
+  class StringCleaner
+  {
+    private $elements;
+    private $htmlpuriferconfig;
+    private $htmlpurifer;
+    private $ruleregexps;
+    /** @var Application */
+    private $app;
+
+    /**
+     * StringCleaner constructor.
+     *
+     * @param null|Application $app
+     */
+    public function __construct($app = null)
+    {
+      $this->app = $app;
+      if(class_exists('HTMLPurifier_Config')) {
+        $this->htmlpuriferconfig = HTMLPurifier_Config::createDefault();
+        $this->htmlpuriferconfig->set('Core.Encoding', 'UTF-8');
+        $this->htmlpuriferconfig->set('Attr.AllowedFrameTargets', ['_blank']); // Allow hyperlinks with target="_blank"
+        //$this->htmlpuriferconfig->set('HTML.AllowedElements', 'h1,h2,h3,h4,h5,h6,p,a,strong,em,ol,ul,li,img,param,div,br,form,label,fieldset,input,textarea,select,option');
+        $this->htmlpurifer = new HTMLPurifier($this->htmlpuriferconfig);
+      }
+      $this->elements = array('nohtml'=> array('ust_befreit','abweichendelieferadresse','bestellungsart','bearbeiter','datum','lieferdatum','name','anrede','partner','packstation_inhaber','packstation_station','packstation_ident','packstation_plz','packstation_ort','partnerid','kennen','ihrebestellnummer'
+                                        ,'abteilung','unterabteilung','ansprechpartner','adresszusatz','strasse','land','bundesstaat','plz','ort','versandart','internet','transaktionsnummer','vertrieb','zahlungsweise'
+                                        ,'lieferabteilung','lieferunterabteilung','lieferansprechpartner','lieferadresszusatz','lieferstrasse','lieferland','lieferbundesstaat','lieferplz','lieferort'
+                                        ,'bank_inhaber','bank_institut','bank_blz','bank_konto'
+                                        ,'email','telefon','telefax','ustid','partner','projekt','herstellernummer','ean','nummer','name_de','name_ean'),
+                          'nojs' => array('anabregstext','anabregstext_en','uebersicht_de','uebersicht_en','kurztext_de','kurztext_en','internebemerkung','internebezeichnung','freitext'));
+
+      $this->rulechecks = array('digit'=>'/^[0-9]+$/'
+                               ,'alpha'=>'/^[a-zA-Z]+$/'
+                               ,'alphadigit'=>'/^[0-9a-zA-Z]+$/'
+                               ,'username'=>'/^[0-9a-zA-Z\.\-]+$/'
+                               ,'space'=>'/^[\x20]+$/'
+                               ,'module'=>'/^[0-9a-zA-Z\_]$/'
+                               ,'password'=>'/^[^\s\n]{1}[^\n]{5}.*$/'
+                               ,'email'=>'/^[^@\s\x00-\x20]+@[^@\s\x00-\x20\.]+\.[^@\s\x00-\x20\.]+[^@\s\x00-\x20]*$/'
+                               );
+
+      $this->ruleregexps = array(
+                                 'digit'=>'/[^0-9]/'
+                                 ,'username'=>'/[^0-9a-zA-Z\.\-]/'
+                                 ,'alpha'=>'/[^a-zA-Z]/'
+                                 ,'alphadigits'=>'/[^0-9a-zA-Z]/'
+                                 ,'module'=>'/[^0-9a-zA-Z\_]/'
+                                 ,'moduleminus'=>'/[^0-9a-zA-Z\_\-]/'
+                                 ,'alphadigitsspecial'=>'/[^0-9a-zA-Z\_\.\(\)]/'
+                                 ,'base64'=>'/[^0-9a-zA-Z\=\+\-\_\/]/'
+                                );
+    }
+
+    function SyntaxByElement($key, $default = '')
+    {
+      foreach($this->elements as $type => $arr) {
+        if(in_array($key, $arr)) {
+          return $type;
+        }
+      }
+      return $default;
+    }
+
+    function CleanSQLReturn($value, $columnname, $default = '')
+    {
+      if($value == '' || is_numeric($value))
+      {
+        return $value;
+      }
+      if(in_array($columnname, array('nummer','name','kundennummer','bezeichnung','bezeichnunglieferant','lieferantennummer','mitarbeiternummer','name_de','name_en',
+                                     'kurzbezeichnung','abkuerzung',
+                                     'strasse','plz','ort','land','ansprechpartner','abteilung','unterabteilung',
+                                 'liefername','lieferstrasse','lieferplz','lieferort','lieferland','lieferansprechpartner','lieferabteilung','lieferunterabteilung'))){
+        return strip_tags($value);
+      }
+      if($default == 'xss_clean')
+      {
+        return $this->xss_clean($value, false);
+      }
+      if($this->htmlpurifer)
+      {
+        return $this->htmlpurifer->purify($value);
+      }
+      return $value;
+    }
+
+    function RuleCheck($string, $rule = null, &$found = false)
+    {
+      if(isset($this->rulechecks[$rule]))
+      {
+        $found = true;
+        return preg_match_all($this->rulechecks[$rule], $string, $dummy);
+      }
+      switch($rule)
+      {
+        case 'datum':
+          $found = true;
+
+          if(preg_match_all('/([0-9]+)\.([0-9]+)\.$/', $string, $matches))
+          {
+            $string = $matches[1][0].'.'.$matches[2][0].'.'.date('Y');
+          }
+
+          try {
+            if($x = new DateTime($string)) {
+              return $x->format('Y') > 0;
+            }
+          }
+          catch (Exception $e) {
+            return false;
+          }
+          return false;
+        break;
+      }
+    }
+
+    function CheckSQLHtml($sql)
+    {
+      $start = 0;
+      $len = strlen($sql);
+      $lvl = 0;
+      $col = 0;
+      $ret = array(0);
+      $instring = false;
+      for($i = $start; $i < $len; $i++)
+      {
+        $char = $sql[$i];
+        switch($char)
+        {
+          case "'":
+            if($instring)
+            {
+              if($sql[$i-1] != '\\')
+              {
+                $instring = false;
+              }
+            }else{
+              if($sql[$i-1] != '\\'){
+                $instring = true;
+              }
+            }
+          break;
+          case "(":
+            if($instring)
+            {
+
+            }else{
+              $lvl++;
+            }
+          break;
+          case ")":
+            if($instring)
+            {
+
+            }else{
+              $lvl--;
+            }
+          break;
+          case "<":
+            if($instring)
+            {
+              if(preg_match('/<[a-zA-Z]/',$char.$sql[$i+1]))
+              {
+                if($ret[$col] != 2)
+                {
+                  $ret[$col] = 1;
+                }
+              }
+            }
+          break;
+          case ',':
+            if($instring)
+            {
+
+            }else{
+              if($lvl == 0)
+              {
+                $col++;
+                $ret[$col] = 0;
+              }
+            }
+          break;
+          case 'o':
+          case 'O':
+            if($instring)
+            {
+              if($i < $len -4)
+              {
+                if(strtolower(substr($sql, $i, 2)) == 'on')
+                {
+                  if(preg_match('/^on[a-z]+(\s*)=/', substr($sql, $i)))
+                  {
+                    $ret[$col] = 2;
+                  }
+                }
+              }
+            }
+          break;
+          case 'F':
+          case 'f':
+            if($instring)
+            {
+
+            }else{
+              if($lvl == 0)
+              {
+                if($i < $len - 4)
+                {
+                  if(strtolower(substr($sql, $i, 4)) == 'from')
+                  {
+                    break 2;
+                  }
+                }
+              }
+            }
+          break;
+        }
+      }
+      $where = strripos($sql, 'where');
+      $restsql = substr($sql, $i, $where - $i);
+      if(preg_match('/<[a-zA-Z]/', $restsql))
+      {
+        if(preg_match('/on[a-z]+(\s*)=/',$restsql))
+        {
+          if($ret)
+          {
+            foreach($ret as $k => $v)
+            {
+              $ret[$k] = 2;
+            }
+          }
+        }else{
+          if($ret)
+          {
+            foreach($ret as $k => $v)
+            {
+              if($v != 2)
+              {
+                $ret[$k] = 1;
+              }
+            }
+          }
+        }
+      }
+      return $ret;
+    }
+
+    public function CleanString($string, $rule = null, &$found = false)
+    {
+      if(is_null($rule))
+      {
+        $rule = 'nothml';
+      }
+      switch($rule)
+      {
+        case 'email':
+          if($this->RuleCheck($string, $rule))
+          {
+            return $string;
+          }
+          return '';
+        break;
+        case 'nohtml':
+          $found = true;
+          if($string == '' || is_numeric($string))
+          {
+            return $string;
+          }
+          if(strpos($string,'<') === false)
+          {
+            return $string;
+          }
+          return strip_tags($string);
+        break;
+        case 'datum':
+          $found = true;
+          $string_ = $string;
+          if(preg_match_all('/([0-9]+)\.([0-9]+)\.$/', $string, $matches))
+          {
+            $string_ = $matches[1][0].'.'.$matches[2][0].'.'.date('Y');
+          }
+          try
+          {
+            if($x = new DateTime($string_))
+            {
+              if($x->format('Y') <= 0)
+              {
+                return '';
+              }
+              return $string;
+            }
+          } catch (Exception $e) {
+            return '';
+          }
+          return '';
+        break;
+        case 'xss_clean':
+          $found = true;
+          if($string == '' || is_numeric($string))
+          {
+            return $string;
+          }
+          if(strpos($string,'<') === false){
+            return $string;
+          }
+          return $this->xss_clean($string, false);
+        break;
+        case 'nojs':
+          $found = true;
+          if($string == '' || is_numeric($string))return $string;
+          if(strpos($string,'<') === false)return $string;
+          if($this->htmlpurifer)
+          {
+            return $this->htmlpurifer->purify($string);
+          }
+          return $this->xss_clean($string);
+        break;
+        case 'id':
+          $found = true;
+          if((String)$string === '')
+          {
+            return $string;
+          }
+          return (int)$string;
+        break;
+        case 'doppelid':
+          $found = true;
+          if((String)$string === '')
+          {
+            return $string;
+          }
+          $stringa = explode('-', $string, 2);
+          if(count($stringa) == 1)return (int)$stringa[0];
+          return ($stringa[0]===''?'':(int)$stringa[0]).'-'.(int)$stringa[1];
+        break;
+        case 'module':
+          $found = true;
+          return preg_replace ($this->ruleregexps[$rule], '' , $string);
+        break;
+        default:
+          if(isset($this->ruleregexps[$rule]))
+          {
+            $found = true;
+            return preg_replace ($this->ruleregexps[$rule], '' , $string);
+          }
+        break;
+      }
+      return $string;
+    }
+
+    public function xss_clean($data, $usepurify = true)
+    {
+      if($usepurify && !empty($this->htmlpurifer))
+      {
+        return $this->htmlpurifer->purify($data);
+      }
+      // Fix &entity\n;
+      $data = str_replace(array('&amp;','&lt;','&gt;'), array('&amp;amp;','&amp;lt;','&amp;gt;'), $data);
+      $data = preg_replace('/(&#*\w+)[\x00-\x20]+;/u', '$1;', $data);
+      $data = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $data);
+      $data = html_entity_decode($data, ENT_COMPAT, 'UTF-8');
+      return $data;
+      // Remove any attribute starting with "on" or xmlns
+      $data = preg_replace('#(<[^>]+?[\x00-\x20"\'])(?:on|xmlns)[^>]*+>#iu', '$1>', $data);
+
+      // Remove javascript: and vbscript: protocols
+      $data = preg_replace('#([a-z]*)[\x00-\x20]*=[\x00-\x20]*([`\'"]*)[\x00-\x20]*j[\x00-\x20]*a[\x00-\x20]*v[\x00-\x20]*a[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', '$1=$2nojavascript...', $data);
+      $data = preg_replace('#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*v[\x00-\x20]*b[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', '$1=$2novbscript...', $data);
+      $data = preg_replace('#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*-moz-binding[\x00-\x20]*:#u', '$1=$2nomozbinding...', $data);
+
+      // Only works in IE: <span style="width: expression(alert('Ping!'));"></span>
+      $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?expression[\x00-\x20]*\([^>]*+>#i', '$1>', $data);
+      $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?behaviour[\x00-\x20]*\([^>]*+>#i', '$1>', $data);
+      $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:*[^>]*+>#iu', '$1>', $data);
+
+      // Remove namespaced elements (we do not need them)
+      $data = preg_replace('#</*\w+:\w[^>]*+>#i', '', $data);
+
+      do
+      {
+          // Remove really unwanted tags
+          $old_data = $data;
+          $data = preg_replace('#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*+>#i', '', $data);
+      }
+      while ($old_data !== $data);
+
+      return $data;
+    }
+
+    function XMLArray_clean(&$xml, $lvl = 0)
+    {
+      if(is_string($xml))
+      {
+
+      }elseif(is_array($xml))
+      {
+        if(count($xml) > 0)
+        {
+          foreach($xml as $k => $v)
+          {
+            if(is_string($v))
+            {
+              $xml[$k] = $this->CleanString($v, $this->SyntaxByElement($k,'nojs'));
+            }
+            if($lvl < 10)
+            {
+              $this->XMLArray_clean($v, $lvl + 1);
+            }
+          }
+        }
+      }elseif(is_object($xml))
+      {
+        if(count($xml) > 0)
+        {
+          foreach($xml as $k => $v)
+          {
+            if(count($v) > 0)
+            {
+              if($lvl < 10)
+              {
+                $this->XMLArray_clean($v, $lvl + 1);
+              }
+            }elseif((String)$v != '')
+            {
+              if(isset($xml->$k))
+              {
+                //$xml->$k = $this->CleanString($v, $this->SyntaxByElement($k,'nojs'));
+              }
+            }
+          }
+        }
+      }
+      return $xml;
+    }
+  }

phpwf/plugins/class.yui.php

@@ -28,15 +28,6 @@ class YUI {
     $this->app = $app;
   }
 
-  function dateien_module_objekt_map($module) : string {
-    $dateien_module_objekt_map_array = array(
-        'adresse' => 'adressen',
-        'ticket'  => 'ticket_header' 
-    );
-
-    return (isset($dateien_module_objekt_map_array[$module]) ? $dateien_module_objekt_map_array[$module] : $module);
-  }
-
   function PasswordCheck($passwordFieldID, $repassFieldID, $accountNameFieldID, $submitButtonID, $extra = ''){
         $this->app->Tpl->Add('JQUERYREADY', "
                 function checkPassword(){
@@ -2587,19 +2578,11 @@ class YUI {
                 if(CHAR_LENGTH(b.bezeichnung)>" . $this->app->erp->MaxArtikelbezeichnung() . ",CONCAT(SUBSTR(b.bezeichnung,1," . $this->app->erp->MaxArtikelbezeichnung() . "),'...'),b.bezeichnung))
             ) $erweiterte_ansicht)
             as Artikel,
-            p.abkuerzung as projekt,
-            b.nummer as nummer,
-            DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum,
-            trim(b.menge)+0 as menge,
-            ".$this->FormatPreis($preiscell)." as preis,
-            b.waehrung,
-            ".$this->FormatPreis('b.rabatt')." as rabatt,";
 
-            if ($this->app->erp->RechteVorhanden('auftrag','einkaufspreise')) {
-                $sql .= $this->FormatPreis('einkaufspreis')." as einkaufspreis,
-                        CONCAT(".$this->app->erp->FormatPreis("ROUND(deckungsbeitrag*100,2)",2).",'%') AS DB,
-                        ";
-            }             
+
+
+               p.abkuerzung as projekt, b.nummer as nummer, DATE_FORMAT(lieferdatum,'%d.%m.%Y') as lieferdatum, trim(b.menge)+0 as menge, ".$this->FormatPreis($preiscell)." as preis,b.waehrung, ".$this->FormatPreis('b.rabatt')." as rabatt, ";
+        
                
         $sql .= "b.id as id
                  FROM $table b
@@ -3631,121 +3614,6 @@ class YUI {
             '</td></tr></table>')";
     }
 
-    function IconsSQL_versandpaket() {
-/*
-    status:
-        neu -> 
-   
-    Lagergo
-    lagergo_stop
-    lagerstop
-
-    Schein
-    summe_go
-    summe_stop
-
-    Auto
-    liefersperrego
-    liefersperrestop
-
-    marke
-    portogo
-    portostop
-
-    produktion_usn_gut
-    storno*/
-    
-
-        $lieferschein_kein = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_stop.png\" title=\"Kein Lieferschein\" border=\"0\" style=\"margin-right:1px\">";
-        $lieferschein_ohne_pos = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_go.png\" title=\"Lieferschein ohne Positionen\" border=\"0\" style=\"margin-right:1px\">";
-        $lieferschein_voll = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo.png\" title=\"Lieferschein vollst&auml;ndig\" border=\"0\" style=\"margin-right:1px\">";
-        $lieferschein_teil = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo_teil.png\" title=\"Lieferschein teilweise\" border=\"0\" style=\"margin-right:1px\">";
-
-        $versendet = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperrego.png\" title=\"Versendet\" border=\"0\" style=\"margin-right:1px\">";
-        $versendet_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperrestop.png\" title=\"Nicht versendet\" border=\"0\" style=\"margin-right:1px\">";
-
-        $paketmarke = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/portogo.png\" style=\"margin-right:1px\" title=\"Paketmarke\" border=\"0\">";
-        $paketmarke_keine = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/portostop.png\" style=\"margin-right:1px\" title=\"Keine Paketmarke\" border=\"0\">";
-
-        $ausgeliefert = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery_ok.png\" style=\"margin-right:1px\" title=\"Ausgeliefert\" border=\"0\">";
-        $ausgeliefert_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery.png\" style=\"margin-right:1px\" title=\"Nicht ausgeliefert\" border=\"0\">";
-
-        $storno = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/storno.png\" style=\"margin-right:1px\" title=\"Storniert\" border=\"0\">";
-
-        for ($z = 0;$z < 4;$z++) {
-            $abgeschlossen .= $ausgeliefert; 
-            $storniert .= $storno; 
-        }
-
-        return "CONCAT('<table><tr><td nowrap>',
-            CASE 
-                WHEN status = 'storniert' THEN '$storniert'
-            ELSE CONCAT(                                
-                CASE 
-                    WHEN lieferscheine <> '' AND vmenge = lmenge THEN '$lieferschein_voll'
-                    WHEN lieferschein_ohne_pos <> '' AND vmenge IS NULL THEN '$lieferschein_ohne_pos'
-                    WHEN lieferscheine <> '' THEN '$lieferschein_teil'
-                ELSE 
-                    '$lieferschein_kein'
-                END,
-                CASE 
-                    WHEN tracking <> '' THEN '$paketmarke'
-                ELSE 
-                    '$paketmarke_keine'
-                END,
-                CASE 
-                    WHEN status = 'versendet' THEN '$versendet'
-                    WHEN status = 'abgeschlossen' THEN '$versendet'
-                ELSE 
-                    '$versendet_nicht'
-                END,
-                CASE 
-                    WHEN status = 'abgeschlossen' THEN '$ausgeliefert'
-                ELSE 
-                    '$ausgeliefert_nicht'
-                END
-            )
-            END,
-            '</td></tr></table>')";
-    }
-    function IconsSQL_lieferung() {
-
-        $lieferschein_kein = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagerstop.png\" title=\"Keine Artikel in Versandpaketen\" border=\"0\" style=\"margin-right:1px\">";
-        $lieferschein_ohne_pos = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/summe_go.png\" title=\"Lieferschein ohne Positionen\" border=\"0\" style=\"margin-right:1px\">";
-        $lieferschein_voll = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo.png\" title=\"Artikel vollst&auml;ndig in Versandpaketen\" border=\"0\" style=\"margin-right:1px\">";
-        $lieferschein_teil = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/lagergo_stop.png\" title=\"Artikel teilweise in Versandpaketen\" border=\"0\" style=\"margin-right:1px\">";
-
-        $versendet = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperrego.png\" title=\"Versendet\" border=\"0\" style=\"margin-right:1px\">";
-        $versendet_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperrestop.png\" title=\"Nicht versendet\" border=\"0\" style=\"margin-right:1px\">";
-        $versendet_teil = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/liefersperregostop.png\" title=\"Teilweise versendet\" border=\"0\" style=\"margin-right:1px\">";
-
-        $ausgeliefert = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery_ok.png\" style=\"margin-right:1px\" title=\"Ausgeliefert\" border=\"0\">";
-        $ausgeliefert_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery.png\" style=\"margin-right:1px\" title=\"Nicht ausgeliefert\" border=\"0\">";
-        $ausgeliefert_teil = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery_pending.png\" style=\"margin-right:1px\" title=\"Teilweise ausgeliefert\" border=\"0\">";
-
-        $storno = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/storno.png\" style=\"margin-right:1px\" title=\"Storniert\" border=\"0\">";
-
-        return "CONCAT(
-                '<table><tr><td nowrap>',
-                CASE 
-                    WHEN vmenge >= lmenge THEN '$lieferschein_voll'
-                    WHEN vmenge < lmenge AND vmenge <> 0 THEN '$lieferschein_teil'
-                    ELSE '$lieferschein_kein'
-                END,
-                CASE 
-                    WHEN alle_abgeschlossen THEN '$versendet'
-                    WHEN alle_versendet THEN '$versendet'
-                    WHEN eins_versendet THEN '$versendet_teil'
-                    ELSE '$versendet_nicht'
-                END,
-                CASE 
-                    WHEN alle_abgeschlossen THEN '$ausgeliefert'
-                    WHEN eins_abgeschlossen THEN '$ausgeliefert_teil'
-                    ELSE '$ausgeliefert_nicht'
-                END,
-                '</td></tr></table>')";
-    }
-
   function TablePositionSearch($parsetarget, $name, $callback = "show", $gener) {
 
     $id = $this->app->Secure->GetGET("id");
@@ -4083,7 +3951,6 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
         $allowed['wiki'] = array('dateien');
         $allowed['geschaeftsbrief_vorlagen'] = array('dateien');
         $allowed['kasse'] = array('dateien');
-        $allowed['ticket'] = array('dateien');
 
         $id = $this->app->Secure->GetGET("id");
         $sid = $this->app->Secure->GetGET("sid");
@@ -4092,8 +3959,13 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
         }
 
         parse_str(parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY), $queries);
+        switch($queries['module'])
+        {
+          case "adresse": $objekt="adressen"; break;
+          default: $objekt=$queries['module'];
+        }
 
-        $objekt = $this->dateien_module_objekt_map($queries['module']);
+        //if(!ctype_alpha($objekt))$objekt="";
 
         if(!preg_match('/[A-Za-z_]/', $objekt)) {
           $objekt='';
@@ -5830,8 +5702,12 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
           }
         }
         // Fester filter
+        $more_data6 = $this->app->Secure->GetGET("more_data6");
+        $more_data7 = $this->app->Secure->GetGET("more_data7");
+        $more_data8 = $this->app->Secure->GetGET("more_data8");
+        
         $more_data4 = $this->app->Secure->GetGET("more_data4");
-/*
+
         $versandjoin = "";
         if(isset($parameter['offenversandzentrum'])  && !empty($parameter['offenversandzentrum']))
         {
@@ -5865,8 +5741,8 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
         }
         
         if($versandjoin)$sql .= $versandjoin;
-        */
-       
+        
+        
         if($more_data4 || (isset($parameter['ohnerechnung']) && !empty($parameter['ohnerechnung']))) {
 
             $paramsArray[] = " l.status !='storniert' ";
@@ -5941,21 +5817,6 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
         if ($more_data3 == 1) $subwhere[] = " l.lieferantenretoure=1 ";
 
         // ENDE EXTRA more
-        $more_data6 = $this->app->Secure->GetGET("more_data6");
-        $more_data7 = $this->app->Secure->GetGET("more_data7"); 
-        $more_data8 = $this->app->Secure->GetGET("more_data8"); 
-        
-        if ($more_data6) {            
-            $subwhere[] = "l.versand_status = 3";
-        }
-        if ($more_data7) {
-            $subwhere[] = "l.versand_status = 1";
-        }
-        if ($more_data8) {
-            $subwhere[] = "l.versand_status IN (2,3)";
-        }
-
-
         for ($j = 0;$j < (empty($subwhere)?0:count($subwhere));$j++) $tmp.= " AND " . $subwhere[$j];
         $where = " l.id!='' AND l.status!='angelegt' $tmp " . $this->app->erp->ProjektRechte('p.id', true, 'l.vertriebid');
 
@@ -12247,6 +12108,9 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
     </tr>
     </tfoot>
     </table></div>
+    <br>
+    <br>
+    <br>
     ');
     
         if((empty($disableautosavefilter)) && $this->anzusersaves < 2) {
@@ -14072,7 +13936,11 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
         $sid = (int)$this->app->Secure->GetPOST("sid");
         $sort = $this->app->DB->Select("SELECT sort FROM datei_stichwoerter WHERE id = '$sid' LIMIT 1");
         $id = (int)$this->app->Secure->GetGET("id");
-        $objekt = $this->dateien_module_objekt_map($module);
+        switch($module)
+        {
+          case "adresse": $objekt="adressen"; break;
+          default: $objekt=$module;
+        }
 
         if(!preg_match('/[A-Za-z_]/', $objekt))$objekt="";
         $parameter=$id;
@@ -14101,7 +13969,11 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
         $sid = (int)$this->app->Secure->GetPOST("sid");
         $sort = $this->app->DB->Select("SELECT sort FROM datei_stichwoerter WHERE id = '$sid' LIMIT 1");
         $id = (int)$this->app->Secure->GetGET("id");
-        $objekt = $this->dateien_module_objekt_map($module);
+        switch($module)
+        {
+          case "adresse": $objekt="adressen"; break;
+          default: $objekt=$module;
+        }
 
         if(!preg_match('/[A-Za-z_]/', $objekt))$objekt="";
         $parameter=$id;
@@ -14200,7 +14072,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
           $this->app->Tpl->Add('MESSAGE','<div class="error">Keine Dateien ausgew&auml;hlt!</div>');
         }else{
           $objekt = $this->app->Secure->GetGET('module');
-          $objekt = $this->dateien_module_objekt_map($objekt);
+          if($objekt == 'adresse')$objekt = 'adressen';          
           $parameter = (int)$this->app->Secure->GetGET('id');
           $alledateien = $this->app->DB->SelectArr("SELECT  v.datei, v.id FROM 
               datei d INNER JOIN datei_stichwoerter s ON d.id=s.datei INNER JOIN datei_version v ON v.datei=d.id WHERE s.objekt LIKE '$objekt' AND s.parameter='$parameter' AND d.geloescht=0 ");         
@@ -14267,7 +14139,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
           $this->app->Tpl->Add('MESSAGE','<div class="error">Keine Dateien ausgew&auml;hlt!</div>');
         }else{
           $objekt = $this->app->Secure->GetGET('module');
-          $objekt = $this->dateien_module_objekt_map($objekt);
+          if($objekt == 'adresse')$objekt = 'adressen';
           $typmodul = $this->app->Secure->GetPOST('typ');
           if($objekt == 'dateien' && $typmodul == 'geschaeftsbrief_vorlagen'){
             $objekt = $typmodul;
@@ -14723,7 +14595,7 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
       if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift" || $module == "proformarechnung") {
         
         if ($schreibschutz != 1) {
-          $addrow = array('<form action="" method="post" id="myform">', '[ARTIKELSTART]<input type="text" size="30" name="artikel" id="artikel" onblur="window.setTimeout(\'selectafterblur()\',200);">[ARTIKELENDE]', '<input type="text" name="projekt" id="projekt" size="10" readonly onclick="checkhere()" >', '<input type="text" name="nummer" id="nummer" size="7">', '<input type="text" size="8" name="lieferdatum" id="lieferdatum">', '<input type="text" name="menge" id="menge" size="5" onblur="window.setTimeout(\'selectafterblurmenge()\',200); document.getElementById(\'preis\').style.background =\'none\';">', '<input type="text" name="preis" id="preis" size="10" onclick="checkhere();">', '<input type="text" name="waehrung" id="waehrung" size="10" onclick="checkhere();">' ,'<input type="text" name="rabatt" id="rabatt" size="7">','','');
+          $addrow = array('<form action="" method="post" id="myform">', '[ARTIKELSTART]<input type="text" size="30" name="artikel" id="artikel" onblur="window.setTimeout(\'selectafterblur()\',200);">[ARTIKELENDE]', '<input type="text" name="projekt" id="projekt" size="10" readonly onclick="checkhere()" >', '<input type="text" name="nummer" id="nummer" size="7">', '<input type="text" size="8" name="lieferdatum" id="lieferdatum">', '<input type="text" name="menge" id="menge" size="5" onblur="window.setTimeout(\'selectafterblurmenge()\',200); document.getElementById(\'preis\').style.background =\'none\';">', '<input type="text" name="preis" id="preis" size="10" onclick="checkhere();">', '<input type="text" name="waehrung" id="waehrung" size="10" onclick="checkhere();">' ,'<input type="text" name="rabatt" id="rabatt" size="7">');
           $addrow[] = '<input type="submit" value="einf&uuml;gen" name="ajaxbuchen">
             <script type="text/javascript">
             document.onkeydown = function(evt) {
@@ -14886,11 +14758,9 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
         }
         $table->headings[6] = 'Preis';
         $mengencol = 5;
-        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") {
-            $table->headings[7] = 'W&auml;hrung';
-            $table->headings[8] = 'Rabatt';
-            $rabattcol = 8; 
-        }       
+        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") $table->headings[7] = 'W&auml;hrung';
+        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") $table->headings[8] = 'Rabatt';
+        if ($module == "angebot" || $module == "auftrag" || $module == "rechnung" || $module == "gutschrift") $rabattcol = 8;
       }
       $__arr = array($summencol, $mengencol, $rabattcol, $ecol, $dcol,$zwischensumme);
       $this->app->erp->RunHook('yui_sortlistadd_draw', 2,$table,$__arr);

tools/module_creator/module_creator_php_template.txt

@@ -42,11 +42,7 @@ class PLACEHOLDER_MODULECLASSNAME {
                 $defaultorder = 1;
                 $defaultorderdesc = 0;
 
-        		$dropnbox = "PLACEHOLDER_DROPNBOX";
-
-//                $moreinfo = true; // Allow drop down details
-//                $moreinfoaction = "lieferschein"; // specify suffix for minidetail-URL to allow different minidetails
-//                $menucol = 11; // Set id col for moredata/menu
+		$dropnbox = "PLACEHOLDER_DROPNBOX";
 
                 $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=PLACEHOLDER_MODULENAME&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=PLACEHOLDER_MODULENAME&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
 
@@ -122,8 +118,6 @@ class PLACEHOLDER_MODULECLASSNAME {
             
             // Add checks here
 
-    //        $input['projekt'] = $this->app->erp->ReplaceProjekt(true,$input['projekt'],true); // Parameters: Target db?, value, from form?
-
             $columns = "id, ";
             $values = "$id, ";
             $update = "";
@@ -172,9 +166,6 @@ class PLACEHOLDER_MODULECLASSNAME {
         $this->app->Tpl->Add('KURZUEBERSCHRIFT2', $email);
         $this->app->Tpl->Add('EMAIL', $email);
         $this->app->Tpl->Add('ANGEZEIGTERNAME', $angezeigtername);         
-
-        $this->app->YUI->AutoComplete("artikel", "artikelnummer");
-
          */
 
 //        $this->SetInput($input);              
@@ -192,4 +183,14 @@ class PLACEHOLDER_MODULECLASSNAME {
 
         return $input;
     }
- }
+
+    /*
+     * Set all fields in the page corresponding to $input
+     */
+    function SetInput($input) {
+        // $this->app->Tpl->Set('EMAIL', $input['email']);        
+        
+        PLACEHOLDER_SET_INPUT
+    }
+
+}

upgrade/data/db_schema.json

@@ -57169,28 +57169,6 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
-                },
-                {
-                    "Field": "versand_status",
-                    "Type": "int(11)",
-                    "Collation": null,
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": "0",
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                },
-                {
-                    "Field": "umgelagert",
-                    "Type": "int(1)",
-                    "Collation": null,
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": "0",
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
                 }
             ],
             "keys": [
@@ -64807,17 +64785,6 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
-                },
-                {
-                    "Field": "vorlaeufig",
-                    "Type": "int(1)",
-                    "Collation": null,
-                    "Null": "YES",
-                    "Key": "",
-                    "Default": "",
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
                 }
             ],
             "keys": [
@@ -104782,17 +104749,6 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
-                {
-                    "Field": "adresse",
-                    "Type": "int(11)",
-                    "Collation": null,
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": "0",
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                },
                 {
                     "Field": "warteschlange",
                     "Type": "text",
@@ -112695,76 +112651,6 @@
                 }
             ]
         },
-        {
-            "name": "versandpaket_lieferschein_position",
-            "collation": "utf8mb3_general_ci",
-            "type": "BASE TABLE",
-            "columns": [
-                {
-                    "Field": "id",
-                    "Type": "int(11)",
-                    "Collation": null,
-                    "Null": "NO",
-                    "Key": "PRI",
-                    "Default": null,
-                    "Extra": "auto_increment",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                },
-                {
-                    "Field": "versandpaket",
-                    "Type": "int(11)",
-                    "Collation": null,
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": null,
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                },
-                {
-                    "Field": "lieferschein_position",
-                    "Type": "int(11)",
-                    "Collation": null,
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": null,
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                },
-                {
-                    "Field": "menge",
-                    "Type": "decimal(14,4)",
-                    "Collation": null,
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": null,
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                }
-            ],
-            "keys": [
-                {
-                    "Key_name": "PRIMARY",
-                    "Index_type": "BTREE",
-                    "columns": [
-                        "id"
-                    ],
-                    "Non_unique": ""
-                },
-                {
-                    "Key_name": "versandpaket_lieferschein_position",
-                    "Index_type": "BTREE",
-                    "columns": [
-                        "versandpaket",
-                        "lieferschein_position"
-                    ],
-                    "Non_unique": "UNIQUE"
-                } 
-            ]
-        },
         {
             "name": "versandarten",
             "collation": "utf8mb3_general_ci",
@@ -112952,17 +112838,6 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
-                {
-                    "Field": "datum",
-                    "Type": "datetime",
-                    "Collation": null,
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": "current_timestamp()",
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                },
                 {
                     "Field": "versand",
                     "Type": "int(11)",
@@ -112985,28 +112860,6 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
-                {
-                    "Field": "versandart",
-                    "Type": "varchar(64)",
-                    "Collation": "utf8mb3_general_ci",
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": "",
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                },
-                {
-                    "Field": "lieferschein_ohne_pos",
-                    "Type": "int(11)",
-                    "Collation": null,
-                    "Null": "YES",
-                    "Key": "",
-                    "Default": null,
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                },
                 {
                     "Field": "tracking",
                     "Type": "varchar(255)",
@@ -113018,17 +112871,6 @@
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
                 },
-                {
-                    "Field": "tracking_link",
-                    "Type": "text",
-                    "Collation": "utf8mb3_general_ci",
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": "",
-                    "Extra": "",
-                    "Privileges": "select,insert,update,references",
-                    "Comment": ""
-                },
                 {
                     "Field": "versender",
                     "Type": "varchar(255)",
@@ -113061,28 +112903,6 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
-                },
-                {
-                    "Field": "status",
-                    "Type": "varchar(64)",
-                    "Collation": "utf8mb3_general_ci",
-                    "Null": "NO",
-                    "Key": "",
-                    "Default": null,
-                    "Extra": "",
-                    "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": ""
                 }
             ],
             "keys": [

upgrade/data/upgrade.php

@@ -112,12 +112,6 @@ if (php_sapi_name() == "cli") {
           $check_db = true;
         } else {
         } 
-
-        if (in_array('-strict', $argv)) {
-          $strict_db = true;
-        } else {
-          $strict_db = false;
-        } 
         
         if (in_array('-do', $argv)) {
             if (!$check_git && !$check_db) {
@@ -133,17 +127,7 @@ if (php_sapi_name() == "cli") {
         }
 
         if ($check_git || $check_db || $do_git || $do_db) {
-            upgrade_main(   directory: $directory,
-                            verbose: $verbose,
-                            check_git: $check_git,
-                            do_git: $do_git,
-                            export_db: $export_db,
-                            check_db: $check_db,
-                            strict_db: $strict_db,
-                            do_db: $do_db,
-                            force: $force,
-                            connection: $connection,
-                            origin: $origin);
+            upgrade_main($directory,$verbose,$check_git,$do_git,$export_db,$check_db,$do_db,$force,$connection,$origin);
         } else {
             info();
         }
@@ -155,7 +139,7 @@ if (php_sapi_name() == "cli") {
 } 
 // -------------------------------- END
 
-function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do_git, bool $export_db, bool $check_db, bool $strict_db, bool $do_db, bool $force, bool $connection, bool $origin) {  
+function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do_git, bool $export_db, bool $check_db, bool $do_db, bool $force, bool $connection, bool $origin) {  
   
     $mainfolder = dirname($directory);
     $datafolder = $directory."/data";
@@ -395,7 +379,7 @@ function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do
         echo_out("--------------- Calculating database upgrade for '$schema@$host'... ---------------\n");
 
         $upgrade_sql = array();
-        $result =  mustal_calculate_db_upgrade($compare_def, $db_def, $upgrade_sql, $mustal_replacers, $strict_db);
+        $result =  mustal_calculate_db_upgrade($compare_def, $db_def, $upgrade_sql, $mustal_replacers);
 
         if (!empty($result)) {
             abort(count($result)." errors.\n");
@@ -498,7 +482,6 @@ function info() {
     echo_out("\t-f: force override of existing files\n");
     echo_out("\t-o: update from origin instead of remote.json\n");
     echo_out("\t-connection use connection.json in data folder instead of user.inc.php\n");
-    echo_out("\t-strict: innodb_strict_mode=ON\n");
     echo_out("\t-clean: (not yet implemented) create the needed SQL to remove items from the database not in the JSON\n");
     echo_out("\n");
 }

vendor/mustal/mustal_mysql_upgrade_tool.php

@@ -21,7 +21,7 @@ function mustal_compare_table_array(array $nominal, string $nominal_name, array
 Compare two database structures
 Returns a structured array containing information on all the differences.
 
-function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql, bool $strict) : int
+function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql) : int
 Generate the SQL needed to upgrade the database to match the definition, based on a comparison.
 
 Data structure in Array and JSON
@@ -542,7 +542,7 @@ function mustal_implode_with_quote(string $quote, string $delimiter, array $arra
 // 11 Table type upgrade not supported
 // 12 Upgrade type not supported
 
-function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql, array $replacers, bool $strict) : array {
+function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$upgrade_sql, array $replacers) : array {
 
     $result = array();
     $upgrade_sql = array();    
@@ -752,10 +752,8 @@ function mustal_calculate_db_upgrade(array $compare_def, array $db_def, array &$
     $upgrade_sql = array_unique($upgrade_sql);
 
     if (count($upgrade_sql) > 0) {
-        array_unshift($upgrade_sql,"SET SQL_MODE='ALLOW_INVALID_DATES';");
-        if (!$strict) {
-            array_unshift($upgrade_sql,"SET SESSION innodb_strict_mode=OFF;");
-        }
+
+        array_unshift($upgrade_sql,"SET SQL_MODE='ALLOW_INVALID_DATES';","SET SESSION innodb_strict_mode=OFF;");
     }
 
     return($result);

version.php

@@ -1,7 +1,7 @@
 <?php 
 
 $version="OSS"; 
-$version_revision="1.11";
+$version_revision="1.10";
 $githash = file_get_contents("../githash.txt");
 if (!empty($githash)) {
   $version_revision .= " (".substr($githash,0,8).")";

www/lib/class.versanddienstleister.php

@@ -75,8 +75,7 @@ abstract class Versanddienstleister
       $ret['lieferscheinId'] = $lieferscheinId;
 
       $addressfields = ['name', 'adresszusatz', 'abteilung', 'ansprechpartner', 'unterabteilung', 'ort', 'plz',
-          'strasse', 'land'];       
-
+          'strasse', 'land'];
       $ret['original'] = array_filter($docArr, fn($key) => in_array($key, $addressfields), ARRAY_FILTER_USE_KEY);
 
       $ret['name'] = empty(trim($docArr['ansprechpartner'])) ? trim($docArr['name']) : trim($docArr['ansprechpartner']);
@@ -128,7 +127,7 @@ abstract class Versanddienstleister
       if (!empty($docArr['ihrebestellnummer'])) {
         $orderNumberParts[] = $docArr['ihrebestellnummer'];
       }
-      $orderNumberParts[] = ucfirst($sid)." ".$docArr['belegnr'];
+      $orderNumberParts[] = $docArr['belegnr'];
       $ret['order_number'] = implode(' / ', $orderNumberParts);
     }
 
@@ -370,7 +369,7 @@ abstract class Versanddienstleister
     return true;
   }
 
-  public function Paketmarke(string $target, string $docType, int $docId, $versandpaket = null): void
+  public function Paketmarke(string $target, string $docType, int $docId): void
   {
     $address = $this->GetAdressdaten($docId, $docType);
     if (isset($_SERVER['CONTENT_TYPE']) && ($_SERVER['CONTENT_TYPE'] === 'application/json')) {
@@ -379,65 +378,25 @@ abstract class Versanddienstleister
       if ($json->submit == 'print') {
         $result = $this->CreateShipment($json, $address);
         if ($result->Success) {
-            if (empty($versandpaket)) {
-                $sql = "INSERT INTO versandpakete 
-                      (
-                        lieferschein_ohne_pos,
-                        gewicht,
-                        tracking,
-                        tracking_link,
-                        status,
-                        versandart,
-                        versender
-                      ) 
-                      VALUES 
-                      (
-                        {$address['lieferscheinId']},
-                        '$json->weight',
-                        '$result->TrackingNumber',
-                        '$result->TrackingUrl',
-                        'neu',
-                        '$this->type',
-                        '".$this->app->User->GetName()."'
-                    )";
-                $this->app->DB->Insert($sql);
-                $versandpaket = $this->app->DB->GetInsertID();
-            }
-            else {
-                $sql = "UPDATE versandpakete SET 
-                            gewicht = '".$json->weight."',
-                            tracking = '".$result->TrackingNumber."',
-                            tracking_link = '".$result->TrackingUrl."'
-                        WHERE id = '".$versandpaket."'
-                        ";             
-                $this->app->DB->Update($sql);      
-            }       
+          $sql = "INSERT INTO versand 
+          (adresse, lieferschein, versandunternehmen, gewicht, tracking, tracking_link, anzahlpakete) 
+          VALUES 
+          ({$address['addressId']}, {$address['lieferscheinId']}, '$this->type',
+           '$json->weight', '$result->TrackingNumber', '$result->TrackingUrl', 1)";
+          $this->app->DB->Insert($sql);
 
-            $filename = join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
-            $filefullpath = $this->app->erp->GetTMP() . $filename;
-            file_put_contents($filefullpath, $result->Label);
-            $this->app->erp->CreateDateiWithStichwort(
-                $filename,
-                'Paketmarke '.$this->type.' '.$result->TrackingNumber,
-                'Paketmarke Versandpaket Nr. '.$versandpaket,
-                '',
-                $filefullpath,
-                $this->app->User->GetName(),
-                'paketmarke',
-                'versandpaket',
-                $versandpaket
-            );
+          $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
+          file_put_contents($filename, $result->Label);
+          $this->app->printer->Drucken($this->labelPrinterId, $filename);
 
-            $this->app->printer->Drucken($this->labelPrinterId, $filefullpath);
-
-            if (isset($result->ExportDocuments)) {
-                $filefullpath = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
-                file_put_contents($filefullpath, $result->ExportDocuments);
-                $this->app->printer->Drucken($this->documentPrinterId, $filefullpath);
-            }
-            $ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
+          if (isset($result->ExportDocuments)) {
+            $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
+            file_put_contents($filename, $result->ExportDocuments);
+            $this->app->printer->Drucken($this->documentPrinterId, $filename);
+          }
+          $ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
         } else {
-            $ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
+          $ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
         }
       }
       header('Content-Type: application/json');
@@ -451,12 +410,7 @@ abstract class Versanddienstleister
     $address['product'] = $products[0]->Id ?? '';
 
     $countries = $this->app->DB->SelectArr("SELECT iso, bezeichnung_de name, eu FROM laender ORDER BY bezeichnung_de");
-    if(!empty($countries)) {
-        $countries = array_combine(array_column($countries, 'iso'), $countries);    
-    } else {
-        $countries = Array();        
-        $this->app->Tpl->addMessage('error', 'Länderliste ist leer. Siehe Einstellungen -> Länderliste.', false, 'PAGE');
-    }  
+    $countries = array_combine(array_column($countries, 'iso'), $countries);
 
     $json['form'] = $address;
     $json['countries'] = $countries;

www/lib/versandarten/content/createshipment.tpl

@@ -137,7 +137,7 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
                 <h2>{|Paket|}</h2>
                 <table>
                     <tr>
-                        <td>{|Gewicht (in kg)</b>|}:</td>
+                        <td>{|Gewicht (in kg)|}:</td>
                         <td><input type="text" v-model.number="form.weight"></td>
                     </tr>
                     <tr>
@@ -157,7 +157,7 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
                         <td>
                             <select v-model="form.product" required>
                                 <option v-for="prod in products" :value="prod.Id" v-if="productAvailable(prod)">{{prod.Name}}</option>
-                            </select><i>F&uuml;r Produktwahl Gewicht eingeben!</i>
+                            </select>
                         </td>
                     </tr>
                     <tr v-if="serviceAvailable('premium')">
@@ -168,11 +168,11 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
             </div>
             <div class="clearfix"></div>
             <div class="col-md-12">
-                <h2>{|Sonstiges|}</h2>
+                <h2>{|Bestellung|}</h2>
                 <table>
                     <tbody>
                         <tr>
-                            <td>{|Referenzen|}:</td>
+                            <td>{|Bestellnummer|}:</td>
                             <td><input type="text" size="36" v-model="form.order_number"></td>
                         </tr>
                         <tr>
@@ -300,4 +300,4 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
             }
         }
     })
-</script>
+</script>

www/pages/ajax.php

@@ -350,9 +350,9 @@ class Ajax {
       $id = $this->app->Secure->GetPOST('id');
       $objekt = $this->app->Secure->GetPOST('typ');
       $parameter = $this->app->Secure->GetPOST('parameter');
-
-      $module = strtolower($objekt);
-      $objekt = $this->app->YUI->dateien_module_objekt_map($objekt);   
+      if($objekt === 'adresse'){
+        $objekt = 'Adressen';
+      }
 
       $data = $this->app->DB->SelectRow(
         "SELECT d.*, s.subjekt 
@@ -363,6 +363,12 @@ class Ajax {
         LIMIT 1"
       );
 
+
+      $module = strtolower($objekt);
+      if($module === 'adressen'){
+        $module = 'adresse';
+      }
+
       $typen = $this->app->erp->getDateiTypen($module);
       $found = false;
       foreach($typen as $typ) {
@@ -425,10 +431,10 @@ class Ajax {
       $titel = $this->app->Secure->GetPOST('titel');
       $beschreibung = $this->app->Secure->GetPOST('beschreibung');
       $subjekt = $this->app->Secure->GetPOST('subjekt');
-
-      $module = strtolower($objekt);
-      $objekt = $this->app->YUI->dateien_module_objekt_map($module);      
-
+      if($objekt == 'adresse')
+      {
+        $objekt = 'Adressen';
+      }
       $ersteller = $this->app->DB->real_escape_string($this->app->User->GetName());
       $datei = $this->app->DB->SelectArr("SELECT d.id, s.id as sid FROM datei d LEFT JOIN datei_stichwoerter s ON d.id=s.datei LEFT JOIN datei_version v ON v.datei=d.id WHERE s.objekt LIKE '$objekt' AND s.parameter='$parameter' AND d.geloescht=0 AND d.id = '$id' LIMIT 1");
       if($datei)
@@ -648,9 +654,6 @@ class Ajax {
     $cmd = trim($this->app->Secure->GetGET('cmd'));
     $id = (int)$this->app->Secure->GetGET('id');
 
-    $module = strtolower($cmd);
-    $cmd = $this->app->YUI->dateien_module_objekt_map($cmd);
-
     if(!empty($cmd) && $id
       && (!in_array($cmd, $cmds) || (in_array($cmd, $cmds) && $this->app->erp->RechteVorhanden($cmd,'dateien')))) {
       $datei = $this->app->DB->SelectRow(
@@ -658,7 +661,7 @@ class Ajax {
           "SELECT dv.id, ds.parameter, dv.dateiname 
           FROM datei_version AS dv 
           INNER JOIN datei_stichwoerter ds ON ds.datei = dv.datei 
-          WHERE dv.datei = %d AND (ds.objekt like '%s') 
+          WHERE dv.datei = %d AND (ds.objekt like '%s'".($cmd === 'adresse'?" OR ds.objekt like 'Adressen' ":'').") 
           ORDER BY  dv.datei DESC, dv.version DESC 
           LIMIT 1",
           $id, $cmd
@@ -691,7 +694,7 @@ class Ajax {
           $projekt = $this->app->DB->Select(
             sprintf(
               'SELECT `projekt` FROM `%s` WHERE `id` = %d LIMIT 1',
-              $module, $datei[0]['parameter']
+              $cmd, $datei[0]['parameter']
             )
           );
           if(!$this->app->erp->UserProjektRecht($projekt)) {
@@ -1594,17 +1597,11 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
         if($artikel_freitext1_suche)
         {
           $felder[] = 'art.freifeld1';
-        } else {
-            $artikel_freitext1_suche = 'true';
         }
-        $subwhere = $this->AjaxFilterWhere($termorig,$felder);       
-        $sql = "SELECT CONCAT(art.nummer,' ',art.name_de) as name FROM artikel art
+        $subwhere = $this->AjaxFilterWhere($termorig,$felder);
+        $arr = $this->app->DB->SelectArr("SELECT CONCAT(art.nummer,' ',art.name_de) as name FROM artikel art
         INNER JOIN $doctype"."_position ap ON ap.artikel = art.id AND $doctype = '$doctypeid'
-        WHERE 
-            art.geloescht=0 AND ($artikel_freitext1_suche) AND art.geloescht=0 AND art.intern_gesperrt!=1 AND 
-            (name_de LIKE '%$term%' OR art.nummer LIKE '%$term%') 
-        LIMIT 20";
-        $arr = $this->app->DB->SelectArr($sql);
+        WHERE art.geloescht=0 AND  ($artikel_freitext1_suche) AND art.geloescht=0 AND art.intern_gesperrt!=1 LIMIT 20");
         $carr = !empty($arr)?count($arr):0;
         for($i = 0; $i < $carr; $i++) {
           $newarr[] = $arr[$i]['name'];
@@ -2482,7 +2479,7 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
           $adresse = $this->app->DB->Select("SELECT id FROM adresse WHERE kundennummer = '".$kunde[0]."' AND kundennummer <> '' LIMIT 1");
         }
         $beleg = str_replace('kunden','',$filtername);
-        $arr = $this->app->DB->SelectArr("SELECT CONCAT(belegnr,' ',kundennummer,' ',name) as name FROM $beleg WHERE (belegnr <> '') AND (belegnr LIKE '%$term%' OR name LIKE '%$term%' OR kundennummer LIKE '$%term%') AND (status IN ('angelegt','freigegeben','versendet')) 
+        $arr = $this->app->DB->SelectArr("SELECT CONCAT(id,' ',if(belegnr <> '',belegnr,'ENTWURF'),' ',kundennummer,' ',name) as name FROM $beleg WHERE (belegnr LIKE '%$term%' OR name LIKE '%$term%' OR kundennummer LIKE '$%term%') AND (status = 'angelegt' OR status = 'freigegeben') 
         ".($adresse?" AND adresse = '$adresse' ":'')."   ".$this->app->erp->ProjektRechte('projekt')."
         ORDER by belegnr LIMIT 20");
         $carr = !empty($arr)?count($arr):0;

www/pages/auftrag.php

@@ -1990,52 +1990,8 @@ class Auftrag extends GenAuftrag
       $gebuchtezeit = str_replace(".", ",", round($gebuchtezeit,2));
     }
     $summebrutto = $this->app->DB->Select("SELECT gesamtsumme FROM auftrag WHERE id='$id' LIMIT 1");
-
-    // Deckungsbeitrag
-    if (!$this->app->erp->RechteVorhanden('auftrag','einkaufspreise')) {
-        $this->app->Tpl->Set('DBHIDDEN','hidden');
-    } else {
-        $sql = "
-                SELECT
-                    umsatz_netto_gesamt,
-                    artikel,
-                    menge,
-                    einkaufspreis
-                FROM
-                    `auftrag_position`
-                WHERE
-                    `auftrag` = ".$id."
-            ";
-
-        $positionen = $this->app->DB->SelectArr($sql);
-
-        $umsatz_gesamt = 0;
-        $kosten_gesamt = 0;
-        $db_gesamt = 0;    
-        foreach ($positionen as $position) {
-            if (empty($position['einkaufspreis'])) {
-                $position['einkaufspreis'] = $this->app->erp->GetEinkaufspreis($position['artikel'],$position['menge']);
-            }
-            $kosten = ($position['einkaufspreis']*$position['menge']);
-            $db_gesamt += $position['umsatz_netto_gesamt']-$kosten;
-            $kosten_gesamt += $kosten;
-            $umsatz_gesamt += $position['umsatz_netto_gesamt'];
-        }
-
-        $this->app->Tpl->Set('NETTOGESAMT',$this->app->erp->number_format_variable($umsatz_gesamt,2));
-        $this->app->Tpl->Set('KOSTEN',$this->app->erp->number_format_variable($kosten_gesamt,2));
-        $this->app->Tpl->Set('DECKUNGSBEITRAG',$this->app->erp->number_format_variable($db_gesamt,2));
-        $this->app->Tpl->Set(   'DBPROZENT',
-                                $umsatz_gesamt==0?
-                                "-":
-                                $this->app->erp->number_format_variable(
-                                    round(
-                                        $db_gesamt/$umsatz_gesamt*100,2
-                                    )                                
-                                )."%"
-                            );
-    }
-   
+    $this->app->Tpl->Set('DECKUNGSBEITRAG',0);
+    $this->app->Tpl->Set('DBPROZENT',0);
     $this->app->Tpl->Set('GEBUCHTEZEIT',0);
 
     if($auftragArr[0]['ust_befreit']==0){
@@ -2314,7 +2270,7 @@ class Auftrag extends GenAuftrag
       }
       $this->app->Tpl->Set('PREISANFRAGE', implode('<br />', $priceRequestsHtml));
     }
-/*
+
     $tmpVersand = !$hasDeliveryNotes?[]: $this->app->DB->SelectFirstCols(
       "SELECT if(v.versendet_am!='0000-00-00', 
         CONCAT(DATE_FORMAT( v.versendet_am,'%d.%m.%Y'),' ',v.versandunternehmen),
@@ -2397,39 +2353,6 @@ class Auftrag extends GenAuftrag
     else {
       $this->app->Tpl->Set('TRACKING',$tmpVersand);
     }
-*/
-
-
-      $sql = "SELECT SQL_CALC_FOUND_ROWS
-                v.id,                   
-                v.tracking as tracking,
-                v.tracking_link
-            FROM 
-                versandpakete v
-            LEFT JOIN
-                versandpaket_lieferschein_position vlp ON v.id = vlp.versandpaket
-            LEFT JOIN
-                lieferschein_position lp ON lp.id = vlp.lieferschein_position
-            LEFT JOIN
-                lieferschein l ON lp.lieferschein = l.id
-            LEFT JOIN
-                lieferschein lop ON lop.id = v.lieferschein_ohne_pos 
-            WHERE 
-                l.auftragid = ".$id." OR lop.auftragid = ".$id."
-            GROUP BY 
-               v.id
-            ";
-    $tracking = $this->app->DB->SelectArr($sql);
-
-    $tracking_list = array();
-    foreach ($tracking as $single_tracking) {
-        $tracking_list[] =  '<a href="index.php?module=versandpakete&action=edit&id='.$single_tracking['id'].'">Paket Nr.'.$single_tracking['id'].'</a>'.
-                            ' ('.'<a href="'.$single_tracking['tracking_link'].'">'.$single_tracking['tracking'].'</a>'.')';
-    }
-
-    $this->app->Tpl->Set('TRACKING',implode('<br>',$tracking_list));
-
-
 
 
     $icons = $this->app->YUI->IconsSQL();
@@ -4993,10 +4916,6 @@ class Auftrag extends GenAuftrag
       $this->app->erp->AdresseAlsLieferadresseButton($adresse);
     }
 
-    if ($schreibschutz != 1 AND $status != 'abgeschlossen') {
-        $this->app->erp->BerechneDeckungsbeitrag($id,'auftrag');
-    }
-
     if($nummer!='') {
       $this->app->Tpl->Set('NUMMER',$nummer);
       if($this->app->erp->RechteVorhanden('adresse','edit')){
@@ -5775,13 +5694,8 @@ Die Gesamtsumme stimmt nicht mehr mit urspr&uuml;nglich festgelegten Betrag '.
         }
 
         $this->app->DB->Update("UPDATE lieferschein SET 
-                                    belegnr='$ls_belegnr',  
-                                    status='freigegeben',
-                                    versand='".$this->app->User->GetDescription()."',
-                                    versand_status = 1
-                                WHERE id='$lieferschein' LIMIT 1");
-
-        // Versand_status: 1 = process in versandpakete, 2 = finished, 3 = finished manually
+            belegnr='$ls_belegnr', status='freigegeben', versand='".$this->app->User->GetDescription()."' 
+            WHERE id='$lieferschein' LIMIT 1");
 
         $this->app->erp->LieferscheinProtokoll($lieferschein, 'Lieferschein freigegeben');
 
@@ -6428,7 +6342,7 @@ Die Gesamtsumme stimmt nicht mehr mit urspr&uuml;nglich festgelegten Betrag '.
     $this->app->erp->MenuEintrag('index.php?module=auftrag&action=list','&Uuml;bersicht');
     $this->app->erp->MenuEintrag('index.php?module=auftrag&action=create','Neuen Auftrag anlegen');
     $this->app->erp->MenuEintrag('index.php?module=auftrag&action=offene','Offene Positionen');
-    $this->app->erp->MenuEintrag('index.php?module=auftrag&action=versandzentrum','Versand&uuml;bergabe');
+    $this->app->erp->MenuEintrag('index.php?module=auftrag&action=versandzentrum','Versandzentrum');
 
     if(strlen($backurl)>5){
       $this->app->erp->MenuEintrag("$backurl", 'Zur&uuml;ck zur &Uuml;bersicht');
@@ -6473,7 +6387,7 @@ Die Gesamtsumme stimmt nicht mehr mit urspr&uuml;nglich festgelegten Betrag '.
     $this->AuftraguebersichtMenu();
     $targetMessage = 'AUTOVERSANDBERECHNEN';
 
-    $this->app->Tpl->Add('MESSAGE','<div class="info">Auftr&auml;ge an Versand übergeben mit automatischem Druck und Mailversand. <a class="button" href="index.php?module=versandpakete&action=lieferungen">Zum Versand</a></div>');
+    $this->app->Tpl->Add('MESSAGE','<div class="info">Auftr&auml;ge an Versand übergeben mit automatischem Druck und Mailversand.</div>');
 
     $autoshipmentEnabled = true;
     $this->app->erp->RunHook('OrderAutoShipment', 2, $targetMessage, $autoshipmentEnabled);

www/pages/content/auftrag_minidetail.tpl

@@ -37,7 +37,7 @@
 <tr><td class="auftraginfo_cell">{|Bestellung|}:</td><td class="auftraginfo_cell" >[BESTELLUNG]</td><td class="auftraginfo_cell">{|Eigene Umsatzsteuer ID|}:</td><td class="auftraginfo_cell">[DELIVERYTHRESHOLDVATID]</td></tr>
 <tr><td class="auftraginfo_cell">{|Retoure|}:</td><td class="auftraginfo_cell" >[RETOURE]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
 <tr><td class="auftraginfo_cell">{|Preisanfrage|}:</td><td class="auftraginfo_cell" >[PREISANFRAGE]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
-<tr><td class="auftraginfo_cell">{|Pakete|}:</td><td class="auftraginfo_cell" >[TRACKING]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
+<tr><td class="auftraginfo_cell">{|Tracking|}:</td><td class="auftraginfo_cell" >[TRACKING]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
 </table>
 
 <table width="100%">
@@ -48,14 +48,19 @@
   <td style="" width="50%">[VERSANDTEXT]</td>
 [RMAENDIF]
 </tr>
+
 </table>
+
 <div style="background-color:white">
 <div style="padding:10px">
   [RECHNUNGLIEFERADRESSE]
 </div>
 </div>
+
+
 </div>
 <div style="float:left; width:50%">
+
 <div style="overflow:auto;max-height:550px;">
 <div style="background-color:white;">
 <h2 class="greyh2">Artikel</h2>
@@ -64,55 +69,63 @@
 <i style="color:#999">* Die linke Zahl zeigt die für den Kunden reservierten Einheiten und die rechte Zahl die global reservierte Anzahl.</i>
 </div>
 </div>
+
 [MINIDETAILNACHARTIKEL]
-<div style="background-color:white" [DBHIDDEN]>
-    <h2 class="greyh2">{|Deckungsbeitrag (netto)|}</h2>
-    <table width="100%">
-        <tbody>
-            <tr>
-                <td>Umsatz EUR</td>
-                <td>Kosten EUR</td>
-                <td>Deckungsbeitrag EUR</td>
-                <td>DB %</td>
-            </tr>
-            <tr>
-              <td class="greybox" width="25%">[NETTOGESAMT]</td>
-              <td class="greybox" width="25%">[KOSTEN]</td>
-              <td class="greybox" width="25%">[DECKUNGSBEITRAG]</td>
-              <td class="greybox" width="25%">[DBPROZENT]</td>
-            </tr>
-        </tbody>
-    </table>
+<!--    
+<div style="background-color:white;">
+<h2 class="greyh2">Lieferkette</h2>
+<div style="padding:10px">
+<table class="mkTable">
+<tr><th>Art</th><th>Beleg</th><th>Datum</th><th>Lieferant</th><th>Status</th></tr>
+<tr><td>Bestellung</td><td>ENTWURF</td><td></td><td>In-Circuit<br>200 x 777777 SMT USBprog 1)</td><td>-</td></tr>
+<tr><td>Anlieferung</td><td>200000</td><td></td><td>In-Circuit<br>200 x 777777 ATMEGA32</td><td>offen</td></tr>
+<tr><td>Bestellung</td><td>100023</td><td></td><td>Instanet<br>200 x USBprog 5.0 Spezial Elektor<br>200 x 777777 Flashen + Montieren</td><td>offen</td></tr>
+<tr><td>Anlieferung</td><td>200002</td><td></td><td>Instanet<br>200 x 777777 SMT USBprog 1)<br>200 x 122222 Gehäuse</td><td>offen</td></tr>
+</table>
 </div>
+</div>
+-->
+
 <div style="background-color:white">
 <h2 class="greyh2">{|Zahlungen|}</h2>
 <div style="padding:10px">
   [ZAHLUNGEN]
 </div>
 </div>
+
 <div style="background-color:white">
 <h2 class="greyh2">{|Protokoll|}</h2>
 <div style="padding:10px;">
   [PROTOKOLL]
 </div>
 </div>
+
 [VORPRODUKTIONPROTOKOLL]
 [PRODUKTIONPROTOKOLL]
 [NACHPRODUKTIONPROTOKOLL]
-<!--
+
 <div style="background-color:white">
-    <h2 class="greyh2">{|RMA Prozess|}</h2>
-    <div style="padding:10px">
-      [RMA]
-    </div>
+<h2 class="greyh2">{|RMA Prozess|}</h2>
+<div style="padding:10px">
+  [RMA]
+</div>
 </div>
--->
 <div style="background-color:white">
 <h2 class="greyh2">{|PDF-Archiv|}</h2>
 <div style="padding:10px;overflow:auto;">
   [PDFARCHIV]
+</div>
+</div>
+<div style="background-color:white">
+<h2 class="greyh2">{|Deckungsbeitrag|}</h2>
+<div style="padding:10px">
+
+<div class="info">{|Dieses Modul ist erst ab Version Professional verfügbar|}</div>
+
+
 </div>
 </div>
 [INTERNEBEMERKUNGEDIT]
+
 </div>
 </div>

www/pages/content/geschaeftsbrief_vorlagen_list.tpl

@@ -122,7 +122,7 @@
                 <li>{|Stornierung|} <i>{|Variablen|}: {AUFTRAG}, {DATUM}, {INTERNET}</i></li>
                 <li>{|ZahlungMiss|} <i>{|Variablen|}: {AUFTRAG}, {DATUM}, {GESAMT}, {REST}, {ANSCHREIBEN}, {INTERNET}</i></li>
                 <li>Mahnung <i>Variablen: {BELEGNR}, {DATUM}, {OFFEN}, {MAHNGEBUEHR}, {HEUTE}</i></li>
-                <li>{|Versand|} <i>{|Variablen|}: {VERSAND}, {VERSANDTYPE}, {VERSANDBEZEICHNUNG}, {TRACKINGNUMMER}, {TRACKINGLINK}, {NAME}, {ANSCHREIBEN}, {BELEGNR}, {IHREBESTELLNUMMER}, {INTERNET}, {AUFTRAGDATUM}, {LIEFERADRESSE}, {LIEFERADRESSELANG}</i></li>
+                <li>{|Versand|} <i>{|Variablen|}: {VERSAND}, {VERSANDTYPE}, {VERSANDBEZEICHNUNG}, {TRACKINGNUMMER}, {NAME}, {ANSCHREIBEN}, {BELEGNR}, {IHREBESTELLNUMMER}, {INTERNET}, {AUFTRAGDATUM}, {LIEFERADRESSE}, {LIEFERADRESSELANG}</i></li>
                 <li>{|VersandMailDokumente|} <i>{|Variablen|}: {NAME}, {ANSCHREIBEN}, {BELEGNR}, {IHREBESTELLNUMMER}, {INTERNET}, {AUFTRAGDATUM}</i></li>
                 <li>{|Erweiterte Freigabe|} <i>{|Variablen|}: {REQUESTER}, {LINK}, {LINKFREIGABEUEBERSICHT}, {DOCTYPE}, {DOCTYPE_ID}</i></li>
                 <li>{|Selbstabholer|}</li>

www/pages/content/lager_umlagern_lieferschein.tpl

@@ -1,43 +0,0 @@
-<div id="tabs">
-    <ul>
-            <li><a href="#tabs-1">[TABTEXT1]</a></li>
-    </ul>
-    <div id="tabs-1">
-        [MESSAGE]
-        [MESSAGETABLE]
-        <fieldset>
-            <form action="" method="post" id="eprooform" name="eprooform">
-                <table class="tableborder" border="0" cellpadding="3" cellspacing="0" width="100%">
-                    <tbody>
-                        <tr valign="top" colspan="3">
-                            <td>                                
-                                <table width="80%" align="center">
-                                    <tr valign="top">
-                                    <td align="center">
-                                    <table width="90%">
-                                      <tr><td><b>{|Quelllager|}:</b></td><td><input type="text" id="quelllager" name="quelllager" value="[QUELLLAGER]"  size="27" style="width:200px"></td></tr>
-                                    <tr>
-                                        <td>
-                                        </td>
-                                        <td>
-                                            <button name="submit" value="lieferschein" class="ui-button-icon" style="width:200px;">
-                                                Lieferschein erzeugen
-                                            </button>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <br>
-                            </td>
-                            <td>
-                            </td>
-                        </tr>
-                    </table>
-                    <br>
-                    <br>
-                </td>
-              </tr>
-          </table>
-        </form>
-        </fieldset>
-    </div>
-</div>

www/pages/content/lieferschein_minidetail.tpl

@@ -22,7 +22,7 @@
 <tr><td class="auftraginfo_cell">Projekt:</td><td class="auftraginfo_cell">[PROJEKT]</td><td class="auftraginfo_cell">Angebotssumme:</td><td class="auftraginfo_cell">[GESAMTSUMME]</td></tr>
 <tr><td class="auftraginfo_cell">Auftrag:</td><td class="auftraginfo_cell">[AUFTRAG]</td><td class="auftraginfo_cell">Versteuerung:</td><td class="auftraginfo_cell">[STEUER]</td></tr>
 <tr><td class="auftraginfo_cell">Rechnung:</td><td class="auftraginfo_cell">[RECHNUNG]</td><td class="auftraginfo_cell">Gewicht (netto):</td><td class="auftraginfo_cell">[GEWICHT]</td></tr>
-<tr><td class="auftraginfo_cell">Pakete:</td><td class="auftraginfo_cell">[TRACKING]</td><td class="auftraginfo_cell">Versandart:</td><td class="auftraginfo_cell">[VERSANDART]</td></tr>
+<tr><td class="auftraginfo_cell">Tracking:</td><td class="auftraginfo_cell">[TRACKING]</td><td class="auftraginfo_cell">Versandart:</td><td class="auftraginfo_cell">[VERSANDART]</td></tr>
 <tr><td class="auftraginfo_cell">Retoure:</td><td class="auftraginfo_cell">[RETOURE]</td><td class="auftraginfo_cell"></td><td class="auftraginfo_cell"></td></tr>
 </table>
 

www/pages/content/lieferschein_umlagern.tpl

@@ -1,45 +0,0 @@
-<div id="tabs">
-    <ul>
-            <li><a href="#tabs-1">[TABTEXT1]</a></li>
-    </ul>
-    <div id="tabs-1">
-        [MESSAGE]
-        [MESSAGETABLE]
-        <fieldset>
-            <form action="" method="post" id="eprooform" name="eprooform">
-                <table class="tableborder" border="0" cellpadding="3" cellspacing="0" width="100%">
-                    <tbody>
-                        <tr valign="top" colspan="3">
-                            <td>                                
-                                <table width="80%" align="center">
-                                    <tr valign="top">
-                                    <td align="center">
-                                    <table width="90%">
-                                      <tr><td><b>{|Quelllager|}:</b></td><td><input type="text" id="quelllager" name="quelllager" value="[QUELLLAGER]"  size="27" style="width:200px"></td></tr>
-                                      <tr><td><b>{|Ziellager|}:</b></td><td><input type="text" id="ziellager" name="ziellager" value="[ZIELLAGER]"  size="27" style="width:200px"></td></tr>
-                                    <tr>
-                                        <td>
-                                            <p [ERNEUT_UMLAGERN_HIDDEN]><input type="checkbox" name="erneut" id="erneut" value="1" size="20" [ERNEUT_CHECKED]>{|Erneut umlagern|}</input></p>
-                                        </td>
-                                        <td>
-                                            <button name="submit" value="umlagern" class="ui-button-icon" style="width:200px;">
-                                                Umlagern
-                                            </button>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <br>
-                            </td>
-                            <td>
-                            </td>
-                        </tr>
-                    </table>
-                    <br>
-                    <br>
-                </td>
-              </tr>
-          </table>
-        </form>
-        </fieldset>
-    </div>
-</div>

www/pages/content/lieferscheinuebersicht.tpl

@@ -17,6 +17,33 @@
 				<li class="filter-item"><input type="checkbox" id="anlieferanten"><label for="anlieferanten">{|an Lieferanten|}</label></li>
 			</ul>
 		</div>
+
+		<div class="filter-block filter-inline">
+			<div class="filter-title">{|Filter Versandzentrum|}</div>
+			<ul class="filter-list">
+				<li class="filter-item">
+					<label for="abgeschlossenlogistik" class="switch">
+						<input type="checkbox" id="abgeschlossenlogistik">
+						<span class="slider round"></span>
+					</label>
+					<label for="abgeschlossenlogistik">{|abgeschlossen &uuml;ber Logistik|}</label>
+				</li>
+				<li class="filter-item">
+					<label for="nochinlogistik" class="switch">
+						<input type="checkbox" id="nochinlogistik">
+						<span class="slider round"></span>
+					</label>
+					<label for="nochinlogistik">{|noch in Logistik|}</label>
+				</li>
+				<li class="filter-item">
+					<label for="manuellabgeschlossen" class="switch">
+						<input type="checkbox" id="manuellabgeschlossen">
+						<span class="slider round"></span>
+					</label>
+					<label for="manuellabgeschlossen">{|manuell abgeschlossen|}</label>
+				</li>
+			</ul>
+		</div>
 	</div>
 
 [MESSAGE]
@@ -29,7 +56,6 @@
 <option value="offen">{|als offen markieren|}</option>
 <option value="versendet">{|als versendet markieren|}</option>
 <option value="storniert">{|als storniert markieren|}</option>
-<option value="versanduebergabe">{|in Versand geben|}</option>
 <option value="pdf">{|Sammel-PDF|}</option>
 <option value="drucken">{|drucken|}</option>
 </select>&nbsp;{|Drucker|}: <select name="seldrucker">[SELDRUCKER]</select>&nbsp;<input type="submit" class="btnBlue" name="ausfuehren" value="{|ausf&uuml;hren|}" />

www/pages/content/ticket_edit.tpl

@@ -19,13 +19,12 @@
 	        				<fieldset>
                                 <table width="100%" border="0" class="mkTableFormular">
                                     <legend>{|[STATUSICON]<b>Ticket <font color="blue">#[SCHLUESSEL]</font></b>|}</legend>
-                                    <tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" id="betreff" value="[BETREFF]" style="width: 100%;"></td></tr>
+                                    <tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" id="betreff" value="[BETREFF]" size="20"></td></tr>
                                     <tr><td>{|Von|}:</td><td>[KUNDE]&nbsp;[MAILADRESSE]</td></tr>
                                     <tr><td>{|Projekt|}:</td><td><input type="text" name="projekt" id="projekt" value="[PROJEKT]" size="20"></td></tr>
                                     <tr><td>{|Adresse|}:</td><td><input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="20"><a href="index.php?module=adresse&action=edit&id=[ADRESSE_ID]"><img src="./themes/new/images/forward.svg" border="0" style="top:6px; position:relative"></a></td></tr>
                                     <tr><td>{|Tags|}:</td><td><input type="text" name="tags" id="tags" value="[TAGS]" size="20"></td></tr>
                                     <tr><td>{|Letzte Aktion|}:</td><td>[ZEIT]</td></tr>
-                                    [TICKET_ANHANG]
                                 </table>
                             </fieldset> 
                         </div>
@@ -50,7 +49,6 @@
                                     <legend>{|Aktionen|}</legend>
                                     <td><button name="submit" value="speichern" class="ui-button-icon" style="width:100%;">Speichern</button></td></tr>
                                     <td><button name="submit" value="neue_email" class="ui-button-icon" style="width:100%;">Neue E-Mail</button></td></tr>
-                                    <td><button name="submit" value="neue_email_alle" class="ui-button-icon" style="width:100%;">Neue E-Mail an alle</button></td></tr>
                                     <td><button name="submit" formaction="index.php?module=ticketregeln&action=create" value="regel" class="ui-button-icon" style="width:100%;">Ticketregel erstellen</button><input hidden type="text" name="ticketid" value="[ID]"></td></tr>
                                 </table>
                             </fieldset>

www/pages/content/ticket_list.tpl

@@ -49,19 +49,7 @@
                     <tr><td>{|Status|}:</td><td><select name="status">[STATUS]</select></td></tr>
                      <tr><td>{|Verantwortlich|}:</td><td><input type="text" name="warteschlange" id="warteschlange" value="[WARTESCHLANGE]" size="20"></td></tr>
                     <tr>
-                        <td>                            
-                            <input type="checkbox" value="1" id="autoalle" />&nbsp;alle markieren&nbsp;
-                        </td>
-                        <td>
-                            <button name="submit" value="zuordnen" class="ui-button-icon" style="width:100%;">{|Zuordnen|}</button>
-                        </td>
-                    </tr>
-                    <tr [SPAM_HIDDEN]>
-                        <td>
-                        </td>
-                        <td>
-                            <button name="submit" value="spam_filter" class="ui-button-icon" title="Ticket auf Status 'Papierkorb' setzen und Absender-Adresse in Ticketregel eintragen" style="width:100%;">{|Spamregel erstellen|}</button>
-                        </td>
+                        <td><input type="checkbox" value="1" id="autoalle" />&nbsp;alle markieren&nbsp;</td><td><input type="submit" class="btnBlue" name="ausfuehren" value="{|Zuordnen|}" /></td>
                     </tr>
                 </table>
 

www/pages/content/ticketregeln_edit.tpl

@@ -23,12 +23,10 @@
 <tr><td>{|E-Mail Verfasser|}:</td><td><input type="text" name="sender_email" value="[SENDER_EMAIL]" size="40"></td></tr>
 <tr><td>{|Verfasser Name|}:</td><td><input type="text" name="name" value="[NAME]" size="40"></td></tr>
 <tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" value="[BETREFF]" size="40"></td></tr>
-<tr><td colspan="2"><hr style="border-style:solid; border-width:1px"></td></tr>
 <tr><td>{|Papierkorb|}:</td><td><input type="checkbox" name="spam" value="1" [SPAM] size="40"></td></tr>
 <tr><td>{|Pers&ouml;nlich|}:</td><td><input type="checkbox" name="persoenlich" value="1" [PERSOENLICH] size="40"></td></tr>
 <tr><td>{|Prio|}:</td><td><input type="checkbox" name="prio" value="1" [PRIO] size="40"></td></tr>
 <tr><td>{|DSGVO|}:</td><td><input type="checkbox" name="dsgvo" value="1" [DSGVO] size="40"></td></tr>
-<tr><td>{|Adresse|}:</td><td><input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="40"></td></tr>
 <tr><td>{|Verantwortliche Warteschlange|}:</td><td><input type="text" name="warteschlange" id="warteschlange" value="[WARTESCHLANGE]" size="40"></td></tr>
 <tr><td>{|Aktiv|}:</td><td><input type="checkbox" name="aktiv" value="1" [AKTIV] size="40"></td></tr>
 

www/pages/content/ticketregeln_list.tpl

@@ -1,10 +1,5 @@
-<div id="tabs">
-    <ul>
-            <li><a href="#tabs-1">[TABTEXT1]</a></li>
-    </ul>
-    <div id="tabs-1">
-        [MESSAGE]
-        [TAB1]
-        [TAB1NEXT]
-    </div>
+<div id="tabs-1">
+    [MESSAGE]
+    [TAB1]
+    [TAB1NEXT]
 </div>

www/pages/content/versandarten_neu.tpl

@@ -23,9 +23,6 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
             [MODULEINSTALLIERT]
         </fieldset>
         [TAB1NEXT]
-        <form id="neu" action="index.php?module=versandarten&action=neusonstige" method="post">
-            <button name="submit" value="neusonstige" class="ui-button-icon">Versandart ohne Modul anlegen</button>
-        </form>
     </div>
 
 <!-- tab view schließen -->
@@ -38,4 +35,4 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
         :pages="pages"
         :allowClose="allowClose"
         :pagination="pagination">
-</click-by-click-assistant>
+</click-by-click-assistant>

www/pages/content/versandpakete_add.tpl

@@ -1,80 +0,0 @@
-<div id="tabs">
-    <ul>
-        <li><a href="#tabs-1"></a></li>
-    </ul>
-    <div id="tabs-1">
-        [MESSAGE]
-        <form action="index.php?module=versandpakete&action=add&id=[ID]&lieferschein=[LIEFERSCHEIN_ID]" method="post">   
-            [FORMHANDLEREVENT]
-            <div class="row">
-	        	<div class="row-height">
-	        		<div class="col-xs-14 col-md-10 col-md-height">
-	        			<div class="inside inside-full-height">
-	        				<fieldset>
-                                <legend>{|Hinzuf&uuml;gen von Artikeln aus <a href="index.php?module=lieferschein&action=edit&id=[LIEFERSCHEIN_ID]"><b>Lieferschein [LIEFERSCHEIN]</b></a> zu Versandpaket <b>Nr. [ID]</b>|}</legend>
-                                <table width="100%" border="0" class="mkTableFormular">                                
-                                    <tr>
-                                        <td>
-                                            {|Artikel|}:
-                                        </td>
-                                        <td>
-                                            <input type="text" name="artikel" id="artikel" value="" size="40" autofocus>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            {|Menge|}:
-                                        </td>
-                                        <td>
-                                            <input type="number" name="menge" id="menge" value="" min="1" size="40">
-                                        </td>
-                                    </tr>          
-                                </table>                               
-                            </fieldset>            
-                        </div>
-               		</div>
-                    <div class="col-xs-14 col-md-2 col-md-height">
-	        			<div class="inside inside-full-height">
-	        				<fieldset>
-                                <legend>{|Aktionen|}</legend>
-                                <table width="100%" border="0" class="mkTableFormular">
-                                    <tr><td><button name="submit" value="hinzufuegen" class="ui-button-icon" style="width:100%;">Hinzuf&uuml;gen</button></td></tr>
-                                    <tr><td><button name="submit" value="lieferschein_komplett_hinzufuegen" class="ui-button-icon" style="width:100%;">Alle hinzuf&uuml;gen</button></td></tr>
-                                    <tr><td><button form="back" name="submit" value="fertig" class="ui-button-icon" style="width:100%;">Fertig</button></td></tr>
-                                </table>
-                            </fieldset>            
-                        </div>
-               		</div>
-               	</div>	
-            </div>        
-            <div class="row">
-	        	<div class="row-height">
-	        		<div class="col-xs-12 col-md-12 col-md-height">
-	        			<div class="inside inside-full-height">
-	        				<fieldset>
-                                <legend>{|Lieferscheininhalt|}</legend>
-                                [LIEFERSCHEININHALT]
-                            </fieldset>            
-                        </div>
-               		</div>
-               	</div>	
-            </div>     
-            <div class="row">
-	        	<div class="row-height">
-	        		<div class="col-xs-12 col-md-12 col-md-height">
-	        			<div class="inside inside-full-height">
-	        				<fieldset>
-                                <legend>{|Paketinhalt|}</legend>
-                                [PAKETINHALT]
-                            </fieldset>            
-                        </div>
-               		</div>
-               	</div>	
-            </div> 
-            <input type="text" name="lieferschein" id="lieferschein" value="[LIEFERSCHEIN]" size="40" hidden>
-        </form>
-        <form action="index.php?module=versandpakete&action=edit&id=[VERSANDPAKET_ID]" id="back" method="post">
-        </form>                                    
-    </div>      
-</div>
-

www/pages/content/versandpakete_edit.tpl

@@ -1,147 +0,0 @@
-<div id="tabs">
-    <ul>
-        <li><a href="#tabs-1"></a></li>
-    </ul>
-    <div id="tabs-1">
-        [MESSAGE]        
-        [FORMHANDLEREVENT]
-        <form id="save" action="" method="post">   
-            <div class="row">
-            	<div class="row-height">
-            		<div class="col-xs-14 col-md-6 col-md-height">
-            			<div class="inside inside-full-height">
-            				<fieldset>
-                                <legend>
-                                    {|<b>Versandpaket Nr. [ID]</b> vom [DATUM]<span [NO_ADDRESS_HIDDEN]> f&uuml;r Adresse '[ADRESSE]'|}</span>
-                                </legend>
-                                [ICONS]
-                                <table width="100%" border="0" class="mkTableFormular">                                   
-                                    <tr>
-                                        <td>
-                                            {|Status|}:
-                                        </td>
-                                        <td>
-                                            <input type="text" name="" id="" value="[STATUS]" size="40" disabled>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            {|Versender|}:
-                                        </td>
-                                        <td>
-                                            <input type="text" name="" id="" value="[VERSENDER]" size="40" disabled>
-                                        </td>
-                                    </tr>    
-                                    <tr>
-                                        <td>
-                                            {|Versandart|}:
-                                        </td>
-                                        <td>
-                                            <input type="text" name="" id="" value="[VERSANDART]" size="40" disabled>
-                                        </td>
-                                    </tr>    
-                                    <tr>
-                                        <td>
-                                            {|Tracking|}:
-                                        </td>
-                                        <td>
-                                            <input type="text" name="tracking" id="tracking" value="[TRACKING]" size="40" [TRACKING_DISABLED]>
-                                            <a href="[PAKETMARKE_LINK]" [PAKETMARKE_HIDDEN]>
-                                                <img src="themes/new/images/portogo.png" border="0" title="Zur Paketmarke" style="top:6px; position:relative">
-                                            </a>
-                                            <a href="[TRACKING_LINK]" [TRACKING_LINK_HIDDEN]>
-                                                <img src="themes/new/images/forward.svg" border="0" title="Zum Tracking" style="top:6px; position:relative">
-                                            </a>
-                                        </td>
-                                    </tr>
-                                    <tr [TRACKING_LINK_EDIT_HIDDEN]>
-                                        <td>
-                                            {|Tracking link|}:
-                                        </td>
-                                        <td>
-                                            <input type="text" name="tracking_link" id="tracking_link" value="[TRACKING_LINK]" size="40" [TRACKING_DISABLED]>                                           
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            {|Gewicht Kg|}:
-                                        </td>
-                                        <td>
-                                            <input type="number" name="" id="" value="[GEWICHT]" size="40" disabled>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            {|Bemerkung|}:
-                                        </td>
-                                        <td>
-                                            <textarea name="bemerkung" id="bemerkung" rows="3" style="width:100%;">[BEMERKUNG]</textarea>
-                                        </td>
-                                    </tr>                                
-                                </table>
-                            </fieldset>            
-                        </div>
-               		</div>
-                    <div class="col-xs-14 col-md-6 col-md-height">
-            			<div class="inside inside-full-height">
-                            <fieldset >
-                                <legend>{|Lieferschein|}</legend>
-                                <table width="100%" border="0" class="mkTableFormular"> 
-                                    <tr [LIEFERSCHEIN_OHNE_POS_HIDDEN]>
-                                        <td>
-                                            {|Zugeordnet|}:
-                                        </td>
-                                        <td>
-                                            <input form="add" type="text" name="" id="" value="[LIEFERSCHEIN_OHNE_POS]" size="40" disabled>
-                                            <a href="index.php?module=lieferschein&action=edit&id=[LIEFERSCHEIN_OHNE_POS_ID]"><img src="themes/new/images/forward.svg" title="Zum Lieferschein" border="0" style="top:6px; position:relative"></a>
-                                        </td>
-                                    </tr>      
-                                    <tr [LIEFERSCHEIN_ADD_POS_HIDDEN]>
-                                        <td>
-                                            {|Lieferschein für Artikel hinzuf&uuml;gen|}:
-                                        </td>
-                                        <td>
-                                            <input form="add" type="text" name="lieferschein" id="lieferschein" value="[LIEFERSCHEIN]" autofocus size="40">
-                                        </td>
-                                    </tr>      
-                                </table>
-                            </fieldset>                                             
-                        </div>
-               		</div>
-                    <div class="col-xs-14 col-md-2 col-md-height">
-            			<div class="inside inside-full-height">
-            				<fieldset>
-                                <legend>{|Aktionen|}</legend>
-                                <table width="100%" border="0" class="mkTableFormular">
-                                    <tr><td><button form="save" name="submit" value="speichern" class="ui-button-icon" style="width:100%;">Speichern</button></td></tr>
-                                    <tr [LIEFERSCHEIN_ADD_POS_HIDDEN]><td><button form="add" name="submit" value="lieferschein_hinzufuegen" class="ui-button-icon" style="width:100%;">Artikel hinzuf&uuml;gen</button></td></tr>
-                                    <tr [LIEFERSCHEIN_ADD_POS_HIDDEN]><td><button form="add" name="submit" value="lieferschein_komplett_hinzufuegen" class="ui-button-icon" style="width:100%;">Alle Artikel hinzuf&uuml;gen</button></td></tr>
-                                    <tr [PAKETMARKE_ADD_HIDDEN]><td><button form="paketmarke" name="submit" value="paketmarke" class="ui-button-icon" style="width:100%;">Paketmarke drucken</button></td></tr>
-                                    <tr [ABSENDEN_HIDDEN]><td><button name="submit" value="absenden" class="ui-button-icon" style="width:100%;">Absenden</button></td></tr>
-                                    <tr [ABSCHLIESSEN_HIDDEN]><td><button name="submit" value="abschliessen" class="ui-button-icon" style="width:100%;">Abschlie&szlig;en</button></td></tr>
-                                </table>
-                            </fieldset>            
-                        </div>
-               		</div>
-               	</div>	
-            </div>          
-        </form>
-        <form id="add" action="index.php?module=versandpakete&action=add&id=[ID]" method="post">
-        </form>
-        <form id="paketmarke" action="index.php?module=versandpakete&action=paketmarke&id=[ID]" method="post">
-        </form>
-        <div class="row" [LIEFERSCHEIN_POS_HIDDEN]>
-        	<div class="row-height">
-        		<div class="col-xs-12 col-md-12 col-md-height">
-        			<div class="inside inside-full-height">
-        				<fieldset>
-                            <legend>{|Paketinhalt|}</legend>
-                            [PAKETINHALT]
-                        </fieldset>            
-                    </div>
-           		</div>
-           	</div>	
-        </div> 
-    </div>      
-</div>
-

www/pages/content/versandpakete_lieferung.tpl

@@ -1,50 +0,0 @@
-<div id="tabs">
-    <ul>
-            <li><a href="#tabs-1">[TABTEXT1]</a></li>
-    </ul>
-    <div id="tabs-1">
-       <div class="row">
-        	<div class="row-height">
-        		<div class="col-xs-12 col-md-12 col-md-height">
-        			<div class="inside inside-full-height">
-        				<fieldset>
-                            <legend>{|<b>Lieferung zu <font color="blue"><a href="index.php?module=lieferschein&action=edit&id=[BELEGID]">Lieferschein [BELEGNR]</a></font></b>|}</legend>                              
-                        </fieldset>            
-                    </div>
-           		</div>
-           	</div>	
-        </div>
-        [MESSAGE]        
-        <div class="row">
-        	<div class="row-height">
-        		<div class="col-xs-12 col-md-12 col-md-height">
-        			<div class="inside inside-full-height">
-                        <form action="index.php?module=versandpakete&action=stapelverarbeitung&from=lieferung&id=[FROMID]" id="frmauto" name="frmauto" method="post">
-                            [TAB1]
-                            <fieldset>
-                                <table>
-                                    <legend>Stapelverarbeitung</legend>
-                                    <tr>
-                                       <tr><td>{|Status|}:</td><td><select name="status">[STATUS_OPTIONS]</select></td></tr>
-                                       <td><input type="checkbox" value="1" id="autoalle" />&nbsp;alle markieren&nbsp;</td><td><input type="submit" class="btnBlue" name="status_setzen" value="{|Status setzen|}" /></td>
-                                    </tr>
-                                </table>
-                            </fieldset>
-                        </form>
-                    </div>
-           		</div>
-           	</div>	
-        </div>
-        [TAB1NEXT]
-    </div>
-</div>
-
-<script>
-
-    $('#autoalle').on('change',function(){
-      var wert = $(this).prop('checked');
-      $('#versandpakete_list').find('input[type="checkbox"]').prop('checked',wert);
-      $('#versandpakete_list').find('input[type="checkbox"]').first().trigger('change');
-    });
-  
-</script>

www/pages/content/versandpakete_lieferungen.tpl

@@ -1,32 +0,0 @@
-<div id="tabs">
-    <ul>
-            <li><a href="#tabs-1">[TABTEXT1]</a></li>
-    </ul>
-    <div id="tabs-1">
-        [MESSAGE]
-        <div class="filter-box filter-usersave">
-            <div class="filter-block filter-inline">
-                <div class="filter-title">{|Filter|}</div>
-                <ul class="filter-list">
-                    [STATUSFILTER]   
-                    <li class="filter-item">
-                        <label for="unterwegs" class="switch">
-                            <input type="checkbox" id="unterwegs">
-                            <span class="slider round"></span>
-                        </label>
-                        <label for="unterwegs">{|Unterwegs|}</label>
-                    </li>                 
-                    <li class="filter-item">
-                        <label for="geschlossene" class="switch">
-                            <input type="checkbox" id="geschlossene">
-                            <span class="slider round"></span>
-                        </label>
-                        <label for="geschlossene">{|Zzgl. abgeschlossen|}</label>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        [TAB1]
-        [TAB1NEXT]
-    </div>
-</div>

www/pages/content/versandpakete_list.tpl

@@ -1,53 +0,0 @@
-<div id="tabs">
-    <ul>
-            <li><a href="#tabs-1">[TABTEXT1]</a></li>
-    </ul>
-    <div id="tabs-1">
-        [MESSAGE]
-        <div class="filter-box filter-usersave">
-            <div class="filter-block filter-inline">
-                <div class="filter-title">{|Filter|}</div>
-                <ul class="filter-list">
-                    [STATUSFILTER]                    
-                    <li class="filter-item">
-                        <label for="geschlossene" class="switch">
-                            <input type="checkbox" id="geschlossene">
-                            <span class="slider round"></span>
-                        </label>
-                        <label for="geschlossene">{|Zzgl. abgeschlossen|}</label>
-                    </li>
-                    <li class="filter-item">
-                        <label for="stornierte" class="switch">
-                            <input type="checkbox" id="stornierte">
-                            <span class="slider round"></span>
-                        </label>
-                        <label for="stornierte">{|Zzgl. Papierkorb|}</label>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <form action="index.php?module=versandpakete&action=stapelverarbeitung" id="frmauto" name="frmauto" method="post">
-            [TAB1]
-            <fieldset>
-                <table>
-                    <legend>Stapelverarbeitung</legend>
-                    <tr>
-                       <tr><td>{|Status|}:</td><td><select name="status">[STATUS_OPTIONS]</select></td></tr>
-                       <td><input type="checkbox" value="1" id="autoalle" />&nbsp;alle markieren&nbsp;</td><td><input type="submit" class="btnBlue" name="status_setzen" value="{|Status setzen|}" /></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </form>
-        [TAB1NEXT]
-    </div>
-</div>
-
-<script>
-
-    $('#autoalle').on('change',function(){
-      var wert = $(this).prop('checked');
-      $('#versandpakete_list').find('input[type="checkbox"]').prop('checked',wert);
-      $('#versandpakete_list').find('input[type="checkbox"]').first().trigger('change');
-    });
-  
-</script>

www/pages/content/wareneingang_minidetail.tpl

@@ -1,11 +1,7 @@
-<!--
 <table id="table[MD5]">
-<tr><td>{|Lieferschein|}:</td><td><input type="checkbox" onchange="lsclick[MD5]();" id="beiback_lieferschein[MD5]" disabled value="1" [BEIPACK_LIEFERSCHEIN] /></td><td><span id="lsnr[MD5]">[LSNR]</span></td>
-<td><input type="button" value="{|Belege &auml;ndern|}" style="cursor:hand;" onclick="editclick[MD5]();" /></td>
-</tr>
+<tr><td>{|Lieferschein|}:</td><td><input type="checkbox" onchange="lsclick[MD5]();" id="beiback_lieferschein[MD5]" disabled value="1" [BEIPACK_LIEFERSCHEIN] /></td><td><span id="lsnr[MD5]">[LSNR]</span></td><td><input type="button" value="{|Belege &auml;ndern|}" style="cursor:hand;" onclick="editclick[MD5]();" /></td></tr>
 <tr><td>{|Rechnung|}:</td><td><input type="checkbox" onchange="reclick[MD5]();" id="beiback_rechnung[MD5]" disabled value="1" [BEIPACK_RECHNUNG] /></td><td><span id="renr[MD5]">[RENR]</span></td><td></td></tr>
 </table>
--->
 
 <table width="100%">
 <tr><td width="100%">[ARTIKEL]</td></tr>
@@ -114,4 +110,4 @@ $(document).ready(function() {
     });
   
 });
-</script>
+</script>

www/pages/content/wareneingang_paketannahme.tpl

@@ -12,10 +12,10 @@
         <div class="row-height">
           <div class="col-xs-12 col-md-8 col-md-height">
             <div class="inside inside-full-height">
+
               <div class="filter-box filter-usersave">
-                 <div class="filter-block filter-inline">
+                <div class="filter-block filter-inline">
                   <fieldset>
-                     <legend>{|Neuen Wareneingang erzeugen|}</legend>
                     <div class="filter-title">{|Filter|}</div>
                     <ul class="filter-list">
                       <li class="filter-item">

www/pages/content/wareneingang_paketinhalt.tpl

@@ -11,7 +11,9 @@
   <input type="hidden" id="paketannahme_id" value="[ID]" />
   [BEFORETAB1]
   <div id="tabs-1">
+
     [TAB1START]
+
     [MESSAGE1]
     <form action="" method="post">
       <div class="row">
@@ -24,50 +26,25 @@
                   <tr><td>{|Lieferschein-Nr.|}:</td><td><input type=text size="40" name="lsnr" value=[LSNR]></td></tr>
                   <tr><td>{|Rechnung-Nr.|}:</td><td><input type=text size="40" name="renr" value=[RENR]></td></tr>
                   <tr><td>{|Bemerkung|}:</td><td><textarea rows="5" cols="40" name="bemerkung">[BEMERKUNG]</textarea></td></tr>
-                  [ISLIEFERANTSTART]
-                  <tr><td>{|Ziellager|}:</td><td><input type=text size="40" name="ziellager" id="ziellager" value=[LAGER]><br><i>Wenn nicht angegeben, wird das Standardlager des Artikels bebucht.</i></td></tr>
-                  [ISLIEFERANTENDE]                
+                  <tr><td><input type="submit" name="speichern" class="btnGreenNew" value="Speichern"></td>
                 </table>
               </fieldset>
             </div>
           </div>
           <div class="col-xs-12 col-md-2 col-md-height">
             <div class="inside inside-full-height">
-                <fieldset>
-                    [BUTTONS]
-                    [BEFOREFRM]
-                    [AFTERFRM]
-                    [DISTRIINHALTBUTTONS]
-                    [BEFOREFRM]
-                    [AFTERFRM]         
-                    <button name="submit" class="ui-button-icon" style="width:100%;" value="speichern" hidden="true"></button>
-                    <table width="100%" border="0" class="mkTableFormular">
-                        <legend>{|Aktionen|}</legend>                        
-                        [BEFOREMANUELLERFASSEN]            
-                        <tr><td>               
-                            <button name="submit" class="ui-button-icon" style="width:100%;" value="manuellerfassen">{|Artikel manuell erfassen|}</button>
-                        </td></tr>
-                        [AFTERMANUELLERFASSEN]
-                        [ISLIEFERANTSTART]
-                        <tr><td>               
-                            <button name="submit" class="ui-button-icon" style="width:100%;" value="fuellen">{|Aus Bestellungen f&uuml;llen|}</button>
-                        </td></tr>
-                        <tr><td>               
-                            <button name="submit" class="ui-button-icon" style="width:100%;" value="leeren">{|Leeren|}</button>
-                        </td></tr>
-                        [ISLIEFERANTENDE]                
-                        <tr><td>               
-                            <button name="submit" class="ui-button-icon" style="width:100%;" value="speichern">{|Speichern|}</button>
-                        </td></tr>
-                        [ISLIEFERANTSTART]
-                        <tr><td>               
-                            <button name="submit" class="ui-button-icon" style="width:100%;" value="buchen">{|Buchen|}</button>
-                        </td></tr>
-                        [ISLIEFERANTENDE]                
-                        <tr><td>               
-                            <button name="submit" class="ui-button-icon" style="width:100%;" value="abschliessen">{|Abschlie&szlig;en|}</button>            
-                        </td></tr>
-                    </table>
+              <fieldset>
+                <legend>{|Aktionen|}</legend>
+                [BUTTONS]
+                [BEFOREFRM]
+                [AFTERFRM]
+                  [DISTRIINHALTBUTTONS]
+                  <input type="submit" name="abschliessen" id="btnabschliessen" class="btnGreenNew"  value="Paketinhalt ist erfasst">
+                  [BEFOREMANUELLERFASSEN]
+                  <input type="submit" name="manuellerfassen" class="btnBlueNew" value="Artikel manuell erfassen">
+                  [AFTERMANUELLERFASSEN]
+                [BEFOREFRM]
+                [AFTERFRM]
               </fieldset>
             </div>
           </div>
@@ -77,7 +54,7 @@
         <div class="row-height">
           <div class="col-xs-12 col-md-10 col-md-height">
             <div class="inside-white inside-full-height">
-                [TAB1]                                 
+              [TAB1]
             </div>
           </div>
         </div>

www/pages/content/welcome_settings.tpl

@@ -97,7 +97,11 @@
                     <td>{|Sprache|}:</td>
                     <td><select name="sprachebevorzugen" id="sprachebevorzugen">[SPRACHEBEVORZUGEN]</select></td>
                   </tr>
-                  <tr>
+					<tr>
+						<td>{|Sprache und Region|}:</td>
+						<td><input type="text" name="locale" id="locale" value="[LOCALE]" size="40" disabled="disabled"></td>
+					</tr>
+					<tr>
                     <td>{|Eigene Kalenderfarbe|}:</td>
                     <td><input type="text" name="defaultcolor" id="defaultcolor" value="[DEFAULTCOLOR]" size="80"></td>
                     <td></td>

www/pages/emailbackup.php

@@ -300,7 +300,7 @@ $width = array('10%'); // Fill out manually later
         $result[0]['email'],
         $result[0]['angezeigtername'],
         'OpenXE ERP: Testmail',
-        utf8_encode('Dies ist eine Testmail für Account "'.$result[0]['email'].'".'),
+        'Dies ist eine Testmail für Account "'.$result[0]['email'].'".',
         '',0,false,'','',
         true
       )

www/pages/exportbuchhaltung.php

@@ -609,7 +609,7 @@ class Exportbuchhaltung
                     $data['Soll-/Haben-Kennzeichen'] = $typ['kennzeichen_negativ']; // obligatory        
                 }
 
-                $data['EU-Steuersatz (Bestimmung)'] = number_format($tmpsteuersatz, 2, ',', '');
+                $data['EU-Steuersatz (Bestimmung)'] = number_format($$tmpsteuersatz, 2, ',', '');
                 $data['WKZ Umsatz'] = $row['pos_waehrung'];
                 $data['Belegfeld 1'] = mb_strimwidth($row['belegnr'],0,12);
                 $data['Konto'] = $row['kundennummer']; // obligatory

www/pages/lager.php

@@ -174,7 +174,31 @@ class Lager extends GenLager {
         // fester filter
         $where = " l.geloescht=0 AND l.id!=0 AND l.lager='$id' ";
         $count = "SELECT COUNT(id) FROM lager_platz WHERE geloescht=0 AND lager='$id' ";
-        break;  
+        break;
+      case 'lagerletztebewegungen':
+        $allowed['lager'] = array('letztebewegungen');
+
+        // headings
+
+        // headings
+
+        $heading = array('Datum', 'Lager', 'Menge', 'Nummer', 'Artikel', 'Richtung', 'Referenz', 'Bearbeiter', 'Projekt', 'Menü');
+        $width = array('1%', '5%', '5%', '5%', '5%', '5%', '40%', '20%', '5%', '1%');
+        $findcols = array('zeit', 'lager', 'menge', 'nummer', 'name_de', 'Richtung', 'referenz', 'bearbeiter', 'projekt', 'id');
+        $searchsql = array('lpi.referenz', 'lpi.bearbeiter', 'p.abkuerzung', 'DATE_FORMAT(lpi.zeit,\'%d.%m.%Y\')', 'lp.kurzbezeichnung', 'a.name_de', 'a.nummer');
+        $defaultorder = 10; //Optional wenn andere Reihenfolge gewuenscht
+        $alignright = array(3);
+        $defaultorderdesc = 1;
+        $menu = "-";
+
+        $sql = "SELECT SQL_CALC_FOUND_ROWS lpi.id,
+                DATE_FORMAT(lpi.zeit,'%d.%m.%Y') as datum, lp.kurzbezeichnung as lager, trim(lpi.menge)+0 as menge, 
+                a.nummer, a.name_de, if(lpi.eingang,'Eingang','Ausgang') as Richtung, substring(lpi.referenz,1,60) as referenz, lpi.bearbeiter as bearbeiter, p.abkuerzung as projekt, 
+                lpi.id FROM lager_bewegung lpi LEFT JOIN lager_platz as lp ON lpi.lager_platz=lp.id LEFT JOIN projekt p ON lpi.projekt=p.id LEFT JOIN artikel a ON a.id=lpi.artikel";
+
+
+        $count = "SELECT COUNT(lpi.id) FROM lager_bewegung lpi LEFT JOIN lager_platz as lp ON lpi.lager_platz=lp.id LEFT JOIN projekt p ON lpi.projekt=p.id ";
+        break;
       case 'lagertabelle':
         $allowed['lager'] = array('list');
         $defaultCountry = $app->erp->Firmendaten('land');
@@ -808,23 +832,7 @@ class Lager extends GenLager {
 
         $datecols = array(6);
 
-        $sql = "SELECT SQL_CALC_FOUND_ROWS 
-                    i.id,
-                    l.bezeichnung,
-                    lp.kurzbezeichnung as regal,
-                    a.nummer,
-                    a.name_de,
-                    IF(i.eingang,
-                    'Eingang',
-                    'Ausgang'),
-                    if(i.eingang,
-                    CONCAT('+',' ',trim(i.menge)+0),CONCAT('-',' ',trim(i.menge)+0)) as menge,
-                    ".$app->erp->FormatDateTimeShort('i.zeit')." as datum,
-                    i.referenz,
-                    i.bearbeiter,
-                    p.abkuerzung AS projektbewegung,
-                    i.id 
-                    FROM lager_bewegung i LEFT JOIN lager_platz lp ON lp.id=i.lager_platz LEFT JOIN lager l ON lp.lager = l.id LEFT JOIN artikel a ON i.artikel=a.id LEFT JOIN projekt p ON l.projekt = p.id";
+        $sql = "SELECT SQL_CALC_FOUND_ROWS i.id, l.bezeichnung, lp.kurzbezeichnung as regal, a.nummer, a.name_de, IF(i.eingang, 'Eingang', 'Ausgang'), if(i.eingang, CONCAT('+', ' ', trim(i.menge)+0), CONCAT('-', ' ', trim(i.menge)+0)) as menge, DATE_FORMAT(i.zeit,'%d.%m.%Y') as datum, i.referenz, i.bearbeiter, p.abkuerzung AS projektbewegung, i.id FROM lager_bewegung i LEFT JOIN lager_platz lp ON lp.id=i.lager_platz LEFT JOIN lager l ON lp.lager = l.id LEFT JOIN artikel a ON i.artikel=a.id LEFT JOIN projekt p ON l.projekt = p.id";
    
                
         $lager = $app->User->GetParameter("lager_bewegungalle_lager");
@@ -1099,7 +1107,6 @@ class Lager extends GenLager {
     $this->app->ActionHandler("buchenzwischenlagerdelete", "LagerBuchenZwischenlagerDelete");
     $this->app->ActionHandler("bucheneinlagern", "LagerBuchenEinlagern");
     $this->app->ActionHandler("buchenauslagern", "LagerBuchenAuslagern");
-    $this->app->ActionHandler("umlagernlieferschein", "LagerBuchenUmlagernLieferschein");
     $this->app->ActionHandler("artikelentfernenreserviert", "LagerArtikelEntfernenReserviert");
     $this->app->ActionHandler("letztebewegungen", "LagerLetzteBewegungen");
     $this->app->ActionHandler("schnelleinlagern", "LagerSchnellEinlagern");
@@ -3149,50 +3156,12 @@ class Lager extends GenLager {
     $this->app->Tpl->Parse('PAGE', 'tabview.tpl');
   }
 
-    function LagerBuchenUmlagernLieferschein() {
-        $this->LagerBuchenMenu();
-        $this->app->Tpl->AddMessage('info',"Gesamten Lagerplatz in einen neuen Lieferschein zur Umlagerung geben.");   
-        $this->app->YUI->AutoComplete("quelllager", "lagerplatz");    
-        $quelllager = $this->app->Secure->GetPOST('quelllager');
-
-        $submit = $this->app->Secure->GetPOST('submit');
-        if ($submit == 'lieferschein') {
-            $quellager_id = $this->app->erp->ReplaceLagerPlatz(true, $quelllager, true);
-            if (empty($quellager_id)) {
-                $this->app->Tpl->AddMessage('error',"Bitte Quelllager angeben.");
-            } else {
-                $sql = "SELECT artikel, SUM(menge) as menge FROM lager_platz_inhalt WHERE lager_platz=$quellager_id AND menge > 0 GROUP BY artikel";   
-          	    $positionen = $this->app->DB->SelectArr($sql);
-
-                if (empty($positionen)) {
-                    $this->app->Tpl->AddMessage('error',"Lager ist leer.");
-                } else {
-                    $id = $this->app->erp->ImportCreateLieferschein(null);
-                    if (!empty($id)) {
-                        $this->app->erp->LieferscheinProtokoll($id,"Lieferschein aus Lager ".$quelllager." erstellt");
-                        $this->app->DB->Update("UPDATE lieferschein SET standardlager = '$quellager_id' WHERE id = '$id' LIMIT 1");
-
-                        foreach ($positionen as $position) {
-                            //  public function AddLieferscheinPositionArtikelID($lieferschein, $artikel,$menge,$bezeichnung,$beschreibung,$datum)
-                            $this->app->erp->AddLieferscheinPositionArtikelID($id, $position['artikel'],$position['menge'],null,null,null);
-                        }
-
-                        $this->app->Location->execute("index.php?module=lieferschein&action=edit&id=$id");
-                    } else {
-                        $this->app->Tpl->AddMessage('error',"Lieferschein konnte nicht erzeugt werden.");
-                    }
-                }                
-            }
-        }
-
-        $this->app->Tpl->Set('QUELLLAGER',$this->app->erp->ReplaceLagerPlatz(false, $quellager_id, false));
-        $this->app->Tpl->Parse('PAGE', 'lager_umlagern_lieferschein.tpl');
-    }
-
   function LagerLetzteBewegungen()
   {
     $this->LagerBuchenMenu();
-    $this->app->YUI->TableSearch('TAB1', 'lager_allebewegungenlist','show','','',basename(__FILE__), __CLASS__);
+
+    $this->app->YUI->TableSearch('TAB1', 'lagerletztebewegungen','show','','',basename(__FILE__), __CLASS__);
+
     $this->app->Tpl->Parse('PAGE', 'tabview.tpl');
   } 
 
@@ -3202,7 +3171,6 @@ class Lager extends GenLager {
     $this->app->erp->Headlines('Lager');
     if($this->app->erp->Version()!=='stock') {
       $this->app->erp->MenuEintrag("index.php?module=lager&action=buchenauslagern&cmd=umlagern&id=$id", 'Umlagern');
-      $this->app->erp->MenuEintrag("index.php?module=lager&action=umlagernlieferschein&id=$id", 'Umlagern mit Lieferschein');
       $this->app->erp->MenuEintrag("index.php?module=lager&action=buchenauslagern&id=$id", 'Auslagern');
       $this->app->erp->MenuEintrag("index.php?module=lager&action=bucheneinlagern&id=$id", 'Einlagern');
       $this->app->erp->MenuEintrag("index.php?module=lager&action=buchenzwischenlager&id=$id", 'Zwischenlager');

www/pages/lieferschein.php

@@ -194,7 +194,6 @@ class Lieferschein extends GenLieferschein
     $this->app->ActionHandler("abschicken","LieferscheinAbschicken");
     $this->app->ActionHandler("abschliessen","LieferscheinAbschliessen");
     $this->app->ActionHandler("auslagern","LieferscheinAuslagern");
-    $this->app->ActionHandler("umlagern","LieferscheinUmlagern");
     $this->app->ActionHandler("pdf","LieferscheinPDF");
     $this->app->ActionHandler("inlinepdf","LieferscheinInlinePDF");
     $this->app->ActionHandler("protokoll","LieferscheinProtokoll");
@@ -454,107 +453,6 @@ class Lieferschein extends GenLieferschein
     exit;
   }
 
-  function LieferscheinUmlagern()
-  {
-    $id = (int)$this->app->Secure->GetGET("id");
-    $sql = "SELECT belegnr, name, status, umgelagert, standardlager FROM lieferschein WHERE id='$id'";
-    $lieferschein = $this->app->DB->SelectArr($sql)[0];
-    $belegnr = $lieferschein['belegnr'];
-    $name = $lieferschein['name'];
-    $status = $lieferschein['status'];
-    $umgelagert = $lieferschein['umgelagert'];
-
-    $quelllager = $this->app->Secure->GetPOST('quelllager');
-    $ziellager = $this->app->Secure->GetPOST('ziellager');
-
-    $quellager_id = $this->app->erp->ReplaceLagerPlatz(true, $quelllager, true);
-    $ziellager_id = $this->app->erp->ReplaceLagerPlatz(true, $ziellager, true);
-
-    if (empty($quellager_id)) {
-        $quellager_id = $lieferschein['standardlager'];
-    }
-
-    if ($status != "versendet" && $status != "freigegeben") {
-        exit();
-    }
-
-    $submit = $this->app->Secure->GetPOST('submit');
-    $erneut = $this->app->Secure->GetPOST('erneut');
-
-    if ($umgelagert && !$erneut) {
-        $this->app->Tpl->AddMessage('warning',"Lieferschein wurde bereits umgelagert.");
-    } else {
-        $this->app->Tpl->Set('ERNEUT_UMLAGERN_HIDDEN','hidden');
-        $submit = $this->app->Secure->GetPOST('submit');
-        if ($submit == 'umlagern') {
-
-            if (empty($quellager_id) || empty($ziellager_id)) {
-                $this->app->Tpl->AddMessage('error',"Bitte Quell- und Ziellager angeben.");
-            } else {
-                $sql = "SELECT artikel, name_de, a.nummer AS artikelnummer, SUM(menge) AS menge FROM lieferschein_position lp INNER JOIN artikel a ON a.id = lp.artikel WHERE lp.lieferschein = $id GROUP BY lp.artikel";
-	            $positionen = $this->app->DB->SelectArr($sql);
-
-                $menge_ok = true;
-                $fehlt = array();
-
-                foreach ($positionen as $position) {
-                    $sql = "SELECT SUM(menge) as menge FROM lager_platz_inhalt WHERE lager_platz=$quellager_id AND artikel = ".$position['artikel'];           
-            	    $menge_lager = $this->app->DB->SelectArr($sql)[0]['menge'];    
-
-                    if ($menge_lager < $position['menge']) {
-                        $menge_ok = false;
-                        $fehlt[] = array('Nummer' => $position['artikelnummer'],'Artikel' => $position['name_de'],'Lieferschein Menge' => (int) $position['menge'],'Lager Menge' => empty($menge_lager)?'-':(int) $menge_lager);
-                    }
-                }     
-
-                if ($menge_ok) {
-                   foreach ($positionen as $position) {                  
-
-                        $artikel = $position['artikel'];
-                        $menge = $position['menge'];
-                        $projekt = 0;
-                        $grund = "Umlagern Lieferschein ".$belegnr;
-                        $importer = "";
-                        $paketannahme = "";
-                        $doctype = "lieferschein";
-                        $doctypeId = $id;
-
-                        $this->app->erp->LagerAuslagernRegal($artikel,$quellager_id,$menge,$projekt,$grund,$importer,$doctype,$doctypeid);
-                        $this->app->erp->LagerEinlagern($artikel,$menge,$ziellager_id,$projekt,$grund,$importer,$paketannahme,$doctype,$doctypeid);
-                    }
-                    $sql = "UPDATE lieferschein SET umgelagert = 1 WHERE id = ".$id;
-                    $this->app->DB->Update($sql);
-                    $this->app->erp->LieferscheinProtokoll($id,"Lieferschein umgelagert von ".$quelllager." nach ".$ziellager);
-                    $this->app->Tpl->AddMessage('success','Erfolgreich umgelagert.');
-		    $erneut = null;
-                } else {                
-                    $this->app->Tpl->AddMessage('error',"Mengen im Quelllager nicht ausreichend.");   
-                    $tmp = new EasyTable($this->app);
-                    $tmp->headings = array('Nummer','Artikel','Lieferschein Menge','Lager Menge','');
-                    $tmp->datasets = $fehlt;
-                    $tmp->DisplayNew('MESSAGETABLE',null,"noAction");
-                } // Menge ok
-            } // Lager ok
-        } // umlagern
-    } // $umgelagert
-
-    $this->LieferscheinMenu();
-
-    $this->app->YUI->AutoComplete("quelllager", "lagerplatz");
-    $this->app->YUI->AutoComplete("ziellager", "lagerplatz");
-
-    $this->app->Tpl->Set('KURZUEBERSCHRIFT2',"Lieferschein $belegnr umlagern");
-    $this->app->Tpl->Set('TABTEXT',"Umlagern");
-
-    $this->app->Tpl->Set('QUELLLAGER',$this->app->erp->ReplaceLagerPlatz(false, $quellager_id, false));
-
-    $this->app->Tpl->Set('ZIELLAGER',$this->app->erp->ReplaceLagerPlatz(false, $ziellager_id, false));
-
-    $this->app->Tpl->Set('ERNEUT_CHECKED',$erneut?'checked':'');
-
-    $this->app->Tpl->Parse('PAGE',"lieferschein_umlagern.tpl");    
-  }
-
   function LieferscheinPaketmarke()
   {
     $id = (int)$this->app->Secure->GetGET("id");
@@ -570,8 +468,7 @@ class Lieferschein extends GenLieferschein
         AND v.aktiv = 1 AND v.ausprojekt = 0 AND v.modul != ''
         ORDER BY v.projekt DESC LIMIT 1");
     if (empty($result['modul']) || empty($result['id'])) {
-//      $this->app->Tpl->addMessage('error', 'Bitte zuerst eine gültige Versandart auswählen', false, 'PAGE');
-        $this->app->Location->execute("index.php?module=versandpakete&action=add&lieferschein=".$id);
+      $this->app->Tpl->addMessage('error', 'Bitte zuerst eine gültige Versandart auswählen', false, 'PAGE');
       return;
     }
     $versandmodul = $this->app->erp->LoadVersandModul($result['modul'], $result['id']);
@@ -639,16 +536,16 @@ class Lieferschein extends GenLieferschein
   function LieferscheinIconMenu($id,$prefix="")
   {
     $status = $this->app->DB->Select("SELECT status FROM lieferschein WHERE id='$id' LIMIT 1");
-    $adresse = $this->app->DB->Select("SELECT adresse FROM lieferschein WHERE id='$id' LIMIT 1");
     $lieferantenretoure = $this->app->DB->Select("SELECT lieferantenretoure FROM lieferschein WHERE id='$id' LIMIT 1");
 
-    if($adresse > 0 && ($status=="angelegt" || $status==""))
+    if($status=="angelegt" || $status=="")
       $freigabe = "<option value=\"freigabe\">Lieferschein freigeben</option>";
 
 
     if(($status=="versendet" || $status=="freigegeben") && $lieferantenretoure=="1")
       $abschliessen = "<option value=\"abschliessen\">Lieferschein abschliessen</option>";
 
+
     $checkifrgexists = $this->app->DB->Select("SELECT id FROM rechnung WHERE lieferschein='$id' LIMIT 1");
 
     $optioncustom = $this->Custom('option');
@@ -676,34 +573,27 @@ class Lieferschein extends GenLieferschein
 
     $mengegeliefert = $mengegeliefert + $this->app->DB->Select("SELECT ifnull(sum(olp.menge),0)+0 FROM objekt_lager_platz olp INNER JOIN lieferschein_position lp ON olp.objekt='lieferschein' AND olp.parameter=lp.id AND lp.lieferschein = '$id'");
 
-    if ($status == "versendet" || $status == "freigegeben") {
-
-        if($mengegeliefert <= 0 && $liefermengelagerartikel > 0  && $schreibschutz=="1" && $status!='angelegt' && $status!='storniert') {
-          $auslagern = '<option value="auslagern">Lieferschein auslagern</option>';
-        }else{
-          //12.07.19 LG lieferscheinlager als kommissionierverfahren zum if hinzugefuegt
-          $projektkommissionierverfahren = $this->app->DB->Select("SELECT kommissionierverfahren FROM projekt where id = '$projekt'");
-          if($projekt && ($projektkommissionierverfahren == "" || $projektkommissionierverfahren == "rechnungsmail" || $projektkommissionierverfahren == "lieferschein" || $projektkommissionierverfahren == "lieferscheinscan" || $projektkommissionierverfahren == "lieferscheinlager" || $projektkommissionierverfahren == "lieferscheinlagerscan"))
-          {
-            if(($bestellmengelagerartikel != $liefermengelagerartikel && $bestellmengelagerartikel != $liefermengelagerartikel2) && $status!='angelegt' && $status!='storniert') {
-                $auslagern = '<option value="auslagern">Lieferschein auslagern</option>';
-            }
-          }
-        }
-
-        $optionumlagern = "<option value=\"umlagern\">Lieferschein umlagern</option>";
-        $abschicken = "<option value=\"abschicken\">Lieferschein abschicken</option>";
-
-       if($status!="angelegt" && $lieferantenretoure!="1")
-        {
-          $alsrechnung = "<option value=\"rechnung\">als Rechnung weiterf&uuml;hren</option>";
-          if($this->app->erp->RechteVorhanden('lieferschein', 'proformarechnung') && $this->app->erp->ModulVorhanden('proformarechnung'))
-          {
-            $alsrechnung .= "<option value=\"proformarechnung\">als Proformarechnung weiterf&uuml;hren</option>";
-          }
+    if($mengegeliefert <= 0 && $liefermengelagerartikel > 0  && $schreibschutz=="1" && $status!='angelegt' && $status!='storniert') {
+      $auslagern = '<option value="auslagern">Lieferschein auslagern</option>';
+    }else{
+      //12.07.19 LG lieferscheinlager als kommissionierverfahren zum if hinzugefuegt
+      $projektkommissionierverfahren = $this->app->DB->Select("SELECT kommissionierverfahren FROM projekt where id = '$projekt'");
+      if($projekt && ($projektkommissionierverfahren == "" || $projektkommissionierverfahren == "rechnungsmail" || $projektkommissionierverfahren == "lieferschein" || $projektkommissionierverfahren == "lieferscheinscan" || $projektkommissionierverfahren == "lieferscheinlager" || $projektkommissionierverfahren == "lieferscheinlagerscan"))
+      {
+        if(($bestellmengelagerartikel != $liefermengelagerartikel && $bestellmengelagerartikel != $liefermengelagerartikel2) && $status!='angelegt' && $status!='storniert') {
+            $auslagern = '<option value="auslagern">Lieferschein auslagern</option>';
         }
+      }
     }
 
+    if($status!="angelegt" && $lieferantenretoure!="1")
+    {
+      $alsrechnung = "<option value=\"rechnung\">als Rechnung weiterf&uuml;hren</option>";
+      if($this->app->erp->RechteVorhanden('lieferschein', 'proformarechnung') && $this->app->erp->ModulVorhanden('proformarechnung'))
+      {
+        $alsrechnung .= "<option value=\"proformarechnung\">als Proformarechnung weiterf&uuml;hren</option>";
+      }
+    }
 
     if($this->app->erp->RechteVorhanden('belegeimport', 'belegcsvexport'))
     { 
@@ -738,7 +628,6 @@ class Lieferschein extends GenLieferschein
           $casehook
           $hookcase 
           $casebelegeimport
-          case 'umlagern': window.location.href='index.php?module=lieferschein&action=umlagern&id=%value%'; break;
         }
 
       }
@@ -749,17 +638,16 @@ class Lieferschein extends GenLieferschein
       <option value=\"storno\">Lieferschein stornieren</option>
       <option value=\"copy\">Lieferschein kopieren</option>
       $freigabe
-      $abschicken
+      <option value=\"abschicken\">Lieferschein abschicken</option>
       $abschliessen
       $auslagern
-      $optionumlagern
       $alsrechnung
       $optionbelegeimport
       <option value=\"pdf\">PDF &ouml;ffnen</option>
       $etiketten
       $optioncustom
       $optionhook
-      $hookoption         
+      $hookoption 
       </select>&nbsp;
 
     <a href=\"index.php?module=lieferschein&action=pdf&id=%value%\" title=\"PDF\"><img border=\"0\" src=\"./themes/new/images/pdf.svg\"></a>
@@ -1072,7 +960,6 @@ class Lieferschein extends GenLieferschein
 
     $this->app->Tpl->Set('VERSANDART',$auftragArr[0]['versandart']);
 
-/*
     $tracking = $this->app->DB->SelectArr("SELECT
        if(v.tracking_link IS NOT NULL AND v.tracking_link != '', CONCAT(UPPER(versandunternehmen), ':<a href=\"', v.tracking_link, '\">', v.tracking, '</a>'),
          if(versandunternehmen = 'dhlexpress' AND l.land = 'DE' AND v.tracking != '', CONCAT(UPPER(versandunternehmen), ':<a href=\"https://www.dhl.de/de/privatkunden/pakete-empfangen/verfolgen.html?piececode=', v.tracking, '\" target=\"_blank\">', v.tracking, '</a>'),
@@ -1131,32 +1018,7 @@ class Lieferschein extends GenLieferschein
 	if (!is_null($tmp)) {
 	    $this->app->Tpl->Set('TRACKING',implode(', ',$tmp));
 	}
-*/
 
-    $sql = "SELECT SQL_CALC_FOUND_ROWS
-                v.id,                   
-                v.tracking as tracking,
-                v.tracking_link
-            FROM 
-                versandpakete v
-            LEFT JOIN
-                versandpaket_lieferschein_position vlp ON v.id = vlp.versandpaket
-            LEFT JOIN
-                lieferschein_position lp ON lp.id = vlp.lieferschein_position
-            LEFT JOIN
-                lieferschein l ON lp.lieferschein = l.id
-            WHERE l.id = ".$id." OR v.lieferschein_ohne_pos = ".$id."
-            GROUP BY 
-               v.id
-            ";
-    $tracking = $this->app->DB->SelectArr($sql);
-    $tracking_list = array();
-    foreach ($tracking as $single_tracking) {
-        $tracking_list[] =  '<a href="index.php?module=versandpakete&action=edit&id='.$single_tracking['id'].'">Paket Nr.'.$single_tracking['id'].'</a>'.
-                            ' ('.'<a href="'.$single_tracking['tracking_link'].'">'.$single_tracking['tracking'].'</a>'.')';
-    }
-
-    $this->app->Tpl->Set('TRACKING',implode('<br>',$tracking_list));
 
     $returnOrders = (array)$this->app->DB->SelectArr(
       sprintf(
@@ -2397,18 +2259,6 @@ class Lieferschein extends GenLieferschein
               }
             }
           break;
-          case 'versanduebergabe':
-            if(!empty($selectedIds)) {
-              $this->app->DB->Update(
-                sprintf(
-                  "UPDATE `lieferschein` 
-                  SET `versand_status` = 1
-                  WHERE `id` IN (%s) AND `versand_status` = 0",
-                  implode(',' , $selectedIds)
-                )
-              );
-            }
-          break;
         }
       }      
     }

www/pages/managementboard.php

@@ -401,8 +401,7 @@ class Managementboard
     /** @var Rechnungslauf $obj */
     $obj = $this->app->erp->LoadModul('rechnungslauf');
     if($obj){
-      // $w[24] = $obj->RechnungslaufRechnungslauf(true); // This does not exist, presumably old xentral function
-      $w[24] = 0;    
+      $w[24] = $obj->RechnungslaufRechnungslauf(true);
     }
     else {
       $w[24] = 0;

www/pages/paketmarke.php

@@ -0,0 +1,56 @@
+<?php
+/*
+**** COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
+* 
+* Xentral (c) Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg, * Germany 2019
+*
+* This file is licensed under the Embedded Projects General Public License *Version 3.1. 
+*
+* You should have received a copy of this license from your vendor and/or *along with this file; If not, please visit www.wawision.de/Lizenzhinweis 
+* to obtain the text of the corresponding license version.  
+*
+**** END OF COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
+*/
+?>
+<?php
+class Paketmarke {
+  /** @var Application $app */
+  var $app;
+
+  /**
+   * Paketmarke constructor.
+   *
+   * @param Application $app
+   * @param bool        $intern
+   */
+  public function __construct($app, $intern = false) {
+    //parent::GenPaketmarke($app);
+    $this->app=$app;
+    if($intern) {
+      return;
+    }
+
+    $this->app->ActionHandlerInit($this);
+
+    $this->app->ActionHandler("create","PaketmarkeCreatePopup");
+    $this->app->ActionHandler("tracking","PaketmarkeTracking");
+
+    $this->app->ActionHandlerListen($app);
+
+  }
+
+  function PaketmarkeTracking()
+  {
+    $this->app->erp->Headlines('Paketmarken Drucker');
+
+    $this->app->Tpl->Set('PAGE',"Tracking-Nummer: <input type=\"text\" id=\"tracking\"><script type=\"text/javascript\">document.getElementById(\"tracking\").focus(); </script>");
+    //$this->app->BuildNavigation=false;
+  }
+
+  function PaketmarkeCreatePopup()
+  {
+    $this->app->erp->Headlines('Paketmarken Drucker');
+      $this->app->erp->PaketmarkeDHLEmbedded('PAGE','lieferschein');
+  }
+}
+

www/pages/projekt.php

@@ -2727,8 +2727,6 @@ class Projekt extends GenProjekt {
 
           if($oldProjectId > 0){
             $this->createAdditionalInputForCopyProjects($oldProjectId,$check);
-            $msg = $this->app->erp->base64_url_encode("<div class=\"info\">Das Projekt wurde erfolgreich kopiert.</div>");
-            $this->app->Location->execute("index.php?module=projekt&action=uebersicht&id=$check&msg=$msg");
             return;
           }
           $msg = $this->app->erp->base64_url_encode("<div class=\"info\">Das Projekt wurde erfolgreich angelegt.</div>");
@@ -2850,7 +2848,7 @@ class Projekt extends GenProjekt {
    * @param int $copyProjectId
    * @return bool
    */
-  public function createAdditionalInputForCopyProjects(int $oldProjectId, int $copyProjectId) 
+  public function createAdditionalInputForCopyProjects(int $oldProjectId, int $copyProjectId): bool
   {
     $hasAdditionalInput = false;
     $this->app->Tpl->Set('TOID',$copyProjectId);

www/pages/ticket.php

@@ -23,7 +23,6 @@ class Ticket {
         $this->app->ActionHandler("text_ausgang", "ticket_text_ausgang"); // Output text for iframe display
         $this->app->ActionHandler("statusfix", "ticket_statusfix"); // Xentral 20 compatibility set all ticket status to latest ticket_nachricht status
         $this->app->ActionHandler("datefix", "ticket_datefix"); // Xentral 20 compatibility set all ticket dates to latest ticket_nachricht date
-        $this->app->ActionHandler("dateien", "ticket_dateien"); 
         $this->app->DefaultActionHandler("list");
         $this->app->ActionHandlerListen($app);
     }
@@ -69,7 +68,7 @@ class Ticket {
                 $dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`,
                               CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',t.id,'\" />') AS `auswahl`";
 
-                $priobetreff = "if(t.prio!=1,REGEXP_REPLACE(t.betreff, '<[^>]*>+', ''),CONCAT('<b><font color=red>',REGEXP_REPLACE(t.betreff, '<[^>]*>+', ''),'</font></b>'))"; //+ #20230916 XSS
+                $priobetreff = "if(t.prio!=1,t.betreff,CONCAT('<b><font color=red>',t.betreff,'</font></b>'))";
 
                 $anzahlnachrichten = "(SELECT COUNT(n.id) FROM ticket_nachricht n WHERE n.ticket = t.schluessel)";
 
@@ -187,7 +186,6 @@ class Ticket {
   
         // Process multi action
         $auswahl = $this->app->Secure->GetPOST('auswahl');
-        $submit = $this->app->Secure->GetPOST('submit');
         $selectedIds = [];
         if(!empty($auswahl)) {
           foreach($auswahl as $selectedId) {
@@ -197,71 +195,19 @@ class Ticket {
             }
           }          
 
-            switch ($submit) {
-                case 'zuordnen':
-                    $status = $this->app->Secure->GetPOST('status');
-                    $warteschlange = $this->app->Secure->GetPOST('warteschlange');
+          $status = $this->app->Secure->GetPOST('status');
+          $warteschlange = $this->app->Secure->GetPOST('warteschlange');
 
-                    $sql = "UPDATE ticket SET status = '".$status."', zeit = NOW()";
-                    if ($warteschlange != '') {
-                        $sql .= ", warteschlange = '".explode(" ",$warteschlange)[0]."'";
-                    }
+          $sql = "UPDATE ticket SET status = '".$status."', zeit = NOW()";
+          if ($warteschlange != '') {
+            $sql .= ", warteschlange = '".explode(" ",$warteschlange)[0]."'";
+          }
 
-                    $sql .= " WHERE id IN (".implode(",",$selectedIds).")";
-                    $this->app->DB->Update($sql);
-                    $this->ticket_set_self_assigned_status($selectedIds);
-                break;
-                case 'spam_filter':
-                    if($this->app->erp->RechteVorhanden('ticketregeln','create')) {
-                        $sql = "UPDATE ticket SET status = 'spam', zeit = NOW()";
-                        $sql .= " WHERE id IN (".implode(",",$selectedIds).")";
-                        $this->app->DB->Update($sql);
+          $sql .= " WHERE id IN (".implode(",",$selectedIds).")";
+          $this->app->DB->Update($sql);
 
-                        foreach ($selectedIds as $selectedId) {
+          $this->ticket_set_self_assigned_status($selectedIds);
 
-                            // Check existing
-                            $sql = "SELECT id FROM ticket_regeln WHERE
-                                        empfaenger_email = '' AND
-                                        sender_email = (SELECT mailadresse FROM ticket WHERE id = ".$selectedId." LIMIT 1) AND
-                                        name = '' AND
-                                        betreff = '' AND
-                                        spam = 1 AND
-                                        aktiv = 1
-                                    ";
-
-                            if (!$this->app->DB->Select($sql)) {
-                                $sql = "INSERT IGNORE INTO ticket_regeln (
-                                                        empfaenger_email,
-                                                        sender_email,
-                                                        name,
-                                                        betreff,
-                                                        spam,
-                                                        persoenlich,
-                                                        prio,
-                                                        dsgvo,
-                                                        adresse,
-                                                        warteschlange,
-                                                        aktiv
-                                        ) VALUES (
-                                            '',
-                                            (SELECT mailadresse FROM ticket WHERE id = ".$selectedId." LIMIT 1),
-                                            '',
-                                            '',
-                                            1,
-                                            0,
-                                            0,
-                                            0,
-                                            0,
-                                            '',
-                                            1
-                                        )";
-                                $this->app->DB->Insert($sql);
-                            }
-                        }
-
-                    }
-                break;
-            }    
         }
 
         // List
@@ -276,10 +222,6 @@ class Ticket {
         $this->app->Tpl->Set('STATUS', $this->app->erp->GetStatusTicketSelect('neu'));
         $this->app->YUI->AutoComplete("warteschlange","warteschlangename");
 
-        if(!$this->app->erp->RechteVorhanden('ticketregeln','create')) {
-            $this->app->Tpl->Set('SPAM_HIDDEN', 'hidden');
-        }
-
         $this->app->YUI->TableSearch('TAB1', 'ticket_list', "show", "", "", basename(__FILE__), __CLASS__);
         $this->app->Tpl->Parse('PAGE', "ticket_list.tpl");
     }    
@@ -363,34 +305,11 @@ class Ticket {
         }
     }
 
-    function add_attachments_header_html($ticket_id, $templatepos) {
-        $file_attachments = $this->app->erp->GetDateiSubjektObjekt('%','ticket_header',$ticket_id);       
-
-        if (!empty($file_attachments)) {     
-          $this->app->Tpl->Add($templatepos,"<tr><td>{|Anh&auml;nge|}:</td><td><div class=\"ticket_attachments\">");
-          foreach ($file_attachments as $file_attachment) {
-
-              $this->app->Tpl->Add($templatepos,                    
-                  "<a href=\"index.php?module=dateien&action=send&id=".$file_attachment.
-                  "\">".
-                  htmlentities($this->app->erp->GetDateiName($file_attachment)).
-                  " (".
-                  $this->app->erp->GetDateiSize($file_attachment).
-                  ")".  
-                  "</a>".       
-                  "<br>");
-          }
-          $this->app->Tpl->Add($templatepos,"</div></td></tr>");
-        }
-    }
-
     function add_messages_tpl($messages, $showdrafts) {
 
         // Add Messages now
         foreach ($messages as $message) {
 
-            $message['betreff'] = strip_tags($message['betreff']); //+ #20230916 XSS
-
             // Clear this first
             $this->app->Tpl->Set('NACHRICHT_ANHANG',"");         
 
@@ -669,19 +588,6 @@ class Ticket {
         $this->app->Tpl->Parse('PAGE', "ticket_create.tpl");
     }
 
-
-    function ticket_menu($id) {
-        $this->app->erp->MenuEintrag("index.php?module=ticket&action=edit&id=$id", "Details");
-        $this->app->erp->MenuEintrag("index.php?module=ticket&action=list", "Zur&uuml;ck zur &Uuml;bersicht");
-        $anzahldateien = $this->app->erp->AnzahlDateien("ticket_header",$id);
-        if ($anzahldateien > 0) {
-            $anzahldateien = " (".$anzahldateien.")"; 
-        } else {
-            $anzahldateien="";
-        }
-        $this->app->erp->MenuEintrag("index.php?module=ticket&action=dateien&id=$id", "Dateien".$anzahldateien);
-    }
-
     function ticket_edit() {
         $id = $this->app->Secure->GetGET('id');
 
@@ -689,10 +595,10 @@ class Ticket {
             return;
         }
              
-        $this->ticket_menu($id);
-
         $this->app->Tpl->Set('ID', $id);
 
+        $this->app->erp->MenuEintrag("index.php?module=ticket&action=edit&id=$id", "Details");
+        $this->app->erp->MenuEintrag("index.php?module=ticket&action=list", "Zur&uuml;ck zur &Uuml;bersicht");
         $id = $this->app->Secure->GetGET('id');
         $cmd = $this->app->Secure->GetGET('cmd');
         $input = $this->GetInput();
@@ -716,8 +622,6 @@ class Ticket {
 
         $ticket_from_db = $this->app->DB->SelectArr($sql)[0];
 
-        $ticket_from_db['betreff'] = htmlentities(strip_tags($ticket_from_db['betreff'])); //+ #20230916 XSS
-
         foreach ($ticket_from_db as $key => $value) {
             $this->app->Tpl->Set(strtoupper($key), $value);   
         }
@@ -813,12 +717,7 @@ class Ticket {
         $messages = $this->get_messages_of_ticket($id, 1, NULL);
         $recv_messages = $this->get_messages_of_ticket($id,"n.versendet != 1",NULL);
 
-        $an_alle = false;
-
         switch ($submit) {
-          case 'neue_email_alle':
-            $an_alle = true;
-            // break omitted
           case 'neue_email':
 
             $senderName = $this->app->User->GetName()." (".$this->app->erp->GetFirmaAbsender().")";
@@ -834,24 +733,23 @@ class Ticket {
                 
                 if (!empty($recv_messages)) {
                     if (!str_starts_with(strtoupper($recv_messages[0]['betreff']),"RE:")) {
-                        $betreff = "RE: ".strip_tags($recv_messages[0]['betreff']); //+ #20230916 XSS
+                        $betreff = "RE: ".$recv_messages[0]['betreff'];
                     }
                     else {
-                        $betreff = strip_tags($recv_messages[0]['betreff']); //+ #20230916 XSS
+                        $betreff = $recv_messages[0]['betreff'];
                     }
 
+                    $sql = "SELECT GROUP_CONCAT(DISTINCT `value` ORDER BY `value` SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = ".$recv_messages[0]['id']." AND `value` <> '".$senderAddress."' AND type='to'";
+
                     $to = $recv_messages[0]['mail'];
-                    if ($an_alle) {
-                        $sql = "SELECT GROUP_CONCAT(DISTINCT `value` ORDER BY `value` SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = ".$recv_messages[0]['id']." AND `value` <> '".$senderAddress."' AND type='to'"; 
-                        $to_additional = $this->app->DB->Select($sql);
-                        if (!empty($to_additional)) {
-                          $to .= ", ".$to_additional;
-                        }
-                        $sql = "SELECT GROUP_CONCAT(DISTINCT `value` ORDER BY `value` SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = ".$recv_messages[0]['id']." AND `value` <> '".$senderAddress."' AND type='cc'";
-                        $cc = $this->app->DB->Select($sql);
-                    } else {
-                        $cc = null;
-                    }    
+                    $to_additional = $this->app->DB->Select($sql);
+
+                    if (!empty($to_additional)) {
+                      $to .= ", ".$to_additional;
+                    }
+
+                    $sql = "SELECT GROUP_CONCAT(DISTINCT `value` ORDER BY `value` SEPARATOR ', ') FROM ticket_header th WHERE th.ticket_nachricht = ".$recv_messages[0]['id']." AND `value` <> '".$senderAddress."' AND type='cc'";
+                    $cc = $this->app->DB->Select($sql);
                 }
                 else {
                     $betreff = $ticket_from_db['betreff'];
@@ -993,19 +891,11 @@ class Ticket {
         } 
 
         $this->add_messages_tpl($messages, false);
-        $this->add_attachments_header_html($id,'TICKET_ANHANG');
+
         $this->app->Tpl->Set('MESSAGE', $msg);
         $this->app->Tpl->Parse('PAGE', "ticket_edit.tpl");
     }
 
-    function ticket_dateien()
-    {
-        $id = $this->app->Secure->GetGET("id");
-        $this->ticket_menu($id);
-        $this->app->Tpl->Add('UEBERSCHRIFT'," (Dateien)");
-        $this->app->YUI->DateiUpload('PAGE',"ticket_header",$id);
-    }
-
   /**
    * Get all paramters from html form and save into $input
    */

www/pages/ticketregeln.php

@@ -30,36 +30,18 @@ class Ticketregeln {
         switch ($name) {
             case "ticketregeln_list":
                 $allowed['ticketregeln_list'] = array('list');
-                $heading = array('E-Mail Empfänger', 'E-Mail Verfasser', 'Verfasser Name', 'Betreff', 'Papierkorb', 'Persönlich', 'Prio', 'DSGVO','Adresse', 'Verantw.', 'Aktiv', 'Menü');
+                $heading = array('E-Mail Empfänger', 'E-Mail Verfasser', 'Verfasser Name', 'Betreff', 'Papierkorb', 'Persönlich', 'Prio', 'DSGVO', 'Verantw.', 'Aktiv', 'Menü');
                 $width = array('10%'); // Fill out manually later
 
-                $findcols = array('t.empfaenger_email', 't.sender_email', 't.name', 't.betreff', 't.spam', 't.persoenlich', 't.prio', 't.dsgvo', 'a.name', 't.warteschlange', 't.aktiv');
-                $searchsql = array('t.empfaenger_email', 't.sender_email', 't.name', 't.betreff', 't.spam', 't.persoenlich', 't.prio', 't.dsgvo', 'a.name', 't.warteschlange', 't.aktiv');
+                $findcols = array('t.empfaenger_email', 't.sender_email', 't.name', 't.betreff', 't.spam', 't.persoenlich', 't.prio', 't.dsgvo', 't.warteschlange', 't.aktiv');
+                $searchsql = array('t.empfaenger_email', 't.sender_email', 't.name', 't.betreff', 't.spam', 't.persoenlich', 't.prio', 't.dsgvo', 't.warteschlange', 't.aktiv');
 
                 $defaultorder = 1;
                 $defaultorderdesc = 0;
 
                 $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=ticketregeln&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=ticketregeln&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
 
-                $sql = "SELECT SQL_CALC_FOUND_ROWS t.id,
-                            t.empfaenger_email,
-                            t.sender_email,
-                            t.name,
-                            t.betreff,
-                            t.spam,
-                            t.persoenlich,
-                            t.prio,
-                            t.dsgvo,
-                            a.name,
-                            w.warteschlange,
-                            t.aktiv,
-                            t.id
-                        FROM 
-                            ticket_regeln t 
-                        LEFT JOIN warteschlangen w ON t.warteschlange = w.label
-                        LEFT JOIN adresse a ON t.adresse = a.id
-                            
-                ";
+                $sql = "SELECT SQL_CALC_FOUND_ROWS t.id, t.empfaenger_email, t.sender_email, t.name, t.betreff, t.spam, t.persoenlich, t.prio, t.dsgvo, w.warteschlange, t.aktiv, t.id FROM ticket_regeln t LEFT JOIN warteschlangen w ON t.warteschlange = w.label";
 
                 $where = "1";
                 $count = "SELECT count(DISTINCT id) FROM ticket_regeln WHERE $where";
@@ -129,7 +111,6 @@ class Ticketregeln {
                         n.mail,
                         t.quelle,
                         t.warteschlange,
-                        t.adresse,
                         ".$this->app->erp->FormatDateTimeShort('n.zeit','zeit').",
                         ".$this->app->erp->FormatDateTimeShort('n.zeitausgang','zeitausgang').",
                         n.versendet,
@@ -149,7 +130,6 @@ class Ticketregeln {
                 $input['sender_email'] = $last_message['mail'];
                 $input['name'] = $last_message['verfasser'];
                 $input['betreff'] = $last_message['betreff'];
-                $input['adresse'] = $last_message['adresse'];
                 $input['warteschlange'] = $last_message['warteschlange'];
 
                 $from_ticket = true;
@@ -159,7 +139,6 @@ class Ticketregeln {
                     'sender_email' => $last_message['mail'],
                     'name' => $last_message['verfasser'],
                     'betreff' => $last_message['betreff'],
-                    'adresse' => $last_message['adresse'],
                     'warteschlange' => $last_message['warteschlange'],
                     'aktiv' => 1
                 );
@@ -177,7 +156,6 @@ class Ticketregeln {
                 
                 // Add checks here
                 $input['warteschlange'] = explode(" ",$input['warteschlange'])[0]; // Just the label
-                $input['adresse'] = $this->app->erp->ReplaceAdresse(true,$input['adresse'],true); // Parameters: Target db?, value, from form?
 
                 $columns = "id, ";
                 $values = "$id, ";
@@ -215,22 +193,7 @@ class Ticketregeln {
 
         
             // Load values again from database
-            $result = $this->app->DB->SelectArr("SELECT t.id,
-                                                    t.empfaenger_email,
-                                                    t.sender_email,
-                                                    t.name,
-                                                    t.betreff,
-                                                    t.spam,
-                                                    t.persoenlich,
-                                                    t.prio,
-                                                    t.dsgvo,
-                                                    t.adresse,
-                                                    CONCAT(w.label,' ',w.warteschlange) as warteschlange,
-                                                    t.aktiv,
-                                                    t.id 
-                                                FROM ticket_regeln t
-                                                LEFT JOIN warteschlangen w on t.warteschlange = w.label 
-                                                WHERE t.id=$id")[0];
+            $result = $this->app->DB->SelectArr("SELECT t.id, t.empfaenger_email, t.sender_email, t.name, t.betreff, t.spam, t.persoenlich, t.prio, t.dsgvo, CONCAT(w.label,' ',w.warteschlange) as warteschlange, t.aktiv, t.id FROM ticket_regeln t LEFT JOIN warteschlangen w on t.warteschlange = w.label WHERE t.id=$id")[0];
         } 
        
 
@@ -243,16 +206,12 @@ class Ticketregeln {
          * 
          */
 
-        
-
       	$this->app->Tpl->Set('PRIO', $result['prio']==1?"checked":"");
       	$this->app->Tpl->Set('SPAM', $result['spam']==1?"checked":"");
       	$this->app->Tpl->Set('PERSOENLICH', $result['persoenlich']==1?"checked":"");
       	$this->app->Tpl->Set('DSGVO', $result['dsgvo']==1?"checked":"");
       	$this->app->Tpl->Set('AKTIV', $result['aktiv']==1?"checked":"");
 
-      	$this->app->Tpl->Set('ADRESSE', $this->app->erp->ReplaceAdresse(false,$result['adresse'],false));
-        $this->app->YUI->AutoComplete("adresse","adresse");
         $this->app->YUI->AutoComplete("warteschlange","warteschlangename");
 
 //        $this->SetInput($input);              
@@ -267,16 +226,15 @@ class Ticketregeln {
         //$input['EMAIL'] = $this->app->Secure->GetPOST('email');
         
         $input['empfaenger_email'] = $this->app->Secure->GetPOST('empfaenger_email');
-	    $input['sender_email'] = $this->app->Secure->GetPOST('sender_email');
-	    $input['name'] = $this->app->Secure->GetPOST('name');
-	    $input['betreff'] = $this->app->Secure->GetPOST('betreff');
-	    $input['spam'] = $this->app->Secure->GetPOST('spam');
-	    $input['persoenlich'] = $this->app->Secure->GetPOST('persoenlich');
-	    $input['prio'] = $this->app->Secure->GetPOST('prio');
-	    $input['dsgvo'] = $this->app->Secure->GetPOST('dsgvo');
-	    $input['adresse'] = $this->app->Secure->GetPOST('adresse');
-	    $input['warteschlange'] = $this->app->Secure->GetPOST('warteschlange');
-	    $input['aktiv'] = $this->app->Secure->GetPOST('aktiv');
+	$input['sender_email'] = $this->app->Secure->GetPOST('sender_email');
+	$input['name'] = $this->app->Secure->GetPOST('name');
+	$input['betreff'] = $this->app->Secure->GetPOST('betreff');
+	$input['spam'] = $this->app->Secure->GetPOST('spam');
+	$input['persoenlich'] = $this->app->Secure->GetPOST('persoenlich');
+	$input['prio'] = $this->app->Secure->GetPOST('prio');
+	$input['dsgvo'] = $this->app->Secure->GetPOST('dsgvo');
+	$input['warteschlange'] = $this->app->Secure->GetPOST('warteschlange');
+	$input['aktiv'] = $this->app->Secure->GetPOST('aktiv');
 	
 
         return $input;

www/pages/upgrade.php

@@ -41,71 +41,29 @@ class upgrade {
         $this->app->Tpl->Set('UPGRADE_VISIBLE', "hidden");
         $this->app->Tpl->Set('UPGRADE_DB_VISIBLE', "hidden");
 
+        //function upgrade_main(string $directory,bool $verbose, bool $check_git, bool $do_git, bool $export_db, bool $check_db, bool $do_db, bool $force, bool $connection, bool $origin) {  
+
         $directory = dirname(getcwd())."/upgrade";
 
         switch ($submit) {
             case 'check_upgrade':
                 $this->app->Tpl->Set('UPGRADE_VISIBLE', "");
                 unlink($logfile);
-                upgrade_main(   directory: $directory,
-                                verbose: $verbose,
-                                check_git: true,
-                                do_git: false,
-                                export_db: false,
-                                check_db: true,
-                                strict_db: false,
-                                do_db: false,
-                                force: $force,
-                                connection: false,
-                                origin: false
-                );
+                upgrade_main($directory,$verbose,true,false,false,true,false,$force,false,false);
             break;
             case 'do_upgrade':
                 unlink($logfile);
-                upgrade_main(   directory: $directory,
-                                verbose: $verbose,
-                                check_git: true,
-                                do_git: true,
-                                export_db: false,
-                                check_db: true,
-                                strict_db: false,
-                                do_db: true,
-                                force: $force,
-                                connection: false,
-                                origin: false
-                );
+                upgrade_main($directory,$verbose,true,true,false,true,true,$force,false,false);  
             break;    
             case 'check_db':
                 $this->app->Tpl->Set('UPGRADE_DB_VISIBLE', "");
                 unlink($logfile);
-                upgrade_main(   directory: $directory,
-                                verbose: $db_verbose,
-                                check_git: false,
-                                do_git: false,
-                                export_db: false,
-                                check_db: true,
-                                strict_db: false,
-                                do_db: false,
-                                force: $force,
-                                connection: false,
-                                origin: false
-                );
+                upgrade_main($directory,$db_verbose,false,false,false,true,false,$force,false,false);  
             break;    
             case 'do_db_upgrade':
                 $this->app->Tpl->Set('UPGRADE_DB_VISIBLE', "");
                 unlink($logfile);
-                upgrade_main(   directory: $directory,
-                                verbose: $db_verbose,
-                                check_git: false,
-                                do_git: false,
-                                export_db: false,
-                                check_db: true,
-                                strict_db: false,
-                                do_db: true,
-                                force: $force,
-                                connection: false,
-                                origin: false
-                );
+                upgrade_main($directory,$db_verbose,false,false,false,true,true,$force,false,false);  
             break;    
             case 'refresh':
             break;

www/pages/versandarten.php

@@ -56,7 +56,6 @@ class Versandarten {
 
     // ab hier alle Action Handler definieren die das Modul hat
     $this->app->ActionHandler("create", "VersandartenCreate");
-    $this->app->ActionHandler("neusonstige", "VersandartenNeuSonstige");
     $this->app->ActionHandler("edit", "VersandartenEdit");
     $this->app->ActionHandler("list", "VersandartenList");
     $this->app->ActionHandler("delete", "VersandartenDelete");
@@ -154,13 +153,6 @@ class Versandarten {
     return $erg;
   }
 
-    public function VersandartenNeuSonstige() {
-        $sql = "INSERT INTO versandarten (aktiv) VALUES (1)";
-        $this->app->DB->Insert($sql);
-        $id = $this->app->DB->GetInsertID();
-        $this->app->Location->execute('index.php?module=versandarten&action=edit&id='.$id);
-    }
-
   /** @noinspection PhpUnused */
   public function VersandartenEdit(): void
   {
@@ -177,8 +169,8 @@ class Versandarten {
     if($submit != '') { // handle form submit
       $form = $this->GetInput();
       $obj = $this->loadModule($form['modul'], $id);
-/*      if ($obj === null)
-        $error[] = sprintf('Versandart "%s" existiert nicht.', $form['selmodul']); */
+      if ($obj === null)
+        $error[] = sprintf('Versandart "%s" existiert nicht.', $form['selmodul']);
 
       if(trim($form['bezeichnung']) == '')
         $error[] = 'Bitte eine Bezeichnung angeben!';
@@ -842,4 +834,4 @@ class Versandarten {
 
     return $result;
   }
-}
+}

www/pages/welcome.php

@@ -1711,6 +1711,13 @@ $this->app->Tpl->Add('TODOFORUSER',"<tr><td width=\"90%\">".$tmp[$i]['aufgabe'].
     $this->app->Tpl->Set('STARTSEITE', $settings['startseite']);
     $this->app->Tpl->Set('DEFAULTCOLOR', $settings['defaultcolor']);
     $this->app->Tpl->Set('SPRACHEBEVORZUGEN', $this->languageSelectOptions($settings['sprachebevorzugen']));
+    
+    /** @var \Xentral\Components\I18n\Localization $localization */
+    if($localization=$this->app->Container->get('Localization')) {
+        $this->app->Tpl->Set('LOCALE', $localization->getLocale());
+    } else {
+        $this->app->Tpl->Set('LOCALE', 'Fehler!');
+    }
 
     if($settings['chat_popup']){
       $this->app->Tpl->Set('CHAT_POPUP', ' checked="checked" ');

www/setup/setup.css

@@ -1,3 +1,37 @@
+@font-face {
+	font-family: 'Inter';
+	font-style: normal;
+	font-weight: 400;
+	font-display: swap;
+	src: url('../themes/new/fonts/Inter-Regular.woff2?v=3.13') format("woff2"),
+	url('../themes/new/fonts/Inter-Regular.woff?v=3.13') format("woff");
+}
+@font-face {
+	font-family: 'Inter';
+	font-style: italic;
+	font-weight: 400;
+	font-display: swap;
+	src: url('../themes/new/fonts/Inter-Italic.woff2?v=3.13') format("woff2"),
+	url('../themes/new/fonts/Inter-Italic.woff?v=3.13') format("woff");
+}
+
+@font-face {
+	font-family: 'Inter';
+	font-style: normal;
+	font-weight: 700;
+	font-display: swap;
+	src: url('../themes/new/fonts/Inter-Bold.woff2?v=3.13') format("woff2"),
+	url('../themes/new/fonts/Inter-Bold.woff?v=3.13') format("woff");
+}
+@font-face {
+	font-family: 'Inter';
+	font-style: italic;
+	font-weight: 700;
+	font-display: swap;
+	src: url('../themes/new/fonts/Inter-BoldItalic.woff2?v=3.13') format("woff2"),
+	url('../themes/new/fonts/Inter-BoldItalic.woff?v=3.13') format("woff");
+}
+
 body {
 	font-size: 16px;
 	font-family: 'Inter', Arial, Helvetica, sans-serif;

www/themes/new/css/color3.css

@@ -64,6 +64,5 @@
     --error: #F05A5C;
     --error-color: #fff;
     --important: #68D4D0;
-/*    --success: #92EFB4;*/
-    --success: #2DCA73;
+    --success: #92EFB4;
 }

www/themes/new/css/login.css

@@ -1,3 +1,38 @@
+@font-face {
+    font-family: 'Inter';
+    font-style:  normal;
+    font-weight: 400;
+    font-display: swap;
+    src: url('../themes/new/fonts/Inter-Regular.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-Regular.woff?v=3.13') format("woff");
+}
+@font-face {
+    font-family: 'Inter';
+    font-style:  italic;
+    font-weight: 400;
+    font-display: swap;
+    src: url('../themes/new/fonts/Inter-Italic.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-Italic.woff?v=3.13') format("woff");
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style:  normal;
+    font-weight: 700;
+    font-display: swap;
+    src: url('../fonts/Inter-Bold.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-Bold.woff?v=3.13') format("woff");
+}
+@font-face {
+    font-family: 'Inter';
+    font-style:  italic;
+    font-weight: 700;
+    font-display: swap;
+    src: url('../fonts/Inter-BoldItalic.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-BoldItalic.woff?v=3.13') format("woff");
+}
+
+
 html {
     box-sizing: border-box;
 }

www/themes/new/css/login_styles.css

@@ -1,3 +1,39 @@
+
+@font-face {
+    font-family: 'Inter';
+    font-style:  normal;
+    font-weight: 400;
+    font-display: swap;
+    src: url('../fonts/Inter-Regular.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-Regular.woff?v=3.13') format("woff");
+}
+@font-face {
+    font-family: 'Inter';
+    font-style:  italic;
+    font-weight: 400;
+    font-display: swap;
+    src: url('../fonts/Inter-Italic.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-Italic.woff?v=3.13') format("woff");
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style:  normal;
+    font-weight: 700;
+    font-display: swap;
+    src: url('../fonts/Inter-Bold.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-Bold.woff?v=3.13') format("woff");
+}
+@font-face {
+    font-family: 'Inter';
+    font-style:  italic;
+    font-weight: 700;
+    font-display: swap;
+    src: url('../themes/new/fonts/Inter-BoldItalic.woff2?v=3.13') format("woff2"),
+    url('../themes/new/fonts/Inter-BoldItalic.woff?v=3.13') format("woff");
+}
+
+
 html {
     box-sizing: border-box;
 }

www/themes/new/css/styles.css

@@ -1,3 +1,71 @@
+@font-face {
+    font-family: 'Inter';
+    font-style:  normal;
+    font-weight: 400;
+    font-display: swap;
+    src: url('../fonts/Inter-Regular.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-Regular.woff?v=3.13') format("woff");
+}
+@font-face {
+    font-family: 'Inter';
+    font-style:  italic;
+    font-weight: 400;
+    font-display: swap;
+    src: url('../fonts/Inter-Italic.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-Italic.woff?v=3.13') format("woff");
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style:  normal;
+    font-weight: 500;
+    font-display: swap;
+    src: url("../fonts/Inter-Medium.woff2?v=3.13") format("woff2"),
+    url("../fonts/Inter-Medium.woff?v=3.13") format("woff");
+}
+@font-face {
+    font-family: 'Inter';
+    font-style:  italic;
+    font-weight: 500;
+    font-display: swap;
+    src: url("../fonts/Inter-MediumItalic.woff2?v=3.13") format("woff2"),
+    url("../fonts/Inter-MediumItalic.woff?v=3.13") format("woff");
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style:  normal;
+    font-weight: 600;
+    font-display: swap;
+    src: url("../fonts/Inter-SemiBold.woff2?v=3.13") format("woff2"),
+    url("../fonts/Inter-SemiBold.woff?v=3.13") format("woff");
+}
+@font-face {
+    font-family: 'Inter';
+    font-style:  italic;
+    font-weight: 600;
+    font-display: swap;
+    src: url("../fonts/Inter-SemiBoldItalic.woff2?v=3.13") format("woff2"),
+    url("../fonts/Inter-SemiBoldItalic.woff?v=3.13") format("woff");
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style:  normal;
+    font-weight: 700;
+    font-display: swap;
+    src: url('../fonts/Inter-Bold.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-Bold.woff?v=3.13') format("woff");
+}
+@font-face {
+    font-family: 'Inter';
+    font-style:  italic;
+    font-weight: 700;
+    font-display: swap;
+    src: url('../fonts/Inter-BoldItalic.woff2?v=3.13') format("woff2"),
+    url('../fonts/Inter-BoldItalic.woff?v=3.13') format("woff");
+}
+
 body {
     font-size: 12px;
 	font-family: 'Inter', Arial, Helvetica, sans-serif;
@@ -2961,6 +3029,7 @@ div.error > input[type=submit] {
 }
 
 .info,
+.success,
 .error2 {
     background-color: var(--info);
     color: var(--info-color);
@@ -2975,14 +3044,6 @@ div.error > input[type=submit] {
     background-size: 30px 30px;
 }
 
-.success {
-    background-color: var(--success);
-    color: var(--info-color);
-    background-image: url('../images/info.png');
-    background-size: 30px 30px;
-}
-
-
 .pull-right {
   float: right !important;
 }
@@ -3047,7 +3108,7 @@ div.error > input[type=submit] {
 #header div.headererror > input {
     padding: 5px;
     margin: 3px;
-    background-color: var(--success);
+    background-color: var(--info);
     color: var(--info-color);
 }
 
@@ -3663,8 +3724,9 @@ a.ui-tabs-anchor:hover {
 
 .greybox {
     background-color: lightgrey;
+    color: white;
     padding: 10px;
-    font-size: 1.2em;
+    font-size: 1.8em;
     text-align: right;
 }