-
-
-
-
Index: i.php
===================================================================
--- api.php (revision 15edf86c83205cf1ba097fb446d2d92d2f2cd65f)
+++ (revision )
@@ -1,18 +1,0 @@
-
Index: nfig.template.php
===================================================================
--- config.template.php (revision 15edf86c83205cf1ba097fb446d2d92d2f2cd65f)
+++ (revision )
@@ -1,14 +1,0 @@
-
Index: include.css
===================================================================
--- include.css (revision 15edf86c83205cf1ba097fb446d2d92d2f2cd65f)
+++ include.css (revision 1ef418221dfb9aac8c2e099d46b49cf494a47f04)
@@ -1,66 +1,0 @@
-.meraki_container {
- display: table;
- width:1%;
- text-align: left;
-}
-.meraki_row {
- display: table-row;
- width:1%;
- text-align: left;
-}
-.meraki_left, .meraki_right, .meraki_middle {
- display: table-cell;
- width:1%;
- white-space:nowrap;
- padding-right: 25px;
-}
-.meraki_left p, .meraki_right p, .meraki_middle p {
- margin: 1px 1px;
-}
-
-.meraki_output_group {
- border: 1px solid;
- border-color: black;
-}
-
-.meraki_output_header{
-}
-
-.meraki_output_header_group {
- border: 1px solid;
- border-color: black;
-}
-
-.meraki_output_table tr {
- border: 1px solid;
- border-color: black;
-}
-
-.meraki_success {
- background-color: rgb(224, 255, 224);
- font-color: rgb(0, 128, 0);
- color: rgb(0, 128, 0);
-}
-
-.meraki_warning {
- background-color: rgb(255, 255, 224);
- font-color: rgb(128, 128, 0);
- color: rgb(128, 128, 0);
-}
-
-.meraki_failure {
- background-color: rgb(255, 224, 224);
- font-color: rgb(128, 0, 0);
- color: rgb(128, 0, 0);
-}
-
-.meraki_button_warning {
- background-color: rgb(255, 0, 0);
- font-color: rgb(255, 255, 255);
- color: rgb(255, 255, 255);
- font-weight: bold;
-}
-
-.meraki_ro_key {
- display:none;
-}
Index: include.js
===================================================================
--- include.js (revision 15edf86c83205cf1ba097fb446d2d92d2f2cd65f)
+++ include.js (revision 1ef418221dfb9aac8c2e099d46b49cf494a47f04)
@@ -1,1097 +1,124 @@
-// Variable to hold fetched organisations
var orgs;
+var number_of_orgs;
+var current_org=-1;
-// Variable to hold fetched networks
-var nets;
-
-// Number of Organisations expected
-var number_of_orgs;
-
-// Number of Networks expected
-var number_of_nets;
-
-// Number of Organisations fetched
-var orgs_completed=0;
-
-// Number of Networks fetched
-var nets_completed=0;
-
-// API Key
-var key="";
-
-//Rate limit APIs to 1 every xxx ms
-var ratelimit=600;
-
-//Extend _ with rate limit method:
-_.rateLimit = function(func, rate, async) {
- var queue = [];
- var timeOutRef = false;
- var currentlyEmptyingQueue = false;
-
- var emptyQueue = function() {
- if (queue.length) {
- currentlyEmptyingQueue = true;
- _.delay(function() {
- if (async) {
- _.defer(function() { queue.shift().call(); });
- } else {
- queue.shift().call();
- }
- emptyQueue();
- }, rate);
- } else {
- currentlyEmptyingQueue = false;
- }
- };
-
- return function() {
- var args = _.map(arguments, function(e) { return e; }); // get arguments into an array
- queue.push( _.bind.apply(this, [func, this].concat(args)) ); // call apply so that we can pass in arguments as parameters as opposed to an array
- if (!currentlyEmptyingQueue) { emptyQueue(); }
- };
-};
-
-// Initialisation functions
-$( document ).ready(function() {
-
- // Add a handler to hide and show API key when a read only key is allowed
- $("#meraki_ro_key").change(function(event) {
- var checkbox = event.target;
- if (checkbox.checked) {
- $(".meraki_ro_key").hide();
- } else {
- // Cannot use normal jQuery function to show as it requires the
- // display property set to table-row
- $(".meraki_ro_key").css('display', 'table-row');
- }
- });
-
-});
-
-
-// ADMIN FUNCTIONS
-
-// Called by button click
-function get_admins_by_org() {
- // Update the status box
- status_update("Fetching organisations...");
- // Hide the form to prevent people clicking stuff
- $(".meraki_form").hide();
- // Get the key to use
- set_key();
- // Call the general function to get the list of organisations
- // Using the success callback for this operation, and a general error catching callback
- get_organisations(on_get_organisations_success_admins, on_get_organisations_error);
+function get_licence_state() {
+
+ $("#licenceOutput").append("
Fetching organisations...
");
+ get_orgs();
+ return;
+
}
-// Callback from get_organisations which has succesfully returned data
-function on_get_organisations_success_admins(data) {
- // Store the organisations received into the global variable
- orgs = data;
- // Get the number of organisations in the array
- number_of_orgs = orgs.length;
- // Update the status box
- status_update("Found " + number_of_orgs + " organisations - fetching admins...");
-
- // Get the admins for each organisation
- function getadmin(org) {
-
- $.ajax({
- dataType: "json",
- url: "api.php",
- method: "post",
- data: {
- action: "get_org_admins",
- orgid: data[org].id,
- key: key
- },
- success: function (r) {on_get_admin_sucess(r, org);},
- error: function (x, s, e) {on_get_admin_error(e, org);}
- });
- }
-
- var delaygetadmin = _.rateLimit(getadmin, ratelimit);
-
- $.each(data, function(org) {delaygetadmin(org);});
-}
-
-// Callback from AJAX call to get organisation admins which has succesfully returned data
-function on_get_admin_sucess(administrator, org_index) {
- // Add the new information to the "administrator" object in
- // the global organisation array
- orgs[org_index].administrator = administrator;
-
- // Mark it as a completed call
- orgs_completed++;
-
- // Check whether all calls have now returned
- // If they have, print the output
- // Otherwise do nothing as we're still waiting on more data
- if(check_orgs_complete()) {
- print_admins_output();
- }
-}
-
-// Callback from AJAX call to get organisation admins which has returned an error
-function on_get_admin_error(error, org_index) {
- // Add a new "administrator" object in the global organisation
- // array and mark it with an ERROR value
- orgs[org_index].administrator = [];
- orgs[org_index].administrator[0] = "ERROR";
-
- // Mark it as a completed call
- orgs_completed++;
-
- // Check whether all calls have now returned
- // If they have, print the output
- // Otherwise do nothing as we're still waiting on more data
- if(check_orgs_complete()) {
- print_admins_output();
- }
-}
-
-// Print the output when the AJAX calls complete
-function print_admins_output() {
- // Depending on the page we need to print the output differently
- // The page is defined in a global variable in a script tag
- // on the original HTML page
- if ( page == "orgs_by_admin" ){
- print_admins_output_by_admin();
- }
- else if ( page == "admins_by_org" ) {
- print_admins_output_by_org();
- }
- else if ( page == "add_admin" ) {
- print_orgs_to_add_admin();
- }
- else if ( page == "delete_admin" ) {
- print_select_admin_to_remove();
+function get_next_licence(data) {
+ if ( current_org == -1 ){
+ //First one to fetch
+ $("#licenceOutput").append('
');
+ current_org++;
+ get_org_licences(orgs[current_org].id);
}
else {
- // We define the pages so there shouldn't be any missing
- status_update("Errrrrr - this shouldn't ever be reached - something went very wrong!");
+ //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();
+ }
}
}
-// Prints the list of administrators grouped by organisation
-function print_admins_output_by_org() {
- status_update('Sorting and generating output...');
-
- // Sort the organisations by name A -> Z
- sorted = orgs.sort(function(a, b) { return a.name - b.name; });
-
- // Insert the table into the pre-created div
- $("#meraki_admins_output").html('\
-
\
-
\
-
Organisation
\
-
Name
\
-
Email Address
\
-
Access Level
\
-
\
-
\
- ');
-
- // Loop over each organisation
- $.each(sorted, function(data) {
- // Check we suceeded in fetching the admins of the network
- if ( sorted[data].administrator[0] != "ERROR" ) {
- // Store the number of admins in this organisation
- number_of_admins = sorted[data].administrator.length;
- // Output the organisation with an appropriate row span along
- // with the first admnistrator
- $("#meraki_admins_output_table").append('\
-
\
-
' + sorted[data].name + '
\
-
' + sorted[data].administrator[0].name + '
\
-
' + sorted[data].administrator[0].email + '
\
-
' + sorted[data].administrator[0].orgAccess + '
\
-
\
- ');
- // Loop oveer the remainig admins (note i=1 not 0) and output their details
- for (i=1; i\
-
' + sorted[data].administrator[i].name + '
\
-
' + sorted[data].administrator[i].email + '
\
-
' + sorted[data].administrator[i].orgAccess + '
\
- \
- ');
- }
- }
- else {
- //We failed to get data on this organisation
- $("#meraki_admins_output_table").append('\
-
\
-
' + sorted[data].name + '
\
-
ERROR
\
-
ERROR
\
-
ERROR
\
-
\
- ');
- }
- });
- //Entire function is complete
- status_update("Done...");
-}
-
-// Prints the list of organisations grouped by oadministrator
-function print_admins_output_by_admin() {
- status_update('Sorting and generating output...');
-
- // Call another function to group organisations by administrator
- // as this is non-trivial and needed elsewhere
- admins = group_orgs_by_admin();
-
- //TODO: Sort by admin alphabetically
- sorted = admins; //.sort(function(a, b) { return a.name - b.name; });
-
- // Insert the table into the pre-created div
- $("#meraki_admins_output").html('\
-
\
-
\
-
Email Address
\
-
Name
\
-
Organisation
\
-
Access Level
\
-
Account Status
\
-
\
-
\
- ');
-
- // Loop over each administrator
- $.each(sorted, function(j) {
- // Store the number of organisations available to this admin
- // TODO: Fix variable name but can't number_of_orgs (damn globals!)
- number_of_admins = sorted[j].length;
- // Output the admin with an appropriate row span along
- // with the first organisation
-
- if (sorted[j][0].accountStatus != 'ok' ) {
- status_style="meraki_failure";
- }
- else {
- status_style="meraki_success";
- }
-
- $("#meraki_admins_output_table").append('\
-
\
-
' + j + '
\
-
' + sorted[j].name + '
\
-
' + sorted[j][0].name + '
\
-
' + sorted[j][0].orgAccess + '
\
-
' + sorted[j][0].accountStatus + '
\
-
\
- ');
- // Loop oveer the remainig organisations (note i=1 not 0) and output their details
- for (i=1; i\
-
' + sorted[j][i].name + '
\
-
' + sorted[j][i].orgAccess + '
\
-
' + sorted[j][i].accountStatus + '
\
- \
- ');
- }
- });
- //Entire function is complete
- status_update("Done...");
-}
-
-function print_orgs_to_add_admin() {
- status_update('Sorting and generating output...');
-
- sorted = orgs.sort(function(a, b) { return (a.name < b.name)?-1:((b.name < a.name)?1:0); });
- orgs = sorted;
-
- // Call another function to group organisations by administrator
- // as this is non-trivial and needed elsewhere
- admins = group_orgs_by_admin();
-
- // Check if the admin exists in organisations this key manages
- // If not we can skip the per organisation checks later
- var admin_to_add = $('#meraki_email').val().toLowerCase ();
- var admin_exists;
- if ( ! (admins[admin_to_add] ) ){
- admin_exists=false;
- }
- else {
- admin_exists = true;
- }
-
- // Add to the HTML page a prompt and the select all box
- $('#meraki_orgsOutput').append('\
-
Please select the organisations to add this user to:
\
- ');
-
- // Attach a function to the check all box to be triggered when changed
- $("#meraki_orgs_select_all_box").change(function(event) {
-
- // Define the checkbox we're working on
- var checkbox = event.target;
-
- // If it's checked, tick all the organisation checkboxes that are not disabled and not already checked
- if (checkbox.checked) {
- $(':checkbox[name="org_checkboxes[]"]:not(:disabled):not(:checked)').each( function () {
- //Note: "this" is the current object in the "each" loop, not the object which raised the event
- this.checked = true;
- });
- }
- // Otherwise, untick all the organisation checkboxes that
- // are not disabled and are already checked
- else {
- $(':checkbox[name="org_checkboxes[]"]:not(:disabled):checked').each( function () {
- //Note: "this" is the current object in the "each" loop,
- // not the object which raised the event
- this.checked = false;
- });
- }
- });
-
- // Loop over the organisations
- $.each (orgs, function (k) {
- // Add a new row to the table
- $('#meraki_orgsOutput').append('');
- // Print the name
- $('#meraki_orgs_'+k).append('\
-
\
- \
-
\
- ');
- // Print a checkbox with a value and DOM id based on the Meraki id
- $('#meraki_orgs_'+k).append('\
-
\
- \
-
\
- ');
-
- // Add a status column
- $('#meraki_orgs_'+k).append('');
-
- // If we were unable to query the admins for the organisation
- // Disable the checkbox
- // Add an error to the output column
- // Set the formatting (CSS class)
- if ( orgs[k].administrator == "ERROR") {
- $('#meraki_org_'+orgs[k].id).attr('disabled','disabled');
- $('#meraki_org_output_'+orgs[k].id).html('Unable to read data');
- $('#meraki_org_output_'+orgs[k].id).addClass('meraki_failure');
- }
-
- // If the admin exists
- if ( admin_exists ) {
- // Loop over administrators organisations
- $.each ( admins[admin_to_add], function (j) {
- //If this organisation is already there
- // Disable the checkbox
- // Add an error to the output column
- // Set the formatting (CSS class)
- if ( admins[admin_to_add][j].id == orgs[k].id ) {
- $('#meraki_org_'+orgs[k].id).attr('disabled','disabled');
- $('#meraki_org_output_'+orgs[k].id).html('Already an admin ('+admins[admin_to_add][j].orgAccess+')');
- $('#meraki_org_output_'+orgs[k].id).addClass('meraki_success');
- }
- });
- }
- });
-
- // Add a button to submit form
- $('#meraki_orgsOutput').append('\
-
\
- \
-
\
- ');
-
- // Need to wait for the user to click the button...
- status_update('Waiting for user input...');
-}
-
-// Function to add the admin to the selected organisations
-function add_admin() {
- status_update("Adding admins...");
-
- // Hide the button to prevent double submissions
- $("#meraki_go").hide();
-
- // Retrieve values from the form
- var fname = $("#meraki_full_name").val();
- var email = $("#meraki_email").val();
- var orgaccess = $("#meraki_access").val();
-
- // Function to add admins
- function addadmin(org_id) {
- $.ajax({
- dataType: "json",
- url: "api.php",
- method: "post",
- data: {
- action: "add_org_admin",
- orgid: org_id,
- key: key,
- fname: fname,
- email: email,
- orgaccess: orgaccess
- },
- success: function (r) {on_add_admin_success(r, org_id);},
- error: function (x, s, e) {on_add_admin_error(x, e, org_id);}
- });
- }
-
- //Create a rate limited function
- var delayaddadmin = _.rateLimit(addadmin, ratelimit);
-
- // Loop over selected check boxes in the org_checkboxes array
- // Don't need to check for enabled as disabled ones are all unticked
- $(':checkbox[name="org_checkboxes[]"]:checked').each( function () {
- // Get the Meraki organisation id which was stored as the checkbox value
- var org_id = this.value;
-
- // Update the output column
- $('#meraki_org_output_'+org_id).html('Adding...');
-
- // Queue an AJAX call to add the admin to the organisation
- delayaddadmin(org_id);
- });
-}
-
-// Callback to update output column on success
-function on_add_admin_success(r, org_id) {
- $('#meraki_org_output_'+org_id).html('Success')
- $('#meraki_org_output_'+org_id).addClass('meraki_success');
-}
-
-// Callback to update output column on error
-function on_add_admin_error(x, e, org_id) {
- $('#meraki_org_output_'+org_id).html('HTTP Error: '+e+' Server response (if any): '+x.responseText);
- $('#meraki_org_output_'+org_id).addClass('meraki_failure');
-}
-
-
-function print_select_admin_to_remove() {
- status_update('Sorting and generating output...');
-
- // Call another function to group organisations by administrator
- // as this is non-trivial and needed elsewhere
- admins = group_orgs_by_admin();
-
- // Create list box for admins
- $('#meraki_admins_output').html('');
-
- // Loop over admins and add as an option in the list box
- // The index for the admins object is email and this is used by
- // JQuery as the iterator (j)
- $.each ( admins, function (j) {
- $('#meraki_admin').append('');
- });
-
- // Add a button to submit form
- $('#meraki_admins_output').append('\
-
\
- \
- ');
- status_update('Waiting for user input...');
-}
-
-//TODO: Rename this function (print_orgs_to_remove_admin?)
-function get_orgs_for_admin() {
- status_update('Sorting and generating output...');
-
- // Hide the previous form to prevent resubmission
- $('#meraki_admins_output').hide();
-
- // Get the admin to remove from the select box
- var admin_to_remove = $('#meraki_admin').val();
-
- sorted = orgs.sort(function(a, b) { return (a.name < b.name)?-1:((b.name < a.name)?1:0); });
- orgs = sorted;
-
- // Call another function to group organisations by administrator
- // as this is non-trivial and needed elsewhere
- admins = group_orgs_by_admin();
-
- // Add to the HTML page a prompt and the select all box
- $('#meraki_orgs_output').append('\
-
Please select the organisations to remove this user from:
\
- ');
-
- // Attach a function to the check all box to be triggered when changed
- $("#meraki_orgs_select_all_box").change(function(event) {
-
- // Define the checkbox we're working on
- var checkbox = event.target;
-
- // If it's checked, tick all the organisation checkboxes that are not disabled and not already checked
- if (checkbox.checked) {
- $(':checkbox[name="org_checkboxes[]"]:not(:disabled):not(:checked)').each( function () {
- //Note: "this" is the current object in the "each" loop, not the object which raised the event
- this.checked = true;
- });
- }
- // Otherwise, untick all the organisation checkboxes that
- // are not disabled and are already checked
- else {
- $(':checkbox[name="org_checkboxes[]"]:not(:disabled):checked').each( function () {
- // Note: "this" is the current object in the "each" loop,
- // not the object which raised the event
- this.checked = false;
- });
- }
- });
-
-
- // Loop over the organisations
- $.each (orgs, function (k) {
- // Add a new row to the table
- $('#meraki_orgs_output').append('');
- // Print the name
- $('#meraki_orgs_'+k).append('\
-
\
- \
-
\
- ');
- // Print a checkbox with a value and DOM id based on the Meraki id
- $('#meraki_orgs_'+k).append('\
-
\
- \
-
\
- ');
-
- // Add a status column
- // We assume they're not an admin and set the formatting
- $('#meraki_orgs_'+k).append('');
- $('#meraki_org_output_'+orgs[k].id).html('Not an admin');
- $('#meraki_org_output_'+orgs[k].id).addClass('meraki_success');
- $('#meraki_orgs_'+k).hide();
-
- // If we were unable to query the admins for the organisation
- // Disable the checkbox
- // Add an error to the output column
- // Set the formatting (CSS class)
- if ( orgs[k].administrator == "ERROR") {
- $('#meraki_org_'+orgs[k].id).attr('disabled','disabled');
- $('#meraki_org_output_'+orgs[k].id).html('Unable to read data');
- $('#meraki_org_output_'+orgs[k].id).addClass('meraki_failure');
- $('#meraki_orgs_'+k).hide();
- }
-
- // Loop over administrators organisations
- $.each ( admins[admin_to_remove], function (j) {
- //If this organisation is there
- // Enable the checkbox
- // Clear the output column
- // Remove the formatting (CSS class)
- if ( admins[admin_to_remove][j].id == orgs[k].id ) {
- $('#meraki_org_'+orgs[k].id).removeAttr('disabled');
- $('#meraki_orgs_'+k).css('display', 'table-row');
- $('#meraki_org_'+orgs[k].id).val(orgs[k].id + ':' + admins[admin_to_remove][j].orgAdminId)
- $('#meraki_org_output_'+orgs[k].id).html('');
- $('#meraki_org_output_'+orgs[k].id).removeClass('meraki_success');
- }
- });
- });
-
- // Add a button to submit form
- $('#meraki_orgs_output').append('\
-
\
- \
-
\
- ');
-
- // Need to wait for the user to click the button...
- status_update('Waiting for user input...');
-}
-
-// Function to remove the admin from the selected organisations
-function remove_admin() {
- status_update("Removing admin...");
-
- // Hide the button to prevent double submissions
- $("#meraki_go").hide();
-
- // Fuction to remove an admin
- function remadmin (org_id, admin_id) {
- $.ajax({
- dataType: "json",
- url: "api.php",
- method: "post",
- data: {
- action: "delete_org_admin",
- orgid: org_id,
- adminid: admin_id,
- key: key
- },
- success: function (r) {on_del_admin_success(r, org_id);},
- error: function (x, s, e) {on_del_admin_error(e, org_id);}
- });
- }
-
-
- //Create a rate limited function
- var delayremadmin = _.rateLimit(remadmin, ratelimit);
-
- // Loop over selected check boxes in the org_checkboxes array
- // Don't need to check for enabled as disabled ones are all unticked
- $(':checkbox[name="org_checkboxes[]"]:checked').each( function () {
- // Get the Meraki organisation and admin id which were stored in the checkbox value seperated by :
- var ids = this.value.split(':');
- var org_id = ids[0];
- var admin_id = ids[1];
-
- // Update the output column
- $('#meraki_org_output_'+org_id).html('Removing...');
-
- // Queue an AJAX call to remove the admin from the organisation
- delayremadmin(org_id, admin_id);
-
- });
-}
-
-// Callback to update output column on success
-function on_del_admin_success(r, org_id) {
- $('#meraki_org_output_'+org_id).html('Success')
- $('#meraki_org_output_'+org_id).addClass('meraki_success');
-}
-
-// Callback to update output column on error
-function on_del_admin_error(e, org_id) {
- $('#meraki_org_output_'+org_id).html('Error: '+e);
- $('#meraki_org_output_'+org_id).addClass('meraki_failure');
-}
-
-
-//GET INVENTORY
-
-// Called by button click
-function get_inv_orgs() {
- // Update the status box
- status_update("Fetching organisations...");
- // Hide the form to prevent people clicking stuff
- $(".meraki_form").hide();
- // Get the key to use
- set_key();
- // Call the general function to get the list of organisations
- // Using the success callback for this operation, and a general error catching callback
- get_organisations(on_get_organisations_success_inventory, on_get_organisations_error);
-}
-
-// Callback from get_organisations which has succesfully returned data
-function on_get_organisations_success_inventory(data) {
- // Update the status box
- status_update('Sorting and generating output...');
- // Store the organisations received into the global variable
- orgs = data;
- // Sort the organisations by name A - Z
- sorted = orgs.sort(function(a, b) { return (a.name < b.name)?-1:((b.name < a.name)?1:0); });
-
- // Create list box for organisations
- $('#meraki_orgs_output').html('');
-
- // Loop over organisations and add as an option in the list box
- $.each ( orgs, function (j) {
- $('#meraki_org').append('');
- });
-
- // Add a button to submit form
- $('#meraki_orgs_output').append('\
-
\
- \
-
\
- ');
- status_update('Waiting for user input...');
-}
-
-// Called by button click
-// TODO: Rename this function
-function get_inventory() {
- // Update the status box
- status_update("Fetching networks...");
- // Hide the form to prevent people clicking stuff
- $('#meraki_orgs_output').hide();
- // Get the organisation id to use
- var orgid=$('#meraki_org').val();
- // Get the networks in this organisation
- $.ajax({
- dataType: "json",
- url: "api.php",
- method: "post",
- data: {
- action: "get_org_networks",
- orgid: orgid,
- key: key
- },
- success: function (r) {on_get_network_success(r, orgid);},
- error: function (x, s, e) {on_get_network_error(e, orgid);}
- });
-}
-
-// Callback from AJAX call to get organisation networks which has succesfully returned data
-function on_get_network_success(r, orgid) {
- nets = r;
- number_of_nets = nets.length;
- status_update("Found " + number_of_nets + " networks - fetching device details...");
-
- // Get the devices for each network
-
- function getnetwork (id,orgid,network) {
- $.ajax({
- dataType: "json",
- url: "api.php",
- method: "post",
- data: {
- action: "get_network_devices",
- orgid: orgid,
- networkid: id,
- key: key
- },
- success: function (r) {on_get_devices_success(r, network);},
- error: function (x, s, e) {on_get_devices_error(e, network);}
- });
- }
- var delaygetnetwork = _.rateLimit(getnetwork, ratelimit);
- $.each(r, function(network) {
- delaygetnetwork(this.id,orgid,network);
- });
-}
-
-// Callback from AJAX call to get network devices which has succesfully returned data
-function on_get_devices_success(devices, net_index) {
- nets[net_index].devices = devices;
- nets_completed++;
- if(check_nets_complete()) {
- print_inventory_output();
- }
-}
-
-function on_get_network_error(e, net_index) {
- status_update("Error fetching networks: " + e);
-}
-
-function on_get_devices_error(e, net_index) {
- status_update("Error fetching devices: " + e);
- nets[net_index].devices = ["ERROR"];
- nets_completed++;
- if(check_nets_complete()) {
- print_inventory_output();
- }
-}
-
-function print_inventory_output() {
- status_update('Sorting and generating output...');
-
- var csv="Network Name,Network Type,Device Name,Device Serial,Device Model,Device IP,Device MAC\r\n";
-
- sorted = nets; //.sort(function(a, b) { return a.name - b.name; });
- $("#meraki_inventory_output").html('\
-
- $name, "email" => $email, "orgAccess" => $access);
- $call = "/organizations/" . $orgid . "/admins/";
- return post_request($call, $data, $key);
- }
+ //Add Admin
+ //POST /organizations/[organization_id]/admins
+ //sample post data:
+ //{"name":"Miles Meraki", "email":"miles@meraki.com", "orgAccess":"none", "tags":[{"tag":"west", "access":"read-only"}]}
- // Delete an admin from an organisation
+ //Delete an admin from an organisation
function delete_org_admin($orgid, $adminid, $key) {
return delete_request('/organizations/' . $orgid . '/admins/' . $adminid, $key);
}
-
- // General function to submit a GET call
+
+ //General function to submit a GET call
function get_request($call, $key) {
global $SERVER;
global $API_VERSION;
-
- // TODO: Move to CURL
-
$opts = array(
'http'=>array(
@@ -169,56 +113,28 @@
// Open the file using the HTTP headers set above
$json = file_get_contents($SERVER . $API_VERSION . $call, false, $context);
- // TODO: Catch exceptions and return errors
-
- // Sanitise the ID for Javascript (enclose in " so it's a string rather than a number)
+ //TODO: Catch exceptions and return errors
$resp = preg_replace ( '/"id":([0-9]+),/', '"id":"$1",', $json );
return $resp;
}
- // General function to submit a POST call
- function post_request($call, $data, $key) {
-
- // Use the values defined in the config.php file
+ //General function to submit a POST call
+ function post_request($call, $post_data, $key) {
global $SERVER;
global $API_VERSION;
-
- // Initialise curl
- $ch = curl_init();
+ $opts = array(
+ 'http'=>array(
+ 'method' => "POST",
+ 'header' => "X-Cisco-Meraki-API-Key: " . $key . "\r\n" .
+ "Content-type: application/x-www-form-urlencoded\r\n",
+ 'content' => $post_data
+ )
+ );
- // Set the request URL
- curl_setopt($ch, CURLOPT_URL,$SERVER . $API_VERSION . $call);
- // Define a POST request
- curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
- // Follow redirects
- curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
- // Encode the data to be sent and attach to the request
- curl_setopt($ch, CURLOPT_POSTFIELDS,json_encode($data));
- // Return the result of request instead of Truse/False
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ $context = stream_context_create($opts);
- // Define request headers
- $headers = [ "X-Cisco-Meraki-API-Key: " . $key,
- "Content-type: application/json"
- ];
-
- // Attach the headers to the request
- curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-
- // Execute the curl request and get the returned data and HTTP code
- $json = curl_exec ($ch);
- $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
- // Sanitise the ID for Javascript (enclose in " so it's a string rather than a number)
+ // Open the file using the HTTP headers set above
+ $json = file_get_contents($SERVER . $API_VERSION . $call, false, $context);
+ //TODO: Catch exceptions and return errors
$resp = preg_replace ( '/"id":([0-9]+),/', '"id":"$1",', $json );
-
- error_log("url: " . $SERVER . $API_VERSION . $call . " data: " . json_encode($data) . " http code: " . $httpcode . " Response: " . $resp, 0);
-
- // Tidy up
- curl_close ($ch);
-
- // Send the return code back to the requesting browser
- header('HTTP/1.1 ' . $httpcode);
-
- // Send any data we may or may not have
return $resp;
}
@@ -226,45 +142,20 @@
//General function to submit a DELETE call
function delete_request($call, $key) {
-
- // Use the values defined in the config.php file
global $SERVER;
global $API_VERSION;
+ $opts = array(
+ 'http'=>array(
+ 'method' => "DELETE",
+ 'header' => "X-Cisco-Meraki-API-Key: " . $key . "\r\n"
+ )
+ );
+ $context = stream_context_create($opts);
- // Initialise curl
- $ch = curl_init();
-
- // Set the request URL
- curl_setopt($ch, CURLOPT_URL,$SERVER . $API_VERSION . $call);
- // Define a DELETE request
- curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
- // Follow redirects
- curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
- // Return the result of request instead of Truse/False
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
- // Define request headers
- $headers = [ "X-Cisco-Meraki-API-Key: " . $key,
- "Content-type: application/json"
- ];
-
- // Attach the headers to the request
- curl_setopt($ch, CURLOPT_HEADER, true);
- curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-
- // Execute the curl request and get the returned data and HTTP code
- $json = curl_exec ($ch);
- $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
- // Sanitise the ID for Javascript (enclose in " so it's a string rather than a number)
- $resp = preg_replace ( '/"id":([0-9]+),/', '"id":"$1",', $json );
-
- // Tidy up
- curl_close ($ch);
-
- // Send the return code back to the requesting browser
- header('HTTP/1.1 ' . $httpcode);
-
- // Send any data we may or may not have
+ // Open the file using the HTTP headers set above
+ $json = file_get_contents($SERVER . $API_VERSION . $call, false, $context);
+ //TODO: Catch exceptions and return errors
+ //Successful HTTP Status: 204
+ //Return HTTP Code
return $resp;
}
Index: index.php
===================================================================
--- index.php (revision 15edf86c83205cf1ba097fb446d2d92d2f2cd65f)
+++ index.php (revision 1ef418221dfb9aac8c2e099d46b49cf494a47f04)
@@ -11,7 +11,5 @@