More robust check for Windows OS in File.php (#275)

xamount · jfritschi · commit 5ad9c1e8d7b8 · 2018-09-15T14:07:11.000+02:00
A common pattern in PHP configurations is to have environment variables turned off. This means on line 125 getenv("OS") will fail and Windows will fail to be detected. Therefore I've added Windows detection using the PHP_OS constant as a fallback.
diff --git a/source/CAS/PGTStorage/File.php b/source/CAS/PGTStorage/File.php
@@ -122,7 +122,7 @@ function __construct($cas_parent,$path)
             $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
         }
         // check that the path is an absolute path
-        if (getenv("OS")=="Windows_NT") {
+        if (getenv("OS")=="Windows_NT" || strtoupper(substr(PHP_OS,0,3)) == 'WIN') {
 
             if (!preg_match('`^[a-zA-Z]:`', $path)) {
                 phpCAS::error('an absolute path is needed for PGT storage to file');
@@ -258,4 +258,4 @@ function read($pgt_iou)
     /** @} */
 
 }
-?>
+?>

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ function __construct($cas_parent,$path)`
`122`	`122`	`$path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;`
`123`	`123`	`}`
`124`	`124`	`// check that the path is an absolute path`
`125`		`- if (getenv("OS")=="Windows_NT") {`
	`125`	`+ if (getenv("OS")=="Windows_NT" \|\| strtoupper(substr(PHP_OS,0,3)) == 'WIN') {`
`126`	`126`
`127`	`127`	if (!preg_match('`^[a-zA-Z]:`', $path)) {
`128`	`128`	`phpCAS::error('an absolute path is needed for PGT storage to file');`
`@@ -258,4 +258,4 @@ function read($pgt_iou)`
`258`	`258`	`/** @} */`
`259`	`259`
`260`	`260`	`}`
`261`		`-?>`
	`261`	`+?>`