Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2018-02-04 11:28:52 +02:00
commit f8032f04b2
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/AccountApiController.php
View File

@ -184,12 +184,10 @@ class AccountApiController extends BaseAPIController
$devices = json_decode($account->devices, true); $devices = json_decode($account->devices, true);
foreach($devices as $key => $value) for($x=0; $x<count($devices); $x++)
{ {
if($request->token == $devices[$x]['token'])
if($request->token == $value['token']) unset($devices[$x]);
unset($devices[$key]);
} }
$account->devices = json_encode(array_values($devices)); $account->devices = json_encode(array_values($devices));

45
app/Ninja/DNS/Cloudflare.php
View File

@ -15,31 +15,36 @@ class Cloudflare
foreach($zones as $zone) foreach($zones as $zone)
{ {
$curl = curl_init(); if($account->subdomain != "")
$jsonEncodedData = json_encode(['type'=>'A', 'name'=>$account->subdomain, 'content'=>env('CLOUDFLARE_TARGET_IP_ADDRESS',''),'proxied'=>true]); {
$opts = [ $curl = curl_init();
CURLOPT_URL => 'https://api.cloudflare.com/client/v4/zones/'.$zone.'/dns_records', $jsonEncodedData = json_encode(['type' => 'A', 'name' => $account->subdomain, 'content' => env('CLOUDFLARE_TARGET_IP_ADDRESS', ''), 'proxied' => true]);
CURLOPT_RETURNTRANSFER => true,
CURLOPT_CUSTOMREQUEST => 'POST',
CURLOPT_POST => 1,
CURLOPT_POSTFIELDS => $jsonEncodedData,
CURLOPT_HTTPHEADER => [ 'Content-Type: application/json',
'Content-Length: '.strlen($jsonEncodedData),
'X-Auth-Email: '.env('CLOUDFLARE_EMAIL', ''),
'X-Auth-Key: '.env('CLOUDFLARE_API_KEY', '')
],
];
curl_setopt_array($curl, $opts); $opts = [
CURLOPT_URL => 'https://api.cloudflare.com/client/v4/zones/' . $zone . '/dns_records',
CURLOPT_RETURNTRANSFER => true,
CURLOPT_CUSTOMREQUEST => 'POST',
CURLOPT_POST => 1,
CURLOPT_POSTFIELDS => $jsonEncodedData,
CURLOPT_HTTPHEADER => ['Content-Type: application/json',
'Content-Length: ' . strlen($jsonEncodedData),
'X-Auth-Email: ' . env('CLOUDFLARE_EMAIL', ''),
'X-Auth-Key: ' . env('CLOUDFLARE_API_KEY', '')
],
];
$result = curl_exec($curl); curl_setopt_array($curl, $opts);
$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
curl_close($curl); $result = curl_exec($curl);
$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
if ($status != 200) curl_close($curl);
Utils::logError('unable to update subdomain ' . $account->subdomain . ' @ Cloudflare - '.$result);
if ($status != 200)
Utils::logError('unable to update subdomain ' . $account->subdomain . ' @ Cloudflare - ' . $result);
}
} }