From b244b625ab60d91464cba2c6f78373ca9a73fe80 Mon Sep 17 00:00:00 2001
From: Riyyi <riyyi3@gmail.com>
Date: Mon, 30 Aug 2021 00:39:01 +0200
Subject: [PATCH] Controllers: Implement new HTTP class in development toggle

---
 app/controllers/CacheController.php | 31 ++++++++++-------------------
 public/js/app.js                    |  2 +-
 route.php                           |  2 +-
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/app/controllers/CacheController.php b/app/controllers/CacheController.php
index 736173b..afc67ab 100644
--- a/app/controllers/CacheController.php
+++ b/app/controllers/CacheController.php
@@ -3,6 +3,7 @@
 namespace App\Controllers;
 
 use App\Classes\Config;
+use App\Classes\Http\Http;
 use App\Model\ConfigModel;
 
 class CacheController extends PageController {
@@ -15,7 +16,7 @@ class CacheController extends PageController {
 		parent::view();
 	}
 
-	public function developmentAction(): void
+	public function toggleAction(): void
 	{
 		if (Config::c('CLOUDFLARE_ENABLED') != '1') {
 			return;
@@ -25,34 +26,24 @@ class CacheController extends PageController {
 		$zone = Config::c('CLOUDFLARE_ZONE');
 
 		$url = "https://api.cloudflare.com/client/v4/zones/$zone/settings/development_mode";
-		$headers = [
-			"Authorization: Bearer $token",
-			"Content-Type: application/json"
-		];
 
 		$config = $this->getConfigValues();
 		$currentState = $config['CLOUDFLARE_DEVELOPMENT_MODE_ENABLED'];
 
-		$newState = $currentState == '1' ? 'off' : 'on';
-		$data = '{"value": "' . $newState . '"}';
+		$response = (new Http)->withToken($token)
+							  ->asJson()
+							  ->acceptJson()
+							  ->patch($url, [
+								  'value' => $currentState == '1' ? 'off' : 'on',
+							  ]);
+
+		$this->saveConfigValues($response->body());
 
-		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_URL, $url);
-		curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
-		curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PATCH');
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-		// curl_setopt($curl, CURLINFO_HEADER_OUT, 1);
+		echo $response->body();
 
-		$response = curl_exec($curl);
-		// $info = curl_getinfo($curl, CURLINFO_HEADER_OUT);
 
-		curl_close($curl);
 
-		$this->saveConfigValues($response);
 
-		echo $response;
-		// echo $info;
 	}
 
 	//-------------------------------------//
diff --git a/public/js/app.js b/public/js/app.js
index 042a7c4..bcb869b 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -238,7 +238,7 @@ $(document).ready(function() {
 			return;
 		}
 
-		$.get('/admin/toggle-development-mode').done(function(data)
+		$.get('/admin/cache/toggle').done(function(data)
 		{
 			const response = JSON.parse(data);
 			if (response.success == false) {
diff --git a/route.php b/route.php
index 560467a..e2f0d9a 100644
--- a/route.php
+++ b/route.php
@@ -23,7 +23,7 @@ return [
 	['/admin',                      'AdminController',    '',         ''],
 	['/admin/cache',                'CacheController',      'cache',        ''],
 	['/admin/toggle',               'AdminController',    'toggle',   ''],
-	['/admin/toggle-development-mode',  'CacheController',  'development',  ''],
+	['/admin/cache/toggle',         'CacheController',    'toggle',   ''],
 	['/admin/syntax-highlighting',  'AdminController',    'syntax',   ''],
 	['/test', 'TestController', '', ''],
 	// ["", "", "", ""],