@@ -17,41 +17,41 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | class Comarch extends \App\SystemWarnings\Template |
| 19 | 19 | { |
| 20 | - /** {@inheritdoc} */ |
|
| 21 | - protected $title = 'LBL_CHECK_COMARCH_INTEGRATION_LOG'; |
|
| 20 | + /** {@inheritdoc} */ |
|
| 21 | + protected $title = 'LBL_CHECK_COMARCH_INTEGRATION_LOG'; |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Checks for suspended email accounts. |
|
| 25 | - * |
|
| 26 | - * @return void |
|
| 27 | - */ |
|
| 28 | - public function process(): void |
|
| 29 | - { |
|
| 30 | - $db = \App\DB::getInstance('log'); |
|
| 31 | - if(!$db->isTableExists(\App\Integrations\Comarch::LOG_TABLE_NAME)) { |
|
| 32 | - $this->status = 1; |
|
| 33 | - return; |
|
| 34 | - } |
|
| 35 | - $data = (new \App\Db\Query())->select(['time', 'message'])->from(\App\Integrations\Comarch::LOG_TABLE_NAME) |
|
| 36 | - ->where([ |
|
| 37 | - 'and', |
|
| 38 | - ['error' => 1], |
|
| 39 | - ['>=', 'time', date('Y-m-d H:i:s', strtotime('-24 hours'))] |
|
| 40 | - ])->orderBy(['id' => SORT_DESC]) |
|
| 41 | - ->all($db); |
|
| 42 | - if ($data) { |
|
| 43 | - $this->status = 0; |
|
| 44 | - $this->description = \App\Language::translate('LBL_CHECK_COMARCH_INTEGRATION_LOG_DESC', 'Settings:SystemWarnings'); |
|
| 45 | - $this->description .= '<br>' . \App\TextUtils::getHtmlTable($data, [ |
|
| 46 | - 'time' => \App\Language::translate('LBL_TIME', 'Settings:Log'), |
|
| 47 | - 'message' => \App\Language::translate('LBL_MESSAGE', 'Settings:Comarch') |
|
| 48 | - ]); |
|
| 49 | - if (\App\Security\AdminAccess::isPermitted('Log')) { |
|
| 50 | - $this->link = 'index.php?parent=Settings&module=Log&view=LogsViewer&type=mail'; |
|
| 51 | - $this->linkTitle = \App\Language::translate('LBL_LOGS_VIEWER', 'Settings:Log'); |
|
| 52 | - } |
|
| 53 | - } else { |
|
| 54 | - $this->status = 1; |
|
| 55 | - } |
|
| 56 | - } |
|
| 23 | + /** |
|
| 24 | + * Checks for suspended email accounts. |
|
| 25 | + * |
|
| 26 | + * @return void |
|
| 27 | + */ |
|
| 28 | + public function process(): void |
|
| 29 | + { |
|
| 30 | + $db = \App\DB::getInstance('log'); |
|
| 31 | + if(!$db->isTableExists(\App\Integrations\Comarch::LOG_TABLE_NAME)) { |
|
| 32 | + $this->status = 1; |
|
| 33 | + return; |
|
| 34 | + } |
|
| 35 | + $data = (new \App\Db\Query())->select(['time', 'message'])->from(\App\Integrations\Comarch::LOG_TABLE_NAME) |
|
| 36 | + ->where([ |
|
| 37 | + 'and', |
|
| 38 | + ['error' => 1], |
|
| 39 | + ['>=', 'time', date('Y-m-d H:i:s', strtotime('-24 hours'))] |
|
| 40 | + ])->orderBy(['id' => SORT_DESC]) |
|
| 41 | + ->all($db); |
|
| 42 | + if ($data) { |
|
| 43 | + $this->status = 0; |
|
| 44 | + $this->description = \App\Language::translate('LBL_CHECK_COMARCH_INTEGRATION_LOG_DESC', 'Settings:SystemWarnings'); |
|
| 45 | + $this->description .= '<br>' . \App\TextUtils::getHtmlTable($data, [ |
|
| 46 | + 'time' => \App\Language::translate('LBL_TIME', 'Settings:Log'), |
|
| 47 | + 'message' => \App\Language::translate('LBL_MESSAGE', 'Settings:Comarch') |
|
| 48 | + ]); |
|
| 49 | + if (\App\Security\AdminAccess::isPermitted('Log')) { |
|
| 50 | + $this->link = 'index.php?parent=Settings&module=Log&view=LogsViewer&type=mail'; |
|
| 51 | + $this->linkTitle = \App\Language::translate('LBL_LOGS_VIEWER', 'Settings:Log'); |
|
| 52 | + } |
|
| 53 | + } else { |
|
| 54 | + $this->status = 1; |
|
| 55 | + } |
|
| 56 | + } |
|
| 57 | 57 | } |
@@ -1003,8 +1003,8 @@ |
||
| 1003 | 1003 | } |
| 1004 | 1004 | if ($this->searchFieldsForDuplicates) { |
| 1005 | 1005 | $duplicateCheckClause = []; |
| 1006 | - $queryGenerator = new self($this->moduleName, $this->user->getId()); |
|
| 1007 | - $queryGenerator->setStateCondition($this->getState()); |
|
| 1006 | + $queryGenerator = new self($this->moduleName, $this->user->getId()); |
|
| 1007 | + $queryGenerator->setStateCondition($this->getState()); |
|
| 1008 | 1008 | $queryGenerator->permissions = $this->permissions; |
| 1009 | 1009 | $queryGenerator->setFields(array_keys($this->searchFieldsForDuplicates)); |
| 1010 | 1010 | foreach ($this->searchFieldsForDuplicates as $fieldName => $ignoreEmptyValue) { |