|
|
@@ -34,7 +34,7 @@ class DiskSizeValidator extends BaseValidator
|
|
|
if($additionalData->get('formData')[$this->additionalField] ){
|
|
|
$additionalSize = (int) $additionalData->get('formData')[$this->additionalField];
|
|
|
}
|
|
|
- $diskResource = $resurceManager ->disk();
|
|
|
+ $diskResource = $resurceManager->disk();
|
|
|
$diskResource->setTotal($diskResource->getTotal()-$additionalSize);
|
|
|
if ($this->isWhmcsConfigOption(ConfigurableOption::STORAGE)) {
|
|
|
$this->maxValue = $this->getWhmcsConfigOption(ConfigurableOption::STORAGE) - $diskResource->getUsed();
|
|
|
@@ -42,20 +42,11 @@ class DiskSizeValidator extends BaseValidator
|
|
|
$this->maxValue = $diskResource->free();
|
|
|
}
|
|
|
|
|
|
- logModuleCall(
|
|
|
- 'ProxmoxCloudVps',
|
|
|
- __FUNCTION__,
|
|
|
- 'min: ' . $this->minValue . ' max: ' . $this->maxValue,
|
|
|
- 'Debug1',
|
|
|
- 'data: ' . $data . ' resMax: ' . $diskResource->getMax() . ' free: ' . $diskResource->free()
|
|
|
- );
|
|
|
-
|
|
|
if ($this->maxValue > $diskResource->getMax()) {
|
|
|
- $this->addValidationError('PleaseProvideANumericValueBetween', false, ['minValue' => $this->minValue, 'maxValue' => $diskResource->getMax()]);
|
|
|
- return false;
|
|
|
+ $this->maxValue = $diskResource->getMax();
|
|
|
}
|
|
|
|
|
|
- $this->minValue = $diskResource->getMin();
|
|
|
+ $this->minValue = $diskResource->getMin();
|
|
|
if(preg_match("/\./", $data)){
|
|
|
$this->addValidationError('PleaseProvideANumericValueBetween', false, ['minValue' => $this->minValue, 'maxValue' => $this->maxValue]);
|
|
|
return false;
|