Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions functions/classes/class.PDO.php
Original file line number Diff line number Diff line change
Expand Up @@ -1042,6 +1042,13 @@ private function set_db_params () {
$this->ssl[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = false;
}

$db += [
'ssl_key' => null,
'ssl_cert' => null,
'ssl_ca' => null,
'ssl_cipher' => null,
'ssl_capath' => null
];
foreach ($this->pdo_ssl_opts as $key => $pdoopt) {
if ($db[$key]) {
$this->ssl[$pdoopt] = $db[$key];
Expand Down
3 changes: 2 additions & 1 deletion functions/classes/class.Scan.php
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ public function ping_address_method_fping_subnet ($subnet_cidr, $return_result =
exec($cmd, $output, $retval);

# save result
$out = null;
if(sizeof($output)>0) {
foreach($output as $line) {
if (!preg_match('/timed out/', $line)) {
Expand Down Expand Up @@ -921,4 +922,4 @@ function fping_subnet ($subnet_cidr, $return = true) {
global $Scan;
//scan
return $Scan->ping_address_method_fping_subnet ($subnet_cidr, $return);
}
}
2 changes: 1 addition & 1 deletion functions/classes/class.phpipamAgent.php
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ private function mysql_scan_discovered_write_to_db ($subnets) {
}
// loop
foreach($subnets as $s) {
if(is_array($s->discovered)) {
if (isset($s->discovered) && is_array($s->discovered)) {
foreach($s->discovered as $ip) {
// try to resolve hostname
$tmp = new stdClass();
Expand Down