@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * <base_url>/copyright.php after deploying the software |
20 | 20 | */ |
21 | 21 | |
22 | -require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
22 | +require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
23 | 23 | |
24 | 24 | $deco = new \web\lib\admin\PageDecoration(); |
25 | 25 | $validator = new \web\lib\common\InputValidation(); |
@@ -53,10 +53,10 @@ discard block |
||
53 | 53 | <?php |
54 | 54 | foreach ($preflist as $method) { |
55 | 55 | $escapedMethod = $method->getIntegerRep(); |
56 | - echo "<th style='min-width:200px'>" . $method->getPrintableRep() . "<br/> |
|
56 | + echo "<th style='min-width:200px'>".$method->getPrintableRep()."<br/> |
|
57 | 57 | <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
58 | 58 | <input type='hidden' name='eaptype' value='$escapedMethod'> |
59 | - <button class='redirect' type='submit'>" . _("EAP-Type-specific options...") . "</button> |
|
59 | + <button class='redirect' type='submit'>"._("EAP-Type-specific options...")."</button> |
|
60 | 60 | </form></th>"; |
61 | 61 | } |
62 | 62 | ?> |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | foreach (\devices\Devices::listDevices() as $index => $description) { |
73 | 73 | |
74 | 74 | echo "<tr>"; |
75 | - echo "<td align='center'><img src='../resources/images/vendorlogo/" . $description['group'] . ".png' alt='logo'></td><td>" . $description['display'] . "<br/> |
|
75 | + echo "<td align='center'><img src='../resources/images/vendorlogo/".$description['group'].".png' alt='logo'></td><td>".$description['display']."<br/> |
|
76 | 76 | <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
77 | 77 | <input type='hidden' name='device' value='$index'> |
78 | - <button class='redirect' type='submit'>" . _("Device-specific options...") . "</button> |
|
78 | + <button class='redirect' type='submit'>"._("Device-specific options...")."</button> |
|
79 | 79 | </form> |
80 | 80 | </td>"; |
81 | 81 | $factory = new \core\DeviceFactory($index); |
@@ -84,10 +84,10 @@ discard block |
||
84 | 84 | $footnotesForDevEapCombo = []; |
85 | 85 | $display_footnote = FALSE; |
86 | 86 | $langObject = new \core\common\Language(); |
87 | - $downloadform = "<form action='" . rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/') . "/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=" . $langObject->getLang() . "' method='post' accept-charset='UTF-8'> |
|
87 | + $downloadform = "<form action='".rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/')."/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=".$langObject->getLang()."' method='post' accept-charset='UTF-8'> |
|
88 | 88 | <input type='hidden' name='device' value='$index'/> |
89 | 89 | <input type='hidden' name='generatedfor' value='admin'/> |
90 | - <button class='download'>" . _("Download") . "</button> |
|
90 | + <button class='download'>"._("Download")."</button> |
|
91 | 91 | "; |
92 | 92 | // first of all: if redirected, indicate by color |
93 | 93 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | </table> |
159 | 159 | <?php |
160 | 160 | if (count($distinctFootnotes)) { |
161 | - echo "<p><strong>" . _("Footnotes:") . "</strong></p><table>"; |
|
161 | + echo "<p><strong>"._("Footnotes:")."</strong></p><table>"; |
|
162 | 162 | foreach ($distinctFootnotes as $number => $text) { |
163 | 163 | echo "<tr><td>($number) - </td><td>$text</td></tr>"; |
164 | 164 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <?php |
29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
30 | 30 | |
31 | 31 | $auth = new \web\lib\admin\Authentication(); |
32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | ?> |
62 | 62 | </h1> |
63 | 63 | <div class='infobox'> |
64 | - <h2><?php echo sprintf(_("%s Properties"),$uiElements->nomenclatureFed); ?></h2> |
|
64 | + <h2><?php echo sprintf(_("%s Properties"), $uiElements->nomenclatureFed); ?></h2> |
|
65 | 65 | <table> |
66 | 66 | <tr> |
67 | 67 | <td><?php echo _("Country:"); ?></td> |
@@ -72,11 +72,11 @@ discard block |
||
72 | 72 | </table> |
73 | 73 | </div> |
74 | 74 | <?php |
75 | - echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld" . "' method='post' accept-charset='UTF-8'> |
|
76 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE'] . "'>"; |
|
75 | + echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld"."' method='post' accept-charset='UTF-8'> |
|
76 | + <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE']."'>"; |
|
77 | 77 | ?> |
78 | 78 | <fieldset class="option_container"> |
79 | - <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclatureFed); ?></strong></legend> |
|
79 | + <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclatureFed); ?></strong></legend> |
|
80 | 80 | <?php |
81 | 81 | $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, "FED"); |
82 | 82 | echo $optionDisplay->prefilledOptionTable("fed"); |
@@ -84,5 +84,5 @@ discard block |
||
84 | 84 | <button type='button' class='newoption' onclick='getXML("fed")'><?php echo _("Add new option"); ?></button> |
85 | 85 | </fieldset> |
86 | 86 | <?php |
87 | - echo "<div><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button> <button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php\"'>" . _("Discard changes") . "</button></div></form>"; |
|
87 | + echo "<div><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button> <button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php\"'>"._("Discard changes")."</button></div></form>"; |
|
88 | 88 | echo $deco->footer(); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * @author Stefan Winter <[email protected]> |
26 | 26 | */ |
27 | 27 | |
28 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
28 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
29 | 29 | |
30 | 30 | $auth = new \web\lib\admin\Authentication(); |
31 | 31 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -40,18 +40,18 @@ discard block |
||
40 | 40 | $my_fed = $validator->Federation($_GET['fed_id'], $_SESSION['user']); |
41 | 41 | if (isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\common\FormElements::BUTTON_SAVE) { // here we go |
42 | 42 | $fed_name = $my_fed->name; |
43 | - echo "<h1>" . sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name) . "</h1>"; |
|
43 | + echo "<h1>".sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclatureFed, $fed_name)."</h1>"; |
|
44 | 44 | echo "<table>"; |
45 | 45 | echo $optionParser->processSubmittedFields($my_fed, $_POST, $_FILES); |
46 | 46 | echo "</table>"; |
47 | 47 | |
48 | 48 | $loggerInstance = new \core\common\Logging(); |
49 | - $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED " . $my_fed->name . " - attributes changed"); |
|
49 | + $loggerInstance->writeAudit($_SESSION['user'], "MOD", "FED ".$my_fed->name." - attributes changed"); |
|
50 | 50 | |
51 | 51 | // re-instantiate ourselves... profiles need fresh data |
52 | 52 | |
53 | 53 | $my_fed = $validator->Federation($_GET['fed_id'], $_SESSION['user']); |
54 | 54 | |
55 | - echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>"; |
|
55 | + echo "<br/><form method='post' action='overview_federation.php' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>"; |
|
56 | 56 | } |
57 | 57 | echo $deco->footer(); |
@@ -19,7 +19,7 @@ discard block |
||
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 | $loggerInstance = new \core\common\Logging(); |
25 | 25 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | $user = new \core\User($_SESSION['user']); |
31 | 31 | if (!isset($_POST['submitbutton']) || $_POST['submitbutton'] != web\lib\common\FormElements::BUTTON_SAVE) { // what are we supposed to do? |
32 | - echo "<p>" . _("The page was called with insufficient data. Please report this as an error.") . "</p>"; |
|
32 | + echo "<p>"._("The page was called with insufficient data. Please report this as an error.")."</p>"; |
|
33 | 33 | echo $deco->footer(); |
34 | 34 | exit(0); |
35 | 35 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | if (isset($_POST['option'])) { |
47 | 47 | foreach ($_POST['option'] as $opt_id => $optname) { |
48 | 48 | if ($optname == "user:fedadmin") { |
49 | - echo "Security violation: user tried to make himself " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " administrator!"; |
|
49 | + echo "Security violation: user tried to make himself ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." administrator!"; |
|
50 | 50 | exit(1); |
51 | 51 | } |
52 | 52 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * <base_url>/copyright.php after deploying the software |
20 | 20 | */ |
21 | 21 | |
22 | -require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
22 | +require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
23 | 23 | |
24 | 24 | $therealm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING); |
25 | 25 | $thevisited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING); |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $validator = new \web\lib\common\InputValidation(); |
36 | 36 | |
37 | 37 | echo "<pre>"; |
38 | - echo "Testing " . $validatedRealm . " in " . $validator->string($thevisited); |
|
38 | + echo "Testing ".$validatedRealm." in ".$validator->string($thevisited); |
|
39 | 39 | print_r($telepath->magic()); |
40 | 40 | echo "</pre>"; |
41 | 41 | } |
42 | 42 | \ No newline at end of file |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * <base_url>/copyright.php after deploying the software |
20 | 20 | */ |
21 | 21 | |
22 | -require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
22 | +require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
23 | 23 | CAT_session_start(); |
24 | 24 | $loggerInstance = new \core\common\Logging(); |
25 | 25 | $loggerInstance->debug(4, "Sociopath test\n"); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | return NULL; |
34 | 34 | } |
35 | 35 | $loggerInstance->debug(4, $_SESSION['EVIDENCE']['QUESTIONSASKED']); |
36 | - $loggerInstance->debug(4, "\nAnswer question " . $QNUM . "\n"); |
|
36 | + $loggerInstance->debug(4, "\nAnswer question ".$QNUM."\n"); |
|
37 | 37 | switch ($answer) { |
38 | 38 | case 1: |
39 | 39 | $loggerInstance->debug(4, "Revaluate with FALSE"); |
@@ -19,7 +19,7 @@ |
||
19 | 19 | * <base_url>/copyright.php after deploying the software |
20 | 20 | */ |
21 | 21 | |
22 | -require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
22 | +require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
23 | 23 | |
24 | 24 | $sociopath = new \core\diag\Sociopath(); |
25 | 25 |
@@ -19,7 +19,7 @@ discard block |
||
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 | $loggerInstance = new \core\common\Logging(); |
25 | 25 | $validator = new \web\lib\common\InputValidation(); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | function disp_name($eap) { |
45 | 45 | $displayName = \core\common\EAP::eapDisplayName($eap); |
46 | - return $displayName['OUTER'] . ( $displayName['INNER'] != '' ? '-' . $displayName['INNER'] : ''); |
|
46 | + return $displayName['OUTER'].($displayName['INNER'] != '' ? '-'.$displayName['INNER'] : ''); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | if (!isset($_REQUEST['test_type']) || !$_REQUEST['test_type']) { |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | // contains port number; needs to be redacted for filter_var to work |
83 | 83 | // in any case, it's a printable string, so filter it initially |
84 | 84 | |
85 | - $filteredHost = filter_input(INPUT_GET,'src', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST,'src', FILTER_SANITIZE_STRING); |
|
85 | + $filteredHost = filter_input(INPUT_GET, 'src', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST, 'src', FILTER_SANITIZE_STRING); |
|
86 | 86 | $hostonly1 = preg_replace('/:[0-9]*$/', "", $filteredHost); |
87 | 87 | $hostonly2 = preg_replace('/^\[/', "", $hostonly1); |
88 | 88 | $hostonly3 = preg_replace('/\]$/', "", $hostonly2); |
@@ -158,10 +158,10 @@ discard block |
||
158 | 158 | break; |
159 | 159 | case \core\common\Entity::L_REMARK: |
160 | 160 | case \core\common\Entity::L_WARN: |
161 | - $message = _("<strong>Test partially successful</strong>: authentication succeded.") . ' ' . $additional_message[$level]; |
|
161 | + $message = _("<strong>Test partially successful</strong>: authentication succeded.").' '.$additional_message[$level]; |
|
162 | 162 | break; |
163 | 163 | case \core\common\Entity::L_ERROR: |
164 | - $message = _("<strong>Test FAILED</strong>: authentication succeded.") . ' ' . $additional_message[$level]; |
|
164 | + $message = _("<strong>Test FAILED</strong>: authentication succeded.").' '.$additional_message[$level]; |
|
165 | 165 | break; |
166 | 166 | } |
167 | 167 | break; |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | case \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT: |
213 | 213 | $level = $returnarray['result'][$i]['level']; |
214 | 214 | if ($level > \core\common\Entity::L_OK) { |
215 | - $message = _("<strong>Test partially successful</strong>: a bidirectional RADIUS conversation with multiple round-trips was carried out, and ended in an Access-Reject as planned.") . ' ' . $additional_message[$level]; |
|
215 | + $message = _("<strong>Test partially successful</strong>: a bidirectional RADIUS conversation with multiple round-trips was carried out, and ended in an Access-Reject as planned.").' '.$additional_message[$level]; |
|
216 | 216 | } else { |
217 | 217 | $message = _("<strong>Test successful</strong>: a bidirectional RADIUS conversation with multiple round-trips was carried out, and ended in an Access-Reject as planned."); |
218 | 218 | } |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | $level = \core\common\Entity::L_ERROR; |
236 | 236 | break; |
237 | 237 | } |
238 | - $loggerInstance->debug(4, "SERVER=" . $returnarray['result'][$i]['server'] . "\n"); |
|
238 | + $loggerInstance->debug(4, "SERVER=".$returnarray['result'][$i]['server']."\n"); |
|
239 | 239 | $returnarray['result'][$i]['level'] = $level; |
240 | 240 | $returnarray['result'][$i]['message'] = $message; |
241 | 241 | break; |
@@ -249,13 +249,13 @@ discard block |
||
249 | 249 | if (isset($rfc6614suite->TLS_CA_checks_result[$host])) { |
250 | 250 | $returnarray['time_millisec'] = sprintf("%d", $rfc6614suite->TLS_CA_checks_result[$host]['time_millisec']); |
251 | 251 | if (isset($rfc6614suite->TLS_CA_checks_result[$host]['cert_oddity']) && ($rfc6614suite->TLS_CA_checks_result[$host]['cert_oddity'] == \core\diag\RADIUSTests::CERTPROB_UNKNOWN_CA)) { |
252 | - $returnarray['message'] = _("<strong>ERROR</strong>: the server presented a certificate which is from an unknown authority!") . ' (' . sprintf(_("elapsed time: %d"), $rfc6614suite->TLS_CA_checks_result[$host]['time_millisec']) . ' ms)'; |
|
252 | + $returnarray['message'] = _("<strong>ERROR</strong>: the server presented a certificate which is from an unknown authority!").' ('.sprintf(_("elapsed time: %d"), $rfc6614suite->TLS_CA_checks_result[$host]['time_millisec']).' ms)'; |
|
253 | 253 | $returnarray['level'] = \core\common\Entity::L_ERROR; |
254 | 254 | } else { |
255 | 255 | $returnarray['message'] = $rfc6614suite->returnCodes[$rfc6614suite->TLS_CA_checks_result[$host]['status']]["message"]; |
256 | 256 | $returnarray['level'] = \core\common\Entity::L_OK; |
257 | 257 | if ($rfc6614suite->TLS_CA_checks_result[$host]['status'] != \core\diag\RADIUSTests::RETVAL_CONNECTION_REFUSED) { |
258 | - $returnarray['message'] .= ' (' . sprintf(_("elapsed time: %d"), $rfc6614suite->TLS_CA_checks_result[$host]['time_millisec']) . ' ms)'; |
|
258 | + $returnarray['message'] .= ' ('.sprintf(_("elapsed time: %d"), $rfc6614suite->TLS_CA_checks_result[$host]['time_millisec']).' ms)'; |
|
259 | 259 | } else { |
260 | 260 | $returnarray['level'] = \core\common\Entity::L_ERROR; |
261 | 261 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * License: see the web/copyright.inc.php file in the file structure or |
20 | 20 | * <base_url>/copyright.php after deploying the software |
21 | 21 | */ |
22 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
22 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
23 | 23 | $languageInstance = new \core\common\Language(); |
24 | 24 | $languageInstance->setTextDomain("diagnostics"); |
25 | 25 | |
@@ -56,119 +56,119 @@ discard block |
||
56 | 56 | $select = "<div id='sp_abuse_problem'> |
57 | 57 | <select style='margin-left: 0px;' id='select_sp_problem'>"; |
58 | 58 | foreach ($sp_problem as $pname => $pdesc) { |
59 | - $select = $select . "<option value='$pname'>$pdesc</option>\n"; |
|
59 | + $select = $select."<option value='$pname'>$pdesc</option>\n"; |
|
60 | 60 | } |
61 | - $select = $select . "</select></div>"; |
|
61 | + $select = $select."</select></div>"; |
|
62 | 62 | $res = " |
63 | 63 | <table id='sp_questions'> |
64 | 64 | <tr> |
65 | - <td>" . _("Select your problem") . "</td> |
|
65 | + <td>" . _("Select your problem")."</td> |
|
66 | 66 | <td>$select</td> |
67 | 67 | </tr> |
68 | 68 | <tr> |
69 | - <td>" . _("What is the realm of the IdP in question?") . "</td> |
|
69 | + <td>"._("What is the realm of the IdP in question?")."</td> |
|
70 | 70 | <td> |
71 | 71 | <input type='text' name='admin_realm' id='admin_realm' value=''> |
72 | 72 | <button id='realm_in_db_admin' accesskey='R' type='button'>" . |
73 | - _("Check if this value is registered") . |
|
73 | + _("Check if this value is registered"). |
|
74 | 74 | "</button> |
75 | 75 | </td> |
76 | 76 | </tr> |
77 | 77 | <tr class='hidden_row'> |
78 | - <td>" . _("What is the authentication timestamp of the user session in question?") . "</td> |
|
78 | + <td>" . _("What is the authentication timestamp of the user session in question?")."</td> |
|
79 | 79 | <td><input type='text' id='timestamp' name='timestamp'> |
80 | 80 | <div id='datepicker'></div> |
81 | 81 | </td> |
82 | 82 | </tr> |
83 | 83 | <tr class='hidden_row'> |
84 | - <td>" . _("What is the MAC address of the user session in question?") . "</td> |
|
84 | + <td>" . _("What is the MAC address of the user session in question?")."</td> |
|
85 | 85 | <td><input type='text' id='mac' name='mac'></td> |
86 | 86 | </tr> |
87 | 87 | <tr class='hidden_row'> |
88 | - <td>" . _("Additional comments") . "</td> |
|
88 | + <td>" . _("Additional comments")."</td> |
|
89 | 89 | <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td> |
90 | 90 | </tr> |
91 | 91 | <tr class='hidden_row'> |
92 | - <td>" . _("Please specify an email address on which the IdP can contact you") . "</td> |
|
92 | + <td>" . _("Please specify an email address on which the IdP can contact you")."</td> |
|
93 | 93 | <td><input type='text' id='email' name='email'></td> |
94 | 94 | </tr> |
95 | 95 | <tr class='hidden_row' id='send_query_to_idp'> |
96 | - <td>" . _("Now you can send your query") . "</td> |
|
97 | - <td><button type='submit' id='submit_idp_query' name='go'>" . _("Send") . "</button></td> |
|
96 | + <td>" . _("Now you can send your query")."</td> |
|
97 | + <td><button type='submit' id='submit_idp_query' name='go'>" . _("Send")."</button></td> |
|
98 | 98 | </tr> |
99 | 99 | </table>"; |
100 | - $res = $res . $javascript; |
|
100 | + $res = $res.$javascript; |
|
101 | 101 | } |
102 | 102 | if ($queryType == 'idp') { |
103 | 103 | $select = "<div id='idp_reported_problem' style='display:;'> |
104 | 104 | <select style='margin-left:0px;' id='select_idp_problem'>"; |
105 | 105 | foreach ($idp_problem as $pname => $pdesc) { |
106 | - $select = $select . "<option value='$pname'>$pdesc</option>\n"; |
|
106 | + $select = $select."<option value='$pname'>$pdesc</option>\n"; |
|
107 | 107 | } |
108 | - $select = $select . "</select></div>"; |
|
108 | + $select = $select."</select></div>"; |
|
109 | 109 | $res = " |
110 | 110 | <table id='idp_questions'> |
111 | 111 | <tr> |
112 | - <td>" . _("Select your problem") . "</td> |
|
112 | + <td>" . _("Select your problem")."</td> |
|
113 | 113 | <td>$select</td> |
114 | 114 | </tr> |
115 | 115 | <tr> |
116 | - <td>" . _("Identify the SP by one of following means") . "</td> |
|
116 | + <td>"._("Identify the SP by one of following means")."</td> |
|
117 | 117 | <td></td> |
118 | 118 | </tr> |
119 | 119 | <tr id='by_opname'> |
120 | - <td>" . _("SP Operator-Name attribute") . "</td> |
|
120 | + <td>" . _("SP Operator-Name attribute")."</td> |
|
121 | 121 | <td><input type='text' id='opname' name='opname' value=''></td> |
122 | 122 | </tr> |
123 | 123 | <tr id='spmanually'> |
124 | - <td>" . _("Select the SP manually:") . "</td> |
|
124 | + <td>" . _("Select the SP manually:")."</td> |
|
125 | 125 | <td> |
126 | 126 | <div id='select_asp_country'><a href='' id='asp_countries_list'> |
127 | - <span id='opnameselect'>" . _("click to select country and organisation") . "</a></span> |
|
127 | + <span id='opnameselect'>" . _("click to select country and organisation")."</a></span> |
|
128 | 128 | </div> |
129 | 129 | <div id='select_asp_area'></div> |
130 | 130 | </td> |
131 | 131 | </tr> |
132 | 132 | <tr id='asp_desc' style='display: none;'> |
133 | - <td>" . _("or") . ' ' . _("at least describe the SP location") . "</td> |
|
133 | + <td>" . _("or").' '._("at least describe the SP location")."</td> |
|
134 | 134 | <td><input type='text' id='asp_location' name='asp_location' value=''></td> |
135 | 135 | </tr> |
136 | 136 | <tr> |
137 | - <td>" . _("What is the outer ID of the user session in question?") . "</td> |
|
137 | + <td>" . _("What is the outer ID of the user session in question?")."</td> |
|
138 | 138 | <td><input type='text' id='outer_id' name='outer_id' value=''></td> |
139 | 139 | </tr> |
140 | 140 | <tr> |
141 | - <td>" . _("What is the authentication timestamp of the user session in question?") . "</td> |
|
141 | + <td>" . _("What is the authentication timestamp of the user session in question?")."</td> |
|
142 | 142 | <td> |
143 | 143 | <input type='text' id='timestamp' name='timestamp'> |
144 | 144 | <div id='datepicker'></div> |
145 | 145 | </td> |
146 | 146 | </tr> |
147 | 147 | <tr> |
148 | - <td>" . _("What is the MAC address of the user session in question?") . "</td> |
|
148 | + <td>" . _("What is the MAC address of the user session in question?")."</td> |
|
149 | 149 | <td><input type='text' id='mac' name='mac'></td> |
150 | 150 | </tr> |
151 | 151 | <tr> |
152 | - <td>" . _("Additional comments about the problem") . "</td> |
|
152 | + <td>" . _("Additional comments about the problem")."</td> |
|
153 | 153 | <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td> |
154 | 154 | </tr> |
155 | 155 | <tr> |
156 | - <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?") . "</td> |
|
156 | + <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?")."</td> |
|
157 | 157 | <td><textarea id='c_details' name='c_details' cols='60' rows='5'></textarea></td> |
158 | 158 | </tr> |
159 | 159 | <tr> |
160 | - <td>" . _("Please specify an email address on which the SP can contact you") . "</td> |
|
160 | + <td>" . _("Please specify an email address on which the SP can contact you")."</td> |
|
161 | 161 | <td><input type='text' id='email' name='email'></td> |
162 | 162 | </tr> |
163 | 163 | <tr class='hidden_row' id='send_query_to_sp'> |
164 | - <td>" . _("Now you can send your query") . "</td> |
|
165 | - <td><button type='submit' id='submit_sp_query' name='go'>" . _("Send") . "</button></td> |
|
164 | + <td>" . _("Now you can send your query")."</td> |
|
165 | + <td><button type='submit' id='submit_sp_query' name='go'>" . _("Send")."</button></td> |
|
166 | 166 | </tr> |
167 | 167 | </table>"; |
168 | - $res = $res . $javascript; |
|
168 | + $res = $res.$javascript; |
|
169 | 169 | } |
170 | 170 | if ($queryType == 'idp_send' || $queryType == 'sp_send') { |
171 | - include_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
171 | + include_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
172 | 172 | $cat = new \core\CAT(); |
173 | 173 | $returnArray = array(); |
174 | 174 | if (count((array) $o) > 0) { |