Index: .gitignore =================================================================== --- .gitignore (revision c7c91bded5c7b8970a4ca74a3f5e06884d8bd41b) +++ .gitignore (revision c7c91bded5c7b8970a4ca74a3f5e06884d8bd41b) @@ -0,0 +1,1 @@ +config.php Index: accounts.php =================================================================== --- accounts.php (revision 76cb6041d6d56e8deeba1ee13f26029c5b1db271) +++ accounts.php (revision c7c91bded5c7b8970a4ca74a3f5e06884d8bd41b) @@ -49,11 +49,22 @@ function page_admins_by_org() { ?> -
+

List of Administrators by Organisation

-
+ + 
Current status: Awaiting user input
+ +
+ +
+
+ +
+
+
+ +
- @@ -61,13 +72,23 @@ function page_orgs_by_admin() { ?> -
+

List of Organisations by Administrator

-
+ + 
Current status: Awaiting user input
+ +
+ +
+
+ +
+
+
+ +
- - OrganisationNameEmail AddressAccess Level'); + $.each(sorted, function(data) { + if ( sorted[data].administrator[0] != "ERROR" ) { + number_of_admins = sorted[data].administrator.length; + $("#meraki_admins_output_table").append('' + sorted[data].name + '' + sorted[data].administrator[0].name + '' + sorted[data].administrator[0].email + '' + sorted[data].administrator[0].orgAccess + ''); + for (i=1; i' + sorted[data].administrator[i].name + '' + sorted[data].administrator[i].email + '' + sorted[data].administrator[i].orgAccess + ''); + } + } + else { + $("#meraki_admins_output_table").append('' + sorted[data].name + 'ERRORERRORERROR'); + } + }); + status_update("Done..."); +} + +function print_admins_output_by_admin() { + status_update('Sorting and generating output...'); + var admins = {}; + + $.each (orgs, function(j) { + $.each (orgs[j].administrator, function (k) { + if (orgs[j].administrator[k] != "ERROR") { + if (!admins[orgs[j].administrator[k].email]) { + + admins[orgs[j].administrator[k].email]=[]; + + admins[orgs[j].administrator[k].email].name = orgs[j].administrator[k].name; + + } + + var next_org = admins[orgs[j].administrator[k].email].length; + + admins[orgs[j].administrator[k].email][next_org] = orgs[j]; + + + admins[orgs[j].administrator[k].email][next_org].orgAccess = orgs[j].administrator[k].orgAccess; + } + + + }); + }); + + + + + + sorted = admins; //.sort(function(a, b) { return a.name - b.name; }); + $("#meraki_admins_output").html('
Email AddressNameOrganisationAccess Level
'); + $.each(sorted, function(j) { + number_of_admins = sorted[j].length; + $("#meraki_admins_output_table").append(' ' + j + ' ' + sorted[j].name + ' ' + sorted[j][0].name + ' ' + sorted[j][0].orgAccess + ' '); + for (i=1; i ' + sorted[j][i].name + ' ' + sorted[j][i].orgAccess + ''); + } + }); + status_update("Done..."); +} + + +//GET LICENCES function get_licence_state() { - $("#licenceOutput").append("

Fetching organisations...

"); - get_orgs_licences(); - return; - -} - -function get_next_licence(data) { - if ( current_org == -1 ){ - //First one to fetch - $("#licenceOutput").append('

Getting organisation ' + 1 + '/' + number_of_orgs + ' (' + orgs[0].name + ')....

'); - current_org++; - get_org_licences(orgs[current_org].id); - } - else { - //We should be in a success clause, so parse data - lic = data; - if (typeof data == 'undefined') { - //This shouldn't happen now - orgs[current_org].licStatus = "ERROR"; - orgs[current_org].licExpirationDate = "ERROR"; - orgs[current_org].licLicensedDeviceCounts = "ERROR"; - } - else { - orgs[current_org].licStatus = lic['status']; - orgs[current_org].licExpirationDate = Date.parse(lic['expirationDate']); - orgs[current_org].licLicensedDeviceCounts = lic['licensedDeviceCounts']; - } - - if (current_org < number_of_orgs-1) { - //More stuff to get.... - current_org++; - $("#licenceOutputCounter").text('Getting organisation ' + parseInt(parseInt(current_org)+1) + '/' + number_of_orgs + ' (' + orgs[current_org].name + ')....'); - get_org_licences(orgs[current_org].id); - } - else { - //All done - print output... - print_licence_output(); - } - } + status_update("Fetching organisations..."); + $(".meraki_form").hide(); + set_key(); + get_organisations(on_get_organisations_success_licences, on_get_organisations_error); +} + + +function on_get_organisations_success_licences(data) { + orgs = data; + number_of_orgs = orgs.length; + status_update("Found " + number_of_orgs + " organisations - fetching licence states..."); + $.each(data, function(org) { + + $.ajax({ + dataType: "json", + url: "api.php?action=get_org_licences&orgid="+data[org].id+"&key=" + key, + success: function (r) {on_get_licence_sucess(r, org);}, + error: function (x, s, e) {on_get_licence_error(e, org);} + }); + }); +} + +function on_get_licence_sucess(lic, org_index) { + orgs[org_index].licStatus = lic['status']; + orgs[org_index].licExpirationDate = Date.parse(lic['expirationDate']); + orgs[org_index].licLicensedDeviceCounts = lic['licensedDeviceCounts']; + orgs_completed++; + if(check_orgs_complete()) { + print_licence_output(); + } +} + +function on_get_licence_error(error, org_index) { + orgs[org_index].licStatus = "ERROR"; + orgs[org_index].licExpirationDate = "ERROR"; + orgs[org_index].licLicensedDeviceCounts = "ERROR"; + orgs_completed++; + if(check_orgs_complete()) { + print_licence_output(); + } } function print_licence_output() { - $("#licenceOutput").append('

Sorting and generating output...

'); + status_update('Sorting and generating output...'); sorted = orgs.sort(function(a, b) { return a.licExpirationDate - b.licExpirationDate; }); - $("#licenceOutput").html('
OrganisationStatusExpiration DateDevices
'); + $("#meraki_licence_output").html('
OrganisationStatusExpiration DateDevices
'); $.each(sorted, function(data) { d = new Date(sorted[data].licExpirationDate); @@ -55,4 +184,5 @@ $("#licenceOutputTable").append('' + sorted[data].name + '' + sorted[data].licStatus + '' + n + ''+ dump_licenced_devices(sorted[data].licLicensedDeviceCounts) + ''); }); + status_update("Done..."); } @@ -75,50 +205,45 @@ } -function get_orgs_licences_success(data) { - orgs = data; - number_of_orgs = orgs.length; - $("#licenceOutput").append('

Got ' + number_of_orgs + ' organisations. Fetching details....

'); - get_next_licence(0); -} - -function get_orgs_licences() { - var key = $('#api-key').val(); - //Check if the user has entered anything - //if(key == ''){ - // key = 'rokey'; - //} - $.ajax({ - dataType: "json", - url: "licences.php?action=get_orgs&key=" + key, - success: function(data) {get_orgs_licences_success(data);} - }); -} - -function get_org_licences(orgid) { - var key = $('#api-key').val(); - //Check if the user has entered anything - //if(key == ''){ - // key = 'rokey'; - //} - $.ajax({ - dataType: "json", - url: "licences.php?action=get_org_licences&orgid=" + orgid + "&key=" + key, - success: function(data) { get_next_licence(data); }, - error: function (jqXHR, textStatus, errorThrown ) { - console.log("Status: " + textStatus + ", Error: " + errorThrown); - orgs[current_org].licStatus = "ERROR"; - orgs[current_org].licExpirationDate = "ERROR"; - orgs[current_org].licLicensedDeviceCounts = "ERROR"; - if (current_org < number_of_orgs-1) { - //More stuff to get.... - current_org++; - $("#licenceOutputCounter").text('Getting organisation ' + parseInt(parseInt(current_org)+1) + '/' + number_of_orgs + ' (' + orgs[current_org].name + ')....'); - get_org_licences(orgs[current_org].id); - } - else { - //All done - print output... - print_licence_output(); - } - } - }); -} + + +//GENERAL FUNCTIONS + +function check_orgs_complete() { + if( orgs_completed != number_of_orgs) { + status_update("Retrieved data for " + orgs_completed + " / " + number_of_orgs + " organisations - waiting for more data..."); + return false; + } + return true; +} + +function do_this_when_all_loops_are_done() { + status_update("Done..."); + //Output something? +} + +function get_organisations(callback_success, callback_error) { + $.ajax({ + dataType: "json", + url: "api.php?action=get_orgs&key=" + key, + success: function(r) {callback_success(r);}, + error: function(x, s, e) {callback_error(e);} + }); +} + +function on_get_organisations_error (jqXHR, textStatus, errorThrown) { + status_update("Error..." + errorThrown); +} + +function status_update(t) { + $("#meraki_status").html("
Current status: " + t + "
"); + return 1; +} + +function set_key() { + if (!($("#meraki_ro_key").is(':checked'))) { + key = $("#meraki_api_key").val(); + } + else{ + key = "rokey"; + } +} Index: include.php =================================================================== --- include.php (revision 76cb6041d6d56e8deeba1ee13f26029c5b1db271) +++ include.php (revision c7c91bded5c7b8970a4ca74a3f5e06884d8bd41b) @@ -5,4 +5,24 @@ $page_header = file_get_contents ( "page_header.html" ); $page_footer = file_get_contents ( "page_footer.html" ); + +function ro_key_fields() { ?> +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ -
+

Licence State for Organisations

-
+ 
Current status: Awaiting user input
+ +
+ +
+
+ +
+
+
+ +
- - + + +