@@ -131,6 +131,7 @@ discard block |
||
| 131 | 131 | * |
| 132 | 132 | * @param string $device |
| 133 | 133 | * @param AbstractProfile $profile |
| 134 | + * @param string $generatedFor |
|
| 134 | 135 | * @return array info about the new installer (mime and link) |
| 135 | 136 | */ |
| 136 | 137 | private function generateNewInstaller($device, $profile, $generatedFor, $token, $password) { |
@@ -501,9 +502,9 @@ discard block |
||
| 501 | 502 | * |
| 502 | 503 | * When called for DiscoJuice, first check if file cache exists |
| 503 | 504 | * If not then generate the file and save it in the cache |
| 504 | - * @param int $idp IdP identifier |
|
| 505 | 505 | * @param int $width maximum width of the generated image - if 0 then it is treated as no upper bound |
| 506 | 506 | * @param int $height maximum height of the generated image - if 0 then it is treated as no upper bound |
| 507 | + * @param string $type |
|
| 507 | 508 | * @return array|null array with image information or NULL if there is no logo |
| 508 | 509 | */ |
| 509 | 510 | private function getLogo($identifier, $type, $width = 0, $height = 0) { |
@@ -678,6 +679,7 @@ discard block |
||
| 678 | 679 | /** |
| 679 | 680 | * Order active identity providers according to their distance and name |
| 680 | 681 | * @param array $currentLocation - current location |
| 682 | + * @param string $country |
|
| 681 | 683 | * @return array $IdPs - list of arrays ('id', 'name'); |
| 682 | 684 | */ |
| 683 | 685 | public function orderIdentityProviders($country, $currentLocation = NULL) { |
@@ -549,7 +549,7 @@ |
||
| 549 | 549 | if (count($logoAttribute) == 0) { |
| 550 | 550 | return(NULL); |
| 551 | 551 | } |
| 552 | - $this->loggerInstance->debug(4,"RESIZE:$width:$height\n"); |
|
| 552 | + $this->loggerInstance->debug(4, "RESIZE:$width:$height\n"); |
|
| 553 | 553 | $meta = $this->processImage($logoAttribute[0]['value'], $logoFile, $width, $height, $resize); |
| 554 | 554 | $filetype = $meta['filetype']; |
| 555 | 555 | $expiresString = $meta['expires']; |