[Astlinux-commits] SF.net SVN: astlinux:[5972] branches/1.0/package/webinterface/altweb/common

[<abe...@us...>]

Revision: 5972
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5972&view=rev
Author:   abelbeck
Date:     2013-02-27 18:14:51 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
web interface, use '/etc/timezone' if it exists for the Timezone, use 'date_default_timezone_get()' as fallback.
Note: This is what PHP 5.3 prefers and PHP 5.4 requires since 'date_default_timezone_get()' got neutered.

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/common/functions.php
    branches/1.0/package/webinterface/altweb/common/version.php

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2013-02-27 17:12:48 UTC (rev 5971)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2013-02-27 18:14:51 UTC (rev 5972)
@@ -802,10 +802,20 @@
   }
   return($db);
 }
-// Set default timezone
-if (function_exists('date_default_timezone_set')) {
-  date_default_timezone_set(@date_default_timezone_get());
+
+// Function: system_timezone
+//
+function system_timezone() {
+
+  if (($tz = trim(@file_get_contents('/etc/timezone'))) === '') {
+    $tz = @date_default_timezone_get();
+  }
+  return ($tz);
 }
+
+// Set system timezone
+date_default_timezone_set(system_timezone());
+
 // Set globals
 $global_prefs = parsePrefs(getPREFSlocation());
 $global_user = getPHPusername();

Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php	2013-02-27 17:12:48 UTC (rev 5971)
+++ branches/1.0/package/webinterface/altweb/common/version.php	2013-02-27 18:14:51 UTC (rev 5972)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.8.21';
+$GUI_VERSION = '1.8.22';
 
 ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.