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));

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

@ -13,6 +13,9 @@ class Cloudflare
$zones = json_decode(env('CLOUDFLARE_ZONE_IDS',''), true); $zones = json_decode(env('CLOUDFLARE_ZONE_IDS',''), true);
foreach($zones as $zone) foreach($zones as $zone)
{
if($account->subdomain != "")
{ {
$curl = curl_init(); $curl = curl_init();
@ -43,6 +46,8 @@ class Cloudflare
} }
}
} }