Inspection of "MSP - encrypted data from/to CAT" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Push — master ( 382c09...be5cf0 )

by Maja

created 2025-07-23 18:58 UTC

Status

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -61,10 +61,10 @@
 block discarded – undo
         header("Content-Type:text/html;charset=utf-8");
         ?>
         <!DOCTYPE html>
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale;?>' <?php echo ($direction ? "dir='rtl'" : "");?>>
-          <head lang='<?php echo $ourlocale;?>'>
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale; ?>' <?php echo ($direction ? "dir='rtl'" : ""); ?>>
+          <head lang='<?php echo $ourlocale; ?>'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-          <title><?php echo htmlspecialchars($pagetitle);?></title>
+          <title><?php echo htmlspecialchars($pagetitle); ?></title>
           <script type="text/javascript">ie_version = 0;</script>
 <!--[if IE]>
 <script type="text/javascript">ie_version=1;</script>

Please login to merge, or discard this patch.

web/admin/inc/overview_js.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@
 block discarded – undo
     $langInstance = new core\common\Language();
     $end = $langInstance->rtl ? "left" : "right";
     ?>
-    pressedButton.next().append('<span style="padding-<?php echo $end;?>:1em">'+msg+'<\/span>');
+    pressedButton.next().append('<span style="padding-<?php echo $end; ?>:1em">'+msg+'<\/span>');
     }
     );
     }

Please login to merge, or discard this patch.

web/skins/modern/user/cat_info.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -51,7 +51,7 @@
 block discarded – undo
          " . $Tou['title'] . "
     </h1>
 <div id='tou_1'>" . $Tou['subtitle'] .
-               '<div style="direction:ltr">' . $Tou['short'] . "</div>
+                '<div style="direction:ltr">' . $Tou['short'] . "</div>
 </div>
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
 <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .

Please login to merge, or discard this patch.

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -31,7 +31,7 @@  discard block
 block discarded – undo
  * the receiving end to strip this marker and not add the title by itself.
  *
  */
-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 
@@ -41,46 +41,46 @@  discard block
 block discarded – undo
 $subpage = $_REQUEST['subpage'];
 switch ($page) {
     case 'about':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
         $out = "<div class='padding'>$out</div>";
         break;
     case 'tou':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
         $out = "no_title<div>
            <h1>
-         " . $Tou['title'] . "
+         " . $Tou['title']."
     </h1>
-<div id='tou_1'>" . $Tou['subtitle'] .
-               '<div style="direction:ltr">' . $Tou['short'] . "</div>
+<div id='tou_1'>" . $Tou['subtitle'].
+               '<div style="direction:ltr">'.$Tou['short']."</div>
 </div>
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
 <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .
-                $Tou['full'] . "
+                $Tou['full']."
 </div>
 </div>
 ";
         break;
     case 'help':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
         switch ($subpage) {
             case 'contact':
             case 'idp_not_listed':
             case 'device_not_listed':
             case 'what_is_eduroam':
-                $out = "no_title<div><h1>" . _("Help") . "</h1>";
+                $out = "no_title<div><h1>"._("Help")."</h1>";
                 foreach ($Faq as $faqItem) {
                     if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
-                        $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                        $out .= "" . $faqItem['text'] . "</div>\n";
+                        $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                        $out .= "".$faqItem['text']."</div>\n";
                     }
                 }
                 $out .= "</div>";
                 break;
             case 'faq':
-                $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
+                $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
                 foreach ($Faq as $faqItem) {
-                    $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                    $out .= "" . $faqItem['text'] . "</div>\n";
+                    $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                    $out .= "".$faqItem['text']."</div>\n";
                 }
                 $out .= "</div>";
                 break;
@@ -104,15 +104,15 @@  discard block
 block discarded – undo
                     $rn = uniqid();
                     $_SESSION['remindIdP'] = $rn;
                     $out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
-                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
-                    $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
-                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
+                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
+                    $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
+                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
                     $out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
                     $out = "<div  class='padding'>$out</div>";
                 }
                 break;
             case 'develop':
-                include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
+                include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
                 $out = "<div class='padding'>$out</div>";
                 break;
         }

Please login to merge, or discard this patch.

core/SilverbulletCertificate.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -325,7 +325,7 @@  discard block
 block discarded – undo
         $invitationObject = new SilverbulletInvitation($token);
         $profile = new ProfileSilverbullet($invitationObject->profile);
         $inst = new IdP($profile->institution);
-        $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n");
+        $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n");
         if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) {
             throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have got that far!");
         }
@@ -338,12 +338,12 @@  discard block
 block discarded – undo
             throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!");
         }
         $expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow);
-        $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n");
+        $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n");
         $expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry);
         if ($expiryDateObject === FALSE) {
             throw new Exception("The expiry date we got from the DB is bogus!");
         }
-        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n");
+        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n");
         // date_create with no parameters can't fail, i.e. is never FALSE
         $validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject);
         $expiryDays = $validity->days + 1;
@@ -377,14 +377,14 @@  discard block
 block discarded – undo
         $exportedCertClear = "";
         openssl_pkcs12_export($cert, $exportedCertClear, $privateKey, "", ['extracerts' => [$issuingCaPem, $rootCaPem]]);
         $pkey_3des = "";
-        openssl_pkey_export($privateKey, $pkey_3des, $importPassword, [ "encrypt_key_cipher" => OPENSSL_CIPHER_3DES ]);
+        openssl_pkey_export($privateKey, $pkey_3des, $importPassword, ["encrypt_key_cipher" => OPENSSL_CIPHER_3DES]);
         // store resulting cert CN and expiry date in separate columns into DB - do not store the cert data itself as it contains the private key!
         // we need the *real* expiry date, not just the day-approximation
         $x509 = new \core\common\X509();
         $certString = "";
         openssl_x509_export($cert, $certString);
         $parsedCert = $x509->processCertificate($certString);
-        $loggerInstance->debug(5, "CERTINFO: " . /** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
+        $loggerInstance->debug(5, "CERTINFO: "./** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
         $realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s");
 
         // store new cert info in DB
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
         // let the RADIUS users know the actual username for CUI generation
         $radiusDbs = DBConnection::handle("RADIUS"); // is an array of server conns
         foreach ($radiusDbs as $oneRadiusDb) {
-            $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId] , $csr["USERNAME"]);
+            $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId], $csr["USERNAME"]);
         }
 
 // return PKCS#12 data stream
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
         $username = "";
         while ($usernameIsUnique === FALSE) {
             $usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz");
-            $username = $usernameLocalPart . "@" . $realm;
+            $username = $usernameLocalPart."@".$realm;
             $uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ? AND ca_type = ?", "ss", $username, $certtype);
             // SELECT -> resource, not boolean
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) {

Please login to merge, or discard this patch.

web/lib/admin/PageDecoration.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -278,7 +278,7 @@
 block discarded – undo
         <tr>
             <td>" .
                 $cat->catVersion
-               ."
+                ."
             </td>";
 
         if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {

Please login to merge, or discard this patch.

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -73,17 +73,17 @@  discard block
 block discarded – undo
         $retval = "<div class='sidebar'><p>";
         $user = new \core\User($_SESSION['user']);
         if ($advancedControls) {
-            $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
+            $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
             ."<br/>
               <br/>";
             if ($user->isFederationAdmin()) {
-                $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_federation.php'>" . _("The NRO page") . "</a> ";
+                $retval .= "<a href='".\core\CAT::getRootUrlPath()."/admin/overview_federation.php'>"._("The NRO page")."</a> ";
 
             }
-            $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a> 
-              <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
+            $retval .= "<a href='".\core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a> 
+              <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
         }
-        $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
+        $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
             </p>
         </div> <!-- sidebar -->";
         \core\common\Entity::outOfThePotatoes();
@@ -107,23 +107,23 @@  discard block
 block discarded – undo
                     <h1>$cap1</h1>
                 </div><!--header_captions-->
                 <div id='langselection' style='padding-top:20px; padding-".$this->start.":10px;'>
-                    <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "&nbsp;
+                    <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."&nbsp;
                         <select id='lang' name='lang' onchange='this.form.submit()'>";
 
         foreach (\config\Master::LANGUAGES as $lang => $getValue) {
-            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> ";
+            $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> ";
         }
         $retval .= "</select>";
 
         foreach ($_GET as $getVar => $getValue) {
             $filterValue = htmlspecialchars(strip_tags(filter_input(INPUT_GET, $getVar)));
             if ($getVar != "lang" && $getValue != "") {
-                $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>";
+                $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>";
             }
         }
         $retval .= "</form>
                 </div><!--langselection-->";
-        $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
+        $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
         $retval .= "<div class='consortium_logo'>
                     <img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
                 </div> <!-- consortium_logo -->
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
 
         if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") {
             $retval .= "<div id='header_MOTD' style='display:inline-block; padding-".$this->start.":20px;vertical-align:top;'>
-              <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p>
+              <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p>
               </div><!--header_MOTD-->";
         }
         $retval .= $this->sidebar($advancedControls);
@@ -242,11 +242,11 @@  discard block
 block discarded – undo
           <html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'".($this->langObject->rtl ? "dir='rtl'" : "").">
           <head lang='$ourlocale'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-        $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
+        $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
         $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
         $retval .= "<script src='".\core\CAT::getRootUrlPath()."/external/jquery/jquery.js'></script>";
         $retval .= "<script src='".\core\CAT::getRootUrlPath()."/admin/js/click_button.js'></script>";
-        $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
         return $retval;
     }
 
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
             // we may need to jump up one dir if we are either in admin/ or accountstatus/
             // (accountstatus courtesy of my good mood. It's userspace not admin space so
             // it shouldn't be using this function any more.)
-            $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
+            $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
             return "<span id='logos'><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>
               <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";

Please login to merge, or discard this patch.

core/CAT.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -109,7 +109,7 @@  discard block
 block discarded – undo
         parent::__construct();
         common\Entity::intoThePotatoes();
 
-        $this->catVersionString = sprintf("Unreleased %s Git Revision"    , "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
+        $this->catVersionString = sprintf("Unreleased %s Git Revision", "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
 
         if (CAT::RELEASE_VERSION) {
             $major = CAT::VERSION_MAJOR;
@@ -117,14 +117,14 @@  discard block
 block discarded – undo
             $patch = CAT::VERSION_PATCH;
             $extra = CAT::VERSION_EXTRA;
             $temp_version = "CAT-$major.$minor";
-            $branch = "release_$major" . "_$minor";
+            $branch = "release_$major"."_$minor";
             if (CAT::VERSION_PATCH != 0) {
                 $temp_version .= ".$patch";
             }
             if (CAT::VERSION_EXTRA != "") {
                 $temp_version .= "-$extra";
             }
-            $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
+            $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
 
         }
         $product = \config\Master::APPEARANCE['productname'];
@@ -132,9 +132,9 @@  discard block
 block discarded – undo
         $maxYear = self::COPYRIGHT_MAX_YEAR;
         $holder = self::COPYRIGHT_HOLDER;
         $consortia = self::COPYRIGHT_CONSORTIA;
-        $this->catCopyright = "$product - " . $this->catVersionString . " &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
+        $this->catCopyright = "$product - ".$this->catVersionString." &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
         $this->catCopyrifhtAndLicense = "&copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
-        $this->catVersion = "$product<br>" . $this->catVersionString;
+        $this->catVersion = "$product<br>".$this->catVersionString;
 
         /* Federations are created in DB with bootstrapFederation, and listed via listFederations
          */

Please login to merge, or discard this patch.

web/skins/modern/accountstatus/resources/css/accountstatus.css.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -17,12 +17,12 @@
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 header("Content-Type:text/css");
-require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__))))))."/config/_config.php";
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
 ?>
 #sb_info {
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     font-size: 12px;  
     font-weight: normal; 
 }

Please login to merge, or discard this patch.

web/admin/css/silverbullet.css.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 // we need to know if we are serving a RTL language so we can flip some heading
 // items
 header("Content-Type:text/css");
-require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php";
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
 $end = $langInstance->rtl ? "left" : "right";
@@ -82,16 +82,16 @@  discard block
 block discarded – undo
     margin-bottom:3px;
 }
 .sb-date-picker{
-    padding-<?php echo $end;?>:25px;
+    padding-<?php echo $end; ?>:25px;
     width: 140px;
 }
 .sb-date-button{
-    margin-<?php echo $start;?>:-30px;
+    margin-<?php echo $start; ?>:-30px;
     min-height: 22px;
-    border-<?php echo $start;?>-style: solid;
+    border-<?php echo $start; ?>-style: solid;
     border-top-style: solid;
-    border-<?php echo $end;?>-style: solid;
-    border-<?php echo $end;?>-width: 1px;
+    border-<?php echo $end; ?>-style: solid;
+    border-<?php echo $end; ?>-width: 1px;
     border-bottom-width: 1px;
     border-radius: 1px;
     box-shadow: 0px 0px 0px #666666;

Please login to merge, or discard this patch.

web/admin/css/eapSorter.css.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 // we need to know if we are serving a RTL language so we can flip some heading
 // items
 header("Content-Type:text/css");
-require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php";
 
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
@@ -32,15 +32,15 @@  discard block
 block discarded – undo
 ol.eapmethods { list-style-position: inside; margin: 0; padding: 0px; padding-top: 20px; padding-bottom: 0px; width: 20em; }
 ol.eapmethods li{
     background: #CCF;
-    border-<?php echo $start;?>-style: inset;
-    border-<?php echo $start;?>-width: 1px;
-    border-<?php echo $start;?>-color: #8BBACB;
+    border-<?php echo $start; ?>-style: inset;
+    border-<?php echo $start; ?>-width: 1px;
+    border-<?php echo $start; ?>-color: #8BBACB;
     border-top-style: inset;
     border-top-width: 1px;
     border-top-color: #8BBACB;
-    border-<?php echo $end;?>-style: outset;
-    border-<?php echo $end;?>-width: 2px;
-    border-<?php echo $end;?>-color: #043D52;
+    border-<?php echo $end; ?>-style: outset;
+    border-<?php echo $end; ?>-width: 2px;
+    border-<?php echo $end; ?>-color: #043D52;
     border-bottom-style: outset;
     border-bottom-width: 2px;
     border-bottom-color: #043D52;
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
     background-position:95% 50%;
     margin: 2px 0px 2px 0px;
     padding: 3px;
-    padding-<?php echo $start;?>: 1em;
-    padding-<?php echo $end;?>: 0px;
+    padding-<?php echo $start; ?>: 1em;
+    padding-<?php echo $end; ?>: 0px;
 }
 
 table.eaptable td {

Please login to merge, or discard this patch.

		@@ -325,7 +325,7 @@ discard block
		block discarded – undo
325	325	$invitationObject = new SilverbulletInvitation($token);
326	326	$profile = new ProfileSilverbullet($invitationObject->profile);
327	327	$inst = new IdP($profile->institution);
328		- $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n");
	328	+ $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n");
329	329	if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) {
330	330	throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have got that far!");
331	331	}
		@@ -338,12 +338,12 @@ discard block
		block discarded – undo
338	338	throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!");
339	339	}
340	340	$expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow);
341		- $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n");
	341	+ $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n");
342	342	$expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry);
343	343	if ($expiryDateObject === FALSE) {
344	344	throw new Exception("The expiry date we got from the DB is bogus!");
345	345	}
346		- $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n");
	346	+ $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n");
347	347	// date_create with no parameters can't fail, i.e. is never FALSE
348	348	$validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject);
349	349	$expiryDays = $validity->days + 1;
		@@ -377,14 +377,14 @@ discard block
		block discarded – undo
377	377	$exportedCertClear = "";
378	378	openssl_pkcs12_export($cert, $exportedCertClear, $privateKey, "", ['extracerts' => [$issuingCaPem, $rootCaPem]]);
379	379	$pkey_3des = "";
380		- openssl_pkey_export($privateKey, $pkey_3des, $importPassword, [ "encrypt_key_cipher" => OPENSSL_CIPHER_3DES ]);
	380	+ openssl_pkey_export($privateKey, $pkey_3des, $importPassword, ["encrypt_key_cipher" => OPENSSL_CIPHER_3DES]);
381	381	// store resulting cert CN and expiry date in separate columns into DB - do not store the cert data itself as it contains the private key!
382	382	// we need the real expiry date, not just the day-approximation
383	383	$x509 = new \core\common\X509();
384	384	$certString = "";
385	385	openssl_x509_export($cert, $certString);
386	386	$parsedCert = $x509->processCertificate($certString);
387		- $loggerInstance->debug(5, "CERTINFO: " . /** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
	387	+ $loggerInstance->debug(5, "CERTINFO: "./** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
388	388	$realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s");
389	389
390	390	// store new cert info in DB
		@@ -396,7 +396,7 @@ discard block
		block discarded – undo
396	396	// let the RADIUS users know the actual username for CUI generation
397	397	$radiusDbs = DBConnection::handle("RADIUS"); // is an array of server conns
398	398	foreach ($radiusDbs as $oneRadiusDb) {
399		- $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId] , $csr["USERNAME"]);
	399	+ $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId], $csr["USERNAME"]);
400	400	}
401	401
402	402	// return PKCS#12 data stream
		@@ -453,7 +453,7 @@ discard block
		block discarded – undo
453	453	$username = "";
454	454	while ($usernameIsUnique === FALSE) {
455	455	$usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz");
456		- $username = $usernameLocalPart . "@" . $realm;
	456	+ $username = $usernameLocalPart."@".$realm;
457	457	$uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ? AND ca_type = ?", "ss", $username, $certtype);
458	458	// SELECT -> resource, not boolean
459	459	if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) {

		@@ -278,7 +278,7 @@
		block discarded – undo
278	278	<tr>
279	279	<td>" .
280	280	$cat->catVersion
281		- ."
	281	+ ."
282	282	</td>";
283	283
284	284	if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {

		@@ -73,17 +73,17 @@ discard block
		block discarded – undo
73	73	$retval = "<div class='sidebar'><p>";
74	74	$user = new \core\User($_SESSION['user']);
75	75	if ($advancedControls) {
76		- $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
	76	+ $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
77	77	."<br/>
78	78	<br/>";
79	79	if ($user->isFederationAdmin()) {
80		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_federation.php'>" . _("The NRO page") . "</a> ";
	80	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/admin/overview_federation.php'>"._("The NRO page")."</a> ";
81	81
82	82	}
83		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a>
84		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
	83	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a>
	84	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
85	85	}
86		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
	86	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
87	87	</p>
88	88	</div> <!-- sidebar -->";
89	89	\core\common\Entity::outOfThePotatoes();
		@@ -107,23 +107,23 @@ discard block
		block discarded – undo
107	107	<h1>$cap1</h1>
108	108	</div><!--header_captions-->
109	109	<div id='langselection' style='padding-top:20px; padding-".$this->start.":10px;'>
110		- <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "
	110	+ <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."
111	111	<select id='lang' name='lang' onchange='this.form.submit()'>";
112	112
113	113	foreach (\config\Master::LANGUAGES as $lang => $getValue) {
114		- $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> ";
	114	+ $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> ";
115	115	}
116	116	$retval .= "</select>";
117	117
118	118	foreach ($_GET as $getVar => $getValue) {
119	119	$filterValue = htmlspecialchars(strip_tags(filter_input(INPUT_GET, $getVar)));
120	120	if ($getVar != "lang" && $getValue != "") {
121		- $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>";
	121	+ $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>";
122	122	}
123	123	}
124	124	$retval .= "</form>
125	125	</div><!--langselection-->";
126		- $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
	126	+ $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
127	127	$retval .= "<div class='consortium_logo'>
128	128	<img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
129	129	</div> <!-- consortium_logo -->
		@@ -216,7 +216,7 @@ discard block
		block discarded – undo
216	216
217	217	if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") {
218	218	$retval .= "<div id='header_MOTD' style='display:inline-block; padding-".$this->start.":20px;vertical-align:top;'>
219		- <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p>
	219	+ <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p>
220	220	</div><!--header_MOTD-->";
221	221	}
222	222	$retval .= $this->sidebar($advancedControls);
		@@ -242,11 +242,11 @@ discard block
		block discarded – undo
242	242	<html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'".($this->langObject->rtl ? "dir='rtl'" : "").">
243	243	<head lang='$ourlocale'>
244	244	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
245		- $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
	245	+ $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
246	246	$retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
247	247	$retval .= "<script src='".\core\CAT::getRootUrlPath()."/external/jquery/jquery.js'></script>";
248	248	$retval .= "<script src='".\core\CAT::getRootUrlPath()."/admin/js/click_button.js'></script>";
249		- $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
	249	+ $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
250	250	return $retval;
251	251	}
252	252
		@@ -260,7 +260,7 @@ discard block
		block discarded – undo
260	260	// we may need to jump up one dir if we are either in admin/ or accountstatus/
261	261	// (accountstatus courtesy of my good mood. It's userspace not admin space so
262	262	// it shouldn't be using this function any more.)
263		- $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
	263	+ $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
264	264	return "<span id='logos'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
265	265	<img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
266	266	<span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";

		@@ -109,7 +109,7 @@ discard block
		block discarded – undo
109	109	parent::__construct();
110	110	common\Entity::intoThePotatoes();
111	111
112		- $this->catVersionString = sprintf("Unreleased %s Git Revision" , "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
	112	+ $this->catVersionString = sprintf("Unreleased %s Git Revision", "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
113	113
114	114	if (CAT::RELEASE_VERSION) {
115	115	$major = CAT::VERSION_MAJOR;
		@@ -117,14 +117,14 @@ discard block
		block discarded – undo
117	117	$patch = CAT::VERSION_PATCH;
118	118	$extra = CAT::VERSION_EXTRA;
119	119	$temp_version = "CAT-$major.$minor";
120		- $branch = "release_$major" . "_$minor";
	120	+ $branch = "release_$major"."_$minor";
121	121	if (CAT::VERSION_PATCH != 0) {
122	122	$temp_version .= ".$patch";
123	123	}
124	124	if (CAT::VERSION_EXTRA != "") {
125	125	$temp_version .= "-$extra";
126	126	}
127		- $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
	127	+ $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
128	128
129	129	}
130	130	$product = \config\Master::APPEARANCE['productname'];
		@@ -132,9 +132,9 @@ discard block
		block discarded – undo
132	132	$maxYear = self::COPYRIGHT_MAX_YEAR;
133	133	$holder = self::COPYRIGHT_HOLDER;
134	134	$consortia = self::COPYRIGHT_CONSORTIA;
135		- $this->catCopyright = "$product - " . $this->catVersionString . " © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
	135	+ $this->catCopyright = "$product - ".$this->catVersionString." © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
136	136	$this->catCopyrifhtAndLicense = "© $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
137		- $this->catVersion = "$product<br>" . $this->catVersionString;
	137	+ $this->catVersion = "$product<br>".$this->catVersionString;
138	138
139	139	/* Federations are created in DB with bootstrapFederation, and listed via listFederations
140	140	*/

		@@ -61,10 +61,10 @@
		block discarded – undo
61	61	header("Content-Type:text/html;charset=utf-8");
62	62	?>
63	63	<!DOCTYPE html>
64		- <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale;?>' <?php echo ($direction ? "dir='rtl'" : "");?>>
65		- <head lang='<?php echo $ourlocale;?>'>
	64	+ <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale; ?>' <?php echo ($direction ? "dir='rtl'" : ""); ?>>
	65	+ <head lang='<?php echo $ourlocale; ?>'>
66	66	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
67		- <title><?php echo htmlspecialchars($pagetitle);?></title>
	67	+ <title><?php echo htmlspecialchars($pagetitle); ?></title>
68	68	<script type="text/javascript">ie_version = 0;</script>
69	69	<!--[if IE]>
70	70	<script type="text/javascript">ie_version=1;</script>

		@@ -69,7 +69,7 @@
		block discarded – undo
69	69	$langInstance = new core\common\Language();
70	70	$end = $langInstance->rtl ? "left" : "right";
71	71	?>
72		- pressedButton.next().append('<span style="padding-<?php echo $end;?>:1em">'+msg+'<\/span>');
	72	+ pressedButton.next().append('<span style="padding-<?php echo $end; ?>:1em">'+msg+'<\/span>');
73	73	}
74	74	);
75	75	}

		@@ -51,7 +51,7 @@
		block discarded – undo
51	51	" . $Tou['title'] . "
52	52	</h1>
53	53	<div id='tou_1'>" . $Tou['subtitle'] .
54		- '<div style="direction:ltr">' . $Tou['short'] . "</div>
	54	+ '<div style="direction:ltr">' . $Tou['short'] . "</div>
55	55	</div>
56	56	<div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
57	57	<div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	* the receiving end to strip this marker and not add the title by itself.
32	32	*
33	33	*/
34		-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
	34	+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
35	35
36	36	$Gui = new \web\lib\user\Gui();
37	37
		@@ -41,46 +41,46 @@ discard block
		block discarded – undo
41	41	$subpage = $_REQUEST['subpage'];
42	42	switch ($page) {
43	43	case 'about':
44		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
	44	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
45	45	$out = "<div class='padding'>$out</div>";
46	46	break;
47	47	case 'tou':
48		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
	48	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
49	49	$out = "no_title<div>
50	50	<h1>
51		- " . $Tou['title'] . "
	51	+ " . $Tou['title']."
52	52	</h1>
53		-<div id='tou_1'>" . $Tou['subtitle'] .
54		- '<div style="direction:ltr">' . $Tou['short'] . "</div>
	53	+<div id='tou_1'>" . $Tou['subtitle'].
	54	+ '<div style="direction:ltr">'.$Tou['short']."</div>
55	55	</div>
56	56	<div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
57	57	<div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .
58		- $Tou['full'] . "
	58	+ $Tou['full']."
59	59	</div>
60	60	</div>
61	61	";
62	62	break;
63	63	case 'help':
64		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
	64	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
65	65	switch ($subpage) {
66	66	case 'contact':
67	67	case 'idp_not_listed':
68	68	case 'device_not_listed':
69	69	case 'what_is_eduroam':
70		- $out = "no_title<div><h1>" . _("Help") . "</h1>";
	70	+ $out = "no_title<div><h1>"._("Help")."</h1>";
71	71	foreach ($Faq as $faqItem) {
72	72	if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
73		- $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
74		- $out .= "" . $faqItem['text'] . "</div>\n";
	73	+ $out .= "<div><h3>".$faqItem['title']."</h3>\n";
	74	+ $out .= "".$faqItem['text']."</div>\n";
75	75	}
76	76	}
77	77	$out .= "</div>";
78	78	break;
79	79	case 'faq':
80		- $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
	80	+ $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
81	81	foreach ($Faq as $faqItem) {
82		- $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
83		- $out .= "" . $faqItem['text'] . "</div>\n";
	82	+ $out .= "<div><h3>".$faqItem['title']."</h3>\n";
	83	+ $out .= "".$faqItem['text']."</div>\n";
84	84	}
85	85	$out .= "</div>";
86	86	break;
		@@ -104,15 +104,15 @@ discard block
		block discarded – undo
104	104	$rn = uniqid();
105	105	$_SESSION['remindIdP'] = $rn;
106	106	$out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
107		- $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
108		- $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
109		- $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
	107	+ $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
	108	+ $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
	109	+ $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
110	110	$out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
111	111	$out = "<div class='padding'>$out</div>";
112	112	}
113	113	break;
114	114	case 'develop':
115		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
	115	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
116	116	$out = "<div class='padding'>$out</div>";
117	117	break;
118	118	}

		@@ -17,12 +17,12 @@
		block discarded – undo
17	17	* <base_url>/copyright.php after deploying the software
18	18	*/
19	19	header("Content-Type:text/css");
20		-require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))) . "/config/_config.php";
	20	+require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__))))))."/config/_config.php";
21	21	$langInstance = new core\common\Language();
22	22	$start = $langInstance->rtl ? "right" : "left";
23	23	?>
24	24	#sb_info {
25		- padding-<?php echo $start;?>: 30px;
	25	+ padding-<?php echo $start; ?>: 30px;
26	26	font-size: 12px;
27	27	font-weight: normal;
28	28	}

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	// we need to know if we are serving a RTL language so we can flip some heading
22	22	// items
23	23	header("Content-Type:text/css");
24		-require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php";
	24	+require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php";
25	25	$langInstance = new core\common\Language();
26	26	$start = $langInstance->rtl ? "right" : "left";
27	27	$end = $langInstance->rtl ? "left" : "right";
		@@ -82,16 +82,16 @@ discard block
		block discarded – undo
82	82	margin-bottom:3px;
83	83	}
84	84	.sb-date-picker{
85		- padding-<?php echo $end;?>:25px;
	85	+ padding-<?php echo $end; ?>:25px;
86	86	width: 140px;
87	87	}
88	88	.sb-date-button{
89		- margin-<?php echo $start;?>:-30px;
	89	+ margin-<?php echo $start; ?>:-30px;
90	90	min-height: 22px;
91		- border-<?php echo $start;?>-style: solid;
	91	+ border-<?php echo $start; ?>-style: solid;
92	92	border-top-style: solid;
93		- border-<?php echo $end;?>-style: solid;
94		- border-<?php echo $end;?>-width: 1px;
	93	+ border-<?php echo $end; ?>-style: solid;
	94	+ border-<?php echo $end; ?>-width: 1px;
95	95	border-bottom-width: 1px;
96	96	border-radius: 1px;
97	97	box-shadow: 0px 0px 0px #666666;

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	// we need to know if we are serving a RTL language so we can flip some heading
23	23	// items
24	24	header("Content-Type:text/css");
25		-require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php";
	25	+require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php";
26	26
27	27	$langInstance = new core\common\Language();
28	28	$start = $langInstance->rtl ? "right" : "left";
		@@ -32,15 +32,15 @@ discard block
		block discarded – undo
32	32	ol.eapmethods { list-style-position: inside; margin: 0; padding: 0px; padding-top: 20px; padding-bottom: 0px; width: 20em; }
33	33	ol.eapmethods li{
34	34	background: #CCF;
35		- border-<?php echo $start;?>-style: inset;
36		- border-<?php echo $start;?>-width: 1px;
37		- border-<?php echo $start;?>-color: #8BBACB;
	35	+ border-<?php echo $start; ?>-style: inset;
	36	+ border-<?php echo $start; ?>-width: 1px;
	37	+ border-<?php echo $start; ?>-color: #8BBACB;
38	38	border-top-style: inset;
39	39	border-top-width: 1px;
40	40	border-top-color: #8BBACB;
41		- border-<?php echo $end;?>-style: outset;
42		- border-<?php echo $end;?>-width: 2px;
43		- border-<?php echo $end;?>-color: #043D52;
	41	+ border-<?php echo $end; ?>-style: outset;
	42	+ border-<?php echo $end; ?>-width: 2px;
	43	+ border-<?php echo $end; ?>-color: #043D52;
44	44	border-bottom-style: outset;
45	45	border-bottom-width: 2px;
46	46	border-bottom-color: #043D52;
		@@ -51,8 +51,8 @@ discard block
		block discarded – undo
51	51	background-position:95% 50%;
52	52	margin: 2px 0px 2px 0px;
53	53	padding: 3px;
54		- padding-<?php echo $start;?>: 1em;
55		- padding-<?php echo $end;?>: 0px;
	54	+ padding-<?php echo $start; ?>: 1em;
	55	+ padding-<?php echo $end; ?>: 0px;
56	56	}
57	57
58	58	table.eaptable td {

GEANT / CAT

Push — master ( 382c09...be5cf0 )

Status

Category

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch