@@ -130,21 +130,21 @@ |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | /** |
133 | - * Transcode a string adding double quotes escaping |
|
134 | - * |
|
135 | - * Transcoding is only required for Windows installers, and no Unicode support |
|
136 | - * in NSIS (NSIS version below 3) |
|
137 | - * Trancoding is only applied if the third optional parameter is set and nonzero |
|
138 | - * If CONFIG['NSIS']_VERSION is set to 3 or more, no transcoding will be applied |
|
139 | - * regardless of the second parameter value. |
|
140 | - * The second optional parameter, if nonzero, should be the character set understood by iconv |
|
141 | - * This is required by the Windows installer and is expected to go away in the future. |
|
142 | - * |
|
143 | - * @param string $source_string The source string |
|
144 | - * @param int $encoding Set Windows charset if non-zero |
|
145 | - * @return string |
|
146 | - * @final not to be redefined |
|
147 | - */ |
|
133 | + * Transcode a string adding double quotes escaping |
|
134 | + * |
|
135 | + * Transcoding is only required for Windows installers, and no Unicode support |
|
136 | + * in NSIS (NSIS version below 3) |
|
137 | + * Trancoding is only applied if the third optional parameter is set and nonzero |
|
138 | + * If CONFIG['NSIS']_VERSION is set to 3 or more, no transcoding will be applied |
|
139 | + * regardless of the second parameter value. |
|
140 | + * The second optional parameter, if nonzero, should be the character set understood by iconv |
|
141 | + * This is required by the Windows installer and is expected to go away in the future. |
|
142 | + * |
|
143 | + * @param string $source_string The source string |
|
144 | + * @param int $encoding Set Windows charset if non-zero |
|
145 | + * @return string |
|
146 | + * @final not to be redefined |
|
147 | + */ |
|
148 | 148 | final protected function translateString($source_string, $encoding = 0) { |
149 | 149 | $this->loggerInstance->debug(5, "translateString input: \"$source_string\"\n"); |
150 | 150 | if (empty($source_string)) { |
@@ -116,16 +116,16 @@ |
||
116 | 116 | 'server_suffix' => '.hosted.eduroam.org', |
117 | 117 | 'gracetime' => 90, |
118 | 118 | 'CA' => ["type" => "embedded"], # OCSP URL needs to be configured in openssl.cnf |
119 | - # 'CA' => ["type" => "DFN", "SOAP_API_ENDPOINT" => "http://no.idea.where/"], |
|
119 | + # 'CA' => ["type" => "DFN", "SOAP_API_ENDPOINT" => "http://no.idea.where/"], |
|
120 | 120 | |
121 | 121 | ], |
122 | 122 | |
123 | 123 | /** |
124 | - * Lists the RADIUS servers. They have a built-in DB to log auth requests. |
|
125 | - * We need to query those to get auth stats for silverbullet admins |
|
126 | - * |
|
127 | - * @var array |
|
128 | - */ |
|
124 | + * Lists the RADIUS servers. They have a built-in DB to log auth requests. |
|
125 | + * We need to query those to get auth stats for silverbullet admins |
|
126 | + * |
|
127 | + * @var array |
|
128 | + */ |
|
129 | 129 | 'DB' => [ |
130 | 130 | // names don't matter - the source code will iterate through |
131 | 131 | // all entries |
@@ -324,7 +324,6 @@ |
||
324 | 324 | * |
325 | 325 | * @param string $format only "der" and "pem" are currently allowed |
326 | 326 | * @return array an array of arrays or empty array on error |
327 | - |
|
328 | 327 | */ |
329 | 328 | final protected function saveCertificateFiles($format) { |
330 | 329 | switch ($format) { |