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

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

Revision: 6640
          http://sourceforge.net/p/astlinux/code/6640
Author:   abelbeck
Date:     2014-08-19 20:43:20 +0000 (Tue, 19 Aug 2014)
Log Message:
-----------
web interface, only call date_default_timezone_set() if 'date.timezone' is not in php.ini, remove extra php.ini files

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

Removed Paths:
-------------
    branches/1.0/package/webinterface/altweb/admin/php.ini
    branches/1.0/package/webinterface/altweb/php.ini

Deleted: branches/1.0/package/webinterface/altweb/admin/php.ini
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/php.ini	2014-08-19 20:37:32 UTC (rev 6639)
+++ branches/1.0/package/webinterface/altweb/admin/php.ini	2014-08-19 20:43:20 UTC (rev 6640)
@@ -1,9 +0,0 @@
-magic_quotes_gpc = Off
-display_errors = On
-output_buffering = On
-post_max_size = 10M
-upload_max_filesize = 8M
-session.gc_maxlifetime = 1440
-session.gc_probability = 100
-session.gc_divisor = 100
-max_execution_time = 300

Modified: branches/1.0/package/webinterface/altweb/admin/phpliteadmin.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/phpliteadmin.php	2014-08-19 20:37:32 UTC (rev 6639)
+++ branches/1.0/package/webinterface/altweb/admin/phpliteadmin.php	2014-08-19 20:43:20 UTC (rev 6640)
@@ -426,14 +426,16 @@
 // don't mess with this - required for the login session
 ini_set('session.cookie_httponly', '1');
 session_start();
-//AstLinux// Use /etc/timezone for the timezone
+//AstLinux// Use /etc/timezone for the timezone if not in php.ini
 function system_timezone() {
   if (($tz = trim(@file_get_contents('/etc/timezone'))) === '') {
     $tz = @date_default_timezone_get();
   }
   return ($tz);
 }
-date_default_timezone_set(system_timezone());
+if (ini_get('date.timezone') == '') {
+  date_default_timezone_set(system_timezone());
+}
 //AstLinux// end of timezone additions
 
 if($debug==true)

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2014-08-19 20:37:32 UTC (rev 6639)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2014-08-19 20:43:20 UTC (rev 6640)
@@ -966,8 +966,10 @@
   return ($tz);
 }
 
-// Set system timezone
-date_default_timezone_set(system_timezone());
+// Set system timezone if not in php.ini
+if (ini_get('date.timezone') == '') {
+  date_default_timezone_set(system_timezone());
+}
 
 // Set globals
 $global_prefs = parsePrefs(getPREFSlocation());

Deleted: branches/1.0/package/webinterface/altweb/php.ini
===================================================================
--- branches/1.0/package/webinterface/altweb/php.ini	2014-08-19 20:37:32 UTC (rev 6639)
+++ branches/1.0/package/webinterface/altweb/php.ini	2014-08-19 20:43:20 UTC (rev 6640)
@@ -1,9 +0,0 @@
-magic_quotes_gpc = Off
-display_errors = On
-output_buffering = On
-post_max_size = 10M
-upload_max_filesize = 8M
-session.gc_maxlifetime = 1440
-session.gc_probability = 100
-session.gc_divisor = 100
-max_execution_time = 300

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