@@ -138,6 +138,9 @@ |
||
138 | 138 | return($out); |
139 | 139 | } |
140 | 140 | |
141 | + /** |
|
142 | + * @param integer $maxSize |
|
143 | + */ |
|
141 | 144 | private function scaleLogo($imagePath, $maxSize) { |
142 | 145 | $imageObject = new \Imagick($imagePath); |
143 | 146 | $imageSize = $imageObject->getImageGeometry(); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | |
91 | 91 | public function __construct() { |
92 | 92 | parent::__construct(); |
93 | - $this->useGeantLink = (isset($this->options['args']) && $this->options['args'] == 'gl' ) ? 1 : 0; |
|
93 | + $this->useGeantLink = (isset($this->options['args']) && $this->options['args'] == 'gl') ? 1 : 0; |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | protected function prepareInstallerLang() { |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | // not EAP-TLS |
127 | 127 | $out .= sprintf(_("In order to connect to the network you will need an account from your %s. You should consult the support page to find out how this account can be obtained. It is very likely that your account is already activated."), $this->nomenclature_inst); |
128 | 128 | |
129 | - if (! $this->useGeantLink && ( $this->selectedEap == \core\common\EAP::EAPTYPE_TTLS_MSCHAP2 || $this->selectedEap == \core\common\EAP::EAPTYPE_TTLS_PAP )) { |
|
129 | + if (!$this->useGeantLink && ($this->selectedEap == \core\common\EAP::EAPTYPE_TTLS_MSCHAP2 || $this->selectedEap == \core\common\EAP::EAPTYPE_TTLS_PAP)) { |
|
130 | 130 | $out .= "<p>"; |
131 | 131 | $out .= _("When you are connecting to the network for the first time, Windows will pop up a login box, where you should enter your user name and password. This information will be saved so that you will reconnect to the network automatically each time you are in the range."); |
132 | 132 | if ($ssidCount > 1) { |
@@ -180,10 +180,10 @@ discard block |
||
180 | 180 | $this->background['freeHeight'] = $bgImageSize['height'] - $freeTop - $freeBottom; |
181 | 181 | |
182 | 182 | if ($useFederationLogo && $fedLogo != NULL) { |
183 | - $logosToPlace[] = $this->scaleLogo($fedLogo[0]['name'],$maxSize); |
|
183 | + $logosToPlace[] = $this->scaleLogo($fedLogo[0]['name'], $maxSize); |
|
184 | 184 | } |
185 | 185 | if ($logos != NULL) { |
186 | - $logosToPlace[] = $this->scaleLogo($logos[0]['name'],$maxSize); |
|
186 | + $logosToPlace[] = $this->scaleLogo($logos[0]['name'], $maxSize); |
|
187 | 187 | } |
188 | 188 | |
189 | 189 | $logoCount = count($logosToPlace); |