View GitHub Repository CAT

Schedule Inspection
Subscribe
Passed
Push — master ( 657d73...8a66a0 )
by Tomasz
03:36
created
Status
Category
Toggle Patches
web/skins/classic/basic.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -142,7 +142,7 @@  discard block
 
 block discarded – undo
142 142 
     public function listIdPs() {
143 143 
         $instList = $this->orderIdentityProviders($this->country->identifier);
144 144 
         $out = '';
145 
-        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst );
145 
+        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst);
146 146 
         $out .= '<select name="idp" onchange="submit_form(this)">';
147 147 
         if (!empty($instList)) {
148 148 
             if (!isset($this->idp)) {
 
@@ -236,7 +236,7 @@  discard block
 
 block discarded – undo
236 236 
                 }
237 237 
             }
238 238 
             $out .= '>' . $disp . '</option>';
239 
-            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';';
239 
+            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';';
240 240 
             $iterator++;
241 241 
         }
242 242 
         $out .= '</select>';
 
@@ -430,7 +430,7 @@  discard block
 
 block discarded – undo
430 430 
         </script>
431 431 
     </head>
432 432 
     <body style="">
433 
-        <?php print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>'; ?>
433 
+        <?php print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>'; ?>
434 434 
         <form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME'] ?>" accept-charset='UTF-8'>
435 435 
             <img src="<?php echo $skinObject->findResourceUrl("IMAGES", "consortium_logo.png"); ?>" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" />
436 436 
             <?php
Please login to merge, or discard this patch.
web/admin/edit_federation.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -40,7 +40,7 @@  discard block
 
 block discarded – undo
40 40 
         ?>
41 41 
     </h1>
42 42 
     <div class='infobox'>
43 
-        <h2><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></h2>
43 
+        <h2><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></h2>
44 44 
         <table>
45 45 
             <tr>
46 46 
                 <td><?php echo _("Country:"); ?></td>
 
@@ -57,7 +57,7 @@  discard block
 
 block discarded – undo
57 57 
               <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE'] . "'>";
58 58 
     ?>
59 59 
     <fieldset class="option_container">
60 
-        <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></strong></legend>
60 
+        <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></strong></legend>
61 61 
         <?php
62 62 
         $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, "FED");
63 63 
         echo $optionDisplay->prefilledOptionTable("fed");
Please login to merge, or discard this patch.
web/lib/admin/GeoWidget.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -37,7 +37,7 @@
 
 block discarded – undo
37 37 
      */
38 38 
     public function insertInHead($inst_country, $inst_name) {
39 39 
         $cat = new \core\CAT();
40 
-        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".CONFIG['APPEARANCE']['google_maps_api_key']."'></script>
40 
+        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script>
41 41 
     <script type='text/javascript'>
42 42 
         // some global variables;
43 43 
         var center_lat=49.6114885608729;
Please login to merge, or discard this patch.
web/admin/edit_idp_result.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -90,7 +90,7 @@
 
 block discarded – undo
90 90
91 91 
 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
92 92 
     foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) {
93 
-        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
93 
+        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
94 94 
     }
95 95 
 }
96 96
Please login to merge, or discard this patch.
web/user/tou.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -11,7 +11,7 @@  discard block
 
 block discarded – undo
11 11 
 /*
12 12 
 */
13 13
14 
-        $Tou =  [
14 
+        $Tou = [
15 15 
     'title' => _("Terms of Use"),
16 16 
     'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam
17 17 
 Identity Providers by making available customised and securely configured eduroam installers.</p>
 
@@ -49,7 +49,7 @@  discard block
 
 block discarded – undo
49 49 
     they are from the same user group. You are not allowed to share them to an unlimited
50 50 
     audience (e.g. on a publicly accessible web server).</li>
51 51 
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
52 
-your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." end users, e.g. on the support web pages of your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", on Welcome Package CDs or USB sticks, etc.</li>
52 
+your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " end users, e.g. on the support web pages of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", on Welcome Package CDs or USB sticks, etc.</li>
53 53 
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
54 54 
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
55 55 
 </ul>
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 
@@ -52,7 +52,7 @@
 
 block discarded – undo
52 52 
     they are from the same user group. You are not allowed to share them to an unlimited
53 53 
     audience (e.g. on a publicly accessible web server).</li>
54 54 
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
55 
-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>
55 
+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>
56 56 
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
57 57 
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
58 58 
 </ul>
Please login to merge, or discard this patch.
utils/notify_invitation_expiry.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -44,7 +44,7 @@  discard block
 
 block discarded – undo
44 44 
     $admins = $this_fed->listFederationAdmins();
45 45 
     $mailtext = "Hello,
46 46
47 
-invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ." have recently expired:
47 
+invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have recently expired:
48 48
49 49 
 ";
50 50 
     foreach ($listofinstnames as $instname) {
 
@@ -54,7 +54,7 @@  discard block
 
 block discarded – undo
54 54 
     if ($numberofexistingidps > 0) {
55 55 
         $mailtext .= "
56 56
57 
-Additionally, $numberofexistingidps invitations for an existing ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." have expired.
57 
+Additionally, $numberofexistingidps invitations for an existing " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have expired.
58 58 
         ";
59 59 
     }
60 60 
     $mailtext .= "
Please login to merge, or discard this patch.
web/admin/inc/sendinvite.inc.php 2 patches
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -169,8 +169,7 @@
 
 block discarded – undo
169 169 
         _("and enter the invitation token") . "
170 170 
     $newtoken
171 171 
 " . ( /* $new_idp_authorized_fedadmin */ FALSE ?
172 
-        wordwrap(sprintf(_("manually. If you reply to this mail, you will reach your %s administrators."), $uiElements->nomenclature_fed), 72) :
173 
-        wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
172 
+        wordwrap(sprintf(_("manually. If you reply to this mail, you will reach your %s administrators."), $uiElements->nomenclature_fed), 72) : wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
174 173
175 174 
 " . wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . "
176 175
Please login to merge, or discard this patch.
Switch Indentation   +78 added lines, -78 removed lines patch added patch discarded remove patch 
@@ -77,90 +77,90 @@
 
 block discarded – undo
77 77 
 }
78 78
79 79 
 switch ($operationMode) {
80 
-    case OPERATION_MODE_EDIT:
81 
-        $idp = $validator->IdP($_GET['inst_id']);
82 
-        // editing IdPs is done from within the popup. When we're done, send the
83 
-        // user back to the popup (append the result of the operation later)
84 
-        $redirect_destination = "manageAdmins.inc.php?inst_id=" . $idp->identifier . "&";
85 
-        $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
86 
-        // is the user admin of this IdP?
87 
-        $is_owner = FALSE;
88 
-        $owners = $idp->owner();
89 
-        foreach ($owners as $oneowner) {
90 
-            if ($oneowner['ID'] == $_SESSION['user'] && $oneowner['LEVEL'] == "FED") {
91 
-                $is_owner = TRUE;
80 
+        case OPERATION_MODE_EDIT:
81 
+            $idp = $validator->IdP($_GET['inst_id']);
82 
+            // editing IdPs is done from within the popup. When we're done, send the
83 
+            // user back to the popup (append the result of the operation later)
84 
+            $redirect_destination = "manageAdmins.inc.php?inst_id=" . $idp->identifier . "&";
85 
+            $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
86 
+            // is the user admin of this IdP?
87 
+            $is_owner = FALSE;
88 
+            $owners = $idp->owner();
89 
+            foreach ($owners as $oneowner) {
90 
+                if ($oneowner['ID'] == $_SESSION['user'] && $oneowner['LEVEL'] == "FED") {
91 
+                    $is_owner = TRUE;
92 
+                }
93 
+            }
94 
+            // check if he is (also) federation admin for the federation this IdP is in. His invitations have more blessing then.
95 
+            $fedadmin = $userObject->isFederationAdmin($idp->federation);
96 
+            // check if he is either one, if not, complain
97 
+            if (!$is_owner && !$fedadmin) {
98 
+                echo "<p>" . sprintf(_("Something's wrong... you are a %s admin, but not for the %s the requested %s belongs to!"), $uiElements->nomenclature_fed, $uiElements->nomenclature_fed, $uiElements->nomenclature_inst) . "</p>";
99 
+                exit(1);
92 100 
             }
93 
-        }
94 
-        // check if he is (also) federation admin for the federation this IdP is in. His invitations have more blessing then.
95 
-        $fedadmin = $userObject->isFederationAdmin($idp->federation);
96 
-        // check if he is either one, if not, complain
97 
-        if (!$is_owner && !$fedadmin) {
98 
-            echo "<p>" . sprintf(_("Something's wrong... you are a %s admin, but not for the %s the requested %s belongs to!"), $uiElements->nomenclature_fed, $uiElements->nomenclature_fed, $uiElements->nomenclature_inst) . "</p>";
99 
-            exit(1);
100 
-        }
101 101
102 
-        $prettyprintname = $idp->name;
103 
-        $newtoken = $mgmt->createToken($fedadmin, $mailaddress, $idp);
104 
-        $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $idp->identifier . " - Token created for " . $mailaddress);
105 
-        $introtext = sprintf(_("a %s of the %s %s \"%s\" has invited you to manage the %s together with him."), $uiElements->nomenclature_fed, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_inst, $prettyprintname, $uiElements->nomenclature_inst) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
106 
-        break;
107 
-    case OPERATION_MODE_NEWUNLINKED:
108 
-        $redirect_destination = "../overview_federation.php?";
109 
-        $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
110 
-        // run an input check and conversion of the raw inputs... just in case
111 
-        $newinstname = $validator->string($_POST['name']);
112 
-        $newcountry = $validator->string($_POST['country']);
113 
-        $new_idp_authorized_fedadmin = $userObject->isFederationAdmin($newcountry);
114 
-        if ($new_idp_authorized_fedadmin !== TRUE) {
115 
-            throw new Exception("Something's wrong... you want to create a new " . $uiElements->nomenclature_inst . ", but are not a " . $uiElements->nomenclature_fed . " admin for the " . $uiElements->nomenclature_fed . " it should be in!");
116 
-        }
117 
-        $federation = $validator->Federation($newcountry);
118 
-        $prettyprintname = $newinstname;
119 
-        $introtext = sprintf(_("a %s %s has invited you to manage the future %s  \"%s\" (%s)."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_fed, $uiElements->nomenclature_inst, $prettyprintname, $newcountry) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
120 
-        // send the user back to his federation overview page, append the result of the operation later
121 
-        // do the token creation magic
122 
-        $newtoken = $mgmt->createToken(TRUE, $mailaddress, $newinstname, 0, $newcountry);
123 
-        $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP FUTURE  - Token created for " . $mailaddress);
124 
-        break;
125 
-    case OPERATION_MODE_NEWFROMDB:
126 
-        $redirect_destination = "../overview_federation.php?";
127 
-        $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
128 
-        // a real external DB entry was submitted and all the required parameters are there
129 
-        $newexternalid = $validator->string($_POST['externals']);
130 
-        $extinfo = $catInstance->getExternalDBEntityDetails($newexternalid);
131 
-        $new_idp_authorized_fedadmin = $userObject->isFederationAdmin($extinfo['country']);
132 
-        if ($new_idp_authorized_fedadmin !== TRUE) {
133 
-            throw new Exception("Something's wrong... you want to create a new " . $uiElements->nomenclature_inst . ", but are not a " . $uiElements->nomenclature_fed . " admin for the " . $uiElements->nomenclature_fed . " it should be in!");
134 
-        }
135 
-        $federation = $validator->Federation($extinfo['country']);
136 
-        $newcountry = $extinfo['country'];
137 
-        // see if the inst name is defined in the currently set language; if not, pick its English name; if N/A, pick the last in the list
138 
-        $prettyprintname = "";
139 
-        foreach ($extinfo['names'] as $lang => $name) {
140 
-            if ($lang == $languageInstance->getLang()) {
141 
-                $prettyprintname = $name;
102 
+            $prettyprintname = $idp->name;
103 
+            $newtoken = $mgmt->createToken($fedadmin, $mailaddress, $idp);
104 
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $idp->identifier . " - Token created for " . $mailaddress);
105 
+            $introtext = sprintf(_("a %s of the %s %s \"%s\" has invited you to manage the %s together with him."), $uiElements->nomenclature_fed, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_inst, $prettyprintname, $uiElements->nomenclature_inst) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
106 
+            break;
107 
+        case OPERATION_MODE_NEWUNLINKED:
108 
+            $redirect_destination = "../overview_federation.php?";
109 
+            $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
110 
+            // run an input check and conversion of the raw inputs... just in case
111 
+            $newinstname = $validator->string($_POST['name']);
112 
+            $newcountry = $validator->string($_POST['country']);
113 
+            $new_idp_authorized_fedadmin = $userObject->isFederationAdmin($newcountry);
114 
+            if ($new_idp_authorized_fedadmin !== TRUE) {
115 
+                throw new Exception("Something's wrong... you want to create a new " . $uiElements->nomenclature_inst . ", but are not a " . $uiElements->nomenclature_fed . " admin for the " . $uiElements->nomenclature_fed . " it should be in!");
142 116 
             }
143 
-        }
144 
-        if ($prettyprintname == "" && isset($extinfo['names']['en'])) {
145 
-            $prettyprintname = $extinfo['names']['en'];
146 
-        }
147 
-        if ($prettyprintname == "") {
148 
-            foreach ($extinfo['names'] as $name) {
149 
-                $prettyprintname = $name;
117 
+            $federation = $validator->Federation($newcountry);
118 
+            $prettyprintname = $newinstname;
119 
+            $introtext = sprintf(_("a %s %s has invited you to manage the future %s  \"%s\" (%s)."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_fed, $uiElements->nomenclature_inst, $prettyprintname, $newcountry) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
120 
+            // send the user back to his federation overview page, append the result of the operation later
121 
+            // do the token creation magic
122 
+            $newtoken = $mgmt->createToken(TRUE, $mailaddress, $newinstname, 0, $newcountry);
123 
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP FUTURE  - Token created for " . $mailaddress);
124 
+            break;
125 
+        case OPERATION_MODE_NEWFROMDB:
126 
+            $redirect_destination = "../overview_federation.php?";
127 
+            $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
128 
+            // a real external DB entry was submitted and all the required parameters are there
129 
+            $newexternalid = $validator->string($_POST['externals']);
130 
+            $extinfo = $catInstance->getExternalDBEntityDetails($newexternalid);
131 
+            $new_idp_authorized_fedadmin = $userObject->isFederationAdmin($extinfo['country']);
132 
+            if ($new_idp_authorized_fedadmin !== TRUE) {
133 
+                throw new Exception("Something's wrong... you want to create a new " . $uiElements->nomenclature_inst . ", but are not a " . $uiElements->nomenclature_fed . " admin for the " . $uiElements->nomenclature_fed . " it should be in!");
150 134 
             }
151 
-        }
152 
-        // fill the rest of the text
153 
-        $introtext = sprintf(_("a %s %s has invited you to manage the %s  \"%s\"."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_fed, $uiElements->nomenclature_inst, $prettyprintname) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
154 
-        // do the token creation magic
155 
-        $newtoken = $mgmt->createToken(TRUE, $mailaddress, $prettyprintname, $newexternalid);
156 
-        $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP FUTURE  - Token created for " . $mailaddress);
157 
-        break;
158 
-    default: // includes OPERATION_MODE_INVALID
159 
-        $wrongcontent = print_r($_POST, TRUE);
160 
-        echo "<pre>Wrong parameters in POST:
135 
+            $federation = $validator->Federation($extinfo['country']);
136 
+            $newcountry = $extinfo['country'];
137 
+            // see if the inst name is defined in the currently set language; if not, pick its English name; if N/A, pick the last in the list
138 
+            $prettyprintname = "";
139 
+            foreach ($extinfo['names'] as $lang => $name) {
140 
+                if ($lang == $languageInstance->getLang()) {
141 
+                    $prettyprintname = $name;
142 
+                }
143 
+            }
144 
+            if ($prettyprintname == "" && isset($extinfo['names']['en'])) {
145 
+                $prettyprintname = $extinfo['names']['en'];
146 
+            }
147 
+            if ($prettyprintname == "") {
148 
+                foreach ($extinfo['names'] as $name) {
149 
+                    $prettyprintname = $name;
150 
+                }
151 
+            }
152 
+            // fill the rest of the text
153 
+            $introtext = sprintf(_("a %s %s has invited you to manage the %s  \"%s\"."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_fed, $uiElements->nomenclature_inst, $prettyprintname) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
154 
+            // do the token creation magic
155 
+            $newtoken = $mgmt->createToken(TRUE, $mailaddress, $prettyprintname, $newexternalid);
156 
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP FUTURE  - Token created for " . $mailaddress);
157 
+            break;
158 
+        default: // includes OPERATION_MODE_INVALID
159 
+            $wrongcontent = print_r($_POST, TRUE);
160 
+            echo "<pre>Wrong parameters in POST:
161 161 
 " . htmlspecialchars($wrongcontent) . "
162 162 
 </pre>";
163 
-        exit(1);
163 
+            exit(1);
164 164 
 }
165 165 
 // are we on https?
166 166 
 $proto = "http://";
Please login to merge, or discard this patch.
config/config-diagnostics-template.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch 
@@ -59,12 +59,12 @@  discard block
 
 block discarded – undo
59 59 
      */
60 60
61 61 
         /**
62 
-     * Various paths.
63 
-     * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
64 
-     * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
65 
-     *   See also NSIS_VERSION further down
66 
-     * @var array
67 
-     */
62 
+         * Various paths.
63 
+         * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
64 
+         * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
65 
+         *   See also NSIS_VERSION further down
66 
+         * @var array
67 
+         */
68 68 
     'PATHS' => [
69 69 
         'c_rehash' => 'c_rehash',
70 70 
         'eapol_test' => 'eapol_test',
 
@@ -101,44 +101,44 @@  discard block
 
 block discarded – undo
101 101 
         ],
102 102
103 103 
         'TLS-clientcerts' => [
104 
-          'CA1' => [
104 
+            'CA1' => [
105 105 
             'status' => 'ACCREDITED',
106 106 
             'issuerCA' => '/DC=org/DC=pki1/CN=PKI 1',
107 107 
             'certificates' => [
108 
-              [
108 
+                [
109 109 
                 'status' => 'CORRECT',
110 110 
                 'public' => 'ca1-client-cert.pem',
111 111 
                 'private' => 'ca1-client-key.pem',
112 112 
                 'expected' => 'PASS'],
113 
-              [
113 
+                [
114 114 
                 'status' => 'WRONGPOLICY',
115 115 
                 'public' => 'ca1-nopolicy-cert.pem',
116 116 
                 'private' => 'ca1-nopolicy-key.key',
117 117 
                 'expected' => 'FAIL'],
118 
-              [
118 
+                [
119 119 
                 'status' => 'EXPIRED',
120 120 
                 'public' => 'ca1-exp.pem',
121 121 
                 'private' => 'ca1-exp.key',
122 122 
                 'expected' => 'FAIL'],
123 
-              [
123 
+                [
124 124 
                 'status' => 'REVOKED',
125 125 
                 'public' => 'ca1-revoked.pem',
126 126 
                 'private' => 'ca1-revoked.key',
127 127 
                 'expected' => 'FAIL'],
128 128 
             ]
129 
-          ],
130 
-          'CA-N' => [
129 
+            ],
130 
+            'CA-N' => [
131 131 
             'status' => 'NONACCREDITED',
132 132 
             'issuerCA' => '/DC=org/DC=pkiN/CN=PKI N',
133 133 
             'certificates' => [
134 
-               [
134 
+                [
135 135 
                 'status' => 'CORRECT',
136 136 
                 'public' => 'caN-client-cert.pem',
137 137 
                 'private' => 'caN-client-cert.key',
138 138 
                 'expected' => 'FAIL'],
139 
-               ]
140 
-          ]
141 
-      ],
142 
-      'accreditedCAsURL' => '',
139 
+                ]
140 
+            ]
141 
+        ],
142 
+        'accreditedCAsURL' => '',
143 143 
     ],
144 144 
 ];
Please login to merge, or discard this patch.