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

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

Revision: 3595
          http://astlinux.svn.sourceforge.net/astlinux/?rev=3595&view=rev
Author:   abelbeck
Date:     2010-01-01 14:55:14 +0000 (Fri, 01 Jan 2010)

Log Message:
-----------
Web interface, explicitly set the timezone from the system, without it this will cause a problem with PHP 5.3.x

Modified Paths:
--------------
    branches/0.7/package/webinterface/altweb/admin/cdrlog.php
    branches/0.7/package/webinterface/altweb/admin/monitor.php
    branches/0.7/package/webinterface/altweb/admin/voicemail.php
    branches/0.7/package/webinterface/altweb/common/functions.php
    branches/0.7/package/webinterface/altweb/common/version.php

Modified: branches/0.7/package/webinterface/altweb/admin/cdrlog.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/cdrlog.php	2010-01-01 14:54:32 UTC (rev 3594)
+++ branches/0.7/package/webinterface/altweb/admin/cdrlog.php	2010-01-01 14:55:14 UTC (rev 3595)
@@ -354,10 +354,10 @@
   if ($disable) {
     return(htmlspecialchars($cidnum));
   }
-  if ($cidnum[0] === '+') {
+  if (isset($cidnum[0]) && $cidnum[0] === '+') {
     $num = substr($cidnum, 1);
     if (! preg_match("/$cmd/", $num)) {
-      if ($num[0] === '1') {
+      if (isset($num[0]) && $num[0] === '1') {
         $num = substr($num, 1);
         if (! preg_match("/$cmd/", $num)) {
           return(htmlspecialchars($cidnum));

Modified: branches/0.7/package/webinterface/altweb/admin/monitor.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/monitor.php	2010-01-01 14:54:32 UTC (rev 3594)
+++ branches/0.7/package/webinterface/altweb/admin/monitor.php	2010-01-01 14:55:14 UTC (rev 3595)
@@ -175,7 +175,7 @@
       echo '<td style="text-align: left;">', date($datef, $db['data'][$i]['mtime']), '</td>';
 
       echo '<td style="text-align: center;">';
-      if ($file === $db['data'][$i]['name']) {
+      if (isset($file) && $file === $db['data'][$i]['name']) {
         insertWAVinline($cacheLink);
       } else {
         echo '<a href="'.$myself.'?file='.rawurlencode($db['data'][$i]['name']).'" class="actionText">'.$action.'</a>';

Modified: branches/0.7/package/webinterface/altweb/admin/voicemail.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/voicemail.php	2010-01-01 14:54:32 UTC (rev 3594)
+++ branches/0.7/package/webinterface/altweb/admin/voicemail.php	2010-01-01 14:55:14 UTC (rev 3595)
@@ -441,7 +441,7 @@
       echo '<td style="text-align: center;">', ($data['folder'] !== 'INBOX' && $data['folder'] !== 'Old') ? '&nbsp;' : '<a href="'.$myself.'?'.$cmd['href'].'" class="actionText">'.$cmd['action'].'</a>', '</td>';
       
       echo '<td style="text-align: center;">';
-      if ($file === $path.$data['suffix']) {
+      if (isset($file) && $file === $path.$data['suffix']) {
         insertWAVinline($cacheLink);
       } else {
         echo ($data['suffix'] === '') ? '&nbsp;' : '<a href="'.$myself.'?file='.$path.$data['suffix'].'" class="actionText">'.$action.'</a>';

Modified: branches/0.7/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/functions.php	2010-01-01 14:54:32 UTC (rev 3594)
+++ branches/0.7/package/webinterface/altweb/common/functions.php	2010-01-01 14:55:14 UTC (rev 3595)
@@ -662,6 +662,11 @@
   }
   return($db);
 }
+// Set default timezone
+if (function_exists('date_default_timezone_set')) {
+  date_default_timezone_set(@date_default_timezone_get());
+}
+// Set globals
 $global_prefs = parsePrefs(getPREFSlocation());
 $global_user = getPHPusername();
 $global_admin = ($global_user === '' || $global_user === 'admin');

Modified: branches/0.7/package/webinterface/altweb/common/version.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/version.php	2010-01-01 14:54:32 UTC (rev 3594)
+++ branches/0.7/package/webinterface/altweb/common/version.php	2010-01-01 14:55:14 UTC (rev 3595)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.6.08';
+$GUI_VERSION = '1.6.09';
 
 ?>


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