@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | echo $deco->productheader("FEDERATION"); |
28 | 28 | ?> |
29 | 29 | <h1> |
30 | - <?php echo sprintf(_("%s Overview"),$uiElements->nomenclature_fed); ?> |
|
30 | + <?php echo sprintf(_("%s Overview"), $uiElements->nomenclature_fed); ?> |
|
31 | 31 | </h1> |
32 | 32 | |
33 | 33 | <div class="infobox"> |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $mgmt = new \core\UserManagement(); |
52 | 52 | |
53 | 53 | if (!$user->isFederationAdmin()) { |
54 | - echo "<p>" . sprintf(_("You are not a %s manager."),$uiElements->nomenclature_fed) . "</p>"; |
|
54 | + echo "<p>" . sprintf(_("You are not a %s manager."), $uiElements->nomenclature_fed) . "</p>"; |
|
55 | 55 | echo $deco->footer(); |
56 | 56 | exit(0); |
57 | 57 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | // deployment status; need to dive into profiles for this |
198 | 198 | // show happy eyeballs if at least one profile is configured/showtime |
199 | 199 | echo "<td>"; |
200 | - echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "" ) . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "" ); |
|
200 | + echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "") . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : ""); |
|
201 | 201 | echo "</td>"; |
202 | 202 | // name |
203 | 203 | echo "<td> |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | echo "<tr> |
237 | 237 | <td colspan='2'> |
238 | 238 | <strong>" . |
239 | - sprintf(_("Pending invitations in your %s:"),$uiElements->nomenclature_fed) . " |
|
239 | + sprintf(_("Pending invitations in your %s:"), $uiElements->nomenclature_fed) . " |
|
240 | 240 | </strong> |
241 | 241 | </td> |
242 | 242 | </tr>"; |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | <key>PayloadIdentifier</key> |
72 | 72 | <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string> |
73 | 73 | <key>PayloadOrganization</key> |
74 | - <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string> |
|
74 | + <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string> |
|
75 | 75 | <key>PayloadType</key> |
76 | 76 | <string>Configuration</string> |
77 | 77 | <key>PayloadUUID</key> |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | |
120 | 120 | $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE)); |
121 | 121 | |
122 | - $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"),$this->nomenclature_inst); |
|
122 | + $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"), $this->nomenclature_inst); |
|
123 | 123 | $this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile"); |
124 | 124 | |
125 | 125 | $this->massagedInst = $this->massageName($this->instName); |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | <key>PayloadVersion</key> |
480 | 480 | <integer>1</integer> |
481 | 481 | </dict>", |
482 | - "UUID" => $payloadUUID,]; |
|
482 | + "UUID" => $payloadUUID, ]; |
|
483 | 483 | } |
484 | 484 | |
485 | 485 | private function expiryBlock() { |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $cat = new \core\CAT(); |
43 | 43 | $fedIdentifiers = array_keys($cat->knownFederations); |
44 | 44 | if (!in_array(strtoupper($input), $fedIdentifiers)) { |
45 | - throw new Exception($this->inputValidationError(sprintf("This %s does not exist!",$cat->nomenclature_fed))); |
|
45 | + throw new Exception($this->inputValidationError(sprintf("This %s does not exist!", $cat->nomenclature_fed))); |
|
46 | 46 | } |
47 | 47 | // totally circular, but this hopefully *finally* make Scrutinizer happier |
48 | 48 | $correctIndex = array_search(strtoupper($input), $fedIdentifiers); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | return $temp; |
59 | 59 | } |
60 | 60 | } |
61 | - throw new Exception($this->inputValidationError(sprintf("User is not %s administrator!",$cat->nomenclature_fed))); |
|
61 | + throw new Exception($this->inputValidationError(sprintf("User is not %s administrator!", $cat->nomenclature_fed))); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | */ |
135 | 135 | public function string($input, $allowWhitespace = FALSE) { |
136 | 136 | // always chop out invalid characters, and surrounding whitespace |
137 | - $retvalStep0 = iconv("UTF-8", "UTF-8//TRANSLIT", $input); |
|
137 | + $retvalStep0 = iconv("UTF-8", "UTF-8//TRANSLIT", $input); |
|
138 | 138 | if ($retvalStep0 === FALSE) { |
139 | 139 | throw new Exception("iconv failure for string sanitisation. With TRANSLIT, this should never happen!"); |
140 | 140 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | if (is_array($afterWhitespace)) { |
156 | 156 | throw new Exception("This function has to be given a string and returns a string. preg_replace has generated an array instead!"); |
157 | 157 | } |
158 | - return (string)$afterWhitespace; |
|
158 | + return (string) $afterWhitespace; |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | /** |
@@ -37,7 +37,7 @@ |
||
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; |
@@ -10,8 +10,8 @@ |
||
10 | 10 | <?php |
11 | 11 | |
12 | 12 | if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam" && isset(CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo']) && CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo'] == "Operations Team") { |
13 | -echo "<span id='logos'><img src='".$Gui->skinObject->findResourceUrl("IMAGES","dante.png")."' alt='DANTE' style='height:23px;width:47px'/> |
|
14 | - <img src='".$Gui->skinObject->findResourceUrl("IMAGES","eu.png")."' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span> |
|
13 | +echo "<span id='logos'><img src='" . $Gui->skinObject->findResourceUrl("IMAGES", "dante.png") . "' alt='DANTE' style='height:23px;width:47px'/> |
|
14 | + <img src='".$Gui->skinObject->findResourceUrl("IMAGES", "eu.png") . "' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span> |
|
15 | 15 | <span id='eu_text' style='text-align:right; padding-left: 60px; display: block; '><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top; text-align:right'>European Commission Communications Networks, Content and Technology</a></span>"; |
16 | 16 | |
17 | 17 | } else { |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | $uiElements = new \web\lib\admin\UIElements(); |
40 | 40 | |
41 | -$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'),$uiElements->nomenclature_inst), '1.3.3'); |
|
41 | +$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'), $uiElements->nomenclature_inst), '1.3.3'); |
|
42 | 42 | // Load global scripts |
43 | 43 | $page->appendScript('js/option_expand.js'); |
44 | 44 | $page->appendScript('../external/jquery/jquery.js'); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $builder = new InstitutionPageBuilder($page); |
56 | 56 | $builder->buildPagePrelude(); |
57 | 57 | $builder->buildPageHeader(); |
58 | -if($builder->isReady()){ |
|
58 | +if ($builder->isReady()) { |
|
59 | 59 | // this page may have been called for the first time, when the profile does not |
60 | 60 | // actually exist in the DB yet. If so, we will need to create it first. |
61 | 61 | if (!isset($_REQUEST['profile_id'])) { |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | $fed = new \core\Federation($inst->federation); |
70 | 70 | $allowSb = $fed->getAttributes("fed:silverbullet"); |
71 | 71 | if (count($allowSb) == 0) { |
72 | - throw new Exception("We were told to create a new SB profile, but this ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." does not allow SB at all!"); |
|
72 | + throw new Exception("We were told to create a new SB profile, but this " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " does not allow SB at all!"); |
|
73 | 73 | } |
74 | 74 | // okay, new SB profiles are allowed. Create one. |
75 | 75 | $newProfile = $inst->newProfile("SILVERBULLET"); |
76 | 76 | // and modify the REQUEST_URI to add the new profile ID |
77 | - $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI']."&profile_id=".$newProfile->identifier; |
|
77 | + $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . "&profile_id=" . $newProfile->identifier; |
|
78 | 78 | $_GET['profile_id'] = $newProfile->identifier; |
79 | 79 | } |
80 | 80 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $action = $context->addQuery($_SERVER['SCRIPT_NAME']); |
88 | 88 | |
89 | 89 | //Info block data preparation |
90 | - $infoBlock = new InfoBlockTable( sprintf(_('Current %s users'), $uiElements->nomenclature_inst)); |
|
90 | + $infoBlock = new InfoBlockTable(sprintf(_('Current %s users'), $uiElements->nomenclature_inst)); |
|
91 | 91 | $infoBlock->addRow(array('The assigned realm', $builder->getRealmName())); |
92 | 92 | $infoBlock->addRow(array('The total number of active users which are allowed for this profile', $stats[SilverbulletContext::STATS_TOTAL])); |
93 | 93 | $infoBlock->addRow(array('The current number of configured active users', $stats[SilverbulletContext::STATS_ACTIVE])); |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | $builder->addContentElement($infoBlock); |
96 | 96 | |
97 | 97 | //Edit form data preparation |
98 | - $acknowledgeText = _ ( 'You need to acknowledge that the created accounts are still valid within the next %s days.' |
|
98 | + $acknowledgeText = _('You need to acknowledge that the created accounts are still valid within the next %s days.' |
|
99 | 99 | .' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".' |
100 | - .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.' ); |
|
100 | + .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.'); |
|
101 | 101 | $editBlock = new UserCredentialsForm($context, $action, sprintf(_('Manage %s users'), $uiElements->nomenclature_inst), $acknowledgeText, count($users) > 0); |
102 | 102 | foreach ($users as $user) { |
103 | 103 | $editBlock->addUserRow($user); |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | $builder->addContentElement($tabbedBox); |
125 | 125 | |
126 | 126 | //Appending terms of use popup |
127 | - if(!$context->isAgreementSigned()){ |
|
127 | + if (!$context->isAgreementSigned()) { |
|
128 | 128 | $termsOfUse = new TermsOfUseBox($action, TermsOfUseCommand::COMMAND, TermsOfUseCommand::AGREEMENT); |
129 | 129 | $termsOfUsePopup = new PopupMessageContainer($termsOfUse, PageElementInterface::MESSAGEPOPUP_CLASS, \core\ProfileSilverbullet::PRODUCTNAME . " - " . _('Terms of Use')); |
130 | 130 | $termsOfUsePopup->setCloseButtonClass('redirect'); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | |
142 | 142 | //Adding hidden QR code popup template |
143 | 143 | $qrCodeImage = new UnaryTag("img"); |
144 | - $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS."-image"); |
|
144 | + $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS . "-image"); |
|
145 | 145 | $qrCodeImage->addAttribute("alt", _('Invitation QR Code')); |
146 | 146 | $qrCodeImage->addAttribute("width", 400); |
147 | 147 | $qrCodeImage->addAttribute("height", 400); |
@@ -90,7 +90,7 @@ |
||
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 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | // if we have a pushed close button, submit attributes and send user back to the overview page |
27 | 27 | // if external DB sync is disabled globally, the user never gets to this page. If he came here *anyway* -> send him back immediately. |
28 | -if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\admin\FormElements::BUTTON_CLOSE ) || CONFIG['DB']['enforce-external-sync'] == FALSE) { |
|
28 | +if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\admin\FormElements::BUTTON_CLOSE) || CONFIG['DB']['enforce-external-sync'] == FALSE) { |
|
29 | 29 | header("Location: ../overview_federation.php"); |
30 | 30 | exit; |
31 | 31 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | // right-hand side: external DB |
108 | 108 | $externalid = $my_inst->getExternalDBId(); |
109 | 109 | if (!$externalid) { // we are in SYNCED state so this cannot happen |
110 | - throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']."!"); |
|
110 | + throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . "!"); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | $extinfo = $cat->getExternalDBEntityDetails($externalid); |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | } |
169 | 169 | // issue a big red warning if there are no link candidates at all in the federation |
170 | 170 | if (empty($buffer) && empty($candidates)) { |
171 | - echo "<tr><td style='color:#ff0000' colspan='2'>". sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclature_inst, $uiElements->nomenclature_fed)."</td></tr>"; |
|
171 | + echo "<tr><td style='color:#ff0000' colspan='2'>" . sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclature_inst, $uiElements->nomenclature_fed) . "</td></tr>"; |
|
172 | 172 | } |
173 | 173 | echo "</table><button type='submit' name='submitbutton' id='submit' value='" . web\lib\admin\FormElements::BUTTON_SAVE . "' disabled >" . _("Create Link") . "</button></form>"; |
174 | 174 | } |
@@ -11,7 +11,7 @@ discard block |
||
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 |
||
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> |