Inspection of "this comment does not reflect reality" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — release_2_0 ( c27090...f474b2 )

by Stefan

created 2019-07-24 07:48 UTC

Status

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

@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 
 namespace core;
 
-require_once dirname(__DIR__) . "/config/_config.php";
+require_once dirname(__DIR__)."/config/_config.php";
 
 CAT_session_start();
 
@@ -105,19 +105,19 @@  discard block
 block discarded – undo
         parent::__construct();
         common\Entity::intoThePotatoes();
         
-        $this->CAT_VERSION_STRING = sprintf(_("Unreleased %s Git Revision"),"<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
+        $this->CAT_VERSION_STRING = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
         if (CAT::RELEASE_VERSION) {
-            $temp_version = "CAT-" . CAT::VERSION_MAJOR . "." . CAT::VERSION_MINOR;
-            $branch = "release_" . CAT::VERSION_MAJOR . "_" . CAT::VERSION_MINOR;
+            $temp_version = "CAT-".CAT::VERSION_MAJOR.".".CAT::VERSION_MINOR;
+            $branch = "release_".CAT::VERSION_MAJOR."_".CAT::VERSION_MINOR;
             if (CAT::VERSION_PATCH != 0) {
-                $temp_version .= "." . CAT::VERSION_PATCH;
+                $temp_version .= ".".CAT::VERSION_PATCH;
             }
             if (CAT::VERSION_EXTRA != "") {
-                $temp_version .= "-" . CAT::VERSION_EXTRA;
+                $temp_version .= "-".CAT::VERSION_EXTRA;
             }
-            $this->CAT_VERSION_STRING = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
+            $this->CAT_VERSION_STRING = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
         }
-        $this->CAT_COPYRIGHT = CONFIG['APPEARANCE']['productname'] . " - " . $this->CAT_VERSION_STRING . " &copy; " . CAT::COPYRIGHT_MIN_YEAR . "-" . CAT::COPYRIGHT_MAX_YEAR . " " . CAT::COPYRIGHT_HOLDER . "<br/>on behalf of " . CAT::COPYRIGHT_CONSORTIA . "; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
+        $this->CAT_COPYRIGHT = CONFIG['APPEARANCE']['productname']." - ".$this->CAT_VERSION_STRING." &copy; ".CAT::COPYRIGHT_MIN_YEAR."-".CAT::COPYRIGHT_MAX_YEAR." ".CAT::COPYRIGHT_HOLDER."<br/>on behalf of ".CAT::COPYRIGHT_CONSORTIA."; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
         
 
         /* Federations are created in DB with bootstrapFederation, and listed via listFederations

Please login to merge, or discard this patch.

web/skins/modern/Divs.php 1 patch

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

@@ -49,11 +49,11 @@  discard block
 block discarded – undo
         $location = $this->Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png");
         if ($location !== FALSE) {
             $retval .= "<div id='cat_logo'>
-            <a href='" . CONFIG_CONFASSISTANT['CONSORTIUM']['homepage'] . "'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
+            <a href='" . CONFIG_CONFASSISTANT['CONSORTIUM']['homepage']."'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
             <span>Configuration Assistant Tool</span>
             </div>";
         }
-        $retval .= "<div id='motd'>" . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . "</div>";
+        $retval .= "<div id='motd'>".(isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp')."</div>";
         $loc2 = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png");
         if ($loc2 !== FALSE) {
             $retval .= "<img id='hamburger' src='$loc2' alt='Menu'/>";
@@ -71,13 +71,13 @@  discard block
 block discarded – undo
     public function divUserWelcome() {
         $retval = "
 <div id='user_welcome'> <!-- this information is shown just before the download -->
-    <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING] . "</strong>
+    <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING]."</strong>
     <p>
     <span id='download_info'>
     <!-- the empty href is dynamically exchanged with the actual path by jQuery at runtime -->
-        " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD] . "
+        " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD]."
     </span>
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING] . "
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING]."
     <br/>
     <br/>";
         switch (CONFIG_CONFASSISTANT['CONSORTIUM']['name']) {
@@ -87,11 +87,11 @@  discard block
 block discarded – undo
         }
         $retval .= "
     </p>
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE] . "
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS] . "
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE]."
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS]."
     </p>
     <p>
-    <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS] . "</strong></a>
+    <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS]."</strong></a>
     </p>
 </div> <!-- id='user_welcomer_page' -->
 ";
@@ -101,7 +101,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;
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
         }
         return "
 <div id='welcome_top1'>
-    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET] . "
+    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET]."
 </div>
 <div id='top_invite'>
-    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE] . $retval . "
+    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE].$retval."
 </div>";
     }
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
         $retval = "
 <div id='roller'>
     <div id='slides'>
-        <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY] . "</span>
+        <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY]."</span>
         <span id='line2'></span>
         <span id='line3'></span>
         <span id='line4'>";
@@ -177,9 +177,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>";
     }
 
@@ -193,7 +193,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;
@@ -207,7 +207,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) {
@@ -215,18 +215,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>";
@@ -240,15 +240,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'>
@@ -256,23 +256,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' -->";
     }
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
             </td>";
 
         if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) {
-            $retval .= "<td><a href='" . CONFIG['APPEARANCE']['privacy_notice_url'] . "'>" . sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</a></td>";
+            $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</a></td>";
         }
         $retval .= "<td>";
         if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam" && isset(CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo']) && CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo'] == "Operations Team") {

Please login to merge, or discard this patch.

web/skins/modern/copyright.php 1 patch

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

@@ -35,7 +35,7 @@
 block discarded – undo
             <div id="user_page" style="display:block">
                 <?php echo $divs->divPagetitle("eduroam CAT 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/modern/index.php 1 patch

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

@@ -43,10 +43,10 @@  discard block
 block discarded – undo
 $operatingSystem = $Gui->detectOS();
 $Gui->loggerInstance->debug(4, $operatingSystem);
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\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)) {
@@ -75,7 +75,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/modern/test.php 1 patch

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

@@ -28,9 +28,9 @@  discard block
 block discarded – undo
 ?>
 
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 
 <script type="text/javascript">
@@ -44,10 +44,10 @@  discard block
 block discarded – undo
 $operatingSystem = $Gui->detectOS();
 $Gui->loggerInstance->debug(4, $operatingSystem);
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\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
 if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
     $profile_list_size = 1;
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 include("user/js/cat_js.php");
 ?>
     var loading_ico = new Image();
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
 </script>
 <?php $Gui->langObject->setTextDomain("web_user"); ?>
 <!-- DiscoJuice -->
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
     front_page = 0;
     var lang = "<?php echo($Gui->langObject->getLang()) ?>";
 </script>
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 </head>
 <body>
 <div id="wrap">
@@ -77,14 +77,14 @@  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>
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
         </div>
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
         </div>
         <div id="main_body">

Please login to merge, or discard this patch.

web/admin/inc/manageNewInst.inc.php 1 patch

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

@@ -20,7 +20,7 @@  discard block
 block discarded – undo
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $uiElements = new \web\lib\admin\UIElements();
@@ -57,8 +57,8 @@  discard block
 block discarded – undo
 <?php
 echo sprintf(_("On this page, you can add a new %s to your %s. Please fill out the form below to send out an email invitation to the new %s administrator."), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed, $uiElements->nomenclatureInst);
 if (CONFIG['DB']['enforce-external-sync']) {
-    echo "<p>" . sprintf(_("You can either register a known %s (as defined in the %s database) or create a totally new %s."), $uiElements->nomenclatureInst, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclatureInst) . "</p>";
-    echo "<p>" . sprintf(_("The latter one is typically for an %s which is yet in a testing phase and therefore doesn't appear in the %s database yet."), $uiElements->nomenclatureInst, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</p>";    
+    echo "<p>".sprintf(_("You can either register a known %s (as defined in the %s database) or create a totally new %s."), $uiElements->nomenclatureInst, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclatureInst)."</p>";
+    echo "<p>".sprintf(_("The latter one is typically for an %s which is yet in a testing phase and therefore doesn't appear in the %s database yet."), $uiElements->nomenclatureInst, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</p>";    
 }
 ?>
 <hr/>
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
         <?php
         if (CONFIG['DB']['enforce-external-sync']) {
             echo "<tr><td>
-                <input type='radio' name='creation' value='existing'>" . _("Existing IdP:") . "</input>
+                <input type='radio' name='creation' value='existing'>" . _("Existing IdP:")."</input>
                      </td>";
 
             echo "<td colspan='2'>
                 <select id='externals' name='externals' onchange='document.sendinvite.creation[0].checked=true; document.sendinvite.mailaddr.value=this.options[this.selectedIndex].id;'>
-                    <option value='FREETEXT'>" . _("--- select IdP here ---") . "</option>";
+                    <option value='FREETEXT'>" . _("--- select IdP here ---")."</option>";
 
             foreach ($feds as $fed_value) {
                 $thefed = new \core\Federation(strtoupper($fed_value['value']));
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
                 $entities = $thefed->listExternalEntities(TRUE, \core\Federation::EDUROAM_DB_TYPE_IDP);
 
                 foreach ($entities as $v) {
-                    echo "<option id='" . $v['contactlist'] . "' value='" . $v['ID'] . "'>[" . $fed_value['value'] . "] " . $v['name'] . "</option>";
+                    echo "<option id='".$v['contactlist']."' value='".$v['ID']."'>[".$fed_value['value']."] ".$v['name']."</option>";
                 }
             }
 

Please login to merge, or discard this patch.

web/skins/modern/diag/diag.php 1 patch

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

@@ -40,16 +40,16 @@  discard block
 block discarded – undo
 
 <?php
 $profile_list_size = 1;
-require_once dirname(__DIR__) . '/Divs.php';
+require_once dirname(__DIR__).'/Divs.php';
 $divs = new Divs($Gui);
 $visibility = 'index';
 $operatingSystem = $Gui->detectOS();
 $Gui->loggerInstance->debug(4, $operatingSystem);
 $uiElements = new web\lib\admin\UIElements();
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
-require dirname(__DIR__) . '/user/js/cat_js.php';
+require dirname(__DIR__).'/user/js/cat_js.php';
 ?>
 
 </script>
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
     </div>
     <div id="main_body">
         <div id="user_page">
-            <?php echo $divs->divPagetitle(_("Diagnostics site") . " (<span style='color:red'>beta</span>)", ""); ?>
+            <?php echo $divs->divPagetitle(_("Diagnostics site")." (<span style='color:red'>beta</span>)", ""); ?>
             <div id="user_info" style='padding-top: 10px;'>
             <div id='diagnostic_choice'>
-                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!") . ' ' . _("Please help the system by answering the questions as precisely as possible.") . "<br/>" . _("Are you a") . ' '; ?>
-                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user") . ' ' . _("or"); ?>   
-                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator") .'?'; ?>
+                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!").' '._("Please help the system by answering the questions as precisely as possible.")."<br/>"._("Are you a").' '; ?>
+                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user").' '._("or"); ?>   
+                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator").'?'; ?>
             </div>
             <div id='diagnostic_enduser' style='display: none;'>
                 <h2><?php echo _("Tools for End Users"); ?></h2>
@@ -93,24 +93,24 @@  discard block
 block discarded – undo
                 ?>
                 </p>
                 <?php
-                    echo '<div id="before_stage_1"><h3>' . _("The system needs some information on your home institution - issuer of your account") . '</h3>';
+                    echo '<div id="before_stage_1"><h3>'._("The system needs some information on your home institution - issuer of your account").'</h3>';
                     echo _("What is the realm part of your user account (the part behind the @ of 'your.username@<b>realm.tld</b>):");
                 ?>
                 <input type='text' name='user_realm' id='user_realm' value=''>
                 <?php
-                    echo '<div id="realm_by_select"><br/>' . _("alternatively") . '<br/>';
-                    echo _("You can select your home institution from the following list") . '<br/>';
+                    echo '<div id="realm_by_select"><br/>'._("alternatively").'<br/>';
+                    echo _("You can select your home institution from the following list").'<br/>';
                     echo '<div id="select_idp_country"><a href="" id="idp_countries_list">';    
-                    echo '<span id="realmselect">' . _("Click to select your country/region and organisation") . '</span></a></div>';
+                    echo '<span id="realmselect">'._("Click to select your country/region and organisation").'</span></a></div>';
                 ?>
                 <div id="select_idp_area" style="display:none;">
                 </div>
                 </div>
                 <div id="position_info">
                     <?php
-                        echo '<h3>' . _("Optionally, to improve tests, you can provide information on your current location") . '</h3>';
+                        echo '<h3>'._("Optionally, to improve tests, you can provide information on your current location").'</h3>';
                         echo '<div id="select_sp_country"><a href="" id="sp_countries_list">';    
-                        echo '<span id="spselect">' . _("Click to select a location in which you have an eduroam problem") . '</span></a></div>';
+                        echo '<span id="spselect">'._("Click to select a location in which you have an eduroam problem").'</span></a></div>';
                     ?>
                     <div id="select_sp_area" style="display:none;">
                     </div>
@@ -143,9 +143,9 @@  discard block
 block discarded – undo
                             echo 'none';
                         }
                         echo ";'>";
-                        echo '<h3>' . _("Which problem are you reporting?") . '</h3>';
+                        echo '<h3>'._("Which problem are you reporting?").'</h3>';
                         echo '<input type="radio" name="problem_type" value="1">';
-                        echo _("SP contacting IdP due to technical problems or abuse") . '<br>';
+                        echo _("SP contacting IdP due to technical problems or abuse").'<br>';
                         echo '<input type="radio" name="problem_type" value="2">';
                         echo _("IdP contacting SP due to technical problems");
                         echo "<div id='idp_contact_area'></div>";
@@ -154,9 +154,9 @@  discard block
 block discarded – undo
                         echo "</div>"; 
                     } else {
                         echo "0\">";
-                        echo _("This service is for authenticated admins only.") . '<br>';
-                        echo "<a href=\"diag.php?admin=1\">" .
-                             _("eduroam® admin access is needed") . "</a>";
+                        echo _("This service is for authenticated admins only.").'<br>';
+                        echo "<a href=\"diag.php?admin=1\">".
+                             _("eduroam® admin access is needed")."</a>";
                     }
                 ?>
             </div> 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
         if (type === 'idp' || type === 'sp') {
             shtml = '<table><tbody><tr id="row_'+type+'_country"></tr>';
             shtml = shtml + '<tr id="row_'+type+'_institution" style="visibility: collapse;">';
-            shtml = shtml + '<td>' + <?php echo '"' . _("Select institiution:") . '"'; ?> + '</td><td></td></tr>';
+            shtml = shtml + '<td>' + <?php echo '"'._("Select institiution:").'"'; ?> + '</td><td></td></tr>';
             if (type === 'idp') {
                 shtml = shtml + '<tr id="row_idp_realm"></tr>';
             }
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
         var options = '';
         var selecthead = '';
         if (type1 === 'sp' || type1 === 'idp') {
-            selecthead = <?php echo '"<td>' . _("Select country or region:") . ' </td>"'; ?>;
+            selecthead = <?php echo '"<td>'._("Select country or region:").' </td>"'; ?>;
             selecthead = selecthead + '<td>\n';
         }
         var select = '<select id="' + type1 + '_country" name="' + type1 + '_country" style="margin-left:0px; width:400px;">';
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
             options = ($('#'+type2+'_country').html());
             countryAddSelect(selecthead, select + options + '</select>', type1);
         } else {
-            var comment = <?php echo '"<br><br>' . _("Fetching country/region list") . '..."'; ?>;
+            var comment = <?php echo '"<br><br>'._("Fetching country/region list").'..."'; ?>;
             inProgress(1, comment);
             $.ajax({
                 url: "findRealm.php",
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
         return false;
     }
     function testSociopath(realm, answer) {
-        var comment = <?php echo '"' . _("Testing realm") . '..."'; ?>; 
+        var comment = <?php echo '"'._("Testing realm").'..."'; ?>; 
         inProgress(1, comment);
         if ($('#tested_realm').length == 0) {
             $('<input>').attr({
@@ -275,9 +275,9 @@  discard block
 block discarded – undo
                                 query = '<input type="hidden" id="tested_realm" value="' + realm + '">';
                             }    
                             query = query + '<div id="current_query">'+data['TEXT']+'</div>';
-                            query = query + '<div><button id="answer_yes">' + <?php echo '"' . _("Yes") . '"'; ?> + '</button>';
-                            query = query + '<button style="margin-left:20px;" id="answer_no">' + <?php echo '"' . _("No") . '"'; ?> + '</button>';
-                            query = query + '<button style="margin-left:20px;" id="answer_noidea">' + <?php echo '"' . _("I don't know") . '"'; ?> + '</button></div>';
+                            query = query + '<div><button id="answer_yes">' + <?php echo '"'._("Yes").'"'; ?> + '</button>';
+                            query = query + '<button style="margin-left:20px;" id="answer_no">' + <?php echo '"'._("No").'"'; ?> + '</button>';
+                            query = query + '<button style="margin-left:20px;" id="answer_noidea">' + <?php echo '"'._("I don't know").'"'; ?> + '</button></div>';
                             $('#sociopath_queries').html(query);
                             $('#sociopath_query_area').show();
                         }
@@ -308,55 +308,55 @@  discard block
 block discarded – undo
        }); 
     }
     function finalVerdict(realm, verdict) {
-        var title = <?php echo '"' . _("Diagnostic tests results for selected realm") . '"'; ?>;
+        var title = <?php echo '"'._("Diagnostic tests results for selected realm").'"'; ?>;
         result = '<div class="padding">';
         result = result + '<div><h3>';
-        result = result + <?php echo '"' . _("The result for tested realm:") . ' "'; ?> + realm;
+        result = result + <?php echo '"'._("The result for tested realm:").' "'; ?> + realm;
         result = result + '</h3></p><div style="padding: 5px;"><div style="padding: 0px;">';
-        result = result + <?php echo '"' . _("The system identified") . '" '; ?>  + ' ';
+        result = result + <?php echo '"'._("The system identified").'" '; ?>  + ' ';
         result = result + Object.keys(verdict).length + ' ';
-        result = result + <?php echo '"' . _("suspected areas which potentially can cause a problem.") . '"'; ?> + '<br>';
-        result = result + <?php echo '"' . _("Next to the problem description we show a speculated probability of this event.") . '"'; ?>;
+        result = result + <?php echo '"'._("suspected areas which potentially can cause a problem.").'"'; ?> + '<br>';
+        result = result + <?php echo '"'._("Next to the problem description we show a speculated probability of this event.").'"'; ?>;
         result = result + '</div><div style="padding: 5px;"><table>';
         k = 1;
         for (key in verdict) {
             result = result + '<tr><td>' + k + '.</td>';
             k = k + 1;
             if (key === 'INFRA_DEVICE') {
-                result = result + '<td>' + <?php echo '"' . _("Your device configuration is broken") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("Your device configuration is broken").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_SP_80211') {
-                result = result + '<td>' + <?php echo '"' . _("The Wi-Fi network in your vicinity has quality issues") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The Wi-Fi network in your vicinity has quality issues").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_SP_LAN') {
-                result = result + '<td>' + <?php echo '"' . _("The network environment around you is broken") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The network environment around you is broken").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_SP_RADIUS') {
-                result = result + '<td>' + <?php echo '"' . _("The RADIUS server of your service provider is the source of the problem") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The RADIUS server of your service provider is the source of the problem").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_IDP_AUTHBACKEND') {
-                result = result + '<td>' + <?php echo '"' . _("The RADIUS server in your home institution is currently unable to authenticate you") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The RADIUS server in your home institution is currently unable to authenticate you").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_NRO_SP') {
-                result = result + '<td>' + <?php echo '"' . _("The national server in the country/region you are visiting is not functioning correctly") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The national server in the country/region you are visiting is not functioning correctly").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_LINK_ETLR_NRO_SP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between the national server of the country/region you are visiting and the top-level server is broken") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The link between the national server of the country/region you are visiting and the top-level server is broken").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_LINK_ETLR_NRO_IdP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between the national server of your home country/region and the top-level server is broken") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The link between the national server of your home country/region and the top-level server is broken").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_ETLR') {
-                result = result + '<td>' + <?php echo '"' . _("The communication to the top-level server is down") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The communication to the top-level server is down").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_NRO_IdP') {
-                result = result + '<td>' + <?php echo '"' . _("The national server in your home country/region is not functioning properly.") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The national server in your home country/region is not functioning properly.").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_IdP_RADIUS') {
-                result = result + '<td>' + <?php echo '"' . _("The RADIUS server of your home institution is the source of the problem") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The RADIUS server of your home institution is the source of the problem").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_NONEXISTENTREALM') {
-                result = result + '<td>' + <?php echo '"' . _("This realm does not exist") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("This realm does not exist").'"'; ?> + '</td>';
             }
             result = result + '<td style="padding-left: 5px;">' + (verdict[key] * 100).toFixed(2) + "%</td></tr>";
         }
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
         return false;
     });
     $(document).on('change', '#idp_country' , function() {
-        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
+        var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>;  
         var id = $(this).attr('id');
         var k = id.indexOf('_');
         var type = id.substr(0,k);
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
                         var shtml = '';
                         var select = '';
                         if (type !== 'asp') {
-                            shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>;
+                            shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>;
                         }
                         select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>';
                         for (var i in institutions) {
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
                     } else {
                         if (data.status === 0) {
                             inProgress(0);
-                            var msg = <?php echo '"' . _("The database does not contain the information needed to help you in realm selection for this country. You have to provide realm you are interested in.") . '"'; ?>;
+                            var msg = <?php echo '"'._("The database does not contain the information needed to help you in realm selection for this country. You have to provide realm you are interested in.").'"'; ?>;
                             alert(msg);
                             $('#select_idp_country').show();
                             $('#select_idp_area').hide();
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
                 },
                 error:function() {
                     inProgress(0);
-                    var msg = <?php echo '"' . _("Can not search database. You have to provide realm you are interested in.") . '"'; ?>;
+                    var msg = <?php echo '"'._("Can not search database. You have to provide realm you are interested in.").'"'; ?>;
                     alert(msg);
                     $('#select_idp_country').show();
                     $('#select_idp_area').hide();
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
         return false;
     });
     $(document).on('change', '#sp_country, #asp_country' , function() {
-        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
+        var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>;  
         var id = $(this).attr('id');
         var k = id.indexOf('_');
         var type = id.substr(0,k);
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
                         var shtml = '';
                         var select = '';
                         if (type !== 'asp') {
-                            shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>;
+                            shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>;
                         }
                         select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>';
                         for (var i in hotspots) {
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
                             inProgress(0);
                             var select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value="">';
                             var shtml = '<td></td><td>';
-                            select = select + <?php echo '"' . _("Other location") . '"'; ?> + '</option></select></td>';
+                            select = select + <?php echo '"'._("Other location").'"'; ?> + '</option></select></td>';
                             if (type !== 'asp') {
                                 $('#row_' + type + '_institution').html('');
                                 $('#row_' + type + '_institution').append(shtml + select);
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
             $('#start_test_area').hide();
             return false;
         }
-        var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>;
+        var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>;
         inProgress(1, comment);
         $.ajax({
             url: "findRealm.php",
@@ -618,7 +618,7 @@  discard block
 block discarded – undo
                     var realms = data.realms;
                     var realmselect = '';
                     if (realms.length > 1) {
-                        realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>;
+                        realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>;
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
                         for (var i in realms) {
                             realmselect = realmselect + '<input type="radio" name="realm" ';
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
                         }
                         realmselect = realmselect + '</span></td>';
                     } else {
-                        realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>;
+                        realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>;
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
                         realmselect = realmselect + realms[0] + '</span>';
                         realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">';
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
             });
             t = 1;
         }
-        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
+        var comment = <?php echo '"'._("Running realm tests").'..."'; ?>;
         inProgress(1, comment);
         /*waiting(comment);*/
         $.ajax({
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
                             }
                         });
                         $('#sp_questions > tbody').append('<tr class="error_row"><td>' +
-                                <?php echo '"' . _("Realm is not registered with the eduroam database:") . '"'; ?> +
+                                <?php echo '"'._("Realm is not registered with the eduroam database:").'"'; ?> +
                                 '</td><td>' + realm + '</td></tr>');
                         $('#admin_realm').val('');
                     }    
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
         testSociopath('', answer);
     });
     $('#realmtest').click(function(event){
-        var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>;
+        var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>;
         inProgress(1, comment);
         $('#start_test_area').hide();
         if ($('#select_sp_area').is(':hidden')) {
@@ -801,13 +801,13 @@  discard block
 block discarded – undo
                         reset_footer();
                         testSociopath(realm, 0);
                     } else {
-                        var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>;
-                        result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occured") . '"'; ?>;
+                        var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>;
+                        result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occured").'"'; ?>;
                         result = result + '</h3>'
                         if (r.length == 1) {
-                            result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>;
+                            result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>;
                         } else {    
-                            result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>;
+                            result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>;
                         }
                         result = result + ': '
                         for (var i=0; i < r.length; i++) {
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
                             result = result + r[i];
                         }
                         result = result + '.<br>';
-                        result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>';
+                        result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>';
                         result = result + '</div>';
                         $('#after_stage_1').hide();
                         $('#before_stage_1').show();
@@ -877,7 +877,7 @@  discard block
 block discarded – undo
                 });
             });
         });
-        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
+        var comment = <?php echo '"'._("Running realm tests").'..."'; ?>;
         inProgress(1, comment);
         $.ajax({
             url: "findRealm.php",
@@ -948,29 +948,29 @@  discard block
 block discarded – undo
             success:function(data) {
                 if (data.status === 1) {
                     var result = '';
-                    var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>;
+                    var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>;
                     result = '<div class="padding">';
                     if (type == 'idp_send') {
-                        result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>';
+                        result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>';
                         result = result + '<table>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("SP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("IdP email(s)") . '"'; ?> + '</td><td>' + data.idpcontact + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("SP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("IdP email(s)").'"'; ?> + '</td><td>' + data.idpcontact + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
                     }
                     if (type == 'sp_send') {
-                        result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>';
+                        result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>';
                         result = result + '<table>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
                     }
                     result = result + '</div>';
                     showInfo(result, title);
@@ -987,7 +987,7 @@  discard block
 block discarded – undo
         if ($('#mac').val().length > 0) {
             if ($('#mac').val().length != 17) {
                 $('#mac').addClass('error_input');
-                $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>);
+                $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>);
             } else {
                 $('#mac').removeClass('error_input'); 
                 $('#mac').attr('title', '');
@@ -996,7 +996,7 @@  discard block
 block discarded – undo
         if ($(this).attr('id') == 'email' &&  $(this).val().length > 0) {
             if (!isEmail($(this).val())) {
                 $('#email').addClass('error_input');
-                $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>);
+                $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>);
             } else {
                 $('#email').removeClass('error_input');
                 $('#email').attr('title', '');
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
         if ($(this).attr('id') == 'outer_id' &&  $(this).val().length > 0) {
             if (!isEmail($(this).val(), true)) {
                 $('#outer_id').addClass('error_input');
-                $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>);
+                $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>);
             } else {
                 $('#outer_id').removeClass('error_input');
                 $('#outer_id').attr('title', '');
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
         if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) {
             if (!isOperatorName($(this).val())) {
                 $('#opname').addClass('error_input');
-                $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>);
+                $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>);
                 $('#spmanually').show();
             } else {
                 $('#opname').removeClass('error_input');

Please login to merge, or discard this patch.

devices/Devices-template.php 1 patch

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

@@ -377,7 +377,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_pie' => [
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_oreo' => [
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_nougat' => [
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_marshmallow' => [
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_lollipop' => [
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_kitkat' => [
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_43' => [
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_legacy' => [

Please login to merge, or discard this patch.

web/diag/findRealm.php 1 patch

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

@@ -36,7 +36,7 @@
 block discarded – undo
  * @return boolean
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 // we are referring to $_SESSION later in the file
 CAT_session_start();

Please login to merge, or discard this patch.

		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32
33	33	namespace core;
34	34
35		-require_once dirname(__DIR__) . "/config/_config.php";
	35	+require_once dirname(__DIR__)."/config/_config.php";
36	36
37	37	CAT_session_start();
38	38
		@@ -105,19 +105,19 @@ discard block
		block discarded – undo
105	105	parent::__construct();
106	106	common\Entity::intoThePotatoes();
107	107
108		- $this->CAT_VERSION_STRING = sprintf(_("Unreleased %s Git Revision"),"<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
	108	+ $this->CAT_VERSION_STRING = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
109	109	if (CAT::RELEASE_VERSION) {
110		- $temp_version = "CAT-" . CAT::VERSION_MAJOR . "." . CAT::VERSION_MINOR;
111		- $branch = "release_" . CAT::VERSION_MAJOR . "_" . CAT::VERSION_MINOR;
	110	+ $temp_version = "CAT-".CAT::VERSION_MAJOR.".".CAT::VERSION_MINOR;
	111	+ $branch = "release_".CAT::VERSION_MAJOR."_".CAT::VERSION_MINOR;
112	112	if (CAT::VERSION_PATCH != 0) {
113		- $temp_version .= "." . CAT::VERSION_PATCH;
	113	+ $temp_version .= ".".CAT::VERSION_PATCH;
114	114	}
115	115	if (CAT::VERSION_EXTRA != "") {
116		- $temp_version .= "-" . CAT::VERSION_EXTRA;
	116	+ $temp_version .= "-".CAT::VERSION_EXTRA;
117	117	}
118		- $this->CAT_VERSION_STRING = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
	118	+ $this->CAT_VERSION_STRING = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
119	119	}
120		- $this->CAT_COPYRIGHT = CONFIG['APPEARANCE']['productname'] . " - " . $this->CAT_VERSION_STRING . " © " . CAT::COPYRIGHT_MIN_YEAR . "-" . CAT::COPYRIGHT_MAX_YEAR . " " . CAT::COPYRIGHT_HOLDER . "<br/>on behalf of " . CAT::COPYRIGHT_CONSORTIA . "; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
	120	+ $this->CAT_COPYRIGHT = CONFIG['APPEARANCE']['productname']." - ".$this->CAT_VERSION_STRING." © ".CAT::COPYRIGHT_MIN_YEAR."-".CAT::COPYRIGHT_MAX_YEAR." ".CAT::COPYRIGHT_HOLDER."<br/>on behalf of ".CAT::COPYRIGHT_CONSORTIA."; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
121	121
122	122
123	123	/* Federations are created in DB with bootstrapFederation, and listed via listFederations

		@@ -49,11 +49,11 @@ discard block
		block discarded – undo
49	49	$location = $this->Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png");
50	50	if ($location !== FALSE) {
51	51	$retval .= "<div id='cat_logo'>
52		- <a href='" . CONFIG_CONFASSISTANT['CONSORTIUM']['homepage'] . "'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
	52	+ <a href='" . CONFIG_CONFASSISTANT['CONSORTIUM']['homepage']."'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
53	53	<span>Configuration Assistant Tool</span>
54	54	</div>";
55	55	}
56		- $retval .= "<div id='motd'>" . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . "</div>";
	56	+ $retval .= "<div id='motd'>".(isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp')."</div>";
57	57	$loc2 = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png");
58	58	if ($loc2 !== FALSE) {
59	59	$retval .= "<img id='hamburger' src='$loc2' alt='Menu'/>";
		@@ -71,13 +71,13 @@ discard block
		block discarded – undo
71	71	public function divUserWelcome() {
72	72	$retval = "
73	73	<div id='user_welcome'> <!-- this information is shown just before the download -->
74		- <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING] . "</strong>
	74	+ <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING]."</strong>
75	75	<p>
76	76	<span id='download_info'>
77	77	<!-- the empty href is dynamically exchanged with the actual path by jQuery at runtime -->
78		- " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD] . "
	78	+ " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD]."
79	79	</span>
80		- <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING] . "
	80	+ <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING]."
81	81	<br/>
82	82	<br/>";
83	83	switch (CONFIG_CONFASSISTANT['CONSORTIUM']['name']) {
		@@ -87,11 +87,11 @@ discard block
		block discarded – undo
87	87	}
88	88	$retval .= "
89	89	</p>
90		- <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE] . "
91		- <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS] . "
	90	+ <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE]."
	91	+ <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS]."
92	92	</p>
93	93	<p>
94		- <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS] . "</strong></a>
	94	+ <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS]."</strong></a>
95	95	</p>
96	96	</div> <!-- id='user_welcomer_page' -->
97	97	";
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	public function divSilverbullet() {
102	102	$retval = "
103	103	<div id='silverbullet'>"
104		- . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
	104	+ . $this->Gui->textTemplates->templates[user\SB_GO_AWAY].
105	105	"</div>
106	106	";
107	107	return $retval;
		@@ -114,10 +114,10 @@ discard block
		block discarded – undo
114	114	}
115	115	return "
116	116	<div id='welcome_top1'>
117		- " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET] . "
	117	+ " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET]."
118	118	</div>
119	119	<div id='top_invite'>
120		- " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE] . $retval . "
	120	+ " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE].$retval."
121	121	</div>";
122	122	}
123	123
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	$retval = "
126	126	<div id='roller'>
127	127	<div id='slides'>
128		- <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY] . "</span>
	128	+ <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY]."</span>
129	129	<span id='line2'></span>
130	130	<span id='line3'></span>
131	131	<span id='line4'>";
		@@ -177,9 +177,9 @@ discard block
		block discarded – undo
177	177	public function divProfiles() {
178	178	return "
179	179	<div id='profiles'> <!-- this is the profile selection filled during run time -->
180		- <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . "
	180	+ <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
181	181	</div>" .
182		- "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
	182	+ "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
183	183	"</div>";
184	184	}
185	185
		@@ -193,7 +193,7 @@ discard block
		block discarded – undo
193	193	public function divInstitution($selectButton = TRUE) {
194	194	$retval = "<div id='institution_name'>
195	195	<span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
196		- ($selectButton ? "<a id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") .
	196	+ ($selectButton ? "<a id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
197	197	"</div>";
198	198	$retval .= $this->emptyImage('idp_logo', 'IdP Logo');
199	199	return $retval;
		@@ -207,7 +207,7 @@ discard block
		block discarded – undo
207	207	public function divOtherinstallers() {
208	208	$retval = "
209	209	<div class='sub_h'>
210		- <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "
	210	+ <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."
211	211	<table id='device_list' style='padding:0px;'>";
212	212
213	213	foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
		@@ -215,18 +215,18 @@ discard block
		block discarded – undo
215	215	$deviceIndex = 0;
216	216
217	217	$imgTag = "";
218		- $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png");
	218	+ $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png");
219	219	if ($imgLocation !== FALSE) {
220		- $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">';
	220	+ $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">';
221	221	}
222		- $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>';
	222	+ $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>';
223	223	foreach ($deviceGroup as $d => $D) {
224	224	if ($deviceIndex) {
225	225	$retval .= '<tr>';
226	226	}
227		- $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>"
228		- . "<div class='device_info' id='info_" . $d . "'></div></td>"
229		- . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
	227	+ $retval .= "<td><button id='".$d."'>".$D['display']."</button>"
	228	+ . "<div class='device_info' id='info_".$d."'></div></td>"
	229	+ . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n";
230	230	$deviceIndex++;
231	231	}
232	232	$retval .= "</tbody>";
		@@ -240,15 +240,15 @@ discard block
		block discarded – undo
240	240	}
241	241
242	242	public function divGuessOs($operatingSystem) {
243		- $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png");
	243	+ $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png");
244	244	$vendorstyle = "";
245	245	if ($vendorlogo !== FALSE) {
246		- $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'";
	246	+ $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'";
247	247	}
248	248	$deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png");
249	249	$deleteImg = "";
250	250	if ($deleteIcon !== FALSE) {
251		- $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >";
	251	+ $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >";
252	252	}
253	253	return "
254	254	<div class='sub_h' id='guess_os'>
		@@ -256,23 +256,23 @@ discard block
		block discarded – undo
256	256	<table id='browser'>
257	257	<tr>
258	258	<td>
259		- <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'>
	259	+ <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'>
260	260	$deleteImg
261		- <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . "
	261	+ <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]."
262	262	</div>
263	263	<div class='download_button_text'>" .
264		- $operatingSystem['display'] . "
	264	+ $operatingSystem['display']."
265	265	</div>
266	266	</button>
267		- <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div>
	267	+ <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div>
268	268	</td>
269	269	<td style='vertical-align:top'>
270		- <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button>
	270	+ <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button>
271	271	</td>
272	272	</tr>
273	273	</table> <!-- id='browser' -->
274	274	<div class='sub_h'>
275		- <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a>
	275	+ <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a>
276	276	</div>
277	277	</div> <!-- id='guess_os' -->";
278	278	}
		@@ -288,7 +288,7 @@ discard block
		block discarded – undo
288	288	</td>";
289	289
290	290	if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) {
291		- $retval .= "<td><a href='" . CONFIG['APPEARANCE']['privacy_notice_url'] . "'>" . sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</a></td>";
	291	+ $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</a></td>";
292	292	}
293	293	$retval .= "<td>";
294	294	if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam" && isset(CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo']) && CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo'] == "Operations Team") {

		@@ -35,7 +35,7 @@
		block discarded – undo
35	35	<div id="user_page" style="display:block">
36	36	<?php echo $divs->divPagetitle("eduroam CAT 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>

		@@ -43,10 +43,10 @@ discard block
		block discarded – undo
43	43	$operatingSystem = $Gui->detectOS();
44	44	$Gui->loggerInstance->debug(4, $operatingSystem);
45	45	if ($operatingSystem) {
46		- print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
	46	+ print "recognisedOS = '".$operatingSystem['device']."';\n";
47	47	}
48	48
49		-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
	49	+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
50	50	//TODO modify this based on OS detection
51	51	$userAgent = $_SERVER['HTTP_USER_AGENT'] ?? "";
52	52	if (preg_match('/Android/', $userAgent)) {
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	<?php echo $divs->divHeading($visibility); ?>
76	76	<div id="main_page">
77	77	<div id="loading_ico">
78		- <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
	78	+ <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
79	79	</div>
80	80	<div id="info_overlay"> <!-- device info -->
81	81	<div id="info_window"></div>

		@@ -28,9 +28,9 @@ discard block
		block discarded – undo
28	28	?>
29	29
30	30	<!-- JQuery -->
31		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
32		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
33		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
	31	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
	32	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
	33	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
34	34	<!-- JQuery -->
35	35
36	36	<script type="text/javascript">
		@@ -44,10 +44,10 @@ discard block
		block discarded – undo
44	44	$operatingSystem = $Gui->detectOS();
45	45	$Gui->loggerInstance->debug(4, $operatingSystem);
46	46	if ($operatingSystem) {
47		- print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
	47	+ print "recognisedOS = '".$operatingSystem['device']."';\n";
48	48	}
49	49
50		-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
	50	+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
51	51	//TODO modify this based on OS detection
52	52	if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
53	53	$profile_list_size = 1;
		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	include("user/js/cat_js.php");
59	59	?>
60	60	var loading_ico = new Image();
61		- loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
	61	+ loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
62	62	</script>
63	63	<?php $Gui->langObject->setTextDomain("web_user"); ?>
64	64	<!-- DiscoJuice -->
		@@ -67,9 +67,9 @@ discard block
		block discarded – undo
67	67	front_page = 0;
68	68	var lang = "<?php echo($Gui->langObject->getLang()) ?>";
69	69	</script>
70		-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
	70	+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
71	71	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
72		-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
	72	+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
73	73	</head>
74	74	<body>
75	75	<div id="wrap">
		@@ -77,14 +77,14 @@ discard block
		block discarded – undo
77	77	<?php echo $divs->divHeading($visibility); ?>
78	78	<div id="main_page">
79	79	<div id="loading_ico">
80		- <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
	80	+ <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
81	81	</div>
82	82	<div id="info_overlay"> <!-- device info -->
83	83	<div id="info_window"></div>
84		- <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
	84	+ <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
85	85	</div>
86	86	<div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
87		- <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
	87	+ <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
88	88	<div id="main_menu_content"></div>
89	89	</div>
90	90	<div id="main_body">

		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	*/
21	21	?>
22	22	<?php
23		-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
	23	+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
24	24
25	25	$auth = new \web\lib\admin\Authentication();
26	26	$uiElements = new \web\lib\admin\UIElements();
		@@ -57,8 +57,8 @@ discard block
		block discarded – undo
57	57	<?php
58	58	echo sprintf(_("On this page, you can add a new %s to your %s. Please fill out the form below to send out an email invitation to the new %s administrator."), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed, $uiElements->nomenclatureInst);
59	59	if (CONFIG['DB']['enforce-external-sync']) {
60		- echo "<p>" . sprintf(_("You can either register a known %s (as defined in the %s database) or create a totally new %s."), $uiElements->nomenclatureInst, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclatureInst) . "</p>";
61		- echo "<p>" . sprintf(_("The latter one is typically for an %s which is yet in a testing phase and therefore doesn't appear in the %s database yet."), $uiElements->nomenclatureInst, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</p>";
	60	+ echo "<p>".sprintf(_("You can either register a known %s (as defined in the %s database) or create a totally new %s."), $uiElements->nomenclatureInst, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclatureInst)."</p>";
	61	+ echo "<p>".sprintf(_("The latter one is typically for an %s which is yet in a testing phase and therefore doesn't appear in the %s database yet."), $uiElements->nomenclatureInst, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</p>";
62	62	}
63	63	?>
64	64	<hr/>
		@@ -68,12 +68,12 @@ discard block
		block discarded – undo
68	68	<?php
69	69	if (CONFIG['DB']['enforce-external-sync']) {
70	70	echo "<tr><td>
71		- <input type='radio' name='creation' value='existing'>" . _("Existing IdP:") . "</input>
	71	+ <input type='radio' name='creation' value='existing'>" . _("Existing IdP:")."</input>
72	72	</td>";
73	73
74	74	echo "<td colspan='2'>
75	75	<select id='externals' name='externals' onchange='document.sendinvite.creation[0].checked=true; document.sendinvite.mailaddr.value=this.options[this.selectedIndex].id;'>
76		- <option value='FREETEXT'>" . _("--- select IdP here ---") . "</option>";
	76	+ <option value='FREETEXT'>" . _("--- select IdP here ---")."</option>";
77	77
78	78	foreach ($feds as $fed_value) {
79	79	$thefed = new \core\Federation(strtoupper($fed_value['value']));
		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82	$entities = $thefed->listExternalEntities(TRUE, \core\Federation::EDUROAM_DB_TYPE_IDP);
83	83
84	84	foreach ($entities as $v) {
85		- echo "<option id='" . $v['contactlist'] . "' value='" . $v['ID'] . "'>[" . $fed_value['value'] . "] " . $v['name'] . "</option>";
	85	+ echo "<option id='".$v['contactlist']."' value='".$v['ID']."'>[".$fed_value['value']."] ".$v['name']."</option>";
86	86	}
87	87	}
88	88

		@@ -377,7 +377,7 @@ discard block
		block discarded – undo
377	377	"eduroamCAT",
378	378	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
379	379	"<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
380		- "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
	380	+ "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
381	381	],
382	382	],
383	383	'android_pie' => [
		@@ -392,7 +392,7 @@ discard block
		block discarded – undo
392	392	"eduroamCAT",
393	393	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
394	394	"<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
395		- "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
	395	+ "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
396	396	],
397	397	],
398	398	'android_oreo' => [
		@@ -407,7 +407,7 @@ discard block
		block discarded – undo
407	407	"eduroamCAT",
408	408	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
409	409	"<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
410		- "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
	410	+ "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
411	411	],
412	412	],
413	413	'android_nougat' => [
		@@ -422,7 +422,7 @@ discard block
		block discarded – undo
422	422	"eduroamCAT",
423	423	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
424	424	"<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
425		- "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
	425	+ "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
426	426	],
427	427	],
428	428	'android_marshmallow' => [
		@@ -437,7 +437,7 @@ discard block
		block discarded – undo
437	437	"eduroamCAT",
438	438	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
439	439	"<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
440		- "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
	440	+ "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
441	441	],
442	442	],
443	443	'android_lollipop' => [
		@@ -452,7 +452,7 @@ discard block
		block discarded – undo
452	452	"eduroamCAT",
453	453	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
454	454	"<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
455		- "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
	455	+ "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
456	456	],
457	457	],
458	458	'android_kitkat' => [
		@@ -467,7 +467,7 @@ discard block
		block discarded – undo
467	467	"eduroamCAT",
468	468	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
469	469	"<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
470		- "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
	470	+ "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
471	471	],
472	472	],
473	473	'android_43' => [
		@@ -482,7 +482,7 @@ discard block
		block discarded – undo
482	482	"eduroamCAT",
483	483	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
484	484	"<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
485		- "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
	485	+ "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
486	486	],
487	487	],
488	488	'android_legacy' => [

		@@ -36,7 +36,7 @@
		block discarded – undo
36	36	* @return boolean
37	37	*/
38	38
39		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	39	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
40	40
41	41	// we are referring to $_SESSION later in the file
42	42	CAT_session_start();

GEANT / CAT

Push — release_2_0 ( c27090...f474b2 )

Status

Category

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

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

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

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

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

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

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

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

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