GEANT / CAT

devices/linux/Device_Linux.php

Indentation +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
         
         $out .= 'Config.sb_user_file = """' . $this->mkSbUserFile() . '"""' . "\n";
         if (!empty($this->attributes['internal:realm'][0])) {
-           $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
+            $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
         }
         if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $out .= "Config.hint_user_input = True\n";

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

Spacing +10 added lines, -10 removed lines

@@ -33,12 +33,12 @@ 
     public function writeInstaller() {
         $installerPath = $this->installerBasename . ".py";
         $this->copyFile("main.py", $installerPath);
-        $installer = fopen($installerPath,"a");
+        $installer = fopen($installerPath, "a");
         if ($installer === FALSE) {
             throw new Exception("Unable to open installer file for writing!");
         }
-        fwrite($installer,$this->writeMessages());
-        fwrite($installer,$this->writeConfigVars());
+        fwrite($installer, $this->writeMessages());
+        fwrite($installer, $this->writeConfigVars());
         fwrite($installer, "run_installer()\n");
         fclose($installer);
         return($installerPath);
@@ -104,7 +104,7 @@ 
         $out .= 'Messages.p12_title = "' . _("personal certificate file (p12 or pfx)") . "\"\n";
         $out .= 'Messages.save_wpa_conf = "' . _("Network Manager configuration failed, but we may generate a wpa_supplicant configuration file if you wish. Be warned that your connection password will be saved in this file as clear text.") . "\"\n";
         $out .= 'Messages.save_wpa_confirm = "' . _("Write the file") . "\"\n";
-        $out .= 'Messages.wrongUsernameFormat = "' ._("Error: Your username must be of the form 'xxx@institutionID' e.g. 'john@example.net'!") . "\"\n";
+        $out .= 'Messages.wrongUsernameFormat = "' . _("Error: Your username must be of the form 'xxx@institutionID' e.g. 'john@example.net'!") . "\"\n";
         $out .= 'Messages.wrong_realm = "' . _("Error: your username must be in the form of 'xxx@{}'. Please enter the username in the correct format.") . "\"\n";
         $out .= 'Messages.wrong_realm_suffix = "' . _("Error: your username must be in the form of 'xxx@institutionID' and end with '{}'. Please enter the username in the correct format.") . "\"\n";
     
@@ -133,8 +133,8 @@ 
             $out .= "Config.use_other_tls_id = False\n";
         }
         $tou = $this->mkUserConsent();
-        $out .= 'Config.tou = ' . ( $tou ? '"""' . $tou . '"""' : 'None' ) . "\n"; 
-        $out .= 'Config.CA = """' . $this->mkCAfile()  . '"""' . "\n";
+        $out .= 'Config.tou = ' . ($tou ? '"""' . $tou . '"""' : 'None') . "\n"; 
+        $out .= 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n";
         $out .= "Config.anonymous_identity = '" . $this->determineOuterIdString() . "'\n";
         $out .= 'Config.init_info = """' . $this->mkIntro() . '"""' . "\n";
         $out .= 'Config.init_confirmation = "' . $this->mkProfileConfirmation() . "\"\n";
@@ -143,10 +143,10 @@ 
         if (!empty($this->attributes['internal:realm'][0])) {
            $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
         }
-        if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $out .= "Config.hint_user_input = True\n";
         }
-        if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
             $out .= "Config.verify_user_realm_input = True\n";
         }        
         return $out;
@@ -186,7 +186,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "[" . $out. "]";
+        return "[" . $out . "]";
     }
 
     
@@ -210,7 +210,7 @@ 
         return '[' . implode(', ', $outArray) . ']';
     }
     
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {

web/admin/inc/displayQRcode.inc.php

Spacing +3 added lines, -3 removed lines

@@ -29,6 +29,6 @@
 $link = \core\ProfileSilverbullet::generateTokenLink($cleanToken);
 header("Content-Type:text/html;charset=utf-8");
 ?>
-<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1>
-<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11));?>'/>
-<p>(<a href='<?php echo $link;?>'><?php echo $link;?>)</a></p>
\ No newline at end of file
+<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1>
+<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11)); ?>'/>
+<p>(<a href='<?php echo $link; ?>'><?php echo $link; ?>)</a></p>
\ No newline at end of file

web/skins/classic/index.php

Spacing +6 added lines, -6 removed lines

@@ -60,11 +60,11 @@ 
 
 $deco = new \web\lib\admin\PageDecoration();
 ?>
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 <script type="text/javascript">
     if (screen.width <= 480) {
@@ -106,7 +106,7 @@ 
     <div id="heading">
         <?php
         print '<img src="' . $Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png") . '" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
+        print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
         echo '<table id="lang_select"><tr><td>';
@@ -160,7 +160,7 @@ 
                                             <span id="line1"><?php printf(_("%s installation made easy:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?></span>
                                             <span id="line2"></span>
                                             <span id="line3"></span>
-                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"),$Gui->nomenclature_inst) ?></span>
+                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"), $Gui->nomenclature_inst) ?></span>
                                             <span id="line5">
                                                 <?php
                                                 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "") {

web/skins/modern/test.php

Indentation +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
          <?php if (empty($_REQUEST['idp'])) { ?>
               <div id="front_page">
                   <?php
-                         echo $divs->div_top_welcome();
+                            echo $divs->div_top_welcome();
 //                         echo $divs->div_roller();
 //                         echo $divs->div_main_button(); ?>
               </div> <!-- id="front_page" -->

Spacing +9 added lines, -9 removed lines

@@ -18,9 +18,9 @@ 
 ?>
 
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 
 <script type="text/javascript">
@@ -48,7 +48,7 @@ 
 include("user/js/cat_js.php");
 ?>
     var loading_ico = new Image();
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
 </script>
 <?php $Gui->langObject->setTextDomain("web_user"); ?>
 <!-- DiscoJuice -->
@@ -57,9 +57,9 @@ 
     front_page = 0;
     var lang = "<?php echo($Gui->langObject->getLang()) ?>";
 </script>
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 </head>
 <body>
 <div id="wrap">
@@ -67,14 +67,14 @@ 
     <?php echo $divs->div_heading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
         </div>
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
         </div>
         <div id="main_body">

web/skins/modern/resources/css/cat-basic.css.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
    font-size:25px;
    font-size:5vw;
    width: 100%;
-   background: <?php echo $colour2;?>;
+   background: <?php echo $colour2; ?>;
    color: #ffffff;
 }
 
@@ -48,7 +48,7 @@ 
    font-size:25px;
    font-size:5vw;
    width: 100%;
-   background: <?php echo $colour2;?>;
+   background: <?php echo $colour2; ?>;
    color: #ffffff;
    border-radius:10px ; 
    border-radius:2vw ; 

core/DBConnection.php

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
         if ($types == NULL) {
             $result = $this->connection->query($querystring);
             if ($result === FALSE) {
-                throw new Exception("DB: Unable to execute simple statement! Error was --> ". $this->connection->error ." <--");
+                throw new Exception("DB: Unable to execute simple statement! Error was --> " . $this->connection->error . " <--");
             }
         } else {
             // fancy! prepared statement with dedicated argument list
@@ -96,7 +96,7 @@ 
             }
             $prepResult = $statementObject->prepare($querystring);
             if ($prepResult === FALSE) {
-                throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> ". $statementObject->error ." <--.");
+                throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> " . $statementObject->error . " <--.");
             }
 
             // we have a variable number of arguments packed into the ... array
@@ -108,11 +108,11 @@ 
             array_unshift($localArray, $types);
             $retval = call_user_func_array([$statementObject, "bind_param"], $localArray);
             if ($retval === FALSE) {
-                throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> ". var_export($localArray, TRUE) ." <--. Error was --> ". $statementObject->error ." <--");
+                throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> " . var_export($localArray, TRUE) . " <--. Error was --> " . $statementObject->error . " <--");
             }
             $result = $statementObject->execute();
             if ($result === FALSE) {
-                throw new Exception("DB: Unable to execute prepared statement! Error was --> ". $statementObject->error ." <--");
+                throw new Exception("DB: Unable to execute prepared statement! Error was --> " . $statementObject->error . " <--");
             }
             $selectResult = $statementObject->get_result();
             if ($selectResult !== FALSE) {
@@ -123,7 +123,7 @@ 
         }
 
         if ($result === FALSE && $this->connection->errno) {
-            throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was ".$this->connection->errno."!");
+            throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was " . $this->connection->errno . "!");
         }
 
         // log exact query to audit log, if it's not a SELECT

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.");
         }
 

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;
 
@@ -323,7 +323,7 @@ 
             $alreadyUsed = $this->databaseHandle->exec("SELECT DISTINCT external_db_id FROM institution WHERE external_db_id = ? AND external_db_syncstate = ?", "si", $identifier, $syncState);
             // SELECT -> resource, not boolean
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $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/common/Logging.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 namespace core\common;
 use \Exception;
 
-require_once(dirname(dirname(__DIR__))."/config/_config.php");
+require_once(dirname(dirname(__DIR__)) . "/config/_config.php");
 
 class Logging {
 
@@ -86,7 +86,7 @@ 
                 echo " ($category) ";
                 echo " " . $user . ": ";
                 if (is_string($message)) {
-                    echo $message ."\n";
+                    echo $message . "\n";
                 } else {
                     var_export($message);
                 }