Index: accounts.php =================================================================== --- accounts.php (revision c7c91bded5c7b8970a4ca74a3f5e06884d8bd41b) +++ accounts.php (revision 328c604ffc25812aa4372700f0d5093dfe26b939) @@ -5,5 +5,5 @@ $page_header = preg_replace ( '/PAGE_NAME/', $page_name, $page_header ); -if ( !isset ( $_GET['action'] ) || $_GET['action'] == "" ) { +if ( !isset ( $_POST['action'] ) || $_POST['action'] == "" ) { echo ( $page_header ); new_request(); @@ -66,5 +66,5 @@ @@ -89,5 +89,5 @@

Add Administrator

-
-
-
- + 
Current status: Awaiting user input
+
+ + + +
+
+
-
- +
+
- +
- +
- +
- -
-
-
-
- -
-
- @@ -164,9 +160,9 @@
+
- - -
+ +
@@ -176,5 +172,5 @@ Index: api.php =================================================================== --- api.php (revision c7c91bded5c7b8970a4ca74a3f5e06884d8bd41b) +++ api.php (revision 328c604ffc25812aa4372700f0d5093dfe26b939) @@ -1,5 +1,5 @@ OrganisationNameEmail AddressAccess Level'); + $("#meraki_admins_output").html('\ + \ + \ + \ + \ + \ + \ + \ +
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 + ''); + $("#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 + ''); + $("#meraki_admins_output_table").append('\ + \ + ' + 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'); + $("#meraki_admins_output_table").append('\ + \ + ' + sorted[data].name + '\ + ERROR\ + ERROR\ + ERROR\ + \ + '); } }); @@ -87,40 +132,35 @@ 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; - } - - - }); - }); - - - - + + admins = group_orgs_by_admin(); sorted = admins; //.sort(function(a, b) { return a.name - b.name; }); - $("#meraki_admins_output").html('
Email AddressNameOrganisationAccess Level
'); + $("#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 + ' '); + $("#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 + ''); + $("#meraki_admins_output_table").append('\ + \ + ' + sorted[j][i].name + '\ + ' + sorted[j][i].orgAccess + '\ + \ + '); } }); @@ -128,4 +168,97 @@ } +function print_orgs_to_add_admin() { + status_update('Sorting and generating output...'); + + admins = group_orgs_by_admin(); + + //check if admin exists - if not we can skip the per org checks + var admin_to_add = $('#meraki_email').val(); + var admin_exists; + if ( ! (admins[admin_to_add] ) ){ + admin_exists=false; + } + else { + admin_exists = true; + } + + $('#meraki_orgsOutput').append('\ +

Please select the organisations to add this user to:

\ + '); + + $.each (orgs, function (k) { + $('#meraki_orgsOutput').append('
'); + $('#meraki_orgs_'+k).append('\ +
\ + \ +
\ + '); + $('#meraki_orgs_'+k).append('\ +
\ + \ +
\ + '); + + $('#meraki_orgs_'+k).append('
'); + + if ( orgs[k].administrator == "ERROR") { + $('#meraki_org_'+orgs[k].id).attr('disabled','disabled'); + } + + if ( admin_exists ) { + $.each ( admins[admin_to_add], function (j) { + if ( admins[admin_to_add][j].id == orgs[k].id ) { + $('#meraki_org_'+orgs[k].id).attr('disabled','disabled'); + } + }); + } + }); + $('#meraki_orgsOutput').append('\ +
\ + \ +
\ + '); + status_update('Waiting for user input...'); +} + +function add_admin() { + status_update("Adding admins..."); + $("#meraki_go").hide(); + + + var fname = $("#meraki_full_name").val(); + var email = $("#meraki_email").val(); + var orgaccess = $("#meraki_access").val(); + + $(':checkbox[name="org_checkboxes[]"]:checked').each( function () { + var org_id = this.value; + $('#meraki_org_output_'+org_id).html('Adding...'); + $.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(e, org_id);} + }); + }); +} + +function on_add_admin_success(r, org_id) { + $('#meraki_org_output_'+org_id).html('Success') +} + +function on_add_admin_error(e, org_id) { + $('#meraki_org_output_'+org_id).html('Error: '+e) +} //GET LICENCES @@ -148,5 +281,11 @@ $.ajax({ dataType: "json", - url: "api.php?action=get_org_licences&orgid="+data[org].id+"&key=" + key, + url: "api.php", + method: "post", + data: { + 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);} @@ -167,5 +306,5 @@ function on_get_licence_error(error, org_index) { orgs[org_index].licStatus = "ERROR"; - orgs[org_index].licExpirationDate = "ERROR"; + orgs[org_index].licExpirationDate = Date.parse(0); orgs[org_index].licLicensedDeviceCounts = "ERROR"; orgs_completed++; @@ -178,9 +317,25 @@ status_update('Sorting and generating output...'); sorted = orgs.sort(function(a, b) { return a.licExpirationDate - b.licExpirationDate; }); - $("#meraki_licence_output").html('
OrganisationStatusExpiration DateDevices
'); + $("#meraki_licence_output").html('\ + \ + \ + \ + \ + \ + \ + \ +
OrganisationStatusExpiration DateDevices
\ + '); $.each(sorted, function(data) { d = new Date(sorted[data].licExpirationDate); n = d.toDateString(); - $("#licenceOutputTable").append('' + sorted[data].name + '' + sorted[data].licStatus + '' + n + ''+ dump_licenced_devices(sorted[data].licLicensedDeviceCounts) + ''); + $("#licenceOutputTable").append('\ + \ + ' + sorted[data].name + '\ + ' + sorted[data].licStatus + '\ + ' + n + '\ + '+ dump_licenced_devices(sorted[data].licLicensedDeviceCounts) + '\ + \ + '); }); status_update("Done..."); @@ -225,5 +380,10 @@ $.ajax({ dataType: "json", - url: "api.php?action=get_orgs&key=" + key, + url: "api.php", + method: "post", + data: { + action: "get_orgs", + key: key + }, success: function(r) {callback_success(r);}, error: function(x, s, e) {callback_error(e);} @@ -235,4 +395,33 @@ } +function group_orgs_by_admin () { + var admins = {}; + $.each (orgs, function(j) { + $.each (orgs[j].administrator, function (k) { + if (orgs[j].administrator[k] != "ERROR") { + var current_admin = orgs[j].administrator[k]; + if (!admins[current_admin.email]) { + + admins[current_admin.email]=[]; + + admins[current_admin.email].name = current_admin.name; + } + + var next_org = admins[current_admin.email].length; + + admins[current_admin.email][next_org]= { id: orgs[j].id, + name: orgs[j].name, + orgAdminId: current_admin.id, + orgAccess: current_admin.orgAccess + }; + + } + + + }); + }); + return admins; +} + function status_update(t) { $("#meraki_status").html("
Current status: " + t + "
"); Index: include.php =================================================================== --- include.php (revision c7c91bded5c7b8970a4ca74a3f5e06884d8bd41b) +++ include.php (revision 328c604ffc25812aa4372700f0d5093dfe26b939) @@ -30,19 +30,22 @@ global $RO_API_KEY; - if ( !isset ( $_GET['key'] ) || $_GET['key'] == "" || $_GET['key'] == "rokey" ) { + if ( !isset ( $_POST['key'] ) || $_POST['key'] == "" || $_POST['key'] == "rokey" ) { $key = $RO_API_KEY; } else { - $key = $_GET['key']; - } - switch ($_GET['action']) { + $key = $_POST['key']; + } + switch ($_POST['action']) { case "get_orgs": echo ( get_orgs($key) ); break; case "get_org_licences": - echo ( get_org_licences($_GET['orgid'], $key) ); + echo ( get_org_licences($_POST['orgid'], $key) ); break; case "get_org_admins": - echo ( get_org_admins($_GET['orgid'], $key) ); + echo ( get_org_admins($_POST['orgid'], $key) ); + break; + case "add_org_admin": + echo ( add_org_admin($_POST['orgid'], $_POST['fname'], $_POST['email'], $_POST['orgaccess'], $key) ); break; default: @@ -106,5 +109,9 @@ //POST /organizations/[organization_id]/admins //sample post data: - //{"name":"Miles Meraki", "email":"miles@meraki.com", "orgAccess":"none", "tags":[{"tag":"west", "access":"read-only"}]} + function add_org_admin($orgid, $name, $email, $access, $key) { + $data = array ("name" => $name, "email" => $email, "orgAccess" => $access); + $call = "/organizations/" . $orgid . "/admins/"; + return post_request($call, $data, $key); + } //Delete an admin from an organisation @@ -112,5 +119,5 @@ return delete_request('/organizations/' . $orgid . '/admins/' . $adminid, $key); } - + @@ -138,12 +145,13 @@ //General function to submit a POST call - function post_request($call, $post_data, $key) { + function post_request($call, $data, $key) { global $SERVER; global $API_VERSION; + $post_data = json_encode($data); $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-type: application/json\r\n", 'content' => $post_data ) @@ -155,6 +163,27 @@ $json = file_get_contents($SERVER . $API_VERSION . $call, false, $context); //TODO: Catch exceptions and return errors + if ( $json === false ) { + header('HTTP/1.1 400 Bad Request'); + } $resp = preg_replace ( '/"id":([0-9]+),/', '"id":"$1",', $json ); return $resp; + /* + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL,$SERVER . $API_VERSION . $call); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_POSTFIELDS,$data); //Post Fields + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + $headers = [ "X-Cisco-Meraki-API-Key: " . $key, + "Content-type: application/x-www-form-urlencoded" + ]; + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + + $json = curl_exec ($ch); + $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE); + + $resp = preg_replace ( '/"id":([0-9]+),/', '"id":"$1",', $json ); + curl_close ($ch); + header('HTTP/1.1 ' . $httpcode); + return $resp;*/ } Index: licences.php =================================================================== --- licences.php (revision c7c91bded5c7b8970a4ca74a3f5e06884d8bd41b) +++ licences.php (revision 328c604ffc25812aa4372700f0d5093dfe26b939) @@ -5,5 +5,5 @@ $page_header = preg_replace ( '/PAGE_NAME/', $page_name, $page_header ); -if ( !isset ( $_GET['action'] ) || $_GET['action'] == "" ) { +if ( !isset ( $_POST['action'] ) || $_POST['action'] == "" ) { echo ( $page_header ); new_request();