robin/smb
1
0
Fork 0
mirror of https://codeberg.org/icewind/SMB.git synced 2026-06-03 17:24:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

improve timezone detection

Browse source
This commit is contained in:
Robin Appelman 2019-02-06 14:56:11 +01:00
commit 5d1e55f67f
4 changed files with 99 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ISystem.php
View file

@ -55,6 +55,13 @@ interface ISystem {
*/
public function getStdBufPath();
/**
* Get the full path to the `date` binary of false if the binary is not available
*
* @return string|bool
*/
public function getDatePath();
/**
* Whether or not the smbclient php extension is enabled
*

4
src/System.php
View file

@ -45,6 +45,10 @@ class System implements ISystem {
return $this->getBinaryPath('stdbuf');
}
public function getDatePath() {
return $this->getBinaryPath('date');
}
public function libSmbclientAvailable() {
return function_exists('smbclient_state_new');
}

13
src/TimeZoneProvider.php
View file

@ -27,6 +27,7 @@ class TimeZoneProvider implements ITimeZoneProvider {
public function get($host) {
if (!isset($this->timeZones[$host])) {
$timeZone = null;
$net = $this->system->getNetPath();
// for local domain names we can assume same timezone
if ($net && $host && strpos($host, '.') !== false) {
@ -36,13 +37,17 @@ class TimeZoneProvider implements ITimeZoneProvider {
escapeshellarg($host)
);
$timeZone = exec($command);
if (!$timeZone) {
}
if (!$timeZone) {
$date = $this->system->getDatePath();
if ($date) {
$timeZone = exec($date . " +%z");
} else {
$timeZone = date_default_timezone_get();
}
$this->timeZones[$host] = $timeZone;
} else { // fallback to server timezone
$this->timeZones[$host] = date_default_timezone_get();
}
$this->timeZones[$host] = $timeZone;
}
return $this->timeZones[$host];
}