@@ -68,13 +68,12 @@ |
||
| 68 | 68 | |
| 69 | 69 | <?php |
| 70 | 70 | /** |
| 71 | - * The OS object holds operating system descriptions |
|
| 72 | - * @param name is the main title |
|
| 73 | - * @param subtitle - the subtitle |
|
| 74 | - * @param path - the path to the scriin-dump image |
|
| 75 | - * @param signed - if true show information that the module is signed |
|
| 76 | - |
|
| 77 | -*/ |
|
| 71 | + * The OS object holds operating system descriptions |
|
| 72 | + * @param name is the main title |
|
| 73 | + * @param subtitle - the subtitle |
|
| 74 | + * @param path - the path to the scriin-dump image |
|
| 75 | + * @param signed - if true show information that the module is signed |
|
| 76 | + */ |
|
| 78 | 77 | ?> |
| 79 | 78 | |
| 80 | 79 | function OS(name, subtitle, path, signed) { |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | core\ProfileSilverbullet::triggerNewOCSPStatement($serialRow->serial_number); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - /* |
|
| 26 | + /* |
|
| 27 | 27 | * and then writes all recently updated statements to a temporary directory. The |
| 28 | 28 | * calling script ocsp_update.sh should then scp all the files to their |
| 29 | 29 | * destination. |
@@ -156,8 +156,8 @@ |
||
| 156 | 156 | // replace namespace separators with directory separators |
| 157 | 157 | // in the relative class name, append with .php |
| 158 | 158 | $file = $base_dir |
| 159 | - . str_replace('\\', '/', $relative_class) |
|
| 160 | - . '.php'; |
|
| 159 | + . str_replace('\\', '/', $relative_class) |
|
| 160 | + . '.php'; |
|
| 161 | 161 | |
| 162 | 162 | // if the mapped file exists, require it |
| 163 | 163 | if ($this->requireFile($file)) { |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | if (isset($Cache[$entry])) { |
| 42 | 42 | continue; |
| 43 | 43 | } |
| 44 | - \core\common\Entity::rrmdir($downloads . '/' . $entry); |
|
| 44 | + \core\common\Entity::rrmdir($downloads . '/' . $entry); |
|
| 45 | 45 | print "$entry\n"; |
| 46 | 46 | } |
| 47 | 47 | closedir($handle); |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | if ($ftime < 3600) { |
| 57 | 57 | continue; |
| 58 | 58 | } |
| 59 | - \core\common\Entity::rrmdir($downloads . '/' . $entry); |
|
| 59 | + \core\common\Entity::rrmdir($downloads . '/' . $entry); |
|
| 60 | 60 | print "$entry\n"; |
| 61 | 61 | } |
| 62 | 62 | closedir($handle); |
@@ -11,15 +11,15 @@ |
||
| 11 | 11 | namespace devices\redirect_dev; |
| 12 | 12 | |
| 13 | 13 | class Device_RedirectDev extends \core\DeviceConfig { |
| 14 | - /** |
|
| 15 | - * Constructs a Device object. |
|
| 16 | - * |
|
| 17 | - * @final not to be redefined |
|
| 18 | - */ |
|
| 14 | + /** |
|
| 15 | + * Constructs a Device object. |
|
| 16 | + * |
|
| 17 | + * @final not to be redefined |
|
| 18 | + */ |
|
| 19 | 19 | final public function __construct() { |
| 20 | 20 | parent::__construct(); |
| 21 | - $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); |
|
| 22 | - $this->loggerInstance->debug(4,"RedirectEx called"); |
|
| 21 | + $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); |
|
| 22 | + $this->loggerInstance->debug(4,"RedirectEx called"); |
|
| 23 | 23 | } |
| 24 | 24 | public function writeDeviceInfo() { |
| 25 | 25 | $out = "<p>"; |
@@ -246,11 +246,11 @@ discard block |
||
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | /** |
| 249 | - * This function parses a X.509 cert and returns all certificatePolicies OIDs |
|
| 250 | - * |
|
| 251 | - * @param array $cert (returned from openssl_x509_parse) |
|
| 252 | - * @return array of OIDs |
|
| 253 | - */ |
|
| 249 | + * This function parses a X.509 cert and returns all certificatePolicies OIDs |
|
| 250 | + * |
|
| 251 | + * @param array $cert (returned from openssl_x509_parse) |
|
| 252 | + * @return array of OIDs |
|
| 253 | + */ |
|
| 254 | 254 | private function propertyCheckPolicy($cert) { |
| 255 | 255 | $oids = []; |
| 256 | 256 | if ($cert['extensions']['certificatePolicies']) { |
@@ -263,11 +263,11 @@ discard block |
||
| 263 | 263 | return $oids; |
| 264 | 264 | } |
| 265 | 265 | /** |
| 266 | - * This function parses a X.509 cert and returns the value of $field |
|
| 267 | - * |
|
| 268 | - * @param array $cert (returned from openssl_x509_parse) |
|
| 269 | - * @return string value of the issuer field or '' |
|
| 270 | - */ |
|
| 266 | + * This function parses a X.509 cert and returns the value of $field |
|
| 267 | + * |
|
| 268 | + * @param array $cert (returned from openssl_x509_parse) |
|
| 269 | + * @return string value of the issuer field or '' |
|
| 270 | + */ |
|
| 271 | 271 | private function getCertificateIssuer($cert) { |
| 272 | 272 | $issuer = ''; |
| 273 | 273 | foreach ($cert['issuer'] as $key => $val) { |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | 'server_suffix' => '.hosted.eduroam.org', |
| 89 | 89 | 'gracetime' => 90, |
| 90 | 90 | 'CA' => ["type" => "embedded"], # OCSP URL needs to be configured in openssl.cnf |
| 91 | - # 'CA' => ["type" => "DFN", "SOAP_API_ENDPOINT" => "http://no.idea.where/"], |
|
| 91 | + # 'CA' => ["type" => "DFN", "SOAP_API_ENDPOINT" => "http://no.idea.where/"], |
|
| 92 | 92 | |
| 93 | 93 | ], |
| 94 | 94 | /** |
@@ -125,6 +125,7 @@ discard block |
||
| 125 | 125 | * |
| 126 | 126 | * @param string $device |
| 127 | 127 | * @param AbstractProfile $profile |
| 128 | + * @param string $generatedFor |
|
| 128 | 129 | * @return array info about the new installer (mime and link) |
| 129 | 130 | */ |
| 130 | 131 | private function generateNewInstaller($device, $profile, $generatedFor, $token, $password) { |
@@ -459,6 +460,10 @@ discard block |
||
| 459 | 460 | readfile($file); |
| 460 | 461 | } |
| 461 | 462 | |
| 463 | + /** |
|
| 464 | + * @param string $destFile |
|
| 465 | + * @param integer $resize |
|
| 466 | + */ |
|
| 462 | 467 | private function processImage($inputImage, $destFile, $width, $height, $resize) { |
| 463 | 468 | $info = new \finfo(); |
| 464 | 469 | $filetype = $info->buffer($inputImage, FILEINFO_MIME_TYPE); |
@@ -485,7 +490,6 @@ discard block |
||
| 485 | 490 | * When called for DiscoJuice, first check if file cache exists |
| 486 | 491 | * If not then generate the file and save it in the cache |
| 487 | 492 | * @param int $idp IdP identifier |
| 488 | - * @param int $disco flag turning on image generation for DiscoJuice |
|
| 489 | 493 | * @param int $width maximum width of the generated image |
| 490 | 494 | * @param int $height maximum height of the generated image |
| 491 | 495 | * if one of these is 0 then it is treated as no upper bound |
@@ -260,6 +260,9 @@ discard block |
||
| 260 | 260 | return _("Sorry, this should not happen - no additional information is available"); |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | + /** |
|
| 264 | + * @param string $file |
|
| 265 | + */ |
|
| 263 | 266 | private function findSourceFile($file) { |
| 264 | 267 | if (is_file($this->module_path . '/Files/' . $this->device_id . '/' . $file)) { |
| 265 | 268 | return $this->module_path . '/Files/' . $this->device_id . '/' . $file; |
@@ -540,6 +543,9 @@ discard block |
||
| 540 | 543 | 'application/pdf' => 'pdf', |
| 541 | 544 | ]; |
| 542 | 545 | |
| 546 | + /** |
|
| 547 | + * @param string $type |
|
| 548 | + */ |
|
| 543 | 549 | private function saveLogoFile($logos,$type) { |
| 544 | 550 | $iterator = 0; |
| 545 | 551 | $returnarray = []; |