GEANT / CAT

devices/linux/Device_Linux.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             $outString .= "# save user certificate\n";
             $outString .= 'echo "';
             $outString .= base64_encode($this->clientCert["certdata"])
-               . '" | base64 -d ' . " > \$HOME/$this->localDir/user.p12\n";
+                . '" | base64 -d ' . " > \$HOME/$this->localDir/user.p12\n";
         }
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS || $this->selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
             $outString .= $this->printP12Dialog();

Spacing +3 added lines, -3 removed lines

@@ -184,8 +184,8 @@ 
 # will be the default value prompted to the user
 
     private function printFunctions() {
-        $url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0] ) ? $this->attributes['support:url'][0] : $this->support_url_substitute;
-        $support = (isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0] ) ? $this->attributes['support:email'][0] : $this->support_email_substitute;
+        $url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0]) ? $this->attributes['support:url'][0] : $this->support_url_substitute;
+        $support = (isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0]) ? $this->attributes['support:email'][0] : $this->support_email_substitute;
         $out = '
 my_name=$0
 
@@ -480,7 +480,7 @@ 
 ';
 }
     $cert_prompt = $this->selectedEap == \core\common\EAP::EAPTYPE_TLS ? _("enter the password for the certificate file") : _("enter your import password");
-    $out .=  '   cert=$HOME/' . $this->localDir . '/user.p12
+    $out .= '   cert=$HOME/' . $this->localDir . '/user.p12
 
     PASSWORD=""
     prompt="' . $cert_prompt . '"

devices/redirect_dev/Device_RedirectDev.php

Indentation +7 added lines, -7 removed lines

@@ -11,15 +11,15 @@
 namespace devices\redirect_dev;
 
 class Device_RedirectDev extends \core\DeviceConfig {
-   /**
-    * Constructs a Device object.
-    *
-    * @final not to be redefined
-    */
+    /**
+     * Constructs a Device object.
+     *
+     * @final not to be redefined
+     */
     final public function __construct() {
         parent::__construct();
-      $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
-      $this->loggerInstance->debug(4,"RedirectEx called");
+        $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
+        $this->loggerInstance->debug(4,"RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     final public function __construct() {
         parent::__construct();
       $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
-      $this->loggerInstance->debug(4,"RedirectEx called");
+      $this->loggerInstance->debug(4, "RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";

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'], "/");
         }
 

Spacing +7 added lines, -7 removed lines

@@ -65,7 +65,7 @@ 
                         <select id='lang' name='lang' onchange='this.form.submit()'>";
 
         foreach (CONFIG['LANGUAGES'] as $lang => $value) {
-            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
+            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
         }
         $retval .= "</select>";
 
@@ -77,7 +77,7 @@ 
         $retval .= "</form>
                 </div><!--langselection-->";
 
-        $logoUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, (strrpos($_SERVER['PHP_SELF'], "admin/") !== FALSE ? strrpos($_SERVER['PHP_SELF'], "admin/") : strrpos($_SERVER['PHP_SELF'], "/")))."/resources/images/consortium_logo.png";        
+        $logoUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, (strrpos($_SERVER['PHP_SELF'], "admin/") !== FALSE ? strrpos($_SERVER['PHP_SELF'], "admin/") : strrpos($_SERVER['PHP_SELF'], "/"))) . "/resources/images/consortium_logo.png";        
         $retval .= "<div class='consortium_logo'>
                     <img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
                 </div> <!-- consortium_logo -->
@@ -119,7 +119,7 @@ 
         switch ($area) {
             case "ADMIN-IDP":
                 $cap1 = CONFIG['APPEARANCE']['productname_long'];
-                $cap2 = sprintf(_("Administrator Interface - Identity Provider"),$this->ui->nomenclature_inst);
+                $cap2 = sprintf(_("Administrator Interface - Identity Provider"), $this->ui->nomenclature_inst);
                 $advancedControls = TRUE;
                 break;
             case "ADMIN-IDP-USERS":
@@ -139,7 +139,7 @@ 
                 break;
             case "FEDERATION":
                 $cap1 = CONFIG['APPEARANCE']['productname_long'];
-                $cap2 = sprintf(_("Administrator Interface - %s Management"),$this->ui->nomenclature_fed);
+                $cap2 = sprintf(_("Administrator Interface - %s Management"), $this->ui->nomenclature_fed);
                 $advancedControls = TRUE;
                 break;
             case "USER":
@@ -168,7 +168,7 @@ 
         // content from here on will SCROLL instead of being fixed at the top
         $retval .= "<div class='pagecontent'>"; // closes in footer again
         $retval .= "<div class='trick'>"; // closes in footer again
-        $retval .= "<div id='secondrow' style='border-bottom:5px solid ".CONFIG['APPEARANCE']['colour1']."; min-height:100px;'>
+        $retval .= "<div id='secondrow' style='border-bottom:5px solid " . CONFIG['APPEARANCE']['colour1'] . "; min-height:100px;'>
             <div id='secondarycaptions' style='display:inline-block; float:left'>
                 <h2>$cap2</h2>
             </div><!--secondarycaptions-->";
@@ -213,7 +213,7 @@ 
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
 
-        $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition )."/resources/css/cat.css.php";
+        $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/css/cat.css.php";
         
         $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
         $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
@@ -241,7 +241,7 @@ 
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
         
-        $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition)."/resources/images";
+        $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/images";
 
         return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
               <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>

core/diag/RFC6614Tests.php

Indentation +10 added lines, -10 removed lines

@@ -246,11 +246,11 @@ 
     }
 
         /**
-     * This function parses a X.509 cert and returns all certificatePolicies OIDs
-     * 
-     * @param array $cert (returned from openssl_x509_parse) 
-     * @return array of OIDs
-     */
+         * This function parses a X.509 cert and returns all certificatePolicies OIDs
+         * 
+         * @param array $cert (returned from openssl_x509_parse) 
+         * @return array of OIDs
+         */
     private function propertyCheckPolicy($cert) {
         $oids = [];
         if ($cert['extensions']['certificatePolicies']) {
@@ -263,11 +263,11 @@ 
         return $oids;
     }
         /**
-     * This function parses a X.509 cert and returns the value of $field
-     * 
-     * @param array $cert (returned from openssl_x509_parse) 
-     * @return string value of the issuer field or ''
-     */
+         * This function parses a X.509 cert and returns the value of $field
+         * 
+         * @param array $cert (returned from openssl_x509_parse) 
+         * @return string value of the issuer field or ''
+         */
     private function getCertificateIssuer($cert) {
         $issuer = '';
         foreach ($cert['issuer'] as $key => $val) {

web/lib/admin/http/DefaultContext.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
      *
      * @param AbstractPage $page
      */
-    public function __construct($page){
+    public function __construct($page) {
         $this->page = $page;
         $this->session = SessionStorage::getInstance('sb-messages');
     }
@@ -36,7 +36,7 @@ 
      *
      * @return AbstractPage
      */
-    public function getPage(){
+    public function getPage() {
         return $this->page;
     }
     
@@ -45,7 +45,7 @@ 
      *
      * @return \web\lib\admin\storage\SessionStorage
      */
-    public function getSession(){
+    public function getSession() {
         return $this->session;
     }
     

web/lib/admin/http/AbstractAjaxCommand.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-abstract class AbstractAjaxCommand extends AbstractCommand{
+abstract class AbstractAjaxCommand extends AbstractCommand {
     
     /**
      *
@@ -23,7 +23,7 @@ 
      * @param string $commandToken
      * @param DefaultContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken);
         $this->page = $context->getPage();
     }
@@ -32,7 +32,7 @@ 
      * 
      * @param HtmlElementInterface $element
      */
-    public function publish($element){
+    public function publish($element) {
         $this->page->appendHtmlElement(DefaultAjaxPage::SECTION_RESPONSE, $element);
     }
     

web/lib/admin/http/Message.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
      * 
      * @return string
      */
-    public function getText(){
+    public function getText() {
         return $this->text;
     }
     
@@ -50,7 +50,7 @@ 
      * @param string $prefix
      * @return string
      */
-    public function getClass($prefix = ''){
+    public function getClass($prefix = '') {
         return $prefix . '-' . $this->level;
     }
 }

web/lib/admin/http/AbstractInvokerCommand.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-abstract class AbstractInvokerCommand extends AbstractCommand implements MessageInvokerInterface{
+abstract class AbstractInvokerCommand extends AbstractCommand implements MessageInvokerInterface {
 
     /**
      *
@@ -30,7 +30,7 @@ 
      * {@inheritDoc}
      * @see \lib\http\MessageInvokerInterface::storeErrorMessage()
      */
-    public function storeErrorMessage($text){
+    public function storeErrorMessage($text) {
         $this->session->add($this->commandToken, new Message($text, Message::ERROR));
     }
     
@@ -39,7 +39,7 @@ 
      * {@inheritDoc}
      * @see \lib\http\MessageInvokerInterface::storeInfoMessage()
      */
-    public function storeInfoMessage($text){
+    public function storeInfoMessage($text) {
         $this->session->add($this->commandToken, new Message($text, Message::INFO));
     }
     
@@ -48,7 +48,7 @@ 
      * {@inheritDoc}
      * @see \lib\http\MessageInvokerInterface::publishMessages()
      */
-    public function publishMessages($receiver){
+    public function publishMessages($receiver) {
         $messages = $this->session->get($this->commandToken);
         foreach ($messages as $message) {
             $receiver->receiveMessage($message);

web/lib/admin/http/SilverbulletAjaxController.php

Braces +2 added lines, -2 removed lines

@@ -33,9 +33,9 @@
     protected function doCreateCommand($commandToken) {
         if($commandToken == ValidateEmailAddress::COMMAND){
             return new ValidateEmailAddress($commandToken, $this->context);
-        }elseif($commandToken == GetTokenEmailDetails::COMMAND) {
+        } elseif($commandToken == GetTokenEmailDetails::COMMAND) {
             return new GetTokenEmailDetails($commandToken, $this->context);
-        }else {
+        } else {
             return new DefaultCommand($commandToken);
         }
     }

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletAjaxController extends AbstractController{
+class SilverbulletAjaxController extends AbstractController {
 
     /**
      * 
@@ -21,7 +21,7 @@ 
      *
      * @param DefaultContext $context Requires default context object.
      */
-    public function __construct($context){
+    public function __construct($context) {
         $this->context = $context;
     }
     
@@ -31,11 +31,11 @@ 
      * @see \web\lib\admin\http\AbstractController::doCreateCommand()
      */
     protected function doCreateCommand($commandToken) {
-        if($commandToken == ValidateEmailAddress::COMMAND){
+        if ($commandToken == ValidateEmailAddress::COMMAND) {
             return new ValidateEmailAddress($commandToken, $this->context);
-        }elseif($commandToken == GetTokenEmailDetails::COMMAND) {
+        }elseif ($commandToken == GetTokenEmailDetails::COMMAND) {
             return new GetTokenEmailDetails($commandToken, $this->context);
-        }else {
+        } else {
             return new DefaultCommand($commandToken);
         }
     }
@@ -45,9 +45,9 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractController::parseRequest()
      */
-    public function parseRequest(){
+    public function parseRequest() {
         $commandToken = '';
-        if(isset($_REQUEST[SilverbulletAjaxController::COMMAND])){
+        if (isset($_REQUEST[SilverbulletAjaxController::COMMAND])) {
             $commandToken = $_REQUEST[SilverbulletAjaxController::COMMAND];
         }
         $currentCommand = $this->createCommand($commandToken);