deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer need to test for type, it should exist

Browse Source
This commit is contained in:
Deon George
2023-05-03 23:41:48 +10:00
parent 25dab73a83
commit a5238bfbdc
6 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Product.php
View File

@@ -294,7 +294,7 @@ class Product extends Model implements IDs
*/
public function getSuppliedAttribute(): ?Model
{
return $this->type && $this->type->supplied ? $this->type->supplied : NULL;
return $this->type->supplied ? $this->type->supplied : NULL;
}
/**
@@ -426,7 +426,7 @@ class Product extends Model implements IDs
*/
public function hasUsage(): bool
{
return $this->type && $this->type->hasUsage();
return $this->type->hasUsage();
}
/**

4
app/Models/Service.php
View File

@@ -786,7 +786,7 @@ class Service extends Model implements IDs
*/
public function getNameShortAttribute()
{
return ($this->type && $this->type->getServiceNameAttribute()) ? $this->type->getServiceNameAttribute() : 'SID:'.$this->sid;
return $this->type->getServiceNameAttribute() ? $this->type->getServiceNameAttribute() : 'SID:'.$this->sid;
}
/**
@@ -801,7 +801,7 @@ class Service extends Model implements IDs
*/
public function getNameDetailAttribute()
{
return ($this->type && ($this->type->getServiceDescriptionAttribute() !== NULL)) ? $this->type->getServiceDescriptionAttribute() : 'No Description';
return ($this->type->getServiceDescriptionAttribute() !== NULL) ? $this->type->getServiceDescriptionAttribute() : 'No Description';
}
/**

5
app/Models/Service/SSL.php
View File

@@ -45,10 +45,11 @@ class SSL extends Type
if ($this->cert)
return Arr::get($this->crt_parse,'name');
else {
elseif ($this->csr) {
$dn = '';
$dna = openssl_csr_get_subject($this->csr);
dump(['dna'=>$dna,'csr'=>$this->csr,'id',$this->id]);
foreach ($dna as $k=>$v) {
if ($dn)
$dn .= ',';
@@ -57,6 +58,8 @@ class SSL extends Type
}
return $dn;
} else {
return '[NO DN]';
}
}