GEANT / CAT

web/lib/admin/OptionDisplay.php

Doc Comments +11 added lines, -1 removed lines

@@ -142,6 +142,9 @@ 
         return $retval;
     }
 
+    /**
+     * @param integer $rowid
+     */
     private function selectElement($rowid, $list) {
         $jsmagic = "onchange='
                                if (/#ML#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
@@ -183,6 +186,10 @@ 
         return ["TEXT" => $retval, "ACTIVE" => $activelisttype];
     }
 
+    /**
+     * @param integer $rowid
+     * @param boolean $makeVisible
+     */
     private function selectLanguage($rowid, $makeVisible) {
         $retval = "<select style='display:" . ($makeVisible ? "block" : "none") . "' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect'>
             <option value='' name='select_language' selected>" . _("select language") . "</option>
@@ -203,6 +210,9 @@ 
         \core\Options::TYPECODE_TEXT => ["html" => "textarea cols='30' rows='3'", "tail" => '></textarea'],
     ];
 
+    /**
+     * @param integer $rowid
+     */
     private function inputFields($rowid, $activetype) {
         $retval = "";
         foreach (OptionDisplay::HTML_DATATYPE_TEXTS as $key => $type) {
@@ -235,7 +245,7 @@ 
      * @param int $rowid the HTML field base name of the option to be displayed
      * @param string $optionName the name of the option to display
      * @param string $optionValue the value of the option to display
-     * @param mixed $optionLang the language of the option to display
+     * @param null|string $optionLang the language of the option to display
      * @return string HTML code
      * @throws Exception
      */

Spacing +3 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
 
         $optioninfo = \core\Options::instance();
 
-        if (is_array($prepopulate) && ( count($prepopulate) > 1 || $class == "device-specific" || $class == "eap-specific")) { // editing... fill with values
+        if (is_array($prepopulate) && (count($prepopulate) > 1 || $class == "device-specific" || $class == "eap-specific")) { // editing... fill with values
             foreach ($prepopulate as $option) {
                 if (preg_match("/$class:/", $option['name']) && !preg_match("/(user:fedadmin)/", $option['name'])) {
                     $optiontypearray = $optioninfo->optionType($option['name']);
@@ -272,7 +272,7 @@ 
                 $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-" . \core\Options::TYPECODE_TEXT . "]' id='S$rowid-input-text' value='$optionValue'>$link";
                 break;
             case \core\Options::TYPECODE_FILE:
-                $retval .= "<input readonly type='text' name='value[S$rowid-".\core\Options::TYPECODE_STRING."]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($optionValue) . "'>";
+                $retval .= "<input readonly type='text' name='value[S$rowid-" . \core\Options::TYPECODE_STRING . "]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($optionValue) . "'>";
                 $uiElements = new UIElements();
                 switch ($optionName) {
                     case "eap:ca_file":
@@ -340,7 +340,7 @@ 
         $retval .= "
 
        <td>
-          <button type='button' class='delete' onclick='deleteOption(" . ( $prefillValue !== NULL && $item == "general:geo_coordinates" ? $this->allLocationCount : 0 ) . ",\"option-S" . $rowid . "\")'>-</button>
+          <button type='button' class='delete' onclick='deleteOption(" . ($prefillValue !== NULL && $item == "general:geo_coordinates" ? $this->allLocationCount : 0) . ",\"option-S" . $rowid . "\")'>-</button>
        </td>
     </tr>";
         return $retval;

devices/xml/Device_XML.php

Doc Comments +6 added lines

@@ -287,6 +287,9 @@ 
         }
     }
 
+    /**
+     * @param Type $eaptype
+     */
     private function setServerSideCredentials($eaptype) {
         $attr = $this->attributes;
         $serversidecredential = new ServerSideCredential();
@@ -331,6 +334,9 @@ 
         return($clientsidecredential);
     }
     
+    /**
+     * @param Type $eaptype
+     */
     private function setEapMethod($eaptype) {
         $attr = $this->attributes;
         $eapmethod = new EAPMethod();

Indentation +1 added lines, -1 removed lines

@@ -350,7 +350,7 @@
     }
     
     private function getAuthMethod($eap) {
- //       $attr = $this->attributes;
+    //       $attr = $this->attributes;
         $authmethod = new AuthenticationMethod();
         $eapParams = $this->getAuthenticationMethodParams($eap);
         $eaptype = new Type();

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  * @package ModuleWriting
  */
 namespace devices\xml;
-require_once(dirname(__FILE__).'/XML.inc.php');
+require_once(dirname(__FILE__) . '/XML.inc.php');
 
 /**
  * This class implements full functionality of the generic XML device
@@ -64,8 +64,8 @@ 
 //ID attribute
 //lang attribute
         $methodList = [];
-        $this->loggerInstance->debug(4,"ALLEAP\n");
-        $this->loggerInstance->debug(4,$attr['all_eaps']);
+        $this->loggerInstance->debug(4, "ALLEAP\n");
+        $this->loggerInstance->debug(4, $attr['all_eaps']);
         if ($this->allEaps) {
             $eapmethods = [];
             foreach ($attr['all_eaps'] as $eap) {
@@ -137,7 +137,7 @@ 
         $objs = [];
         if ($this->langScope === 'global') {
             foreach ($attributeList['langs'] as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $obj = new $className();
                 $obj->setValue($value);
                 $obj->setAttributes(['lang' => $language]);
@@ -161,7 +161,7 @@ 
                 $profileNameLangs = $attr['profile:name']['langs'];
             }
             foreach ($instNameLangs as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $displayname = new DisplayName();
                 if (isset($profileNameLangs)) {
                     $langOrC = isset($profileNameLangs[$language]) ? $profileNameLangs[$language] : $profileNameLangs['C'];
@@ -312,7 +312,7 @@ 
             $clientCertificateObject = new ClientCertificate();
             $clientCertificateObject->setValue(base64_encode($this->clientCert["certdata"]));
             $clientCertificateObject->setAttributes(['format' => 'PKCS12', 'encoding' => 'base64']);
-            $clientsidecredential->setProperty('ClientCertificate',$clientCertificateObject);
+            $clientsidecredential->setProperty('ClientCertificate', $clientCertificateObject);
         }
         return($clientsidecredential);
     }