Inspection of "Update to Changes" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Push — master ( defeb2...c0e551 )

by Tomasz

created 2025-08-12 13:16 UTC

Status

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

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 <head>
 <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"); ?>" />
-<title><?php echo config\Master::APPEARANCE['productname'];?> Copyright and Licensing</title>
+<title><?php echo config\Master::APPEARANCE['productname']; ?> Copyright and Licensing</title>
 </head>
 <body>
 <div id="wrap">
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
             <div id="user_page" style="display:block">
                 <?php echo $divs->divPagetitle(config\Master::APPEARANCE['productname']." Copyright and Licensing", ""); ?>
                 <div style="padding:20px">
-            <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
+            <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
                 </div>
             </div>
         </div>

Please login to merge, or discard this patch.

web/skins/msp/index.php 1 patch

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

@@ -49,7 +49,7 @@  discard block
 block discarded – undo
     print "vendorlogo ='';\n";
 }
 
-print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
 //TODO modify this based on OS detection
 $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? "";
 if (preg_match('/Android/', $userAgent)) {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
     <?php echo $divs->divHeading($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>

Please login to merge, or discard this patch.

web/skins/msp/Divs.php 1 patch

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

@@ -67,7 +67,7 @@  discard block
 block discarded – undo
     public function divSilverbullet() {
         $retval = "
 <div id='silverbullet'>"
-    . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] . 
+    . $this->Gui->textTemplates->templates[user\SB_GO_AWAY]. 
     "</div>
     ";
         return $retval;
@@ -109,9 +109,9 @@  discard block
 block discarded – undo
     public function divProfiles() {
         return "
 <div id='profiles'> <!-- this is the profile selection filled during run time -->
-    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . "
+    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
     </div>" .
-"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
+"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
                 "</div>";
     }
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
     public function divInstitution($selectButton = TRUE) {
         $retval = "<div id='institution_name'>
     <span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
-                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") .
+                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
                 "</div>";
         $retval .= $this->emptyImage('idp_logo', 'IdP Logo');
         return $retval;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
     public function divOtherinstallers() {
         $retval = "
 <div class='sub_h'>
-    <div id='other_installers'>".$this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "
+    <div id='other_installers'>".$this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."
          <table id='device_list' style='padding:0px;'>";
 
         foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
@@ -148,18 +148,18 @@  discard block
 block discarded – undo
             $deviceIndex = 0;
 
             $imgTag = "";
-            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png");
+            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png");
             if ($imgLocation !== FALSE) {
-                $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">';
+                $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">';
             }
-            $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>';
+            $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>';
             foreach ($deviceGroup as $d => $D) {
                 if ($deviceIndex) {
                     $retval .= '<tr>';
                 }
-                $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>"
-                        . "<div class='device_info' id='info_" . $d . "'></div></td>"
-                        . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
+                $retval .= "<td><button id='".$d."'>".$D['display']."</button>"
+                        . "<div class='device_info' id='info_".$d."'></div></td>"
+                        . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n";
                 $deviceIndex++;
             }
             $retval .= "</tbody>";
@@ -172,15 +172,15 @@  discard block
 block discarded – undo
     }
 
     public function divGuessOs($operatingSystem) {
-        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png");
+        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png");
         $vendorstyle = "";
         if ($vendorlogo !== FALSE) {
-            $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'";
+            $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'";
         }
         $deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png");
         $deleteImg = "";
         if ($deleteIcon !== FALSE) {
-            $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >";
+            $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >";
         }
         return "
 <div class='sub_h' id='guess_os'>
@@ -188,23 +188,23 @@  discard block
 block discarded – undo
     <table id='browser'>
         <tr>
             <td>
-                <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'>
+                <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'>
                     $deleteImg
-                    <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . "
+                    <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]."
                     </div>
                     <div class='download_button_text'>" .
-                $operatingSystem['display'] . "
+                $operatingSystem['display']."
                     </div>
                 </button>
-                <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div>
+                <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div>
           </td>
           <td style='vertical-align:top'>
-               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button>
+               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button>
           </td>
       </tr>
     </table> <!-- id='browser' -->
     <div class='sub_h'>
-       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a>
+       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a>
     </div>
 </div> <!-- id='guess_os' -->";
     }

Please login to merge, or discard this patch.

web/skins/msp/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.

web/skins/msp/resources/css/cat-user.css.php 1 patch

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

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 header("Content-Type:text/css");
-require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . "/config/_config.php";
+require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__))))))."/config/_config.php";
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
 $end = $langInstance->rtl ? "left" : "right";
@@ -399,8 +399,8 @@  discard block
 block discarded – undo
 
 #message_only {
     padding-top: 20px;
-    padding-<?php echo $start;?>: 30px;
-    padding-<?php echo $end;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
+    padding-<?php echo $end; ?>: 30px;
     font-weight: normal;
     position: relative;
     font-size: 15px;

Please login to merge, or discard this patch.

utils/update_monitor_copy_2.php 1 patch

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

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
  * in a separate way and it is crucial that the updates are porformed more often (hourly)
  */
 namespace utils;
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 setlocale(LC_CTYPE, "en_US.UTF-8");
 
@@ -52,4 +52,4 @@  discard block
 block discarded – undo
 
 $timeEnd = microtime(true);
 $timeElapsed = $timeEnd - $timeStart;
-printf("Whole update done in %.2fs\n",$timeElapsed);
\ No newline at end of file
+printf("Whole update done in %.2fs\n", $timeElapsed);
\ No newline at end of file

Please login to merge, or discard this patch.

utils/UpdateFromMonitor.php 1 patch

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

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
  * update the local copy
  */
 namespace utils;
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 setlocale(LC_CTYPE, "en_US.UTF-8");
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
         $this->db_ext->query("SET NAMES 'utf8'");
         $this->db_local->query("SET NAMES 'utf8mb4'");
         $result = $this->db_ext->query("SELECT * FROM $table");
-        $queryFields = implode(',', array_column($this->fields[$db][$table_name],0));
+        $queryFields = implode(',', array_column($this->fields[$db][$table_name], 0));
         while ($row = $result->fetch_assoc()) {
             $v = [];
             foreach ($this->fields[$db][$table_name] as $field) {
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
                     }
                 }
             }
-            $queryValues = implode(',',$v);
+            $queryValues = implode(',', $v);
             $query = "INSERT INTO $tmpTable (".$queryFields.") VALUES (".$queryValues.")";
             $this->db_local->query($query);
         }
@@ -134,9 +134,9 @@  discard block
 block discarded – undo
             $realms = explode(',', $row[1]);
             foreach ($contacts as $contact) {
                 foreach ($realms as $realm) {
-                    $email = empty($contact['mail']) ? 'NULL' :'"'.$contact['mail'].'"';
-                    $name = empty($contact['name']) ? 'NULL' :'"'.$contact['name'].'"';
-                    $phone = empty($contact['phone']) ? 'NULL' :'"'.$contact['phone'].'"';
+                    $email = empty($contact['mail']) ? 'NULL' : '"'.$contact['mail'].'"';
+                    $name = empty($contact['name']) ? 'NULL' : '"'.$contact['name'].'"';
+                    $phone = empty($contact['phone']) ? 'NULL' : '"'.$contact['phone'].'"';
                     $id = '"'.$row[2].'"';
                     $ROid = '"'.$row[3].'"';
                     $query = "INSERT INTO tmp_institution_admins (name, email, phone, inst_realm, instid, ROid)"
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
     }
 
     private function escape($inp) {
-        $out=str_replace('\\','\\\\',$inp);
-        $out=str_replace('"','\"',$out);
-        $out=str_replace('?','\?',$out);
+        $out = str_replace('\\', '\\\\', $inp);
+        $out = str_replace('"', '\"', $out);
+        $out = str_replace('?', '\?', $out);
         $out = 'convert(cast(convert("'.$out.'" using latin1) as binary) using utf8)';
         return($out);
     }

Please login to merge, or discard this patch.

config/autoloader.php 1 patch

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

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once __DIR__ . "/../core/Psr4Autoloader.php";
+require_once __DIR__."/../core/Psr4Autoloader.php";
 use core\autoloader\Psr4Autoloader;
 
 // instantiate the loader
@@ -30,12 +30,12 @@  discard block
 block discarded – undo
 
 // register the base directories for the namespace prefix
 // include configuration
-$loader->addNamespace('config', __DIR__ );
+$loader->addNamespace('config', __DIR__);
 // include CAT/core library
-$loader->addNamespace('core', __DIR__ . "/../core");
+$loader->addNamespace('core', __DIR__."/../core");
 // include CAT/devices library
-$loader->addNamespace('devices', __DIR__ . "/../devices");
+$loader->addNamespace('devices', __DIR__."/../devices");
 // include CAT/web library
-$loader->addNamespace('web', __DIR__ . "/../web");
+$loader->addNamespace('web', __DIR__."/../web");
 // include CAT/utils
-$loader->addNamespace('utils', __DIR__ . "/../utils");
+$loader->addNamespace('utils', __DIR__."/../utils");

Please login to merge, or discard this patch.

docker/MSP/web/html/lib.inc 2 patches

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

@@ -2,12 +2,12 @@
 block discarded – undo
 define('SOCKET', '/opt/Socket/CAT_requests/queue');
 
 function cat_socket($obj) {
-   $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
-   $conn = socket_connect($sock, SOCKET);
-   if ( $conn ) {
-     socket_write ($sock, $obj, strlen($obj));
-     $out = socket_read ($sock, 2048);
-     return $out;
-   }
-   return 'FAILURE';
+    $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
+    $conn = socket_connect($sock, SOCKET);
+    if ( $conn ) {
+        socket_write ($sock, $obj, strlen($obj));
+        $out = socket_read ($sock, 2048);
+        return $out;
+    }
+    return 'FAILURE';
 }

Please login to merge, or discard this patch.

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

@@ -6,9 +6,9 @@
 block discarded – undo
 function cat_socket($obj) {
    $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
    $conn = socket_connect($sock, SOCKET);
-   if ( $conn ) {
-     socket_write ($sock, $obj, strlen($obj));
-     $out = socket_read ($sock, 2048);
+   if ($conn) {
+     socket_write($sock, $obj, strlen($obj));
+     $out = socket_read($sock, 2048);
      return $out;
    }
    return 'FAILURE';

Please login to merge, or discard this patch.

		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	public function divSilverbullet() {
68	68	$retval = "
69	69	<div id='silverbullet'>"
70		- . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
	70	+ . $this->Gui->textTemplates->templates[user\SB_GO_AWAY].
71	71	"</div>
72	72	";
73	73	return $retval;
		@@ -109,9 +109,9 @@ discard block
		block discarded – undo
109	109	public function divProfiles() {
110	110	return "
111	111	<div id='profiles'> <!-- this is the profile selection filled during run time -->
112		- <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . "
	112	+ <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
113	113	</div>" .
114		-"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
	114	+"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
115	115	"</div>";
116	116	}
117	117
		@@ -126,7 +126,7 @@ discard block
		block discarded – undo
126	126	public function divInstitution($selectButton = TRUE) {
127	127	$retval = "<div id='institution_name'>
128	128	<span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
129		- ($selectButton ? "<a id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") .
	129	+ ($selectButton ? "<a id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
130	130	"</div>";
131	131	$retval .= $this->emptyImage('idp_logo', 'IdP Logo');
132	132	return $retval;
		@@ -140,7 +140,7 @@ discard block
		block discarded – undo
140	140	public function divOtherinstallers() {
141	141	$retval = "
142	142	<div class='sub_h'>
143		- <div id='other_installers'>".$this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "
	143	+ <div id='other_installers'>".$this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."
144	144	<table id='device_list' style='padding:0px;'>";
145	145
146	146	foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
		@@ -148,18 +148,18 @@ discard block
		block discarded – undo
148	148	$deviceIndex = 0;
149	149
150	150	$imgTag = "";
151		- $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png");
	151	+ $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png");
152	152	if ($imgLocation !== FALSE) {
153		- $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">';
	153	+ $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">';
154	154	}
155		- $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>';
	155	+ $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>';
156	156	foreach ($deviceGroup as $d => $D) {
157	157	if ($deviceIndex) {
158	158	$retval .= '<tr>';
159	159	}
160		- $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>"
161		- . "<div class='device_info' id='info_" . $d . "'></div></td>"
162		- . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
	160	+ $retval .= "<td><button id='".$d."'>".$D['display']."</button>"
	161	+ . "<div class='device_info' id='info_".$d."'></div></td>"
	162	+ . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n";
163	163	$deviceIndex++;
164	164	}
165	165	$retval .= "</tbody>";
		@@ -172,15 +172,15 @@ discard block
		block discarded – undo
172	172	}
173	173
174	174	public function divGuessOs($operatingSystem) {
175		- $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png");
	175	+ $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png");
176	176	$vendorstyle = "";
177	177	if ($vendorlogo !== FALSE) {
178		- $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'";
	178	+ $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'";
179	179	}
180	180	$deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png");
181	181	$deleteImg = "";
182	182	if ($deleteIcon !== FALSE) {
183		- $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >";
	183	+ $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >";
184	184	}
185	185	return "
186	186	<div class='sub_h' id='guess_os'>
		@@ -188,23 +188,23 @@ discard block
		block discarded – undo
188	188	<table id='browser'>
189	189	<tr>
190	190	<td>
191		- <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'>
	191	+ <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'>
192	192	$deleteImg
193		- <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . "
	193	+ <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]."
194	194	</div>
195	195	<div class='download_button_text'>" .
196		- $operatingSystem['display'] . "
	196	+ $operatingSystem['display']."
197	197	</div>
198	198	</button>
199		- <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div>
	199	+ <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div>
200	200	</td>
201	201	<td style='vertical-align:top'>
202		- <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button>
	202	+ <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button>
203	203	</td>
204	204	</tr>
205	205	</table> <!-- id='browser' -->
206	206	<div class='sub_h'>
207		- <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a>
	207	+ <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a>
208	208	</div>
209	209	</div> <!-- id='guess_os' -->";
210	210	}

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	<head>
25	25	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
26	26	<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
27		-<title><?php echo config\Master::APPEARANCE['productname'];?> Copyright and Licensing</title>
	27	+<title><?php echo config\Master::APPEARANCE['productname']; ?> Copyright and Licensing</title>
28	28	</head>
29	29	<body>
30	30	<div id="wrap">
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	<div id="user_page" style="display:block">
36	36	<?php echo $divs->divPagetitle(config\Master::APPEARANCE['productname']." Copyright and Licensing", ""); ?>
37	37	<div style="padding:20px">
38		- <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
	38	+ <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
39	39	</div>
40	40	</div>
41	41	</div>

		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	print "vendorlogo ='';\n";
50	50	}
51	51
52		-print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
	52	+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
53	53	//TODO modify this based on OS detection
54	54	$userAgent = $_SERVER['HTTP_USER_AGENT'] ?? "";
55	55	if (preg_match('/Android/', $userAgent)) {
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	<?php echo $divs->divHeading($visibility); ?>
80	80	<div id="main_page">
81	81	<div id="loading_ico">
82		- <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
	82	+ <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
83	83	</div>
84	84	<div id="info_overlay"> <!-- device info -->
85	85	<div id="info_window"></div>

		@@ -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	}

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	* <base_url>/copyright.php after deploying the software
20	20	*/
21	21	header("Content-Type:text/css");
22		-require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . "/config/_config.php";
	22	+require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__))))))."/config/_config.php";
23	23	$langInstance = new core\common\Language();
24	24	$start = $langInstance->rtl ? "right" : "left";
25	25	$end = $langInstance->rtl ? "left" : "right";
		@@ -399,8 +399,8 @@ discard block
		block discarded – undo
399	399
400	400	#message_only {
401	401	padding-top: 20px;
402		- padding-<?php echo $start;?>: 30px;
403		- padding-<?php echo $end;?>: 30px;
	402	+ padding-<?php echo $start; ?>: 30px;
	403	+ padding-<?php echo $end; ?>: 30px;
404	404	font-weight: normal;
405	405	position: relative;
406	406	font-size: 15px;

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	* in a separate way and it is crucial that the updates are porformed more often (hourly)
28	28	*/
29	29	namespace utils;
30		-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
	30	+require_once dirname(dirname(__FILE__))."/config/_config.php";
31	31
32	32	setlocale(LC_CTYPE, "en_US.UTF-8");
33	33
		@@ -52,4 +52,4 @@ discard block
		block discarded – undo
52	52
53	53	$timeEnd = microtime(true);
54	54	$timeElapsed = $timeEnd - $timeStart;
55		-printf("Whole update done in %.2fs\n",$timeElapsed);
56	55	\ No newline at end of file
	56	+printf("Whole update done in %.2fs\n", $timeElapsed);
57	57	\ No newline at end of file

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	* update the local copy
25	25	*/
26	26	namespace utils;
27		-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
	27	+require_once dirname(dirname(__FILE__))."/config/_config.php";
28	28
29	29	setlocale(LC_CTYPE, "en_US.UTF-8");
30	30
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	$this->db_ext->query("SET NAMES 'utf8'");
99	99	$this->db_local->query("SET NAMES 'utf8mb4'");
100	100	$result = $this->db_ext->query("SELECT * FROM $table");
101		- $queryFields = implode(',', array_column($this->fields[$db][$table_name],0));
	101	+ $queryFields = implode(',', array_column($this->fields[$db][$table_name], 0));
102	102	while ($row = $result->fetch_assoc()) {
103	103	$v = [];
104	104	foreach ($this->fields[$db][$table_name] as $field) {
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	}
117	117	}
118	118	}
119		- $queryValues = implode(',',$v);
	119	+ $queryValues = implode(',', $v);
120	120	$query = "INSERT INTO $tmpTable (".$queryFields.") VALUES (".$queryValues.")";
121	121	$this->db_local->query($query);
122	122	}
		@@ -134,9 +134,9 @@ discard block
		block discarded – undo
134	134	$realms = explode(',', $row[1]);
135	135	foreach ($contacts as $contact) {
136	136	foreach ($realms as $realm) {
137		- $email = empty($contact['mail']) ? 'NULL' :'"'.$contact['mail'].'"';
138		- $name = empty($contact['name']) ? 'NULL' :'"'.$contact['name'].'"';
139		- $phone = empty($contact['phone']) ? 'NULL' :'"'.$contact['phone'].'"';
	137	+ $email = empty($contact['mail']) ? 'NULL' : '"'.$contact['mail'].'"';
	138	+ $name = empty($contact['name']) ? 'NULL' : '"'.$contact['name'].'"';
	139	+ $phone = empty($contact['phone']) ? 'NULL' : '"'.$contact['phone'].'"';
140	140	$id = '"'.$row[2].'"';
141	141	$ROid = '"'.$row[3].'"';
142	142	$query = "INSERT INTO tmp_institution_admins (name, email, phone, inst_realm, instid, ROid)"
		@@ -161,9 +161,9 @@ discard block
		block discarded – undo
161	161	}
162	162
163	163	private function escape($inp) {
164		- $out=str_replace('\\','\\\\',$inp);
165		- $out=str_replace('"','\"',$out);
166		- $out=str_replace('?','\?',$out);
	164	+ $out = str_replace('\\', '\\\\', $inp);
	165	+ $out = str_replace('"', '\"', $out);
	166	+ $out = str_replace('?', '\?', $out);
167	167	$out = 'convert(cast(convert("'.$out.'" using latin1) as binary) using utf8)';
168	168	return($out);
169	169	}

		@@ -2,12 +2,12 @@
		block discarded – undo
2	2	define('SOCKET', '/opt/Socket/CAT_requests/queue');
3	3
4	4	function cat_socket($obj) {
5		- $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
6		- $conn = socket_connect($sock, SOCKET);
7		- if ( $conn ) {
8		- socket_write ($sock, $obj, strlen($obj));
9		- $out = socket_read ($sock, 2048);
10		- return $out;
11		- }
12		- return 'FAILURE';
	5	+ $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
	6	+ $conn = socket_connect($sock, SOCKET);
	7	+ if ( $conn ) {
	8	+ socket_write ($sock, $obj, strlen($obj));
	9	+ $out = socket_read ($sock, 2048);
	10	+ return $out;
	11	+ }
	12	+ return 'FAILURE';
13	13	}

		@@ -6,9 +6,9 @@
		block discarded – undo
6	6	function cat_socket($obj) {
7	7	$sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
8	8	$conn = socket_connect($sock, SOCKET);
9		- if ( $conn ) {
10		- socket_write ($sock, $obj, strlen($obj));
11		- $out = socket_read ($sock, 2048);
	9	+ if ($conn) {
	10	+ socket_write($sock, $obj, strlen($obj));
	11	+ $out = socket_read($sock, 2048);
12	12	return $out;
13	13	}
14	14	return 'FAILURE';

GEANT / CAT

Push — master ( defeb2...c0e551 )

Status

Category

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

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

Spacing +20 added lines, -20 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 +3 added lines, -3 removed lines patch added patch discarded remove patch

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

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

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

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

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