@@ -297,10 +297,11 @@ |
||
297 | 297 | <allow-save>true</allow-save> |
298 | 298 | '; |
299 | 299 | if ($use_anon == 1) { |
300 | - if ($outer_user == '') |
|
301 | - $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>'; |
|
302 | - else |
|
303 | - $profileFileCont .= '<AnonymousIdentity>' . $outer_id . '</AnonymousIdentity>'; |
|
300 | + if ($outer_user == '') { |
|
301 | + $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>'; |
|
302 | + } else { |
|
303 | + $profileFileCont .= '<AnonymousIdentity>' . $outer_id . '</AnonymousIdentity>'; |
|
304 | + } |
|
304 | 305 | } |
305 | 306 | $profileFileCont .= '</ClientSideCredential> |
306 | 307 | <ServerSideCredential> |
@@ -446,8 +446,8 @@ |
||
446 | 446 | |
447 | 447 | $fcontents .= ';-------------------------------- |
448 | 448 | !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->codePage) . '" |
449 | -!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '" |
|
450 | -!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '" |
|
449 | +!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '" |
|
450 | +!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '" |
|
451 | 451 | |
452 | 452 | !ifdef TLS |
453 | 453 | '; |
@@ -446,8 +446,8 @@ |
||
446 | 446 | |
447 | 447 | $fcontents .= ';-------------------------------- |
448 | 448 | !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->codePage) . '" |
449 | -!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '" |
|
450 | -!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '" |
|
449 | +!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '" |
|
450 | +!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '" |
|
451 | 451 | |
452 | 452 | !ifdef TLS |
453 | 453 | '; |
@@ -446,8 +446,8 @@ |
||
446 | 446 | |
447 | 447 | $fcontents .= ';-------------------------------- |
448 | 448 | !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->codePage) . '" |
449 | -!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '" |
|
450 | -!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '" |
|
449 | +!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '" |
|
450 | +!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '" |
|
451 | 451 | |
452 | 452 | !ifdef TLS |
453 | 453 | '; |
@@ -90,7 +90,7 @@ |
||
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() { |