GEANT / CAT

web/lib/admin/domain/SilverbulletUser.php

Spacing +30 added lines, -30 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletUser extends PersistentEntity{
+class SilverbulletUser extends PersistentEntity {
     
     const LEVEL_GREEN = 0;
     const LEVEL_YELLOW = 1;
@@ -89,14 +89,14 @@ 
      * @param int $profileId
      * @param string $username
      */
-    public function __construct($profileId, $username){
+    public function __construct($profileId, $username) {
         parent::__construct(self::TABLE, self::TYPE_INST);
         $this->setAttributeType(self::PROFILEID, Attribute::TYPE_INTEGER);
         
         $this->set(self::PROFILEID, $profileId);
         $this->set(self::USERNAME, $username);
         //$this->set(self::EXPIRY, 'NOW() + INTERVAL 1 WEEK');
-        $this->defaultUserExpiry = date('Y-m-d H:i:s',strtotime("today"));
+        $this->defaultUserExpiry = date('Y-m-d H:i:s', strtotime("today"));
         //$this->set(self::EXPIRY, $this->defaultUserExpiry);
     }
     
@@ -105,7 +105,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::validate()
      */
-    public function validate(){
+    public function validate() {
         return (
                 !empty($this->get(self::PROFILEID))
         );
@@ -116,11 +116,11 @@ 
      * 
      * @param string $date Takes any string value that can passed to strtotime() function.
      */
-    public function setExpiry($date){
+    public function setExpiry($date) {
         $tokenExpiry = date('Y-m-d H:i:s', strtotime($date));
-        if($tokenExpiry > $this->defaultUserExpiry){
+        if ($tokenExpiry > $this->defaultUserExpiry) {
             $this->set(self::EXPIRY, $tokenExpiry);
-        }else{
+        } else {
             $this->clear();
         }
     }
@@ -128,8 +128,8 @@ 
     /**
      * 
      */
-    public function makeAcknowledged(){
-        $this->set(self::LAST_ACKNOWLEDGE, date('Y-m-d H:i:s',strtotime("now")));
+    public function makeAcknowledged() {
+        $this->set(self::LAST_ACKNOWLEDGE, date('Y-m-d H:i:s', strtotime("now")));
     }
     
     /**
@@ -137,14 +137,14 @@ 
      * 
      * @return int One of the following constants LEVEL_GREEN, LEVEL_YELLOW, LEVEL_RED.
      */
-    public function getAcknowledgeLevel(){
+    public function getAcknowledgeLevel() {
         $max = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $days = $this->getAcknowledgeDays();
-        if($days <= $max * 0.2 && $days > $max * 0.1){
+        if ($days <= $max * 0.2 && $days > $max * 0.1) {
             return self::LEVEL_YELLOW;
-        }elseif ($days <= $max * 0.1){
+        }elseif ($days <= $max * 0.1) {
             return self::LEVEL_RED;
-        }else{
+        } else {
             return self::LEVEL_GREEN;
         }
     }
@@ -154,7 +154,7 @@ 
      * 
      * @return number Number of days from 0 to maximum period.
      */
-    public function getAcknowledgeDays(){
+    public function getAcknowledgeDays() {
         $max = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $lastAcknowledge = strtotime($this->get(self::LAST_ACKNOWLEDGE));
         $now = strtotime('now');
@@ -162,11 +162,11 @@ 
         return $days > 0 ? $days : 0;
     }
     
-    public function getProfileId(){
+    public function getProfileId() {
         return $this->get(self::PROFILEID);
     }
     
-    public function getUsername(){
+    public function getUsername() {
         return $this->get(self::USERNAME);
     }
     
@@ -174,7 +174,7 @@ 
      * 
      * @return boolean
      */
-    public function isExpired(){
+    public function isExpired() {
         $expiryTime = strtotime($this->get(self::EXPIRY));
         $currentTime = time();
         return $currentTime > $expiryTime;
@@ -184,7 +184,7 @@ 
      *
      * @return string
      */
-    public function getExpiry(){
+    public function getExpiry() {
         return date('Y-m-d', strtotime($this->get(self::EXPIRY)));
     }
     
@@ -192,7 +192,7 @@ 
      * 
      * @return \web\lib\admin\domain\SilverbulletCertificate
      */
-    public function getCertificates(){
+    public function getCertificates() {
         return $this->certificates;
     }
 
@@ -200,7 +200,7 @@ 
      *
      * @return \web\lib\admin\domain\SilverbulletInvitation
      */
-    public function getInvitations(){
+    public function getInvitations() {
         return $this->invitations;
     }
     
@@ -208,7 +208,7 @@ 
      * 
      * @return boolean
      */
-    public function hasCertificates(){
+    public function hasCertificates() {
         return count($this->certificates) > 0;
     }
     
@@ -216,10 +216,10 @@ 
      *
      * @return boolean
      */
-    public function hasActiveCertificates(){
+    public function hasActiveCertificates() {
         $count = 0;
         foreach ($this->certificates as $certificate) {
-            if(!$certificate->isExpired() && !$certificate->isRevoked()){
+            if (!$certificate->isExpired() && !$certificate->isRevoked()) {
                 $count++;
             }
         }
@@ -231,14 +231,14 @@ 
      * 
      * @param boolean $isDeactivated
      */
-    public function setDeactivated($isDeactivated, $profile){
+    public function setDeactivated($isDeactivated, $profile) {
         $this->set(self::DEACTIVATION_STATUS, $isDeactivated ? self::INACTIVE : self::ACTIVE);
-        if($isDeactivated){
+        if ($isDeactivated) {
             $this->set(self::DEACTIVATION_TIME, date('Y-m-d H:i:s', strtotime("now")));
             foreach ($this->certificates as $certificate) {
                 $certificate->revoke($profile);
             }
-        }else{
+        } else {
             $this->set(self::DEACTIVATION_TIME, '0000-00-00 00:00:00');
         }
     }
@@ -247,7 +247,7 @@ 
      * 
      * @return boolean
      */
-    public function isDeactivated(){
+    public function isDeactivated() {
         return $this->get(self::DEACTIVATION_STATUS) == self::INACTIVE;
     }
     
@@ -256,7 +256,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = parent::load();
         $this->certificates = SilverbulletCertificate::getList($this, $searchAttribute);
         $this->invitations = SilverbulletInvitation::getList($this);
@@ -268,7 +268,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::delete()
      */
-    public function delete(){
+    public function delete() {
         $state = parent::delete();
         foreach ($this->certificates as $certificate) {
             $certificate->delete();
@@ -284,7 +284,7 @@ 
      * @param integer $userId
      * @return \web\lib\admin\domain\SilverbulletUser
      */
-    public static function prepare($userId){
+    public static function prepare($userId) {
         $instance = new SilverbulletUser(null, '');
         $instance->set(self::ID, $userId);
         return $instance;

web/user/faq.inc.php

Spacing +13 added lines, -13 removed lines

@@ -14,50 +14,50 @@
     $Faq = [
       [
         'id'=>'idp_not_listed',
-        'title'=>sprintf(_("My %s is not listed. Can't I just use any of the other ones?"),$Gui->nomenclature_inst),
+        'title'=>sprintf(_("My %s is not listed. Can't I just use any of the other ones?"), $Gui->nomenclature_inst),
         'text'=>sprintf(_("No! The installers contain security settings which are specific to the %s. If you are not from that %s, your computer will detect that you are about to send your username and credential to an unauthorised server and will abort the login. Using a different %s installer is <i>guaranteed to not work</i>!"), $Gui->nomenclature_inst, $Gui->nomenclature_inst, $Gui->nomenclature_inst)
          ],
       [
         'id'=>'idp_not_listed',
         'title'=>sprintf(_("What can I do to get my %s listed?"), $Gui->nomenclature_inst),
-        'text'=>sprintf(_("Contact %s administrators at your %s and complain. It will take at most one hour of their time to get things done."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $Gui->nomenclature_inst)
+        'text'=>sprintf(_("Contact %s administrators at your %s and complain. It will take at most one hour of their time to get things done."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $Gui->nomenclature_inst)
 ],
       [
         'id'=>'device_not_listed',
-        'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
-        'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your %s Identity Provider to get help in setting up such a device."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
+        'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
+        'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your %s Identity Provider to get help in setting up such a device."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
       ],
 
       [
-        'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
+        'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
         'text'=>sprintf(_("When you are connecting from an unconfigured device your security is at risk. The very point of preconfiguration is to set up security, when this is done, your device will first confirm that it talks to the correct authentication server and will never send your password to an untrusted one."))
 ],
       [
-        'title'=>sprintf(_("Is it safe to use %s installers?"),CONFIG['APPEARANCE']['productname']),
-        'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."),CONFIG['APPEARANCE']['productname']).' '.( isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."),CONFIG['APPEARANCE']['productname'],CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']):""),
+        'title'=>sprintf(_("Is it safe to use %s installers?"), CONFIG['APPEARANCE']['productname']),
+        'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), CONFIG['APPEARANCE']['productname']) . ' ' . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) : ""),
         
 ],
       [
         'title'=>_("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
-        'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."),CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'])." ":"").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."),"<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
+        'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
         
 ],
       [
-        'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
-      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your %s and report the problem, the administrators should be able to trace your connections."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $Gui->nomenclature_inst)
+        'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
+      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your %s and report the problem, the administrators should be able to trace your connections."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $Gui->nomenclature_inst)
 ],
       [
         'id'=>'contact',
         'title'=>sprintf(_("I have a question about this web site. Whom should I contact?")),
-        'text'=>sprintf(_("You should send a mail to %s."),CONFIG['APPEARANCE']['support-contact']['display'])
+        'text'=>sprintf(_("You should send a mail to %s."), CONFIG['APPEARANCE']['support-contact']['display'])
       ],
 ];
 
     if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam") {
        array_push($Faq,
          [
-           'id'=>'what_is_'.CONFIG_CONFASSISTANT['CONSORTIUM']['name'],
+           'id'=>'what_is_' . CONFIG_CONFASSISTANT['CONSORTIUM']['name'],
            'title'=>sprintf(_("What is this %s thing anyway?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
-           'text'=>sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> for more details."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
+           'text'=>sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> for more details."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
          ]);
     }
\ No newline at end of file

core/CAT.php

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
         $dummy_inst2 = _("organisation");
         $dummy_inst3 = _("Identity Provider");
         // and do something useless with the strings so that there's no "unused" complaint
-        if (strlen($dummy_NRO . $dummy_inst1 . $dummy_inst2 . $dummy_inst3) < 0 ) {
+        if (strlen($dummy_NRO . $dummy_inst1 . $dummy_inst2 . $dummy_inst3) < 0) {
             throw new Exception("Strings are usually not shorter than 0 characters. We've encountered a string blackhole.");
         }
 

web/admin/inc/toggleRedirect.inc.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         throw new Exception("POSTed EAP type value is not an integer!");
     }
     // conversion routine throws an exception if the EAP type id is not known
-    $eaptype = new \core\common\EAP((int)$posted_eaptype);
+    $eaptype = new \core\common\EAP((int) $posted_eaptype);
 }
 
 // there is either one or the other. If both are set, something's fishy.

web/skins/classic/user/cat_info.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         }
         break;
     case 'about':
-        $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform.<p>Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. An installer prepared for one %s will not work for users of another one, therefore if your %s is not on the list, you cannot use this system. Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG['APPEARANCE']['productname'],$skinObject->nomenclature_inst, $skinObject->nomenclature_inst, $skinObject->nomenclature_inst, CONFIG['APPEARANCE']['productname']);
+        $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform.<p>Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. An installer prepared for one %s will not work for users of another one, therefore if your %s is not on the list, you cannot use this system. Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG['APPEARANCE']['productname'], $skinObject->nomenclature_inst, $skinObject->nomenclature_inst, $skinObject->nomenclature_inst, CONFIG['APPEARANCE']['productname']);
         $out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), CONFIG['APPEARANCE']['productname']) . "</p>";
         $out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
 foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {

core/ProfileRADIUS.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 
         $this->realm = $profileQuery->realm;
 
-        $localValueIfAny = (preg_match('/@/', $this->realm) ? substr($this->realm, 0, strpos($this->realm, '@')) : "anonymous" );
+        $localValueIfAny = (preg_match('/@/', $this->realm) ? substr($this->realm, 0, strpos($this->realm, '@')) : "anonymous");
 
         $internalAttributes = [
             "internal:profile_count" => $this->idpNumberOfProfiles,
@@ -167,7 +167,7 @@ 
                 "row" => $attributeQuery->row,
                 "flag" => $optinfo['flag'],
                 "device" => ($devicesOrEAPMethods == "DEVICES" ? $attributeQuery->deviceormethod : NULL),
-                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep() )];
+                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep())];
         }
         return $temparray;
     }
@@ -267,7 +267,7 @@ 
      */
     public function setRealmCheckUser($shallwe, $localpart = NULL) {
         $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") .
-                ( $localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
+                ($localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
                 " WHERE profile_id = $this->identifier");
     }
 

web/diag/action_userdiag.php

Spacing +2 added lines, -2 removed lines

@@ -167,10 +167,10 @@
             $checks[] = ["realm" => $sanitised_realm, "instance" => new \core\diag\RADIUSTests($sanitised_realm, $profile->getRealmCheckOuterUsername(), $profile->getEapMethodsinOrderOfPreference(1), $profile->getCollapsedAttributes()['eap:server_name'], $profile->getCollapsedAttributes()['eap:ca_file']), "class" => "CAT", "profile" => $profile];
             echo "Debugging CAT Profile $profile_id for $sanitised_realm<br/>";
         } else if (!empty($cat->getExternalDBEntityDetails(0, $realm))) {
-            $checks[] = ["realm" => $sanitised_realm, "instance" => new \core\diag\RADIUSTests($sanitised_realm, "@".$sanitised_realm), "class" => "EXT_DB"];
+            $checks[] = ["realm" => $sanitised_realm, "instance" => new \core\diag\RADIUSTests($sanitised_realm, "@" . $sanitised_realm), "class" => "EXT_DB"];
             echo "Debugging non-CAT but existing realm $sanitised_realm<br/>";
         } else {
-            $checks[] = ["realm" => $sanitised_realm, "instance" => new \core\diag\RADIUSTests($sanitised_realm, "@".$sanitised_realm), "class" => "ALIEN"];
+            $checks[] = ["realm" => $sanitised_realm, "instance" => new \core\diag\RADIUSTests($sanitised_realm, "@" . $sanitised_realm), "class" => "ALIEN"];
             echo "Debugging non-existing realm $sanitised_realm<br/>";
         }
     }

web/diag/radius_tests.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 
 function disp_name($eap) {
     $displayName = EAP::eapDisplayName($eap);
-    return $displayName['OUTER'] . ( $displayName['INNER'] != '' ? '-' . $displayName['INNER'] : '');
+    return $displayName['OUTER'] . ($displayName['INNER'] != '' ? '-' . $displayName['INNER'] : '');
 }
 
 if (!isset($_REQUEST['test_type']) || !$_REQUEST['test_type']) {
@@ -50,7 +50,7 @@ 
     $testsuite = new \core\diag\RADIUSTests($check_realm, $my_profile->getRealmCheckOuterUsername(), $my_profile->getEapMethodsinOrderOfPreference(1), $my_profile->getCollapsedAttributes()['eap:server_name'], $my_profile->getCollapsedAttributes()['eap:ca_file']);
 } else {
     $my_profile = NULL;
-    $testsuite = new \core\diag\RADIUSTests($check_realm, "@".$check_realm);
+    $testsuite = new \core\diag\RADIUSTests($check_realm, "@" . $check_realm);
 }
 
 
@@ -66,7 +66,7 @@ 
     // contains port number; needs to be redacted for filter_var to work
     // in any case, it's a printable string, so filter it initially
     
-    $filteredHost = filter_input(INPUT_GET,'src', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST,'src', FILTER_SANITIZE_STRING);
+    $filteredHost = filter_input(INPUT_GET, 'src', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST, 'src', FILTER_SANITIZE_STRING);
     $hostonly1 = preg_replace('/:[0-9]*$/', "", $filteredHost);
     $hostonly2 = preg_replace('/^\[/', "", $hostonly1);
     $hostonly3 = preg_replace('/\]$/', "", $hostonly2);
@@ -295,12 +295,12 @@ 
         $returnarray['time_millisec'] = sprintf("%d", $testsuite->UDP_reachability_result[$host]['time_millisec']);
 
         if (preg_match('/verify error:num=19/', implode($opensslbabble))) {
-            $printedres .= "<tr><td>"._("<strong>ERROR</strong>: the server presented a certificate which is from an unknown authority!") . $measure ."</td></tr>";
+            $printedres .= "<tr><td>" . _("<strong>ERROR</strong>: the server presented a certificate which is from an unknown authority!") . $measure . "</td></tr>";
             $my_ip_addrs[$key]["status"] = "FAILED";
             $goterror = 1;
         }
         if (preg_match('/verify return:1/', implode($opensslbabble))) {
-            $printedres .= "<tr><td>"._("Completed.") . $measure . "</td></tr>";
+            $printedres .= "<tr><td>" . _("Completed.") . $measure . "</td></tr>";
             $printedres .= "<tr><td></td><td><div class=\"more\">";
             $my_ip_addrs[$key]["status"] = "OK";
             $servercertRaw = implode("\n", $opensslbabble);

web/admin/API.php

Spacing +4 added lines, -5 removed lines

@@ -40,8 +40,7 @@ 
         $leftNum = (int) preg_replace($pat, $rep, $left);
         $rightNum = (int) preg_replace($pat, $rep, $right);
         return ($left != $leftNum && $right != $rightNum) ?
-                $leftNum - $rightNum :
-                strcmp($left, $right);
+                $leftNum - $rightNum : strcmp($left, $right);
     }
 
     
@@ -118,8 +117,8 @@ 
             $therealm = "";
             $theanonid = "anonymous";
             $useAnon = FALSE;
-            $stringValuesFiltered = filter_input(INPUT_POST,'value', FILTER_SANITIZE_STRING, FILTER_REQUIRE_ARRAY);
-            $intValuesFiltered = filter_input(INPUT_POST,'value', FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY);
+            $stringValuesFiltered = filter_input(INPUT_POST, 'value', FILTER_SANITIZE_STRING, FILTER_REQUIRE_ARRAY);
+            $intValuesFiltered = filter_input(INPUT_POST, 'value', FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY);
             $pref = 0;
             foreach ($_POST['option'] as $optindex => $optname) {
                 switch ($optname) {
@@ -145,7 +144,7 @@ 
                         
                         if (isset($intValuesFiltered[$optindex . "-0"])) {
                             $filteredType = $intValuesFiltered[$optindex . "-0"];
-                            if ($filteredType <0 || $filteredType >8) {
+                            if ($filteredType < 0 || $filteredType > 8) {
                                 break;
                             }
                             $newprofile->addSupportedEapMethod(new \core\common\EAP($filteredType), $pref);