@@ -90,7 +90,7 @@ |
||
90 | 90 | |
91 | 91 | if (isset(CONFIG['CONSORTIUM']['ssid']) && count(CONFIG['CONSORTIUM']['ssid']) > 0) |
92 | 92 | foreach (CONFIG['CONSORTIUM']['ssid'] as $ssidname) |
93 | - $ssids[] = $ssidname . " " . (isset(CONFIG['CONSORTIUM']['tkipsupport']) && CONFIG['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") ); |
|
93 | + $ssids[] = $ssidname . " " . (isset(CONFIG['CONSORTIUM']['tkipsupport']) && CONFIG['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)")); |
|
94 | 94 | |
95 | 95 | $custom_ssids_wpa2 = $my_inst->getAttributes("media:SSID"); |
96 | 96 | $custom_ssids_wpa = $my_inst->getAttributes("media:SSID_with_legacy"); |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | sprintf(_("In this section, you define on which media %s should be configured on user devices."), CONFIG['CONSORTIUM']['name']) . "</p> |
137 | 137 | <ul>"; |
138 | 138 | echo "<li>"; |
139 | - echo "<strong>" . ( count(CONFIG['CONSORTIUM']['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>"; |
|
139 | + echo "<strong>" . (count(CONFIG['CONSORTIUM']['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>"; |
|
140 | 140 | if (count(CONFIG['CONSORTIUM']['ssid']) > 0) { |
141 | 141 | $ssidlist = ""; |
142 | 142 | foreach (CONFIG['CONSORTIUM']['ssid'] as $ssid) |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | echo "</li>"; |
154 | 154 | |
155 | 155 | echo "<li>"; |
156 | - echo "<strong>" . ( count(CONFIG['CONSORTIUM']['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>"; |
|
156 | + echo "<strong>" . (count(CONFIG['CONSORTIUM']['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>"; |
|
157 | 157 | if (count(CONFIG['CONSORTIUM']['interworking-consortium-oi']) > 0) { |
158 | 158 | $consortiumlist = ""; |
159 | 159 | foreach (CONFIG['CONSORTIUM']['interworking-consortium-oi'] as $oi) |
@@ -12,5 +12,5 @@ |
||
12 | 12 | $old_include_path = get_include_path(); |
13 | 13 | set_include_path(dirname(__DIR__)); |
14 | 14 | require_once("packageRoot.php"); |
15 | -include(ROOT."/config/config.php"); |
|
15 | +include(ROOT . "/config/config.php"); |
|
16 | 16 | set_include_path($old_include_path . PATH_SEPARATOR . ROOT . "/core" . PATH_SEPARATOR . ROOT); |
17 | 17 | \ No newline at end of file |
@@ -188,8 +188,8 @@ |
||
188 | 188 | # will be the default value prompted to the user |
189 | 189 | |
190 | 190 | private function printFunctions() { |
191 | - $url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0] ) ? $this->attributes['support:url'][0] : $this->support_url_substitute; |
|
192 | - $support = (isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0] ) ? $this->attributes['support:email'][0] : $this->support_email_substitute; |
|
191 | + $url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0]) ? $this->attributes['support:url'][0] : $this->support_url_substitute; |
|
192 | + $support = (isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0]) ? $this->attributes['support:email'][0] : $this->support_email_substitute; |
|
193 | 193 | $out = ' |
194 | 194 | my_name=$0 |
195 | 195 |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | } |
234 | 234 | } |
235 | 235 | $out .= '>' . $disp . '</option>'; |
236 | - $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';'; |
|
236 | + $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';'; |
|
237 | 237 | $iterator++; |
238 | 238 | } |
239 | 239 | $out .= '</select>'; |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | $loggerInstance->debug(4, "SERVER\n"); |
430 | 430 | $loggerInstance->debug(4, $_SERVER); |
431 | 431 | ?> |
432 | -<?php print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ' ) . '</div>'; ?> |
|
432 | +<?php print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ') . '</div>'; ?> |
|
433 | 433 | <form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME'] ?>" accept-charset='UTF-8'> |
434 | 434 | <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" /> |
435 | 435 | <?php |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $objs = []; |
149 | 149 | if ($this->langScope === 'global') { |
150 | 150 | foreach ($attributeList['langs'] as $language => $value) { |
151 | - $language = ( $language === 'C' ? 'any' : $language ); |
|
151 | + $language = ($language === 'C' ? 'any' : $language); |
|
152 | 152 | $obj = new $class_name(); |
153 | 153 | $obj->setValue($value); |
154 | 154 | $obj->setAttributes(['lang' => $language]); |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | $P = $attr['profile:name']['langs']; |
173 | 173 | } |
174 | 174 | foreach ($instNameLangs as $language => $value) { |
175 | - $language = ( $language === 'C' ? 'any' : $language ); |
|
175 | + $language = ($language === 'C' ? 'any' : $language); |
|
176 | 176 | $displayname = new DisplayName(); |
177 | 177 | if (isset($P)) { |
178 | 178 | $p = isset($P[$language]) ? $P[$language] : $P['C']; |
@@ -129,7 +129,7 @@ |
||
129 | 129 | <div id="heading"> |
130 | 130 | <?php |
131 | 131 | print '<img src="resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
132 | - print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ' ) . '</div>'; |
|
132 | + print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ') . '</div>'; |
|
133 | 133 | print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1> |
134 | 134 | <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>'; |
135 | 135 | echo '<table id="lang_select"><tr><td>'; |
@@ -501,8 +501,8 @@ |
||
501 | 501 | |
502 | 502 | $fcontents .= ';-------------------------------- |
503 | 503 | !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->code_page) . '" |
504 | -!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '" |
|
505 | -!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '" |
|
504 | +!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '" |
|
505 | +!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '" |
|
506 | 506 | |
507 | 507 | !ifdef TLS |
508 | 508 | '; |
@@ -501,8 +501,8 @@ |
||
501 | 501 | |
502 | 502 | $fcontents .= ';-------------------------------- |
503 | 503 | !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->code_page) . '" |
504 | -!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '" |
|
505 | -!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '" |
|
504 | +!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '" |
|
505 | +!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '" |
|
506 | 506 | |
507 | 507 | !ifdef TLS |
508 | 508 | '; |