GEANT / CAT

web/lib/admin/PageDecoration.php

Braces +1 added lines, -2 removed lines

@@ -206,8 +206,7 @@
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "accountstatus/");
         } elseif (strrpos($_SERVER['PHP_SELF'], "diag/")) {
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "diag/");
-        }
-            else {
+        } else {
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
 

devices/linux/Device_Linux.php

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         $out .= "Config.eap_inner = '" . $eapMethod['INNER'] . "'\n";
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') {
             $out .= "Config.use_other_tls_id = True\n";
-        }
-        else {
+        } else {
             $out .= "Config.use_other_tls_id = False\n";
         }
         $tou = $this->mkUserConsent();

core/AbstractProfile.php

Doc Comments +6 added lines

@@ -96,6 +96,12 @@
      */
     protected $frontendHandle;
 
+    /**
+     * @param integer $idpIdentifier
+     * @param string $deviceId
+     * @param string $area
+     * @param string $lang
+     */
     protected function saveDownloadDetails($idpIdentifier, $profileId, $deviceId, $area, $lang, $eapType) {
         if (CONFIG['PATHS']['logdir']) {
             $file = fopen(CONFIG['PATHS']['logdir'] . "/download_details.log", "a");

core/diag/Telepath.php

Doc Comments +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
      * realm (and indirectly that of the links and statuses of involved proxies
      * and returns a judgment whether external Monitoring API tests are warranted
      * or not
-     * @return boolean TRUE if external tests have to be run
+     * @return boolean|null TRUE if external tests have to be run
      */
     private function CATInternalTests() {
         // we are expecting to get a REJECT from all runs, because that means the packet got through to the IdP.

core/ProfileSilverbullet.php

Doc Comments +1 added lines, -1 removed lines

@@ -254,7 +254,7 @@
      * create a CSR
      * 
      * @param resource $privateKey the private key to create the CSR with
-     * @return array with the CSR and some meta info
+     * @return integer with the CSR and some meta info
      */
     private function generateCsr($privateKey) {
         // token leads us to the NRO, to set the OU property of the cert

core/UserAPI.php

Doc Comments +7 added lines

@@ -138,6 +138,7 @@ 
      * 
      * @param string $device
      * @param AbstractProfile $profile
+     * @param string $generatedFor
      * @return array info about the new installer (mime and link)
      */
     private function generateNewInstaller($device, $profile, $generatedFor, $token, $password) {
@@ -327,6 +328,7 @@ 
      * @param string either 'idp' or 'federation' is allowed 
      * @param int $width maximum width of the generated image - if 0 then it is treated as no upper bound
      * @param int $height  maximum height of the generated image - if 0 then it is treated as no upper bound
+     * @param string $type
      * @return array|null array with image information or NULL if there is no logo
      */
     protected function getLogo($identifier, $type, $width = 0, $height = 0) {
@@ -371,6 +373,10 @@ 
         return ["filetype" => $filetype, "expires" => $expiresString, "blob" => $blob];
     }
     
+    /**
+     * @param integer $width
+     * @param integer $height
+     */
     private function testForResize($width, $height) {
         if (is_numeric($width) && is_numeric($height) && ($width > 0 || $height > 0)) {
             if ($height == 0) {
@@ -474,6 +480,7 @@ 
     /**
      * Order active identity providers according to their distance and name
      * @param array $currentLocation - current location
+     * @param string $country
      * @return array $IdPs -  list of arrays ('id', 'name');
      */
     public function orderIdentityProviders($country, $currentLocation = NULL) {

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
      */

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();

core/SilverbulletInvitation.php

Doc Comments -1 removed lines

@@ -239,7 +239,6 @@
     /**
      * revokes an invitation
      * 
-     * @param int $invitationId
      */
     public function revokeInvitation() {
         $query = "UPDATE silverbullet_invitation SET expiry = NOW() WHERE id = ? AND profile_id = ?";