diff --git a/lam/lib/modules/windowsUser.inc b/lam/lib/modules/windowsUser.inc index 74a95e044..aa0af56db 100644 --- a/lam/lib/modules/windowsUser.inc +++ b/lam/lib/modules/windowsUser.inc @@ -5277,8 +5277,8 @@ if (interface_exists('\LAM\JOB\Job', false)) { /** * Returns if the job should run. * - * @param $pdo PDO - * @param $jobId job id + * @param PDO $pdo PDO + * @param string $jobId job id * @param DateTime $baseDate base date * @param int $monthInterval month interval * @return bool should run @@ -5512,15 +5512,7 @@ if (interface_exists('\LAM\JOB\Job', false)) { } /** - * Checks if a user is expired. - * - * @param integer $jobID job ID - * @param array $options job settings - * @param PDO $pdo PDO - * @param DateTime $now current time - * @param array $policyOptions list of policy options by getPolicyOptions() - * @param array $user user attributes - * @param boolean $isDryRun just do a dry run, nothing is modified + * {@inheritDoc} */ protected function checkSingleUser($jobID, $options, &$pdo, $now, $policyOptions, $user, $isDryRun) { $seconds = substr($user['accountexpires'][0], 0, -7); diff --git a/lam/lib/persistence.inc b/lam/lib/persistence.inc index da850299c..169d6e05f 100644 --- a/lam/lib/persistence.inc +++ b/lam/lib/persistence.inc @@ -342,7 +342,7 @@ class ConfigDataImporter { $steps[] = new ImporterStep(_('General settings'), 'mainConfig', $value); break; case 'certificates': - $steps[] = new ImporterStep(_('SSL certificates'), 'certificates', $value); + $steps[] = new ImporterStep(_('SSL certificates'), 'certificates', [$value]); break; case 'serverProfiles': $mainStep = new ImporterStep(_('Server profiles'), 'serverProfiles', $value); @@ -424,7 +424,7 @@ class ConfigDataImporter { * Runs the actual import. * * @param ImporterStep[] $steps import steps - * @throws LAMException if error occurred + * @throws LAMException if an error occurred */ public function runImport($steps) { foreach ($steps as $step) { @@ -434,7 +434,7 @@ class ConfigDataImporter { $key = $step->getKey(); match ($key) { 'mainConfig' => $this->importMainConfig($step->getValue()), - 'certificates' => $this->importCertificates($step->getValue()), + 'certificates' => $this->importCertificates($step->getValue()[0]), 'serverProfiles' => $this->importServerProfiles($step), 'accountProfiles' => $this->importAccountProfiles($step), 'accountProfileTemplates' => $this->importAccountProfileTemplates($step),