tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
Menu
▾
▴
tutos-commits — SVN commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(214) |
Sep
(144) |
Oct
(22) |
Nov
(22) |
Dec
(93) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(25) |
Feb
(31) |
Mar
(92) |
Apr
(70) |
May
(103) |
Jun
(130) |
Jul
(265) |
Aug
(325) |
Sep
(233) |
Oct
(244) |
Nov
(261) |
Dec
(157) |
| 2003 |
Jan
(101) |
Feb
(135) |
Mar
(148) |
Apr
(164) |
May
(53) |
Jun
(116) |
Jul
(149) |
Aug
(126) |
Sep
(45) |
Oct
(109) |
Nov
(36) |
Dec
(61) |
| 2004 |
Jan
(131) |
Feb
(236) |
Mar
(278) |
Apr
(259) |
May
(92) |
Jun
(110) |
Jul
(150) |
Aug
(64) |
Sep
(141) |
Oct
(141) |
Nov
(146) |
Dec
(65) |
| 2005 |
Jan
(70) |
Feb
(77) |
Mar
(129) |
Apr
(153) |
May
(161) |
Jun
(63) |
Jul
(42) |
Aug
(16) |
Sep
(30) |
Oct
(3) |
Nov
(8) |
Dec
(40) |
| 2006 |
Jan
(114) |
Feb
(16) |
Mar
(12) |
Apr
(15) |
May
(4) |
Jun
(9) |
Jul
(69) |
Aug
(27) |
Sep
(12) |
Oct
(80) |
Nov
(62) |
Dec
(41) |
| 2007 |
Jan
(34) |
Feb
(2) |
Mar
(38) |
Apr
(82) |
May
(61) |
Jun
(37) |
Jul
(16) |
Aug
(64) |
Sep
(7) |
Oct
(52) |
Nov
(18) |
Dec
(28) |
| 2008 |
Jan
(168) |
Feb
(26) |
Mar
(27) |
Apr
(19) |
May
(10) |
Jun
(58) |
Jul
(58) |
Aug
(91) |
Sep
(14) |
Oct
(23) |
Nov
(56) |
Dec
(38) |
| 2009 |
Jan
(58) |
Feb
(90) |
Mar
(204) |
Apr
(90) |
May
(27) |
Jun
(177) |
Jul
(116) |
Aug
(53) |
Sep
(42) |
Oct
(120) |
Nov
(51) |
Dec
(58) |
| 2010 |
Jan
(117) |
Feb
(231) |
Mar
(163) |
Apr
(90) |
May
(40) |
Jun
(139) |
Jul
(49) |
Aug
(118) |
Sep
(25) |
Oct
(80) |
Nov
(102) |
Dec
(99) |
| 2011 |
Jan
(176) |
Feb
(42) |
Mar
(60) |
Apr
(52) |
May
(30) |
Jun
(29) |
Jul
(27) |
Aug
(16) |
Sep
(51) |
Oct
(70) |
Nov
(63) |
Dec
(58) |
| 2012 |
Jan
(28) |
Feb
(26) |
Mar
(7) |
Apr
(12) |
May
(41) |
Jun
(61) |
Jul
(59) |
Aug
(38) |
Sep
(30) |
Oct
(28) |
Nov
(14) |
Dec
(31) |
| 2013 |
Jan
(24) |
Feb
(54) |
Mar
(45) |
Apr
(22) |
May
(35) |
Jun
(8) |
Jul
(18) |
Aug
(38) |
Sep
(11) |
Oct
(8) |
Nov
(19) |
Dec
(20) |
| 2014 |
Jan
(20) |
Feb
(22) |
Mar
(4) |
Apr
(6) |
May
(13) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(8) |
Aug
(13) |
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
|
1
|
|
2
|
3
(7) |
4
(4) |
5
|
6
(5) |
7
(14) |
8
|
|
9
|
10
(7) |
11
(6) |
12
(9) |
13
(8) |
14
|
15
|
|
16
|
17
|
18
(5) |
19
(8) |
20
|
21
|
22
|
|
23
|
24
|
25
(2) |
26
(5) |
27
(3) |
28
(2) |
29
(6) |
|
30
(1) |
31
|
|
|
|
|
|
|
From: <cib...@wa...> - 2004-05-30 03:40:16
|
I are new on this list. I not speak english. For the momment i will be only a reader. Thanks for Tutos |
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/php Modified Files: address_overview.php admin_show.php app_overview.php product_overview.php team_overview.php timetrack_overview.php Log Message: show default sort order in headline Index: address_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- address_overview.php 26 Mar 2004 11:01:23 -0000 1.45 +++ address_overview.php 29 May 2004 08:50:48 -0000 1.46 @@ -250,6 +250,11 @@ $xxx = ""; $this->atool['link2'] = $this->atool['link1']; order_parse($q,$this->atool['link1'],$xxx,$xxx,"l_name"); + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "l_name"; + $_GET['xo'] = 1; + } if ($this->stop) { return; Index: admin_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- admin_show.php 25 Apr 2004 09:35:39 -0000 1.73 +++ admin_show.php 29 May 2004 08:50:48 -0000 1.74 @@ -364,7 +364,9 @@ } + echo "<tr><td colspan=\"7\"> </td></tr>\n"; $this->login_info(); + echo "<tr><td colspan=\"7\"> </td></tr>\n"; $this->sessions_info(); echo $this->DataTableEnd(); @@ -422,6 +424,11 @@ # sorting $xxx = ""; order_parse($this->q,$xxx,$xxx,$xxx,"last_seen DESC"); + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "last_seen"; + $_GET['xo'] = 2; + } $x = array( url => "user_new.php", Index: app_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/app_overview.php,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- app_overview.php 27 Mar 2004 18:53:16 -0000 1.57 +++ app_overview.php 29 May 2004 08:50:49 -0000 1.58 @@ -308,6 +308,11 @@ $this->link2 = $this->link1; $xxx = ""; order_parse($this->q,$this->link1,$xxx,$xxx,"a_start ASC"); + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "a_start"; + $_GET['xo'] = 1; + } if ($this->stop) { return; } Index: product_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- product_overview.php 22 Apr 2004 16:37:12 -0000 1.102 +++ product_overview.php 29 May 2004 08:50:49 -0000 1.103 @@ -1058,6 +1058,11 @@ $this->link2 = addUrlParameter($this->link2,"format=".UrlEncode($this->format)); $xxx = ""; order_parse($this->q,$this->link1,$xxx,$xxx,"creation DESC"); + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "creation"; + $_GET['xo'] = 2; + } if ($this->stop) { return; Index: team_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/team_overview.php,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- team_overview.php 27 Mar 2004 18:51:31 -0000 1.50 +++ team_overview.php 29 May 2004 08:50:49 -0000 1.51 @@ -180,6 +180,11 @@ $xxx = ""; $this->link2 = $this->link1; order_parse($this->q,$this->link1,$xxx,$xxx,"name"); + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "name"; + $_GET['xo'] = 1; + } # Menu $x = team::getSelectLink($this->user,$lang['Search']); Index: timetrack_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- timetrack_overview.php 20 Apr 2004 19:08:44 -0000 1.85 +++ timetrack_overview.php 29 May 2004 08:50:49 -0000 1.86 @@ -48,7 +48,7 @@ } echo "</timetrack_set>\n"; } - return; + return; } else if ($this->format == "excel") { include_once '../libs/excel/Worksheet.php'; include_once '../libs/excel/Workbook.php'; @@ -88,12 +88,12 @@ $worksheet1->write_string($x,$c++, $lang['atDateTime'],$format1); $x++; - $cnt = 0; + $cnt = 0; while ( $cnt < $n ) { $a = new timetrack($this->dbconn); $a->read_result($this->result,$cnt); - $c = 0; + $c = 0; $worksheet1->write_number($x,$c++, $a->id); $worksheet1->write_number($x,$c++, $a->volume,$format2); $worksheet1->write_number($x,$c++, $a->cph,$format2); @@ -112,7 +112,7 @@ fpassthru($fh); fclose($fh); @unlink($tmpname); - return; + return; } else if ($this->format == "stat") { $this->statinfo(); $this->result->free(); @@ -572,10 +572,10 @@ # Search for worker if ( isset($_GET['worker']) ) { $x = getObject($this->dbconn,$_GET['worker']); - if ($x == -1) { + if ($x == -1) { $msg .= sprintf($lang['Err0012'],$lang['TimetrackWorker'],$_GET['worker']); $this->stop = true; - } else if ( $x->getType() == "address" ) { + } else if ( $x->getType() == "address" ) { $q .= $pre . "adr_id =" . $_GET['worker']; } else if ( $x->getType() == "user" ) { $q .= $pre . "adr_id =" . $_GET['worker']; @@ -596,12 +596,16 @@ } check_dbacl( $q, $this->user->id); -# echo $q; +# echo $q; # sorting $this->link2 = $this->link1; $xxx = ""; order_parse($q,$this->link1,$xxx,$xxx,"vtime DESC"); - + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "vtime"; + $_GET['xo'] = 2; + } if ($this->stop) { return; } |
|
From: Gero K. <gok...@us...> - 2004-05-29 08:51:03
|
Update of /cvsroot/tutos/tutos/php/reminder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/php/reminder Modified Files: reminder_overview.php Log Message: show default sort order in headline Index: reminder_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_overview.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- reminder_overview.php 27 Apr 2004 04:49:47 -0000 1.8 +++ reminder_overview.php 29 May 2004 08:50:51 -0000 1.9 @@ -188,6 +188,11 @@ $xxx = ""; $this->link2 = $this->link1; order_parse($this->q,$this->link1,$xxx,$xxx,"remind_date"); + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "remind_date"; + $_GET['xo'] = 1; + } $this->result = $this->dbconn->Exec($this->q); $n = $this->result->numrows(); |
|
From: Gero K. <gok...@us...> - 2004-05-29 08:51:03
|
Update of /cvsroot/tutos/tutos/php/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/php/file Modified Files: file_overview.php Log Message: show default sort order in headline Index: file_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/file/file_overview.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- file_overview.php 27 Mar 2004 17:52:41 -0000 1.11 +++ file_overview.php 29 May 2004 08:50:50 -0000 1.12 @@ -260,6 +260,11 @@ $xxx = ""; $this->link2 = $this->link1; order_parse($this->q,$this->link1,$xxx,$xxx,"name"); + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "name"; + $_GET['xo'] = 1; + } $this->result = $this->dbconn->Exec($this->q); if ( 0 == $this->result->numrows()) { $this->redirect = "file_select.php?msg=". UrlEncode($lang['Err0048']); |
|
From: Gero K. <gok...@us...> - 2004-05-29 08:51:02
|
Update of /cvsroot/tutos/tutos/php/note In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/php/note Modified Files: note_overview.php Log Message: show default sort order in headline Index: note_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/note_overview.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- note_overview.php 27 Mar 2004 16:37:56 -0000 1.36 +++ note_overview.php 29 May 2004 08:50:51 -0000 1.37 @@ -366,6 +366,11 @@ $xxx = ""; $this->link2 = $this->link1; order_parse($this->q,$this->link1,$xxx,$xxx,"n.creation DESC"); + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "n.creation"; + $_GET['xo'] = 2; + } if ($this->stop) { return; |
|
From: Gero K. <gok...@us...> - 2004-05-29 08:51:02
|
Update of /cvsroot/tutos/tutos/php/group In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/php/group Modified Files: group_overview.php Log Message: show default sort order in headline Index: group_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/group/group_overview.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- group_overview.php 27 Mar 2004 18:22:37 -0000 1.19 +++ group_overview.php 29 May 2004 08:50:50 -0000 1.20 @@ -136,6 +136,11 @@ $xxx = ""; $this->link2 = $this->link1; order_parse($this->q,$this->link1,$xxx,$xxx,"name"); + # display default sortorder + if (!isset($_GET['xf'])) { + $_GET['xf'] = "name"; + $_GET['xo'] = 1; + } if ( $this->user->feature_ok(usegroups,PERM_NEW) ) { $x = array( url => "group/group_new.php", |
|
From: Gero K. <gok...@us...> - 2004-05-29 08:50:01
|
Update of /cvsroot/tutos/tutos/php/cia_factbook In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26425/php/cia_factbook Modified Files: cia.pinc Log Message: extended Index: cia.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/cia_factbook/cia.pinc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cia.pinc 7 Apr 2004 12:00:12 -0000 1.6 +++ cia.pinc 29 May 2004 08:49:48 -0000 1.7 @@ -38,8 +38,17 @@ $trans['au'] = 'as'; $trans['gb'] = 'uk'; $trans['pr'] = 'rq'; - $trans['se'] = 'sw'; - $trans['es'] = 'sp'; + $trans['se'] = 'sw'; + $trans['es'] = 'sp'; + $trans['dk'] = 'da'; + $trans['sk'] = 'lo'; + $trans['cz'] = 'ez'; + $trans['ru'] = 'rs'; + $trans['cn'] = 'ch'; + $trans['ge'] = 'gg'; + $trans['pt'] = 'po'; + $trans['za'] = 'sf'; + $trans['tr'] = 'tu'; if (isset($trans[$cn])) { $cn = $trans[$cn]; |
|
From: Gero K. <gok...@us...> - 2004-05-28 15:41:45
|
Update of /cvsroot/tutos/tutos/php/cia_factbook In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16483/php/cia_factbook Modified Files: Tag: BRANCH-1-2 cia.pinc Log Message: extended Index: cia.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/cia_factbook/cia.pinc,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- cia.pinc 7 Apr 2004 12:00:12 -0000 1.6 +++ cia.pinc 28 May 2004 15:41:36 -0000 1.6.2.1 @@ -38,8 +38,16 @@ $trans['au'] = 'as'; $trans['gb'] = 'uk'; $trans['pr'] = 'rq'; - $trans['se'] = 'sw'; - $trans['es'] = 'sp'; + $trans['se'] = 'sw'; + $trans['es'] = 'sp'; + $trans['dk'] = 'da'; + $trans['sk'] = 'lo'; + $trans['cz'] = 'ez'; + $trans['ru'] = 'rs'; + $trans['cn'] = 'ch'; + $trans['ge'] = 'gg'; + $trans['pt'] = 'po'; + $trans['za'] = 'sf'; if (isset($trans[$cn])) { $cn = $trans[$cn]; |
Update of /cvsroot/tutos/tutos/php/note In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32543/php/note Modified Files: ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 fr.p3 hu.p3 it.p3 ja.p3 ko.p3 mtable.pinc nl.p3 note.pinc note_ins.php note_new.php note_show.php pl.p3 pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 Log Message: New field "Event Type" added. Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/ca.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ca.p3 5 Nov 2002 19:46:47 -0000 1.4 +++ ca.p3 28 May 2004 14:16:10 -0000 1.5 @@ -38,6 +38,14 @@ $lang['NoteBetween'] = "Creat entre"; $lang['NotesOverview'] = "Notes"; $lang['EmailRememberNote'] = "Recordi: Nota: %s Web TUTOS"; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "Usar notas"; $lang['note'] = &$lang['Note']; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/cs.p3,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cs.p3 4 Feb 2003 20:05:26 -0000 1.7 +++ cs.p3 28 May 2004 14:16:11 -0000 1.8 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "vytvoøeno mezi"; $lang['NotesOverview'] = "Pøehled poznámek"; $lang['EmailRememberNote'] = "Pozor: Poznámka %s v systému TUTOS"; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "pou¾ít poznámky"; $lang['note'] = &$lang['Note']; Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/de.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- de.p3 5 Nov 2002 19:46:48 -0000 1.4 +++ de.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "Erzeugt zwischen"; $lang['NotesOverview'] = "Notizübersicht"; $lang['EmailRememberNote'] = "Erinnerung: Notiz %s in TUTOS "; +$lang['NoteEventType'] = "Vorgangsart"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Brief"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Telefon (eingehend)"; +$lang['NoteEventTypes'][5] = "Telefon (ausgehend)"; $lang['perm'][usenotes] = "Notizennutzung"; $lang['note'] = &$lang['Note']; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/el.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- el.p3 5 Nov 2002 19:46:48 -0000 1.4 +++ el.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "äçìéïõñãÞèçêå ìåôáîý"; $lang['NotesOverview'] = "Åðéóêüðçóç Óçìåßùóçò"; $lang['EmailRememberNote'] = "Remember: Note: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "÷ñÞóç óçìåéþóåùí"; $lang['note'] = &$lang['Note']; Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/en.p3,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- en.p3 1 Mar 2004 18:25:18 -0000 1.5 +++ en.p3 28 May 2004 14:16:11 -0000 1.6 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "created between"; $lang['NotesOverview'] = "Note Overview"; $lang['EmailRememberNote'] = "Remember: Note: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "use notes"; $lang['note'] = &$lang['Note']; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/es-mx.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- es-mx.p3 5 Nov 2002 19:46:48 -0000 1.4 +++ es-mx.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "creado entre"; $lang['NotesOverview'] = "Resumen de Nota"; $lang['EmailRememberNote'] = "Recuerde: Nota: %s eb TUTOS"; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "usar notas"; $lang['note'] = &$lang['Note']; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/es-ni.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- es-ni.p3 5 Nov 2002 19:46:48 -0000 1.4 +++ es-ni.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "Creada entre"; $lang['NotesOverview'] = "Vista General de Nota"; $lang['EmailRememberNote'] = "Recuerde: Nota: %s eb TUTOS"; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "use notas"; $lang['note'] = &$lang['Note']; Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/es-ve.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es-ve.p3 10 Jun 2003 17:16:07 -0000 1.2 +++ es-ve.p3 28 May 2004 14:16:11 -0000 1.3 @@ -37,6 +37,14 @@ $lang['NoteBetween'] = "Creado entre"; $lang['NotesOverview'] = "Resumen de Nota"; $lang['EmailRememberNote'] = "Recuerde: Nota: %s en TUTOS"; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "usar notas"; $lang['note'] = &$lang['Note']; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/es.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- es.p3 5 Nov 2002 19:46:48 -0000 1.4 +++ es.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "Creado entre"; $lang['NotesOverview'] = "Notas"; $lang['EmailRememberNote'] = "Recuerde: Nota: %s eb TUTOS"; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "Usar notas"; $lang['note'] = &$lang['Note']; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/fr.p3,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fr.p3 17 Apr 2003 18:38:19 -0000 1.5 +++ fr.p3 28 May 2004 14:16:11 -0000 1.6 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "Créé entre"; $lang['NotesOverview'] = "Résumé des notes"; $lang['EmailRememberNote'] = "Rappel: Note: %s dans TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "Écrire des notes"; $lang['note'] = &$lang['Note']; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/hu.p3,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hu.p3 1 Mar 2004 18:25:18 -0000 1.9 +++ hu.p3 28 May 2004 14:16:11 -0000 1.10 @@ -33,6 +33,14 @@ $lang['NoteBetween'] = "létrehozva között"; $lang['NotesOverview'] = "Jegyzet áttekintés"; $lang['EmailRememberNote'] = "Emlékeztetõ: %s jegyzet TUTOS-ban"; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "jegyzetek használata"; $lang['note'] = &$lang['Note']; Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/it.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- it.p3 5 Nov 2002 19:46:48 -0000 1.4 +++ it.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "creata tra il"; $lang['NotesOverview'] = "Overview delle note"; $lang['EmailRememberNote'] = "Remember: Note: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "Usa note"; $lang['note'] = &$lang['Note']; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/ja.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ja.p3 5 Nov 2002 19:46:48 -0000 1.3 +++ ja.p3 28 May 2004 14:16:11 -0000 1.4 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "±¦¤Î´Ö¤ËºîÀ®"; $lang['NotesOverview'] = "¥Î¡¼¥È³µÍ×"; $lang['EmailRememberNote'] = "Remember: Note: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "use notes"; $lang['note'] = &$lang['Note']; Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/ko.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ko.p3 5 Nov 2002 19:46:48 -0000 1.3 +++ ko.p3 28 May 2004 14:16:11 -0000 1.4 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "»ý¼º ±â°£"; $lang['NotesOverview'] = "¸Þ¸ð Àüüº¸±â"; $lang['EmailRememberNote'] = "Remember: Note: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "use notes"; $lang['note'] = &$lang['Note']; Index: mtable.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/mtable.pinc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mtable.pinc 21 Feb 2004 17:25:02 -0000 1.4 +++ mtable.pinc 28 May 2004 14:16:11 -0000 1.5 @@ -16,6 +16,7 @@ "name" => array(type => "VARCHAR", size => 40, constraints => "", Desc => "name of note"), "note" => array(type => "TX_TYPE", constraints => "", Desc => "text of note"), "remember" => array(type => "TS_TYPE", constraints => "", Desc => "when to remember"), + "etype" => array(type => "ID_TYPE", constraints => "", Desc => "id of event type"), "creator" => array(type => "ID_TYPE", constraints => "NN", Desc => "creator ID"), "creation" => array(type => "TS_TYPE", constraints => "NN", Desc => "creation date") ); Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/nl.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nl.p3 5 Nov 2002 19:46:49 -0000 1.4 +++ nl.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "aangemaakt tussen"; $lang['NotesOverview'] = "Notitie Overzicht"; $lang['EmailRememberNote'] = "Herinnering: Notitie: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "gebruik notities"; $lang['note'] = &$lang['Note']; Index: note.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- note.pinc 21 Apr 2004 20:09:15 -0000 1.51 +++ note.pinc 28 May 2004 14:16:11 -0000 1.52 @@ -43,6 +43,31 @@ } } /** + * ask a note's event type + */ +function NoteAskEventType($default,$any) { + global $lang; + + $r = "<select id=\"etype\" name=\"etype\">\n"; + @reset($lang['NoteEventType']); + while ( list ($i,$f) = @each ($lang['NoteEventTypes']) ) { + $r .= "<option value=\"". $i ."\""; + if ( $i == $default ) { + $r .= " selected "; + } + $r .= ">". $f ."</option>\n"; + } + if ( $any > 0 ) { + $r .= "<option value=\"-1\""; + if ( -1 == $default ) { + $r .= " selected "; + } + $r .= ">". $lang['any'] ."</option>\n"; + } + $r .= "</select>\n"; + return $r; +} +/** * a note , attachable nearly everywhere in TUTOS * * @package note @@ -58,6 +83,7 @@ $this->name = ""; $this->note = ""; + $this->etype = ""; $this->ref = -1; $this->link_id = $current_user->id; $this->remember = new DateTime(0); @@ -73,6 +99,7 @@ $this->link_id = $r->get($pos, "link_id"); $this->name = $r->get($pos, "name"); $this->note = $r->get($pos, "note"); + $this->etype = $r->get($pos, "etype"); $this->remember = $r->getDateTime($pos, "remember"); $this->creator = getObject($this->dbconn,$r->get($pos, "creator")); @@ -114,6 +141,21 @@ } return "no link"; } + function askEventType() { + $r = NoteAskEventType($this->etype,0); + return $r; + } + /** + * get current event type of this note (default) as HTML + */ + function getEventType($e = "") { + global $lang; + + if ( ! empty($e) ) { + return "<font color=\"". $this->etype[$e] ."\">". $lang['NoteEventTypes'][$e] ."</font>"; + } + return "<font color=\"". $this->etype[$this->etype] ."\">". $lang['NoteEventTypes'][$this->etype] ."</font>"; + } /** * added by J. Baten */ @@ -230,6 +272,9 @@ function setRemember(&$value) { return $this->setDateTimeField("remember",$value,"NoteRemember"); } + function setEventType($value) { + return $this->setIntField("etype",$value,"NoteEventType"); + } /** * set the reference */ @@ -257,6 +302,7 @@ $q->addFV("name",$this->name,"STRING",$table['note']['name'][size]); $q->addFV("note",$this->note,"TEXT"); $q->addFV("remember",$this->remember,"DATETIME"); + $q->addFV("etype",$this->etype,"INT"); $q->addFV("link_id",$this->link_id,"INT"); if ( $this->id < 0 ) { Index: note_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/note_ins.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- note_ins.php 27 Nov 2003 15:35:34 -0000 1.14 +++ note_ins.php 28 May 2004 14:16:11 -0000 1.15 @@ -37,6 +37,10 @@ $u->setName(StripSlashes($_POST['name'])); $gotourl= addUrlParameter($gotourl,"name=". UrlEncode($u->name),true); } + if ( isset($_POST['etype']) ) { + $u->setEventType($_POST['etype']); + $gotourl= addUrlParameter($gotourl,"etype=". UrlEncode($u->etype),true); + } if ( empty($_POST['note']) ) { $msg .= sprintf($lang['Err0009'],$lang['NoteDescription']) ."<br>"; } else { Index: note_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/note_new.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- note_new.php 23 Feb 2004 20:06:45 -0000 1.25 +++ note_new.php 28 May 2004 14:16:11 -0000 1.26 @@ -63,6 +63,13 @@ echo "</tr>\n"; echo "<tr>\n"; + echo $this->showfieldc($lang['NoteEventType'],0,"etype"); + echo " <td>\n"; + echo $this->obj->askEventType(); + echo " </td>\n"; + echo "</tr>\n"; + + echo "<tr>\n"; echo $this->showfield($lang['NoteDescription'],1,"note"); echo " <td colspan=\"5\"><textarea id=\"note\" rows=\"20\" cols=\"80\" name=\"note\">". $this->obj->note ."</textarea></td>\n"; echo "</tr>\n"; @@ -127,6 +134,9 @@ if ( isset($_GET['remember']) ) { $this->obj->remember->setDateTime($_GET['remember']); } + if ( isset($_GET['etype']) ){ + $this->obj->etype = $_GET['etype']; + } if ( ! $this->obj->mod_ok() ) { $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]); $this->stop = true; Index: note_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/note_show.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- note_show.php 21 Apr 2004 20:09:19 -0000 1.25 +++ note_show.php 28 May 2004 14:16:11 -0000 1.26 @@ -47,6 +47,11 @@ echo "</tr>\n"; echo "<tr>\n"; + echo $this->showfield($lang['NoteEventType']); + echo $this->showdata($this->obj->getEventType()); + echo "</tr>\n"; + + echo "<tr>\n"; echo $this->showfield($lang['NoteReference']); echo $this->showdata($this->obj->getRefLink(),3); echo "</tr>\n"; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/pl.p3,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pl.p3 30 Jan 2003 21:55:17 -0000 1.6 +++ pl.p3 28 May 2004 14:16:11 -0000 1.7 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "Utworzone pomiêdzy"; $lang['NotesOverview'] = "Przegl±d notatek"; $lang['EmailRememberNote'] = "Pamiêtaj: Notatka: %s w TUTOSIE "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "u¿ywanie notatek"; $lang['note'] = &$lang['Notatka']; Index: pt-br.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/pt-br.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pt-br.p3 5 Nov 2002 19:46:52 -0000 1.3 +++ pt-br.p3 28 May 2004 14:16:11 -0000 1.4 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "created between"; $lang['NotesOverview'] = "Note Overview"; $lang['EmailRememberNote'] = "Remember: Note: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "u¿ywanie notek"; $lang['note'] = &$lang['Note']; Index: pt.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/pt.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pt.p3 10 Jun 2003 17:16:08 -0000 1.2 +++ pt.p3 28 May 2004 14:16:11 -0000 1.3 @@ -36,6 +36,14 @@ $lang['NoteBetween'] = "criada entre"; $lang['NotesOverview'] = "Visão Geral de Notas"; $lang['EmailRememberNote'] = "Lembrar: Nota: %s em TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "usar NOTAS"; $lang['note'] = &$lang['Note']; Index: ru.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/ru.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ru.p3 5 Nov 2002 19:46:52 -0000 1.4 +++ ru.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "óÏÚÄÁÔØ ÍÅÖÄÕ"; $lang['NotesOverview'] = "ïÂÚÏÒ ÚÁÍÅÔÏË"; $lang['EmailRememberNote'] = "Remember: Note: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "ÉÓÐÏÌØÚÕÅÔ ÚÁÍÅÔËÉ"; $lang['note'] = &$lang['Note']; Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/sv.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sv.p3 5 Nov 2002 19:46:52 -0000 1.4 +++ sv.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "skapad mellan"; $lang['NotesOverview'] = "Notering Överblick"; $lang['EmailRememberNote'] = "Remember: Note: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "använd noteringar"; $lang['note'] = &$lang['Note']; Index: tw.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/tw.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tw.p3 27 Nov 2002 17:54:57 -0000 1.4 +++ tw.p3 28 May 2004 14:16:11 -0000 1.5 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "«Ø¥ß©ó"; $lang['NotesOverview'] = "³Æ§Ñ¿ý¤@Äý"; $lang['EmailRememberNote'] = "´£¿ô±z: TUTOS ³Æ§Ñ¿ý: %s"; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "use notes"; $lang['note'] = &$lang['Note']; Index: vi.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/vi.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vi.p3 10 Jun 2003 17:16:08 -0000 1.2 +++ vi.p3 28 May 2004 14:16:11 -0000 1.3 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "Äược láºp giữa"; $lang['NotesOverview'] = "Tá»ng quan vá» báo cáo"; $lang['EmailRememberNote'] = "Nhắc nhá»: Ghi chú: %s trong TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "dùng ghi chú"; $lang['note'] = &$lang['Note']; Index: zh.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/zh.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- zh.p3 5 Nov 2002 19:46:53 -0000 1.3 +++ zh.p3 28 May 2004 14:16:11 -0000 1.4 @@ -34,6 +34,14 @@ $lang['NoteBetween'] = "created between"; $lang['NotesOverview'] = "Note Overview"; $lang['EmailRememberNote'] = "Remember: Note: %s in TUTOS "; +$lang['NoteEventType'] = "Event Type"; + +$lang['NoteEventTypes'] = array(); +$lang['NoteEventTypes'][1] = "Letter"; +$lang['NoteEventTypes'][2] = "eMail"; +$lang['NoteEventTypes'][3] = "Fax"; +$lang['NoteEventTypes'][4] = "Phone (incoming)"; +$lang['NoteEventTypes'][5] = "Phone (outgoing)"; $lang['perm'][usenotes] = "använd noteringar"; $lang['note'] = &$lang['Note']; |
|
From: Csecsy L. <bo...@us...> - 2004-05-27 17:49:32
|
Update of /cvsroot/tutos/tutos/php/bugtracking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16612 Modified Files: hu.p3 Log Message: Hungarian language update Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/hu.p3,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hu.p3 27 May 2004 10:01:56 -0000 1.7 +++ hu.p3 27 May 2004 17:49:21 -0000 1.8 @@ -72,7 +72,7 @@ $lang['BugAutoSolver'] = "Kezdetben"; $lang['UserBugSearch'] = "felelõse %s"; $lang['BugReportedFrom'] = "Bejelentve"; -$lang['BugReportedAll'] = "Reported Bugs Overview"; +$lang['BugReportedAll'] = "Bejelentett hibák áttekintése"; $lang['BugMedium'] = "Felfedezés/bejelentés módja"; $lang['BugTrack'] = "Hibakezelés"; |
|
From: Andreas M. <me...@us...> - 2004-05-27 10:02:23
|
Update of /cvsroot/tutos/tutos/php/bugtracking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25063/php/bugtracking Modified Files: bug_show.php ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 Log Message: It's now possible to get an overview on all reported bugs from any user. Index: bug_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bug_show.php 26 May 2004 10:06:22 -0000 1.8 +++ bug_show.php 27 May 2004 10:01:55 -0000 1.9 @@ -88,6 +88,9 @@ echo "</tr><tr>\n"; echo $this->showfield($lang['BugReportedFrom']); echo $this->showdata($this->obj->reporter->getLink(),1); + echo $this->showdata(" ",1); + echo $this->showdata( " (". makelink("bugtracking/bug_overview.php?reporterid=". $this->obj->reporter->id, + $lang['BugReportedAll']) .")",1); echo "</tr><tr>\n"; echo $this->showfield($lang['BugMedium']); Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ca.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ca.p3 26 May 2004 10:43:53 -0000 1.3 +++ ca.p3 27 May 2004 10:01:55 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "asignat a %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Incidències"; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/cs.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cs.p3 26 May 2004 10:43:53 -0000 1.3 +++ cs.p3 27 May 2004 10:01:55 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Poèáteèní"; $lang['UserBugSearch'] = "pøiøazeno k %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Sledování chyb"; Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/de.p3,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- de.p3 26 May 2004 10:43:53 -0000 1.5 +++ de.p3 27 May 2004 10:01:55 -0000 1.6 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Zu Beginn"; $lang['UserBugSearch'] = "zu Lösen von %s"; $lang['BugReportedFrom'] = "Gemeldet von"; +$lang['BugReportedAll'] = "Übersicht gemeldete Fehler"; $lang['BugMedium'] = "Wie entdeckt?"; $lang['BugTrack'] = "Fehlermanagement"; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/el.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- el.p3 26 May 2004 10:43:53 -0000 1.3 +++ el.p3 27 May 2004 10:01:55 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Áñ÷éêÜ"; $lang['UserBugSearch'] = "áíáôÝèçêå óå %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Äéá÷åßñéóç ëÜèþí"; Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/en.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- en.p3 26 May 2004 10:43:53 -0000 1.4 +++ en.p3 27 May 2004 10:01:55 -0000 1.5 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Initial"; $lang['UserBugSearch'] = "assigned to %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bug Tracking"; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-mx.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- es-mx.p3 26 May 2004 10:43:53 -0000 1.3 +++ es-mx.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "assigned to %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Fallos"; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-ni.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- es-ni.p3 26 May 2004 10:43:53 -0000 1.3 +++ es-ni.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "asignado a %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Fallos"; Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-ve.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- es-ve.p3 26 May 2004 10:43:53 -0000 1.3 +++ es-ve.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "asignada a %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Fallos"; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- es.p3 26 May 2004 10:43:53 -0000 1.3 +++ es.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "asignado a %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Incidencias"; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/fr.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fr.p3 26 May 2004 10:43:53 -0000 1.3 +++ fr.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Initial"; $lang['UserBugSearch'] = "Assigné à %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Rapport/Suivi d'incidents"; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/hu.p3,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hu.p3 26 May 2004 17:08:48 -0000 1.6 +++ hu.p3 27 May 2004 10:01:56 -0000 1.7 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Kezdetben"; $lang['UserBugSearch'] = "felelõse %s"; $lang['BugReportedFrom'] = "Bejelentve"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "Felfedezés/bejelentés módja"; $lang['BugTrack'] = "Hibakezelés"; Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/it.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- it.p3 26 May 2004 10:43:53 -0000 1.3 +++ it.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "iniziale"; $lang['UserBugSearch'] = "assigned to %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bug Tracking"; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ja.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ja.p3 26 May 2004 10:43:53 -0000 1.3 +++ ja.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "ºÇ½é¤Î"; $lang['UserBugSearch'] = "%s ¤Ë³äÅö¤Æ"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "¥Ð¥°¥È¥é¥Ã¥¥ó¥°"; Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ko.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ko.p3 26 May 2004 10:43:53 -0000 1.3 +++ ko.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "ÃʱⰪ"; $lang['UserBugSearch'] = "%s¿¡°Ô ÇÒ´çµÊ"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "¹ö±×ÃßÀû"; Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/nl.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nl.p3 26 May 2004 10:43:53 -0000 1.4 +++ nl.p3 27 May 2004 10:01:56 -0000 1.5 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Initieel"; $lang['UserBugSearch'] = "toegewezen aan %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Foutregistratie"; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pl.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pl.p3 26 May 2004 10:43:53 -0000 1.3 +++ pl.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Wyj¶ciowy"; $lang['UserBugSearch'] = "przypisany do %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "B³êdy"; Index: pt-br.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pt-br.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pt-br.p3 26 May 2004 10:43:53 -0000 1.3 +++ pt-br.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "assigned to %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bug Tracking"; Index: pt.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pt.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pt.p3 26 May 2004 10:43:53 -0000 1.3 +++ pt.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "atribuída a %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Registo de Anomalias"; Index: ru.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ru.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ru.p3 26 May 2004 10:43:53 -0000 1.3 +++ ru.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "ÎÁÞÁÌØÎÙÊ"; $lang['UserBugSearch'] = "ÎÁÚÎÁÞÅÎ %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "ïÛÉÂËÉ"; Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/sv.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sv.p3 26 May 2004 10:43:53 -0000 1.4 +++ sv.p3 27 May 2004 10:01:56 -0000 1.5 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Initial"; $lang['UserBugSearch'] = "Ägs av %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bugghantering"; Index: tw.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/tw.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tw.p3 26 May 2004 10:43:53 -0000 1.3 +++ tw.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "µo°_¤H"; $lang['UserBugSearch'] = "«ü©wµ¹ %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bug °lÂÜ"; Index: vi.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/vi.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vi.p3 26 May 2004 10:43:53 -0000 1.3 +++ vi.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "Khá»i thuá»·"; $lang['UserBugSearch'] = "Äược giao cho %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Theo dõi SCKT"; Index: zh.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/zh.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- zh.p3 26 May 2004 10:43:54 -0000 1.3 +++ zh.p3 27 May 2004 10:01:56 -0000 1.4 @@ -72,6 +72,7 @@ $lang['BugAutoSolver'] = "initial"; $lang['UserBugSearch'] = "assigned to %s"; $lang['BugReportedFrom'] = "Reported from"; +$lang['BugReportedAll'] = "Reported Bugs Overview"; $lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "©¶´×·Ñ°"; |
|
From: Andreas M. <me...@us...> - 2004-05-27 08:10:00
|
Update of /cvsroot/tutos/tutos/php/bugtracking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5897/php/bugtracking Modified Files: bug_ins.php bug_new.php Log Message: Fix: now you can choose a reporter on bug creating. If you leave it blank, the current user is default. Index: bug_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bug_ins.php 26 May 2004 10:06:22 -0000 1.9 +++ bug_ins.php 27 May 2004 08:09:49 -0000 1.10 @@ -91,7 +91,8 @@ if ( isset($_POST['reporterid']) ) { $reporter = getObject($dbconn,$_POST['reporterid']); } else { - $msg .= sprintf($lang['Err0009'],$lang['BugReportedFrom']) ."<br>"; + #$msg .= sprintf($lang['Err0009'],$lang['BugReportedFrom']) ."<br>"; + $reporter = $current_user; } } else { if ($b->reporter->getFullName() == $_POST['reporterfn']) { @@ -215,7 +216,7 @@ } else { $b->setSolver($current_user); } - $b->setReporter($current_user); + $b->setReporter($reporter); } $b->setName($name); $b->setShort($short); Index: bug_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bug_new.php 26 May 2004 10:06:22 -0000 1.11 +++ bug_new.php 27 May 2004 08:09:49 -0000 1.12 @@ -161,16 +161,9 @@ echo "</td></tr>\n"; echo "<tr>\n"; - echo $this->showfieldc($lang['BugReportedFrom']); + echo $this->showfieldc($lang['BugReportedFrom'],1); echo " <td colspan=\"1\" valign=\"top\">"; - if ( $this->obj->id > 0 ) { - select_from_array_or_input($this->obj,"reporter",$this->obj->reporter,1); - } else { - $reporter = $this->user->id; - echo $lang['BugAutoSolver'] ." "; - echo $this->user->getLink(); - $this->addHidden("reporterid",$reporter); - } + select_from_array_or_input($this->obj,"reporter",$this->obj->reporter,1); echo " </td>\n"; echo $this->showfieldc($lang['BugMedium'],0,"medium"); echo " <td>\n"; |
|
From: Csecsy L. <bo...@us...> - 2004-05-26 17:08:57
|
Update of /cvsroot/tutos/tutos/php/bugtracking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6470 Modified Files: hu.p3 Log Message: Hungarian language update Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/hu.p3,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hu.p3 26 May 2004 10:43:53 -0000 1.5 +++ hu.p3 26 May 2004 17:08:48 -0000 1.6 @@ -45,11 +45,11 @@ $lang['BugClasses'][3] = "veszélyes"; $lang['BugClasses'][4] = "javaslat"; $lang['BugMediums'][1] = "Desktop"; -$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][2] = "E-mail"; $lang['BugMediums'][3] = "Fax"; -$lang['BugMediums'][4] = "Forum"; -$lang['BugMediums'][5] = "Miscellaneous"; -$lang['BugMediums'][6] = "Phone"; +$lang['BugMediums'][4] = "Fórum"; +$lang['BugMediums'][5] = "Egyéb"; +$lang['BugMediums'][6] = "Telefon"; $lang['SearchForBug'] = "Hiba keresése"; $lang['SearchForBugExt'] = "Hiba bõvített keresése"; $lang['CreateNewBug'] = "Új hiba bevitele"; @@ -71,8 +71,8 @@ $lang['BugAutoState'] = "Kezdõállapot"; $lang['BugAutoSolver'] = "Kezdetben"; $lang['UserBugSearch'] = "felelõse %s"; -$lang['BugReportedFrom'] = "Reported from"; -$lang['BugMedium'] = "How detected/reported"; +$lang['BugReportedFrom'] = "Bejelentve"; +$lang['BugMedium'] = "Felfedezés/bejelentés módja"; $lang['BugTrack'] = "Hibakezelés"; $lang['BugTrackInfo'] = "Hiba-adatbázis"; |
Update of /cvsroot/tutos/tutos/php/expense In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26430/php/expense Modified Files: ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 expense.pinc expense_ins.php expense_new.php expense_overview.php expense_show.php fr.p3 hu.p3 it.p3 ja.p3 ko.p3 mtable.pinc nl.p3 pl.p3 pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 Log Message: - Fix: XML-Export/Import - Fix: multilingual categories and method of payment (mop) Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/ca.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ca.p3 19 May 2004 14:30:38 -0000 1.3 +++ ca.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/cs.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cs.p3 19 May 2004 14:30:38 -0000 1.3 +++ cs.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/de.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- de.p3 19 May 2004 14:30:38 -0000 1.3 +++ de.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Begin"; $lang['ExpenseEndTime'] = "Ende"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "Auto/Mietwagen"; -$tutos[expensecategory][] = "Arbeitsessen"; -$tutos[expensecategory][] = "Benzin"; -$tutos[expensecategory][] = "Bus/Bahn"; -$tutos[expensecategory][] = "Flug"; -$tutos[expensecategory][] = "Geschenke"; -$tutos[expensecategory][] = "Hotel"; -$tutos[expensecategory][] = "Kalkulatorische Kosten"; -$tutos[expensecategory][] = "Öl/Reparatur"; -$tutos[expensecategory][] = "Parken"; -$tutos[expensecategory][] = "Porto"; -$tutos[expensecategory][] = "Privat"; -$tutos[expensecategory][] = "Restaurant/Essen"; -$tutos[expensecategory][] = "Snacks"; -$tutos[expensecategory][] = "Sonstige Belegarten"; -$tutos[expensecategory][] = "Sonstige KFZ Kosten"; -$tutos[expensecategory][] = "Taxi"; -$tutos[expensecategory][] = "Telefon"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "Auto/Mietwagen"; +$lang['ExpenseCategories'][2] = "Arbeitsessen"; +$lang['ExpenseCategories'][3] = "Benzin"; +$lang['ExpenseCategories'][4] = "Bus/Bahn"; +$lang['ExpenseCategories'][5] = "Flug"; +$lang['ExpenseCategories'][6] = "Geschenke"; +$lang['ExpenseCategories'][7] = "Hotel"; +$lang['ExpenseCategories'][8] = "Kalkulatorische Kosten"; +$lang['ExpenseCategories'][9] = "Öl/Reparatur"; +$lang['ExpenseCategories'][10] = "Parken"; +$lang['ExpenseCategories'][11] = "Porto"; +$lang['ExpenseCategories'][12] = "Privat"; +$lang['ExpenseCategories'][13] = "Restaurant/Essen"; +$lang['ExpenseCategories'][14] = "Snacks"; +$lang['ExpenseCategories'][15] = "Sonstige Belegarten"; +$lang['ExpenseCategories'][16] = "Sonstige KFZ Kosten"; +$lang['ExpenseCategories'][17] = "Taxi"; +$lang['ExpenseCategories'][18] = "Telefon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "Bar/Privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Sonstige Zahlungsarten"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "Bar/Privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Sonstige Zahlungsarten"; $lang['perm'][useexpenses] = "Spesennutzung"; $lang['expense'] = &$lang['Expense']; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/el.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- el.p3 19 May 2004 14:30:38 -0000 1.3 +++ el.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/en.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- en.p3 19 May 2004 14:30:38 -0000 1.3 +++ en.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/es-mx.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- es-mx.p3 19 May 2004 14:30:38 -0000 1.3 +++ es-mx.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/es-ni.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- es-ni.p3 19 May 2004 14:30:38 -0000 1.3 +++ es-ni.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/es-ve.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- es-ve.p3 19 May 2004 14:30:38 -0000 1.3 +++ es-ve.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/es.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- es.p3 19 May 2004 14:30:38 -0000 1.3 +++ es.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: expense.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense.pinc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- expense.pinc 19 May 2004 14:04:45 -0000 1.3 +++ expense.pinc 26 May 2004 13:38:08 -0000 1.4 @@ -49,6 +49,56 @@ ." ". makelink("expense/expense_overview.php?show=all&link_id=". $obj->id,$lang['ExpenseOverview']); } /** + * ask a expense category + */ +function ExpenseAskCategory ($default,$any) { + global $lang; + + $r = "<select id=\"category\" name=\"category\">\n"; + @reset($lang['ExpenseCategory']); + while ( list ($i,$f) = @each ($lang['ExpenseCategories']) ) { + $r .= "<option value=\"". $i ."\""; + if ( $i == $default ) { + $r .= " selected "; + } + $r .= ">". $f ."</option>\n"; + } + if ( $any > 0 ) { + $r .= "<option value=\"-1\""; + if ( -1 == $default ) { + $r .= " selected "; + } + $r .= ">". $lang['any'] ."</option>\n"; + } + $r .= "</select>\n"; + return $r; +} +/** + * ask a expense method of payment + */ +function ExpenseAskMOP ($default,$any) { + global $lang; + + $r = "<select id=\"mop\" name=\"mop\">\n"; + @reset($lang['ExpenseMOP']); + while ( list ($i,$f) = @each ($lang['ExpenseMOPs']) ) { + $r .= "<option value=\"". $i ."\""; + if ( $i == $default ) { + $r .= " selected "; + } + $r .= ">". $f ."</option>\n"; + } + if ( $any > 0 ) { + $r .= "<option value=\"-1\""; + if ( -1 == $default ) { + $r .= " selected "; + } + $r .= ">". $lang['any'] ."</option>\n"; + } + $r .= "</select>\n"; + return $r; +} +/** * a expense , attachable nearly everywhere in TUTOS * * @package expense @@ -171,6 +221,36 @@ } return "no link"; } + function askCategory () { + $r = ExpenseAskCategory($this->category,0); + return $r; + } + /** + * get current category of this expense (default) as HTML + */ + function getCategory ($c = "") { + global $lang; + + if ( ! empty($c) ) { + return "<font color=\"". $this->category[$c] ."\">". $lang['ExpenseCategories'][$c] ."</font>"; + } + return "<font color=\"". $this->category[$this->category] ."\">". $lang['ExpenseCategories'][$this->category] ."</font>"; + } + function askMOP () { + $r = ExpenseAskMOP($this->mop,0); + return $r; + } + /** + * get current method of payment of this expense (default) as HTML + */ + function getMOP ($m = "") { + global $lang; + + if ( ! empty($m) ) { + return "<font color=\"". $this->mop[$m] ."\">". $lang['ExpenseMOPs'][$m] ."</font>"; + } + return "<font color=\"". $this->mop[$this->mop] ."\">". $lang['ExpenseMOPs'][$this->mop] ."</font>"; + } /** * added by J. Baten */ @@ -229,7 +309,7 @@ /** * Dropdown to choose the expense category */ - function Category_Select($name,$def) { + /*function Category_Select($name,$def) { global $lang , $tutos; $found = 0; @@ -247,11 +327,11 @@ echo "<option value=\"". $c ."\">". myentities($c) ."</option>\n"; } echo "</select>\n"; - } + }*/ /** * Dropdown to choose the expense method of payment */ - function MOP_Select($name,$def) { + /*function MOP_Select($name,$def) { global $lang , $tutos; $found = 0; @@ -269,7 +349,7 @@ echo "<option value=\"". $c ."\">". myentities($c) ."</option>\n"; } echo "</select>\n"; - } + }*/ /** * Return a link to this expense */ @@ -320,7 +400,7 @@ * set the expense category */ function setCategory($value) { - return $this->setStrField("category",$value,"ExpenseCategory"); + return $this->setIntField("category",$value,"ExpenseCategory"); } /** * set the expense reason @@ -356,7 +436,7 @@ * set the expense method of payment */ function setMop($value) { - return $this->setStrField("mop",$value,"ExpenseMOP"); + return $this->setIntField("mop",$value,"ExpenseMOP"); } /** * set the expense cost centre @@ -443,12 +523,12 @@ $q = new query($this->dbconn); $q->setTable($this->tablename); $q->addFV("name",$this->name,"STRING",$table['expense']['name'][size]); - $q->addFV("category",$this->category,"STRING",$table['expense']['category'][size]); + $q->addFV("category",$this->category,"INT"); $q->addFV("reason",$this->reason,"STRING",$table['expense']['reason'][size]); $q->addFV("city",$this->city,"STRING",$table['expense']['city'][size]); $q->addFV("country",$this->country,"STRING",$table['expense']['country'][size]); $q->addFV("currency",$this->currency,"STRING",$table['expense']['currency'][size]); - $q->addFV("mop",$this->mop,"STRING",$table['expense']['mop'][size]); + $q->addFV("mop",$this->mop,"INT"); $q->addFV("ccentre",$this->ccentre,"STRING",$table['expense']['ccentre'][size]); $q->addFV("description",$this->description,"TEXT"); $q->addFV("people",$this->people,"TEXT"); @@ -526,31 +606,80 @@ /** * Export as XML */ - function exportXML () { - $r = $this->exportXML_head() ; - $r .= $this->exportXML_start(); - $r .= " <link_id>". $this->link_id ."</link_id>\n"; - $r .= " <adr_id>". $this->adr_id ."</adr_id>\n"; - $r .= " <name>". $this->name ."</name>\n"; - $r .= " <description>". $this->description ."</description>\n"; - $r .= " <category>". $this->category ."</category>\n"; - $r .= " <reason>". $this->reason ."</reason>\n"; - $r .= " <people>". $this->people ."</people>\n"; - $r .= " <city>". $this->city ."</city>\n"; - $r .= " <country>". $this->country ."</country>\n"; - $r .= " <gamount>". $this->gamount ."</gamount>\n"; - $r .= " <currency>". $this->currency ."</currency>\n"; - $r .= " <deduction>". $this->deduction ."</deduction>\n"; - $r .= " <itax>". $this->itax ."</itax>\n"; - $r .= " <mop>". $this->mop ."</mop>\n"; - $r .= " <ccentre>". $this->ccentre ."</ccentre>\n"; - $r .= " <invoice>". $this->invoice ."</invoice>\n"; - $r .= " <t_start>". $this->t_start ."</t_start>\n"; - $r .= " <t_end>". $this->t_end ."</t_end>\n"; - $r .= $this->exportXML_end(); + function exportXML_body ($only_ids = false) { + #$r = $this->exportXML_head() ; + #$r = $this->exportXML_start(); + $r = parent::exportXML_body(); + $r .= " <link_id>". utf8_encode(htmlspecialchars($this->link_id)) ."</link_id>\n"; + $r .= " <adr_id>". utf8_encode(htmlspecialchars($this->adr_id)) ."</adr_id>\n"; + $r .= " <name>". utf8_encode(htmlspecialchars($this->name)) ."</name>\n"; + $r .= " <description>". utf8_encode(htmlspecialchars($this->description)) ."</description>\n"; + $r .= " <category>". utf8_encode(htmlspecialchars($this->category)) ."</category>\n"; + $r .= " <reason>". utf8_encode(htmlspecialchars($this->reason)) ."</reason>\n"; + $r .= " <people>". utf8_encode(htmlspecialchars($this->people)) ."</people>\n"; + $r .= " <city>". utf8_encode(htmlspecialchars($this->city)) ."</city>\n"; + $r .= " <country>". utf8_encode(htmlspecialchars($this->country)) ."</country>\n"; + $r .= " <gamount>". utf8_encode(htmlspecialchars($this->gamount)) ."</gamount>\n"; + $r .= " <currency>". utf8_encode(htmlspecialchars($this->currency)) ."</currency>\n"; + $r .= " <deduction>". utf8_encode(htmlspecialchars($this->deduction)) ."</deduction>\n"; + $r .= " <itax>". utf8_encode(htmlspecialchars($this->itax)) ."</itax>\n"; + $r .= " <mop>". utf8_encode(htmlspecialchars($this->mop)) ."</mop>\n"; + $r .= " <ccentre>". utf8_encode(htmlspecialchars($this->ccentre)) ."</ccentre>\n"; + $r .= " <invoice>". utf8_encode(htmlspecialchars($this->invoice)) ."</invoice>\n"; + $r .= " <t_start>". $this->t_start->exportXML_body() ."</t_start>\n"; + $r .= " <t_end>". $this->t_end->exportXML_body() ."</t_end>\n"; + #$r .= $this->exportXML_end(); return $r; } /** + * parse XML import + */ + function parseXML ($fld,$data,$attrs) { + parent::parseXML($fld,$data,$attrs); + if ($fld == "link_id") { + $this->setReference($data); + } else if ($fld == "adr_id") { + $this->setAdrReference($data); + } else if ($fld == "name") { + $this->setName($data); + } else if ($fld == "description") { + $this->setDescription($data); + } else if ($fld == "category") { + $this->setCategory($data); + } else if ($fld == "reason") { + $this->setReason($data); + } else if ($fld == "people") { + $this->setPeople($data); + } else if ($fld == "city") { + $this->setCity($data); + } else if ($fld == "country") { + $this->setCountry($data); + } else if ($fld == "gamount") { + $this->setGAmount($data); + } else if ($fld == "currency") { + $this->setCurrency($data); + } else if ($fld == "deduction") { + $this->setDeduction($data); + } else if ($fld == "itax") { + $this->setITax($data); + } else if ($fld == "mop") { + $this->setMop($data); + } else if ($fld == "mop") { + $this->setMop($data); + } else if ($fld == "ccentre") { + $this->setCCentre($data); + } else if ($fld == "invoice") { + $this->setInvoice($data); + } else if ($fld == "t_start") { + $d = new DateTime($data); + $this->setStartTime($d); + } else if ($fld == "t_end") { + $d = new DateTime($data); + $this->setEndTime($d); + } + return; + } + /** * checks if the expense remember happens that day * Date d true if expense remember happens that day */ Index: expense_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense_ins.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- expense_ins.php 19 May 2004 14:04:45 -0000 1.2 +++ expense_ins.php 26 May 2004 13:38:08 -0000 1.3 @@ -38,7 +38,7 @@ $gotourl= addUrlParameter($gotourl,"name=". UrlEncode($u->name),true); } if ( isset($_POST['category']) ) { - $u->setCategory(StripSlashes($_POST['category'])); + $u->setCategory($_POST['category']); $gotourl= addUrlParameter($gotourl,"category=". UrlEncode($u->category),true); } if ( isset($_POST['reason']) ) { @@ -64,7 +64,7 @@ $gotourl= addUrlParameter($gotourl,"currency=". UrlEncode($u->currency),true); } if ( isset($_POST['mop']) ) { - $u->setMop(StripSlashes($_POST['mop'])); + $u->setMop($_POST['mop']); $gotourl= addUrlParameter($gotourl,"mop=". UrlEncode($u->mop),true); } if ( isset($_POST['ccentre']) ) { Index: expense_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense_new.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- expense_new.php 18 May 2004 15:29:14 -0000 1.1 +++ expense_new.php 26 May 2004 13:38:08 -0000 1.2 @@ -80,7 +80,8 @@ echo "<tr>\n"; echo $this->showfieldc($lang['ExpenseCategory'],0,"category"); echo " <td>\n"; - echo $this->obj->Category_Select("category",$this->obj->category); + #echo $this->obj->Category_Select("category",$this->obj->category); + echo $this->obj->askCategory(); echo " </td>\n"; echo "</tr>\n"; @@ -128,7 +129,8 @@ echo "<tr>\n"; echo $this->showfieldc($lang['ExpenseMOP'],0,"mop"); echo " <td>\n"; - echo $this->obj->MOP_Select("mop",$this->obj->mop); + #echo $this->obj->MOP_Select("mop",$this->obj->mop); + echo $this->obj->askMOP(); echo " </td>\n"; echo "</tr>\n"; @@ -219,7 +221,7 @@ $this->obj->name = StripSlashes($_GET['name']); } if ( isset($_GET['category']) ){ - $this->obj->category = StripSlashes($_GET['category']); + $this->obj->category = $_GET['category']; } if ( isset($_GET['reason']) ){ $this->obj->reason = StripSlashes($_GET['reason']); @@ -237,7 +239,7 @@ $this->obj->currency = StripSlashes($_GET['currency']); } if ( isset($_GET['mop']) ){ - $this->obj->mop = StripSlashes($_GET['mop']); + $this->obj->mop = $_GET['mop']; } if ( isset($_GET['ccentre']) ){ $this->obj->ccentre = StripSlashes($_GET['ccentre']); Index: expense_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense_overview.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- expense_overview.php 19 May 2004 13:49:52 -0000 1.3 +++ expense_overview.php 26 May 2004 13:38:08 -0000 1.4 @@ -30,6 +30,21 @@ $n = $this->result->numrows(); + if ( $this->format == "xml" ) { + $e = new expense($this->dbconn); + echo $e->exportXMLHeader(); + echo $e->exportXML_head(); + echo "<expense_set>\n"; + $x = 0; + while ( $x < $n ) { + $e = new expense($this->dbconn); + $e->read_result($this->result,$x); + echo $e->exportXML(false); + $x++; + } + echo "</expense_set>\n"; + } else { + $blist = array(); # Make a big array of all visible expenses $x = 0; @@ -108,7 +123,7 @@ echo " <td> ". number_format($b->gamount,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". myentities($b->currency) ."</td>\n"; $sum[$b->currency] += $b->gamount; - echo " <td> ". $b->category ."</td>\n"; + echo " <td> ". $b->getCategory() ."</td>\n"; if ( $tutos[massupdate] == 1 ) { echo " <td align=\"center\">\n"; if ( $b->mod_ok() ) { @@ -168,6 +183,7 @@ } echo $this->OverviewTableEnd(); echo $this->actionformEnd("expense_overview.php"); + } } /** * naviagte Index: expense_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense_show.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- expense_show.php 18 May 2004 15:29:14 -0000 1.1 +++ expense_show.php 26 May 2004 13:38:08 -0000 1.2 @@ -28,6 +28,12 @@ Function info() { global $lang,$tutos; + if ( $this->format == "xml") { + echo $this->obj->exportXMLHeader(); + echo $this->obj->exportXML(); + return; + } + echo $this->DataTableStart(); echo "<tr><th colspan=\"4\">". $lang['Expense'] ."</th></tr>\n"; @@ -55,7 +61,7 @@ echo "<tr>\n"; echo $this->showfield($lang['ExpenseCategory']); - echo $this->showdata(myentities($this->obj->category)); + echo $this->showdata($this->obj->getCategory()); echo "</tr>\n"; echo "<tr>\n"; @@ -111,7 +117,7 @@ echo "<tr>\n"; echo $this->showfield($lang['ExpenseMOP']); - echo $this->showdata(myentities($this->obj->mop)); + echo $this->showdata($this->obj->getMOP()); echo "</tr>\n"; echo "<tr>\n"; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/fr.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fr.p3 19 May 2004 14:30:38 -0000 1.3 +++ fr.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/hu.p3,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hu.p3 19 May 2004 17:19:35 -0000 1.5 +++ hu.p3 26 May 2004 13:38:08 -0000 1.6 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Kezdés ideje"; $lang['ExpenseEndTime'] = "Vége"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "ajándék"; -$tutos[expensecategory][] = "autókölcsönzés"; -$tutos[expensecategory][] = "benzin"; -$tutos[expensecategory][] = "beszámított költségek"; -$tutos[expensecategory][] = "büfé"; -$tutos[expensecategory][] = "busz/vonat"; -$tutos[expensecategory][] = "egyéb autó költségek"; -$tutos[expensecategory][] = "egyéb típusok"; -$tutos[expensecategory][] = "javítás"; -$tutos[expensecategory][] = "munkaebéd"; -$tutos[expensecategory][] = "parkolás"; -$tutos[expensecategory][] = "postaköltség"; -$tutos[expensecategory][] = "privát"; -$tutos[expensecategory][] = "repülõ"; -$tutos[expensecategory][] = "szállás"; -$tutos[expensecategory][] = "szolgáltatás"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telefon"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "autókölcsönzés"; +$lang['ExpenseCategories'][2] = "munkaebéd"; +$lang['ExpenseCategories'][3] = "benzin"; +$lang['ExpenseCategories'][4] = "busz/vonat"; +$lang['ExpenseCategories'][5] = "repülõ"; +$lang['ExpenseCategories'][6] = "ajándék"; +$lang['ExpenseCategories'][7] = "szállás"; +$lang['ExpenseCategories'][8] = "beszámított költségek"; +$lang['ExpenseCategories'][9] = "javítás"; +$lang['ExpenseCategories'][10] = "parkolás"; +$lang['ExpenseCategories'][11] = "postaköltség"; +$lang['ExpenseCategories'][12] = "privát"; +$lang['ExpenseCategories'][13] = "szolgáltatás"; +$lang['ExpenseCategories'][14] = "büfé"; +$lang['ExpenseCategories'][15] = "egyéb típusok"; +$lang['ExpenseCategories'][16] = "egyéb autó költségek"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telefon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "készpénz/privát"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "más fizetési mód"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "készpénz/privát"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "más fizetési mód"; $lang['perm'][useexpenses] = "kiadások használata"; $lang['expense'] = &$lang['Expense']; Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/it.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- it.p3 19 May 2004 14:30:38 -0000 1.3 +++ it.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/ja.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ja.p3 19 May 2004 14:30:38 -0000 1.3 +++ ja.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/ko.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ko.p3 19 May 2004 14:30:38 -0000 1.3 +++ ko.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: mtable.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/mtable.pinc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mtable.pinc 18 May 2004 15:29:15 -0000 1.1 +++ mtable.pinc 26 May 2004 13:38:08 -0000 1.2 @@ -16,7 +16,7 @@ "adr_id" => array(type => "ID_TYPE", constraints => "NN", Desc => "id of linked address"), "name" => array(type => "VARCHAR", size => 50, constraints => "NN", Desc => "short name of expenses"), "description" => array(type => "TX_TYPE", constraints => "", Desc => "long description of expenses"), - "category" => array(type => "VARCHAR", size => 50, constraints => "", Desc => "category of expenses"), + "category" => array(type => "ID_TYPE", constraints => "", Desc => "category of expenses"), "reason" => array(type => "VARCHAR", size => 50, constraints => "", Desc => "reason of the expense"), "people" => array(type => "TX_TYPE", constraints => "", Desc => "concerned persons"), "city" => array(type => "VARCHAR", size => 50, constraints => "", Desc => "city name"), @@ -25,7 +25,7 @@ "currency" => array(type => "VARCHAR", size => 4, constraints => "NN", Desc => "currency for gross amount"), "deduction" => array(type => "float", constraints => "", Desc => "possible deduction"), "itax" => array(type => "float", constraints => "", Desc => "input tax for gross amount"), - "mop" => array(type => "VARCHAR", size => 50, constraints => "", Desc => "method of payment"), + "mop" => array(type => "ID_TYPE", constraints => "", Desc => "method of payment"), "ccentre" => array(type => "VARCHAR", size => 50, constraints => "", Desc => "cost centre"), "invoice" => array(type => "ID_TYPE", constraints => "", Desc => "id of invoice"), "t_start" => array(type => "TS_TYPE", constraints => "NN", Desc => "start date/time of using expenses"), Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/nl.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nl.p3 19 May 2004 14:30:38 -0000 1.3 +++ nl.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategory][] = "service"; -$tutos[expensecategory][] = "snacks"; -$tutos[expensecategory][] = "taxi"; -$tutos[expensecategory][] = "telephon"; -$tutos[expensecategory][] = "working lunch"; +$lang['ExpenseCategories'] = array(); +$lang['ExpenseCategories'][1] = "hired car"; +$lang['ExpenseCategories'][2] = "working lunch"; +$lang['ExpenseCategories'][3] = "petrol"; +$lang['ExpenseCategories'][4] = "bus/train"; +$lang['ExpenseCategories'][5] = "flight"; +$lang['ExpenseCategories'][6] = "gift"; +$lang['ExpenseCategories'][7] = "hotel"; +$lang['ExpenseCategories'][8] = "imputed costs"; +$lang['ExpenseCategories'][9] = "repair"; +$lang['ExpenseCategories'][10] = "parking"; +$lang['ExpenseCategories'][11] = "postal charges"; +$lang['ExpenseCategories'][12] = "privat"; +$lang['ExpenseCategories'][13] = "service"; +$lang['ExpenseCategories'][14] = "snacks"; +$lang['ExpenseCategories'][15] = "other types"; +$lang['ExpenseCategories'][16] = "other automobile charges"; +$lang['ExpenseCategories'][17] = "taxi"; +$lang['ExpenseCategories'][18] = "telephon"; -$tutos[expensemop] = array(); -$tutos[expensemop][] = "cash/privat"; -$tutos[expensemop][] = "Eurocard"; -$tutos[expensemop][] = "American Express"; -$tutos[expensemop][] = "Visa Card"; -$tutos[expensemop][] = "Diners"; -$tutos[expensemop][] = "Other method of payments"; +$lang['ExpenseMOPs'] = array(); +$lang['ExpenseMOPs'][1] = "cash/privat"; +$lang['ExpenseMOPs'][2] = "Eurocard"; +$lang['ExpenseMOPs'][3] = "American Express"; +$lang['ExpenseMOPs'][4] = "Visa Card"; +$lang['ExpenseMOPs'][5] = "Diners"; +$lang['ExpenseMOPs'][6] = "Other method of payments"; $lang['perm'][useexpenses] = "use expenses"; $lang['expense'] = &$lang['Expense']; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/pl.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pl.p3 19 May 2004 14:30:38 -0000 1.3 +++ pl.p3 26 May 2004 13:38:08 -0000 1.4 @@ -46,33 +46,33 @@ $lang['ExpenseStartTime'] = "Starting Time"; $lang['ExpenseEndTime'] = "Ending Time"; -$tutos[expensecategory] = array(); -$tutos[expensecategory][] = "bus/train"; -$tutos[expensecategory][] = "flight"; -$tutos[expensecategory][] = "gift"; -$tutos[expensecategory][] = "hired car"; -$tutos[expensecategory][] = "hotel"; -$tutos[expensecategory][] = "imputed costs"; -$tutos[expensecategory][] = "other automobile charges"; -$tutos[expensecategory][] = "other types"; -$tutos[expensecategory][] = "parking"; -$tutos[expensecategory][] = "petrol"; -$tutos[expensecategory][] = "postal charges"; -$tutos[expensecategory][] = "privat"; -$tutos[expensecategory][] = "repair"; -$tutos[expensecategor... [truncated message content] |
|
From: Andreas M. <me...@us...> - 2004-05-26 10:44:10
|
Update of /cvsroot/tutos/tutos/php/bugtracking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26243/php/bugtracking Modified Files: ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 Log Message: Two language-constants added. Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ca.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ca.p3 26 May 2004 10:06:22 -0000 1.2 +++ ca.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "estat inicial"; $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "asignat a %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Incidències"; $lang['BugTrackInfo'] = "Base de dades d'incidències"; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/cs.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cs.p3 26 May 2004 10:06:23 -0000 1.2 +++ cs.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "Poèáteèní stav"; $lang['BugAutoSolver'] = "Poèáteèní"; $lang['UserBugSearch'] = "pøiøazeno k %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Sledování chyb"; $lang['BugTrackInfo'] = "Databáze sledování chyb"; Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/de.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- de.p3 26 May 2004 10:06:23 -0000 1.4 +++ de.p3 26 May 2004 10:43:53 -0000 1.5 @@ -72,7 +72,7 @@ $lang['BugAutoSolver'] = "Zu Beginn"; $lang['UserBugSearch'] = "zu Lösen von %s"; $lang['BugReportedFrom'] = "Gemeldet von"; -$lang['BugMedium'] = "Meldungsform"; +$lang['BugMedium'] = "Wie entdeckt?"; $lang['BugTrack'] = "Fehlermanagement"; $lang['BugTrackInfo'] = "Zur Fehlerdatenbank"; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/el.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- el.p3 26 May 2004 10:06:23 -0000 1.2 +++ el.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "Áñ÷éêÞ êáôÜóôáóç"; $lang['BugAutoSolver'] = "Áñ÷éêÜ"; $lang['UserBugSearch'] = "áíáôÝèçêå óå %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Äéá÷åßñéóç ëÜèþí"; $lang['BugTrackInfo'] = "ÂÜóç äåäïìÝíùí Åíôïðéóìïý Ëáèþí "; Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/en.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- en.p3 26 May 2004 10:06:23 -0000 1.3 +++ en.p3 26 May 2004 10:43:53 -0000 1.4 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "Initial state"; $lang['BugAutoSolver'] = "Initial"; $lang['UserBugSearch'] = "assigned to %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bug Tracking"; $lang['BugTrackInfo'] = "Bug Tracking Database"; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-mx.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es-mx.p3 26 May 2004 10:06:23 -0000 1.2 +++ es-mx.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "estado inicial"; $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "assigned to %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Fallos"; $lang['BugTrackInfo'] = "Base de datos de fallos"; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-ni.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es-ni.p3 26 May 2004 10:06:23 -0000 1.2 +++ es-ni.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "Estado Inicial"; $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "asignado a %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Fallos"; $lang['BugTrackInfo'] = "Base de Datos de Fallos"; Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-ve.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es-ve.p3 26 May 2004 10:06:23 -0000 1.2 +++ es-ve.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "estado inicial"; $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "asignada a %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Fallos"; $lang['BugTrackInfo'] = "Base de datos de fallos"; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es.p3 26 May 2004 10:06:23 -0000 1.2 +++ es.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "estado inicial"; $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "asignado a %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Incidencias"; $lang['BugTrackInfo'] = "Base de datos de Incidencias"; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/fr.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fr.p3 26 May 2004 10:06:23 -0000 1.2 +++ fr.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "État initial"; $lang['BugAutoSolver'] = "Initial"; $lang['UserBugSearch'] = "Assigné à %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Rapport/Suivi d'incidents"; $lang['BugTrackInfo'] = "Base de suivi d'incidents"; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/hu.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hu.p3 26 May 2004 10:06:23 -0000 1.4 +++ hu.p3 26 May 2004 10:43:53 -0000 1.5 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "Kezdõállapot"; $lang['BugAutoSolver'] = "Kezdetben"; $lang['UserBugSearch'] = "felelõse %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Hibakezelés"; $lang['BugTrackInfo'] = "Hiba-adatbázis"; Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/it.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- it.p3 26 May 2004 10:06:23 -0000 1.2 +++ it.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "stato iniziale"; $lang['BugAutoSolver'] = "iniziale"; $lang['UserBugSearch'] = "assigned to %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bug Tracking"; $lang['BugTrackInfo'] = "Database di Bug Tracking"; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ja.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ja.p3 26 May 2004 10:06:23 -0000 1.2 +++ ja.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "½é´ü¾õÂÖ"; $lang['BugAutoSolver'] = "ºÇ½é¤Î"; $lang['UserBugSearch'] = "%s ¤Ë³äÅö¤Æ"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "¥Ð¥°¥È¥é¥Ã¥¥ó¥°"; $lang['BugTrackInfo'] = "¥Ð¥°¥È¥é¥Ã¥¥ó¥° ¥Ç¡¼¥¿¥Ù¡¼¥¹"; Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ko.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ko.p3 26 May 2004 10:06:23 -0000 1.2 +++ ko.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "Ãʱâ»óÅÂ"; $lang['BugAutoSolver'] = "ÃʱⰪ"; $lang['UserBugSearch'] = "%s¿¡°Ô ÇÒ´çµÊ"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "¹ö±×ÃßÀû"; $lang['BugTrackInfo'] = "¹ö±×ÃßÀû DB"; Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/nl.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nl.p3 26 May 2004 10:06:23 -0000 1.3 +++ nl.p3 26 May 2004 10:43:53 -0000 1.4 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "Initiele status"; $lang['BugAutoSolver'] = "Initieel"; $lang['UserBugSearch'] = "toegewezen aan %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Foutregistratie"; $lang['BugTrackInfo'] = "Bug Tracking Database"; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pl.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pl.p3 26 May 2004 10:06:23 -0000 1.2 +++ pl.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "Stan wyj¶ciowy"; $lang['BugAutoSolver'] = "Wyj¶ciowy"; $lang['UserBugSearch'] = "przypisany do %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "B³êdy"; $lang['BugTrackInfo'] = "Baza b³êdów"; Index: pt-br.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pt-br.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pt-br.p3 26 May 2004 10:06:23 -0000 1.2 +++ pt-br.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "estado inicial"; $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "assigned to %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bug Tracking"; $lang['BugTrackInfo'] = "Banco de dados do Bug Tracking"; Index: pt.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pt.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pt.p3 26 May 2004 10:06:23 -0000 1.2 +++ pt.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "estado inicial"; $lang['BugAutoSolver'] = "inicial"; $lang['UserBugSearch'] = "atribuída a %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Registo de Anomalias"; $lang['BugTrackInfo'] = "Base de dados de Anomalias"; Index: ru.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ru.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ru.p3 26 May 2004 10:06:23 -0000 1.2 +++ ru.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "ÎÁÞÁÌØÎÁÑ ÓÔÁÔÕÓ"; $lang['BugAutoSolver'] = "ÎÁÞÁÌØÎÙÊ"; $lang['UserBugSearch'] = "ÎÁÚÎÁÞÅÎ %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "ïÛÉÂËÉ"; $lang['BugTrackInfo'] = "âÁÚÁ ÏÔÓÌÅÖÉ×ÁÎÉÑ ÏÛÉÂÏË"; Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/sv.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sv.p3 26 May 2004 10:06:23 -0000 1.3 +++ sv.p3 26 May 2004 10:43:53 -0000 1.4 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "Initial status"; $lang['BugAutoSolver'] = "Initial"; $lang['UserBugSearch'] = "Ägs av %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bugghantering"; $lang['BugTrackInfo'] = "Bugghanteringsdatabas"; Index: tw.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/tw.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tw.p3 26 May 2004 10:06:23 -0000 1.2 +++ tw.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "ªì©lª¬ºA"; $lang['BugAutoSolver'] = "µo°_¤H"; $lang['UserBugSearch'] = "«ü©wµ¹ %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "Bug °lÂÜ"; $lang['BugTrackInfo'] = "Bug °lÂܸê®Æ®w"; Index: vi.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/vi.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vi.p3 26 May 2004 10:06:23 -0000 1.2 +++ vi.p3 26 May 2004 10:43:53 -0000 1.3 @@ -71,6 +71,9 @@ $lang['BugAutoState'] = "Tình trạng khá»i thuá»·"; $lang['BugAutoSolver'] = "Khá»i thuá»·"; $lang['UserBugSearch'] = "Äược giao cho %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; + $lang['BugTrack'] = "Theo dõi SCKT"; $lang['BugTrackInfo'] = "Dữ liá»u vá» theo dõi sá»± cá» kỹ thuáºt"; Index: zh.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/zh.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zh.p3 26 May 2004 10:06:23 -0000 1.2 +++ zh.p3 26 May 2004 10:43:54 -0000 1.3 @@ -71,6 +71,8 @@ $lang['BugAutoState'] = "initial state"; $lang['BugAutoSolver'] = "initial"; $lang['UserBugSearch'] = "assigned to %s"; +$lang['BugReportedFrom'] = "Reported from"; +$lang['BugMedium'] = "How detected/reported"; $lang['BugTrack'] = "©¶´×·Ñ°"; $lang['BugTrackInfo'] = "©¶´×·Ñ°×ÊÁÏ¿â"; |
Update of /cvsroot/tutos/tutos/php/bugtracking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20307/php/bugtracking Modified Files: bug.pinc bug_ins.php bug_new.php bug_overview.php bug_show.php ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 fr.p3 hu.p3 it.p3 ja.p3 ko.p3 mtable.pinc nl.p3 pl.p3 pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 Log Message: 2 new fields added: - reporter (who is reporting the bug?) - medium (where the bug is detected?) Index: bug.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- bug.pinc 23 Apr 2004 15:15:30 -0000 1.26 +++ bug.pinc 26 May 2004 10:06:22 -0000 1.27 @@ -122,6 +122,39 @@ $r .= "</select>\n"; return $r; } +/** + * ask a bug medium + */ +function BugAskMedium ($default,$any) { + global $lang; + + $r = "<select id=\"medium\" name=\"medium\">\n"; + @reset($lang['BugMediums']); + while ( list ($i,$f) = @each ($lang['BugMediums']) ) { + $r .= "<option value=\"". $i ."\""; + if ( $i == $default ) { + $r .= " selected "; + } + $r .= ">". $f ."</option>\n"; + } + if ( $any > 0 ) { + $r .= "<option value=\"-1\""; + if ( -1 == $default ) { + $r .= " selected "; + } + $r .= ">". $lang['any'] ."</option>\n"; + } + # Any but not closed + /*if ( $any == 2 ) { + $r .= "<option value=\"-2\""; + if ( -2 == $default ) { + $r .= " selected "; + } + $r .= ">". $lang['BugAnyButClosed'] ."</option>\n"; + }*/ + $r .= "</select>\n"; + return $r; +} /** * a bug/incident @@ -292,10 +325,12 @@ $this->name = "auto"; $this->state = BUG_STATE_OPEN; $this->class = BUG_CLASS_LIGHT; - $this->solver = new tutos_address($this->dbconn); - $this->parent = -1; - $this->plist = array(); - $this->short = ""; + $this->solver = new tutos_address($this->dbconn); + $this->reporter = new tutos_address($this->dbconn); + $this->parent = -1; + $this->plist = array(); + $this->short = ""; + $this->medium = ""; $this->plandate = new DateTime(0); # planned solve date $this->solvedate = new DateTime(0); # real solvedate @@ -355,6 +390,7 @@ $this->name = $r->get($pos, "name"); $this->short = $r->get($pos, "short"); + $this->medium = $r->get($pos, "medium"); $this->parent = $r->getObject($pos, "product_id"); if ($this->name == "") { @@ -403,6 +439,15 @@ $this->solver->read_member(); } + $br = $r->get($pos, "reporter"); + $this->reporter = getObject($this->dbconn,$br); + if ( $this->reporter == -1 ) { + # set default + $this->reporter = $this->creator; + } + if ( is_object($this->reporter) && ($this->reporter->gettype() == "team") ) { + $this->reporter->read_member(); + } parent::read_result($r,$pos); return; @@ -500,12 +545,27 @@ } return "<font color=\"". $this->c_state[$this->state] ."\">". $lang['BugStates'][$this->state] ."</font>"; } + /** + * get current medium of this bug (default) as HTML + */ + function getMedium ($m = "") { + global $lang; + + if ( ! empty($m) ) { + return "<font color=\"". $this->medium[$m] ."\">". $lang['BugMediums'][$m] ."</font>"; + } + return "<font color=\"". $this->medium[$this->medium] ."\">". $lang['BugMediums'][$this->medium] ."</font>"; + } /** --------------------------------------------------------------------------- */ function askState () { $r = BugAskState($this->state,0); return $r; } + function askMedium () { + $r = BugAskMedium($this->medium,0); + return $r; + } /** * get current class of this bug (default) as HTML */ @@ -583,6 +643,12 @@ $this->setStrField("short",$value,"BugShort"); } /** + * set the medium + */ + function setMedium($value) { + $this->setIntField("medium",$value,"BugMedium"); + } + /** * set the name of the bug */ function setName($value) { @@ -604,6 +670,16 @@ return; } /** + * set the reporter + */ + function setReporter(&$reporter) { + if ( $this->reporter->id != $reporter->id ) { + $this->modified[] = array ( "field" => "BugReportedFrom" , "old" => $this->reporter->id , "new" => $reporter->id); + $this->reporter = $reporter; + } + return; + } + /** * set the parent (i.e. the buggy product etc) */ function setParent(&$parent) { @@ -683,8 +759,10 @@ $q->addFV("name", $this->name,"STRING",$table['bug']['name'][size]); $q->addFV("class",$this->class,"INT"); $q->addFV("short",$this->short,"STRING",$table['bug']['short'][size]); + $q->addFV("medium",$this->medium,"INT"); $q->addFV("description",$this->bughist[0]->description,"TEXT"); $q->addFV("solver",$this->solver,"OBJ"); + $q->addFV("reporter",$this->reporter,"OBJ"); $q->addFV("product_id",$this->parent,"OBJ"); if ( ($this->state == BUG_STATE_SOLVED) || ( $this->state == BUG_STATE_CLOSED) ) { $q->addFV("solvedate",$this->solvedate,"DATETIME"); Index: bug_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bug_ins.php 7 Apr 2004 16:05:46 -0000 1.8 +++ bug_ins.php 26 May 2004 10:06:22 -0000 1.9 @@ -58,7 +58,14 @@ $short = StripSlashes($_POST['short']); $gotourl= addUrlParameter($gotourl,"short=". UrlEncode($short),true); } - + + if ( empty($_POST['medium']) || !isset($_POST['medium']) ) { + $msg .= sprintf($lang['Err0009'],$lang['BugMedium']) ."<br>"; + } else { + $medium = $_POST['medium']; + $gotourl= addUrlParameter($gotourl,"medium=". $medium,true); + } + if ( isset($_POST['pid']) ) { $gotourl= addUrlParameter($gotourl,"pid=". $_POST['pid'],true); $oldparent = $b->parent; @@ -79,7 +86,21 @@ $class = $_POST['class']; $gotourl= addUrlParameter($gotourl,"class=". $class,true); } - + + if ( empty($_POST['reporterfn']) || !isset($_POST['reporterfn']) ) { + if ( isset($_POST['reporterid']) ) { + $reporter = getObject($dbconn,$_POST['reporterid']); + } else { + $msg .= sprintf($lang['Err0009'],$lang['BugReportedFrom']) ."<br>"; + } + } else { + if ($b->reporter->getFullName() == $_POST['reporterfn']) { + $reporter = $b->reporter; + } else { + $reporter = check_field($_POST['reporterfn'],"reporterfn","reporterl"); + } + } + if ( empty($_POST['sfn']) || !isset($_POST['sfn']) ) { if ( isset($_POST['sid']) ) { $solver = getObject($dbconn,$_POST['sid']); @@ -126,6 +147,17 @@ $b->setSolver($solver); } # + # Reporter Change + # + if ( $b->reporter->id != $reporter->id ) { + if ( ($reporter->id > 0) && ($b->reporter->id > 0 ) ) { + $newlines = sprintf("<b>". $lang['BugReportedFrom'] .": <i>%s</i> → <i>%s</i></b>\n%s" ,$b->reporter->getFullName(),$reporter->getFullName() , $newlines); + } else { + $newlines = sprintf("<b>Reporter changed</b>\n%s",$newlines); + } + $b->setReporter($reporter); + } + # # Parent Change # if (($oldparent != -1) && ($b->parent->id != $oldparent->id) ) { @@ -143,6 +175,12 @@ if ( $b->class != $class ) { $newlines = sprintf("<b>". $lang['BugClass'] .":<i>%s</i> → <i>%s</i></b>\n%s" ,$b->getClass(),$b->getClass($class) , $newlines); } + # + # Medium Change + # + if ( $b->medium != $medium ) { + $newlines = sprintf("<b>". $lang['BugMedium'] .":<i>%s</i> → <i>%s</i></b>\n%s" ,$b->getMedium(),$b->getMedium($medium) , $newlines); + } if ( $b->short != $short ) { $newlines = sprintf("<b>". $lang['BugShort'] .": <i>%s</i> → <i>%s</i></b>\n%s" ,$b->short,$short , $newlines); } @@ -177,9 +215,11 @@ } else { $b->setSolver($current_user); } + $b->setReporter($current_user); } $b->setName($name); $b->setShort($short); + $b->setMedium($medium); $b->setState($state); $b->setClass($class); $dbconn->Begin("WORK"); Index: bug_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bug_new.php 10 May 2004 15:34:42 -0000 1.10 +++ bug_new.php 26 May 2004 10:06:22 -0000 1.11 @@ -159,7 +159,25 @@ } echo "</select>\n"; echo "</td></tr>\n"; - + + echo "<tr>\n"; + echo $this->showfieldc($lang['BugReportedFrom']); + echo " <td colspan=\"1\" valign=\"top\">"; + if ( $this->obj->id > 0 ) { + select_from_array_or_input($this->obj,"reporter",$this->obj->reporter,1); + } else { + $reporter = $this->user->id; + echo $lang['BugAutoSolver'] ." "; + echo $this->user->getLink(); + $this->addHidden("reporterid",$reporter); + } + echo " </td>\n"; + echo $this->showfieldc($lang['BugMedium'],0,"medium"); + echo " <td>\n"; + echo $this->obj->askMedium(); + echo " </td>\n"; + echo "</tr>\n"; + echo "<tr>\n"; if ( $this->obj->id > 0 ) { echo $this->showfield($lang['BugHistory']); @@ -228,6 +246,9 @@ if ( isset($_GET['short']) ) { $this->obj->short = StripSlashes($_GET['short']); } + if ( isset($_GET['medium']) ){ + $this->obj->medium = $_GET['medium']; + } if ( isset($_GET['state']) ) { $this->obj->state = $_GET['state']; } @@ -242,6 +263,8 @@ # Get the solver preset_from_array_or_input($this->obj,'solver',"s"); + + preset_from_array_or_input($this->obj,'reporter',"reporter"); if ( $this->obj->id < 0 ) { if ( !$this->user->feature_ok(usebugtracking,PERM_NEW) ) { Index: bug_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- bug_overview.php 29 Apr 2004 15:05:37 -0000 1.15 +++ bug_overview.php 26 May 2004 10:06:22 -0000 1.16 @@ -160,6 +160,7 @@ echo $this->orderHeader("state",$lang['BugState'],$this->link2); echo $this->orderHeader("class",$lang['BugClass'],$this->link2); echo $this->orderHeader("",$lang['BugCreator'],$this->link2); + echo $this->orderHeader("reporter",$lang['BugReportedFrom'],$this->link2); echo $this->orderHeader("",$lang['BugAssignedTo'],$this->link2); if ( $tutos[massupdate] == 1 ) { echo " <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n"; @@ -204,12 +205,17 @@ echo " <td> ". $x ."</td>\n"; echo " <td> ". $b->getState() ."</td>\n"; echo " <td> ". $b->getClass() ."</td>\n"; - if ($b->creator->id > 0) { + if ($b->creator->id > 0) { echo " <td> ". $b->creator->getLink($b->creator->getShortname()) ."</td>\n"; } else { echo " <td> <i>". $lang['HistoryDeleted'] ."</i></td>\n"; } - if ($b->solver->id > 0) { + if ($b->reporter->id > 0) { + echo " <td> ". $b->reporter->getLink($b->reporter->getShortname()) ."</td>\n"; + } else { + echo " <td> <i>". $lang['HistoryDeleted'] ."</i></td>\n"; + } + if ($b->solver->id > 0) { echo " <td> ". $b->solver->getLink($b->solver->getShortname()) ."</td>\n"; } else { echo " <td> <i>". $lang['HistoryDeleted'] ."</i></td>\n"; @@ -227,10 +233,10 @@ $a++; } - echo $this->list_navigation($this->link1,8 + $tutos[massupdate] ,$this->start,$a,$n); + echo $this->list_navigation($this->link1,9 + $tutos[massupdate] ,$this->start,$a,$n); if ( $tutos[massupdate] == 1 ) { - echo $this->UpdateRowStart(7); + echo $this->UpdateRowStart(8); echo sprintf($lang['withmarked'],$lang['Bugs']); echo " <select name=\"action\">\n"; echo " <option value=\"-1\" selected=\"selected\">". $lang['ActionNil'] ."</option>\n"; @@ -608,6 +614,9 @@ if ( isset($_GET['solverid']) ) { $solverid = $_GET['solverid']; } + if ( isset($_GET['reporterid']) ) { + $reporterid = $_GET['reporterid']; + } if ( isset($_GET['state']) ) { $state = $_GET['state']; } else { @@ -763,6 +772,17 @@ check_dbacl( $q1, $this->user->id); + # reporter to display + if ( isset($reporterid) ) { + $q1 .= $pre1 ." reporter = ". $reporterid; + $q2 .= $pre2 ." b.reporter = ". $reporterid; + $pre1 = " AND "; + $pre2 = " AND "; + $this->link1 = addUrlParameter($this->link1,"reporterid=". $reporterid); + $this->filter['reporter'] = $reporterid; + $this->addHidden("reporterid",$reporterid); + } + # sorting $xxx = ""; $this->link2 = $this->link1; Index: bug_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bug_show.php 7 Apr 2004 15:56:23 -0000 1.7 +++ bug_show.php 26 May 2004 10:06:22 -0000 1.8 @@ -86,6 +86,14 @@ echo $this->showdata($this->obj->getClass(),1); echo "</tr><tr>\n"; + echo $this->showfield($lang['BugReportedFrom']); + echo $this->showdata($this->obj->reporter->getLink(),1); + + echo "</tr><tr>\n"; + echo $this->showfield($lang['BugMedium']); + echo $this->showdata($this->obj->getMedium(),1); + + echo "</tr><tr>\n"; echo $this->showfield($lang['BugShort']); echo $this->showdata(myentities($this->obj->short),3); Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ca.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ca.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ ca.p3 26 May 2004 10:06:22 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Crear incidència"; $lang['BugCreateInfo'] = "Obrir una incidència per %s"; $lang['BugDeleteI'] = "Eliminar aquest bug %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "OBERT"; $lang['BugStates'][2] = "TREBALLANT"; $lang['BugStates'][3] = "SOLUCIONAT"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "important"; $lang['BugClasses'][3] = "perillós"; $lang['BugClasses'][4] = "suggeriment"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Buscar una incidència"; $lang['SearchForBugExt'] = "Recerca avançada d'una incidència"; $lang['CreateNewBug'] = "Introduir una nova incidència"; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/cs.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cs.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ cs.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Vytvoøit záznam o chybì"; $lang['BugCreateInfo'] = "Vytvoøit záznam o chybì pro %s"; $lang['BugDeleteI'] = "Odstranit tento záznam o chybì %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "OTEVØENO"; $lang['BugStates'][2] = "V CHODU"; $lang['BugStates'][3] = "VYØE©ENO"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "te¾ké"; $lang['BugClasses'][3] = "nebezpeèné"; $lang['BugClasses'][4] = "náznak"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Hledat chybu"; $lang['SearchForBugExt'] = "Roz¹íøené hledání chyby"; $lang['CreateNewBug'] = "Vlo¾it novou chybu"; Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/de.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- de.p3 20 Feb 2004 06:38:10 -0000 1.3 +++ de.p3 26 May 2004 10:06:23 -0000 1.4 @@ -11,7 +11,6 @@ # # German Texts for this module # - # Bugs $lang['Bug'] = "Fehler"; $lang['Bugs'] = "Fehler"; @@ -34,8 +33,9 @@ $lang['BugCreate'] = "Fehler eintragen"; $lang['BugCreateInfo'] = "Einen Fehler zu %s eintragen"; $lang['BugDeleteI'] = "Fehler %s löschen"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "Offen"; $lang['BugStates'][2] = "In Bearbeitung"; $lang['BugStates'][3] = "Gelöst"; @@ -44,6 +44,12 @@ $lang['BugClasses'][2] = "Schwer"; $lang['BugClasses'][3] = "Gefährlich"; $lang['BugClasses'][4] = "Vorschlag"; +$lang['BugMediums'][1] = "Arbeitsplatz"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Sonstiges"; +$lang['BugMediums'][6] = "Telefon"; $lang['SearchForBug'] = "Suche nach einer Fehlermeldung"; $lang['SearchForBugExt'] = "Erweiterte Suche nach Fehlermeldung"; $lang['CreateNewBug'] = "Einen neuen Fehler eintragen"; @@ -65,6 +71,8 @@ $lang['BugAutoState'] = "Anfänglicher Status"; $lang['BugAutoSolver'] = "Zu Beginn"; $lang['UserBugSearch'] = "zu Lösen von %s"; +$lang['BugReportedFrom'] = "Gemeldet von"; +$lang['BugMedium'] = "Meldungsform"; $lang['BugTrack'] = "Fehlermanagement"; $lang['BugTrackInfo'] = "Zur Fehlerdatenbank"; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/el.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- el.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ el.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Äçìéïõñãßá ËÜèïõò"; $lang['BugCreateInfo'] = "äçìéïõñãßá ëÜèïõò ãéá %s"; $lang['BugDeleteI'] = "äéáãñáöÞ áõôïý ôïõ ëÜèïõò %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "ÁÍÏÉ×ÔO"; $lang['BugStates'][2] = "ÅÍÅÑÃÏ"; $lang['BugStates'][3] = "ÄÉÏÑÈÙÈÇÊÅ"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "óïâáñü"; $lang['BugClasses'][3] = "åðéêßíäõíï"; $lang['BugClasses'][4] = "õðüäåéîç"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "ÁíáæÞôçóç ëÜèïõò"; $lang['SearchForBugExt'] = "åêôåôáìÝíç ÁíáæÞôçóç ëÜèïõò"; $lang['CreateNewBug'] = "Êáôá÷þñéóç ëÜèïõò"; Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/en.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- en.p3 29 Oct 2003 08:58:13 -0000 1.2 +++ en.p3 26 May 2004 10:06:23 -0000 1.3 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Bug Create"; $lang['BugCreateInfo'] = "create a bug for %s"; $lang['BugDeleteI'] = "delete this bug %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "OPEN"; $lang['BugStates'][2] = "IN PROGRESS"; $lang['BugStates'][3] = "SOLVED"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "heavy"; $lang['BugClasses'][3] = "dangerous"; $lang['BugClasses'][4] = "suggestion"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Search for a bug"; $lang['SearchForBugExt'] = "extended Search for a bug"; $lang['CreateNewBug'] = "Enter a new bug"; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-mx.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- es-mx.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ es-mx.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Crear fallo"; $lang['BugCreateInfo'] = "Abrir un fallo para %s"; $lang['BugDeleteI'] = "delete this bug %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "ABIERTO"; $lang['BugStates'][2] = "TRABAJANDO"; $lang['BugStates'][3] = "SOLUCIONADO"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "importante"; $lang['BugClasses'][3] = "peligroso"; $lang['BugClasses'][4] = "sugerencia"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Buscar de un fallo"; $lang['SearchForBugExt'] = "Búsqueda avanzada de un fallo"; $lang['CreateNewBug'] = "Introducir un nuevo fallo"; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-ni.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- es-ni.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ es-ni.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Crear fallo"; $lang['BugCreateInfo'] = "Abrir un fallo para %s"; $lang['BugDeleteI'] = "elimine este fallo %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "ABIERTO"; $lang['BugStates'][2] = "TRABAJANDO"; $lang['BugStates'][3] = "SOLUCIONADO"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "importante"; $lang['BugClasses'][3] = "peligroso"; $lang['BugClasses'][4] = "sugerencia"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Buscar de un fallo"; $lang['SearchForBugExt'] = "Búsqueda avanzada de un fallo"; $lang['CreateNewBug'] = "Introducir un nuevo fallo"; Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-ve.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- es-ve.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ es-ve.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Crear incidencia"; $lang['BugCreateInfo'] = "Abrir una incidencia para %s"; $lang['BugDeleteI'] = "eliminar esta incidencia %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "ABIERTO"; $lang['BugStates'][2] = "TRABAJANDO"; $lang['BugStates'][3] = "RESUELTO"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "importante"; $lang['BugClasses'][3] = "peligroso"; $lang['BugClasses'][4] = "sugerencia"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Buscar incidencia"; $lang['SearchForBugExt'] = "Búsqueda avanzada de incidencias"; $lang['CreateNewBug'] = "Introducir una nueva incidencia"; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- es.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ es.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Crear incidencia"; $lang['BugCreateInfo'] = "Abrir una incidencia para %s"; $lang['BugDeleteI'] = "Eliminar este bug %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "ABIERTO"; $lang['BugStates'][2] = "TRABAJANDO"; $lang['BugStates'][3] = "SOLUCIONADO"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "importante"; $lang['BugClasses'][3] = "peligroso"; $lang['BugClasses'][4] = "sugerencia"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Buscar una incidencia"; $lang['SearchForBugExt'] = "Búsqueda avanzada de una incidencia"; $lang['CreateNewBug'] = "Introducir una nueva incidencia"; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/fr.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fr.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ fr.p3 26 May 2004 10:06:23 -0000 1.2 @@ -11,7 +11,6 @@ # # French Texts for this module # - # Bugs $lang['Bug'] = "Incident"; $lang['Bugs'] = "Incidents"; @@ -34,8 +33,9 @@ $lang['BugCreate'] = "Créer un ticket d'incident"; $lang['BugCreateInfo'] = "Créer un ticket pour %s"; $lang['BugDeleteI'] = "Effacer ce ticket d'incident %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "OUVERT"; $lang['BugStates'][2] = "EN COURS"; $lang['BugStates'][3] = "RÉSOLU"; @@ -44,6 +44,12 @@ $lang['BugClasses'][2] = "Grave"; $lang['BugClasses'][3] = "Très grave"; $lang['BugClasses'][4] = "Suggestion"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Rechercher un incident"; $lang['SearchForBugExt'] = "Recherche étendue d'incident"; $lang['CreateNewBug'] = "Crée un nouveau ticket"; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/hu.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hu.p3 1 Mar 2004 16:47:55 -0000 1.3 +++ hu.p3 26 May 2004 10:06:23 -0000 1.4 @@ -11,7 +11,6 @@ # # Hungarian Texts for this module # - # Bugs $lang['Bug'] = "Hiba"; $lang['Bugs'] = "Hibák"; @@ -34,6 +33,9 @@ $lang['BugCreate'] = "Hiba létrehozása"; $lang['BugCreateInfo'] = "Hiba létrehozása %s számára"; $lang['BugDeleteI'] = "%s hiba törlése"; +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "NYITOTT"; $lang['BugStates'][2] = "FELDOLGOZÁS ALATT"; $lang['BugStates'][3] = "MEGOLDVA"; @@ -42,6 +44,12 @@ $lang['BugClasses'][2] = "nehéz"; $lang['BugClasses'][3] = "veszélyes"; $lang['BugClasses'][4] = "javaslat"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Hiba keresése"; $lang['SearchForBugExt'] = "Hiba bõvített keresése"; $lang['CreateNewBug'] = "Új hiba bevitele"; Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/it.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- it.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ it.p3 26 May 2004 10:06:23 -0000 1.2 @@ -11,7 +11,6 @@ # # Italian Texts for this module # - # Bugs $lang['Bug'] = "Bug"; $lang['Bugs'] = "Lista Errori"; @@ -34,8 +33,9 @@ $lang['BugCreate'] = "Crea un Bug"; $lang['BugCreateInfo'] = "crea un bug per %s"; $lang['BugDeleteI'] = "delete this bug %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "APERTO"; $lang['BugStates'][2] = "IN LAVORAZIONE"; $lang['BugStates'][3] = "RISOLTO"; @@ -44,6 +44,12 @@ $lang['BugClasses'][2] = "pesante"; $lang['BugClasses'][3] = "pericoloso"; $lang['BugClasses'][4] = "suggerimento"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Ricerca bug"; $lang['SearchForBugExt'] = "Ricerca bug estesa"; $lang['CreateNewBug'] = "Inserisci un nuovo bug"; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ja.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ja.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ ja.p3 26 May 2004 10:06:23 -0000 1.2 @@ -11,7 +11,6 @@ # # Japanese Texts for this module # - # Bugs $lang['Bug'] = "¥Ð¥°"; $lang['Bugs'] = "¥Ð¥°"; @@ -34,8 +33,9 @@ $lang['BugCreate'] = "¥Ð¥°ºîÀ®"; $lang['BugCreateInfo'] = "%s ¤Ë ¥Ð¥°¤òºîÀ®"; $lang['BugDeleteI'] = "¤³¤Î¥Ð¥° %s ¤òºï½ü"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "¥ª¡¼¥×¥ó"; $lang['BugStates'][2] = "ºî¶ÈÃæ"; $lang['BugStates'][3] = "²ò·è"; @@ -44,6 +44,12 @@ $lang['BugClasses'][2] = "½Å"; $lang['BugClasses'][3] = "´í¸±"; $lang['BugClasses'][4] = "Äó°Æ"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "¥Ð¥°¸¡º÷"; $lang['SearchForBugExt'] = "¥Ð¥°³ÈÄ¥¸¡º÷"; $lang['CreateNewBug'] = "¿·¤¿¤Ê¥Ð¥°¤òÆþÎÏ"; Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ko.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ko.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ ko.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "¹ö±× »ý¼º"; $lang['BugCreateInfo'] = "%s¿¡ ¹ö±× Ãß°¡"; $lang['BugDeleteI'] = "¹ö±× »èÁ¦: %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "¿¸²"; $lang['BugStates'][2] = "ÀÛ¾÷Áß"; $lang['BugStates'][3] = "ÇØ°áµÊ"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "Áß´ëÇÔ"; $lang['BugClasses'][3] = "À§ÇèÇÔ"; $lang['BugClasses'][4] = "Á¦¾È"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "¹ö±× ã±â"; $lang['SearchForBugExt'] = "¹ö±× ã±â(È®Àå°Ë»ö)"; $lang['CreateNewBug'] = "»õ·Î¿î ¹ö±× »ý¼º"; Index: mtable.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/mtable.pinc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mtable.pinc 21 Feb 2004 17:24:57 -0000 1.3 +++ mtable.pinc 26 May 2004 10:06:23 -0000 1.4 @@ -20,6 +20,8 @@ "state" => array(type => "ID_TYPE", constraints => "NN", Desc => "state of bug"), "solver" => array(type => "ID_TYPE", constraints => "", Desc => "solver ID"), "solvedate" => array(type => "TS_TYPE", constraints => "", Desc => "solve date"), + "reporter" => array(type => "ID_TYPE", constraints => "", Desc => "reporter ID"), + "medium" => array(type => "ID_TYPE", constraints => "", Desc => "how the bug was reported"), "creator" => array(type => "ID_TYPE", constraints => "", Desc => "creator ID"), "creation" => array(type => "TS_TYPE", constraints => "", Desc => "creation date") ); Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/nl.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nl.p3 10 Nov 2003 14:55:40 -0000 1.2 +++ nl.p3 26 May 2004 10:06:23 -0000 1.3 @@ -11,7 +11,6 @@ # # Dutch Texts for this module # - # Bugs $lang['Bug'] = "Fout"; $lang['Bugs'] = "Foutregistratie"; @@ -34,8 +33,9 @@ $lang['BugCreate'] = "Maak Foutregistratie"; $lang['BugCreateInfo'] = "Maak een Foutregistratie voor%s"; $lang['BugDeleteI'] = "Verwijder deze foutregistratie %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "OPEN"; $lang['BugStates'][2] = "IN BEWERKING"; $lang['BugStates'][3] = "OPGELOST"; @@ -44,6 +44,12 @@ $lang['BugClasses'][2] = "zwaar"; $lang['BugClasses'][3] = "gevaarlijk"; $lang['BugClasses'][4] = "suggestie"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Zoek een Foutregistratie"; $lang['SearchForBugExt'] = "Uitgebreid zoeken naar Foutregistratie"; $lang['CreateNewBug'] = "Voer een nieuwe Foutregistratie in"; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pl.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pl.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ pl.p3 26 May 2004 10:06:23 -0000 1.2 @@ -11,7 +11,6 @@ # # Polish Texts for this module # - # Bugs $lang['Bug'] = "b³ad"; $lang['Bugs'] = "B³êdy"; @@ -34,8 +33,9 @@ $lang['BugCreate'] = "Raportuj b³±d"; $lang['BugCreateInfo'] = "Raportuj b³±d w %s"; $lang['BugDeleteI'] = "Skasuj b³±d %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "OTWARTY"; $lang['BugStates'][2] = "PRACA TRWA"; $lang['BugStates'][3] = "ROZWI¡ZANY"; @@ -44,6 +44,12 @@ $lang['BugClasses'][2] = "trudny"; $lang['BugClasses'][3] = "niebezpieczny"; $lang['BugClasses'][4] = "propozycja"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Szukaj b³êdu"; $lang['SearchForBugExt'] = "Rozszerzone przeszukiwanie b³êdów"; $lang['CreateNewBug'] = "Raportuj nowy b³±d"; Index: pt-br.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pt-br.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pt-br.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ pt-br.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Criar bug"; $lang['BugCreateInfo'] = "criar um bug para %s"; $lang['BugDeleteI'] = "delete this bug %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "ABRIR"; $lang['BugStates'][2] = "EM TRABALHO"; $lang['BugStates'][3] = "RESOLVIDO"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "pesado"; $lang['BugClasses'][3] = "perigoso"; $lang['BugClasses'][4] = "sugestão"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Procurar por um bug"; $lang['SearchForBugExt'] = "Busca avançada por um bug"; $lang['CreateNewBug'] = "Entrar um novo bug"; Index: pt.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pt.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pt.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ pt.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Criar anomalia"; $lang['BugCreateInfo'] = "criar anomalia para %s"; $lang['BugDeleteI'] = "eliminar anomalia %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "PLANEADA"; $lang['BugStates'][2] = "EM CURSO"; $lang['BugStates'][3] = "SOLUCIONADA"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "DIFÍCIL"; $lang['BugClasses'][3] = "ARRISCADA"; $lang['BugClasses'][4] = "SUGESTÃO"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Pesquisar uma anomalia"; $lang['SearchForBugExt'] = "Pesquisa avançada de uma anomalia"; $lang['CreateNewBug'] = "Registar uma nova anomalia"; Index: ru.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ru.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ru.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ ru.p3 26 May 2004 10:06:23 -0000 1.2 @@ -11,7 +11,6 @@ # # Russian Texts for this module # - # Bugs $lang['Bug'] = "ïÛÉÂËÁ"; $lang['Bugs'] = "ïÛÉÂËÉ"; @@ -34,8 +33,9 @@ $lang['BugCreate'] = "óÏÚÄÁÔØ ÏÛÉÂËÕ"; $lang['BugCreateInfo'] = "ÓÏÚÄÁÔØ ÏÛÉÂËÕ %s"; $lang['BugDeleteI'] = "õÄÁÌÉÔØ ÏÛÉÂËÕ %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "ïÔËÒÙÔÁÑ"; $lang['BugStates'][2] = "÷ ÒÁÂÏÔÅ"; $lang['BugStates'][3] = "éÓÐÒÁ×ÌÅÎÁ"; @@ -44,6 +44,12 @@ $lang['BugClasses'][2] = "ÓÌÏÖÎÁÑ"; $lang['BugClasses'][3] = "ÏÐÁÓÎÁÑ"; $lang['BugClasses'][4] = "ÐÒÅÄÌÏÖÅÎÉÅ"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "ðÏÉÓË ÏÛÉÂËÉ"; $lang['SearchForBugExt'] = "òÁÓÛÉÒÅÎÎÙÊ ÐÏÉÓË ÏÛÉÂËÉ"; $lang['CreateNewBug'] = "÷ÎÅÓÔÉ ÎÏ×ÕÀ ÏÛÉÂËÕ"; Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/sv.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sv.p3 8 Feb 2004 14:02:10 -0000 1.2 +++ sv.p3 26 May 2004 10:06:23 -0000 1.3 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Skapa bugga"; $lang['BugCreateInfo'] = "Skapa bugg åt %s"; $lang['BugDeleteI'] = "Ta bort bugg %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "ÖPPEN"; $lang['BugStates'][2] = "ARBETE PÅGÅR"; $lang['BugStates'][3] = "AVKLARAT"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "Medel"; $lang['BugClasses'][3] = "Hög"; $lang['BugClasses'][4] = "Förslag"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Sök efter bugg"; $lang['SearchForBugExt'] = "utökad sökning efter bugg"; $lang['CreateNewBug'] = "Rapportera ny bugg"; Index: tw.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/tw.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tw.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ tw.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "«Ø¥ß Bug °O¿ý"; $lang['BugCreateInfo'] = "«Ø¥ß %s ªº Bug °O¿ý"; $lang['BugDeleteI'] = "§R°£¦¹ Bug %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "¶}±Ò"; $lang['BugStates'][2] = "¶i¦æ¤¤"; $lang['BugStates'][3] = "¤w¸Ñ¨M"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "ÄY«"; $lang['BugClasses'][3] = "¦MÀI"; $lang['BugClasses'][4] = "´£Ä³"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "´M§ä Bug ¶µ¥Ø"; $lang['SearchForBugExt'] = "¶i¶¥´M§ä Bug ¶µ¥Ø"; $lang['CreateNewBug'] = "¿é¤J·sªº Bug ¶µ¥Ø"; Index: vi.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/vi.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vi.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ vi.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "Ghi má»i SCKT"; $lang['BugCreateInfo'] = "Ghi nháºn 1 sá»± cá» kỹ thuáºt cho %s"; $lang['BugDeleteI'] = "Xoá SCKT %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "Äang má»"; $lang['BugStates'][2] = "Äang là m viá»c"; $lang['BugStates'][3] = "Äã giải quyết"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "nặng"; $lang['BugClasses'][3] = "nghiêm trá»ng"; $lang['BugClasses'][4] = "Äá» nghá»"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Truy lục 1 SCKT"; $lang['SearchForBugExt'] = "Truy lục má» rá»ng 1 SCKT"; $lang['CreateNewBug'] = "Ghi nháºn 1 Sá»± cá» kỹ thuáºt"; Index: zh.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/zh.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zh.p3 29 Oct 2003 08:58:13 -0000 1.1 +++ zh.p3 26 May 2004 10:06:23 -0000 1.2 @@ -33,8 +33,9 @@ $lang['BugCreate'] = "¼Ç¼©¶´"; $lang['BugCreateInfo'] = "¼Ç¼©¶´¸ø %s"; $lang['BugDeleteI'] = "delete this bug %s"; -$lang['BugStates'] = array(); -$lang['BugClasses'] = array(); +$lang['BugStates'] = array(); +$lang['BugClasses'] = array(); +$lang['BugMediums'] = array(); $lang['BugStates'][1] = "¿ªÊ¼"; $lang['BugStates'][2] = "ÕýÔÚ¹¤×÷ÖÐ"; $lang['BugStates'][3] = "Òѽâ¾ö"; @@ -43,6 +44,12 @@ $lang['BugClasses'][2] = "ÑÏÖØ"; $lang['BugClasses'][3] = "ΣÏÕ"; $lang['BugClasses'][4] = "ÌáÒâ"; +$lang['BugMediums'][1] = "Desktop"; +$lang['BugMediums'][2] = "eMail"; +$lang['BugMediums'][3] = "Fax"; +$lang['BugMediums'][4] = "Forum"; +$lang['BugMediums'][5] = "Miscellaneous"; +$lang['BugMediums'][6] = "Phone"; $lang['SearchForBug'] = "Ñ°ÕÒ©¶´ÏîÄ¿"; $lang['SearchForBugExt'] = "ÉîÈëÑ°ÕÒ©¶´ÏîÄ¿"; $lang['CreateNewBug'] = "ÊäÈëеĩ¶´ÏîÄ¿"; |
|
From: Andreas M. <me...@us...> - 2004-05-26 08:36:34
|
Update of /cvsroot/tutos/tutos/php/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6540/php/xml Modified Files: xml_parse.pinc Log Message: Fix: Bug in XML-Import Index: xml_parse.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/xml/xml_parse.pinc,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xml_parse.pinc 26 Mar 2004 18:05:26 -0000 1.15 +++ xml_parse.pinc 26 May 2004 08:36:24 -0000 1.16 @@ -8,9 +8,10 @@ */ include_once('appointment.pinc'); -include_once('group/group.pinc'); -include_once('url/url.pinc'); -include_once('note/note.pinc'); +loadmodule("group"); +loadmodule("url"); +loadmodule("note"); +loadmodule("expense"); class TUTOS_XMLParser extends tutos_module { # var: Deprecated in PHP5 @@ -77,6 +78,11 @@ $this->parentobj = $this->cobj; $this->cobj = &$this->group; } + if ( $name == "expense" ) { + $this->expense = new expense($this->dbconn); + $this->parentobj = $this->cobj; + $this->cobj = &$this->expense; + } $this->ctag = $name; $this->attrs = $attrs; @@ -182,6 +188,19 @@ $this->company = null; $this->groupmemberlist = null; $this->cobj = null; + } else if ( $name == "expense" ) { + if (!$this->testonly) { + $this->expense->msg = $this->expense->save(); + $this->output .= "<expense_set>\n"; + $this->output .= $this->expense->exportXML_start(); + $this->output .= $this->expense->exportXML_body(true); + $this->output .= $this->expense->exportXML_end(); + $this->output .= "</expense_set>\n"; + } else { + $this->output .= "test only:". $this->expense->getFullName() ."\n"; + } + $this->expense = null; + $this->cobj = null; } $this->ctag = end($this->stack); |
|
From: Gero K. <gok...@us...> - 2004-05-25 19:25:03
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6346 Modified Files: company_new.php department_new.php Log Message: fix bug 960219 Index: company_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/company_new.php,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- company_new.php 4 May 2004 05:58:14 -0000 1.59 +++ company_new.php 25 May 2004 19:24:52 -0000 1.60 @@ -74,11 +74,7 @@ hiddenFormElements(); echo $this->getHidden(); echo "</form>\n"; - if ( $this->loc != "" ) { - echo $this->setfocus("locadd.lname"); - } else { - echo $this->setfocus("cmpadd.name"); - } + echo $this->setfocus("cmpadd.name"); echo $lang['FldsRequired'] ."\n"; } /** Index: department_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/department_new.php,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- department_new.php 13 Apr 2004 15:32:46 -0000 1.51 +++ department_new.php 25 May 2004 19:24:52 -0000 1.52 @@ -79,12 +79,7 @@ echo $this->getHidden(); hiddenFormElements(); echo "</form>\n"; - if ( $this->loc != "" ) { - echo $this->setfocus("locadd.lname"); - } else { - echo $this->setfocus("depadd.name"); - } - + echo $this->setfocus("depadd.name"); echo $lang['FldsRequired'] ."\n"; } /** |
|
From: Gero K. <gok...@us...> - 2004-05-25 19:04:38
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1958 Modified Files: Tag: BRANCH-1-2 company_new.php department_new.php Log Message: fix bug 960219 Index: company_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/company_new.php,v retrieving revision 1.59 retrieving revision 1.59.2.1 diff -u -r1.59 -r1.59.2.1 --- company_new.php 4 May 2004 05:58:14 -0000 1.59 +++ company_new.php 25 May 2004 19:04:13 -0000 1.59.2.1 @@ -74,11 +74,7 @@ hiddenFormElements(); echo $this->getHidden(); echo "</form>\n"; - if ( $this->loc != "" ) { - echo $this->setfocus("locadd.lname"); - } else { - echo $this->setfocus("cmpadd.name"); - } + echo $this->setfocus("cmpadd.name"); echo $lang['FldsRequired'] ."\n"; } /** Index: department_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/department_new.php,v retrieving revision 1.51 retrieving revision 1.51.2.1 diff -u -r1.51 -r1.51.2.1 --- department_new.php 13 Apr 2004 15:32:46 -0000 1.51 +++ department_new.php 25 May 2004 19:04:28 -0000 1.51.2.1 @@ -79,12 +79,7 @@ echo $this->getHidden(); hiddenFormElements(); echo "</form>\n"; - if ( $this->loc != "" ) { - echo $this->setfocus("locadd.lname"); - } else { - echo $this->setfocus("depadd.name"); - } - + echo $this->setfocus("depadd.name"); echo $lang['FldsRequired'] ."\n"; } /** |
|
From: Csecsy L. <bo...@us...> - 2004-05-19 17:19:50
|
Update of /cvsroot/tutos/tutos/php/expense In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19979 Modified Files: hu.p3 Log Message: Hungarian language update Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/hu.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hu.p3 19 May 2004 14:30:38 -0000 1.4 +++ hu.p3 19 May 2004 17:19:35 -0000 1.5 @@ -36,7 +36,7 @@ $lang['ExpenseCategory'] = "Kategória"; $lang['ExpenseReason'] = "Ok"; $lang['ExpensePeople'] = "Emberek"; -$lang['ExpenseGAmountAll'] = "Overall Gross Amount"; +$lang['ExpenseGAmountAll'] = "Átlagos bruttó összeg"; $lang['ExpenseGAmount'] = "Bruttó összeg"; $lang['ExpenseNAmount'] = "Nettó összeg"; $lang['ExpenseDeduction'] = "Levonás"; @@ -55,13 +55,13 @@ $tutos[expensecategory][] = "busz/vonat"; $tutos[expensecategory][] = "egyéb autó költségek"; $tutos[expensecategory][] = "egyéb típusok"; -$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "javítás"; $tutos[expensecategory][] = "munkaebéd"; $tutos[expensecategory][] = "parkolás"; $tutos[expensecategory][] = "postaköltség"; $tutos[expensecategory][] = "privát"; $tutos[expensecategory][] = "repülõ"; +$tutos[expensecategory][] = "szállás"; $tutos[expensecategory][] = "szolgáltatás"; $tutos[expensecategory][] = "taxi"; $tutos[expensecategory][] = "telefon"; |
|
From: Andreas M. <me...@us...> - 2004-05-19 14:30:56
|
Update of /cvsroot/tutos/tutos/php/expense In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18609/php/expense Modified Files: ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 Log Message: New constant added. Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/ca.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ca.p3 19 May 2004 13:44:04 -0000 1.2 +++ ca.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/cs.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cs.p3 19 May 2004 13:44:04 -0000 1.2 +++ cs.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/de.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- de.p3 19 May 2004 13:44:04 -0000 1.2 +++ de.p3 19 May 2004 14:30:38 -0000 1.3 @@ -47,18 +47,19 @@ $lang['ExpenseEndTime'] = "Ende"; $tutos[expensecategory] = array(); +$tutos[expensecategory][] = "Auto/Mietwagen"; $tutos[expensecategory][] = "Arbeitsessen"; $tutos[expensecategory][] = "Benzin"; -$tutos[expensecategory][] = "Bewirtung"; $tutos[expensecategory][] = "Bus/Bahn"; $tutos[expensecategory][] = "Flug"; $tutos[expensecategory][] = "Geschenke"; +$tutos[expensecategory][] = "Hotel"; $tutos[expensecategory][] = "Kalkulatorische Kosten"; -$tutos[expensecategory][] = "Mietwagen"; $tutos[expensecategory][] = "Öl/Reparatur"; $tutos[expensecategory][] = "Parken"; $tutos[expensecategory][] = "Porto"; $tutos[expensecategory][] = "Privat"; +$tutos[expensecategory][] = "Restaurant/Essen"; $tutos[expensecategory][] = "Snacks"; $tutos[expensecategory][] = "Sonstige Belegarten"; $tutos[expensecategory][] = "Sonstige KFZ Kosten"; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/el.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- el.p3 19 May 2004 13:44:04 -0000 1.2 +++ el.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/en.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- en.p3 19 May 2004 13:44:04 -0000 1.2 +++ en.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/es-mx.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es-mx.p3 19 May 2004 13:44:04 -0000 1.2 +++ es-mx.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/es-ni.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es-ni.p3 19 May 2004 13:44:04 -0000 1.2 +++ es-ni.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/es-ve.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es-ve.p3 19 May 2004 13:44:04 -0000 1.2 +++ es-ve.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/es.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- es.p3 19 May 2004 13:44:04 -0000 1.2 +++ es.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/fr.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fr.p3 19 May 2004 13:44:04 -0000 1.2 +++ fr.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/hu.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hu.p3 19 May 2004 13:44:04 -0000 1.3 +++ hu.p3 19 May 2004 14:30:38 -0000 1.4 @@ -47,23 +47,24 @@ $lang['ExpenseEndTime'] = "Vége"; $tutos[expensecategory] = array(); -$tutos[expensecategory][] = "busz/vonat"; -$tutos[expensecategory][] = "repülõ"; $tutos[expensecategory][] = "ajándék"; $tutos[expensecategory][] = "autókölcsönzés"; +$tutos[expensecategory][] = "benzin"; $tutos[expensecategory][] = "beszámított költségek"; +$tutos[expensecategory][] = "büfé"; +$tutos[expensecategory][] = "busz/vonat"; $tutos[expensecategory][] = "egyéb autó költségek"; $tutos[expensecategory][] = "egyéb típusok"; +$tutos[expensecategory][] = "hotel"; +$tutos[expensecategory][] = "javítás"; +$tutos[expensecategory][] = "munkaebéd"; $tutos[expensecategory][] = "parkolás"; -$tutos[expensecategory][] = "benzin"; $tutos[expensecategory][] = "postaköltség"; $tutos[expensecategory][] = "privát"; -$tutos[expensecategory][] = "javítás"; +$tutos[expensecategory][] = "repülõ"; $tutos[expensecategory][] = "szolgáltatás"; -$tutos[expensecategory][] = "büfé"; $tutos[expensecategory][] = "taxi"; $tutos[expensecategory][] = "telefon"; -$tutos[expensecategory][] = "munkaebéd"; $tutos[expensemop] = array(); $tutos[expensemop][] = "készpénz/privát"; Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/it.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- it.p3 19 May 2004 13:44:04 -0000 1.2 +++ it.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/ja.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ja.p3 19 May 2004 13:44:04 -0000 1.2 +++ ja.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/ko.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ko.p3 19 May 2004 13:44:04 -0000 1.2 +++ ko.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/nl.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nl.p3 19 May 2004 13:44:04 -0000 1.2 +++ nl.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/pl.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pl.p3 19 May 2004 13:44:04 -0000 1.2 +++ pl.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: pt-br.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/pt-br.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pt-br.p3 19 May 2004 13:44:04 -0000 1.2 +++ pt-br.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: pt.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/pt.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pt.p3 19 May 2004 13:44:04 -0000 1.2 +++ pt.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: ru.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/ru.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ru.p3 19 May 2004 13:44:04 -0000 1.2 +++ ru.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/sv.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sv.p3 19 May 2004 13:44:04 -0000 1.2 +++ sv.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: tw.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/tw.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tw.p3 19 May 2004 13:44:04 -0000 1.2 +++ tw.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: vi.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/vi.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vi.p3 19 May 2004 13:44:04 -0000 1.2 +++ vi.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; Index: zh.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/zh.p3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zh.p3 19 May 2004 13:44:04 -0000 1.2 +++ zh.p3 19 May 2004 14:30:38 -0000 1.3 @@ -51,6 +51,7 @@ $tutos[expensecategory][] = "flight"; $tutos[expensecategory][] = "gift"; $tutos[expensecategory][] = "hired car"; +$tutos[expensecategory][] = "hotel"; $tutos[expensecategory][] = "imputed costs"; $tutos[expensecategory][] = "other automobile charges"; $tutos[expensecategory][] = "other types"; |
|
From: Andreas M. <me...@us...> - 2004-05-19 14:05:00
|
Update of /cvsroot/tutos/tutos/php/expense In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11690/php/expense Modified Files: expense.pinc expense_ins.php Log Message: Not needed code discarded. Index: expense.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense.pinc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- expense.pinc 19 May 2004 13:49:52 -0000 1.2 +++ expense.pinc 19 May 2004 14:04:45 -0000 1.3 @@ -705,44 +705,10 @@ * method called from check service * Check for expenses to remember */ - /*function checkservice (&$user) { + function checkservice (&$user) { global $tutos,$lang; - - $msg = ""; - $d = new DateTime(); - $expensemailtxt = "expense_remember.proto"; - $q = "SELECT * FROM ". $user->dbconn->prefix ."expenses WHERE remember < ". $user->dbconn->DateTime($d) ." "; - $r = $user->dbconn->Exec($q); - $n = $r->numrows(); - $a = 0; - while ($a < $n) { - $x = new expense($user->dbconn); - $x->read_result($r,$a); - $x->read_reference(); - $m = new mail($user); - $m->setFrom($x->creator); - $m->addTo($x->creator); - $body = ""; - if ( ! findMailTemplate($expensemailtxt,$x->creator,$body) ) { - $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<br>\n"; - continue; - } - $m->setSubject(sprintf($x->creator->lg['EmailRememberExpense'],$x->name)); - - $x->make_mail_body($body); - - $m->addBody($body,"text/plain",$lang['Expense'],"",$x->creator->lg['content_encoding']); - $m->addBody($x->expense,"text/plain",$lang['ExpenseDescription'],"",$x->creator->lg['content_encoding']); - - $msg .= $m->send(); - $x->remember = new DateTime(0); - $x->save(); - $a++; - } - $r->free(); - - return $msg; - }*/ + #not implemented + } /** * create a link to a overview page */ @@ -761,51 +727,10 @@ /** * show the mytutos info about expenses */ - /*function mytutos (&$user) { + function mytutos (&$user) { global $tutos,$lang,$current_user; - - if ( ! $current_user->feature_ok(useexpenses,PERM_SEE) ) { - return ""; - } - - $q = "SELECT * from ". $user->dbconn->prefix ."expenses where creator = ". $user->id ." or link_id = ". $user->id ." order by creation DESC"; - $res = $user->dbconn->Exec($q); - $n = $res->numrows(); - if ($n == 0) { - $res->free(); - return ""; - } - - $r = info_table_start(); - $r .= " <tr>\n"; - $m = expense::getSelectLink($current_user,$lang['Expenses']); - $r .= " <th colspan=\"3\">". $current_user->layout->theme->getImage(expense::getHtmlIcon(),'list') ." ". menulink($m[url],$m[text],$m[info]) ."</th>\n"; - $r .= " </tr>\n"; - $r .= " <tr>\n"; - $r .= " <th>". $lang['ExpenseName'] ."</th>\n"; - $r .= " <th>". $lang['ExpenseReference'] ."</th>\n"; - $r .= " <th>". $lang['created'] ."</th>\n"; - $r .= " </tr>\n"; - - $a = 0; - while ( ($a < $n) and ($a < 2* $tutos[maxshort]) ) { - $f = new expense($user->dbconn); - $f->read_result($res,$a); - if ( $f->see_ok() ) { - $f->read_reference(); - $r .= " <tr>\n"; - $r .= " <td>" . $f->getLink() ."</td>\n"; - $r .= " <td>" . $f->ref->getLink() ."</td>\n"; - $r .= " <td align=\"right\">" . $f->creation->getDateTime() ."</td>\n"; - $r .= " </tr>\n"; - } - $a++; - unset($f); - } - $r .= info_table_end(); - $res->free(); - return $r; - }*/ + #not implemented + } /** * Reading Expenses for the calendar * author J.Baten Index: expense_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense_ins.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- expense_ins.php 18 May 2004 15:29:14 -0000 1.1 +++ expense_ins.php 19 May 2004 14:04:45 -0000 1.2 @@ -123,33 +123,6 @@ $u->setEndTime($t_end); $gotourl= addUrlParameter($gotourl,"t_end=". $t_end->getYYYYMMDDHHMM(),true); } - # - # Checks - # - /*if ( ($a->start->ts > $a->end->ts) && ($a->r_ignore == 0) ) { - # Start after End - $msg .= $lang['Err0002'] ."<br>"; - } - $a->oldparticipant = $a->participant; - if ( isset($_POST['people']) && (count($_POST['people']) > 0)) { - foreach ($_POST['people'] as $f) { - if ( $f == "" ) { - continue; - } - $gotourl= addUrlParameter($gotourl,"people[]=".$f,true); - - unset($a->oldparticipant[$f]); // a virtual move to the new list - - if (!isset($a->participant[$f])) { - // new participant - $obj = GetObject($dbconn, $f); - if ( $obj->id == $f ) { - $a->addParticipant($obj); - } - unset($obj); - } - } - }*/ # other modules $msg .= module_parseforms($current_user,$u,$gotourl); |
|
From: Andreas M. <me...@us...> - 2004-05-19 13:51:32
|
Update of /cvsroot/tutos/tutos/php/expense In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9151/php/expense Modified Files: expense_select.php Log Message: Extended search adjusted. Index: expense_select.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense_select.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- expense_select.php 18 May 2004 15:29:14 -0000 1.1 +++ expense_select.php 19 May 2004 13:51:22 -0000 1.2 @@ -122,7 +122,7 @@ */ Function prepare() { global $msg,$lang; - + $this->name = $lang['ExpenseSearch']; if ( ! $this->user->feature_ok(useexpenses,PERM_SEL) ) { @@ -150,14 +150,15 @@ $this->ext = $_GET['ext']; } - $lang['ExpenseReferences'][1] = &$lang['Company']; - $lang['ExpenseReferences'][2] = &$lang['Department']; - $lang['ExpenseReferences'][3] = &$lang['Address']; - $lang['ExpenseReferences'][4] = &$lang['Bug']; +# $lang['ExpenseReferences'][1] = &$lang['Company']; +# $lang['ExpenseReferences'][2] = &$lang['Department']; +# $lang['ExpenseReferences'][3] = &$lang['Address']; +# $lang['ExpenseReferences'][4] = &$lang['Bug']; $lang['ExpenseReferences'][5] = &$lang['ProductP']; - $lang['ExpenseReferences'][6] = &$lang['Team']; +# $lang['ExpenseReferences'][6] = &$lang['Team']; $lang['ExpenseReferences'][7] = &$lang['Task']; # $lang['ExpenseReferences'][8] = &$lang['Installation']; + $lang['ExpenseReferences'][8] = 'Installation'; # $lang['ExpenseReferences'][9] = &$lang['Checklist']; } } |
|
From: Andreas M. <me...@us...> - 2004-05-19 13:50:04
|
Update of /cvsroot/tutos/tutos/php/expense In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8790/php/expense Modified Files: expense.pinc expense_overview.php Log Message: Aggregate amount - partitioned in currencies - added in overview- and smallinfo-functions. Index: expense.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense.pinc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- expense.pinc 18 May 2004 15:29:14 -0000 1.1 +++ expense.pinc 19 May 2004 13:49:52 -0000 1.2 @@ -12,7 +12,7 @@ * cols > 0 make sperate rows with cols columns for each expense */ function showExpenses(&$user,&$obj,$cols,$rows = 0) { - global $tutos,$lang; + global $tutos,$lang,$table; $n = 1; $x = count($obj->expenselist); @@ -24,24 +24,29 @@ $rows = count($obj->expenselist); } + $currbox = array(); + foreach ($obj->expenselist as $i => $f) { - if ( $cols > 0 ) { - echo "<tr><td colspan=\"". $cols ."\">\n"; - } - if ( ($n >= $rows) && ( $x != $rows ) ) { - echo " ". $user->layout->theme->getImage(folder,'list') ." ". makelink("expense/expense_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->expenselist))); - if ( $cols > 0 ) { - echo "</td></tr>\n"; - } - break; - } - echo " ". $user->layout->theme->getImage(paper,'list') ." ". $f->getLink() ." ". $lang['ExpenseGAmount'] - .": ". number_format($f->gamount,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". $f->currency ."<br>\n"; - if ( $cols > 0 ) { - echo "</td></tr>\n"; + array_push($currbox, $f->currency); + } + $currbox = array_unique($currbox); + + for($x=0;$x<count($currbox);$x++){ + $q = "SELECT SUM(gamount) as XX FROM ". $obj->dbconn->prefix .$table['expense'][name]; + $q .= " WHERE currency = '". $currbox[$x] ."' AND link_id = ". $obj->id; + $r = $obj->dbconn->Exec($q); + $n = $r->numrows(); + if ( $n == 0 ) { + return; } - $n++; + $gamount = $r->get(0,"XX"); + $r->free(); + echo makelink("expense/expense_overview.php?link_id=". $obj->id ."&currency=". $currbox[$x], + number_format($gamount,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". $currbox[$x]) + ." (". $lang['ExpenseGAmountAll'] .")<br>\n"; } + echo $user->layout->theme->getImage(folder,'list') + ." ". makelink("expense/expense_overview.php?show=all&link_id=". $obj->id,$lang['ExpenseOverview']); } /** * a expense , attachable nearly everywhere in TUTOS Index: expense_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/expense_overview.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- expense_overview.php 18 May 2004 16:32:44 -0000 1.2 +++ expense_overview.php 19 May 2004 13:49:52 -0000 1.3 @@ -10,10 +10,6 @@ ini_set("include_path",".."); include_once 'webelements.p3'; include_once 'permission.p3'; - #include_once 'appointment.pinc'; - #include_once 'product.pinc'; - #include_once 'task.pinc'; - #include_once 'timetrack.pinc'; /* Check if user is allowed to use it */ check_user(); @@ -61,7 +57,7 @@ echo $this->orderHeader("name",$lang['ExpenseName'],$this->link2); echo $this->orderHeader("link_id",$lang['ExpenseReference'],$this->link2); echo $this->orderHeader("adr_id",$lang['ExpenseAddress'],$this->link2); - echo $this->orderHeader("",$lang['ExpenseNAmount'],$this->link2); + echo $this->orderHeader("",$lang['ExpenseGAmount'],$this->link2); echo $this->orderHeader("category",$lang['ExpenseCategory'],$this->link2); if ( $tutos[massupdate] == 1 ) { echo " <th nowrap><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\"></th>\n"; @@ -69,6 +65,13 @@ echo "</tr>\n"; echo "</thead>\n"; + # Fill the sum + $sum[''] = 0.0; + @reset($tutos[currencies]); + while( list ($ia,$c) = @each ($tutos[currencies])) { + $sum[$c] = 0.0; + } + if ( $this->start == -1 ) { # Show the last pasrt $a = $n - $tutos[maxshow]; @@ -79,6 +82,13 @@ $end = $this->start + $tutos[maxshow]; } + # Fill the sum + $x = 0; + while ( $x < $a ) { + $sum[$this->result->get($x, "currency")] += $this->result->get($x, "gamount"); + $x++; + } + $this->filter['name'] = prepare_regpattern($this->filter['name']); echo "<tbody>\n"; $line = 1; @@ -95,9 +105,9 @@ echo " <td>". makelink($b->getUrl(),$x) ."</td>\n"; echo " <td> ". $b->ref->getLink() ."</td>\n"; echo " <td> ". $b->adr_ref->getLink($b->adr_ref->getShortname()) ."</td>\n"; - $netamount = $b->gamount - $b->gamount * $b->itax / 100 - $b->deduction; - echo " <td> ". number_format($netamount,2,$lang['DecPoint'],$lang['ThousandPoint']) + echo " <td> ". number_format($b->gamount,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". myentities($b->currency) ."</td>\n"; + $sum[$b->currency] += $b->gamount; echo " <td> ". $b->category ."</td>\n"; if ( $tutos[massupdate] == 1 ) { echo " <td align=\"center\">\n"; @@ -115,6 +125,33 @@ echo "</tbody>\n"; echo $this->list_navigation($this->link1,5+$tutos[massupdate],$this->start,$a,$n); + + # Fill the sum + while ( $a < $n ) { + $sum[$this->result->get($a, "currency")] += ( $this->result->get($a, "cph") * $this->result->get($a, "volume") ); + $a++; + } + echo "<tr>\n"; + echo " <td colspan=\"3\"> </td>\n"; + echo " <td align=\"right\"><b>\n"; + @reset($sum); + while ( list ($s,$x) = @each ($sum) ) { + #if ( ($s != 'v') && ($x != 0.0) ) { + if ( $x != 0.0 ) { + $z= array($x,$s); + echo handle('money',$z,number_format($sum[$s],2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". myentities($s)) ."<br />\n"; + } else { + echo " "; + } + } + echo "</b></td>\n"; + echo " <td colspan=\"2\"> </td>\n"; + #$test = 5+$tutos[massupdate]; + #if ( $cols > $test ) { + # echo " <td colspan=\"". ( $cols - $test )."\"> </td>\n"; + #} + echo "</tr>\n"; + if ( $tutos[massupdate] == 1 ) { echo $this->UpdateRowStart(4); echo sprintf($lang['withmarked'],$lang['Expenses']); @@ -205,12 +242,12 @@ } - $j = "SELECT DISTINCT n.* FROM ". $this->dbconn->prefix ."expenses n "; // select + join + $j = "SELECT DISTINCT e.* FROM ". $this->dbconn->prefix ."expenses e "; // select + join $q = ""; $pre = " WHERE "; if ( ($name != "*") && ($name != "") ) { - $q .= " " . $pre ."(". $this->dbconn->Like("n.expense",$name) ." OR ". $this->dbconn->Like("n.name",$name) .")"; + $q .= " " . $pre ."(". $this->dbconn->Like("e.name",$name) ." OR ". $this->dbconn->Like("e.name",$name) .")"; $pre = " AND "; $this->link1 = addUrlParameter($this->link1,"name=".UrlEncode($name)); $this->filter['name'] = $name; @@ -223,7 +260,7 @@ $msg .= sprintf($lang['Err0012'],"id",$_GET['id']); $this->stop = true; } - $q .= " ". $pre ." n.id = ".$_GET['id']; + $q .= " ". $pre ." e.id = ".$_GET['id']; $pre = " AND "; $this->link1 = addUrlParameter($this->link1,"id=". $_GET['id']); } @@ -233,10 +270,16 @@ $msg .= sprintf($lang['Err0012'],"link_id",$_GET['link_id']); $this->stop = true; } - $q .= " ". $pre ." n.link_id = ".$_GET['link_id']; + $q .= " ". $pre ." e.link_id = ".$_GET['link_id']; $pre = " AND "; $this->link1 = addUrlParameter($this->link1,"link_id=". $_GET['link_id']); } + + if ( isset($_GET['currency']) ) { + $q .= " ". $pre ." e.currency = '".$_GET['currency']."'"; + $pre = " AND "; + $this->link1 = addUrlParameter($this->link1,"currency=". $_GET['currency']); + } # References to display if ( ($reftype > 0) || ($reftype > 0 && ($nsrn != "*") && ($nsrn != "")) ) { @@ -245,7 +288,7 @@ } if ( ($reftype == 1) || ($reftype == -1) ) { $j .= ", ". $this->dbconn->prefix ."companies c "; - $q .= " ". $pre . "(n.link_id=c.id "; + $q .= " ". $pre . "(e.link_id=c.id "; if ( $nsrn != "" ) { $q .= " AND ". $this->dbconn->Like("c.name",$nsrn); } @@ -254,7 +297,7 @@ } if ( ($reftype == 2) || ($reftype == -1) ) { $j .= ",". $this->dbconn->prefix ."departments d "; - $q .= " ". $pre . "(n.link_id=d.id "; + $q .= " ". $pre . "(e.link_id=d.id "; if ( $nsrn != "" ) { $q .= " AND ". $this->dbconn->Like("d.name",$nsrn); } @@ -267,12 +310,12 @@ $q .= $this->dbconn->Like("a.f_name",$nsrn) ." OR "; $q .= $this->dbconn->Like("a.m_name",$nsrn) ." OR "; $q .= $this->dbconn->Like("a.l_name",$nsrn) .")"; - $q .= " AND n.link_id=a.id )"; + $q .= " AND e.link_id=a.id )"; $pre = " OR "; } if ( ($reftype == 4) || ($reftype == -1) ) { $j .= ",". $this->dbconn->prefix ."bugs b"; - $q .= " ". $pre . "(n.link_id=b.id "; + $q .= " ". $pre . "(e.link_id=b.id "; if ( $nsrn != "" ) { $q .= " AND ". $this->dbconn->Like("b.short",$nsrn); } @@ -281,7 +324,7 @@ } if ( ($reftype == 5) || ($reftype == -1) ) { $j .= ",". $this->dbconn->prefix ."products p"; - $q .= $pre ."( n.link_id=p.id "; + $q .= $pre ."( e.link_id=p.id "; if ( $nsrn != "" ) { $q .= " AND ("; $q .= $this->dbconn->Like("p.name",$nsrn) ." OR "; @@ -292,12 +335,12 @@ } if ( ($reftype == 6) || ($reftype == -1) ) { $j .= ",". $this->dbconn->prefix ."teams t"; - $q .= $pre . "(n.link_id=t.id AND ". $this->dbconn->Like("t.name",$nsrn) .")"; + $q .= $pre . "(e.link_id=t.id AND ". $this->dbconn->Like("t.name",$nsrn) .")"; $pre = " OR "; } if ( ($reftype == 7) || ($reftype == -1) ) { $j .= ",". $this->dbconn->prefix ."tasks k"; - $q .= $pre . "(n.link_id=k.id AND ". $this->dbconn->Like("k.name",$nsrn) .")"; + $q .= $pre . "(e.link_id=k.id AND ". $this->dbconn->Like("k.name",$nsrn) .")"; $pre = " OR "; } if ( ($reftype == 8) || ($reftype == -1) ) { @@ -305,7 +348,7 @@ if ( ! stristr($j, "products") ) { $j .= ",". $this->dbconn->prefix ."products p"; } - $q .= $pre ."( n.link_id=i.id AND i.product_id=p.id AND ("; + $q .= $pre ."( e.link_id=i.id AND i.product_id=p.id AND ("; $q .= $this->dbconn->Like("p.name",$nsrn) ." OR "; $q .= $this->dbconn->Like("p.version",$nsrn) .") )"; $pre = " OR "; @@ -324,7 +367,7 @@ $q .= $this->dbconn->Like("addresses.f_name",$nscr) ." OR "; $q .= $this->dbconn->Like("addresses.m_name",$nscr) ." OR "; $q .= $this->dbconn->Like("addresses.l_name",$nscr) .")"; - $q .= " AND n.creator=addresses.id )"; + $q .= " AND e.creator=addresses.id )"; $pre = "AND "; $this->link1 = addUrlParameter($this->link1,"nscr=".UrlEncode($nscr)); $this->filter['nscr'] = $nscr; @@ -341,7 +384,7 @@ $_SESSION['expensesearchfrom'] = $from->getYYYYMMDD(); } if ( $from->notime != 1 ) { - $q .= $pre ."(n.creation >= ". $this->dbconn->Date($from) .")"; + $q .= $pre ."(e.creation >= ". $this->dbconn->Date($from) .")"; $pre = "AND "; $this->link1 = addUrlParameter($this->link1,"fd=".$from->getYYYYMMDD()); $this->filter['from'] = $from; @@ -357,7 +400,7 @@ $_SESSION['expensesearchto'] = $to->getYYYYMMDD(); } if ( $to->notime != 1 ) { - $q .= $pre ."(n.creation <= ". $this->dbconn->Date($to) .")"; + $q .= $pre ."(e.creation <= ". $this->dbconn->Date($to) .")"; $pre = "AND "; $this->link1 = addUrlParameter($this->link1,"td=".$to->getYYYYMMDD()); $this->filter['to'] = $to; @@ -369,7 +412,7 @@ # sorting $xxx = ""; $this->link2 = $this->link1; - order_parse($this->q,$this->link1,$xxx,$xxx,"n.creation DESC"); + order_parse($this->q,$this->link1,$xxx,$xxx,"e.creation DESC"); if ($this->stop) { return; |
|
From: Andreas M. <me...@us...> - 2004-05-19 13:45:51
|
Update of /cvsroot/tutos/tutos/php/expense In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7677/php/expense Modified Files: mconfig.pinc Log Message: Fixed module id... Index: mconfig.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/expense/mconfig.pinc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mconfig.pinc 18 May 2004 15:29:15 -0000 1.1 +++ mconfig.pinc 19 May 2004 13:45:31 -0000 1.2 @@ -10,9 +10,9 @@ # # Every module must have an individual ID ( < 0 > -100 ). -# this is module 8 +# this is module 90 # -define('useexpenses',-8); +define('useexpenses',-90); $tutos[modules]['expense'] = array( name => "expense", Desc => "expenses", |