[Sitracker-devel] SF.net SVN: sitracker: [2230] branches/mincepie
Open source support tracking in your browser
Brought to you by:
ivanlucas
Menu
▾
▴
[Sitracker-devel] SF.net SVN: sitracker: [2230] branches/mincepie
|
From: <iva...@us...> - 2008-01-24 15:09:33
|
Revision: 2230
http://sitracker.svn.sourceforge.net/sitracker/?rev=2230&view=rev
Author: ivanlucas
Date: 2008-01-24 07:09:22 -0800 (Thu, 24 Jan 2008)
Log Message:
-----------
Merged revisions 2221-2229 via svnmerge from
https://iva...@si.../svnroot/sitracker/trunk
........
r2221 | ivanlucas | 2008-01-23 17:22:11 +0000 (Wed, 23 Jan 2008) | 4 lines
* Remove dependency on mime_content_type. Display blanks if not found.
* Add a global variable for windows/unix path delimiter
* Add copyright to shell script
........
r2225 | ivanlucas | 2008-01-24 11:50:04 +0000 (Thu, 24 Jan 2008) | 2 lines
User configurable timezones (note: currently assumes system time = utc)
........
r2226 | ivanlucas | 2008-01-24 12:59:36 +0000 (Thu, 24 Jan 2008) | 2 lines
Use ldate() rather than date() to display dates, this will use users selected translation and timezone
........
r2227 | ivanlucas | 2008-01-24 13:40:05 +0000 (Thu, 24 Jan 2008) | 2 lines
Missed some ldate() calls
........
r2228 | ivanlucas | 2008-01-24 14:10:41 +0000 (Thu, 24 Jan 2008) | 2 lines
Make sure user timezone adjustments based on user offset, are from UTC not from system time
........
r2229 | ivanlucas | 2008-01-24 14:53:30 +0000 (Thu, 24 Jan 2008) | 2 lines
Add record for 0 user status = account disabled. Resolves SF#1862279
........
Modified Paths:
--------------
branches/mincepie/create-release.sh
branches/mincepie/htdocs/add_incident.php
branches/mincepie/htdocs/advanced_search_incidents.php
branches/mincepie/htdocs/book_holidays.php
branches/mincepie/htdocs/browse_contract.php
branches/mincepie/htdocs/browse_feedback.php
branches/mincepie/htdocs/browse_journal.php
branches/mincepie/htdocs/browse_kb.php
branches/mincepie/htdocs/contact_details.php
branches/mincepie/htdocs/contact_support.php
branches/mincepie/htdocs/contract_details.php
branches/mincepie/htdocs/display_rss_feed.inc.php
branches/mincepie/htdocs/edit_profile.php
branches/mincepie/htdocs/feedback.php
branches/mincepie/htdocs/ftp_edit_file.php
branches/mincepie/htdocs/ftp_file_details.php
branches/mincepie/htdocs/ftp_list_files.php
branches/mincepie/htdocs/holiday_request.php
branches/mincepie/htdocs/holidays.php
branches/mincepie/htdocs/incident/files.inc.php
branches/mincepie/htdocs/incident/incoming.inc.php
branches/mincepie/htdocs/incident/sla.inc.php
branches/mincepie/htdocs/kb_view_article.php
branches/mincepie/htdocs/login.php
branches/mincepie/htdocs/main.php
branches/mincepie/htdocs/move_update.php
branches/mincepie/htdocs/portal.php
branches/mincepie/htdocs/products.php
branches/mincepie/htdocs/reports/allnames.php
branches/mincepie/htdocs/reports/average_incident_duration.php
branches/mincepie/htdocs/reports/incidents_by_software.php
branches/mincepie/htdocs/reports/incidents_by_swn.php
branches/mincepie/htdocs/reports/recent_incidents_table.php
branches/mincepie/htdocs/reports/site_products.php
branches/mincepie/htdocs/reports/supportbycontract.php
branches/mincepie/htdocs/reports/yearly_customer_export.php
branches/mincepie/htdocs/reports/yearly_engineer_export.php
branches/mincepie/htdocs/review_incoming_updates.php
branches/mincepie/htdocs/search.inc.php
branches/mincepie/htdocs/search_contract.php
branches/mincepie/htdocs/search_expired.php
branches/mincepie/htdocs/search_incidents.php
branches/mincepie/htdocs/search_renewals.php
branches/mincepie/htdocs/setup-schema.php
branches/mincepie/htdocs/site_details.php
branches/mincepie/htdocs/tasks.inc.php
branches/mincepie/includes/functions.inc.php
branches/mincepie/includes/i18n/en-GB.inc.php
branches/mincepie/includes/strings.inc.php
Property Changed:
----------------
branches/mincepie/
Property changes on: branches/mincepie
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-1985,2000,2005-2012,2015,2018-2019,2025-2026,2030-2032,2037,2042,2045,2048-2050,2052,2063-2066,2074,2078,2089-2113,2124-2125,2129-2133,2136-2137,2143,2148,2151,2156-2157,2160,2162-2165,2172-2183,2193-2195,2212,2214
+ /trunk:1-1985,2000,2005-2012,2015,2018-2019,2025-2026,2030-2032,2037,2042,2045,2048-2050,2052,2063-2066,2074,2078,2089-2113,2124-2125,2129-2133,2136-2137,2143,2148,2151,2156-2157,2160,2162-2165,2172-2183,2193-2195,2212,2214,2221-2229
Modified: branches/mincepie/create-release.sh
===================================================================
--- branches/mincepie/create-release.sh 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/create-release.sh 2008-01-24 15:09:22 UTC (rev 2230)
@@ -1,9 +1,13 @@
#!/bin/bash
-
-# Generates Debian packages for SiT
-# Authors: Ivan Lucas <ivanlucas[at]users.sourceforge.net>
-# Paul Heaney <paulheaney[at]users.sourceforge.net>
-
+## Generates Debian packages for SiT
+## SiT (Support Incident Tracker) - Support call tracking system
+## Copyright (C) 2000-2008 Salford Software Ltd. and Contributors
+##
+## This software may be used and distributed according to the terms
+## of the GNU General Public License, incorporated herein by reference.
+##
+## Authors: Ivan Lucas <ivanlucas[at]users.sourceforge.net>
+## Paul Heaney <paulheaney[at]users.sourceforge.net>
# Requirements:
# svn2cl
@@ -25,7 +29,7 @@
# Now grab the app version number
SITVER=$(grep ^\$application_version= includes/functions.inc.php|awk -F "'|'" '{print $2}')
-# Now find out if this is a proper release
+# Now find out if this is a proper release
SITREV=$(grep ^\$application_revision= includes/functions.inc.php|awk -F "'|'" '{print $2}')
# Now we've got version and rev Create the release name
@@ -33,7 +37,7 @@
RELNAME="sit_$SITVER"
elif [ $SITREV = "svn" ]; then
RELNAME="sit_$SITVER+$SITREV$SVNREV"
-else
+else
RELNAME="sit_$SITVER+$SITREV"
fi
Modified: branches/mincepie/htdocs/add_incident.php
===================================================================
--- branches/mincepie/htdocs/add_incident.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/add_incident.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -167,7 +167,7 @@
}
else
{
- $str .= '<td>'.date($CONFIG['dateformat_date'], $contactrow['expirydate']).'</td>';
+ $str .= '<td>'.ldate($CONFIG['dateformat_date'], $contactrow['expirydate']).'</td>';
}
$str .= "</tr>\n";
return $str;
Modified: branches/mincepie/htdocs/advanced_search_incidents.php
===================================================================
--- branches/mincepie/htdocs/advanced_search_incidents.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/advanced_search_incidents.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -196,8 +196,8 @@
<td align='center' width='100'><?php echo site_name($results['siteid']) ?></td>
<td align='center' width='50'><?php echo $results['servicelevel']."<br />".priority_name($results["priority"]); ?></td>
<td align='center' width='100'><?php echo user_realname($results['owner'],TRUE) ?></td>
- <td align='center' width='150'><?php echo date($CONFIG['dateformat_datetime'], $results["opened"]); ?></td>
- <td align='center' width='150'><?php echo date($CONFIG['dateformat_datetime'], $results["lastupdated"]); ?></td>
+ <td align='center' width='150'><?php echo ldate($CONFIG['dateformat_datetime'], $results["opened"]); ?></td>
+ <td align='center' width='150'><?php echo ldate($CONFIG['dateformat_datetime'], $results["lastupdated"]); ?></td>
<td align='center' width='50'><?php echo $results["type"] ?></td>
<td align='center' width='50'><?php echo incidentstatus_name($results["status"]); ?></td>
</tr>
Modified: branches/mincepie/htdocs/book_holidays.php
===================================================================
--- branches/mincepie/htdocs/book_holidays.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/book_holidays.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -127,8 +127,8 @@
echo "<p align='center'><strong>Select Days</strong></p>";// FIXME i18n
echo "<table align='center' width='550' class='vertical'>";
- echo "<tr><th>{$strStartDate}</th><td>".date($CONFIG['dateformat_date'],$start)."</td></tr>";
- echo "<tr><th>{$strEndDate}</th><td>".date($CONFIG['dateformat_date'],$end)."</td></tr>";
+ echo "<tr><th>{$strStartDate}</th><td>".ldate($CONFIG['dateformat_date'],$start)."</td></tr>";
+ echo "<tr><th>{$strEndDate}</th><td>".ldate($CONFIG['dateformat_date'],$end)."</td></tr>";
echo "</table><br />";
echo "<form name='date' action='{$_SERVER['PHP_SELF']}' method='post'>";
@@ -136,7 +136,7 @@
echo "<input type='hidden' name='type' value='{$type}' />";
echo "<table align='center' width='550'>";
- echo "<tr><th>{$strDate}</th><th>{$strNone}</th><th>{$strDay}</th><th>AM</th><th>PM</th></tr>\n";
+ echo "<tr><th>{$strDate}</th><th>{$strNone}</th><th>{$strDay}</th><th>{$strAM}</th><th>{$strPM}</th></tr>\n";
$daynumber = 1;
$options = 0;
@@ -158,7 +158,7 @@
$holiday_type=holiday_type($existing_holiday['type']);
$holiday_legend=strtoupper(substr($holiday_type,0,1));
echo "<tr>";
- echo "<td class='shade2' align='right'> ".date('l jS M y',$day)." </td>";
+ echo "<td class='shade2' align='right'> ".ldate('l jS M y',$day)." </td>";
echo "<td class='shade1' align='center'>";
if ($existing_holiday['length'] == 'day')
{
@@ -231,11 +231,11 @@
if (mysql_error()) trigger_error("MySQL Query Error ".mysql_error(), E_USER_ERROR);
if (mysql_num_rows($result) > 0)
{
- echo "<tr><td class='shade1' align='right'>".date('l jS M y',$day)."</td><td colspan='4'>{$strPublicHoliday}</td></tr>";
+ echo "<tr><td class='shade1' align='right'>".ldate('l jS M y',$day)."</td><td colspan='4'>{$strPublicHoliday}</td></tr>";
}
else
{
- echo "<tr><td class='shade2' align='right'>".date('l jS M y',$day)." </td>";
+ echo "<tr><td class='shade2' align='right'>".ldate('l jS M y',$day)." </td>";
// Don't allow booking sickness in the future, still not sure whether we should allow this or not, it could be useful in the case of long term illness
if (($type == '2' && $day <= $now) || ($type != 2))
{
@@ -297,7 +297,7 @@
{
$$len='day';
}
-
+
if ($$len != 'none')
{
// check to see if there is other holiday booked on this day
Modified: branches/mincepie/htdocs/browse_contract.php
===================================================================
--- branches/mincepie/htdocs/browse_contract.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/browse_contract.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -249,7 +249,7 @@
}
else
{
- echo date($CONFIG['dateformat_date'], $results["expirydate"]);
+ echo ldate($CONFIG['dateformat_date'], $results["expirydate"]);
}
echo "</td>";
Modified: branches/mincepie/htdocs/browse_feedback.php
===================================================================
--- branches/mincepie/htdocs/browse_feedback.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/browse_feedback.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -202,7 +202,7 @@
$hashcode1=trim($hashcode2);
$hashcode=urlencode($hashcode1);
echo "<tr class='$shade'>";
- echo "<td>".date($CONFIG['dateformat_datetime'],mysqlts2date($resp->created))."</td>";
+ echo "<td>".ldate($CONFIG['dateformat_datetime'],mysqlts2date($resp->created))."</td>";
echo "<td><a href='contact_details.php?id={$resp->contactid}' title='{$resp->email}'>".contact_realname($resp->contactid)."</a></td>";
echo "<td><a href=\"javascript:incident_details_window('{$resp->incidentid}','incident{$resp->incidentid}')\">Incident [{$resp->incidentid}]</a> - ";
echo incident_title($resp->incidentid)."</td>";
Modified: branches/mincepie/htdocs/browse_journal.php
===================================================================
--- branches/mincepie/htdocs/browse_journal.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/browse_journal.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -88,7 +88,7 @@
else $class = "shade2";
echo "<tr class='$class'>";
echo "<td>".user_realname($journal->userid,TRUE)."</td>";
- echo "<td>".date($CONFIG['dateformat_datetime'], mysqlts2date($journal->timestamp))."</td>";
+ echo "<td>".ldate($CONFIG['dateformat_datetime'], mysqlts2date($journal->timestamp))."</td>";
echo "<td>{$journal->event}</td>";
echo "<td>";
switch ($journal->journaltype)
Modified: branches/mincepie/htdocs/browse_kb.php
===================================================================
--- branches/mincepie/htdocs/browse_kb.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/browse_kb.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -180,7 +180,7 @@
echo "<span>{$content}</span>";
echo "</a>";
echo "</td>";
- echo "<td>".date($CONFIG['dateformat_date'], mysql2date($kbarticle->published))."</td>";
+ echo "<td>".ldate($CONFIG['dateformat_date'], mysql2date($kbarticle->published))."</td>";
echo "<td>".user_realname($kbarticle->author)."</td>";
echo "<td>{$kbarticle->keywords}</td>";
echo "</tr>\n";
Modified: branches/mincepie/htdocs/contact_details.php
===================================================================
--- branches/mincepie/htdocs/contact_details.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/contact_details.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -81,7 +81,7 @@
{
echo "<tr><th>{$strTags}:</th><td>{$tags}</td></tr>\n";
}
-
+
echo "<tr><th>{$strJobTitle}:</th><td>{$contactrow['jobtitle']}</td></tr>\n";
echo "<tr><th>{$strSite}:</th><td>";
echo "<a href='site_details.php?id={$contactrow['siteid']}'>";
@@ -158,7 +158,7 @@
{
echo $strNone;
}
-
+
//if ($openincidents >= 1) echo "$openincidents open, ";
if ($openincidents >= 1)
{
@@ -202,7 +202,7 @@
if ($contactrow['timestamp_modified'] > 0)
{
echo "<tr><th>{$strLastUpdated}:</th>";
- echo "<td>".date($CONFIG['dateformat_datetime'],$contactrow['timestamp_modified'])."</td></tr>\n";
+ echo "<td>".ldate($CONFIG['dateformat_datetime'],$contactrow['timestamp_modified'])."</td></tr>\n";
}
echo "</table>\n";
@@ -239,7 +239,7 @@
{
$shade='expired';
}
-
+
if ($supportedrow['expirydate'] < $now)
{
$shade='expired';
@@ -249,12 +249,12 @@
echo "<img src='{$CONFIG['application_webpath']}images/icons/{$iconset}/16x16/contract.png' width='16' height='16' alt='' /> ";
echo "<a href='contract_details.php?id={$supportedrow['maintenanceid']}'>{$strContract}: {$supportedrow['maintenanceid']}</a></td>";
echo "<td class='$shade'>{$supportedrow['productname']}</td>";
- echo "<td class='$shade'>".date($CONFIG['dateformat_date'], $supportedrow['expirydate']);
+ echo "<td class='$shade'>".ldate($CONFIG['dateformat_date'], $supportedrow['expirydate']);
if ($supportedrow['term'] == 'yes')
{
echo " {$strTerminated}";
}
-
+
echo "</td>";
echo "</tr>\n";
$supportcount++;
Modified: branches/mincepie/htdocs/contact_support.php
===================================================================
--- branches/mincepie/htdocs/contact_support.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/contact_support.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -109,10 +109,10 @@
if ($row->status==2) echo "<td>Closed, ".closingstatus_name($row->closingstatus)."</td>";
else echo "<td>".incidentstatus_name($row->status)."</td>";
echo "<td>".user_realname($row->owner,TRUE)."</td>";
- echo "<td>".date($CONFIG['dateformat_date'],$row->opened)."</td>";
+ echo "<td>".ldate($CONFIG['dateformat_date'],$row->opened)."</td>";
if ($row->closed > 0)
{
- echo "<td>".date($CONFIG['dateformat_date'], $row->closed)."</td>";
+ echo "<td>".ldate($CONFIG['dateformat_date'], $row->closed)."</td>";
echo "<td>".format_seconds($row->duration_closed)."</td>";
}
else echo "<td colspan='2'>-</td>";
Modified: branches/mincepie/htdocs/contract_details.php
===================================================================
--- branches/mincepie/htdocs/contract_details.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/contract_details.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -106,7 +106,7 @@
}
else
{
- date($CONFIG['dateformat_date'], $maintrow['expirydate']);
+ ldate($CONFIG['dateformat_date'], $maintrow['expirydate']);
}
echo "</td></tr>";
@@ -146,7 +146,7 @@
{
echo "<p class='error'>{$strMoreContactsThanContractSupports}</p>";
}
-
+
if ($allowedcontacts == 0)
{
$allowedcontacts = $strUnlimited;
Modified: branches/mincepie/htdocs/display_rss_feed.inc.php
===================================================================
--- branches/mincepie/htdocs/display_rss_feed.inc.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/display_rss_feed.inc.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -82,7 +82,7 @@
elseif (!empty($item['published'])) $itemdate = strtotime($item['published']);
$d = strip_tags($item['atom_content'],$feedallowedtags);
}
- if ($itemdate > 10000) $itemdate = date($CONFIG['dateformat_datetime'], $itemdate);
+ if ($itemdate > 10000) $itemdate = ldate($CONFIG['dateformat_datetime'], $itemdate);
echo "<span>";
if (!empty($itemdate)) echo "<strong>{$itemdate}</strong><br />";
echo "{$d}</span></a></td></tr>\n";
Modified: branches/mincepie/htdocs/edit_profile.php
===================================================================
--- branches/mincepie/htdocs/edit_profile.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/edit_profile.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -114,7 +114,7 @@
}
else
{
- echo "None set";
+ echo "{$strNotSet}";
}
echo "</td></tr>";
echo "<tr><th colspan='2'>{$strWorkStatus}</th></tr>";
@@ -174,6 +174,8 @@
echo "</select>";
echo "</td></tr>\n";
+ echo "<tr><th>{$strUTCOffset}:</th><td>".array_drop_down($availabletimezones, 'utcoffset', $user->var_utc_offset)."</td></tr>\n";
+
echo "<tr><th>{$strInterfaceStyle}:</th><td>".interfacestyle_drop_down('style', $user->var_style)."</td></tr>\n";
echo "<tr><th>{$strIncidentRefresh}:</th>";
echo "<td><input maxlength='10' name='incidentrefresh' size='3' type='text' value=\"{$user->var_incident_refresh}\" /> {$strSeconds}</td></tr>\n";
@@ -253,6 +255,7 @@
$emailonreassign = cleanvar($_POST['emailonreassign']);
$style = cleanvar($_POST['style']);
$vari18n = cleanvar($_POST['vari18n']);
+ $utcoffset = cleanvar($_POST['utcoffset']);
$accepting = cleanvar($_POST['accepting']);
$roleid = cleanvar($_POST['roleid']);
$holiday_entitlement = cleanvar($_POST['holiday_entitlement']);
@@ -365,7 +368,8 @@
$sql .= "holiday_entitlement='{$holiday_entitlement}', ";
}
$sql .= "var_update_order='$updateorder', var_num_updates_view='$updatesperpage', var_style='$style', signature='$signature', message='$message', status='$status', accepting='$accepting', ";
- $sql .= "var_collapse='$collapse', var_notify_on_reassign='$emailonreassign', var_i18n='{$vari18n}' WHERE id='$edituserid' LIMIT 1";
+ $sql .= "var_collapse='$collapse', var_notify_on_reassign='$emailonreassign', var_i18n='{$vari18n}', var_utc_offset='{$utcoffset}' ";
+ $sql .= "WHERE id='$edituserid' LIMIT 1";
$result = mysql_query($sql);
if (mysql_error()) trigger_error("MySQL Query Error ".mysql_error(), E_USER_ERROR);
@@ -379,6 +383,7 @@
$_SESSION['update_order'] = $updateorder;
$_SESSION['num_update_view'] = $updatesperpage;
$_SESSION['lang'] = $vari18n;
+ $_SESSION['utcoffset'] = $utcoffset;
}
//only want to reassign to backup if you've changed you status
Modified: branches/mincepie/htdocs/feedback.php
===================================================================
--- branches/mincepie/htdocs/feedback.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/feedback.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -393,8 +393,8 @@
echo "<form action='feedback.php' method='post'>\n";
echo "<h1>{$form->name}</h1>\n";
echo "<p>{$strRelatingToIncident} <strong>#{$incidentid}</strong> — <strong>".incident_title($incidentid)."</strong><br />";
- echo sprintf($strOpenedbyXonY, contact_realname(incident_contact($incidentid)), date($CONFIG['dateformat_date'],db_read_column('opened', 'incidents', $incidentid)));
- echo sprintf($strClosedOnX, date($CONFIG['dateformat_date'],db_read_column('closed', 'incidents', $incidentid))).".</p>";
+ echo sprintf($strOpenedbyXonY, contact_realname(incident_contact($incidentid)), ldate($CONFIG['dateformat_date'],db_read_column('opened', 'incidents', $incidentid)));
+ echo sprintf($strClosedOnX, ldate($CONFIG['dateformat_date'],db_read_column('closed', 'incidents', $incidentid))).".</p>";
if (!empty($_REQUEST['error']))
{
@@ -413,7 +413,7 @@
{
echo "<hr />{$question->sectiontext}\n";
}
-
+
echo "<h4>Q{$question->taborder}: {$question->question}";
if ($question->required=='true')
{
@@ -434,7 +434,7 @@
{
$answer='';
}
-
+
echo feedback_html_question($question->type, "Q{$question->id}", $question->required, $question->options, $answer);
if (in_array($question->id, $errorfields))
{
Modified: branches/mincepie/htdocs/ftp_edit_file.php
===================================================================
--- branches/mincepie/htdocs/ftp_edit_file.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/ftp_edit_file.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -66,9 +66,9 @@
echo "<tr><th>File Version:</th><td>";
echo "<input type='text' size='40' name='fileversion' value='{$frow['fileversion']}' />";
echo "</td></tr>\n";
- echo "<tr><th>File Date:</th><td>".date('D jS M Y @ g:i A',$frow['filedate'])." <strong>by</strong> ".user_realname($frow['userid'],TRUE). "</td></tr>\n";
+ echo "<tr><th>File Date:</th><td>".ldate('D jS M Y @ g:i A',$frow['filedate'])." <strong>by</strong> ".user_realname($frow['userid'],TRUE). "</td></tr>\n";
- if ($frow['expiry']>0) echo "<tr><th>Expiry:</th><td>".date('D jS M Y @ g:i A',$frow['expiry'])." </td></tr>\n";
+ if ($frow['expiry']>0) echo "<tr><th>Expiry:</th><td>".ldate('D jS M Y @ g:i A',$frow['expiry'])." </td></tr>\n";
echo "</table>\n\n";
echo "<input type='hidden' name='id' value='{$id}' />";
Modified: branches/mincepie/htdocs/ftp_file_details.php
===================================================================
--- branches/mincepie/htdocs/ftp_file_details.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/ftp_file_details.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -52,11 +52,11 @@
<tr><th>Web Category:</th><td><?php echo $frow['webcategory']; ?></td></tr>
<tr><th>Description:</th><td><?php echo $frow['longdescription']; ?></td></tr>
<tr><th>File Version:</th><td><?php echo $frow['fileversion']; ?></td></tr>
-<tr><th>File Date:</th><td><?php echo date($CONFIG['dateformat_filedatetime'],$frow['filedate']).' <strong>by</strong> '.user_realname($frow['userid'],TRUE); ?></td></tr>
+<tr><th>File Date:</th><td><?php echo ldate($CONFIG['dateformat_filedatetime'],$frow['filedate']).' <strong>by</strong> '.user_realname($frow['userid'],TRUE); ?></td></tr>
<?php
if ($frow['expiry']>0)
{
- ?><tr><th>Expiry:</th><td><?php echo date($CONFIG['dateformat_filedatetime'],$frow['expiry']); ?></td></tr><?php
+ ?><tr><th>Expiry:</th><td><?php echo ldate($CONFIG['dateformat_filedatetime'],$frow['expiry']); ?></td></tr><?php
}
echo "</table>\n";
echo "<p align='center'>";
Modified: branches/mincepie/htdocs/ftp_list_files.php
===================================================================
--- branches/mincepie/htdocs/ftp_list_files.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/ftp_list_files.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -102,7 +102,7 @@
echo "<td>$pretty_file_size</td>";
echo "<td>$shortdescription</td>";
echo "<td>$fileversion</td>";
- echo "<td>".date($CONFIG['dateformat_filedatetime'],$filedate)."</td>";
+ echo "<td>".ldate($CONFIG['dateformat_filedatetime'],$filedate)."</td>";
echo "<td>";
if ($expiry==0)
{
@@ -110,7 +110,7 @@
}
else
{
- echo date($CONFIG['dateformat_filedatetime'],$expiry);
+ echo ldate($CONFIG['dateformat_filedatetime'],$expiry);
}
echo "</td>";
echo "</tr>\n";
Modified: branches/mincepie/htdocs/holiday_request.php
===================================================================
--- branches/mincepie/htdocs/holiday_request.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/holiday_request.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -91,7 +91,7 @@
echo user_realname($holiday->userid,TRUE);
echo "</a></td>";
}
- echo "<td>".date('l j F Y', $holiday->startdate)."</td>";
+ echo "<td>".ldate('l j F Y', $holiday->startdate)."</td>";
echo "<td>";
if ($holiday->length=='am') echo $strMorning;
if ($holiday->length=='pm') echo $strAfternoon;
@@ -211,7 +211,7 @@
$bodytext = "Message from {$CONFIG['application_shortname']}: ".user_realname($user)." has requested that you approve the following holidays:\n\n"; //FIXME i18n
while ($holiday=mysql_fetch_object($result))
{
- $holidaylist .= date('l j F Y', $holiday->startdate).", ";
+ $holidaylist .= ldate('l j F Y', $holiday->startdate).", ";
if ($holiday->length=='am') $holidaylist .= $strMorning;
if ($holiday->length=='pm') $holidaylist .= $strAfternoon;
if ($holiday->length=='day') $holidaylist .= $strFullDaye;
Modified: branches/mincepie/htdocs/holidays.php
===================================================================
--- branches/mincepie/htdocs/holidays.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/holidays.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -83,10 +83,10 @@
while ($dates = mysql_fetch_array($result))
{
echo "<tr class='shade1'><td>{$dates['name']}</td>";
- echo "<td>".date('l', $dates['startdate'])." ";
+ echo "<td>".ldate('l', $dates['startdate'])." ";
if ($dates['length']=='am') echo "<u>{$strMorning}</u> ";
if ($dates['length']=='pm') echo "<u>{$strAfternoon}</u> ";
- echo date('jS F Y', $dates['startdate']);
+ echo ldate('jS F Y', $dates['startdate']);
echo "</td>";
echo "<td>";
echo holiday_approval_status($dates['approved'], $dates['approvedby']);
@@ -126,10 +126,10 @@
while ($dates = mysql_fetch_array($result))
{
echo "<tr class='shade1'>";
- echo "<td colspan='2'>".date('l', $dates['startdate'])." ";
+ echo "<td colspan='2'>".ldate('l', $dates['startdate'])." ";
if ($dates['length']=='am') echo "<u>{$strMorning}</u> ";
if ($dates['length']=='pm') echo "<u>{$strAfternoon}</u> ";
- echo date('jS F Y', $dates['startdate']);
+ echo ldate('jS F Y', $dates['startdate']);
echo "</td>";
echo "<td colspan='2'>";
echo holiday_approval_status($dates['approved'], $dates['approvedby']);
Modified: branches/mincepie/htdocs/incident/files.inc.php
===================================================================
--- branches/mincepie/htdocs/incident/files.inc.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/incident/files.inc.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -171,8 +171,17 @@
$filesize = filesize($file);
while ($filesize >= pow(1024,$j)) ++$j;
$file_size = round($filesize / pow(1024,$j-1) * 100) / 100 . ' ' . $ext[$j-1];
- $mime_type = mime_content_type($file); // FIXME this requires php > 4.3 and is deprecated
-
+ if (function_exists('mime_content_type')
+ {
+ // FIXME mime_content_type requires php > 4.3 and is deprecated
+ $mime_type = mime_content_type($file);
+ }
+ else
+ {
+ // TODO find a reliable cross/platform low dependency way of determining mime type if possibe
+ // At the moment we leave mime_type blank if we can't find mime_content_type
+ $mime_type = '';
+ }
$html = "<tr>";
$html .= "<td align='right' width='5%'>";
$html .= "<a href=\"$url\"><img src='".getattachmenticon($filename)."' alt='Icon' title='{$filename} ({$file_size})' /></a>";
@@ -192,7 +201,7 @@
$html .= "</td>";
$html .= "<td width='20%'>$file_size</td>";
$html .= "<td width='20%'>$mime_type</td>";
- $html .= "<td width='20%'>".date($CONFIG['dateformat_filedatetime'],filemtime($file))."</td>";
+ $html .= "<td width='20%'>".ldate($CONFIG['dateformat_filedatetime'],filemtime($file))."</td>";
// $html .= "<td width='5%'><input type='checkbox' name='fileselection[]' value='{$filename}' onclick=\"togglerow(this, 'tt');\"/></td>";
$html .= "</tr>\n";
return $html;
@@ -244,7 +253,7 @@
$dirname!=$id &&
strlen($dirname)==10)
{
- $dirprettyname = date('l jS M Y @ g:ia',$dirname);
+ $dirprettyname = ldate('l jS M Y @ g:ia',$dirname);
}
else
{
@@ -286,4 +295,4 @@
}
}
echo "</form>";
-?>
+?>
\ No newline at end of file
Modified: branches/mincepie/htdocs/incident/incoming.inc.php
===================================================================
--- branches/mincepie/htdocs/incident/incoming.inc.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/incident/incoming.inc.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -38,7 +38,7 @@
if (!$incoming->locked)
{
//it's not locked, lock for this user
- $lockeduntil=date('Y-m-d H:i:s',$now+$CONFIG['record_lock_delay']);
+ $lockeduntil = date('Y-m-d H:i:s',$now+$CONFIG['record_lock_delay']);
$sql = "UPDATE tempincoming SET locked='{$sit[2]}', lockeduntil='{$lockeduntil}' WHERE tempincoming.id='{$incomingid}' AND (locked = 0 OR locked IS NULL)";
$result = mysql_query($sql);
if (mysql_error()) trigger_error("MySQL Query Error ".mysql_error(), E_USER_ERROR);
Modified: branches/mincepie/htdocs/incident/sla.inc.php
===================================================================
--- branches/mincepie/htdocs/incident/sla.inc.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/incident/sla.inc.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -45,7 +45,7 @@
if ($history['timestamp'] == 0) echo "</em>";
echo "</td>";
echo "<td>";
- if ($history['timestamp'] > 0) echo date($CONFIG['dateformat_datetime'],$history['timestamp']);
+ if ($history['timestamp'] > 0) echo ldate($CONFIG['dateformat_datetime'],$history['timestamp']);
echo "</td>";
}
echo "</table>\n";
Modified: branches/mincepie/htdocs/kb_view_article.php
===================================================================
--- branches/mincepie/htdocs/kb_view_article.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/kb_view_article.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -109,7 +109,7 @@
$pubdate=mysql2date($kbarticle->published);
if ($pubdate > 0)
{
- echo sprintf($strPublishedOnX, date($CONFIG['dateformat_date'],$pubdate))."<br />";
+ echo sprintf($strPublishedOnX, ldate($CONFIG['dateformat_date'],$pubdate))."<br />";
}
if (is_array($author))
Modified: branches/mincepie/htdocs/login.php
===================================================================
--- branches/mincepie/htdocs/login.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/login.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -61,6 +61,7 @@
$_SESSION['num_update_view'] = $user->var_num_updates_view;
$_SESSION['collapse'] = $user->var_collapse;
$_SESSION['groupid'] = is_null($user->groupid) ? 0 : $user->groupid;
+ $_SESSION['utcoffset'] = $user->var_utc_offset;
// Delete any old session user notices
$sql = "DELETE FROM `{$dbNotices}` WHERE durability='session' AND userid={$_SESSION['userid']}";
Modified: branches/mincepie/htdocs/main.php
===================================================================
--- branches/mincepie/htdocs/main.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/main.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -23,14 +23,12 @@
// --------------------------------------------------------------------------------------------
// Dashboard widgets
-
-
$sql = "SELECT * FROM `{$dbDashboard}` WHERE enabled='true' ORDER BY id";
$result = mysql_query($sql);
if (mysql_error()) trigger_error(mysql_error(),E_USER_WARNING);
while ($dashboard = mysql_fetch_object($result))
{
- include("{$CONFIG['application_fspath']}dashboard/dashboard_{$dashboard->name}.php");
+ include ("{$CONFIG['application_fspath']}dashboard{$fsdelim}dashboard_{$dashboard->name}.php");
$DASHBOARDCOMP["dashboard_{$dashboard->name}"]="dashboard_{$dashboard->name}";
}
@@ -290,4 +288,4 @@
echo "</form>\n";
echo "</div>\n";
include('htmlfooter.inc.php');
-?>
+?>
\ No newline at end of file
Modified: branches/mincepie/htdocs/move_update.php
===================================================================
--- branches/mincepie/htdocs/move_update.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/move_update.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -49,7 +49,7 @@
while ($updates = mysql_fetch_array($result))
{
- $update_timestamp_string = date($CONFIG['dateformat_datetime'], $updates["timestamp"]);
+ $update_timestamp_string = ldate($CONFIG['dateformat_datetime'], $updates["timestamp"]);
?>
<br />
<table align='center' width="95%">
@@ -151,7 +151,7 @@
if (mysql_error()) trigger_error("MySQL Query Error ".mysql_error(), E_USER_ERROR);
list($oldincidentid, $bodytext, $timestamp)=mysql_fetch_row($uresult);
if ($oldincidentid==0) $oldincidentid='Inbox';
- $prettydate=date('r', $timestamp);
+ $prettydate = ldate('r', $timestamp);
// prepend 'moved' header to bodytext
$body ="Moved from <b>$oldincidentid</b> -> <b>$incidentid</b> by: <b>".user_realname($sit[2])."</b>\n";
$body .="Original Message Received at: <b>$prettydate</b>\n";
Modified: branches/mincepie/htdocs/portal.php
===================================================================
--- branches/mincepie/htdocs/portal.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/portal.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -52,7 +52,7 @@
{
session_regenerate_id();
}
-
+
if (!version_compare(phpversion(),"4.3.3",">="))
{
setcookie(session_name(), session_id(),ini_get("session.cookie_lifetime"), "/");
@@ -115,7 +115,7 @@
}
echo "</td>";
echo "<td>{$contract->incidents_used}</td>";
- echo "<td>".date($CONFIG['dateformat_date'],$contract->expirydate)."</td>";
+ echo "<td>".ldate($CONFIG['dateformat_date'],$contract->expirydate)."</td>";
echo "<td><a href='$_SERVER[PHP_SELF]?page=add&contractid={$contract->id}'>{$strAddIncident}</a></td></tr>\n";
if ($shade == 'shade1') $shade = 'shade2';
else $shade = 'shade1';
@@ -161,7 +161,7 @@
{
echo colheader('actions', $strOperation);
}
-
+
echo "</tr>\n";
while ($incident = mysql_fetch_object($result))
{
@@ -171,7 +171,7 @@
{
echo software_name($incident->softwareid)."<br />";
}
-
+
echo "<strong><a href='portal.php?page=showincident&id={$incident->id}'>{$incident->title}</a></strong></td>";
echo "<td>".format_date_friendly($incident->lastupdated)."</td>";
echo "<td>".incidentstatus_name($incident->status)."</td>";
@@ -313,17 +313,17 @@
{
$updatetext .= "<b>Problem Description</b>\n{$probdesc}\n\n";
}
-
+
if (!empty($workarounds))
{
$updatetext .= "<b>Workarounds Attempted</b>\n{$workarounds}\n\n";
}
-
+
if (!empty($reproduction))
{
$updatetext .= "<b>Problem Reproduction</b>\n{$reproduction}\n\n";
}
-
+
if (!empty($impact))
{
$updatetext .= "<b>Customer Impact</b>\n{$impact}\n\n";
@@ -412,13 +412,13 @@
$errors = 1;
echo "<p class='error'>You must enter a surname</p>\n";
}
-
+
if ($email == "" OR $email=='none' OR $email=='n/a')
{
$errors = 1;
echo "<p class='error'>You must enter an email address</p>\n";
}
-
+
if ($errors == 0)
{
$updatesql = "UPDATE contacts SET forenames='$forenames', surname='$surname', department='$department', address1='$address1', address2='$address2', county='$county', country='$country', postcode='$postcode', phone='$phone', fax='$fax', email='$email' ";
@@ -499,7 +499,7 @@
$sql = "SELECT * FROM `{$dbUpdates}` WHERE incidentid='{$incidentid}' AND customervisibility='show' ";
$sql .= "ORDER BY timestamp DESC, id DESC";
-
+
if ($offset > 0)
{
if (empty($records))
@@ -543,7 +543,7 @@
{
$firstid = $update->id;
}
-
+
$updateid = $update->id;
$updatebody=trim($update->bodytext);
@@ -637,7 +637,7 @@
{
echo "<div class='detailentryhidden'>\n";
}
-
+
if ($updatebodylen > 5)
{
echo nl2br($updatebody);
Modified: branches/mincepie/htdocs/products.php
===================================================================
--- branches/mincepie/htdocs/products.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/products.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -119,22 +119,22 @@
echo "<td>";
if ($software['lifetime_start'] > 1)
{
- echo date($CONFIG['dateformat_shortdate'],mysql2date($software['lifetime_start'])).' to ';// FIXME i18n
+ echo ldate($CONFIG['dateformat_shortdate'],mysql2date($software['lifetime_start'])).' to '; // FIXME i18n 'to'
}
else
{
echo "∞";
}
-
+
if ($software['lifetime_end'] > 1)
{
- echo date($CONFIG['dateformat_shortdate'],mysql2date($software['lifetime_end']));
+ echo ldate($CONFIG['dateformat_shortdate'],mysql2date($software['lifetime_end']));
}
elseif ($software['lifetime_start'] > 1)
{
echo "∞";
}
-
+
echo "</td>";
echo "<td>{$countengineers}</td>";
echo "<td>{$countincidents}</td>";
@@ -187,29 +187,29 @@
{
$shade='expired';
}
-
+
echo "<tr class='{$shade}'>";
echo "<td>{$software->name}</td>";
echo "<td>{$software->vendorname}</td>";
echo "<td>";
if ($software->lifetime_start > 1)
{
- echo date($CONFIG['dateformat_shortdate'],$lifetime_start).' to ';
+ echo ldate($CONFIG['dateformat_shortdate'],$lifetime_start).' to '; // FIXME i18n 'to'
}
else
{
echo "∞";
}
-
+
if ($software->lifetime_end > 1)
{
- echo date($CONFIG['dateformat_shortdate'],$lifetime_end);
+ echo ldate($CONFIG['dateformat_shortdate'],$lifetime_end);
}
elseif ($software->lifetime_start >1)
{
echo "∞";
}
-
+
echo "</td>";
echo "<td>{$countlinked}</td>";
echo "<td>{$countengineers}</td>";
@@ -268,16 +268,16 @@
echo "<td>";
if ($software['lifetime_start'] > 1)
{
- echo date($CONFIG['dateformat_shortdate'],mysql2date($software['lifetime_start'])).' to ';
+ echo ldate($CONFIG['dateformat_shortdate'],mysql2date($software['lifetime_start'])).' to '; // FIXME i18n 'to'
}
else
{
echo "∞";
}
-
+
if ($software['lifetime_end'] > 1)
{
- echo date($CONFIG['dateformat_shortdate'],mysql2date($software['lifetime_end']));
+ echo ldate($CONFIG['dateformat_shortdate'],mysql2date($software['lifetime_end']));
}
elseif ($software['lifetime_start'] > 1)
{
@@ -317,7 +317,7 @@
{
$shade = "expired";
}
-
+
echo "<tr class='{$shade}'>";
echo "<td><img src='{$CONFIG['application_webpath']}images/icons/{$iconset}/16x16/contract.png' width='16' height='16' alt='' /> ";
echo "<a href='contract_details.php?id={$contract->id}'>".sprintf($strContractNum, $contract->id)."</a></td>";
Modified: branches/mincepie/htdocs/reports/allnames.php
===================================================================
--- branches/mincepie/htdocs/reports/allnames.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/reports/allnames.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -34,7 +34,7 @@
if (mysql_error()) trigger_error("MySQL Query Error ".mysql_error(), E_USER_ERROR);
$count = mysql_num_rows($result);
-echo "<strong>Report showing all $count contact records</strong> - ".date(r)."<br /><br />";
+echo "<strong>Report showing all $count contact records</strong> - ".ldate(r)."<br /><br />";
if ($result)
{
Modified: branches/mincepie/htdocs/reports/average_incident_duration.php
===================================================================
--- branches/mincepie/htdocs/reports/average_incident_duration.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/reports/average_incident_duration.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -131,8 +131,8 @@
$html .= "<tr class='$shade'>";
- $html .= "<td>".date('F Y',mktime(0,0,0,$current_month,1,$current_year));
- if ($next_month > $current_month+1 AND $next_year==$current_year) $html .= " - ".date('F Y',mktime(0,0,0,$next_month,1,$next_year))."</td>";
+ $html .= "<td>".ldate('F Y',mktime(0,0,0,$current_month,1,$current_year));
+ if ($next_month > $current_month+1 AND $next_year==$current_year) $html .= " - ".ldate('F Y',mktime(0,0,0,$next_month,1,$next_year))."</td>";
$html .= "<td>{$stats[0]}</td>";
$html .= "<td>".format_seconds($stats[1]*60)."</td>";
$html .= "<td>".round($stats[2]/60)." hours</td>";
@@ -140,7 +140,7 @@
$html .= "<td>{$stats[4]}</td>";
$html .= "<td>{$stats[5]}</td>";
$html .= "</tr>\n";
- $csv .= date('F Y',mktime(0,0,0,$current_month,1,$current_year))." - ".date('F Y',mktime(0,0,0,$next_month,1,$next_year));
+ $csv .= ldate('F Y',mktime(0,0,0,$current_month,1,$current_year))." - ".ldate('F Y',mktime(0,0,0,$next_month,1,$next_year));
$csv .= ",{$stats[0]},".($stats[1]/60).",".round($stats[2]/60)."\n";
if ($shade=='shade1') $shade='shade2';
else $shade='shade1';
Modified: branches/mincepie/htdocs/reports/incidents_by_software.php
===================================================================
--- branches/mincepie/htdocs/reports/incidents_by_software.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/reports/incidents_by_software.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -86,7 +86,7 @@
$resultSLA = mysql_query($sqlSLA);
if (mysql_error()) trigger_error("MySQL Query Error ".mysql_error(), E_USER_ERROR);
- if ($startdate > 1) echo "<p align='center'>since ".date($CONFIG['dateformat_date'], $startdate)."</p>"; // FIXME i18n since
+ if ($startdate > 1) echo "<p align='center'>since ".ldate($CONFIG['dateformat_date'], $startdate)."</p>"; // FIXME i18n since
echo "<table class='vertical' align='center'>";
echo "<tr><th>Number of calls</th><th>%</th><th>{$strSkill}</th>"; // FIXME i18n number of calls
while ($sla = mysql_fetch_object($resultSLA))
Modified: branches/mincepie/htdocs/reports/incidents_by_swn.php
===================================================================
--- branches/mincepie/htdocs/reports/incidents_by_swn.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/reports/incidents_by_swn.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -94,8 +94,8 @@
if (mysql_error()) trigger_error("MySQL Query Error ".mysql_error(), E_USER_ERROR);
echo "<h2>Number of incidents by software";
- if ($startdate > 1) echo " between ".date($CONFIG['dateformat_date'], $startdate);
- if ($enddate > 1) echo " and ".date($CONFIG['dateformat_date'], $enddate);
+ if ($startdate > 1) echo " between ".ldate($CONFIG['dateformat_date'], $startdate);
+ if ($enddate > 1) echo " and ".ldate($CONFIG['dateformat_date'], $enddate);
echo "</h2>";
echo "<p>";
echo "<table class='vertical' align='center'>";
Modified: branches/mincepie/htdocs/reports/recent_incidents_table.php
===================================================================
--- branches/mincepie/htdocs/reports/recent_incidents_table.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/reports/recent_incidents_table.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -23,7 +23,7 @@
$monthago = time()-(60 * 60 * 24 * 30.5);
-echo "<h2>Incidents opened since ".date($CONFIG['dateformat_date'], $monthago)."</h2>";
+echo "<h2>Incidents opened since ".ldate($CONFIG['dateformat_date'], $monthago)."</h2>";
$sql = "SELECT *,s.id AS siteid FROM `{$dbSites}` AS s, `{$dbMaintenance}` AS m, `{$dbSupportContacts}` AS sc, `{$dbIncidents}` AS i ";
$sql .= "WHERE s.id = m.site ";
@@ -43,7 +43,7 @@
if ($prvincid!=$row->id)
{
echo "<b>[{$row->siteid}] {$row->name}</b> Incident: <a href='{$CONFIG['application_uriprefix']}{$CONFIG['application_webpath']}incident_details.php?id={$row->id}'>{$row->id}</a> ";
- echo "Date: ".date('d M Y', $row->opened)." ";
+ echo "Date: ".ldate('d M Y', $row->opened)." ";
echo "Product: ".product_name($row->product);
$site=$row->siteid;
$$site++;
Modified: branches/mincepie/htdocs/reports/site_products.php
===================================================================
--- branches/mincepie/htdocs/reports/site_products.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/reports/site_products.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -79,7 +79,7 @@
{
// FIXME strip slashes
$product="";
- $nicedate=date('d/m/Y',$row->opened);
+ $nicedate = ldate('d/m/Y',$row->opened);
$html .= "<tr class='shade2'><td>{$row->name}</td>";
$html .= "<td>{$row->address1}</td><td>{$row->address2}</td>";
$html .= "<td>{$row->city}</td><td>{$row->county}</td>";
Modified: branches/mincepie/htdocs/reports/supportbycontract.php
===================================================================
--- branches/mincepie/htdocs/reports/supportbycontract.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/reports/supportbycontract.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -68,7 +68,7 @@
{
echo "{$maint->product},";
echo "{$maint->licence_quantity} {$maint->licence_type},";
- echo date($CONFIG['dateformat_date'], $maint->expirydate).",";
+ echo ldate($CONFIG['dateformat_date'], $maint->expirydate).",";
$csql = "SELECT * FROM `{$dbSupportContacts}` ";
$csql .= "WHERE maintenanceid='{$maint->maintid}' ";
$csql .= "ORDER BY contactid LIMIT 4";
@@ -96,7 +96,7 @@
echo "<tr>";
echo "<td width='20%'>{$maint->product}</td>";
echo "<td>{$maint->licence_quantity} {$maint->licence_type}</td>";
- echo "<td>".date($CONFIG['dateformat_date'], $maint->expirydate)."</td>";
+ echo "<td>".ldate($CONFIG['dateformat_date'], $maint->expirydate)."</td>";
$csql = "SELECT * FROM `{$dbSupportContacts}` ";
$csql .= "WHERE maintenanceid='{$maint->maintid}' ";
Modified: branches/mincepie/htdocs/reports/yearly_customer_export.php
===================================================================
--- branches/mincepie/htdocs/reports/yearly_customer_export.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/reports/yearly_customer_export.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -115,7 +115,7 @@
$externalincidents=0;
while ($row = mysql_fetch_object($result))
{
- $nicedate=date('d/m/Y',$row->opened);
+ $nicedate = ldate('d/m/Y',$row->opened);
$html .= "<tr class='shade2'><td>$nicedate</td><td>{$row->incid}</td><td>{$row->externalid}</td><td>{$row->title}</td><td>{$row->cname}</td><td>{$row->site}</td><td>{$row->typename}</td></tr>\n";
$csv .="'".$nicedate."', '{$row->incid}','{$row->externalid}', '{$row->title}','{$row->cname}','{$row->site}','{$row->typename}'\n";
if (!empty($row->externalid))
Modified: branches/mincepie/htdocs/reports/yearly_engineer_export.php
===================================================================
--- branches/mincepie/htdocs/reports/yearly_engineer_export.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/reports/yearly_engineer_export.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -426,9 +426,9 @@
$rowcount=0;
while ($row = mysql_fetch_object($result))
{
- $nicedate=date('d/m/Y',$row->opened);
- $niceclose = date('d/m/Y',$row->closed);
- $ext = external_escalation($escalated_array, $row->incid);
+ $nicedate = ldate('d/m/Y',$row->opened);
+ $niceclose = ldate('d/m/Y',$row->closed);
+ $ext = external_escalation($escalated_array, $row->incid);
$html .= "<tr class='shade2'><td>$nicedate</td><td>{$niceclose}</td><td><a href='../incident_details.php?id={$row->incid}'>{$row->incid}</a></td><td>{$row->title}</td><td>{$row->realname}</td><td>$ext</td></tr>";
$csv .="'".$nicedate."','".$niceclose."', '{$row->incid}','{$row->title}','{$row->realname},'$ext'\n";
}
Modified: branches/mincepie/htdocs/review_incoming_updates.php
===================================================================
--- branches/mincepie/htdocs/review_incoming_updates.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/review_incoming_updates.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -270,7 +270,7 @@
list($update_userid, $update_type, $update_currentowner, $update_currentstatus, $update_body, $update_timestamp, $update_nextaction, $update_id) = incident_lastupdate($new->id);
$update_body = parse_updatebody($update_body);
$html = "<tr class='shade1'><td />";
- $html .= "<td align='center'>".date($CONFIG['dateformat_datetime'], $new->opened)."</td>";
+ $html .= "<td align='center'>".ldate($CONFIG['dateformat_datetime'], $new->opened)."</td>";
$html .= "<td>".contact_realname($new->contact)."</td>";
$html .= "<td>".product_name($new->product)." / ".software_name($new->softwareid)."<br />";
$html .= "[{$new->id}] <a href=\"javascript:incident_details_window('{$new->id}','holdingview');\" class='info'>{$new->title}<span>{$update_body}</span></a></td>";
@@ -329,7 +329,7 @@
if ($spamcount > 0)
{
echo "<h2>{$strSpamEmail}";
- if($spamcount > 1) echo "s"; // FIXME i18n cant we do this ?
+ if($spamcount > 1) echo "s"; // FIXME i18n cant we do this ?
echo " ({$spamcount} {$strTotal})</h2>\n";
echo "<p align='center'>{$strIncomingEmailSpam}</p>";
@@ -438,7 +438,7 @@
if (($assign->owner == $assign->originalowner || $assign->towner == $assign->originalowner) AND $useraccepting=='no')
{
echo "<tr class='shade1'>";
- echo "<td align='center'>".date($CONFIG['dateformat_datetime'], $assign->lastupdated)."</td>";
+ echo "<td align='center'>".ldate($CONFIG['dateformat_datetime'], $assign->lastupdated)."</td>";
echo "<td>".user_realname($assign->originalowner,TRUE)."</td>";
echo "<td>".software_name($assign->softwareid)."<br />[<a href=\"javascript:wt_winpopup('incident_details.php?id={$assign->id}&popup=yes', 'mini')\">{$assign->id}</a>] ".$assign->title."</td>";
$userstatus = userstatus_name($assign->userstatus);
@@ -461,7 +461,7 @@
{
// display a row to assign the incident back to the original owner
echo "<tr class='shade2'>";
- echo "<td>".date($CONFIG['dateformat_datetime'], $assign->lastupdated)."</td>";
+ echo "<td>".ldate($CONFIG['dateformat_datetime'], $assign->lastupdated)."</td>";
echo "<td>".user_realname($assign->owner,TRUE)."</td>";
echo "<td>[<a href=\"javascript:wt_winpopup('incident_details.php?id={$assign->id}&popup=yes', 'mini')\">{$assign->id}</a>] {$assign->title}</td>";
$userstatus = user_status($assign->originalowner);
Modified: branches/mincepie/htdocs/search.inc.php
===================================================================
--- branches/mincepie/htdocs/search.inc.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdocs/search.inc.php 2008-01-24 15:09:22 UTC (rev 2230)
@@ -256,10 +256,10 @@
$entry['score'] = 10 + search_score_adjust($sterms, $entry['string']);
$entry['title'] = $sresult->title;
$entry['date'] = $sresult->lastupdated;
- $entry['extra']['opened'] = date($CONFIG['dateformat_datetime'],$sresult->opened);
+ $entry['extra']['opened'] = ldate($CONFIG['dateformat_datetime'],$sresult->opened);
if ($sresult->status == 2)
{
- $entry['extra']['closed'] = date($CONFIG['dateformat_datetime'],$sresult->closed);
+ $entry['extra']['closed'] = ldate($CONFIG['dateformat_datetime'],$sresult->closed);
}
foreach ($sterms AS $sterm)
@@ -291,10 +291,10 @@
$entry['score'] = 8 + search_score_adjust($sterms, $entry['string']);
$entry['title'] = $sresult->title;
$entry['date'] = $sresult->timestamp;
- $entry['extra']['opened'] = date($CONFIG['dateformat_datetime'],$sresult->opened);
+ $entry['extra']['opened'] = ldate($CONFIG['dateformat_datetime'],$sresult->opened);
if ($sresult->status == 2)
{
- $entry['extra']['closed'] = date($CONFIG['dateformat_datetime'],$sresult->closed);
+ $entry['extra']['closed'] = ldate($CONFIG['dateformat_datetime'],$sresult->closed);
}
search_build_results($srch_results,$entry);
unset($entry);
@@ -419,22 +419,22 @@
echo "<td>".ucfirst($type).": {$sresult['id']}</td>";
switch ($type)
{
- case 'incident':
- $url = "javascript:incident_details_window('{$sresult['id']}', 'incident{$sresult['id']}')";
+ case 'incident':
+ $url = "javascript:incident_details_window('{$sresult['id']}', 'incident{$sresult['id']}')";
break;
- case 'contact':
- $url = "contact_details.php?id={$sresult['id']}";
+ case 'contact':
+ $url = "contact_details.php?id={$sresult['id']}";
break;
- case 'site':
- $url = "site_details.php?id={$sresult['id']}";
+ case 'site':
+ $url = "site_details.php?id={$sresult['id']}";
break;
- case 'contract':
- $url = "contract_details.php?id={$sresult['id']}";
+ case 'contract':
+ $url = "contract_details.php?id={$sresult['id']}";
break;
- case 'kb':
- $url = "kb_view_article.php?id={$sresult['id']}";
+ case 'kb':
+ $url = "kb_view_article.php?id={$sresult['id']}";
break;
- default:
+ default:
$url = "javascript:alert('nothing to link to');";
}
echo "<td style='width:400px;'><a href=\"$url\" class='info'>{$sresult['title']}";
@@ -457,7 +457,7 @@
echo "<td>";
if ($sresult['date'] > 0)
{
- echo date($CONFIG['dateformat_datetime'],$sresult['date']);
+ echo ldate($CONFIG['dateformat_datetime'],$sresult['date']);
}
echo "</td>";
echo "</tr>\n";
Modified: branches/mincepie/htdocs/search_contract.php
===================================================================
--- branches/mincepie/htdocs/search_contract.php 2008-01-24 14:53:30 UTC (rev 2229)
+++ branches/mincepie/htdo...
[truncated message content] |