Test Setup Failed
Push — master ( 499243...624c0d )
by Maja
05:54
created
web/admin/action_enrollment.php 2 patches
Switch Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -49,14 +49,14 @@
 block discarded – undo
49 49
 }
50 50
 
51 51
 switch ($_GET['token']) {
52
-    case "SELF-REGISTER":
53
-        $token = "SELF-REGISTER";
54
-        $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW;
55
-        $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration'];
56
-        break;
57
-    default:
58
-        $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING));
59
-        $checkval = $usermgmt->checkTokenValidity($token);
52
+        case "SELF-REGISTER":
53
+            $token = "SELF-REGISTER";
54
+            $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW;
55
+            $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration'];
56
+            break;
57
+        default:
58
+            $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING));
59
+            $checkval = $usermgmt->checkTokenValidity($token);
60 60
 }
61 61
 
62 62
 if ($checkval < 0) {
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 ?>
31 31
 <?php
32 32
 
33
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
33
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
34 34
 
35 35
 $auth = new \web\lib\admin\Authentication();
36 36
 $deco = new \web\lib\admin\PageDecoration();
@@ -41,11 +41,11 @@  discard block
 block discarded – undo
41 41
 $auth->authenticate();
42 42
 
43 43
 if (!isset($_GET['token'])) {
44
-    $elements->errorPage(_("Error creating new IdP binding!"),_("This page needs to be called with a valid invitation token!"));
44
+    $elements->errorPage(_("Error creating new IdP binding!"), _("This page needs to be called with a valid invitation token!"));
45 45
 }
46 46
 
47 47
 if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL && $_GET['token'] == "SELF-REGISTER") {
48
-    $elements->errorPage(_("Error creating new IdP binding!"),_("You tried to register in self-service, but this deployment does not allow self-service!"));
48
+    $elements->errorPage(_("Error creating new IdP binding!"), _("You tried to register in self-service, but this deployment does not allow self-service!"));
49 49
 }
50 50
 
51 51
 switch ($_GET['token']) {
@@ -55,22 +55,22 @@  discard block
 block discarded – undo
55 55
         $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration'];
56 56
         break;
57 57
     default:
58
-        $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING));
58
+        $token = $validator->token(filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING));
59 59
         $checkval = $usermgmt->checkTokenValidity($token);
60 60
 }
61 61
 
62 62
 if ($checkval < 0) {
63 63
     echo $deco->pageheader(_("Error creating new IdP binding!"), "ADMIN-IDP");
64
-    echo "<h1>" . _("Error creating new IdP binding!") . "</h1>";
64
+    echo "<h1>"._("Error creating new IdP binding!")."</h1>";
65 65
     switch ($checkval) {
66 66
         case \core\UserManagement::TOKENSTATUS_FAIL_ALREADYCONSUMED:
67
-            echo "<p>" . sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureInst) . "</p>";
67
+            echo "<p>".sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureInst)."</p>";
68 68
             break;
69 69
         case \core\UserManagement::TOKENSTATUS_FAIL_EXPIRED:
70
-            echo "<p>" . sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed) . "</p>";
70
+            echo "<p>".sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed)."</p>";
71 71
             break;
72 72
         default:
73
-            echo "<p>" . _("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.") . "</p>";
73
+            echo "<p>"._("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.")."</p>";
74 74
     }
75 75
     echo $deco->footer();
76 76
     throw new Exception("Terminating because something is wrong with the token we received.");
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
     case "SELF-REGISTER":
86 86
         $fed = new \core\Federation($federation);
87 87
         $newidp = new \core\IdP($fed->newIdP(core\IdP::TYPE_IDPSP, $user, "FED", "SELFSERVICE"));
88
-        $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - selfservice registration");
88
+        $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - selfservice registration");
89 89
         break;
90 90
     default:
91 91
         $newidp = $usermgmt->createIdPFromToken($token, $user);
92 92
         $usermgmt->invalidateToken($token);
93
-        $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - Token used and invalidated");
93
+        $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - Token used and invalidated");
94 94
         break;
95 95
 }
96 96
 
Please login to merge, or discard this patch.
web/user/tou.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
     they are from the same user group. You are not allowed to share them to an unlimited
63 63
     audience (e.g. on a publicly accessible web server).</li>
64 64
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
65
-your own <?php echo \config\ConfAssistant::CONSORTIUM['nomenclature_institution'];?> end users, e.g. on the support web pages of your <?php echo \config\ConfAssistant::CONSORTIUM['nomenclature_institution'];?>, on Welcome Package CDs or USB sticks, etc.</li>
65
+your own <?php echo \config\ConfAssistant::CONSORTIUM['nomenclature_institution']; ?> end users, e.g. on the support web pages of your <?php echo \config\ConfAssistant::CONSORTIUM['nomenclature_institution']; ?>, on Welcome Package CDs or USB sticks, etc.</li>
66 66
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
67 67
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
68 68
 </ul>
Please login to merge, or discard this patch.
core/SilverbulletInvitation.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         $this->activationsTotal = $invitationRow->quantity;
146 146
         $certificatesResult = $this->databaseHandle->exec("SELECT `serial_number`, `ca_type` FROM `silverbullet_certificate` WHERE `silverbullet_invitation_id` = ? ORDER BY `revocation_status`, `expiry` DESC", "i", $this->identifier);
147 147
         $certificatesNumber = ($certificatesResult ? $certificatesResult->num_rows : 0);
148
-        $this->loggerInstance->debug(5, "At token validation level, " . $certificatesNumber . " certificates exist.\n");
148
+        $this->loggerInstance->debug(5, "At token validation level, ".$certificatesNumber." certificates exist.\n");
149 149
         // SELECT -> resource, no boolean
150 150
         while ($runner = mysqli_fetch_object(/** @scrutinizer ignore-type */ $certificatesResult)) {
151 151
             $this->associatedCertificates[] = new \core\SilverbulletCertificate($runner->serial_number, $runner->ca_type);
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
                 throw new Exception("Uh. Something went seriously wrong with URL path mangling.");
205 205
             }
206 206
         }
207
-        $link = $link . $relPath;
207
+        $link = $link.$relPath;
208 208
 
209 209
         if (preg_match('/admin$/', $link)) {
210 210
             $link = substr($link, 0, -6);
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
             }
214 214
         }
215 215
 
216
-        return $link . '/accountstatus/accountstatus.php?token=' . $this->invitationTokenString;
216
+        return $link.'/accountstatus/accountstatus.php?token='.$this->invitationTokenString;
217 217
     }
218 218
 
219 219
     /**
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
         $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."), \config\ConfAssistant::CONSORTIUM['display_name']);
241 241
         $text .= " ";
242 242
         $text .= sprintf(_("Please follow the following link with the device you want to enable for %s to get a custom %s installation program just for you. You can click on the link, copy and paste it into a browser or scan the attached QR code."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']);
243
-        $text .= "\n\n" . $this->link() . "\n\n"; // gets replaced with the token value by getBody()
243
+        $text .= "\n\n".$this->link()."\n\n"; // gets replaced with the token value by getBody()
244 244
         $text .= sprintf(_("Please keep this email or bookmark this link for future use. After picking up your %s installation program, you can use the same link to get status information about your %s account."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']);
245 245
         $text .= "\n\n";
246 246
         $text .= _("Regards,");
Please login to merge, or discard this patch.
utils/notify_invitation_expiry.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 // please run this as a cron job every hour
23 23
 
24
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
24
+require_once dirname(dirname(__FILE__))."/config/_config.php";
25 25
 
26 26
 // iterate through all federations and see if there are recently expired 
27 27
 // invitations for any of them
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     $admins = $this_fed->listFederationAdmins();
56 56
     $mailtext = "Hello,
57 57
 
58
-invitation tokens for the following new ". \config\ConfAssistant::CONSORTIUM['nomenclature_institution'] ." have recently expired:
58
+invitation tokens for the following new ". \config\ConfAssistant::CONSORTIUM['nomenclature_institution']." have recently expired:
59 59
 
60 60
 ";
61 61
     foreach ($listofinstnames as $instname) {
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
     if ($numberofexistingidps > 0) {
66 66
         $mailtext .= "
67 67
 
68
-Additionally, $numberofexistingidps invitations for an existing ". \config\ConfAssistant::CONSORTIUM['nomenclature_institution']." have expired.
68
+Additionally, $numberofexistingidps invitations for an existing ".\config\ConfAssistant::CONSORTIUM['nomenclature_institution']." have expired.
69 69
         ";
70 70
     }
71 71
     $mailtext .= "
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 Greetings,
75 75
 
76
-A humble " . \config\Master::APPEARANCE['productname'] . " cron job
76
+A humble " . \config\Master::APPEARANCE['productname']." cron job
77 77
 ";
78 78
 
79 79
     foreach ($admins as $admin) {
Please login to merge, or discard this patch.
config/Master-template.php 2 patches
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,6 @@
 block discarded – undo
148 148
          *    mails, just configure the signing cert with these parameters. All must
149 149
          *    be non-NULL for signing to happen. If you don't need a keypass, make 
150 150
          *    it an empty string instead.
151
-
152 151
          * @var array
153 152
          */
154 153
         const MAILSETTINGS = [// we always use Submission
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
                 'db' => 'cat',
216 216
                 'user' => 'kitty',
217 217
                 'pass' => 'somepass',
218
-                'readonly' => FALSE,],
218
+                'readonly' => FALSE, ],
219 219
             // this DB stores diagnostics data. The connection details can be
220 220
             // identical to INST as there is no table overlap
221 221
             'DIAGNOSTICS' => [
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
                 'db' => 'cat',
224 224
                 'user' => 'kitty',
225 225
                 'pass' => 'somepass',
226
-                'readonly' => FALSE,],
226
+                'readonly' => FALSE, ],
227 227
             // this slice of DB user is about the downloads table. The corresponding
228 228
             // DB user should have write access to update statistics and the cache
229 229
             // locations of installers. 
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
                 'db' => 'cat',
234 234
                 'user' => 'kitty',
235 235
                 'pass' => 'somepass',
236
-                'readonly' => FALSE,],
236
+                'readonly' => FALSE, ],
237 237
             // this slice of DB use is about user management in the user_options
238 238
             // table. Giving the corresponding user only read-only access means that
239 239
             // all user properties have to "magically" occur in the table by OOB
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
                 'db' => 'cat',
245 245
                 'user' => 'kitty',
246 246
                 'pass' => 'somepass',
247
-                'readonly' => FALSE,],
247
+                'readonly' => FALSE, ],
248 248
             /*   If you use this tool in conjunction with an external customer management database, you can configure that every 
249 249
              * institution entry in CAT MUST correspond to a customer entry in an external database. If you want this, set this
250 250
              * config variable to TRUE.
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
                 'db' => 'customer_db',
265 265
                 'user' => 'customerservice',
266 266
                 'pass' => '2lame4u',
267
-                'readonly' => TRUE,],
267
+                'readonly' => TRUE, ],
268 268
             'enforce-external-sync' => TRUE,
269 269
         ];
270 270
         /**
Please login to merge, or discard this patch.
web/resources/css/cat.css.php 1 patch
Spacing   +17 added lines, -17 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 dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
22
+require dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
23 23
 $colour1 = \config\Master::APPEARANCE['colour1'];
24 24
 $colour2 = \config\Master::APPEARANCE['colour2'];
25 25
 header('Content-type: text/css; charset=utf-8');
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 }
30 30
 
31 31
 body {
32
-    background: <?php echo $colour1;?>;
32
+    background: <?php echo $colour1; ?>;
33 33
     color: #000000;
34 34
     font-family:Verdana, Arial, Helvetica, sans-serif;
35 35
     font-size:11px;
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 }
45 45
 
46 46
 button {
47
-    background: <?php echo $colour2;?>; 
47
+    background: <?php echo $colour2; ?>; 
48 48
     color: #FFFFFF; 
49 49
     min-height: 23px;
50 50
     border-left-style: outset; 
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 
396 396
 span.edu_cat {
397 397
     font-weight: bold;
398
-    color: <?php echo $colour2;?>;
398
+    color: <?php echo $colour2; ?>;
399 399
 }
400 400
 
401 401
 span.tooltip {
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
     border-bottom-style:solid;
492 492
     border-top-width:5px; 
493 493
     border-bottom-width:5px; 
494
-    border-color: <?php echo $colour1;?>; 
494
+    border-color: <?php echo $colour1; ?>; 
495 495
     padding-left:30px;
496 496
 }
497 497
 
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 }
562 562
 
563 563
 #close_button {
564
-    background: <?php echo $colour2;?>; 
564
+    background: <?php echo $colour2; ?>; 
565 565
     color: #FFFFFF; 
566 566
     height: 23px;
567 567
     border-left-style: inset; 
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
     width: 30em; 
637 637
     padding-left: 10px; 
638 638
     padding-right: 0px; 
639
-    background: <?php echo $colour2;?>; 
639
+    background: <?php echo $colour2; ?>; 
640 640
     color: white; 
641 641
     box-shadow: 10px 10px 5px #888888;
642 642
 }
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
     padding-top: 4px; 
684 684
     padding-bottom: 12px; 
685 685
     padding-left: 30px; 
686
-    background: <?php echo $colour1;?>; 
686
+    background: <?php echo $colour1; ?>; 
687 687
     text-align: left; 
688 688
     text-shadow: 10px 10px 5px #888888;
689 689
 }
@@ -693,9 +693,9 @@  discard block
 block discarded – undo
693 693
     border-bottom-style:solid;
694 694
     border-top-width:5px;
695 695
     border-bottom-width:5px;
696
-    border-color: <?php echo $colour1;?>;
696
+    border-color: <?php echo $colour1; ?>;
697 697
     padding-left:30px;
698
-    color: <?php echo $colour2;?>;
698
+    color: <?php echo $colour2; ?>;
699 699
 }
700 700
 
701 701
 #heading h1 { 
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
     text-align: justify;
715 715
     border-bottom-style:solid;
716 716
     border-bottom-width:5px;
717
-    border-color: <?php echo $colour1;?>;
717
+    border-color: <?php echo $colour1; ?>;
718 718
     font-size: 11px;
719 719
     font-weight: normal;
720 720
 }
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
 
762 762
 #faq {
763 763
     padding: 20px;
764
-    color: <?php echo $colour2;?>;
764
+    color: <?php echo $colour2; ?>;
765 765
     background: #ffffff;
766 766
 }
767 767
 
@@ -813,7 +813,7 @@  discard block
 block discarded – undo
813 813
 
814 814
 #line1 {
815 815
     top:145px;
816
-    color: <?php echo $colour2;?>;
816
+    color: <?php echo $colour2; ?>;
817 817
     font-size:20px;
818 818
 }
819 819
 
@@ -860,7 +860,7 @@  discard block
 block discarded – undo
860 860
 
861 861
 #front_page_leftmenu {
862 862
     border-right:solid; 
863
-    border-color: <?php echo $colour1;?>; 
863
+    border-color: <?php echo $colour1; ?>; 
864 864
     border-width:5px; 
865 865
     min-height:400px; 
866 866
     padding-left: 10px; 
@@ -885,11 +885,11 @@  discard block
 block discarded – undo
885 885
 }
886 886
 
887 887
 a:link {
888
-    color:<?php echo $colour2;?>;
888
+    color:<?php echo $colour2; ?>;
889 889
 }
890 890
 
891 891
 a:visited {
892
-    color:<?php echo $colour2;?>;
892
+    color:<?php echo $colour2; ?>;
893 893
 }
894 894
 
895 895
 a:hover {
@@ -897,7 +897,7 @@  discard block
 block discarded – undo
897 897
 }
898 898
 
899 899
 a:active {
900
-    color:<?php echo $colour2;?>;
900
+    color:<?php echo $colour2; ?>;
901 901
 }
902 902
 
903 903
 .comment {
Please login to merge, or discard this patch.
web/diag/diag.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@
 block discarded – undo
42 42
     $auth->authenticate();
43 43
 }
44 44
 if (isset($_SESSION['admin_diag_auth'])) {
45
-   $admin =  1;
46
-   unset($_SESSION['admin_diag_auth']);
45
+    $admin =  1;
46
+    unset($_SESSION['admin_diag_auth']);
47 47
 }
48 48
 $Gui = new \web\lib\user\Gui();
49 49
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]);
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 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
 $admin = filter_input(INPUT_GET, 'admin', FILTER_VALIDATE_INT);
24 24
 $sp = filter_input(INPUT_GET, 'sp', FILTER_VALIDATE_INT);
25 25
 $givenRealm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
             unset($q_el[$idx]);
36 36
             $q_r = preg_replace("/\?.*/", "", $_SERVER['REQUEST_URI']);
37 37
             if (count($q_el)) {
38
-                $q_r = $q_r . '?' . implode('&', $q_el);
38
+                $q_r = $q_r.'?'.implode('&', $q_el);
39 39
             }
40 40
             $_SERVER['REQUEST_URI'] = $q_r;
41 41
         }
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
44 44
     $auth->authenticate();
45 45
 }
46 46
 if (isset($_SESSION['admin_diag_auth'])) {
47
-   $admin =  1;
47
+   $admin = 1;
48 48
    unset($_SESSION['admin_diag_auth']);
49 49
 }
50 50
 $Gui = new \web\lib\user\Gui();
51 51
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]);
52
-require "../skins/" . $skinObject->skin . "/diag/diag.php";
52
+require "../skins/".$skinObject->skin."/diag/diag.php";
53 53
 
54 54
 
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\Master::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/manageDBLink.inc.php 1 patch
Spacing   +20 added lines, -20 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
 $auth->authenticate();
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
 // if we have a pushed close button, submit attributes and send user back to the overview page
37 37
 // if external DB sync is disabled globally, the user never gets to this page. If he came here *anyway* -> send him back immediately.
38
-if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\common\FormElements::BUTTON_CLOSE ) || \config\Master::DB['enforce-external-sync'] == FALSE) {
38
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\common\FormElements::BUTTON_CLOSE) || \config\Master::DB['enforce-external-sync'] == FALSE) {
39 39
     header("Location: ../overview_federation.php");
40 40
     exit;
41 41
 }
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
     $cat = new \core\CAT();
93 93
     switch ($my_inst->getExternalDBSyncState()) {
94 94
         case \core\IdP::EXTERNAL_DB_SYNCSTATE_SYNCED:
95
-            printf(_("This %s is linked to the %s database."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>";
96
-            echo "<p>" . sprintf(_("The following information about the IdP is stored in the %s DB and %s DB:"), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>";
97
-            echo "<table><tr><td>" . sprintf(_("Information in <strong>%s Database</strong>"), \config\Master::APPEARANCE['productname']) . "</td><td>" . sprintf(_("Information in <strong>%s Database</strong>"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</td></tr>";
95
+            printf(_("This %s is linked to the %s database."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name'])."</p>";
96
+            echo "<p>".sprintf(_("The following information about the IdP is stored in the %s DB and %s DB:"), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['display_name'])."</p>";
97
+            echo "<table><tr><td>".sprintf(_("Information in <strong>%s Database</strong>"), \config\Master::APPEARANCE['productname'])."</td><td>".sprintf(_("Information in <strong>%s Database</strong>"), \config\ConfAssistant::CONSORTIUM['display_name'])."</td></tr>";
98 98
             echo "<tr><td>";
99 99
             // left-hand side: CAT DB
100 100
             echo "<table>";
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
                 } else {
107 107
                     $language = \config\Master::LANGUAGES[$name['lang']]['display'] ?? "(unsupported language)";
108 108
                 }
109
-                echo "<tr><td>" . sprintf(_("%s Name (%s)"), $uiElements->nomenclatureInst, $language) . "</td><td>" . $name['value'] . "</td></tr>";
109
+                echo "<tr><td>".sprintf(_("%s Name (%s)"), $uiElements->nomenclatureInst, $language)."</td><td>".$name['value']."</td></tr>";
110 110
             }
111 111
 
112 112
             $admins = $my_inst->listOwners();
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
                 if (count($username) == 0) {
118 118
                     $username[0]['value'] = _("Unnamed User");
119 119
                 }
120
-                echo "<tr><td>" . _("Administrator [invited as]") . "</td><td>" . $username[0]['value'] . " [" . $admin['MAIL'] . "]</td></tr>";
120
+                echo "<tr><td>"._("Administrator [invited as]")."</td><td>".$username[0]['value']." [".$admin['MAIL']."]</td></tr>";
121 121
             }
122 122
             echo "</table>";
123 123
             // end of left-hand side
@@ -125,38 +125,38 @@  discard block
 block discarded – undo
125 125
             // right-hand side: external DB
126 126
             $externalid = $my_inst->getExternalDBId();
127 127
             if (is_bool($externalid)) { // we are in SYNCED state so this cannot happen
128
-                throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the " . \config\ConfAssistant::CONSORTIUM['nomenclature_institution'] . "!");
128
+                throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the ".\config\ConfAssistant::CONSORTIUM['nomenclature_institution']."!");
129 129
             }
130 130
 
131 131
             $extinfo = $cat->getExternalDBEntityDetails($externalid);
132 132
 
133 133
             echo "<table>";
134 134
             foreach ($extinfo['names'] as $lang => $name) {
135
-                echo "<tr><td>" . sprintf(_("%s Name (%s)"), $uiElements->nomenclatureInst, $lang) . "</td><td>$name</td>";
135
+                echo "<tr><td>".sprintf(_("%s Name (%s)"), $uiElements->nomenclatureInst, $lang)."</td><td>$name</td>";
136 136
             }
137 137
             foreach ($extinfo['admins'] as $number => $admin_details) {
138
-                echo "<tr><td>" . _("Administrator email") . "</td><td>" . $admin_details['email'] . "</td></tr>";
138
+                echo "<tr><td>"._("Administrator email")."</td><td>".$admin_details['email']."</td></tr>";
139 139
             }
140 140
             echo "</table>";
141 141
             // end of right-hand side
142 142
             echo "</td></tr></table>";
143
-            echo "<p>" . _("If this mapping is not correct any more, you can remove the link:") . " ";
143
+            echo "<p>"._("If this mapping is not correct any more, you can remove the link:")." ";
144 144
             echo "<form name='form-unlink-inst' action='inc/manageDBLink.inc.php?inst_id=$my_inst->identifier' method='post' accept-charset='UTF-8'>";
145
-            echo "<button type='submit' class='delete' name='submitbutton' id='submit' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Unlink") . "</button></form>";
145
+            echo "<button type='submit' class='delete' name='submitbutton' id='submit' value='".web\lib\common\FormElements::BUTTON_DELETE."'>"._("Unlink")."</button></form>";
146 146
             break;
147 147
         case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOT_SYNCED:
148 148
             $temparray = [];
149
-            printf(_("This %s is not yet linked to the %s database."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name']) . " ";
150
-            echo "<strong>" . _("This means that its profiles are not made available on the user download page.") . "</strong> ";
149
+            printf(_("This %s is not yet linked to the %s database."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name'])." ";
150
+            echo "<strong>"._("This means that its profiles are not made available on the user download page.")."</strong> ";
151 151
             printf(_("You can link it to the %s database below."), \config\ConfAssistant::CONSORTIUM['display_name']);
152 152
             $candidates = $my_inst->getExternalDBSyncCandidates($my_inst->type);
153 153
             echo "<br/><form name='form-link-inst' action='inc/manageDBLink.inc.php?inst_id=$my_inst->identifier' method='post' accept-charset='UTF-8'>";
154
-            printf(_("Please select an entity from the %s DB which corresponds to this CAT %s."), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst) . " ";
154
+            printf(_("Please select an entity from the %s DB which corresponds to this CAT %s."), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst)." ";
155 155
             if (count($candidates) > 0) {
156 156
                 printf(_("Particularly promising entries (names in CAT and %s DB are a 100%% match) are on top of the list."), \config\ConfAssistant::CONSORTIUM['display_name']);
157 157
             }
158 158
             echo "<table>";
159
-            echo "<tr><th>" . _("Link to this entity?") . "</th><th>" . sprintf(_("%s Name"), $uiElements->nomenclatureInst) . "</th><th>" . _("Administrators") . "</th></tr>";
159
+            echo "<tr><th>"._("Link to this entity?")."</th><th>".sprintf(_("%s Name"), $uiElements->nomenclatureInst)."</th><th>"._("Administrators")."</th></tr>";
160 160
 
161 161
             foreach ($candidates as $candidate) {
162 162
                 $info = $cat->getExternalDBEntityDetails($candidate);
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
                 }
167 167
                 echo "</td><td>";
168 168
                 foreach ($info['admins'] as $number => $admin_details) {
169
-                    echo "[E-Mail] " . $admin_details['email'] . "<br/>";
169
+                    echo "[E-Mail] ".$admin_details['email']."<br/>";
170 170
                 }
171 171
                 echo "</td></tr>";
172 172
                 $temparray[] = $candidate;
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
             $buffer = "";
179 179
 
180 180
             foreach ($unmappedentities as $v) {
181
-                $buffer .= "<option value='" . $v['ID'] . "'>[ID " . $v['ID'] . "] " . $v['name'] . "</option>";
181
+                $buffer .= "<option value='".$v['ID']."'>[ID ".$v['ID']."] ".$v['name']."</option>";
182 182
             }
183 183
 
184 184
             if ($buffer != "") {
@@ -189,9 +189,9 @@  discard block
 block discarded – undo
189 189
             }
190 190
             // issue a big red warning if there are no link candidates at all in the federation
191 191
             if (empty($buffer) && empty($candidates)) {
192
-                echo "<tr><td style='color:#ff0000' colspan='2'>" . sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed) . "</td></tr>";
192
+                echo "<tr><td style='color:#ff0000' colspan='2'>".sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed)."</td></tr>";
193 193
             }
194
-            echo "</table><button type='submit' name='submitbutton' id='submit' value='" . web\lib\common\FormElements::BUTTON_SAVE . "' disabled >" . _("Create Link") . "</button></form>";
194
+            echo "</table><button type='submit' name='submitbutton' id='submit' value='".web\lib\common\FormElements::BUTTON_SAVE."' disabled >"._("Create Link")."</button></form>";
195 195
             break;
196 196
         default:
197 197
     }
Please login to merge, or discard this patch.