GEANT / CAT

web/admin/edit_federation_result.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 pageheader(sprintf(_("%s: Federation Customisation (submission completed)"), Config::$APPEARANCE['productname']), "FEDERATION");
 $my_fed = valid_Fed($_GET['fed_id'], $_SESSION['user']);
 if (isset($_POST['submitbutton'])) {
-    if (( $_POST['submitbutton'] == BUTTON_SAVE) && isset($_POST['option']) && isset($_POST['value'])) { // here we go
+    if (($_POST['submitbutton'] == BUTTON_SAVE) && isset($_POST['option']) && isset($_POST['value'])) { // here we go
         $fed_name = $my_fed->identifier;
         echo "<h1>" . sprintf(_("Submitted attributes for federation '%s'"), $fed_name) . "</h1>";
         $remaining_attribs = $my_fed->beginflushAttributes();

web/admin/inc/manageAdmins.inc.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 
         echo "</td>
               <td>
-                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ) . " accept-charset='UTF-8'>
+                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "") . " accept-charset='UTF-8'>
                 <input type='hidden' name='admin_id' value='" . $oneowner['ID'] . "'></input>
                 <button type='submit' name='submitbutton' class='delete' value='" . BUTTON_DELETE . "'>" . _("Delete Administrator") . "</button>
                 </form>

web/resources/css/cat.css.php

Spacing +21 added lines, -21 removed lines

@@ -9,7 +9,7 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
     height: 100%;
@@ -23,7 +23,7 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -205,9 +205,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 div.pagecontent {
@@ -400,7 +400,7 @@ 
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -513,7 +513,7 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     padding-left:30px;
 }
 
@@ -567,7 +567,7 @@ 
 }
 
 span.redirect_link {
-    background: <?php echo $colour2;?>; color: #FFFFFF; height: 23px;
+    background: <?php echo $colour2; ?>; color: #FFFFFF; height: 23px;
     border-left-style: inset; border-left-width: 1px; border-left-color: #8bbacb;
     border-top-style: inset; border-top-width: 1px; border-top-color: #8bbacb;
     border-right-style: outset; border-right-width: 2px; border-right-color: #043d52;
@@ -614,7 +614,7 @@ 
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-left-style: inset; 
@@ -695,7 +695,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 0px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: white; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -704,7 +704,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 00px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -759,7 +759,7 @@ 
     padding-top: 4px; 
     padding-bottom: 12px; 
     padding-left: 30px; 
-    background: <?php echo $colour1;?>; 
+    background: <?php echo $colour1; ?>; 
     text-align: left; 
     text-shadow: 10px 10px 5px #888888;
 }
@@ -769,9 +769,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 #heading h1 { 
@@ -790,7 +790,7 @@ 
     text-align: justify;
     border-bottom-style:solid;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     font-size: 11px;
     font-weight: normal;
 }
@@ -838,7 +838,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -891,7 +891,7 @@ 
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -946,7 +946,7 @@ 
 
 #menu_column {
     border-right:solid;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     border-width:5px;
     min-height:400px;
     padding-left: 10px;
@@ -957,7 +957,7 @@ 
 
 #front_page_leftmenu {
     border-right:solid; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     border-width:5px; 
     min-height:400px; 
     padding-left: 10px; 
@@ -986,11 +986,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -998,7 +998,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {

web/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 ; 

web/admin/inc/common.inc.php

Spacing +2 added lines, -2 removed lines

@@ -264,7 +264,7 @@ 
 
     $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
     $details['name'] = preg_replace('/\//', "", $details['name']);
-    $certstatus = ( $details['root'] == 1 ? "R" : "I");
+    $certstatus = ($details['root'] == 1 ? "R" : "I");
     if ($details['ca'] == 0 && $details['root'] != 1) {
         return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
     }
@@ -339,7 +339,7 @@ 
                     }
                     break;
                 case "boolean":
-                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off")) . "</strong></td></tr>";
                     break;
                 default:
                     $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";

web/resources/inc/header.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
                     <select id='lang' name='lang' onchange='this.form.submit()'>
                         <?php
                         foreach (Config::$LANGUAGES as $lang => $value) {
-                            echo "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
+                            echo "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
                         }
                         ?>
                     </select>

devices/ms/Files/geant_link.inc

Spacing +2 added lines, -2 removed lines

@@ -69,14 +69,14 @@
   File "GEANTLink64.msi"

   nsArray::Set Delete_files "GEANTLink64.msi"

   DetailPrint "Install GEANTLink installer"

-  MessageBox MB_OK  "<?php echo_nsi( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"

+  MessageBox MB_OK  "<?php echo_nsi(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"

   !insertmacro debug_cat 1 "Run GEANTLink installer"

   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink$Platform.msi"'

   ClearErrors

   ExecWait '$Msiexec.exe /i "$TEMP\GEANTLink$Platform.msi" /qb' $0

   !insertmacro debug_cat 4 "GEANTLink returned $0"

   StrCmp $0 0 Cont2

-  MessageBox MB_OK "<?php echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"

+  MessageBox MB_OK "<?php echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"

   Quit

   Cont2:

 FunctionEnd

web/admin/radius_tests.php

Spacing +1 added lines, -1 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'] : '');
 }
 
 function printDN($distinguishedName) {

core/UserManagement.php

Spacing +2 added lines, -2 removed lines

@@ -259,8 +259,8 @@
         $retval = [];
         $invitations = $this->databaseHandle->exec("SELECT cat_institution_id, country, name, invite_issuer_level, invite_dest_mail, invite_token 
                                         FROM invitations 
-                                        WHERE cat_institution_id " . ( $idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
-        $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation" ) . ".\n");
+                                        WHERE cat_institution_id " . ($idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
+        $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation") . ".\n");
         while ($invitationQuery = mysqli_fetch_object($invitations)) {
             $retval[] = ["country" => $invitationQuery->country, "name" => $invitationQuery->name, "mail" => $invitationQuery->invite_dest_mail, "token" => $invitationQuery->invite_token];
         }