diff --git a/app/Libraries/Cloudflare/Zone.php b/app/Libraries/Cloudflare/Zone.php index 4dc6b63..73fbe31 100644 --- a/app/Libraries/Cloudflare/Zone.php +++ b/app/Libraries/Cloudflare/Zone.php @@ -68,15 +68,17 @@ class Zone extends Cloudflare log_message("error", $message); throw new \Exception($message); } - foreach ($cf->result as $cf) { - if (in_array($cf->id, haystack: array_keys($this->_setting_fields))) { - $formDatas[$cf->id] = $cf->value; + foreach ($cf->result as $result) { + if (in_array(needle: $result->id, haystack: array_keys($this->_setting_fields))) { + $formDatas[$result->id] = $result->value; } } + // log_message("debug", var_export($cf, return: true)); return $formDatas; } private function getCFSettingSSL(string $uid, array $formDatas = []): array { + log_message("debug", "TEST"); $cf = $this->getMySocket()->get('zones/' . $uid . '/settings/ssl'); $cf = json_decode($cf->getBody()); if (!$cf->success) { @@ -84,9 +86,7 @@ class Zone extends Cloudflare log_message("error", $message); throw new \Exception($message); } - foreach ($cf->result as $cf) { - $formDatas['ssl_mode'] = $cf->value; - } + $formDatas['ssl_mode'] = $cf->result->value; // log_message("debug", var_export($cf, return: true)); // exit; return $formDatas; @@ -180,8 +180,11 @@ class Zone extends Cloudflare throw new \Exception($message); } $formDatas = $this->getArrayByResult($cf->result); + log_message("debug", var_export($formDatas, true)); $formDatas = $this->getCFSetting($formDatas[ZoneModel::PK], $formDatas); + log_message("debug", var_export($formDatas, true)); $formDatas = $this->getCFSettingSSL($formDatas[ZoneModel::PK], $formDatas); + log_message("debug", var_export($formDatas, true)); return $this->getModel()->modify($entity, $formDatas); } //Reload @@ -195,6 +198,7 @@ class Zone extends Cloudflare foreach ($zone_results as $result) { $formDatas = $this->getArrayByResult($result); $formDatas = $this->getCFSetting($formDatas[ZoneModel::PK], $formDatas); + $formDatas = $this->getCFSettingSSL($formDatas[ZoneModel::PK], $formDatas); $entitys[$formDatas[ZoneModel::PK]] = $this->getModel()->modify(new ZoneEntity(), $formDatas); } //부모키를 기준으로 CF에 존재하지 않는 데이터 삭제용