@@ -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. |
@@ -1005,12 +1005,12 @@ |
||
| 1005 | 1005 | $certUsernameLabel = WindowsCommon::sprint_nsi(_("Username:")); |
| 1006 | 1006 | $certUsernameLength = strlen($certUsernameLabel); |
| 1007 | 1007 | $labelLength = max($certPasswordLenght,$certUsernameLength); |
| 1008 | - ?> |
|
| 1008 | + ?> |
|
| 1009 | 1009 | ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echo_nsi(_("Selected file: \$Cert_file"))?>" |
| 1010 | 1010 | !else |
| 1011 | 1011 | <?php $certPasswordLabel = WindowsCommon::sprint_nsi(_("import password:")); |
| 1012 | 1012 | $certPasswordLenght = strlen($certPasswordLabel); |
| 1013 | - ?> |
|
| 1013 | + ?> |
|
| 1014 | 1014 | !insertmacro debug_cat 4 "Unpacking SB_cert.p12" |
| 1015 | 1015 | File "SB_cert.p12" |
| 1016 | 1016 | nsArray::Set Delete_files "SB_cert.p12" |
@@ -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)) { |
@@ -16,10 +16,10 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | private $box; |
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * |
|
| 21 | - * @param string $class |
|
| 22 | - */ |
|
| 19 | + /** |
|
| 20 | + * |
|
| 21 | + * @param string $class |
|
| 22 | + */ |
|
| 23 | 23 | public function __construct($class) { |
| 24 | 24 | $this->box = new CompositeTag('div'); |
| 25 | 25 | $this->class = $class; |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | $userCount++; |
| 33 | 33 | } |
| 34 | 34 | }else{ |
| 35 | - $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1)); |
|
| 35 | + $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1)); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | if($userCount>0){ |
@@ -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); |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | $outString .= "# save user certificate\n"; |
| 66 | 66 | $outString .= 'echo "'; |
| 67 | 67 | $outString .= base64_encode($this->clientCert["certdata"]) |
| 68 | - . '" | base64 -d ' . " > \$HOME/$this->localDir/user.p12\n"; |
|
| 68 | + . '" | base64 -d ' . " > \$HOME/$this->localDir/user.p12\n"; |
|
| 69 | 69 | } |
| 70 | 70 | if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS || $this->selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) { |
| 71 | 71 | $outString .= $this->printP12Dialog(); |
@@ -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>"; |