View GitHub Repository CAT

Schedule Inspection
Subscribe
Passed
Push — release_2_0 ( aff697...948471 )
by Stefan
08:18
created
Status
Category
Toggle Patches
web/user/devel.inc.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -19,13 +19,13 @@
 
 block discarded – undo
19 19 
  *          <base_url>/copyright.php after deploying the software
20 20 
  */
21 21
22 
-$out = "<h3>" . _("Access the sources") . "</h3>" .
23 
-        sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), CONFIG['APPEARANCE']['productname'], "https://github.com/GEANT/CAT" ) .
24 
-        "<h3>" . _("Join the developers mailing list.") . "</h3>" .
25 
-        sprintf(_("The list is available at: %s"), CONFIG['APPEARANCE']['support-contact']['display']) .
26 
-        "<h3>" . _("Add a translation") . "</h3>" .
27 
-        _("If you would like to add a new language to CAT then please contact us ...") .
28 
-        "<h3><a href='" . \core\CAT::getRootUrlPath() . "/apidoc' target='_blank'>". _("Documentation") . "</a></h3>" ;
22 
+$out = "<h3>"._("Access the sources")."</h3>".
23 
+        sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), CONFIG['APPEARANCE']['productname'], "https://github.com/GEANT/CAT").
24 
+        "<h3>"._("Join the developers mailing list.")."</h3>".
25 
+        sprintf(_("The list is available at: %s"), CONFIG['APPEARANCE']['support-contact']['display']).
26 
+        "<h3>"._("Add a translation")."</h3>".
27 
+        _("If you would like to add a new language to CAT then please contact us ...").
28 
+        "<h3><a href='".\core\CAT::getRootUrlPath()."/apidoc' target='_blank'>"._("Documentation")."</a></h3>";
29 29
30 30
31 31
Please login to merge, or discard this patch.
web/user/tou.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -19,7 +19,7 @@
 
 block discarded – undo
19 19 
  *          <base_url>/copyright.php after deploying the software
20 20 
  */
21 21
22 
-        $Tou =  [
22 
+        $Tou = [
23 23 
     'title' => _("Terms of Use"),
24 24 
     'subtitle' => _("(for legal reasons, the Terms of Use are in English only)"),
25 25 
     'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam
Please login to merge, or discard this patch.
web/4013.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -26,7 +26,7 @@  discard block
 
 block discarded – undo
26 26 
  * @package UserGUI
27 27 
  */
28 28 
 error_reporting(E_ALL | E_STRICT);
29 
-require dirname(dirname(__FILE__)) . "/config/_config.php";
29 
+require dirname(dirname(__FILE__))."/config/_config.php";
30 30
31 31 
 $langObject = new \core\common\Language();
32 32 
 $langObject->setTextDomain("web_user");
 
@@ -39,24 +39,24 @@  discard block
 
 block discarded – undo
39 39 
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
40 40 
     <div id="heading">
41 41 
         <?php
42 
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
43 
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
44 
-        print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
45 
-<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
42 
+        print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
43 
+        print '<div id="motd">'.(isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp').'</div>';
44 
+        print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']).'</h1>
45 
+<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'].'</h2>';
46 46 
         echo '<table id="lang_select"><tr><td>';
47 47 
         echo _("View this page in");
48 48 
         ?>
49 49 
         <?php
50 50 
         foreach (CONFIG['LANGUAGES'] as $lang => $value) {
51 
-            echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> ";
51 
+            echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> ";
52 52 
         }
53 
-        echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>';
53 
+        echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>';
54 54 
         ?>
55 55 
     </div> <!-- id="heading" -->
56 56 
     <div id="main_body" style='padding:20px;'>
57 
-        <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1>
58 
-        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as");?></p>
57 
+        <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1>
58 
+        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as"); ?></p>
59 59 
         <h2>401/403</h2>
60 
-        <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang())?></p>
60 
+        <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang())?></p>
61 61 
     </div>
62 62 
         <?php echo $deco->footer();
Please login to merge, or discard this patch.
web/admin/edit_user.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -19,7 +19,7 @@
 
 block discarded – undo
19 19 
  *          <base_url>/copyright.php after deploying the software
20 20 
  */
21 21
22 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
22 
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23 23
24 24 
 $deco = new \web\lib\admin\PageDecoration();
25 25 
 $uiElements = new web\lib\admin\UIElements();
Please login to merge, or discard this patch.
web/admin/logout_check.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
19 19 
  *          <base_url>/copyright.php after deploying the software
20 20 
  */
21 21
22 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
22 
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23 23 
 require_once CONFIG['AUTHENTICATION']['ssp-path-to-autoloader'];
24 24
25 25 
 $deco = new \web\lib\admin\PageDecoration();
 
@@ -38,13 +38,13 @@  discard block
 
 block discarded – undo
38 38 
     if ($cutoff !== FALSE) {
39 39 
         $substring = substr($_SERVER['PHP_SELF'], 0, $cutoff);
40 40 
         if ($substring !== FALSE) {
41 
-            $url = "//" . htmlspecialchars($_SERVER['SERVER_NAME']) . $substring;
41 
+            $url = "//".htmlspecialchars($_SERVER['SERVER_NAME']).$substring;
42 42 
         }
43 43 
     }
44 44 
     header("Location: $url");
45 45 
 } else {
46 46 
     /* Logout failed. Tell the user to close the browser. */
47 47 
     echo $deco->pageheader(_("Incomplete Logout"), "ADMIN", FALSE);
48 
-    echo "<p>" . _("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.") . "</p>";
48 
+    echo "<p>"._("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.")."</p>";
49 49 
     echo $deco->footer();
50 50 
 }
Please login to merge, or discard this patch.
web/admin/inc/option_xhr.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -19,7 +19,7 @@
 
 block discarded – undo
19 19 
  *          <base_url>/copyright.php after deploying the software
20 20 
  */
21 21
22 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
22 
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
23 23
24 24 
 CAT_session_start();
25 25
Please login to merge, or discard this patch.
web/admin/inc/manageAdmins.inc.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -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 
 $languageInstance = new \core\common\Language();
 
@@ -82,7 +82,7 @@  discard block
 
 block discarded – undo
82 82 
                 $ownermgmt = new \core\UserManagement();
83 83 
                 $ownermgmt->addAdminToIdp($my_inst, $_SESSION['user']);
84 84 
             } else {
85 
-                echo "Fatal Error: you wanted to take control over an " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", but are not a " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " operator!";
85 
+                echo "Fatal Error: you wanted to take control over an ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", but are not a ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." operator!";
86 86 
                 exit(1);
87 87 
             }
88 88 
             break;
 
@@ -118,7 +118,7 @@  discard block
 
 block discarded – undo
118 118 
                 default:
119 119 
                     throw new Exception("Error: unknown encryption status of invitation!?!");
120 120 
             }
121 
-            echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter) . " " . $cryptText, _("Sent successfully."));
121 
+            echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter)." ".$cryptText, _("Sent successfully."));
122 122 
             break;
123 123 
         case "FAILURE":
124 124 
             echo $uiElements->boxError(_("No invitation email could be sent!"), _("Sending failure!"));
 
@@ -138,7 +138,7 @@  discard block
 
 block discarded – undo
138 138 
                 default:
139 139 
                     throw new Exception("Error: unknown encryption status of invitation!?!");
140 140 
             }
141 
-            echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter) . " " . $cryptText, _("Partial success."));
141 
+            echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter)." ".$cryptText, _("Partial success."));
142 142 
             break;
143 143 
         case "INVALIDSYNTAX":
144 144 
             echo $uiElements->boxError(_("The invitation email address was malformed, no invitation was sent!"), _("The invitation email address was malformed, no invitation was sent!"));
 
@@ -186,9 +186,9 @@  discard block
 
 block discarded – undo
186 186
187 187 
         echo "</td>
188 188 
               <td>
189 
-                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ) . " accept-charset='UTF-8'>
190 
-                <input type='hidden' name='admin_id' value='" . $oneowner['ID'] . "'></input>
191 
-                <button type='submit' name='submitbutton' class='delete' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Delete Administrator") . "</button>
189 
+                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier."' method='post' ".($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "")." accept-charset='UTF-8'>
190 
+                <input type='hidden' name='admin_id' value='" . $oneowner['ID']."'></input>
191 
+                <button type='submit' name='submitbutton' class='delete' value='" . web\lib\common\FormElements::BUTTON_DELETE."'>"._("Delete Administrator")."</button>
192 192 
                 </form>
193 193 
               </td>
194 194 
             </tr>";
 
@@ -202,10 +202,10 @@  discard block
 
 block discarded – undo
202 202 
 $loggerInstance = new \core\common\Logging();
203 203 
 $loggerInstance->debug(4, "Displaying pending invitations for $my_inst->identifier.\n");
204 204 
 if (count($pending_invites) > 0) {
205 
-    echo "<strong>" . _("Pending invitations for this IdP") . "</strong>";
205 
+    echo "<strong>"._("Pending invitations for this IdP")."</strong>";
206 206 
     echo "<table>";
207 207 
     foreach ($pending_invites as $invitee) {
208 
-        echo "<tr><td>" . $invitee['mail'] . "</td><td>".sprintf(_("(expires %s)"), $invitee['expiry'])."</td></tr>";
208 
+        echo "<tr><td>".$invitee['mail']."</td><td>".sprintf(_("(expires %s)"), $invitee['expiry'])."</td></tr>";
209 209 
     }
210 210 
     echo "</table>";
211 211 
 }
 
@@ -227,7 +227,7 @@  discard block
 
 block discarded – undo
227 227
228 228 
     if (!$is_admin_himself) {
229 229 
         echo "<form action='inc/manageAdmins.inc.php?inst_id=$my_inst->identifier' method='post' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
230 
-    <button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_TAKECONTROL . "'>" . sprintf(_("Take control of this %s"), $uiElements->nomenclatureInst) . "</button>
230 
+    <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_TAKECONTROL."'>".sprintf(_("Take control of this %s"), $uiElements->nomenclatureInst)."</button>
231 231 
 </form>";
232 232 
     }
233 233 
 }
Please login to merge, or discard this patch.
web/admin/inc/toggleRedirect.inc.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
19 19 
  *          <base_url>/copyright.php after deploying the software
20 20 
  */
21 21
22 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
22 
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
23 23
24 24 
 $auth = new \web\lib\admin\Authentication();
25 25 
 $loggerInstance = new \core\common\Logging();
 
@@ -85,7 +85,7 @@  discard block
 
 block discarded – undo
85 85 
         $remaining_attribs = $my_profile->beginFlushMethodLevelAttributes($eaptype->getIntegerRep(), NULL);
86 86 
         $optionParser->processSubmittedFields($my_profile, $_POST, $_FILES, $eaptype->getIntegerRep(), NULL);
87 87 
     }
88 
-    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $my_profile->identifier . " - device/EAP-Type settings changed");
88 
+    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$my_profile->identifier." - device/EAP-Type settings changed");
89 89 
     header("Location: ../overview_installers.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier");
90 90 
     exit;
91 91 
 }
 
@@ -99,7 +99,7 @@  discard block
 
 block discarded – undo
99 99 
     }
100 100 
     $captiontext = sprintf(_("device <strong>%s</strong>"), $device['display']);
101 101 
     $keyword = "device-specific";
102 
-    $extrainput = "<input type='hidden' name='device' value='" . $device_key . "'/>";
102 
+    $extrainput = "<input type='hidden' name='device' value='".$device_key."'/>";
103 103 
 } elseif ($eaptype !== NULL) {
104 104 
     foreach ($my_profile->getAttributes() as $attrib) {
105 105 
         if (isset($attrib['eapmethod']) && $attrib['eapmethod'] == $eaptype->getArrayRep()) {
 
@@ -109,12 +109,12 @@  discard block
 
 block discarded – undo
109 109
110 110 
     $captiontext = sprintf(_("EAP-Type <strong>%s</strong>"), $eaptype->getPrintableRep());
111 111 
     $keyword = "eap-specific";
112 
-    $extrainput = "<input type='hidden' name='eaptype' value='" . $eaptype->getIntegerRep() . "'>";
112 
+    $extrainput = "<input type='hidden' name='eaptype' value='".$eaptype->getIntegerRep()."'>";
113 113 
 } else {
114 114 
     throw new Exception("previous type checks make it impossible to reach this code path.");
115 115 
 }
116 116 
 ?>
117 
-<p><?php echo _("Fine-tuning options for ") . $captiontext; ?></p>
117 
+<p><?php echo _("Fine-tuning options for ").$captiontext; ?></p>
118 118 
 <hr/>
119 119
120 120 
 <form action='inc/toggleRedirect.inc.php?inst_id=<?php echo $my_inst->identifier; ?>&amp;profile_id=<?php echo $my_profile->identifier; ?>' method='post' accept-charset='UTF-8'><?php echo $extrainput; ?>
 
@@ -123,7 +123,7 @@  discard block
 
 block discarded – undo
123 123 
     $interesting_attribs = [];
124 124
125 125 
     foreach ($attribs as $attrib) {
126 
-        if ($attrib['level'] == "Method" && preg_match('/^' . $keyword . ':/', $attrib['name'])) {
126 
+        if ($attrib['level'] == "Method" && preg_match('/^'.$keyword.':/', $attrib['name'])) {
127 127 
             $interesting_attribs[] = $attrib;
128 128 
         }
129 129 
     }
Please login to merge, or discard this patch.
web/admin/inc/logout.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -20,7 +20,7 @@
 
 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
Please login to merge, or discard this patch.