GEANT / CAT

web/lib/admin/API.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
 
 use Exception;
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 /**
  * This class defines the various actions doable with the admin API, the
@@ -238,7 +238,7 @@ 
     const ACTIONS = [
         // Inst-level actions.
         API::ACTION_NEWINST_BY_REF => [
-            "REQ" => [API::AUXATTRIB_EXTERNALID,],
+            "REQ" => [API::AUXATTRIB_EXTERNALID, ],
             "OPT" => [
                 'general:geo_coordinates',
                 'general:logo_file',
@@ -298,7 +298,7 @@ 
             "OPT" => [API::AUXATTRIB_TARGETMAIL],
             "RETVAL" => [
                 ["TOKEN URL", 
-                 "EMAIL SENT",              // Dependent on TARGETMAIL input.
+                 "EMAIL SENT", // Dependent on TARGETMAIL input.
                  "EMAIL TRANSPORT SECURE"], // Dependent on TARGETMAIL input.
             ]
         ],
@@ -360,7 +360,7 @@ 
         API::ACTION_ENDUSER_NEW => [
             "REQ" => [API::AUXATTRIB_CAT_PROFILE_ID, API::AUXATTRIB_SB_USERNAME, API::AUXATTRIB_SB_EXPIRY],
             "OPT" => [],
-            "RETVAL" => [ API::AUXATTRIB_SB_USERNAME, API::AUXATTRIB_SB_USERID ],
+            "RETVAL" => [API::AUXATTRIB_SB_USERNAME, API::AUXATTRIB_SB_USERID],
         ],
         API::ACTION_ENDUSER_DEACTIVATE => [
             "REQ" => [API::AUXATTRIB_CAT_PROFILE_ID, API::AUXATTRIB_SB_USERID],
@@ -371,14 +371,14 @@ 
             "REQ" => [API::AUXATTRIB_CAT_PROFILE_ID],
             "OPT" => [],
             "RETVAL" => [
-                [ API::AUXATTRIB_SB_USERID => API::AUXATTRIB_SB_USERNAME],
+                [API::AUXATTRIB_SB_USERID => API::AUXATTRIB_SB_USERNAME],
             ],
         ],
         API::ACTION_ENDUSER_IDENTIFY => [
             "REQ" => [API::AUXATTRIB_CAT_PROFILE_ID],
             "OPT" => [API::AUXATTRIB_SB_USERID, API::AUXATTRIB_SB_USERNAME, API::AUXATTRIB_SB_CERTSERIAL],
             "RETVAL" => [
-                [ API::AUXATTRIB_SB_USERID => API::AUXATTRIB_SB_USERNAME],
+                [API::AUXATTRIB_SB_USERID => API::AUXATTRIB_SB_USERNAME],
             ],
         ],
 
@@ -388,9 +388,9 @@ 
             "RETVAL" => [
                 API::AUXATTRIB_TOKENURL, 
                 API::AUXATTRIB_TOKEN, 
-                "EMAIL SENT",             // Dependent on TARGETMAIL input.
+                "EMAIL SENT", // Dependent on TARGETMAIL input.
                 "EMAIL TRANSPORT SECURE", // Dependent on TARGETMAIL input.
-                "SMS SENT",               // Dependent on TARGETSMS input.
+                "SMS SENT", // Dependent on TARGETSMS input.
             ]
         ],
         API::ACTION_TOKEN_REVOKE => [
@@ -409,7 +409,7 @@ 
             "REQ" => [API::AUXATTRIB_CAT_PROFILE_ID, API::AUXATTRIB_SB_USERID],
             "OPT" => [],
             "RETVAL" => [
-                [ API::AUXATTRIB_SB_CERTSERIAL => ["ISSUED", "EXPIRY", "STATUS", "DEVICE", "CN" ]]
+                [API::AUXATTRIB_SB_CERTSERIAL => ["ISSUED", "EXPIRY", "STATUS", "DEVICE", "CN"]]
             ]
         ],
         API::ACTION_CERT_REVOKE => [
@@ -546,8 +546,8 @@ 
 
                 case \core\Options::TYPECODE_COORDINATES:
                     $extension = \core\Options::TYPECODE_TEXT;
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
-                    $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
+                    $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
                     break;
                 case \core\Options::TYPECODE_TEXT:
                 // Fall-through: they all get the same treatment.
@@ -557,18 +557,18 @@ 
                 // Fall-through: they all get the same treatment.
                 case \core\Options::TYPECODE_INTEGER:
                     $extension = $optionInfo['type'];
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
-                    $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
+                    $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
                     if ($optionInfo['flag'] == "ML") {
-                        $coercedInline["value"][$basename . "-lang"] = $oneAttrib['LANG'];
+                        $coercedInline["value"][$basename."-lang"] = $oneAttrib['LANG'];
                     }
                     break;
                 case \core\Options::TYPECODE_FILE:
                     // Binary data is expected in base64 encoding. This is true also for PEM files!
                     $extension = $optionInfo['type'];
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
-                    file_put_contents($dir['dir'] . "/" . $basename . "-" . $extension, base64_decode($oneAttrib['VALUE']));
-                    $coercedFile["value"]['tmp_name'][$basename . "-" . $extension] = $dir['dir'] . "/" . $basename . "-" . $extension;
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
+                    file_put_contents($dir['dir']."/".$basename."-".$extension, base64_decode($oneAttrib['VALUE']));
+                    $coercedFile["value"]['tmp_name'][$basename."-".$extension] = $dir['dir']."/".$basename."-".$extension;
                     break;
                 default:
                     throw new Exception("We don't seem to know this type code!");