@@ -22,7 +22,7 @@ |
||
| 22 | 22 | public function update_file($lang = 'fra') |
| 23 | 23 | { |
| 24 | 24 | try { |
| 25 | - $locale_path = $this->get('settings.locale.directory_path') . '/' . $this->get('settings.locale.file_name'); |
|
| 25 | + $locale_path = $this->get('settings.locale.directory_path').'/'.$this->get('settings.locale.file_name'); |
|
| 26 | 26 | self::create_file($locale_path, $lang); |
| 27 | 27 | |
| 28 | 28 | $this->logger()->notice($this->l('KADRO_SYSTEM_FILE_UPDATED')); |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace HexMakina\kadro\Controllers; |
| 4 | 4 | |
| 5 | -use HexMakina\kadro\Auth\{Operator,Permission,ACL}; |
|
| 5 | +use HexMakina\kadro\Auth\{Operator, Permission, ACL}; |
|
| 6 | 6 | use HexMakina\kadro\Auth\AccessRefusedException; |
| 7 | 7 | use HexMakina\BlackBox\Auth\OperatorInterface; |
| 8 | 8 | // use HexMakina\LeMarchand\LeMarchand; |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | $target_controller = $this->get('Controllers\\'.$router->targetController()); |
| 28 | 28 | |
| 29 | 29 | if ($target_controller->requiresOperator()) { |
| 30 | - if(is_null($operator_id = $this->get('HexMakina\BlackBox\StateAgentInterface')->operatorId())) |
|
| 30 | + if (is_null($operator_id = $this->get('HexMakina\BlackBox\StateAgentInterface')->operatorId())) |
|
| 31 | 31 | $this->checkin(); |
| 32 | 32 | |
| 33 | - if(is_null($operator = get_class($operator)::exists($operator_id)) || !$operator->isActive()){ |
|
| 33 | + if (is_null($operator = get_class($operator)::exists($operator_id)) || !$operator->isActive()) { |
|
| 34 | 34 | $this->checkout(); |
| 35 | 35 | } |
| 36 | 36 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $this->logger()->notice($this->l('PAGE_CHECKIN_WELCOME', [$operator->name()])); |
| 71 | 71 | $this->router()->hop(); |
| 72 | 72 | } catch (\Exception $e) { |
| 73 | - $this->logger()->warning($this->l('KADRO_operator_' . $e->getMessage())); |
|
| 73 | + $this->logger()->warning($this->l('KADRO_operator_'.$e->getMessage())); |
|
| 74 | 74 | $this->router()->hop('checkin'); |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -27,8 +27,9 @@ |
||
| 27 | 27 | $target_controller = $this->get('Controllers\\'.$router->targetController()); |
| 28 | 28 | |
| 29 | 29 | if ($target_controller->requiresOperator()) { |
| 30 | - if(is_null($operator_id = $this->get('HexMakina\BlackBox\StateAgentInterface')->operatorId())) |
|
| 31 | - $this->checkin(); |
|
| 30 | + if(is_null($operator_id = $this->get('HexMakina\BlackBox\StateAgentInterface')->operatorId())) { |
|
| 31 | + $this->checkin(); |
|
| 32 | + } |
|
| 32 | 33 | |
| 33 | 34 | if(is_null($operator = get_class($operator)::exists($operator_id)) || !$operator->isActive()){ |
| 34 | 35 | $this->checkout(); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | public function __toString() |
| 30 | 30 | { |
| 31 | - return $this->iso_name() . ' (' . $this->get(self::ISO_3) . ')'; |
|
| 31 | + return $this->iso_name().' ('.$this->get(self::ISO_3).')'; |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public function traceable(): bool |
@@ -74,11 +74,11 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | if (isset($filter['types'])) { |
| 77 | - $wc = sprintf("AND " . self::ISO_TYPE . " IN ('%s') ", implode('\', \'', array_keys(self::ISO_TYPES))); |
|
| 77 | + $wc = sprintf("AND ".self::ISO_TYPE." IN ('%s') ", implode('\', \'', array_keys(self::ISO_TYPES))); |
|
| 78 | 78 | $Query->where($wc); |
| 79 | 79 | } |
| 80 | 80 | if (isset($filter['scopes'])) { |
| 81 | - $wc = sprintf("AND " . self::ISO_SCOPE . " IN ('%s') ", implode('\', \'', array_keys(self::ISO_SCOPES))); |
|
| 81 | + $wc = sprintf("AND ".self::ISO_SCOPE." IN ('%s') ", implode('\', \'', array_keys(self::ISO_SCOPES))); |
|
| 82 | 82 | $Query->where($wc); |
| 83 | 83 | } |
| 84 | 84 | |