GEANT / CAT

web/diag/testTelepath.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 $validator = new \web\lib\common\InputValidation();
 
 echo "<pre>";
-echo "Testing ".$validator->realm(filter_input(INPUT_GET,'realm', FILTER_SANITIZE_STRING))." in ".$validator->string(filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING));
+echo "Testing " . $validator->realm(filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING)) . " in " . $validator->string(filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING));
 print_r($telepath->magic());
 echo "</pre>";
\ No newline at end of file

web/admin/action_enrollment.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         $federation = CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration'];
         break;
     default:
-        $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING));
+        $token = $validator->token(filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING));
         $checkval = $usermgmt->checkTokenValidity($token);
 }
 

core/UserAPI.php

Spacing +5 added lines, -5 removed lines

@@ -176,7 +176,7 @@ 
             if (isset($deviceProperties['options']['hidden']) && $deviceProperties['options']['hidden'] && $showHidden == 0) {
                 continue;
             }
-            $count ++;
+            $count++;
 
             $deviceProperties['device'] = $device;
 
@@ -563,7 +563,7 @@ 
     }
 
 
-    public function sendLogo($identifier, $type, $width = 0, $height = 0){
+    public function sendLogo($identifier, $type, $width = 0, $height = 0) {
         if ($type === "federation") {
             $logo = $this->getFedLogo($identifier, $width, $height);
         }
@@ -581,7 +581,7 @@ 
             return ['status' => 'error', 'error' => 'Function for GEOIPv1 called, but config says this is not the version to use!'];
         }
         //$host = $_SERVER['REMOTE_ADDR'];
-        $host = input_filter(INPUT_SERVER,'REMOTE_ADDR',FILTER_VALIDATE_IP);
+        $host = input_filter(INPUT_SERVER, 'REMOTE_ADDR', FILTER_VALIDATE_IP);
         $record = geoip_record_by_name($host);
         if ($record === FALSE) {
             return ['status' => 'error', 'error' => 'Problem listing countries'];
@@ -743,12 +743,12 @@ 
                     $this->loggerInstance->debug(4, "Browser_id: $dev_id\n");
                     return(['device' => $dev_id, 'display' => $device['display'], 'group' => $device['group']]);
                 } else {
-                    $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER,'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
+                    $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER, 'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
                     return(false);
                 }
             }
         }
-        $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER,'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
+        $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER, 'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
         return(false);
     }
 

web/lib/admin/http/ValidateEmailAddress.php

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class ValidateEmailAddress extends AbstractAjaxCommand{
+class ValidateEmailAddress extends AbstractAjaxCommand {
 
     const COMMAND = 'validateemailaddress';
     const PARAM_ADDRESS = 'address';
@@ -20,7 +20,7 @@ 
      * @param string $commandToken
      * @param DefaultContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
     }
     
@@ -29,9 +29,9 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::PARAM_ADDRESS])){
-            $address = $this->parseString(filter_input(INPUT_POST,self::PARAM_ADDRESS, FILTER_SANITIZE_STRING));
+    public function execute() {
+        if (isset($_POST[self::PARAM_ADDRESS])) {
+            $address = $this->parseString(filter_input(INPUT_POST, self::PARAM_ADDRESS, FILTER_SANITIZE_STRING));
             $result = OutsideComm::mailAddressValidSecure($address);
             $message = $this->chooseMessage($result, $address);
             $tokenTag = new Tag('email');
@@ -50,7 +50,7 @@ 
      * @param string $address
      * @return string
      */
-    private function chooseMessage($result, $address){
+    private function chooseMessage($result, $address) {
         $errorMessage = sprintf(_("Email address '%s' validation failed. Sending is not possible!"), $address);
         $warningMessage = sprintf(_("The invitation token is possibly going over the internet without transport encryption and can be intercepted by random third parties for email '%s'! Please consider sending the invitation token via a more secure transport!"), $address);
         switch ($result) {

web/lib/admin/http/AddUserCommand.php

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -33,15 +33,15 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::PARAM_NAME]) && isset($_POST[self::PARAM_EXPIRY])){
+    public function execute() {
+        if (isset($_POST[self::PARAM_NAME]) && isset($_POST[self::PARAM_EXPIRY])) {
             $name = $this->parseString(filter_input(INPUT_POST, self::PARAM_NAME, FILTER_SANITIZE_STRING));
             $expiry = $this->parseString($_POST[self::PARAM_EXPIRY]);
             $user = $this->context->createUser($name, $expiry, $this);
-            if(!empty($user->getIdentifier())){
+            if (!empty($user->getIdentifier())) {
                 $this->storeInfoMessage(_('User was added successfully!'));
             }
-        }else{
+        } else {
             $this->storeErrorMessage(_('User name or expiry parameters are missing!'));
         }
     }

core/common/Language.php

Spacing +2 added lines, -2 removed lines

@@ -84,14 +84,14 @@
             $langConverted[] = $hardSetLang;
         }
         if (!empty($_REQUEST['lang'])) {
-            $recoverLang = filter_input(INPUT_GET,'lang', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST, 'lang', FILTER_SANITIZE_STRING);
+            $recoverLang = filter_input(INPUT_GET, 'lang', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST, 'lang', FILTER_SANITIZE_STRING);
             $langConverted[] = $recoverLang;
         }
         if (!empty($_SESSION['language'])) {
             $langConverted[] = $_SESSION['language'];
         }
         if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            $langs = explode(",", filter_input(INPUT_SERVER,"HTTP_ACCEPT_LANGUAGE", FILTER_SANITIZE_STRING));
+            $langs = explode(",", filter_input(INPUT_SERVER, "HTTP_ACCEPT_LANGUAGE", FILTER_SANITIZE_STRING));
             foreach ($langs as $lang) {
                 $result = [];
                 preg_match("/(.*);+.*/", $lang, $result);

web/accountstatus/accountstatus.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 $cleanToken = FALSE;
 $tokenStatus = ["status" => \core\ProfileSilverbullet::SB_TOKENSTATUS_INVALID,
-    "cert_status" => [],];
+    "cert_status" => [], ];
 $profile = NULL;
 $idp = NULL;
 $fed = NULL;
@@ -38,7 +38,7 @@ 
         // it can be VALID (exists and not redeemed, EXPIRED, REDEEMED or INVALID (non existent)
         $tokenStatus = \core\ProfileSilverbullet::tokenStatus($cleanToken);
     }
-} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0']) ) {
+} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0'])) {
     // maybe the user authenticated with his client cert? Then pick any of his
     // tokens to go on
     $certname = $_SERVER['SSL_CLIENT_SAN_Email'] ?? $_SERVER['SSL_CLIENT_SAN_Email_0'];

core/IdP.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
         $this->entityOptionTable = "institution_option";
         $this->entityIdColumn = "institution_id";
         if (!is_numeric($instId)) {
-            throw new Exception("An ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_inst']." is identified by an integer index!");
+            throw new Exception("An " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_inst'] . " is identified by an integer index!");
         }
         $this->identifier = (int) $instId;
 
@@ -317,7 +317,7 @@ 
             $alreadyUsed = $this->databaseHandle->exec("SELECT DISTINCT external_db_id FROM institution WHERE external_db_id = ? AND external_db_syncstate = ?", "si", $identifier, $syncState);
 
             if (mysqli_num_rows($alreadyUsed) == 0) {
-                $this->databaseHandle->exec("UPDATE institution SET external_db_id = ?, external_db_syncstate = ? WHERE inst_id = ?", "sii", $identifier, $syncState, $this->identifier );
+                $this->databaseHandle->exec("UPDATE institution SET external_db_id = ?, external_db_syncstate = ? WHERE inst_id = ?", "sii", $identifier, $syncState, $this->identifier);
             }
         }
     }

core/ProfileSilverbullet.php

Spacing +2 added lines, -2 removed lines

@@ -292,7 +292,7 @@ 
             $certificatesResult = $this->databaseHandle->exec("SELECT * FROM `silverbullet_certificate` WHERE `silverbullet_invitation_id`=? ORDER BY `revocation_status`, `expiry` DESC", "i", $invitationId);
             if (!$certificatesResult || $certificatesResult->num_rows < $invitationRow->quantity) {
                 $invitationProfile = $invitationRow->profile_id;
-                $invitationSbId =  $invitationRow->silverbullet_user_id;
+                $invitationSbId = $invitationRow->silverbullet_user_id;
                 $newCertificateResult = $this->databaseHandle->exec("INSERT INTO `silverbullet_certificate` (`profile_id`, `silverbullet_user_id`, `silverbullet_invitation_id`, `serial_number`, `cn` ,`expiry`) VALUES (?, ?, ?, ?, ?, ?)", "iiisss", $invitationProfile, $invitationSbId, $invitationId, $serial, $username, $realExpiryDate);
                 if ($newCertificateResult === true) {
                     $certificateId = $this->databaseHandle->lastID();
@@ -479,7 +479,7 @@ 
         if (!$invitationsResult || $invitationsResult->num_rows == 0) {
             $loggerInstance->debug(2, "Token  $tokenvalue not found in database or database query error!\n");
             return ["status" => self::SB_TOKENSTATUS_INVALID,
-                "cert_status" => [],];
+                "cert_status" => [], ];
         }
         // if not returned, we found the token in the DB
         $invitationRow = mysqli_fetch_object($invitationsResult);