Skip to content

Commit

Permalink
Improve coding style according to PSR-12
Browse files Browse the repository at this point in the history
  • Loading branch information
ganiuszka committed Jul 21, 2023
1 parent 98009e2 commit 4410c6b
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 39 deletions.
4 changes: 2 additions & 2 deletions Web/Modules/GPG.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ private function getCmdPattern($ptype)
$pattern = null;
switch ($ptype) {
case self::PTYPE_REG_CMD: $pattern = self::GPG_COMMAND_PATTERN;
break;
break;
default: $pattern = self::GPG_COMMAND_PATTERN;
break;
break;
}
return $pattern;
}
Expand Down
4 changes: 2 additions & 2 deletions Web/Modules/SCP.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ private function getCmdPattern($ptype)
$pattern = null;
switch ($ptype) {
case self::PTYPE_REG_CMD: $pattern = self::SCP_COMMAND_PATTERN;
break;
break;
default: $pattern = self::SCP_COMMAND_PATTERN;
break;
break;
}
return $pattern;
}
Expand Down
6 changes: 3 additions & 3 deletions Web/Modules/SSH.php
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ private function getCmdPattern($ptype)
$pattern = null;
switch ($ptype) {
case self::PTYPE_REG_CMD: $pattern = self::SSH_COMMAND_PATTERN;
break;
break;
case self::PTYPE_BG_CMD: $pattern = self::SSH_BG_COMMAND_PATTERN;
break;
break;
default: $pattern = self::SSH_COMMAND_PATTERN;
break;
break;
}
return $pattern;
}
Expand Down
8 changes: 4 additions & 4 deletions Web/Pages/NewCopyJobWizard.php
Original file line number Diff line number Diff line change
Expand Up @@ -607,13 +607,13 @@ public function getSelectionPatternControl()
$sel_type = $this->SelectionType->getDirectiveValue();
switch ($sel_type) {
case 'Job': $control = $this->SelectionPatternJob;
break;
break;
case 'Client': $control = $this->SelectionPatternClient;
break;
break;
case 'Volume': $control = $this->SelectionPatternVolume;
break;
break;
case 'SQLQuery': $control = $this->SelectionPatternSQLQuery;
break;
break;
}
return $control;
}
Expand Down
8 changes: 4 additions & 4 deletions Web/Pages/NewMigrateJobWizard.php
Original file line number Diff line number Diff line change
Expand Up @@ -608,13 +608,13 @@ public function getSelectionPatternControl()
$sel_type = $this->SelectionType->getDirectiveValue();
switch ($sel_type) {
case 'Job': $control = $this->SelectionPatternJob;
break;
break;
case 'Client': $control = $this->SelectionPatternClient;
break;
break;
case 'Volume': $control = $this->SelectionPatternVolume;
break;
break;
case 'SQLQuery': $control = $this->SelectionPatternSQLQuery;
break;
break;
}
return $control;
}
Expand Down
36 changes: 20 additions & 16 deletions Web/Pages/NewVirtualFullJobWizard.php
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function isInJobDefs($directive_name, $directive_value)
{
$jobdefs = $this->getJobDefs();
if ($directive_name == 'Priority') {
$directive_value = (int)$directive_value;
$directive_value = (int) $directive_value;
}
$ret = (key_exists($directive_name, $jobdefs) && $jobdefs[$directive_name] === $directive_value);
return $ret;
Expand Down Expand Up @@ -405,6 +405,9 @@ public function setStorageClientSideValidators()

/**
* Storage control validator method.
*
* @param TRequiredFieldValidator $sender sender object
* @param null $param event parameter
*/
public function validateStorage($sender, $param)
{
Expand Down Expand Up @@ -474,10 +477,11 @@ public function loadPoolList($control)
/**
* Load normal and virtual full (NextPool) pools.
*
* @param TCallback sender object
* @param TCallbackEventParameter callback parameter
* @param TCallback $sender sender object
* @param TCallbackEventParameter $param callback parameter
*/
public function loadPools($sender, $param) {
public function loadPools($sender, $param)
{
$this->loadNormalBackupPools();
$this->loadVirtualFullBackupNextPools();
}
Expand All @@ -487,6 +491,7 @@ public function loadPools($sender, $param) {
* Storage is taken from selected pool.
*
* @param string $pool pool name to get storage
* @param null|TCallbackEventParameter $param callback parameter
*/
public function setVirtualFullBackupStorage($pool, $param = null)
{
Expand All @@ -513,8 +518,8 @@ public function setVirtualFullBackupStorage($pool, $param = null)
/**
* Set control with virtual full backup storage.
*
* @param TCallback sender object
* @param TCallbackEventParameter callback parameter
* @param TCallback $sender sender object
* @param TCallbackEventParameter $param callback parameter
*/
public function setVirtualFullBackupStorageValue($sender, $param)
{
Expand Down Expand Up @@ -584,7 +589,6 @@ public function loadMessages()
$this->Messages->setDirectiveValue($def_msg);
}
$this->Messages->createDirective();

}

/**
Expand Down Expand Up @@ -712,24 +716,24 @@ public function wizardCompleted($sender, $param)
'Level="%s" %s-%s %s',
$this->VirtualFullScheduleBasicLevel->getValue(),
Params::getDaysOfWeekConfig(
[(int)$this->VirtualFullScheduleBasicScheduleFrom->getSelectedValue()]
[(int) $this->VirtualFullScheduleBasicScheduleFrom->getSelectedValue()]
),
Params::getDaysOfWeekConfig(
[(int)$this->VirtualFullScheduleBasicScheduleTo->getSelectedValue()]
[(int) $this->VirtualFullScheduleBasicScheduleTo->getSelectedValue()]
),
Params::getTimeConfig(
[(int)$this->VirtualFullScheduleBasicScheduleAtHour->getSelectedValue()],
(int)$this->VirtualFullScheduleBasicScheduleAtHour->getSelectedValue()
[(int) $this->VirtualFullScheduleBasicScheduleAtHour->getSelectedValue()],
(int) $this->VirtualFullScheduleBasicScheduleAtHour->getSelectedValue()
)
),
sprintf(
'Level="VirtualFull" %s %s',
Params::getDaysOfWeekConfig(
[(int)$this->VirtualFullScheduleBasicScheduleRunVFOn->getSelectedValue()]
[(int) $this->VirtualFullScheduleBasicScheduleRunVFOn->getSelectedValue()]
),
Params::getTimeConfig(
[(int)$this->VirtualFullScheduleBasicScheduleVFAtHour->getSelectedValue()],
(int)$this->VirtualFullScheduleBasicScheduleVFAtMinute->getSelectedValue()
[(int) $this->VirtualFullScheduleBasicScheduleVFAtHour->getSelectedValue()],
(int) $this->VirtualFullScheduleBasicScheduleVFAtMinute->getSelectedValue()
)
)
]
Expand Down Expand Up @@ -784,7 +788,7 @@ public function wizardCompleted($sender, $param)
$this->CreateResourceErrMsg->Text = $result->output;
return;
}
$job = (array)$result->output;
$job = (array) $result->output;
$directives = ['NextPool'];
if ($this->VirtualFullTypeProgressive->Checked) {
$directives[] = 'BackupsToKeep';
Expand Down Expand Up @@ -818,7 +822,7 @@ public function wizardCompleted($sender, $param)
$this->CreateResourceErrMsg->Text = $result->output;
return;
}
$pool = (array)$result->output;
$pool = (array) $result->output;
$pool['Storage'] = $this->VirtualFullBackupStorage->getDirectiveValue();
$params = [
'config',
Expand Down
8 changes: 4 additions & 4 deletions Web/Pages/Security.php
Original file line number Diff line number Diff line change
Expand Up @@ -1036,13 +1036,13 @@ private function addLdapExtraParams(&$params)
$crit = (int) ($this->GetUsersCriteria->SelectedValue);
switch ($crit) {
case self::IMPORT_CRIT_USERNAME: $params['filter_attr'] = $params['user_attr'];
break;
break;
case self::IMPORT_CRIT_LONG_NAME: $params['filter_attr'] = $params['long_name_attr'];
break;
break;
case self::IMPORT_CRIT_DESCRIPTION: $params['filter_attr'] = $params['desc_attr'];
break;
break;
case self::IMPORT_CRIT_EMAIL: $params['filter_attr'] = $params['email_attr'];
break;
break;
}
$params['filter_val'] = $this->GetUsersCriteriaFilter->Text;
}
Expand Down
9 changes: 5 additions & 4 deletions Web/Portlets/QuickResourceEdit.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* @author Marcin Haba <marcin.haba@bacula.pl>
* @category Control
*/
class QuickResourceEdit extends Portlets implements IActiveControl {

class QuickResourceEdit extends Portlets implements IActiveControl
{
public const COMPONENT_TYPE = 'ComponentType';
public const RESOURCE_TYPE = 'ResourceType';
public const RESOURCE_NAME = 'ResourceName';
Expand All @@ -41,8 +41,9 @@ public function getActiveControl()
return $this->getAdapter()->getBaseActiveControl();
}

public function openQuickResourceEdit($sender, $param) {
list($component_type, $resource_type, $resource_name) = $param->getCallbackParameter();
public function openQuickResourceEdit($sender, $param)
{
[$component_type, $resource_type, $resource_name] = $param->getCallbackParameter();
$this->setComponentType($component_type);
$this->setResourceType($resource_type);
$this->setResourceName($resource_name);
Expand Down

0 comments on commit 4410c6b

Please sign in to comment.