mirror of
https://github.com/Karaka-Management/oms-Exchange.git
synced 2026-01-11 16:48:42 +00:00
Automated formatting changes
This commit is contained in:
Formatter Bot
parent
8936f6faf9
commit
c20ad3c4d6
|
|
@ -33,7 +33,7 @@ trait ExchangeTrait
|
|||
*/
|
||||
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();
|
||||
|
||||
$lang = [];
|
||||
|
|
@ -44,21 +44,21 @@ trait ExchangeTrait
|
|||
$importConnection = ($settingData['import']['db']['self'] ?? true)
|
||||
? $this->local ?? new NullConnection()
|
||||
: ConnectionFactory::create([
|
||||
'db' => $settingData['import']['db']['db'],
|
||||
'host' => $settingData['import']['db']['host'],
|
||||
'port' => $settingData['import']['db']['port'],
|
||||
'db' => $settingData['import']['db']['db'],
|
||||
'host' => $settingData['import']['db']['host'],
|
||||
'port' => $settingData['import']['db']['port'],
|
||||
'database' => $settingData['import']['db']['database'],
|
||||
'login' => $settingData['import']['db']['login'],
|
||||
'login' => $settingData['import']['db']['login'],
|
||||
'password' => $settingData['import']['db']['password'],
|
||||
]);
|
||||
$exportConnection = ($settingData['export']['db']['self'] ?? true)
|
||||
? $this->remote ?? new NullConnection()
|
||||
: ConnectionFactory::create([
|
||||
'db' => $settingData['export']['db']['db'],
|
||||
'host' => $settingData['export']['db']['host'],
|
||||
'port' => $settingData['export']['db']['port'],
|
||||
'db' => $settingData['export']['db']['db'],
|
||||
'host' => $settingData['export']['db']['host'],
|
||||
'port' => $settingData['export']['db']['port'],
|
||||
'database' => $settingData['export']['db']['database'],
|
||||
'login' => $settingData['export']['db']['login'],
|
||||
'login' => $settingData['export']['db']['login'],
|
||||
'password' => $settingData['export']['db']['password'],
|
||||
]);
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ final class Exporter extends ExporterAbstract
|
|||
*
|
||||
* @param RequestAbstract $request Request
|
||||
*
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @since 1.0.0
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ final class Importer extends ImporterAbstract
|
|||
*/
|
||||
public function import(\DateTime $start, \DateTime $end) : void
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -14,23 +14,23 @@ declare(strict_types=1);
|
|||
*/
|
||||
return [
|
||||
'DatabaseExchanger' => 'Database Exchanger',
|
||||
'DatabaseType' => 'Database Type',
|
||||
'Settings' => 'Settings',
|
||||
'Src' => 'Src',
|
||||
'Dest' => 'Dest',
|
||||
'Match' => 'Match',
|
||||
'Save' => 'Save',
|
||||
'Table' => 'Table',
|
||||
'Type' => 'Type',
|
||||
'Field' => 'Field',
|
||||
'Protocol' => 'Protocol',
|
||||
'Settings' => 'Settings',
|
||||
'Import' => 'Import',
|
||||
'Export' => 'Export',
|
||||
'Connection' => 'Connection',
|
||||
'Self' => 'Self',
|
||||
'Custom' => 'Custom',
|
||||
'SrcType' => 'Src-Type',
|
||||
'DestType' => 'Dest-Type',
|
||||
'IsPrimary' => 'Is Primary?',
|
||||
'DatabaseType' => 'Database Type',
|
||||
'Settings' => 'Settings',
|
||||
'Src' => 'Src',
|
||||
'Dest' => 'Dest',
|
||||
'Match' => 'Match',
|
||||
'Save' => 'Save',
|
||||
'Table' => 'Table',
|
||||
'Type' => 'Type',
|
||||
'Field' => 'Field',
|
||||
'Protocol' => 'Protocol',
|
||||
'Settings' => 'Settings',
|
||||
'Import' => 'Import',
|
||||
'Export' => 'Export',
|
||||
'Connection' => 'Connection',
|
||||
'Self' => 'Self',
|
||||
'Custom' => 'Custom',
|
||||
'SrcType' => 'Src-Type',
|
||||
'DestType' => 'Dest-Type',
|
||||
'IsPrimary' => 'Is Primary?',
|
||||
];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ $lang = $this->getData('lang') ?? [];
|
|||
// @todo: show job reference
|
||||
|
||||
$interface = $this->getData('interface');
|
||||
$settings = $interface->getSettings();
|
||||
$settings = $interface->getSettings();
|
||||
|
||||
$currentSetting = $settings[(int) ($this->request->getData('setting') ?? 0)] ?? new NullExchangeSetting();
|
||||
$settingData = $currentSetting->getData();
|
||||
|
|
@ -43,21 +43,21 @@ if (!empty($settingData)) {
|
|||
$importConnection = ($settingData['import']['db']['self'] ?? true)
|
||||
? $this->getData('db') ?? new NullConnection()
|
||||
: ConnectionFactory::create([
|
||||
'db' => $settingData['import']['db']['db'],
|
||||
'host' => $settingData['import']['db']['host'],
|
||||
'port' => $settingData['import']['db']['port'],
|
||||
'db' => $settingData['import']['db']['db'],
|
||||
'host' => $settingData['import']['db']['host'],
|
||||
'port' => $settingData['import']['db']['port'],
|
||||
'database' => $settingData['import']['db']['database'],
|
||||
'login' => $settingData['import']['db']['login'],
|
||||
'login' => $settingData['import']['db']['login'],
|
||||
'password' => $settingData['import']['db']['password'],
|
||||
]);
|
||||
$exportConnection = ($settingData['export']['db']['self'] ?? true)
|
||||
? $this->getData('db') ?? new NullConnection()
|
||||
: ConnectionFactory::create([
|
||||
'db' => $settingData['export']['db']['db'],
|
||||
'host' => $settingData['export']['db']['host'],
|
||||
'port' => $settingData['export']['db']['port'],
|
||||
'db' => $settingData['export']['db']['db'],
|
||||
'host' => $settingData['export']['db']['host'],
|
||||
'port' => $settingData['export']['db']['port'],
|
||||
'database' => $settingData['export']['db']['database'],
|
||||
'login' => $settingData['export']['db']['login'],
|
||||
'login' => $settingData['export']['db']['login'],
|
||||
'password' => $settingData['export']['db']['password'],
|
||||
]);
|
||||
|
||||
|
|
@ -101,8 +101,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
|
|||
<tr><td><label for="iDatabaseType"><?= $lang['Connection']; ?></label>
|
||||
<tr><td>
|
||||
<select id="iConnection" name="type">
|
||||
<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['Custom']; ?>"<?= ($settingData['import']['db']['self'] ?? false) ? '' : ' selected'; ?>><?= $lang['Custom']; ?>
|
||||
<option value="<?= $lang['Self']; ?>" <?= ($settingData['import']['db']['self'] ?? false) ? ' selected' : ''; ?>><?= $lang['Self']; ?>
|
||||
</select>
|
||||
<tr><td><label for="iDatabaseType"><?= $lang['Type']; ?></label>
|
||||
<tr><td>
|
||||
|
|
@ -140,8 +140,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
|
|||
<tr><td><label for="iDatabaseType"><?= $lang['Connection']; ?></label>
|
||||
<tr><td>
|
||||
<select id="iConnection" name="type">
|
||||
<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['Custom']; ?>"<?= ($settingData['export']['db']['self'] ?? false) ? '' : ' selected'; ?>><?= $lang['Custom']; ?>
|
||||
<option value="<?= $lang['Self']; ?>" <?= ($settingData['export']['db']['self'] ?? false) ? ' selected' : ''; ?>><?= $lang['Self']; ?>
|
||||
</select>
|
||||
<tr><td><label for="iDatabaseType"><?= $lang['Type']; ?></label>
|
||||
<tr><td>
|
||||
|
|
@ -222,8 +222,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
|
|||
foreach ($currentImportTableFields as $field) :
|
||||
?>
|
||||
<tr>
|
||||
<td><label class="radio" for="import-<?= $field['COLUMN_NAME'] ?>">
|
||||
<input id="import-<?= $field['COLUMN_NAME'] ?>" type="radio" name="import-field" value="1">
|
||||
<td><label class="radio" for="import-<?= $field['COLUMN_NAME']; ?>">
|
||||
<input id="import-<?= $field['COLUMN_NAME']; ?>" type="radio" name="import-field" value="1">
|
||||
<span class="checkmark"></span>
|
||||
</label>
|
||||
<td><?= $field['DATA_TYPE']; ?>
|
||||
|
|
@ -254,8 +254,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
|
|||
foreach ($currentExportTableFields as $field) :
|
||||
?>
|
||||
<tr>
|
||||
<td><label class="radio" for="export-<?= $field['COLUMN_NAME'] ?>">
|
||||
<input id="export-<?= $field['COLUMN_NAME'] ?>" type="radio" name="export-field" value="1">
|
||||
<td><label class="radio" for="export-<?= $field['COLUMN_NAME']; ?>">
|
||||
<input id="export-<?= $field['COLUMN_NAME']; ?>" type="radio" name="export-field" value="1">
|
||||
<span class="checkmark"></span>
|
||||
</label>
|
||||
<td><?= $field['DATA_TYPE']; ?>
|
||||
|
|
|
|||
|
|
@ -19,15 +19,13 @@ use Modules\Exchange\Models\ExchangeLogMapper;
|
|||
use Modules\Exchange\Models\ExchangeSetting;
|
||||
use Modules\Exchange\Models\ExchangeSettingMapper;
|
||||
use Modules\Exchange\Models\InterfaceManager;
|
||||
use Modules\Exchange\Models\PermissionCategory;
|
||||
use Modules\Exchange\Models\InterfaceManagerMapper;
|
||||
use Modules\Exchange\Models\PermissionCategory;
|
||||
use Modules\Media\Models\CollectionMapper;
|
||||
use Modules\Media\Models\NullCollection;
|
||||
use Modules\Media\Models\NullMedia;
|
||||
use Modules\Media\Models\PathSettings;
|
||||
use Modules\Media\Models\UploadFile;
|
||||
use phpOMS\Account\PermissionType;
|
||||
use phpOMS\Autoloader;
|
||||
use phpOMS\DataStorage\Database\Connection\ConnectionFactory;
|
||||
use phpOMS\DataStorage\Database\Connection\NullConnection;
|
||||
use phpOMS\Localization\L11nManager;
|
||||
|
|
@ -37,8 +35,6 @@ use phpOMS\Message\NotificationLevel;
|
|||
use phpOMS\Message\RequestAbstract;
|
||||
use phpOMS\Message\ResponseAbstract;
|
||||
use phpOMS\Model\Message\FormValidation;
|
||||
use phpOMS\System\File\Local\Directory;
|
||||
use phpOMS\Utils\Parser\Markdown\Markdown;
|
||||
use phpOMS\Utils\StringUtils;
|
||||
|
||||
/**
|
||||
|
|
@ -423,8 +419,8 @@ final class ApiController extends Controller
|
|||
*/
|
||||
private function createSettingFromRequest(RequestAbstract $request) : ExchangeSetting
|
||||
{
|
||||
$setting = new ExchangeSetting();
|
||||
$setting->title = $request->getData('title') ?? '';
|
||||
$setting = new ExchangeSetting();
|
||||
$setting->title = $request->getData('title') ?? '';
|
||||
$setting->exchange = (int) ($request->getData('id') ?? 0);
|
||||
$setting->setData(\json_decode((string) ($request->getData('data') ?? '{}'), true));
|
||||
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@ final class ExchangeSettingMapper extends DataMapperFactory
|
|||
*/
|
||||
public const COLUMNS = [
|
||||
'exchange_settings_id' => ['name' => 'exchange_settings_id', 'type' => 'int', 'internal' => 'id'],
|
||||
'exchange_settings_title' => ['name' => 'exchange_settings_title', 'type' => 'string', 'internal' => 'title'],
|
||||
'exchange_settings_data' => ['name' => 'exchange_settings_data', 'type' => 'Json', 'internal' => 'data'],
|
||||
'exchange_settings_job' => ['name' => 'exchange_settings_job', 'type' => 'int', 'internal' => 'job'],
|
||||
'exchange_settings_title' => ['name' => 'exchange_settings_title', 'type' => 'string', 'internal' => 'title'],
|
||||
'exchange_settings_data' => ['name' => 'exchange_settings_data', 'type' => 'Json', 'internal' => 'data'],
|
||||
'exchange_settings_job' => ['name' => 'exchange_settings_job', 'type' => 'int', 'internal' => 'job'],
|
||||
'exchange_settings_exchange' => ['name' => 'exchange_settings_exchange', 'type' => 'int', 'internal' => 'exchange'],
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@ final class InterfaceManagerMapper extends DataMapperFactory
|
|||
* @since 1.0.0
|
||||
*/
|
||||
public const COLUMNS = [
|
||||
'exchange_interface_id' => ['name' => 'exchange_interface_id', 'type' => 'int', 'internal' => 'id'],
|
||||
'exchange_interface_title' => ['name' => 'exchange_interface_title', 'type' => 'string', 'internal' => 'title'],
|
||||
'exchange_interface_version' => ['name' => 'exchange_interface_version', 'type' => 'string', 'internal' => 'version'],
|
||||
'exchange_interface_export' => ['name' => 'exchange_interface_export', 'type' => 'bool', 'internal' => 'hasExport'],
|
||||
'exchange_interface_import' => ['name' => 'exchange_interface_import', 'type' => 'bool', 'internal' => 'hasImport'],
|
||||
'exchange_interface_website' => ['name' => 'exchange_interface_website', 'type' => 'string', 'internal' => 'website'],
|
||||
'exchange_interface_id' => ['name' => 'exchange_interface_id', 'type' => 'int', 'internal' => 'id'],
|
||||
'exchange_interface_title' => ['name' => 'exchange_interface_title', 'type' => 'string', 'internal' => 'title'],
|
||||
'exchange_interface_version' => ['name' => 'exchange_interface_version', 'type' => 'string', 'internal' => 'version'],
|
||||
'exchange_interface_export' => ['name' => 'exchange_interface_export', 'type' => 'bool', 'internal' => 'hasExport'],
|
||||
'exchange_interface_import' => ['name' => 'exchange_interface_import', 'type' => 'bool', 'internal' => 'hasImport'],
|
||||
'exchange_interface_website' => ['name' => 'exchange_interface_website', 'type' => 'string', 'internal' => 'website'],
|
||||
'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_by' => ['name' => 'exchange_interface_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@ $interface = $this->getData('interface');
|
|||
|
||||
include $interface->source->getAbsolutePath()
|
||||
. $interface->source->name . '/'
|
||||
. 'export.tpl.php';
|
||||
. 'export.tpl.php';
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user