Jingga/oms-Exchange
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Exchange.git synced 2026-02-16 09:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automated formatting changes

Browse Source
This commit is contained in:
Formatter Bot 2022-04-18 20:43:03 +00:00
parent 8936f6faf9
commit c20ad3c4d6
9 changed files with 58 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Admin/Install/Interfaces/DatabaseExchanger/ExchangeTrait.php
View File

@ -33,7 +33,7 @@ trait ExchangeTrait
*/ */
public function exchangeFromRequest(RequestAbstract $request) : array public function exchangeFromRequest(RequestAbstract $request) : array
{ {
$setting = ExchangeSettingMapper::get()->where('id', (int) $request->getData('setting'))->execute(); $setting = ExchangeSettingMapper::get()->where('id', (int) $request->getData('setting'))->execute();
$settingData = $setting->getData(); $settingData = $setting->getData();
$lang = []; $lang = [];
@ -44,21 +44,21 @@ trait ExchangeTrait
$importConnection = ($settingData['import']['db']['self'] ?? true) $importConnection = ($settingData['import']['db']['self'] ?? true)
? $this->local ?? new NullConnection() ? $this->local ?? new NullConnection()
: ConnectionFactory::create([ : ConnectionFactory::create([
'db' => $settingData['import']['db']['db'], 'db' => $settingData['import']['db']['db'],
'host' => $settingData['import']['db']['host'], 'host' => $settingData['import']['db']['host'],
'port' => $settingData['import']['db']['port'], 'port' => $settingData['import']['db']['port'],
'database' => $settingData['import']['db']['database'], 'database' => $settingData['import']['db']['database'],
'login' => $settingData['import']['db']['login'], 'login' => $settingData['import']['db']['login'],
'password' => $settingData['import']['db']['password'], 'password' => $settingData['import']['db']['password'],
]); ]);
$exportConnection = ($settingData['export']['db']['self'] ?? true) $exportConnection = ($settingData['export']['db']['self'] ?? true)
? $this->remote ?? new NullConnection() ? $this->remote ?? new NullConnection()
: ConnectionFactory::create([ : ConnectionFactory::create([
'db' => $settingData['export']['db']['db'], 'db' => $settingData['export']['db']['db'],
'host' => $settingData['export']['db']['host'], 'host' => $settingData['export']['db']['host'],
'port' => $settingData['export']['db']['port'], 'port' => $settingData['export']['db']['port'],
'database' => $settingData['export']['db']['database'], 'database' => $settingData['export']['db']['database'],
'login' => $settingData['export']['db']['login'], 'login' => $settingData['export']['db']['login'],
'password' => $settingData['export']['db']['password'], 'password' => $settingData['export']['db']['password'],
]); ]);

1
Admin/Install/Interfaces/DatabaseExchanger/Exporter.php
View File

@ -57,7 +57,6 @@ final class Exporter extends ExporterAbstract
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* *
*
* @return array * @return array
* *
* @since 1.0.0 * @since 1.0.0

1
Admin/Install/Interfaces/DatabaseExchanger/Importer.php
View File

@ -49,7 +49,6 @@ final class Importer extends ImporterAbstract
*/ */
public function import(\DateTime $start, \DateTime $end) : void public function import(\DateTime $start, \DateTime $end) : void
{ {
} }
/** /**

38
Admin/Install/Interfaces/DatabaseExchanger/Lang/en.lang.php
View File

@ -14,23 +14,23 @@ declare(strict_types=1);
*/ */
return [ return [
'DatabaseExchanger' => 'Database Exchanger', 'DatabaseExchanger' => 'Database Exchanger',
'DatabaseType' => 'Database Type', 'DatabaseType' => 'Database Type',
'Settings' => 'Settings', 'Settings' => 'Settings',
'Src' => 'Src', 'Src' => 'Src',
'Dest' => 'Dest', 'Dest' => 'Dest',
'Match' => 'Match', 'Match' => 'Match',
'Save' => 'Save', 'Save' => 'Save',
'Table' => 'Table', 'Table' => 'Table',
'Type' => 'Type', 'Type' => 'Type',
'Field' => 'Field', 'Field' => 'Field',
'Protocol' => 'Protocol', 'Protocol' => 'Protocol',
'Settings' => 'Settings', 'Settings' => 'Settings',
'Import' => 'Import', 'Import' => 'Import',
'Export' => 'Export', 'Export' => 'Export',
'Connection' => 'Connection', 'Connection' => 'Connection',
'Self' => 'Self', 'Self' => 'Self',
'Custom' => 'Custom', 'Custom' => 'Custom',
'SrcType' => 'Src-Type', 'SrcType' => 'Src-Type',
'DestType' => 'Dest-Type', 'DestType' => 'Dest-Type',
'IsPrimary' => 'Is Primary?', 'IsPrimary' => 'Is Primary?',
]; ];

34
Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
View File

@ -26,7 +26,7 @@ $lang = $this->getData('lang') ?? [];
// @todo: show job reference // @todo: show job reference
$interface = $this->getData('interface'); $interface = $this->getData('interface');
$settings = $interface->getSettings(); $settings = $interface->getSettings();
$currentSetting = $settings[(int) ($this->request->getData('setting') ?? 0)] ?? new NullExchangeSetting(); $currentSetting = $settings[(int) ($this->request->getData('setting') ?? 0)] ?? new NullExchangeSetting();
$settingData = $currentSetting->getData(); $settingData = $currentSetting->getData();
@ -43,21 +43,21 @@ if (!empty($settingData)) {
$importConnection = ($settingData['import']['db']['self'] ?? true) $importConnection = ($settingData['import']['db']['self'] ?? true)
? $this->getData('db') ?? new NullConnection() ? $this->getData('db') ?? new NullConnection()
: ConnectionFactory::create([ : ConnectionFactory::create([
'db' => $settingData['import']['db']['db'], 'db' => $settingData['import']['db']['db'],
'host' => $settingData['import']['db']['host'], 'host' => $settingData['import']['db']['host'],
'port' => $settingData['import']['db']['port'], 'port' => $settingData['import']['db']['port'],
'database' => $settingData['import']['db']['database'], 'database' => $settingData['import']['db']['database'],
'login' => $settingData['import']['db']['login'], 'login' => $settingData['import']['db']['login'],
'password' => $settingData['import']['db']['password'], 'password' => $settingData['import']['db']['password'],
]); ]);
$exportConnection = ($settingData['export']['db']['self'] ?? true) $exportConnection = ($settingData['export']['db']['self'] ?? true)
? $this->getData('db') ?? new NullConnection() ? $this->getData('db') ?? new NullConnection()
: ConnectionFactory::create([ : ConnectionFactory::create([
'db' => $settingData['export']['db']['db'], 'db' => $settingData['export']['db']['db'],
'host' => $settingData['export']['db']['host'], 'host' => $settingData['export']['db']['host'],
'port' => $settingData['export']['db']['port'], 'port' => $settingData['export']['db']['port'],
'database' => $settingData['export']['db']['database'], 'database' => $settingData['export']['db']['database'],
'login' => $settingData['export']['db']['login'], 'login' => $settingData['export']['db']['login'],
'password' => $settingData['export']['db']['password'], 'password' => $settingData['export']['db']['password'],
]); ]);
@ -101,8 +101,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
<tr><td><label for="iDatabaseType"><?= $lang['Connection']; ?></label> <tr><td><label for="iDatabaseType"><?= $lang['Connection']; ?></label>
<tr><td> <tr><td>
<select id="iConnection" name="type"> <select id="iConnection" name="type">
<option value="<?= $lang['Custom'] ?>"<?= ($settingData['import']['db']['self'] ?? false) ? '' : ' selected' ?>><?= $lang['Custom']; ?> <option value="<?= $lang['Custom']; ?>"<?= ($settingData['import']['db']['self'] ?? false) ? '' : ' selected'; ?>><?= $lang['Custom']; ?>
<option value="<?= $lang['Self'] ?>" <?= ($settingData['import']['db']['self'] ?? false) ? ' selected' : '' ?>><?= $lang['Self']; ?> <option value="<?= $lang['Self']; ?>" <?= ($settingData['import']['db']['self'] ?? false) ? ' selected' : ''; ?>><?= $lang['Self']; ?>
</select> </select>
<tr><td><label for="iDatabaseType"><?= $lang['Type']; ?></label> <tr><td><label for="iDatabaseType"><?= $lang['Type']; ?></label>
<tr><td> <tr><td>
@ -140,8 +140,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
<tr><td><label for="iDatabaseType"><?= $lang['Connection']; ?></label> <tr><td><label for="iDatabaseType"><?= $lang['Connection']; ?></label>
<tr><td> <tr><td>
<select id="iConnection" name="type"> <select id="iConnection" name="type">
<option value="<?= $lang['Custom'] ?>"<?= ($settingData['export']['db']['self'] ?? false) ? '' : ' selected' ?>><?= $lang['Custom']; ?> <option value="<?= $lang['Custom']; ?>"<?= ($settingData['export']['db']['self'] ?? false) ? '' : ' selected'; ?>><?= $lang['Custom']; ?>
<option value="<?= $lang['Self'] ?>" <?= ($settingData['export']['db']['self'] ?? false) ? ' selected' : '' ?>><?= $lang['Self']; ?> <option value="<?= $lang['Self']; ?>" <?= ($settingData['export']['db']['self'] ?? false) ? ' selected' : ''; ?>><?= $lang['Self']; ?>
</select> </select>
<tr><td><label for="iDatabaseType"><?= $lang['Type']; ?></label> <tr><td><label for="iDatabaseType"><?= $lang['Type']; ?></label>
<tr><td> <tr><td>
@ -222,8 +222,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
foreach ($currentImportTableFields as $field) : foreach ($currentImportTableFields as $field) :
?> ?>
<tr> <tr>
<td><label class="radio" for="import-<?= $field['COLUMN_NAME'] ?>"> <td><label class="radio" for="import-<?= $field['COLUMN_NAME']; ?>">
<input id="import-<?= $field['COLUMN_NAME'] ?>" type="radio" name="import-field" value="1"> <input id="import-<?= $field['COLUMN_NAME']; ?>" type="radio" name="import-field" value="1">
<span class="checkmark"></span> <span class="checkmark"></span>
</label> </label>
<td><?= $field['DATA_TYPE']; ?> <td><?= $field['DATA_TYPE']; ?>
@ -254,8 +254,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
foreach ($currentExportTableFields as $field) : foreach ($currentExportTableFields as $field) :
?> ?>
<tr> <tr>
<td><label class="radio" for="export-<?= $field['COLUMN_NAME'] ?>"> <td><label class="radio" for="export-<?= $field['COLUMN_NAME']; ?>">
<input id="export-<?= $field['COLUMN_NAME'] ?>" type="radio" name="export-field" value="1"> <input id="export-<?= $field['COLUMN_NAME']; ?>" type="radio" name="export-field" value="1">
<span class="checkmark"></span> <span class="checkmark"></span>
</label> </label>
<td><?= $field['DATA_TYPE']; ?> <td><?= $field['DATA_TYPE']; ?>

10
Controller/ApiController.php
View File

@ -19,15 +19,13 @@ use Modules\Exchange\Models\ExchangeLogMapper;
use Modules\Exchange\Models\ExchangeSetting; use Modules\Exchange\Models\ExchangeSetting;
use Modules\Exchange\Models\ExchangeSettingMapper; use Modules\Exchange\Models\ExchangeSettingMapper;
use Modules\Exchange\Models\InterfaceManager; use Modules\Exchange\Models\InterfaceManager;
use Modules\Exchange\Models\PermissionCategory;
use Modules\Exchange\Models\InterfaceManagerMapper; use Modules\Exchange\Models\InterfaceManagerMapper;
use Modules\Exchange\Models\PermissionCategory;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\NullCollection; use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\Media\Models\UploadFile;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Autoloader;
use phpOMS\DataStorage\Database\Connection\ConnectionFactory; use phpOMS\DataStorage\Database\Connection\ConnectionFactory;
use phpOMS\DataStorage\Database\Connection\NullConnection; use phpOMS\DataStorage\Database\Connection\NullConnection;
use phpOMS\Localization\L11nManager; use phpOMS\Localization\L11nManager;
@ -37,8 +35,6 @@ use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\System\File\Local\Directory;
use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\Utils\StringUtils; use phpOMS\Utils\StringUtils;
/** /**
@ -423,8 +419,8 @@ final class ApiController extends Controller
*/ */
private function createSettingFromRequest(RequestAbstract $request) : ExchangeSetting private function createSettingFromRequest(RequestAbstract $request) : ExchangeSetting
{ {
$setting = new ExchangeSetting(); $setting = new ExchangeSetting();
$setting->title = $request->getData('title') ?? ''; $setting->title = $request->getData('title') ?? '';
$setting->exchange = (int) ($request->getData('id') ?? 0); $setting->exchange = (int) ($request->getData('id') ?? 0);
$setting->setData(\json_decode((string) ($request->getData('data') ?? '{}'), true)); $setting->setData(\json_decode((string) ($request->getData('data') ?? '{}'), true));

6
Models/ExchangeSettingMapper.php
View File

@ -34,9 +34,9 @@ final class ExchangeSettingMapper extends DataMapperFactory
*/ */
public const COLUMNS = [ public const COLUMNS = [
'exchange_settings_id' => ['name' => 'exchange_settings_id', 'type' => 'int', 'internal' => 'id'], 'exchange_settings_id' => ['name' => 'exchange_settings_id', 'type' => 'int', 'internal' => 'id'],
'exchange_settings_title' => ['name' => 'exchange_settings_title', 'type' => 'string', 'internal' => 'title'], 'exchange_settings_title' => ['name' => 'exchange_settings_title', 'type' => 'string', 'internal' => 'title'],
'exchange_settings_data' => ['name' => 'exchange_settings_data', 'type' => 'Json', 'internal' => 'data'], 'exchange_settings_data' => ['name' => 'exchange_settings_data', 'type' => 'Json', 'internal' => 'data'],
'exchange_settings_job' => ['name' => 'exchange_settings_job', 'type' => 'int', 'internal' => 'job'], 'exchange_settings_job' => ['name' => 'exchange_settings_job', 'type' => 'int', 'internal' => 'job'],
'exchange_settings_exchange' => ['name' => 'exchange_settings_exchange', 'type' => 'int', 'internal' => 'exchange'], 'exchange_settings_exchange' => ['name' => 'exchange_settings_exchange', 'type' => 'int', 'internal' => 'exchange'],
]; ];

12
Models/InterfaceManagerMapper.php
View File

@ -35,12 +35,12 @@ final class InterfaceManagerMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'exchange_interface_id' => ['name' => 'exchange_interface_id', 'type' => 'int', 'internal' => 'id'], 'exchange_interface_id' => ['name' => 'exchange_interface_id', 'type' => 'int', 'internal' => 'id'],
'exchange_interface_title' => ['name' => 'exchange_interface_title', 'type' => 'string', 'internal' => 'title'], 'exchange_interface_title' => ['name' => 'exchange_interface_title', 'type' => 'string', 'internal' => 'title'],
'exchange_interface_version' => ['name' => 'exchange_interface_version', 'type' => 'string', 'internal' => 'version'], 'exchange_interface_version' => ['name' => 'exchange_interface_version', 'type' => 'string', 'internal' => 'version'],
'exchange_interface_export' => ['name' => 'exchange_interface_export', 'type' => 'bool', 'internal' => 'hasExport'], 'exchange_interface_export' => ['name' => 'exchange_interface_export', 'type' => 'bool', 'internal' => 'hasExport'],
'exchange_interface_import' => ['name' => 'exchange_interface_import', 'type' => 'bool', 'internal' => 'hasImport'], 'exchange_interface_import' => ['name' => 'exchange_interface_import', 'type' => 'bool', 'internal' => 'hasImport'],
'exchange_interface_website' => ['name' => 'exchange_interface_website', 'type' => 'string', 'internal' => 'website'], 'exchange_interface_website' => ['name' => 'exchange_interface_website', 'type' => 'string', 'internal' => 'website'],
'exchange_interface_media' => ['name' => 'exchange_interface_media', 'type' => 'int', 'internal' => 'source'], 'exchange_interface_media' => ['name' => 'exchange_interface_media', 'type' => 'int', 'internal' => 'source'],
'exchange_interface_created_at' => ['name' => 'exchange_interface_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], 'exchange_interface_created_at' => ['name' => 'exchange_interface_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
'exchange_interface_created_by' => ['name' => 'exchange_interface_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'exchange_interface_created_by' => ['name' => 'exchange_interface_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],