tutos-commits Mailing List for TUTOS (Page 451)
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
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:25:37
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv20407/php
Modified Files:
user.pinc user_ins.php user_new.php
Log Message:
fixes (transaction,headlines,html)
Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** user.pinc 2001/09/11 19:32:17 1.48
--- user.pinc 2001/09/16 19:25:35 1.49
***************
*** 116,120 ****
$this->last_host = StripSlashes(DB_Result($result, $pos, "last_host"));
$this->uid = DB_Result($result, $pos, "u_id");
! $this->admin = DB_Result($result, $pos, "admin");
#echo "<BR>LOGIN: ". $this->login;
#echo "<BR>ADMIN: ". $this->admin;
--- 116,120 ----
$this->last_host = StripSlashes(DB_Result($result, $pos, "last_host"));
$this->uid = DB_Result($result, $pos, "u_id");
! $this->admin = DB_Result($result, $pos,$this->dbconn->colname("admin"));
#echo "<BR>LOGIN: ". $this->login;
#echo "<BR>ADMIN: ". $this->admin;
***************
*** 185,202 ****
if ( file_exists("../html/". $this->theme ."/folder.gif") ) {
! $tutos[image][folder] = "<IMG BORDER=0 SRC=\"../html/". $this->theme ."/folder.gif\" ALT=\"\">";
} else {
! $tutos[image][folder] = "<IMG BORDER=0 SRC=\"../html/folder.gif\" ALT=\"\">";
}
if ( file_exists("../html/". $this->theme ."/paper.gif") ) {
! $tutos[image][paper] = "<IMG BORDER=0 SRC=\"../html/". $this->theme ."/paper.gif\" ALT=\"\">";
} else {
! $tutos[image][paper] = "<IMG BORDER=0 SRC=\"../html/paper.gif\" ALT=\"\">";
}
if ( file_exists("../html/". $this->theme ."/mail.gif") ) {
! $tutos[image][mail] = "<IMG BORDER=0 SRC=\"../html/". $this->theme ."/mail.gif\" ALT=\"\">";
} else {
! $tutos[image][mail] = "<IMG BORDER=0 SRC=\"../html/mail.gif\" ALT=\"\">";
}
--- 185,202 ----
if ( file_exists("../html/". $this->theme ."/folder.gif") ) {
! $tutos[image][folder] = "<IMG BORDER=0 SRC=\"../html/". $this->theme ."/folder.gif\">";
} else {
! $tutos[image][folder] = "<IMG BORDER=0 SRC=\"../html/folder.gif\">";
}
if ( file_exists("../html/". $this->theme ."/paper.gif") ) {
! $tutos[image][paper] = "<IMG BORDER=0 SRC=\"../html/". $this->theme ."/paper.gif\">";
} else {
! $tutos[image][paper] = "<IMG BORDER=0 SRC=\"../html/paper.gif\">";
}
if ( file_exists("../html/". $this->theme ."/mail.gif") ) {
! $tutos[image][mail] = "<IMG BORDER=0 SRC=\"../html/". $this->theme ."/mail.gif\">";
} else {
! $tutos[image][mail] = "<IMG BORDER=0 SRC=\"../html/mail.gif\">";
}
***************
*** 316,319 ****
--- 316,322 ----
return $this->parties ;
}
+ $this->parties = array();
+ $this->t_parties = array();
+ $this->a_parties = array();
$t1 = "( (a.id = ". $this->id .")";
***************
*** 516,522 ****
global $current_user,$tutos;
- if ( $current_user->admin == 1 ) {
- return $tutos[modok];
- }
if ( $current_user->id == $this->id ) {
return $tutos[modok];
--- 519,522 ----
***************
*** 551,555 ****
$vals .= ",". $this->dbconn->Password($this->pw);
! $flds .= ",admin";
$vals .= ",". sprintf("%d",$this->admin);
--- 551,555 ----
$vals .= ",". $this->dbconn->Password($this->pw);
! $flds .= ",". $this->dbconn->colname("admin");
$vals .= ",". sprintf("%d",$this->admin);
***************
*** 589,593 ****
$q .= ",pw = ". $this->dbconn->Password($this->pw);
}
! $q .= ",admin = ". $this->admin;
# $q .= ",overlib = ". $this->p[useoverlib];
$q .= ",lang = ". $this->dbconn->String($this->lang);
--- 589,593 ----
$q .= ",pw = ". $this->dbconn->Password($this->pw);
}
! $q .= sprintf(",%s = %d",$this->dbconn->colname("admin"), $this->admin);
# $q .= ",overlib = ". $this->p[useoverlib];
$q .= ",lang = ". $this->dbconn->String($this->lang);
***************
*** 597,605 ****
}
- $this->dbconn->Begin("WORK");
$this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
return $msg;
--- 597,603 ----
Index: user_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_ins.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** user_ins.php 2001/09/10 16:35:44 1.10
--- user_ins.php 2001/09/16 19:25:35 1.11
***************
*** 75,80 ****
--- 75,83 ----
}
# echo count($u->p) ." = ". count($x) ."<BR>\n";
+
+ $dbconn->Begin("WORK");
$msg .= $u->save_permissions();
$msg .= $u->save();
+ $dbconn->Commit("WORK");
$gotourl = "address_show.php";
Index: user_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_new.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** user_new.php 2001/09/13 14:49:48 1.23
--- user_new.php 2001/09/16 19:25:35 1.24
***************
*** 123,127 ****
@reset ($lang['lang']);
while( list ($i,$f) = @each ($lang['lang'])) {
! echo " <OPTION value=". $i ." ". $lsel[$i] .">". $f ."</OPTION>\n";
}
echo " </SELECT>\n";
--- 123,127 ----
@reset ($lang['lang']);
while( list ($i,$f) = @each ($lang['lang'])) {
! echo " <OPTION value=\"". $i ."\" ". $lsel[$i] .">". htmlentities($f) ."</OPTION>\n";
}
echo " </SELECT>\n";
***************
*** 202,206 ****
$stop = 0;
if ( isset($id) ) {
- HTML_Header($lang['UserModify']);
$user = new tutos_user($dbconn);
$user->read($id);
--- 202,205 ----
***************
*** 211,216 ****
}
} else {
- HTML_Header($lang['UserCreate']);
$user = $current_user;
}
--- 210,220 ----
}
} else {
$user = $current_user;
+ }
+
+ if ( $user->isUser() != 0 ) {
+ HTML_Header($lang['UserModify']);
+ } else {
+ HTML_Header($lang['UserCreate']);
}
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:23:56
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv20096/php
Modified Files:
scheme.php
Log Message:
added interbase support
Index: scheme.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/scheme.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** scheme.php 2001/09/10 19:41:24 1.6
--- scheme.php 2001/09/16 19:23:54 1.7
***************
*** 80,83 ****
--- 80,108 ----
$dbconn->Commit("WORK");
}
+ if ( $dbconn->gettype() == "Interbase" ) {
+ droptable(&$dbconn,"ids");
+ createtable(&$dbconn,"ids","id int");
+ $q = "create trigger ids_ins1 for ids before insert position 0 as
+ begin
+ NEW.ID = GEN_ID(ID, 1);
+ end";
+ $r = $dbconn->Exec($q,1);
+ $q = "create trigger ids_ins2 for ids before update position 0 as
+ begin
+ NEW.ID = GEN_ID(ID, 1);
+ end";
+ $r = $dbconn->Exec($q,1);
+ $dbconn->Begin("WORK");
+ $q = "DELETE FROM RDB\$GENERATORS WHERE RDB\$GENERATOR_NAME = 'ID';";
+ $r = $dbconn->Exec($q,0);
+ $q = "create generator ID";
+ $r = $dbconn->Exec($q,0);
+ $q = "set generator ID to 1000";
+ $r = $dbconn->Exec($q,0);
+ ibase_commit();
+ $q = "insert into ids (id) values (0)";
+ $r = $dbconn->Exec($q,1);
+ $dbconn->Commit("WORK");
+ }
}
/* ---------------------------------------------------------------------------
***************
*** 98,102 ****
# return;
! if ( $r == "" || (1 != DB_NumRows($r))) {
echo " Does not exist<BR>\n";
flush();
--- 123,127 ----
# return;
! if ( $r == "" || (1 != $dbconn->NumRows($r))) {
echo " Does not exist<BR>\n";
flush();
***************
*** 141,146 ****
$q = eregi_replace("ID_TYPE","number(30,0)",$q);
$q = eregi_replace("TS_TYPE","date",$q);
! $q = eregi_replace("TX_TYPE","varchar2(400)",$q);
$q = eregi_replace("PK","primary key",$q);
}
$q = eregi_replace("NN","not null",$q);
--- 166,180 ----
$q = eregi_replace("ID_TYPE","number(30,0)",$q);
$q = eregi_replace("TS_TYPE","date",$q);
! $q = eregi_replace("TX_TYPE","varchar2(20000)",$q);
$q = eregi_replace("PK","primary key",$q);
+ } else if ( $dbconn->gettype() == "Interbase" ) {
+ $q = eregi_replace("varchar","varchar",$q);
+ $q = eregi_replace("ID_TYPE","int",$q);
+ $q = eregi_replace("TS_TYPE","timestamp",$q);
+ $q = eregi_replace("TX_TYPE","varchar(20000)",$q);
+ $q = eregi_replace("PK","NN primary key",$q);
+ } else {
+ echo "MISSINIG ". $dbconn->gettype();
+ exit;
}
$q = eregi_replace("NN","not null",$q);
***************
*** 209,212 ****
--- 243,247 ----
droptable($dbconn,"timetrack");
droptable($dbconn,"messages");
+ droptable($dbconn,"tutos_dbs");
echo "XX:". $dbconn->conn;
***************
*** 220,248 ****
echo "<P>";
! createtable($dbconn,"calendar","id ID_TYPE PK, -- a unique ID
! a_start TS_TYPE NN, -- Start of Event
! a_end TS_TYPE NN, -- End of Event
! description varchar(100), -- What is happening
! trace ID_TYPE NN, -- 0 = no voting , 1 = voting
! mod_allow ID_TYPE NN, -- 3 = private (only part. see it)
! -- 2 = owner
! -- 1 = participants
! -- 0 = everybody
! outside ID_TYPE default 0, -- 0 = local 1 = outside 2 = vacation 3 = ill
! remember ID_TYPE , -- 0 = no else minutes before start
! remembered ID_TYPE , -- 0 = no 1 = yes
! visitor ID_TYPE , -- who is visited/visitor see adresses(id)
! product ID_TYPE , -- app. is related to product id
! repeat ID_TYPE default 0, -- app. is a repeating appointment
! -- 0 == no repeat
! -- 1 == every week on weekday r_arg
! -- 2 == every month on day r_arg
! -- 3 == every year on day/month r_arg
! -- 4 == every day
! r_arg varchar(5) , -- additional arg for repeating events ( speedups select )
! r_ignore ID_TYPE default 0, -- ignore end date for repeating events
! -- 0 == respect end date
! -- 1 == ignore end date
! creator ID_TYPE NN, -- who is responsible see adresses(id)
creation TS_TYPE NN");
createindex($dbconn,"calendar","cal_rep_idx1","repeat");
--- 255,273 ----
echo "<P>";
! createtable($dbconn,"calendar","id ID_TYPE PK,
! a_start TS_TYPE NN,
! a_end TS_TYPE NN,
! description varchar(100),
! trace ID_TYPE NN,
! mod_allow ID_TYPE NN,
! outside ID_TYPE default 0,
! remember ID_TYPE ,
! remembered ID_TYPE ,
! visitor ID_TYPE ,
! product ID_TYPE ,
! repeat ID_TYPE default 0,
! r_arg varchar(5) ,
! r_ignore ID_TYPE default 0,
! creator ID_TYPE NN,
creation TS_TYPE NN");
createindex($dbconn,"calendar","cal_rep_idx1","repeat");
***************
*** 252,265 ****
createtable($dbconn,"people","id ID_TYPE PK,
! adr_id ID_TYPE NN, -- see addresses
! login varchar(20) NN , -- login name
! last_seen TS_TYPE, -- last login time
! last_host varchar(20), -- last login host
! admin ID_TYPE NN, -- is admin 0 = no 1 = yes
! pw varchar(20) NN, -- password
! prefteam ID_TYPE default 1, -- the prefered team to display in calendar
! overlib ID_TYPE default 1, -- use overlib 1 = yes 0 = no
! lang varchar(5), -- language (auto == use http accepted languages)
! tz varchar(30), -- timezone name
theme varchar(10) default 'tutos'");
echo "<P>";
--- 277,290 ----
createtable($dbconn,"people","id ID_TYPE PK,
! adr_id ID_TYPE NN,
! login varchar(20) NN ,
! last_seen TS_TYPE,
! last_host varchar(20),
! ". $dbconn->colname("admin") ." ID_TYPE NN,
! pw varchar(20) NN,
! prefteam ID_TYPE default 1,
! overlib ID_TYPE default 1,
! lang varchar(5),
! tz varchar(30),
theme varchar(10) default 'tutos'");
echo "<P>";
***************
*** 276,348 ****
echo "<P>";
! createtable($dbconn,"location","id ID_TYPE PK,-- a unique id
! category ID_TYPE NN, -- type of entry (1 == private, 2 == buisness)
! c_id ID_TYPE, -- id of company
! d_id ID_TYPE, -- id of department
! desc1 varchar(30), -- short description
! phone_1 varchar(30), -- phone number
! phone_2 varchar(30), -- phone number
! fax_1 varchar(30), -- fax number
! email_1 varchar(60), -- email
! email_2 varchar(60), -- email
! street1 varchar(30), -- first part of street
! street2 varchar(30), -- second part of street
! city varchar(30), -- city of home residence
! zip varchar(10), -- zip code
! state varchar(30), -- State in Country
! country varchar(3), -- Country Code
coords varchar(30)");
echo "<P>";
! createtable($dbconn,"adrloc","adr_id ID_TYPE NN, -- see adresses
! loc_id ID_TYPE NN, -- see location
! name varchar(30) NN, -- description
category ID_TYPE");
createindex($dbconn,"adrloc","adrloc_u","adr_id,loc_id","unique");
echo "<P>";
! createtable($dbconn,"teams","id ID_TYPE PK, -- a unique ID
! name varchar(30), -- name of team
! owner ID_TYPE NN, -- who is responsible see adresses(id)
creation TS_TYPE NN");
echo "<P>";
! createtable($dbconn,"adrteam","adr_id ID_TYPE NN, -- see adresses
team_id ID_TYPE NN");
createindex($dbconn,"adrteam","adrteam_u","adr_id,team_id","unique");
echo "<P>";
! createtable($dbconn,"participants","adr_id ID_TYPE NN, -- see addresses
! app_id ID_TYPE NN, -- see calendar
state ID_TYPE default 0");
createindex($dbconn,"participants","part_uap_id","adr_id,app_id","unique");
echo "<P>";
! createtable($dbconn,"resources","id ID_TYPE PK, -- a unique ID
! name varchar(30), -- name
! description varchar(60), -- short text
! creator ID_TYPE NN, -- who made this see adresses(id)
creation TS_TYPE NN");
echo "<P>";
! createtable($dbconn,"res_use","res_id ID_TYPE NN, -- see resources
obj_id ID_TYPE NN");
echo "<P>";
! createtable($dbconn,"products","id ID_TYPE PK, -- a unique index
! name varchar(40), -- product name
! version varchar(20), -- product version
! description TX_TYPE, -- description of product
! desc1 varchar(50), -- for free use
! desc2 varchar(50), -- for free use
! state ID_TYPE, -- state of product 0==prestate 1==ongoing 2==finished 3=cancelled
! path varchar(100), -- path to cvsweb / project source
! price float, -- project/product customers price
! cost float, -- project/product making costs
! currency varchar(4), -- currency
! probability float, -- probability of making a project (only in prestate)
! p_start TS_TYPE , -- estimated start / order
! p_end TS_TYPE , -- estimated end
! creator ID_TYPE NN, -- who made this see adresses(id)
creation TS_TYPE NN");
echo "<P>";
--- 301,373 ----
echo "<P>";
! createtable($dbconn,"location","id ID_TYPE PK,
! category ID_TYPE NN,
! c_id ID_TYPE,
! d_id ID_TYPE,
! desc1 varchar(30),
! phone_1 varchar(30),
! phone_2 varchar(30),
! fax_1 varchar(30),
! email_1 varchar(60),
! email_2 varchar(60),
! street1 varchar(30),
! street2 varchar(30),
! city varchar(30),
! zip varchar(10),
! state varchar(30),
! country varchar(3),
coords varchar(30)");
echo "<P>";
! createtable($dbconn,"adrloc","adr_id ID_TYPE NN,
! loc_id ID_TYPE NN,
! name varchar(30) NN,
category ID_TYPE");
createindex($dbconn,"adrloc","adrloc_u","adr_id,loc_id","unique");
echo "<P>";
! createtable($dbconn,"teams","id ID_TYPE PK,
! name varchar(30),
! owner ID_TYPE NN,
creation TS_TYPE NN");
echo "<P>";
! createtable($dbconn,"adrteam","adr_id ID_TYPE NN,
team_id ID_TYPE NN");
createindex($dbconn,"adrteam","adrteam_u","adr_id,team_id","unique");
echo "<P>";
! createtable($dbconn,"participants","adr_id ID_TYPE NN,
! app_id ID_TYPE NN,
state ID_TYPE default 0");
createindex($dbconn,"participants","part_uap_id","adr_id,app_id","unique");
echo "<P>";
! createtable($dbconn,"resources","id ID_TYPE PK,
! name varchar(30),
! description varchar(60),
! creator ID_TYPE NN,
creation TS_TYPE NN");
echo "<P>";
! createtable($dbconn,"res_use","res_id ID_TYPE NN,
obj_id ID_TYPE NN");
echo "<P>";
! createtable($dbconn,"products","id ID_TYPE PK,
! name varchar(40),
! version varchar(20),
! description TX_TYPE,
! desc1 varchar(50),
! desc2 varchar(50),
! state ID_TYPE,
! path varchar(100),
! price float,
! cost float,
! currency varchar(4),
! probability float,
! p_start TS_TYPE ,
! p_end TS_TYPE ,
! creator ID_TYPE NN,
creation TS_TYPE NN");
echo "<P>";
***************
*** 406,410 ****
echo "<P>";
! createtable($dbconn,"files","id ID_TYPE PK,link_id ID_TYPE, name varchar(200), filename varchar(200), loc varchar(200), type varchar(40), f_size ID_TYPE, version varchar(10), locked ID_TYPE, vsys ID_TYPE, logtxt TX_TYPE, author ID_TYPE, creator ID_TYPE NN, creation TS_TYPE");
echo "<P>";
--- 431,435 ----
echo "<P>";
! createtable($dbconn,"files","id ID_TYPE PK,link_id ID_TYPE, name varchar(200), filename varchar(200), loc varchar(200),". $dbconn->colname("type") ." varchar(40), f_size ID_TYPE, version varchar(10), locked ID_TYPE, vsys ID_TYPE, logtxt TX_TYPE, author ID_TYPE, creator ID_TYPE NN, creation TS_TYPE");
echo "<P>";
***************
*** 421,425 ****
echo "<P>";
! createtable($dbconn,"mailboxes","id ID_TYPE PK,link_id ID_TYPE,host varchar(40),type varchar(10),port ID_TYPE,uname varchar(20),pw varchar(20),path varchar(60),email varchar(60)");
echo "<P>";
--- 446,450 ----
echo "<P>";
! createtable($dbconn,"mailboxes","id ID_TYPE PK,link_id ID_TYPE,host varchar(40),".$dbconn->colname("type") ." varchar(10),port ID_TYPE,uname varchar(20),pw varchar(20),path varchar(60),email varchar(60)");
echo "<P>";
***************
*** 438,446 ****
echo "<P>";
! createtable($dbconn,"messages","ts TS_TYPE,message varchar(200)");
echo "<P>";
createtable($dbconn,"tutos_dbs","id ID_TYPE PK,
! dbname varchar(30) NN,
dbalias varchar(60),
dbhost varchar(30),
--- 463,471 ----
echo "<P>";
! createtable($dbconn,"messages","ts TS_TYPE,". $dbconn->colname("message") ." varchar(200)");
echo "<P>";
createtable($dbconn,"tutos_dbs","id ID_TYPE PK,
! name varchar(30) NN,
dbalias varchar(60),
dbhost varchar(30),
***************
*** 449,452 ****
--- 474,478 ----
dbhome varchar(60),
dbtype ID_TYPE,
+ dbport ID_TYPE,
repository varchar(60),
last_date TS_TYPE,
***************
*** 459,463 ****
# $dbconn->Close();
# $dbconn->Open();
! # Build the aequencer
createsequence($dbconn);
--- 485,489 ----
# $dbconn->Close();
# $dbconn->Open();
! # Build the sequencer
createsequence($dbconn);
***************
*** 650,657 ****
*
*/
! Function info(&$dbconn,$step) {
global $tutos,$lang,$current_user;
! # $dbconn->Open();
echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
echo "<TR>\n";
--- 676,683 ----
*
*/
! Function info(&$dbconn,$step,$id) {
global $tutos,$lang,$current_user;
! # $dbconn->Open($id);
echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
echo "<TR>\n";
***************
*** 680,683 ****
--- 706,710 ----
echo "<FORM METHOD=GET>\n";
+ echo " <INPUT type=\"hidden\" value=\"". $id ."\" name=\"id\">\n";
if ( $step == 0 ) {
echo "Is the above info correct ?<BR>\n";
***************
*** 723,732 ****
HTML_Header($lang['DBInit']);
!
! $dbconn = DB_Open(0);
if ( $dbconn->gettype() == "Postgres" ) {
# No persistent connections here
$dbconn->setPersistent(0);
}
$current_user = new tutos_user($dbconn);
--- 750,765 ----
HTML_Header($lang['DBInit']);
! if ( ! isset($id) ) {
! $id = 0;
! }
! $dbconn = DB_Open($id);
if ( $dbconn->gettype() == "Postgres" ) {
# No persistent connections here
$dbconn->setPersistent(0);
}
+ if ( $dbconn->gettype() == "Interbase" ) {
+ # No persistent connections here
+ $dbconn->setPersistent(0);
+ }
$current_user = new tutos_user($dbconn);
***************
*** 744,748 ****
navigate();
HTML_Base2($msg);
! info($dbconn,$step);
HTML_Base3();
?>
--- 777,781 ----
navigate();
HTML_Base2($msg);
! info($dbconn,$step,$id);
HTML_Base3();
?>
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:23:44
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv20059/php
Modified Files:
history_show.php
Log Message:
team change support
Index: history_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history_show.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** history_show.php 2001/09/10 19:44:03 1.16
--- history_show.php 2001/09/16 19:23:41 1.17
***************
*** 143,146 ****
--- 143,148 ----
|| ($f['field'] == "SoldBy")
|| ($f['field'] == "FileAuthor")
+ || ($f['field'] == "TeamDel")
+ || ($f['field'] == "TeamAdd")
|| ($f['field'] == "InstalledBy") ) {
if ( $f["old"] <= 0 ) {
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:23:05
|
Update of /cvsroot/tutos/tutos
In directory usw-pr-cvs1:/tmp/cvs-serv19934
Modified Files:
createdb.sh shellfunc.sh
Log Message:
added interbase support
Index: createdb.sh
===================================================================
RCS file: /cvsroot/tutos/tutos/createdb.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** createdb.sh 2001/07/21 16:03:32 1.7
--- createdb.sh 2001/09/16 19:23:02 1.8
***************
*** 220,223 ****
--- 220,275 ----
fi
+ # -----------------------------------------------------------------------------
+ # Interbase Version 6.0
+ # -----------------------------------------------------------------------------
+ if [ $1 = "INTERBASE" ]
+ then
+ #
+ # CREATE DATABASE AND USER
+ #
+ if [ $2 = "CREATE" ]
+ then
+ gsec -user SYSDBA -password masterkey -database /opt/interbase/isc4.gdb -add $DBUSER -pw $DBPASSWD -fname TUTOS
+ gsec -user SYSDBA -password masterkey -database /opt/interbase/isc4.gdb -display
+ $SQLCMD -u $DBSUSER -p masterkey <<EOF
+ $line1
+
+ CREATE DATABASE '$DBNAME';
+
+ EOF
+ fi
+ #
+ # DELETE DATABASE AND USER
+ #
+ if [ $2 = "DROP" ]
+ then
+ gsec -user SYSDBA -password masterkey -database /opt/interbase/isc4.gdb -del $DBUSER
+
+ $SQLCMD -u $DBSUSER -p masterkey <<EOF
+ $line1
+ CONNECT '$DBHOST:$DBNAME';
+ DROP DATABASE;
+
+ EOF
+ fi
+ #
+ # DUMP DATABASE AND USER
+ #
+ if [ $2 = "DUMP" ]
+ then
+ mysqldump -t -c -h $DBHOST -u $DBUSER $DBNAME > mysql.$DBNAME.dump
+ echo "MySQL Database dumpfile \"mysql.$DBNAME.dump\" created"
+ fi
+ #
+ # RESTORE DATABASE AND USER
+ #
+ if [ $2 = "RESTORE" ]
+ then
+ echo "MySQL Database restore currently not supported"
+ echo "run mysql < [your dump file]"
+ echo "after running scheme.sh"
+ fi
+ fi
+
if [ $2 = "CREATE" ]
then
Index: shellfunc.sh
===================================================================
RCS file: /cvsroot/tutos/tutos/shellfunc.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** shellfunc.sh 2001/07/07 19:49:26 1.14
--- shellfunc.sh 2001/09/16 19:23:02 1.15
***************
*** 140,143 ****
--- 140,180 ----
fi
+ if [ $1 = "INTERBASE" ]
+ then
+ DBSUSER=SYSDBA
+ DBPASSWD="tutos"
+ DBNAME=/tmp/tutos.gdb
+
+ DBTYPE=7;
+ ID_TYPE="int"
+ TS_TYPE="timestamp"
+ TX_TYPE="varchar2(400)"
+ SQLCMD="isql"
+ carg1="-u $DBUSER -p $DBPASSWD $DBHOST:$DBNAME "
+ #
+ line1=""
+ line2=""
+ dropsequence="drop table if exists id ;"
+ createsequence="create table id (nextval int not null);insert into id values (1000);"
+ # We need these values for the example.sh (surely there are better ways to do this :-) )
+ NOW="now()"
+ NOW1H="DATE_ADD(now(),INTERVAL 1 HOUR)"
+ NOW2H="DATE_ADD(now(),INTERVAL 2 HOUR)"
+ NOW1D="DATE_ADD(now(),INTERVAL 1 DAY)"
+ NOW2D="DATE_ADD(now(),INTERVAL 2 DAY)"
+ NOW3D="DATE_ADD(now(),INTERVAL 3 DAY)"
+ NOW4D="DATE_ADD(now(),INTERVAL 4 DAY)"
+ NOW_1D="DATE_SUB(now(),INTERVAL 1 DAY)"
+ NOW_4D="DATE_SUB(now(),INTERVAL 4 DAY)"
+ NOW1W="DATE_ADD(now(),INTERVAL 7 DAY)"
+ NOW2W="DATE_ADD(now(),INTERVAL 14 DAY)"
+ NOW_1W="DATE_SUB(now(),INTERVAL 7 DAY)"
+ NOW_2W="DATE_SUB(now(),INTERVAL 14 DAY)"
+ NOW_3W="DATE_SUB(now(),INTERVAL 21 DAY)"
+ # Passwort for Guestaccount MYSQL does its own encryption
+ GUESTPW="PASSWORD('guest')"
+ SUPERPW="PASSWORD('tutos')"
+ fi
+
# Now Export everything
export DBTYPE
***************
*** 190,196 ****
echo "\$tutos[dbtype][0] = $DBTYPE ;"
echo "\$tutos[dbalias][0] = \"Whatever you want\";"
echo "----------------------------------------------------------------"
echo ""
}
! # EOF
\ No newline at end of file
--- 227,234 ----
echo "\$tutos[dbtype][0] = $DBTYPE ;"
echo "\$tutos[dbalias][0] = \"Whatever you want\";"
+ echo "\$tutos[repository][0] = \"the path to the file/document repository\";"
echo "----------------------------------------------------------------"
echo ""
}
! # EOF
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:22:24
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv19813/php
Modified Files:
admin_sync.php database.pinc database_ins.php database_new.php
database_show.php db.p3 db_msql.pinc db_mysql.pinc db_ora.pinc
db_pg.pinc db_sybase.pinc
Added Files:
database_overview.php db_interbase.pinc
Log Message:
added interbase support
--- NEW FILE: database_overview.php ---
<?
/*
* Copyright 1999/2000/2001 by Gero Kohnert
*/
include("webelements.p3");
include("permission.p3");
/* Check if user is allowed to use it */
check_user();
/* ---------------------------------------------------------------------------
*
*/
Function info(&$dbconn,&$result,$start=0) {
global $lang,$tutos,$link1;
$n = DB_NumRows($result);
if ( 0 == $n) {
echo $lang['Err0048'];
return;
}
echo "<TABLE CLASS=single BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
echo "<TR>\n";
echo order_header("dbalias",$lang['AdminDBAlias']);
echo order_header("name",$lang['AdminDBName']);
echo order_header("host",$lang['AdminDBHost']);
echo order_header("dbtype",$lang['AdminDBType']);
echo "</TR>\n";
if ( $start == -1 ) {
$a = $n - $tutos[maxshow];
$end = $n;
$start = $a;
} else {
$a = $start;
$end = $start + $tutos[maxshow];
}
$line = 1;
while ( ($a < $n) && ($a < $end) ) {
$c = new database($dbconn);
$c->read_result($result,$a);
$a++;
if ( ! $c->see_ok() ) {
continue;
}
if ( $line == 1 ) {
$line = 2;
} else {
$line = 1;
}
echo "<TR CLASS=line". $line .">\n";
echo "<TD VALIGN=\"top\">". $c->alias ."</TD>";
echo "<TD VALIGN=\"top\">". $c->getLink($c->name) ."</TD>";
echo "<TD VALIGN=\"top\">". $c->host ."</TD>";
echo "<TD VALIGN=\"top\">". $c->tlist[$c->type] ."</TD>";
echo "</TR>\n";
}
ShowBackForwardNav($link1,2,$start,$a,$n);
echo "</TABLE>\n";
}
/* ---------------------------------------------------------------------------
*
*/
Function navigate() {
global $lang;
echo "<TABLE>";
echo "<TR><TD>";
echo menulink("resource_new.php",$lang['NewEntry'],$lang['ResCreate']) . "<BR>\n";
echo "</TD></TR>";
HTML_Select();
}
HTML_Header($lang['DBOverview']);
$link1 = "database_overview.php";
$q = "SELECT * FROM tutos_dbs";
$pre = " WHERE ";
if ( isset($name) && ($name != "*") && ($name != "") ) {
$q .= $pre . $dbconn->Like("name",$name);
$pre = " AND ";
$link1 = addUrlParameter($link1,"name=". UrlEncode($name));
}
# sorting
if ( isset($xf) && isset($xo) ) {
$q .=" ORDER by " . $xf;
if ( $xo == 1 ) {
$q .= " ASC ";
} else {
$q .= " DESC ";
}
$link1 = addUrlParameter($link1,"xf=".UrlEncode($f));
$link1 = addUrlParameter($link1,"xo=". $o);
} else {
$q .= " ORDER by name";
}
$result = $dbconn->Exec($q);
if ( (! isset($start)) || ($start < 0) ) {
$start = 0;
}
HTML_Base1();
navigate();
HTML_Base2($msg);
info($dbconn,$result,$start);
HTML_Base3();
$dbconn->Close();
?>
<!--
CVS Info: $Id: database_overview.php,v 1.1 2001/09/16 19:22:22 gokohnert Exp $
$Author: gokohnert $
-->
--- NEW FILE: db_interbase.pinc ---
<?
if ( isset ($includes['db_interbase.pinc']) ) {$includes['db_interbase.pinc']++;return;}
/*
* Copyright 2001 by Gero Kohnert
*
* CVS Info: $Id: db_interbase.pinc,v 1.1 2001/09/16 19:22:22 gokohnert Exp $
* $Author: gokohnert $
*/
/* ---------------------------------------------------------------------------
* postgres database connection class
*/
class db_interbase {
/* ---------------------------------------------------------------------------
*/
function db_interbase(&$db) {
$this->conn = -1;
$this->lastquery = "";
$this->db = $db;
$this->openfunc = 'ibase_pconnect';
$this->col["message"] = "T_message";
$this->col["type"] = "T_type";
$this->col["admin"] = "T_admin";
}
/* ---------------------------------------------------------------------------
*/
function open() {
global $phperrmsg;
$of = $this->openfunc;
$c = $of($this->db->host.":".$this->db->name,$this->db->user,$this->db->pass);
if ($c == false) {
Fatal_Error("Opening the Interbase database ".$this->getFullName() ,ibase_errmsg() );
}
ibase_timefmt("%Y-%m-%d %H:%M:%S%z");
$this->conn = $c;
}
/* ---------------------------------------------------------------------------
*/
function close() {
$this->timezone("");
if ( $this->conn != -1 ) {
ibase_close($this->conn);
unset($this->conn);
$this->conn = -1;
}
}
/* ---------------------------------------------------------------------------
*/
function numrows(&$r) {
return count($r);
}
/* ---------------------------------------------------------------------------
*/
function numfields(&$r) {
return count($r[0]);
}
/* ---------------------------------------------------------------------------
*/
function fieldname(&$r,$nr) {
# return pg_fieldname($r,$nr);
}
/* ---------------------------------------------------------------------------
*/
function fieldtype(&$r,$nr) {
# return pg_fieldtype($r,$nr);
}
/* ---------------------------------------------------------------------------
*/
function freeresult(&$r) {
unset($r);
}
/* ---------------------------------------------------------------------------
*/
function notime() {
if ( $this->version == 1 ) {
# Postgres 7.0
return ("'epoch'");
} else {
return ("null");
}
}
/* ---------------------------------------------------------------------------
*/
function now() {
if ( $this->version == 1 ) {
# Postgres 7.0
return ("'now'");
} else {
return ("current_timestamp");
}
}
/* ---------------------------------------------------------------------------
*/
function exec($query,$showerror = 1) {
if ( $this->conn == -1 ) {
$msg = "No Connection";
return;
}
$query = eregi_replace(" =null"," is null",$query);
$result = array();
$r = @ibase_query($this->conn,$query);
$this->lastquery = $query;
#echo "<BR>Q:".$query ."<BR>\n";
if ( $r == false) {
if ($showerror == 1) {
Fatal_Error("Exec ". $this->conn ."|". $this->error(),$query);
} else {
# Fatal_Error("Exec ". $this->conn ."|". $this->error(),$query);
return;
}
}
if ( gettype($r) != "resource" ) {
return $result;
}
# echo "<BR>P:" . $r ."<BR>\n";
$x = 0;
while ($row = ibase_fetch_row ($r)) {
# echo var_dump($row);
$nf = ibase_num_fields($r);
for ($c = 0 ; $c < $nf; $c++) {
$fn = ibase_field_info($r,$c);
if ( isset( $row[$c] ) ) {
$result[$x][$fn['alias']] = $row[$c];
# echo $x ." ". $c ." N:". $fn['name'] ." A:". $fn['alias'] ." V:". $row[$c] ."<BR>\n";
}
}
$x++;
}
ibase_free_result($r);
return $result;
}
/* ---------------------------------------------------------------------------
*/
function result(&$r,$pos,$fld) {
$fld = strtoupper($fld);
#echo "<BR>POS:".$pos ." | FLD:". $fld ." | * ". var_dump($r[$pos][$fld]) ."<BR>\n";
if ( isset($r[$pos][$fld]) ) {
return $r[$pos][$fld];
} else {
return;
}
}
/* ---------------------------------------------------------------------------
*/
function nextID() {
$query = "select id from ids";
$result = $this->exec($query);
if ( ($result == "") || (1 != $this->numrows($result)) ) {
Fatal_Error("got no id",$query);
}
# echo var_dump($result);
$id = $this->result($result,0,"id");
$this->freeresult ($result);
$query = "update ids set id = 0";
$this->exec($query);
return $id;
}
/* ---------------------------------------------------------------------------
*/
function setSeqID($id) {
$query = "set generator id to ". $id;
$result = $this->exec($query);
return $id;
}
/* ---------------------------------------------------------------------------
*/
function getSeqID() {
}
/* ---------------------------------------------------------------------------
*/
function string($t) {
$t = str_replace("'","''",$t);
return "'". $t ."'";
# return "'". AddSlashes($t) ."'";
}
/* ---------------------------------------------------------------------------
* give Database formatted datetimestring for d
*/
function datetime(&$d) {
if ( $d->notime == 1) {
return "null";
}
# ibase_timefmt("%Y-%m-%d %H:%M:%S%z");
$x = sprintf ("'%04d-%02d-%02d %02d:%02d:%02d'",$d->year,$d->month,$d->day,$d->hour,$d->min,$d->sec);
return $x;
}
/* ---------------------------------------------------------------------------
* give Database formatted datestring for d
*/
function date(&$d) {
if ( $d->notime == 1) {
return "null";
}
$x = sprintf ("'%04d-%02d-%02d'",$d->year,$d->month,$d->day);
return $x;
}
/* ---------------------------------------------------------------------------
*/
function like($fld1,$name,$fld2 = "",$fld3 = "") {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld .= "|| ' ' ||". $fld2;
}
if ( $fld3 != "" ) {
$fld .= "|| ' ' ||". $fld3;
}
$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","?",$name);
return (" UPPER(". $fld .") like '%". strtoupper($name) ."%' ");
}
/* ---------------------------------------------------------------------------
*/
function password($pw) {
if ( $this->db->crypt != 1 ) {
return "'". $pw ."'";
}
return "'". crypt($pw,"271166") ."'";
}
/* ---------------------------------------------------------------------------
*/
function begin($t) {
# $r = ibase_trans();
return $t;
}
/* ---------------------------------------------------------------------------
*/
function commit($t) {
# $r = ibase_commit();
return $t;
}
/* ---------------------------------------------------------------------------
*/
function abort($t) {
# $r = ibase_rollback();
return $t;
}
/* ---------------------------------------------------------------------------
*/
function lock($t) {
return "";
}
/* ---------------------------------------------------------------------------
*/
function timezone($tz) {
global $tutos;
if ( !empty($tz)) {
putenv ("TZ=".$tz);
strftime("%H:%M %Z");
# $this->exec("SET TIME ZONE '". $tz ."'");
} else {
putenv ("TZ=". $tutos[defaultTZ]);
strftime("%H:%M %Z");
# $this->exec("SET TIME ZONE '". $tutos[defaultTZ] ."'");
}
}
/* ---------------------------------------------------------------------------
*/
function getFullname() {
return "Interbase: ". $this->db->host .":". $this->db->name ;
}
/* ---------------------------------------------------------------------------
* set persistent mode
* 0 = no
* 1 = yes
*/
function setPersistent($mode) {
if ( $mode == 1 ) {
$this->openfunc = 'ibase_pconnect';
} else {
$this->openfunc = 'ibase_connect';
}
}
/* ---------------------------------------------------------------------------
*/
function error() {
return "DBerror: ". $this->getFullname() ." E:". ibase_errmsg();
}
/* ---------------------------------------------------------------------------
* handle reserved words in this database type
*/
function colname($col) {
if ( isset($this->col[$col]) ) {
return $this->col[$col];
}
return $col;
}
/* ---------------------------------------------------------------------------
*/
function gettype() {
return "Interbase";
}
}
$includes['db_interbase.pinc'] = 1;
?>
Index: admin_sync.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_sync.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_sync.php 2001/09/10 19:53:13 1.2
--- admin_sync.php 2001/09/16 19:22:22 1.3
***************
*** 18,21 ****
--- 18,22 ----
$table[] = "adrteam";
$table[] = "calendar";
+ $table[] = "participants";
$table[] = "products";
$table[] = "projectclass1";
***************
*** 72,77 ****
continue;
}
! $flds .= $pre. $fn;
if ( ($ft == "varchar") || ($ft == "string") || ($ft == "blob") || ($ft == "text") ) {
--- 73,82 ----
continue;
}
+ if ( ($f == "files") && ( ($fn == "size") ) ) {
+ $b++;
+ continue;
+ }
! $flds .= $pre. $dbconn2->colname($fn);
if ( ($ft == "varchar") || ($ft == "string") || ($ft == "blob") || ($ft == "text") ) {
***************
*** 108,116 ****
}
# Create a tutos_dbs entry of the source database in the target
# there we store the info about this action
# Delete all other databases
! $q = "DELETE from ". $f;
$dbconn2->Exec($q);
echo "<B>TARGET:</B> ". $q ."<BR>\n";
--- 113,125 ----
}
+ # Get the Sync and save it
+ $seq1 = $dbconn1->NextID();
+ $dbconn2->setSeqID($seq1);
+
# Create a tutos_dbs entry of the source database in the target
# there we store the info about this action
# Delete all other databases
! $q = "DELETE from tutos_dbs";
$dbconn2->Exec($q);
echo "<B>TARGET:</B> ". $q ."<BR>\n";
***************
*** 119,122 ****
--- 128,133 ----
$dbconn1->db->dbconn = $dbconn2;
# The sync happens now
+ $dbconn1->db->id = -1;
+ $dbconn1->db->lastid = $seq1;
$dbconn1->db->lastsync = new DateTime();
$dbconn1->db->save();
***************
*** 138,148 ****
echo "<SPAN CLASS=warn>". $lang['AdminDBSyncM'][$what] ."</SPAN><P><P>\n";
echo "connecting to databases ...<BR>\n";
flush();
$dbconn1 = $db1->getConnection();
$dbconn2 = $db2->getConnection();
if ( $what == 1 ) {
! # copyall($dbconn1,$dbconn2);
} else {
echo "<SPAN CLASS=warn>Action :". $lang['AdminDBSyncM'][$what] ." not yet implemented </SPAN>\n";
--- 149,161 ----
echo "<SPAN CLASS=warn>". $lang['AdminDBSyncM'][$what] ."</SPAN><P><P>\n";
echo "connecting to databases ...<BR>\n";
+
flush();
$dbconn1 = $db1->getConnection();
+
$dbconn2 = $db2->getConnection();
if ( $what == 1 ) {
! copy_all($dbconn1,$dbconn2);
} else {
echo "<SPAN CLASS=warn>Action :". $lang['AdminDBSyncM'][$what] ." not yet implemented </SPAN>\n";
***************
*** 219,223 ****
$q2 = "SELECT * from history where m_field = ". $dbconn2->String("created");
if ( $db1->lastsync->notime != 1) {
! $q2 .= " AND m_time > ". $dbconn2->DateTime($db2->lastsync);
}
$r2 = $dbconn2->Exec($q2);
--- 232,236 ----
$q2 = "SELECT * from history where m_field = ". $dbconn2->String("created");
if ( $db1->lastsync->notime != 1) {
! $q2 .= " AND m_time > ". $dbconn2->DateTime($db1->lastsync);
}
$r2 = $dbconn2->Exec($q2);
***************
*** 237,241 ****
$q4 = "SELECT * from history where m_field = ". $dbconn2->String("Delete");
if ( $db1->lastsync->notime != 1) {
! $q4 .= " AND m_time > ". $dbconn2->DateTime($db2->lastsync);
}
$r4 = $dbconn2->Exec($q4);
--- 250,254 ----
$q4 = "SELECT * from history where m_field = ". $dbconn2->String("Delete");
if ( $db1->lastsync->notime != 1) {
! $q4 .= " AND m_time > ". $dbconn2->DateTime($db1->lastsync);
}
$r4 = $dbconn2->Exec($q4);
***************
*** 302,306 ****
*
*/
! Function info(&$dbconn) {
global $lang,$tutos,$current_user;
--- 315,319 ----
*
*/
! Function info(&$dbconn,$from,$to,$what) {
global $lang,$tutos,$current_user;
***************
*** 322,334 ****
echo "</TR>\n";
echo "<TR>\n";
echo " <TD>\n";
echo " <SELECT SIZE=5 name=\"from\">\n";
-
- $dblist = readDB($dbconn);
-
@reset($dblist);
while ( list ($i,$f) = @each ($dblist) ) {
! echo "<OPTION VALUE=". $i .">". $i .": ". $f->getFullName() ."</OPTION>\n";
}
echo " </SELECT>\n";
--- 335,346 ----
echo "</TR>\n";
+ $dblist = readDB($dbconn);
+
echo "<TR>\n";
echo " <TD>\n";
echo " <SELECT SIZE=5 name=\"from\">\n";
@reset($dblist);
while ( list ($i,$f) = @each ($dblist) ) {
! echo "<OPTION VALUE=\"". $i ."\" ". ($from == $i ? "selected":"") .">". $i .": ". $f->getFullName() ."</OPTION>\n";
}
echo " </SELECT>\n";
***************
*** 337,350 ****
echo " <TD>\n";
echo " <SELECT SIZE=5 name=\"what\">\n";
! echo " <OPTION VALUE=1>". $lang['AdminDBSyncM'][1]."</OPTION>\n";
! # echo " <OPTION VALUE=1>". $lang['AdminDBSyncM'][2]."</OPTION>\n";
! # echo " <OPTION VALUE=1>". $lang['AdminDBSyncM'][3]."</OPTION>\n";
echo " </SELECT>\n";
echo " </TD>\n";
-
- echo " <TD>\n";
if ( ($current_user->admin != 1) || (count($tutos[dbname]) == 1) ) {
! echo $current_user->dbconn->db->getLink();
} else {
# show local available DBs
--- 349,363 ----
echo " <TD>\n";
echo " <SELECT SIZE=5 name=\"what\">\n";
! @reset($lang['AdminDBSyncM']);
! while ( list ($i,$f) = @each ($lang['AdminDBSyncM']) ) {
! echo " <OPTION VALUE=\"". $i ."\" ". ($what == $i ? "selected":"") .">". $lang['AdminDBSyncM'][$i]."</OPTION>\n";
! }
echo " </SELECT>\n";
echo " </TD>\n";
+ echo " <TD VALIGN=top>\n";
if ( ($current_user->admin != 1) || (count($tutos[dbname]) == 1) ) {
! echo "<BR>\n". $current_user->dbconn->db->getLink();
! echo " <input type=\"hidden\" name=\"to\" value=\"". $current_user->dbconn->db->id ."\"></TD>\n";
} else {
# show local available DBs
***************
*** 353,357 ****
while ( list ($i,$f) = @each ($dblist) ) {
if ( $i < 1000 ) {
! echo "<OPTION VALUE=". $i .">". $i .": ". $f->getFullName() ."</OPTION>\n";
}
}
--- 366,370 ----
while ( list ($i,$f) = @each ($dblist) ) {
if ( $i < 1000 ) {
! echo "<OPTION VALUE=\"". $i ."\" ". ($to == $i ? "selected":"") .">". $i .": ". $f->getFullName() ."</OPTION>\n";
}
}
***************
*** 378,381 ****
--- 391,395 ----
echo "<TABLE>";
echo "<TR><TD>";
+ echo menulink("database_overview.php", "Overview","DB Overview") ."<BR>\n";
echo menulink("database_new.php", $lang['NewEntry'],$lang['DBCreate']) ."<BR>\n";
echo "</TD></TR>";
Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** database.pinc 2001/09/12 21:08:50 1.3
--- database.pinc 2001/09/16 19:22:22 1.4
***************
*** 63,66 ****
--- 63,75 ----
$this->lastsync = new Datetime(0);
$this->lastid = -1;
+
+ # Possible Types
+ $this->tlist[1] = "Postgres";
+ $this->tlist[2] = "MySQL";
+ $this->tlist[3] = "Oracle";
+ $this->tlist[4] = "Postgres 7.1";
+ $this->tlist[5] = "MS SQL";
+ $this->tlist[6] = "Sybase";
+ $this->tlist[7] = "Interbase";
}
/* ---------------------------------------------------------------------------
***************
*** 132,136 ****
/* ---------------------------------------------------------------------------
*/
! function save($id) {
global $tutos,$current_user;
--- 141,145 ----
/* ---------------------------------------------------------------------------
*/
! function save() {
global $tutos,$current_user;
***************
*** 209,217 ****
}
- $this->dbconn->Begin("WORK");
$result = $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
return $msg;
--- 218,224 ----
***************
*** 245,254 ****
include("db_msql.pinc");
$dbconn = new db_msql($this);
- $dbconn->home = $this->home;
} else if ( $this->type == 6 ) {
# Sybase
include("db_sybase.pinc");
$dbconn = new db_sybase($this);
! $dbconn->home = $this->home;
} else {
Fatal_Error("Unknown Database #".$this->id, $this->type);
--- 252,263 ----
include("db_msql.pinc");
$dbconn = new db_msql($this);
} else if ( $this->type == 6 ) {
# Sybase
include("db_sybase.pinc");
$dbconn = new db_sybase($this);
! } else if ( $this->type == 7 ) {
! # Interbase
! include("db_interbase.pinc");
! $dbconn = new db_interbase($this);
} else {
Fatal_Error("Unknown Database #".$this->id, $this->type);
Index: database_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_ins.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** database_ins.php 2001/09/10 19:41:24 1.2
--- database_ins.php 2001/09/16 19:22:22 1.3
***************
*** 63,67 ****
--- 63,70 ----
$b->type = $type;
+ $dbconn->Begin("WORK");
$msg = $b->save();
+ $dbconn->Commit("WORK");
+
$gotourl = $b->getURL();
}
Index: database_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_new.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** database_new.php 2001/09/10 19:41:24 1.2
--- database_new.php 2001/09/16 19:22:22 1.3
***************
*** 32,41 ****
echo "<TR>\n";
showfieldc($lang['AdminDBName'],1);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". $obj->name ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdminDBAlias'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=60 MAXLENGTH=60 name=\"alias\" value=\"". $obj->alias ."\"></TD>\n";
echo "</TR>\n";
--- 32,41 ----
echo "<TR>\n";
showfieldc($lang['AdminDBName'],1);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". htmlentities($obj->name) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdminDBAlias'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=60 MAXLENGTH=60 name=\"alias\" value=\"". htmlentities($obj->alias) ."\"></TD>\n";
echo "</TR>\n";
***************
*** 49,59 ****
echo "<TR>\n";
showfieldc($lang['AdminDBType'],1);
! echo "<TD COLSPAN=1><SELECT SIZE=1 name=\"type\">\n";
! echo "<OPTION VALUE=1>Postgres</OPTION>\n";
! echo "<OPTION VALUE=4>Postgres 7.1</OPTION>\n";
! echo "<OPTION VALUE=2>MySQL</OPTION>\n";
! echo "<OPTION VALUE=3>Oracle</OPTION>\n";
! echo "<OPTION VALUE=5>MS SQL</OPTION>\n";
! echo "<OPTION VALUE=6>Sybase</OPTION>\n";
echo "</SELECT></TD>\n";
echo "</TR>\n";
--- 49,57 ----
echo "<TR>\n";
showfieldc($lang['AdminDBType'],1);
! echo "<TD COLSPAN=3><SELECT SIZE=1 name=\"type\">\n";
! @reset($obj->tlist);
! while ( list ($i,$f) = @each ($obj->tlist) ) {
! echo "<OPTION VALUE=". $i .">". htmlentities($f) ."</OPTION>\n";
! }
echo "</SELECT></TD>\n";
echo "</TR>\n";
***************
*** 68,77 ****
echo "<TR>\n";
showfieldc($lang['AdminDBRep'],0);
! echo "<TD COLSPAN=3><INPUT SIZE=60 MAXLENGTH=60 name=\"rep\" value=\"". $obj->repository ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdminDBHome'],0);
! echo "<TD COLSPAN=3><INPUT SIZE=60 MAXLENGTH=60 name=\"rep\" value=\"". $obj->home ."\"></TD>\n";
echo "</TR>\n";
--- 66,75 ----
echo "<TR>\n";
showfieldc($lang['AdminDBRep'],0);
! echo "<TD COLSPAN=3><INPUT SIZE=60 MAXLENGTH=60 name=\"rep\" value=\"". htmlentities($obj->repository) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdminDBHome'],0);
! echo "<TD COLSPAN=3><INPUT SIZE=60 MAXLENGTH=60 name=\"rep\" value=\"". htmlentities($obj->home) ."\"></TD>\n";
echo "</TR>\n";
***************
*** 98,101 ****
--- 96,100 ----
echo "<TABLE>\n";
echo "<TR><TD>\n";
+ echo menulink("database_overview.php", "Overview","DB Overview") ."<BR>\n";
if ( $obj->del_ok() && ($obj->id > 0) ) {
echo confirmlink("database_del.php?id=".$obj->id, $lang['Delete'],sprintf($lang['Delete'],$obj->getFullName())) ."<BR>\n";
Index: database_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_show.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** database_show.php 2001/09/10 19:41:24 1.2
--- database_show.php 2001/09/16 19:22:22 1.3
***************
*** 29,33 ****
echo " <TD COLSPAN=1>". $obj->name ."</TD>\n";
showfield($lang['AdminDBType']);
! echo " <TD COLSPAN=1>". $obj->type ."</TD>\n";
echo "</TR><TR>\n";
--- 29,33 ----
echo " <TD COLSPAN=1>". $obj->name ."</TD>\n";
showfield($lang['AdminDBType']);
! echo " <TD COLSPAN=1>". $obj->tlist[$obj->type] ."</TD>\n";
echo "</TR><TR>\n";
***************
*** 55,59 ****
echo " <TD COLSPAN=1>". $obj->lastid ."</TD>\n";
! if ( $orbj->type == 3 ) {
echo "</TR><TR>\n";
showfield($lang['AdminDBHome']);
--- 55,59 ----
echo " <TD COLSPAN=1>". $obj->lastid ."</TD>\n";
! if ( $obj->type == 3 ) {
echo "</TR><TR>\n";
showfield($lang['AdminDBHome']);
***************
*** 63,67 ****
echo "</TR><TR>\n";
showfield($lang['AdminDBRep']);
! echo " <TD COLSPAN=3>". $obj->repository ."</TD>\n";
}
--- 63,67 ----
echo "</TR><TR>\n";
showfield($lang['AdminDBRep']);
! echo " <TD COLSPAN=3>". $obj->repository ." </TD>\n";
}
***************
*** 92,95 ****
--- 92,96 ----
echo "<TABLE>";
echo "<TR><TD>";
+ echo menulink("database_overview.php", "Overview","DB Overview") ."<BR>\n";
echo menulink("database_new.php",$lang['NewEntry'],$lang['DBCreate']) ."<BR>";
if ( ($obj->id > 1000) && $obj->mod_ok() ) {
Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** db.p3 2001/09/10 16:42:19 1.46
--- db.p3 2001/09/16 19:22:22 1.47
***************
*** 106,109 ****
--- 106,110 ----
define (useresource,-18);
define (usevcard,-19);
+ define (useurl,-20);
# Image IDs
Index: db_msql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_msql.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** db_msql.pinc 2001/09/10 16:30:47 1.1
--- db_msql.pinc 2001/09/16 19:22:22 1.2
***************
*** 238,241 ****
--- 238,250 ----
}
/* ---------------------------------------------------------------------------
+ * handle reserved words in this database type
+ */
+ function colname($col) {
+ if ( isset($this->col[$col]) ) {
+ return $this->col[$col];
+ }
+ return $col;
+ }
+ /* ---------------------------------------------------------------------------
*/
function gettype() {
Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_mysql.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** db_mysql.pinc 2001/09/10 16:30:47 1.1
--- db_mysql.pinc 2001/09/16 19:22:22 1.2
***************
*** 246,249 ****
--- 246,258 ----
}
/* ---------------------------------------------------------------------------
+ * handle reserved words in this database type
+ */
+ function colname($col) {
+ if ( isset($this->col[$col]) ) {
+ return $this->col[$col];
+ }
+ return $col;
+ }
+ /* ---------------------------------------------------------------------------
*/
function gettype() {
Index: db_ora.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_ora.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** db_ora.pinc 2001/09/10 16:30:47 1.1
--- db_ora.pinc 2001/09/16 19:22:22 1.2
***************
*** 322,325 ****
--- 322,334 ----
}
/* ---------------------------------------------------------------------------
+ * handle reserved words in this database type
+ */
+ function colname($col) {
+ if ( isset($this->col[$col]) ) {
+ return $this->col[$col];
+ }
+ return $col;
+ }
+ /* ---------------------------------------------------------------------------
*/
function gettype() {
Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_pg.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** db_pg.pinc 2001/09/10 16:30:47 1.1
--- db_pg.pinc 2001/09/16 19:22:22 1.2
***************
*** 32,41 ****
$of = $this->openfunc;
$c = $of("dbname=". $this->db->name ." host=".$this->db->host." port=".$this->db->port ." user=".$this->db->user." password=".$this->db->pass);
if ($c == false) {
! Fatal_Error("Opening the POSTGRES database ".$this->getFullName() ,$phperrmsg);
}
! putenv("PGDATESTYLE='ISO,US'");
! putenv("DATESTYLE='ISO,US'");
#pg_trace("/tmp/pg.out","w");
--- 32,42 ----
$of = $this->openfunc;
$c = $of("dbname=". $this->db->name ." host=".$this->db->host." port=".$this->db->port ." user=".$this->db->user." password=".$this->db->pass);
+
if ($c == false) {
! Fatal_Error("Opening the database ".$this->getFullName() ,$phperrmsg );
}
! # putenv("PGDATESTYLE='ISO,US'");
! # putenv("DATESTYLE='ISO,US'");
#pg_trace("/tmp/pg.out","w");
***************
*** 105,109 ****
return;
}
!
$result = @pg_Exec($this->conn,$query);
$this->lastquery = $query;
--- 106,110 ----
return;
}
! # echo "<BR>". $this->db->id ." ".$query;
$result = @pg_Exec($this->conn,$query);
$this->lastquery = $query;
***************
*** 244,248 ****
*/
function getFullname() {
! return "POSTGRES:". $this->db->name ."@". $this->db->host .":". $this->db->port;
}
/* ---------------------------------------------------------------------------
--- 245,249 ----
*/
function getFullname() {
! return "POSTGRES: ". $this->db->name ."@". $this->db->host .":". $this->db->port;
}
/* ---------------------------------------------------------------------------
***************
*** 266,269 ****
--- 267,279 ----
return "DBerror: ". $this->getFullname() ." noconn ";
}
+ }
+ /* ---------------------------------------------------------------------------
+ * handle reserved words in this database type
+ */
+ function colname($col) {
+ if ( isset($this->col[$col]) ) {
+ return $this->col[$col];
+ }
+ return $col;
}
/* ---------------------------------------------------------------------------
Index: db_sybase.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_sybase.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** db_sybase.pinc 2001/09/10 16:30:47 1.1
--- db_sybase.pinc 2001/09/16 19:22:22 1.2
***************
*** 238,241 ****
--- 238,250 ----
}
/* ---------------------------------------------------------------------------
+ * handle reserved words in this database type
+ */
+ function colname($col) {
+ if ( isset($this->col[$col]) ) {
+ return $this->col[$col];
+ }
+ return $col;
+ }
+ /* ---------------------------------------------------------------------------
*/
function gettype() {
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:22:24
|
Update of /cvsroot/tutos/tutos In directory usw-pr-cvs1:/tmp/cvs-serv19813 Modified Files: ChangeLog Makefile.in scheme.sh Log Message: added interbase support Index: ChangeLog =================================================================== RCS file: /cvsroot/tutos/tutos/ChangeLog,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** ChangeLog 2001/09/13 19:07:59 1.62 --- ChangeLog 2001/09/16 19:22:21 1.63 *************** *** 1,7 **** $Header$ September 13 2001 ! * added mexican spanish translation < hcartagena at si-mx.com > September 12 2001 ! * added mexican holidays < hcartagena at si-mx.com > holiday_mx.pinc September 11 2001 * moved holidays to own files --- 1,11 ---- $Header$ + September 16 2001 + * new urls that are added to team descriptions will appear in the + main navigation of all team members + * new support of Interbase 6 Databases September 13 2001 ! * new mexican spanish translation < hcartagena at si-mx.com > September 12 2001 ! * new mexican holidays < hcartagena at si-mx.com > holiday_mx.pinc September 11 2001 * moved holidays to own files *************** *** 12,30 **** create table tutos_dbs ( ! id int4 primary key, -- a ID ! name varchar(30) not null, -- database name ! dbalias varchar(60), -- short text ! dbhost varchar(30), -- hostname ! dbuser varchar(30), -- username ! dbpass varchar(30), -- password ! dbhome varchar(60), -- path of ora_inst ! dbtype int4, ! -- type: pg = 1 or 4, mysql = 2, oracle = 3, msql = 5, sybase = 6 ! repository varchar(60), -- path for files ! last_date $TS_TYPE, -- date of last sync ! last_id int4, -- sequencer id at last sync ! creator int4, -- who is responsible ! -- see adresses(id) ! creation $TS_TYPE not null -- when was it created ); --- 16,33 ---- create table tutos_dbs ( ! id int4 primary key, -- a ID ! name varchar(30) not null, -- database name ! dbalias varchar(60), -- short text ! dbhost varchar(30), -- hostname ! dbuser varchar(30), -- username ! dbpass varchar(30), -- password ! dbhome varchar(60), -- path of ora_inst ! dbport int4, -- network port ! dbtype int4, -- type: pg = 1 or 4, mysql = 2, oracle = 3, msql = 5, sybase = 6 ! repository varchar(60), -- path for files ! last_date $TS_TYPE, -- date of last sync ! last_id int4, -- sequencer id at last sync ! creator int4, -- who is responsible, see adresses(id) ! creation $TS_TYPE not null -- when was it created ); Index: Makefile.in =================================================================== RCS file: /cvsroot/tutos/tutos/Makefile.in,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** Makefile.in 2001/09/13 19:07:59 1.66 --- Makefile.in 2001/09/16 19:22:21 1.67 *************** *** 11,14 **** --- 11,17 ---- # # $Log$ + # Revision 1.67 2001/09/16 19:22:21 gokohnert + # added interbase support + # # Revision 1.66 2001/09/13 19:07:59 gokohnert # added mexican spanish *************** *** 266,269 **** --- 269,273 ---- php/db_ora.pinc \ php/db_pg.pinc \ + php/db_interbase.pinc \ php/db_sybase.pinc \ php/department.pinc \ Index: scheme.sh =================================================================== RCS file: /cvsroot/tutos/tutos/scheme.sh,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** scheme.sh 2001/09/10 19:41:24 1.29 --- scheme.sh 2001/09/16 19:22:21 1.30 *************** *** 454,458 **** create table tutos_dbs ( id $ID_TYPE primary key, -- a ID ! dbname varchar(30) not null, -- database name dbalias varchar(60), -- short text dbhost varchar(30), -- hostname --- 454,458 ---- create table tutos_dbs ( id $ID_TYPE primary key, -- a ID ! name varchar(30) not null, -- database name dbalias varchar(60), -- short text dbhost varchar(30), -- hostname *************** *** 460,463 **** --- 460,464 ---- dbpass varchar(30), -- password dbhome varchar(60), -- path of ora_inst + dbport $ID_TYPE, -- network port dbtype $ID_TYPE, -- type pg = 1 or 4 mysql = 2 oracle = 3 msql = 5 sybase = 6 repository varchar(60), -- path for files |
|
From: Gero K. <gok...@us...> - 2001-09-16 19:20:05
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv19366/php
Modified Files:
address.pinc address_ins.php address_overview.php
Log Message:
entities in links
Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** address.pinc 2001/09/11 19:32:17 1.43
--- address.pinc 2001/09/16 19:20:00 1.44
***************
*** 300,304 ****
}
if ( $text == "" ) {
! $text = htmlspecialchars($this->getFullname());
}
--- 300,304 ----
}
if ( $text == "" ) {
! $text = htmlentities($this->getFullname());
}
***************
*** 308,312 ****
$plus = $this->getPopInfo();
! return makelink($this->getURL() ,$text,sprintf($lang['SeeAddress'],$this->getFullname()),$plus);
}
/* ---------------------------------------------------------------------------
--- 308,312 ----
$plus = $this->getPopInfo();
! return makelink($this->getURL(),$text,sprintf($lang['SeeAddress'],$this->getFullname()),$plus);
}
/* ---------------------------------------------------------------------------
***************
*** 550,553 ****
--- 550,560 ----
}
readTasks($this);
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ * Return Info about connected urls of this address
+ */
+ function readUrls() {
+ readUrls($this);
return;
}
Index: address_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_ins.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** address_ins.php 2001/09/10 16:35:44 1.14
--- address_ins.php 2001/09/16 19:20:00 1.15
***************
*** 71,75 ****
|| ($m_name != $a->m_name)
|| ($l_name != $a->l_name) ) {
! $q = "SELECT * FROM addresses WHERE f_name = '". $f_name ."' AND m_name = '". $m_name ."' AND l_name = '". $l_name ."' AND birthday = ". $dbconn->Date($birthday);
$r = $dbconn->Exec($q);
$n = $dbconn->NumRows($r);
--- 71,78 ----
|| ($m_name != $a->m_name)
|| ($l_name != $a->l_name) ) {
! $q = "SELECT * FROM addresses WHERE f_name = '". $f_name ."' AND m_name = '". $m_name ."' AND l_name = '". $l_name ."'";
! if ( $birthday->notime != 1 ) {
! $q .= " AND birthday = ". $dbconn->Date($birthday);
! }
$r = $dbconn->Exec($q);
$n = $dbconn->NumRows($r);
Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** address_overview.php 2001/09/10 16:35:44 1.7
--- address_overview.php 2001/09/16 19:20:00 1.8
***************
*** 122,125 ****
--- 122,126 ----
}
if ( isset($name) ) {
+ $name = StripSlashes($name);
$atool['search']['name'] = $name;
$qarg .= "&name=". UrlEncode($name);
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:17:03
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv18889/php
Modified Files:
product_del.php product_new.php product_overview.php
product_show.php
Log Message:
make url handling optional
Index: product_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_del.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** product_del.php 2001/09/11 18:51:44 1.8
--- product_del.php 2001/09/16 19:16:58 1.9
***************
*** 7,11 ****
include("permission.p3");
- include("url.pinc");
include("note.pinc");
include("bug.pinc");
--- 7,10 ----
***************
*** 14,18 ****
include("installation.pinc");
include("timetrack.pinc");
- include("url.pinc");
include("resource.pinc");
--- 13,16 ----
Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** product_new.php 2001/09/13 14:49:48 1.26
--- product_new.php 2001/09/16 19:16:58 1.27
***************
*** 8,12 ****
include("bug.pinc");
include("product.pinc");
- include("url.pinc");
include("mailbox.pinc");
include("resource.pinc");
--- 8,11 ----
***************
*** 210,215 ****
! if ( $p->id != -1 ) {
! url_form($p,"product_new.php?id=". $p->id);
}
echo $lang['FldsRequired'] ."\n";
--- 209,216 ----
! if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
! if ( $p->id != -1 ) {
! url_form($p,"product_new.php?id=". $p->id);
! }
}
echo $lang['FldsRequired'] ."\n";
Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** product_overview.php 2001/09/10 16:39:04 1.27
--- product_overview.php 2001/09/16 19:16:58 1.28
***************
*** 729,732 ****
--- 729,733 ----
if ( isset($name) && ($name != "*") && ($name != "") ) {
+ $name = StripSlashes($name);
$q .= $pre ."(". $dbconn->Like("name",$name);
$q .= " OR ". $dbconn->Like("description",$name);
Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** product_show.php 2001/09/16 14:29:24 1.21
--- product_show.php 2001/09/16 19:16:58 1.22
***************
*** 7,11 ****
include("product.pinc");
include("note.pinc");
- include("url.pinc");
include("task.pinc");
include("mailbox.pinc");
--- 7,10 ----
***************
*** 192,208 ****
}
! $p->readUrls();
! if ( count($p->urllist) >0 ) {
! echo "<TR>\n";
! showfield($lang['ProdLinks']);
! echo " <TD VALIGN=top COLSPAN=3>\n";
! @reset($p->urllist);
! while ( list ($i,$f) = @each ($p->urllist) ) {
! echo $f->getLink() . "<BR>\n";
}
- echo "</TD>\n";
- echo "</TR>\n";
}
-
if ( ($current_user->p[usecalendar] == 1) && ($tutos[usecalendar] == 1) ) {
$p->readApps();
--- 191,208 ----
}
! if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
! $p->readUrls();
! if ( count($p->urllist) >0 ) {
! echo "<TR>\n";
! showfield($lang['ProdLinks']);
! echo " <TD VALIGN=top COLSPAN=3>\n";
! @reset($p->urllist);
! while ( list ($i,$f) = @each ($p->urllist) ) {
! echo $f->getLink() . "<BR>\n";
! }
! echo "</TD>\n";
! echo "</TR>\n";
}
}
if ( ($current_user->p[usecalendar] == 1) && ($tutos[usecalendar] == 1) ) {
$p->readApps();
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:13:22
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv18352/php
Modified Files:
team_ins.php team_new.php team_show.php
Log Message:
added url handling
Index: team_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_ins.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** team_ins.php 2001/09/10 16:35:44 1.8
--- team_ins.php 2001/09/16 19:13:20 1.9
***************
*** 62,66 ****
--- 62,70 ----
$t->owner = new tutos_address($dbconn);
$t->owner->read($owner);
+
+ $dbconn->Begin("WORK");
$msg .= $t->save($add,$del);
+ $dbconn->Commit("WORK");
+
$gotourl = $t->getUrl();
}
Index: team_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_new.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** team_new.php 2001/09/13 14:49:48 1.12
--- team_new.php 2001/09/16 19:13:20 1.13
***************
*** 13,22 ****
*/
Function info(&$t) {
! global $lang,$current_user;
echo "<FORM method=\"POST\" action=\"team_ins.php\">\n";
hiddenFormElements();
echo "<INPUT type=hidden name=\"id\" value=\"". $t->id ."\">\n";
! echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
echo "<TR>\n";
echo " <TH COLSPAN=5>". sprintf($lang['Showing'],$lang[$t->getType()])."</TH>\n";
--- 13,22 ----
*/
Function info(&$t) {
! global $lang,$tutos,$current_user;
echo "<FORM method=\"POST\" action=\"team_ins.php\">\n";
hiddenFormElements();
echo "<INPUT type=hidden name=\"id\" value=\"". $t->id ."\">\n";
! echo "<TABLE CLASS=single BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
echo "<TR>\n";
echo " <TH COLSPAN=5>". sprintf($lang['Showing'],$lang[$t->getType()])."</TH>\n";
***************
*** 31,35 ****
}
echo "<TR>\n";
! showfieldc($lang['TeamName']);
echo " <TD COLSPAN=4><INPUT name=name value=\"". htmlentities($t->name) ."\"></TD>\n";
echo "</TR>\n";
--- 31,35 ----
}
echo "<TR>\n";
! showfieldc($lang['TeamName'],1);
echo " <TD COLSPAN=4><INPUT name=name value=\"". htmlentities($t->name) ."\"></TD>\n";
echo "</TR>\n";
***************
*** 136,139 ****
--- 136,147 ----
echo "</TABLE>\n";
echo "</FORM>\n";
+
+ if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
+ if ( $t->id != -1 ) {
+ url_form($t,"team_new.php?id=". $t->id);
+ }
+ }
+
+ echo $lang['FldsRequired'] ."\n";
}
/* ---------------------------------------------------------------------------
Index: team_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_show.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** team_show.php 2001/09/11 21:08:26 1.12
--- team_show.php 2001/09/16 19:13:20 1.13
***************
*** 30,33 ****
--- 30,49 ----
echo " <TD>". $t->owner->getMailLink() ."</TD>\n";
echo "</TR>\n";
+
+ if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
+ $t->readUrls();
+ if ( count($t->urllist) >0 ) {
+ echo "<TR>\n";
+ showfield($lang['ProdLinks']);
+ echo " <TD VALIGN=top COLSPAN=3>\n";
+ @reset($t->urllist);
+ while ( list ($i,$f) = @each ($t->urllist) ) {
+ echo $f->getLink() . "<BR>\n";
+ }
+ echo "</TD>\n";
+ echo "</TR>\n";
+ }
+ }
+
echo "<TR>\n";
echo " <TH COLSPAN=2>". $lang['TeamMember'] ."</TH>\n";
***************
*** 50,53 ****
--- 66,72 ----
}
+ echo "<TR>\n";
+ echo " <TD COLSPAN=2>". makelink("history_show.php?id=". $t->id,$lang['HistoryLink'],sprintf($lang['HistoryLinkI'],$t->getFullname())) ."</TD>\n";
+ echo "</TR>\n";
echo "</TABLE>\n";
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:12:01
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv18111/php
Modified Files:
company_new.php company_show.php department_new.php
department_show.php
Log Message:
make url handling optional
Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** company_new.php 2001/09/13 14:49:48 1.14
--- company_new.php 2001/09/16 19:11:58 1.15
***************
*** 5,9 ****
include("webelements.p3");
include("permission.p3");
- include("url.pinc");
/* Check if user is allowed to use it */
--- 5,8 ----
***************
*** 14,18 ****
*/
Function info(&$c,&$loc) {
! global $lang;
--- 13,17 ----
*/
Function info(&$c,&$loc) {
! global $lang,$current_user,$tutos;
***************
*** 111,116 ****
echo "</FORM>\n";
! if ( $c->id > 0 ) {
! url_form($c,"company_new.php?id=".$c->id);
}
echo $lang['FldsRequired'] ."\n";
--- 110,117 ----
echo "</FORM>\n";
! if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
! if ( $c->id > 0 ) {
! url_form($c,"company_new.php?id=".$c->id);
! }
}
echo $lang['FldsRequired'] ."\n";
Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** company_show.php 2001/09/11 18:46:38 1.18
--- company_show.php 2001/09/16 19:11:58 1.19
***************
*** 6,10 ****
include("permission.p3");
include("note.pinc");
- include("url.pinc");
include("installation.pinc");
include("address_tools.p3");
--- 6,9 ----
***************
*** 89,105 ****
# Links
! $c->readUrls();
! if ( count($c->urllist) > 0 ) {
! @reset($c->urllist);
! echo "<TR>\n";
! showfield($lang['CompanyLinks']);
! echo " <TD COLSPAN=". ($cols - 1) .">\n";
! while( list ($i,$f) = @each ($c->urllist)) {
! echo " ". $f->getLink() ."<BR>\n";
}
- echo " </TD>\n";
- echo "</TR>\n";
}
-
# Older Appointments
if ( ($current_user->p[usecalendar] == 1) && ($tutos[usecalendar] == 1) ) {
--- 88,105 ----
# Links
! if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
! $c->readUrls();
! if ( count($c->urllist) > 0 ) {
! @reset($c->urllist);
! echo "<TR>\n";
! showfield($lang['CompanyLinks']);
! echo " <TD COLSPAN=". ($cols - 1) .">\n";
! while( list ($i,$f) = @each ($c->urllist)) {
! echo " ". $f->getLink() ."<BR>\n";
! }
! echo " </TD>\n";
! echo "</TR>\n";
}
}
# Older Appointments
if ( ($current_user->p[usecalendar] == 1) && ($tutos[usecalendar] == 1) ) {
Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** department_new.php 2001/09/13 14:49:48 1.12
--- department_new.php 2001/09/16 19:11:58 1.13
***************
*** 5,9 ****
include("webelements.p3");
include("permission.p3");
- include("url.pinc");
/* Check if user is allowed to use it */
--- 5,8 ----
***************
*** 14,18 ****
*/
Function info(&$d,&$loc) {
! global $lang;
--- 13,17 ----
*/
Function info(&$d,&$loc) {
! global $lang,$current_user,$tutos;
***************
*** 130,137 ****
echo "</FORM>\n";
! if ( $d->id > 0 ) {
! url_form($d,"department_new.php?id=".$d->id);
}
-
echo $lang['FldsRequired'] ."\n";
}
--- 129,137 ----
echo "</FORM>\n";
! if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
! if ( $d->id > 0 ) {
! url_form($d,"department_new.php?id=".$d->id);
! }
}
echo $lang['FldsRequired'] ."\n";
}
Index: department_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_show.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** department_show.php 2001/09/11 18:46:38 1.15
--- department_show.php 2001/09/16 19:11:58 1.16
***************
*** 6,10 ****
include("permission.p3");
include("note.pinc");
- include("url.pinc");
include("installation.pinc");
include("address_tools.p3");
--- 6,9 ----
***************
*** 88,104 ****
# Links
! $d->readUrls();
! if ( count($d->urllist) > 0 ) {
! @reset($d->urllist);
! echo "<TR>\n";
! showfield($lang['CompanyLinks']);
! echo " <TD COLSPAN=". ($cols - 1) .">\n";
! while( list ($i,$f) = @each ($d->urllist)) {
! echo " ". $f->getLink() ."<BR>\n";
}
- echo " </TD>\n";
- echo "</TR>\n";
}
-
# Older Appointments
if ( ($current_user->p[usecalendar] == 1) && ($tutos[usecalendar] == 1) ) {
--- 87,104 ----
# Links
! if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
! $d->readUrls();
! if ( count($d->urllist) > 0 ) {
! @reset($d->urllist);
! echo "<TR>\n";
! showfield($lang['CompanyLinks']);
! echo " <TD COLSPAN=". ($cols - 1) .">\n";
! while( list ($i,$f) = @each ($d->urllist)) {
! echo " ". $f->getLink() ."<BR>\n";
! }
! echo " </TD>\n";
! echo "</TR>\n";
}
}
# Older Appointments
if ( ($current_user->p[usecalendar] == 1) && ($tutos[usecalendar] == 1) ) {
|
|
From: Gero K. <gok...@us...> - 2001-09-16 19:08:37
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv17501
Modified Files:
mailbox.pinc file.pinc team.pinc task.pinc department.pinc
company.pinc installation.pinc bug.pinc resource.pinc
webelements.p3 product.pinc note.pinc
Log Message:
entities in links
Index: mailbox.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox.pinc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** mailbox.pinc 2001/09/11 19:53:03 1.18
--- mailbox.pinc 2001/09/16 19:08:33 1.19
***************
*** 108,112 ****
}
if ( empty($text) ) {
! $text = $this->getFullName();
}
if ( $this->see_ok() ) {
--- 108,112 ----
}
if ( empty($text) ) {
! $text = htmlentities($this->getFullName());
}
if ( $this->see_ok() ) {
***************
*** 261,265 ****
$this->id = DB_Result($result, $pos, "id");
$this->host = DB_Result($result, $pos, "host");
! $this->type = DB_Result($result, $pos, "type");
$this->port = DB_Result($result, $pos, "port");
$this->user = DB_Result($result, $pos, "uname");
--- 261,265 ----
$this->id = DB_Result($result, $pos, "id");
$this->host = DB_Result($result, $pos, "host");
! $this->type = DB_Result($result, $pos, $this->dbconn->colname("type"));
$this->port = DB_Result($result, $pos, "port");
$this->user = DB_Result($result, $pos, "uname");
***************
*** 333,337 ****
$vals .= ",". $this->dbconn->String($this->host);
! $flds .= ",type";
$vals .= ",". $this->dbconn->String($this->type);
--- 333,337 ----
$vals .= ",". $this->dbconn->String($this->host);
! $flds .= ",". $this->dbconn->colname("type");
$vals .= ",". $this->dbconn->String($this->type);
***************
*** 374,378 ****
$q = sprintf("%s link_id = %d", $q,$this->parent->id );
$q = sprintf("%s,host = %s", $q,$this->dbconn->String($this->host) );
! $q = sprintf("%s,type = %s", $q,$this->dbconn->String($this->type) );
$q = sprintf("%s,port = %d", $q,$this->port);
$q = sprintf("%s,uname = %s", $q,$this->dbconn->String($this->user) );
--- 374,378 ----
$q = sprintf("%s link_id = %d", $q,$this->parent->id );
$q = sprintf("%s,host = %s", $q,$this->dbconn->String($this->host) );
! $q = sprintf("%s,%s = %s", $q,$this->dbconn->colname("type"),$this->dbconn->String($this->type) );
$q = sprintf("%s,port = %d", $q,$this->port);
$q = sprintf("%s,uname = %s", $q,$this->dbconn->String($this->user) );
Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file.pinc,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** file.pinc 2001/09/11 18:51:44 1.40
--- file.pinc 2001/09/16 19:08:33 1.41
***************
*** 131,135 ****
$this->name = StripSlashes(DB_Result($result, $pos, "name"));
$this->fileloc = StripSlashes(DB_Result($result, $pos, "loc"));
! $this->filetype = StripSlashes(DB_Result($result, $pos, "type"));
$this->filename = StripSlashes(DB_Result($result, $pos, "filename"));
$this->filesize = DB_Result($result, $pos, "f_size");
--- 131,135 ----
$this->name = StripSlashes(DB_Result($result, $pos, "name"));
$this->fileloc = StripSlashes(DB_Result($result, $pos, "loc"));
! $this->filetype = StripSlashes(DB_Result($result, $pos, $this->dbconn->colname("type")));
$this->filename = StripSlashes(DB_Result($result, $pos, "filename"));
$this->filesize = DB_Result($result, $pos, "f_size");
***************
*** 198,212 ****
if ( $text == "" ) {
! if ( $this->see_ok() ) {
! return makelink( $this->getURL(), $this->name ,$lang['File'] ." ". $this->name);
! } else {
! return $this->name;
! }
} else {
! if ( $this->see_ok() ) {
! return makelink( $this->getURL(), $text ,$lang['File'] ." ". $text);
! } else {
! return $text;
! }
}
}
--- 198,208 ----
if ( $text == "" ) {
! $text = htmlentities($this->name);
! }
!
! if ( $this->see_ok() ) {
! return makelink( $this->getURL(), $text ,$lang['File'] ." ". $this->name);
} else {
! return $this->name;
}
}
***************
*** 572,576 ****
$flds .= ",f_size";
$vals .= "," . $this->filesize;
! $flds .= ",type";
$vals .= ",'" . $this->filetype ."'";
$flds .= ",creator";
--- 568,572 ----
$flds .= ",f_size";
$vals .= "," . $this->filesize;
! $flds .= ",". $this->dbconn->colname("type");
$vals .= ",'" . $this->filetype ."'";
$flds .= ",creator";
***************
*** 643,647 ****
$q .= ",filename = " . $this->dbconn->String($this->filename);
$q .= ",loc = " . $this->dbconn->String($this->fileloc);
! $q .= ",type = " . $this->dbconn->String($this->filetype);
$q .= ",f_size = " . $this->filesize;
# Remove tmpfile !!
--- 639,643 ----
$q .= ",filename = " . $this->dbconn->String($this->filename);
$q .= ",loc = " . $this->dbconn->String($this->fileloc);
! $q .= ",". $this->dbconn->colname("type") ." = " . $this->dbconn->String($this->filetype);
$q .= ",f_size = " . $this->filesize;
# Remove tmpfile !!
Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** team.pinc 2001/09/11 19:53:03 1.32
--- team.pinc 2001/09/16 19:08:33 1.33
***************
*** 202,206 ****
if ( $text == "" ) {
! $text = $this->name;
}
if ( $this->see_ok() ) {
--- 202,206 ----
if ( $text == "" ) {
! $text = htmlentities($this->name);
}
if ( $this->see_ok() ) {
***************
*** 233,238 ****
}
- $this->dbconn->Begin("WORK");
-
$this->dbconn->Exec($q);
--- 233,236 ----
***************
*** 243,246 ****
--- 241,249 ----
$r = $this->dbconn->Exec($q);
acl_raise($this,$f,$tutos[seeok]);
+ $this->modified[] = array ( "field" => "TeamAdd" ,
+ "old" => "-1",
+ "new" => $f,
+ "obj_id" => $this->id
+ );
}
}
***************
*** 251,254 ****
--- 254,262 ----
$r = $this->dbconn->Exec($q);
acl_set($this,$f,0);
+ $this->modified[] = array ( "field" => "TeamDel" ,
+ "old" => $f,
+ "new" => "-1",
+ "obj_id" => $this->id
+ );
}
}
***************
*** 259,263 ****
$msg .= acl_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
return $msg;
--- 267,270 ----
***************
*** 330,333 ****
--- 337,354 ----
}
readTasks($this);
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ * Return Info about history of this team
+ */
+ function readHistory() {
+ readHistory($this);
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ * Return Info about connected urls of this team
+ */
+ function readUrls() {
+ readUrls($this);
return;
}
Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** task.pinc 2001/09/11 19:41:36 1.45
--- task.pinc 2001/09/16 19:08:33 1.46
***************
*** 205,209 ****
$this->creation = new DateTime();
$this->creator = $current_user;
! $this->worker = new tutos_address($dbconn);
$this->s_start = new DateTime();
$this->s_end = new DateTime();
--- 205,209 ----
$this->creation = new DateTime();
$this->creator = $current_user;
! $this->worker = $current_user;
$this->s_start = new DateTime();
$this->s_end = new DateTime();
***************
*** 552,562 ****
global $lang;
! $n =str_replace("\n","<BR>",$this->desc);
$n =str_replace("\r","",$n);
$info = "";
$info .= "<HTML>";
$info .= "<BODY>";
$info .= "<TABLE CLASS=inner BORDER=0 CELLSPACING=0 CELLPADDING=1>";
! $info .= "<TR><TH>". $lang[$this->getType()] ." ". $this->name ."</TH></TR>";
$info .= "<TR><TD><FONT SIZE=-2><PRE>";
$info .= $n;
--- 552,567 ----
global $lang;
! $n =str_replace("\n","<BR>",htmlentities($this->desc));
$n =str_replace("\r","",$n);
+ $n =str_replace("'","\'",$n);
+
+ $t =htmlentities($this->name);
+ $t =str_replace("'","\'",$t);
+
$info = "";
$info .= "<HTML>";
$info .= "<BODY>";
$info .= "<TABLE CLASS=inner BORDER=0 CELLSPACING=0 CELLPADDING=1>";
! $info .= "<TR><TH>". $lang[$this->getType()] ." ". $t ."</TH></TR>";
$info .= "<TR><TD><FONT SIZE=-2><PRE>";
$info .= $n;
***************
*** 576,584 ****
* Return a link to this task
*/
! function getLink() {
global $lang;
if ( $this->see_ok() ) {
! return makelink($this->getURL() , $this->name ,sprintf($lang['TaskLinkInfo'], $this->getFullName()),$this->getPopInfo());
} else {
return $this->name;
--- 581,592 ----
* Return a link to this task
*/
! function getLink($text = "") {
global $lang;
+ if ( $text == "" ) {
+ $text = htmlentities($this->getFullName());
+ }
if ( $this->see_ok() ) {
! return makelink($this->getURL() , $text ,sprintf($lang['TaskLinkInfo'], $this->getFullName()),$this->getPopInfo());
} else {
return $this->name;
***************
*** 589,593 ****
*/
function getFullname() {
! return sprintf("%s",$this->name);
}
/* ---------------------------------------------------------------------------
--- 597,601 ----
*/
function getFullname() {
! return $this->name;
}
/* ---------------------------------------------------------------------------
Index: department.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department.pinc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** department.pinc 2001/09/11 18:46:38 1.24
--- department.pinc 2001/09/16 19:08:33 1.25
***************
*** 253,257 ****
if ( $text == "" ) {
! $text = $this->getFullName();
}
if ( $this->see_ok() ) {
--- 253,257 ----
if ( $text == "" ) {
! $text = htmlentities($this->getFullName());
}
if ( $this->see_ok() ) {
Index: company.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company.pinc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** company.pinc 2001/09/11 18:46:38 1.24
--- company.pinc 2001/09/16 19:08:33 1.25
***************
*** 287,291 ****
if ( $text == "" ) {
! $text = $this->name;
}
if ( $this->see_ok() ) {
--- 287,291 ----
if ( $text == "" ) {
! $text = htmlentities($this->name);
}
if ( $this->see_ok() ) {
Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation.pinc,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** installation.pinc 2001/09/11 18:51:44 1.30
--- installation.pinc 2001/09/16 19:08:33 1.31
***************
*** 236,243 ****
function getLink($text = "") {
if ( $text == "" ) {
! $text = $this->getFullname();
}
if ( $this->see_ok() ) {
! return makelink($this->getURL() , $text , "See installation detail");
} else {
return $text;
--- 236,243 ----
function getLink($text = "") {
if ( $text == "" ) {
! $text = htmlentities($this->getFullname());
}
if ( $this->see_ok() ) {
! return makelink($this->getURL() , $text , $lang['InstDetail']);
} else {
return $text;
Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** bug.pinc 2001/09/11 18:51:44 1.40
--- bug.pinc 2001/09/16 19:08:33 1.41
***************
*** 331,335 ****
if ( $text == "" ) {
! $text = $this->getFullName();
}
if ( $this->see_ok() ) {
--- 331,335 ----
if ( $text == "" ) {
! $text = htmlentities($this->getFullName());
}
if ( $this->see_ok() ) {
Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource.pinc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** resource.pinc 2001/09/11 19:41:36 1.18
--- resource.pinc 2001/09/16 19:08:33 1.19
***************
*** 210,217 ****
if ( $text == "" ) {
! $text = $this->getFullName();
}
if ( $this->see_ok() ) {
! return makelink($this->getURL() , $text ,sprintf($lang['ResShow'],$this->getFullName()));
} else {
return $text;
--- 210,217 ----
if ( $text == "" ) {
! $text = htmlentities($this->getFullName());
}
if ( $this->see_ok() ) {
! return makelink($this->getURL() ,$text,sprintf($lang['ResShow'],$this->getFullName()));
} else {
return $text;
***************
*** 319,323 ****
}
/* ---------------------------------------------------------------------------
! * Delete URL from DB
*/
function delete() {
--- 319,323 ----
}
/* ---------------------------------------------------------------------------
! * Delete resource from DB
*/
function delete() {
Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -r1.79 -r1.80
*** webelements.p3 2001/09/13 19:08:00 1.79
--- webelements.p3 2001/09/16 19:08:33 1.80
***************
*** 579,582 ****
--- 579,613 ----
}
echo "</TD></TR>\n";
+
+ if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
+ $cnt = 0;
+ $current_user->readUrls();
+ $cnt += count($current_user->urllist);
+ @reset($current_user->teamids);
+ while ( list ($i,$f) = @each ($current_user->teamids) ) {
+ $t[$i] = new team($current_user->dbconn);
+ $t[$i]->read($i);
+ $t[$i]->readUrls($i);
+ $cnt += count($t[$i]->urllist);
+ }
+ if ( $cnt > 0 ) {
+ echo "<!-- =============== Team favourites =============== -->\n";
+ echo "<TR VALIGN=bottom><TD><HR NOSHADE SIZE=1></TD></TR>\n";
+ echo "<TR VALIGN=bottom>\n";
+ echo " <TD NOWRAP>\n";
+ @reset($current_user->teamids);
+ while ( list ($i,$f) = @each ($current_user->teamids) ) {
+ if ( count($t[$i]->urllist) > 0 ) {
+ @reset($t[$i]->urllist);
+ while ( list ($j,$x) = @each ($t[$i]->urllist) ) {
+ # echo menulink($x->getUrl(),$x->name) . "<BR>\n";
+ echo "<LI><A CLASS=nodeco HREF=\"". $x->getUrl() ."\" TARGET=map>". htmlentities($x->name) . "</A><BR>\n";
+ }
+ }
+ }
+ echo "<!-- =============== End Team favourites =============== -->\n";
+ echo "</TD></TR>\n";
+ }
+ }
echo "</TABLE>\n";
echo "<!-- =============== End the navigation =============== -->\n";
Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** product.pinc 2001/09/16 14:28:50 1.44
--- product.pinc 2001/09/16 19:08:33 1.45
***************
*** 426,443 ****
global $lang;
! if ( !empty($text) ) {
! if ( $this->see_ok() ) {
! return makelink($this->getURL() ,$text,sprintf($lang['ProdLinkInfo'], $this->getFullName()) );
! } else {
! return $text;
! }
! }
- $text = $this->getFullname();
- if ($text == "") {
- $text = $lang['product']." #". $this->id;
- }
if ( $this->see_ok() ) {
! return makelink($this->getURL() ,$text ,sprintf($lang['ProdLinkInfo'], $this->getFullName()));
} else {
return $text;
--- 426,435 ----
global $lang;
! if ( empty($text) ) {
! $text = htmlentities($this->getFullname());
! }
if ( $this->see_ok() ) {
! return makelink($this->getURL(),$text,sprintf($lang['ProdLinkInfo'],$this->getFullName()) );
} else {
return $text;
Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note.pinc,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** note.pinc 2001/09/16 14:27:27 1.39
--- note.pinc 2001/09/16 19:08:33 1.40
***************
*** 260,268 ****
if ( $text == "" ) {
! $text = $this->getFullName();
}
if ( $this->see_ok() ) {
! return makelink($this->getURL() , $text ,sprintf($lang['NoteLinkInfo'], $this->creator->getFullName()),$this->getPopInfo());
} else {
return $text;
--- 260,268 ----
if ( $text == "" ) {
! $text = htmlentities($this->getFullName());
}
if ( $this->see_ok() ) {
! return makelink($this->getURL() ,$text,sprintf($lang['NoteLinkInfo'], $this->creator->getFullName()),$this->getPopInfo());
} else {
return $text;
|
|
From: Gero K. <gok...@us...> - 2001-09-16 16:35:41
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv17693/php
Modified Files:
address_new.php
Log Message:
bugfix: #461602
Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** address_new.php 2001/09/13 14:49:48 1.18
--- address_new.php 2001/09/16 16:35:38 1.19
***************
*** 239,243 ****
echo "<P>\n";
if ( $a->isUser() != 0 ) {
! $u = new tutos_user($a->conn);
$u->read($a->id);
if ( $u->mod_ok() ) {
--- 239,243 ----
echo "<P>\n";
if ( $a->isUser() != 0 ) {
! $u = new tutos_user($a->dbconn);
$u->read($a->id);
if ( $u->mod_ok() ) {
|
|
From: Gero K. <gok...@us...> - 2001-09-16 14:29:27
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv25566/php
Modified Files:
product_show.php
Log Message:
display fixes
Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** product_show.php 2001/09/10 16:39:04 1.20
--- product_show.php 2001/09/16 14:29:24 1.21
***************
*** 335,339 ****
echo "<TR>\n";
}
! echo " <TD ALIGN=right>". $p->tsum[$i] ."</TD>\n";
echo " <TD ALIGN=left>". $lang['hours'] ."</TD>\n";
echo " <TD>(". $lang[$i] .")</TD>\n";
--- 335,339 ----
echo "<TR>\n";
}
! echo " <TD ALIGN=right>". number_format($p->tsum[$i],2) ."</TD>\n";
echo " <TD ALIGN=left>". $lang['hours'] ."</TD>\n";
echo " <TD>(". $lang[$i] .")</TD>\n";
|
|
From: Gero K. <gok...@us...> - 2001-09-16 14:28:53
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv25474/php
Modified Files:
product_ins.php product.pinc
Log Message:
moved transaction block to product_ins
Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** product_ins.php 2001/09/10 16:39:04 1.19
--- product_ins.php 2001/09/16 14:28:50 1.20
***************
*** 166,170 ****
$p->res = $res;
! $msg = $p->save();
$gotourl = $p->getURL();
}
--- 166,173 ----
$p->res = $res;
! $dbconn->Begin("WORK");
! $msg .= $p->save();
! $dbconn->Commit("WORK");
!
$gotourl = $p->getURL();
}
Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** product.pinc 2001/09/11 18:51:44 1.43
--- product.pinc 2001/09/16 14:28:50 1.44
***************
*** 841,846 ****
}
! $this->dbconn->Begin("WORK");
! $r = $this->dbconn->Exec($q);
$this->saveroles();
for ( $cl = 1;$cl <= $this->classes; $cl++) {
--- 841,845 ----
}
! $this->dbconn->Exec($q);
$this->saveroles();
for ( $cl = 1;$cl <= $this->classes; $cl++) {
***************
*** 850,855 ****
$msg .= history_save($this);
$msg .= resource_save($this);
-
- $this->dbconn->Commit("WORK");
return $msg;
--- 849,852 ----
|
|
From: Gero K. <gok...@us...> - 2001-09-16 14:27:33
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv25277/php
Modified Files:
note.pinc note_ins.php
Log Message:
moved transaction block to note_ins
Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note.pinc,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** note.pinc 2001/09/11 18:51:44 1.38
--- note.pinc 2001/09/16 14:27:27 1.39
***************
*** 334,342 ****
}
! $this->dbconn->Begin("WORK");
! $r = $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
return $msg;
--- 334,340 ----
}
! $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
return $msg;
Index: note_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note_ins.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** note_ins.php 2001/09/10 16:39:04 1.9
--- note_ins.php 2001/09/16 14:27:27 1.10
***************
*** 58,62 ****
--- 58,64 ----
if ( $msg == "" ) {
+ $dbconn->Begin("WORK");
$msg .= $u->save();
+ $dbconn->Commit("WORK");
$gotourl = $u->ref->getURL();
}
|
|
From: Gero K. <gok...@us...> - 2001-09-16 13:49:47
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv20111/php
Modified Files:
address_select.php
Log Message:
html fixes by using entities
Index: address_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_select.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** address_select.php 2001/09/10 16:35:44 1.11
--- address_select.php 2001/09/16 13:49:44 1.12
***************
*** 26,30 ****
echo "</TR><TR>\n";
showfieldc($lang['AdrName']);
! echo "<TD> <INPUT TYPE=\"text\" VALUE=\"". $lookfor ."\" NAME=\"name\"> </TD>\n";
echo "<TD><INPUT TYPE=\"submit\" VALUE=\"". $lang['Search'] ."\" TITLE=\"". $lang['SearchForAdr'] ."\"></TD>\n";
echo "</TR><TR>\n";
--- 26,30 ----
echo "</TR><TR>\n";
showfieldc($lang['AdrName']);
! echo "<TD> <INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\"> </TD>\n";
echo "<TD><INPUT TYPE=\"submit\" VALUE=\"". $lang['Search'] ."\" TITLE=\"". $lang['SearchForAdr'] ."\"></TD>\n";
echo "</TR><TR>\n";
***************
*** 36,40 ****
echo "</TR><TR>\n";
showfieldc($lang['AdrName']);
! echo " <TD> <INPUT TYPE=\"text\" VALUE=\"". $lookfor ."\" NAME=\"name\"> </TD>\n";
echo " <TD><INPUT TYPE=\"submit\" VALUE=\"". $lang['Search'] ."\" TITLE=\"". $lang['SearchForAdrExt'] ."\"></TD>\n";
echo "</TR><TR>\n";
--- 36,40 ----
echo "</TR><TR>\n";
showfieldc($lang['AdrName']);
! echo " <TD> <INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\"> </TD>\n";
echo " <TD><INPUT TYPE=\"submit\" VALUE=\"". $lang['Search'] ."\" TITLE=\"". $lang['SearchForAdrExt'] ."\"></TD>\n";
echo "</TR><TR>\n";
***************
*** 72,76 ****
echo "</TR><TR>\n";
showfieldc($lang['AdrName']);
! echo "<TD> <INPUT TYPE=\"text\" VALUE=\"". $lookfor ."\" NAME=\"name\"> </TD>\n";
echo "<TD><INPUT TYPE=\"submit\" VALUE=\"". $lang['Search'] ."\" TITLE=\"". $lang['SearchLdapAdr'] ."\"></TD>\n";
--- 72,76 ----
echo "</TR><TR>\n";
showfieldc($lang['AdrName']);
! echo "<TD> <INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\"> </TD>\n";
echo "<TD><INPUT TYPE=\"submit\" VALUE=\"". $lang['Search'] ."\" TITLE=\"". $lang['SearchLdapAdr'] ."\"></TD>\n";
***************
*** 101,105 ****
echo "</TR><TR>\n";
showfieldc($lang['Company']);
! echo "<TD> <INPUT TYPE=\"text\" VALUE=\"". $lookfor ."\" NAME=\"name\"> </TD>\n";
echo "<TD><INPUT TYPE=\"submit\" VALUE=\"". $lang['Search'] ."\" TITLE=\"". $lang['SearchForCmp']."\"></TD>\n";
echo "</TR>\n";
--- 101,105 ----
echo "</TR><TR>\n";
showfieldc($lang['Company']);
! echo "<TD> <INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\"> </TD>\n";
echo "<TD><INPUT TYPE=\"submit\" VALUE=\"". $lang['Search'] ."\" TITLE=\"". $lang['SearchForCmp']."\"></TD>\n";
echo "</TR>\n";
|
|
From: Boris W. <bw...@us...> - 2001-09-13 20:38:15
|
Update of /cvsroot/tutos/tutos/php In directory usw-pr-cvs1:/tmp/cvs-serv31866 Modified Files: de.p3 Log Message: Translation of added string Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/de.p3,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -r1.71 -r1.72 *** de.p3 2001/09/13 19:08:00 1.71 --- de.p3 2001/09/13 20:38:08 1.72 *************** *** 91,95 **** $lang['lang']['fr'] = "Französisch"; $lang['lang']['es'] = "Spanisch"; ! $lang['lang']['es-MX'] = "Español/México"; $lang['lang']['it'] = "Italienisch"; $lang['lang']['tw'] = "Traditionelles Chinesisch"; --- 91,95 ---- $lang['lang']['fr'] = "Französisch"; $lang['lang']['es'] = "Spanisch"; ! $lang['lang']['es-MX'] = "Spanisch (Mexiko)"; $lang['lang']['it'] = "Italienisch"; $lang['lang']['tw'] = "Traditionelles Chinesisch"; |
|
From: Gero K. <gok...@us...> - 2001-09-13 19:08:07
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv10262/php
Modified Files:
webelements.p3 pt-br.p3 de.p3 en.p3 es.p3 fr.p3 it.p3 ko.p3
nl.p3 pl.p3 ru.p3 tw.p3 zh.p3
Added Files:
es-mx.p3
Log Message:
added mexican spanish
--- NEW FILE: es-mx.p3 ---
<?
# $Id: es-mx.p3,v 1.1 2001/09/13 19:08:00 gokohnert Exp $
#
# ========================= NOTE ========================
# Please put site specific extensions and changes
# to TUTOS language files in a file called "es_custom.p3"
# or "lang_custom.p3" (for all languages)
# using the same format like here
# =======================================================
#
# Translation by Luca Olivetti <lu...@we...>
#
$lang['content_encoding'] = "iso-8859-1";
setlocale(LC_TIME,'es_MX');
#
# Espaniol Texts
#
$lang['PleaseLogin'] = "Por favor introduzca usuario y contraseña";
$lang['PleaseCookies'] = "Por favor habilite los cookies para este site";
$lang['Password'] = "Contraseña";
$lang['Username'] = "Usuario";
$lang['MOTD'] = "Mensaje del día";
$lang['Login'] = "Entrar";
$lang['LoggedIn'] = "Estas conectado. Por favor selecciona una opción a la izquierda.";
$lang['ReadOnlyAppoint'] = "Cita de sola lectura !";
$lang['StartDate'] = "Fecha inicio";
$lang['StartTime'] = "Hora inicio";
$lang['AppStart'] = "inicio";
$lang['AppCreatedBy'] = "Creado por";
$lang['EndDate'] = "Fecha fin";
$lang['EndTime'] = "Hora fin";
$lang['AppEnd'] = "fin";
$lang['Participants'] = "Participantes";
$lang['everybody'] = "todos";
$lang['atDateTime'] = "el";
$lang['createdby'] = "Creado por";
$lang['Description'] = "Descripción";
$lang['InfoEmail'] = "Informar por Email";
$lang['InviteEmail'] = "Invitar por Email";
$lang['Invitation'] = "Invitación";
$lang['IgnoreTime'] = "ignorar hora y fecha";
$lang['IgnoreTime2'] = "(si la cita no tiene lugar en una hora especifica)";
$lang['forphrase'] = "para";
$lang['nextweek'] = "semana siguiente";
$lang['lastweek'] = "semana anterior";
$lang['plus4weeks'] = "4 semanas siguientes";
$lang['minus4weeks'] = "4 semanas anteriores";
$lang['only'] = "solamente";
$lang['reload'] = "recargar";
$lang['tracestate'] = "ver concordancia";
$lang['tracestate_desc'] = "(los participantes pueden votar)";
$lang['changeapp'] = "ver o modificar esta cita (%s - %s)";
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
#
$lang['DateTimePHP'] = "d.m.Y H:i T";
$lang['DateTimeStr'] = "%d.%m.%Y %H:%M %Z";
$lang['DateTimeFormat'] = "%s.%s.%s %s:%s %s";
#
$lang['DateTimeSPHP'] = "d.m H:i";
$lang['DateTimeSStr'] = "%d.%m %H:%M";
$lang['DateTimeSFormat'] = "%s.%s %02s:%02s";
#
$lang['TimeFormatPHP'] = "H:i T";
$lang['TimeFormatStr'] = "%H:%M";
$lang['TimeFormat'] = "%s:%s";
#
$lang['DateFormatTitle'] = "%A, %e. %B %Y";
$lang['DateFormatStr'] = "%d.%m.%Y";
$lang['DateFormat'] = "%s.%s.%s";
$lang['DateShortFormat'] = "%s.%s";
#
$lang['Printable'] = "Para imprimir";
$lang['PrintableInfo'] = "Ver la pagina en formato para imprimir";
$lang['managedProd'] = "Responsable de productos/proyectos";
$lang['soldProd'] = "productos/proyectos vendidos";
$lang['Enter'] = "Intro";
$lang['Reset'] = "Reset";
$lang['Remove'] = "Eliminar";
$lang['Delete'] = "Eliminar";
$lang['Change'] = "Modificar";
$lang['Modify'] = "Modificar";
$lang['created'] = "creado";
$lang['DateTimeFrom'] = "desde";
$lang['DateTimeTill'] = "hasta";
$lang['Count'] = "Count";
$lang['Showing'] = "Visualizando %s";
$lang['show'] = "muestra";
$lang['lang']['auto'] = "automático (selección en el navegador)";
$lang['lang']['en'] = "Ingles";
$lang['lang']['en-US'] = "Ingles US";
$lang['lang']['de'] = "Alemán";
$lang['lang']['fr'] = "Francés";
$lang['lang']['es'] = "Castellano";
$lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "Italiano";
$lang['lang']['tw'] = "Chino Tradicional";
$lang['lang']['zh'] = "Chino Simplificado";
$lang['lang']['ru'] = "Ruso";
$lang['lang']['pt'] = "Português";
$lang['lang']['pl'] = "Polaco";
$lang['lang']['ko'] = "Koreano";
$lang['lang']['nl'] = "Holandes";
# Common
$lang['ChangesOk'] = "modificaciones OK ?";
$lang['InputOk'] = "Introducción OK ?";
$lang['Day1'] = "Lunes";
$lang['Day2'] = "Martes";
$lang['Day3'] = "Miércoles";
$lang['Day4'] = "Jueves";
$lang['Day5'] = "Viernes";
$lang['Day6'] = "Sábado";
$lang['Day0'] = "Domingo";
$lang['SMonday'] = "L";
$lang['STuesday'] = "M";
$lang['SWednesday'] = "X";
$lang['SThursday'] = "J";
$lang['SFriday'] = "V";
$lang['SSaturday'] = "S";
$lang['SSunday'] = "D";
$lang['week'] = "semana";
$lang['weeks'] = "semanas";
$lang['Date'] = "Fecha";
$lang['NewEntry'] = "Crear";
$lang['Search'] = "Buscar";
$lang['PlsChangeName'] = "Por favor cambie el nombre";
$lang['State_0'] = "???";
$lang['State_1'] = "SI";
$lang['State_2'] = "NO";
$lang['SeeAddress'] = "ver dirección de %s";
$lang['NavFirst'] = "primera";
$lang['NavBack'] = "anterior";
$lang['NavNext'] = "siguiente";
$lang['NavLast'] = "última";
$lang['DecPoint'] = ".";
$lang['ThousandPoint'] = ",";
$lang['yes'] = "sí";
$lang['no'] = "no";
$lang['FldsRequired'] = "<FONT SIZE=-1>Los campos marcados <FONT COLOR=red>(*)</FONT> son obligatorios.</FONT>";
$lang['any'] = "cualquiera";
$lang['all'] = "todos";
$lang['extended'] = "avanzada";
$lang['OrderBy'] = "ordenar por %s";
$lang['RevOrderBy'] = "ordenar al revés por %s";
$lang['Export'] = "Exportar";
$lang['ExportInfo'] = "Export datos en archivo";
# Appointments
$lang['Appointment'] = "Cita";
$lang['Appointments'] = "Citas";
$lang['NewAppoint'] = "Nueva cita";
$lang['NewAppointR'] = "Nueva cita recurrente";
$lang['NewAppointInfo'] = "Crear una nueva cita";
$lang['NewAppointInfoR'] = "Crear una nueva cita recurrente";
$lang['AppointDetail'] = "Detalles de la cita";
$lang['AppointModify'] = "Modificar cita";
$lang['AppointCreate'] = "Crear cita";
$lang['AppointCommit'] = "Voto para cita";
$lang['AppointOverview'] = "Vista general de citas";
$lang['AppDelInfo'] = "Eliminar cita";
$lang['AppNotes'] = "Notas";
$lang['AppChangeOrDel'] = "quien puede modificar o borrar";
$lang['VisitAt'] = "Visitar a las";
$lang['VisitFrom'] = "Visitar desde";
$lang['Visits'] = "Visitas";
$lang['ModOldAppoint'] = "Modificar una cita existente";
$lang['CreateAppoint'] = "Crear una nueva cita";
$lang['AppFirstDate'] = "Primera fecha";
$lang['AppLastDate'] = "última fecha";
$lang['AppNoLastDate'] = "no hay última fecha";
$lang['AppRepeatType'] = "Repetir";
$lang['AppRepeatDay'] = "cada día";
$lang['AppRepeatWeek'] = "cada semana el mismo día de inicio";
$lang['AppRepeatMonth'] = "cada mes el mismo día de inicio";
$lang['AppRepeatYear'] = "cada año el mismo día/mes";
$lang['AppRepeatInfo1'] = "cada %s";
$lang['AppRepeatInfo2'] = "cada mes el día %d";
$lang['AppRepeatInfo3'] = "cada año el %d/%m";
$lang['AppRepeatInfo4'] = "cada día";
$lang['AppSeeEntry'] = "Ver cita";
$lang['AppSeeEntryI'] = "ver la cita";
$lang['AppEmailRemind'] = "Avisar los participantes por email";
$lang['AppRemind'][0] = "nunca";
$lang['AppRemind'][15] = "15 minutos antes";
$lang['AppRemind'][60] = "1 hora antes";
$lang['AppRemind'][1440] = "1 día antes";
$lang['AppRemind'][10080]= "1 semana antes";
$lang['AppAllSee'] = "todo lo que puedes ver";
$lang['AppAllTeams'] = "miembros de todos tus equipos";
$lang['AppEverything'] = "todo";
$lang['AppGetIcal'] = "Exportar Archivo Ical";
# You can expand this as you like
# see also config.pinc AppLocDesc
# colors depend on style sheets
$lang['AppLoc'][0] = "oficina";
$lang['AppLoc'][1] = "fuera";
$lang['AppLoc'][2] = "vacaciones";
$lang['AppLoc'][3] = "enfermedad";
$lang['AppPrivate'] = "privado";
$lang['AppVoteInfo'] = "votar para esta cita";
$lang['AppVoteState'] = "voto actual";
$lang['AppVoteHead'] = "Voto para esta cita (%s)";
$lang['AppVoteSelect'] = "Seleccione su voto";
$lang['AppsSearch'] = "Busqueda en Calendario";
$lang['SearchForAppExt'] = "Busqueda avanzada de cita";
$lang['SearchForApp'] = "Search for an appointment";
$lang['AppSelInfo'] = "(dejar vacío para ver todas las citas)";
# Personal Page
$lang['PersonalPage'] = "Mi TUTOS";
$lang['PersonalPageFor'] = "Página Personal de %s";
$lang['PersonalSettings'] = "Configuración de Usuario";
$lang['PersonalSettingsI'] = "Modificar configuración personal de %s";
# User
$lang['User'] = "Usuario";
$lang['UserCreate'] = "Crear usuario";
$lang['UserModify'] = "Modificar usuario";
$lang['UserDel'] = "Eliminar usuario";
$lang['UserInfo'] = "Información de usuario";
$lang['UserModInfo'] = "Cambiar la información de usuario %s";
$lang['UserNewInfo'] = "Crear un usuario para %s";
$lang['UserDelInfo'] = "Borrar el usuario %s";
$lang['UserUnknown'] = "Usuario desconocido";
$lang['UserLastSeen'] = "última entrada";
$lang['UserLastHost'] = "Ultimo host";
$lang['UserAdmin'] = "Admin";
$lang['UserUseOverlib'] = "usar notas emergentes";
$lang['UserLanguage'] = "Idioma";
$lang['UserTimezone'] = "Zona horario";
$lang['UserTheme'] = "Tema";
# Bugs
$lang['Bug'] = "Fallo";
$lang['BugsSearch'] = "Buscar fallo";
$lang['BugsOverview'] = "Vista general de fallos";
$lang['BugsDetail'] = "Detalles del fallo";
$lang['BugState'] = "Estado";
$lang['BugClass'] = "Clase";
$lang['BugShort'] = "Descripción corta";
$lang['BugLong'] = "Descripción larga";
$lang['BugCreator'] = "Creado por";
$lang['BugCreation'] = "Creado por %s el %s";
$lang['BugProduct'] = "producto/proyecto";
$lang['BugReference'] = "Referencia";
$lang['BugSolvedBy'] = "solucionado por";
$lang['BugClosedBy'] = "cerrado por";
$lang['BugAssignedTo'] = "asignado a";
$lang['BugHistory'] = "Descripción & Historial";
$lang['Bugs'] = "Fallos";
$lang['BugModify'] = "Modificar fallo";
$lang['BugModifyI'] = "Modifica fallo %s";
$lang['BugCreate'] = "Crear fallo";
$lang['BugCreateInfo'] = "Abrir un fallo para %s";
$lang['BugDeleteI'] = "delete this bug %s";
$lang['BugStates'][1] = "ABIERTO";
$lang['BugStates'][2] = "TRABAJANDO";
$lang['BugStates'][3] = "SOLUCIONADO";
$lang['BugStates'][4] = "CERRADO";
$lang['BugClasses'][1] = "poco importante";
$lang['BugClasses'][2] = "importante";
$lang['BugClasses'][3] = "peligroso";
$lang['BugClasses'][4] = "sugerencia";
$lang['SearchForBug'] = "Buscar de un fallo";
$lang['SearchForBugExt'] = "Búsqueda avanzada de un fallo";
$lang['CreateNewBug'] = "Introducir un nuevo fallo";
$lang['BugShow'] = "Ver fallo %s";
$lang['BugAdditional'] = "Información adicional";
$lang['BugHistory'] = "Historial";
$lang['BugSelInfo'] = "(vacío para ver todos los fallos)";
$lang['BugAnyButClosed'] = "fallos no solucionados";
$lang['BugBetween'] = "creados entre";
$lang['BugStats'] = "Estadísticas";
$lang['BugStatsInfo'] = "Información estadística sobre los fallos seleccionados";
$lang['BugStatsTitle'] = "Estadísticas de fallos";
$lang['BugAverage'] = "Performance";
$lang['BugAvgEnd'] = "Promedio %.2f horas para finalizar";
$lang['BugAvgSolve'] = "Promedio %.2f horas para solucionar %d fallo(s)";
$lang['BugAvgClose'] = "Promedio %.2f horas para cerrar %d fallo(s)";
$lang['BugID'] = "ID del fallo";
$lang['BugAutoID'] = "creado automáticamente";
$lang['BugAutoState'] = "estado inicial";
$lang['BugAutoSolver'] = "inicial";
# Product/Projects
$lang['ProductP'] = "Producto/Proyecto";
$lang['Product'] = "Producto";
$lang['Project'] = "proyecto";
$lang['ProductsSearch'] = "Buscar productos/proyectos";
$lang['ProductsOverview']= "Vision general de producto/proyecto";
$lang['ProductsDetail'] = "Detalles de producto/proyecto";
$lang['ProdApps'] = "Citas relacionadas";
$lang['ProdName'] = "producto/proyecto";
$lang['ProdVersion'] = "Versión";
$lang['ProdRoles'] = "Roles";
$lang['ProdFunc'] = "Función";
$lang['ProdRolesNew'] = "Nuevo rol";
$lang['ProdRole'][1] = "Responsable";
$lang['ProdRole'][2] = "Responsable comercial";
$lang['ProdRole'][3] = "Responsable 2.";
$lang['ProdRole'][4] = "Ventas";
$lang['ProdRole'][5] = "Desarrollo";
$lang['ProdRole'][6] = "Cliente";
$lang['ProdRole'][7] = "Proveedor";
$lang['ProdRole'][8] = "Distribuidor";
$lang['ProdRole'][9] = "Socio";
$lang['ProdPath'] = "Ruta de archivos";
$lang['ProdDesc'] = "Descripción";
$lang['ProdDesc1'] = "Descripción 1";
$lang['ProdDesc2'] = "Descripción 2";
$lang['ProdState'] = "Estado";
$lang['ProdState_'] = "Estado desconocido";
$lang['ProdStates'][0] = "Adquisición";
$lang['ProdStates'][1] = "En curso";
$lang['ProdStates'][2] = "Acabado";
$lang['ProdStates'][3] = "Cancelado";
$lang['ProdStates'][4] = "Oferta en curso";
$lang['ProdStates'][5] = "Oferta cancelada";
$lang['ProdStates'][-2] = "No terminado o cancelado";
$lang['ProdClass1'] = "Classification 1";
$lang['ProdClasses1'][1] = "Software";
$lang['ProdClasses1'][2] = "Hardware";
$lang['ProdClasses1'][3] = "Consultoría";
$lang['ProdClass2'] = "Classification 2";
$lang['ProdClasses2'][1] = "North Region";
$lang['ProdClasses2'][2] = "South Region";
$lang['ProdPrice'] = "Precio";
$lang['ProdCost'] = "Costo";
$lang['ProdNotes'] = "Notas";
$lang['ProdTasks'] = "Tareas";
$lang['ProdFiles'] = "Archivos";
$lang['SearchForProd'] = "Buscar un producto/proyecto";
$lang['SearchForProdExt']= "Búsqueda avanzada de un producto/proyecto";
$lang['ProdCreateInfo'] = "Crear un nuevo producto/proyecto";
$lang['ProdDelInfo'] = "Eliminar producto/proyecto %s";
$lang['ProdModInfo'] = "Modificar producto/proyecto %s";
$lang['ProdCreator'] = "Creado por";
$lang['ProdCreation'] = "creado el %s por %s";
$lang['ProdCreationS'] = "creado el";
$lang['ProdStart'] = "inicio est.";
$lang['ProdEnd'] = "fin est.";
$lang['ProdProb'] = "Probabilidad";
$lang['ProdModifyT'] = "Modificar estre producto/proyecto";
$lang['ProdCreateT'] = "Crear un nuevo producto/proyecto";
$lang['ProdSelInfo'] = "(dejar vacío para ver todos los productos/proyectos)";
$lang['ProdLinkInfo'] = "Ver producto/proyecto %s";
$lang['ProdBetween'] = "creado entre";
$lang['ProdLinks'] = "Marcadores";
$lang['ProdMailbox'] = "Buzón";
$lang['ProdStats'] = "Estadísticas";
$lang['ProdStatsInfo'] = "Estadísticas de estos productos/proyectos";
$lang['ProdStatsTitle'] = "Estadísticas de Producto/Projecto";
$lang['ProdFields'] = "Campos";
# Mailboxes
$lang['MailboxName'] = "Nombre de buzón de correo";
$lang['MailboxHost'] = "Servidor";
$lang['MailboxPort'] = "Puerto";
$lang['MailboxProt'] = "Protocolo";
$lang['MailboxUser'] = "Usuario";
$lang['MailboxPass'] = "Contraseña";
$lang['MailboxPath'] = "Camino";
$lang['MailboxEmail'] = "Email";
$lang['MailboxSender'] = "Emisor";
$lang['MailboxSubject'] = "Asunto";
$lang['MailboxSDate'] = "Fecha envío";
$lang['MailboxFlags'] = "Marcadores";
$lang['MailboxOverview'] = "Vista general buzón";
$lang['MailboxSearch'] = "Búsqueda buzón";
$lang['MailboxDetail'] = "Ver correo en el buzón";
$lang['MailboxModify'] = "Modificar buzón";
$lang['MailboxCreate'] = "Crear buzón";
$lang['MailboxModifyI'] = "Cambiar buzón %s";
$lang['MailboxCreateI'] = "Definir un buzón para %s";
$lang['SearchForMail'] = "Buscar %s Buzón %s";
$lang['MailboxSelInfo'] = "(dejar vacío para ver todos los mensajes)";
$lang['MailSendTo'] = "Enviar correo a %s";
$lang['MailDate'] = "Fecha";
$lang['MailFrom'] = "De";
$lang['MailTo'] = "Para";
$lang['MailCc'] = "Cc";
$lang['MailSubject'] = "Asunto";
$lang['MailSize'] = "Tamaño";
$lang['MailSent'] = "enviando correo '%s' a %s.";
$lang['MailSentCc'] = "enviando correo '%s' (Cc) a %s.";
$lang['MailCard'] = "Tarjeta de %s";
$lang['MailboxDelI'] = "Borrar buzones de correo %s";
$lang['Mail'] = "mail";
# ACL
$lang['AclModify'] = "Modificar permisos";
$lang['AclModifyI'] = "Modificar permisos para %s";
$lang['AclDetail'] = "Detalle permisos";
$lang['AclDetailI'] = "Ver permisos para %s";
$lang['permissions'] = "permisos";
$lang['ACLsee'] = "ver permisos";
$lang['ACLmod'] = "modificar permisos";
$lang['ACLread'] = "ver";
$lang['ACLmodify'] = "modificar";
$lang['ACLdelete'] = "eliminar";
$lang['ACLreadI'] = "usuarios y equipos que podrán ver %s";
$lang['ACLmodI'] = "usuarios y equipos que podrán modificar %s";
$lang['ACLdelI'] = "usuarios y equipos que podrán borrar %s";
$lang['ACLOverview'] = "Permissions Overview";
$lang['ACLOverviewI'] = "see all permissions";
# Tasks
$lang['Task'] = "Tarea";
$lang['Tasks'] = "Tareas";
$lang['TaskDetail'] = "Detalle tarea";
$lang['TaskCreate'] = "Crear tarea";
$lang['TaskCreateInfo'] = "crear una nueva subtarea de %s";
$lang['TaskDelete'] = "Eliminar tarea %s";
$lang['TaskModify'] = "Modificar tarea %s";
$lang['TaskOverview'] = "Vista general de tareas";
$lang['TaskOverviewInfo']= "Ver tareas para %s";
$lang['TaskName'] = "Nombre";
$lang['TaskState'] = "Estado";
$lang['TaskDesc'] = "Trabajos";
$lang['TaskWorker'] = "Trabajador";
$lang['TaskVolumeFull'] = "Horas de trabajo";
$lang['TaskVolumeDone'] = "Horas de trabajo hechas";
$lang['TaskSubTask'] = "Subtarea de";
$lang['hours'] = "horas";
$lang['TaskCreation'] = "Creado por %s el %s";
$lang['TaskStates'][0] = "Pre";
$lang['TaskStates'][1] = "En curso";
$lang['TaskStates'][2] = "Acabado";
$lang['TaskStates'][3] = "Retrasado";
$lang['TaskS_Start'] = "inicio planificado";
$lang['TaskS_End'] = "fin planificado";
$lang['TaskSched'] = "planificado";
$lang['TaskReal'] = "real";
$lang['TaskLinkInfo'] = "Ver tareas %s";
$lang['TaskCompleted'] = "Completado %3.2f porciento";
$lang['Completed'] = "Completado";
# Gantt Diagramm
$lang['GanttLink'] = "Ver diag. Gantt";
$lang['GanttLinkInfo'] = "Diagrama de Gantt";
$lang['GanttTitle'] = "Diagrama de GANTT";
$lang['GanttStart'] = "Fecha Inicial";
$lang['GanttEnd'] = "Fecha Final";
$lang['GanttVolume'] = "cantidad de horas";
$lang['GanttCompletion'] = "Completo";
# Installations
$lang['Installation'] = "Instalación";
$lang['Installations'] = "Instalaciones";
$lang['InstDetail'] = "Detalle instalación";
$lang['InstModify'] = "Modificar instalación";
$lang['InstCreate'] = "Crear instalación";
$lang['InstOverview'] = "Vista general de instalación";
$lang['InstalledBy'] = "instalado por";
$lang['SoldBy'] = "vendido por";
$lang['Customer'] = "cliente";
$lang['Money'] = "precio";
$lang['Currency'] = "moneda";
$lang['InstLinkI'] = "Ver instalación";
$lang['InstCreateI'] = "Crear nueva instalación";
$lang['InstModifyI'] = "Modificar instalación";
$lang['InstDelI'] = "Eliminar instalación %s";
# Company
$lang['Company'] = "Empresa";
$lang['CompanySearch'] = "Buscar empresa";
$lang['CompanyOverview'] = "Vista general de empresa";
$lang['CompanyDetail'] = "Detalle empresa";
$lang['CompanyModify'] = "Modificar empresa";
$lang['CompanyCreate'] = "Crear empresa";
$lang['CompanyCreateInfo'] = "crear una nueva empresa";
$lang['CompanyApps'] = "Reuniones con esta empresa";
$lang['CompanyLinks'] = "Marcador";
$lang['CompanyChgInfo'] = "Modificar empresa %s";
$lang['CompanyDelInfo'] = "Eliminar empresa %s";
$lang['CompanyMembers'] = "Personal sin departamento";
$lang['CompanyLinkInfo'] = "Ver empresa %s";
# Department
$lang['Department'] = "departamento";
$lang['Departments'] = "departamentos";
$lang['DepartmentSearch'] = "Buscar departamento";
$lang['DepartmentOverview'] = "Vista general departamento";
$lang['DepartmentDetail'] = "Detalles departamento";
$lang['DepartmentModify'] = "Modificar departamento";
$lang['DepartmentCreate'] = "Crear departamento";
$lang['DepCreateInfo'] = "crear un nuevo departamento";
$lang['DepartmentMembers'] = "miembros del departamento";
$lang['DepartmentApps'] = "Reuniones con este departamento";
$lang['DepartmentLinks'] = "Marcador";
$lang['DepLinkInfo'] = "Ver el departamento %s de %s";
$lang['DepChgInfo'] = "Modificar departamento %s";
$lang['DepDelInfo'] = "Eliminar departamento %s";
# Team
$lang['Team'] = "equipo";
$lang['Teams'] = "equipos";
$lang['TeamOverview'] = "Vista general de equipo";
$lang['TeamDetail'] = "Detalle equipo";
$lang['TeamModify'] = "Modificar equipo";
$lang['TeamCreate'] = "crear equipo";
$lang['TeamMember'] = "miebros del equipo";
$lang['TeamPosMember'] = "posibles miembros";
$lang['TeamMail'] = "correo al equipo";
$lang['TeamMailInfo'] = "Envíar un correo al equipo %s";
$lang['TeamApps'] = "Ver citas del equipo %s";
$lang['TeamLinkInfo'] = "Ver equipo %s";
$lang['TeamManager'] = "Responsable equipo";
$lang['TeamName'] = "nombre equipo";
$lang['TeamCreation'] = "creado el";
$lang['TeamCount'] = "n. miembros";
$lang['TeamOverviewInfo'] = "ver lista de todos los equipos";
$lang['TeamCreateI'] = "crear un nuevo equipo";
$lang['TeamDeleteI'] = "Eliminar equipo %s";
$lang['TeamModifyI'] = "modificar equipo %s";
# Notes
$lang['Note'] = "Nota";
$lang['Notes'] = "Notas";
$lang['NoteCreate'] = "Crear una nota";
$lang['NoteCreateInfo'] = "Crear una nueva nota para %s";
$lang['NoteDelete'] = "Eliminar esta nota";
$lang['NoteDescription'] = "Descripción";
$lang['NoteRemember'] = "Remember on:";
$lang['NoteName'] = "Titulo";
$lang['NoteDetail'] = "Ver nota";
$lang['NoteOverview'] = "Vista general nota";
$lang['NoteCreation'] = "Crear nota";
$lang['NoteMod'] = "Modificar nota";
$lang['NoteReference'] = "Referencia";
$lang['ModOldNote'] = "modificar una nota vieja";
$lang['NoteCreator'] = "creada por";
$lang['NoteLinkInfo'] = "nota desde %s";
$lang['NoteSearch'] = "Note Search";
$lang['SearchForNote'] = "Search for a note";
$lang['SearchForNoteExt'] = "extended Search for a note";
$lang['NoteSelInfo'] = "(dejar en blanco para ver todas las notas)";
$lang['NoteRefType'] = "Tipo de referencia";
$lang['NoteRefName'] = "Nombre de referencia";
$lang['NoteBetween'] = "creado entre";
$lang['NotesOverview'] = "Resumen de Nota";
# Address
$lang['AddressSearch'] = "Buscar dirección";
$lang['AddressOverview'] = "Vista general dirección";
$lang['AddressDetail'] = "Detalle dirección";
$lang['Address'] = "dirección";
$lang['AddressEntries'] = "Entradas de la libreta de direcciones";
$lang['AdrLocChange'] = "modificar una dirección de %s";
$lang['AdrLocCreate'] = "crear una dirección para %s";
$lang['AdrBMod'] = "Modificar datos base";
$lang['AdrBModInfo'] = "modificar datos base de %s";
$lang['AdrBDel'] = "Eliminar datos básicos";
$lang['AdrBDelInfo'] = "eliminar los datos base y todas las direcciones de %s";
$lang['AdrBNew'] = "Crear base";
$lang['AdrBNewInfo'] = "Crear nuevos datos base";
$lang['AdrCreateInfo'] = "crear una nueva dirección";
$lang['AdrLNew'] = "nueva dirección";
$lang['AdrLNewInfo'] = "crear una nueva dirección para %s";
$lang['AdrName'] = "Nombre";
$lang['AdrMailInfo'] = "envíar correo a %s";
$lang['AdrGetVcard'] = "Bajar Vcard";
$lang['AdrGetVcardI'] = "Bajar esta dirección como una Vcard";
$lang['AdrSeeEntry'] = "Ver entrada";
$lang['AdrSeeEntryI'] = "Ver entrada en libro de direcciones de %s";
$lang['AdrLocTitle'] = "dirección de %s";
$lang['AdrBNewTitle'] = "Introduzca nueva dirreción base";
$lang['AdrBChangeTitle'] = "modificar datos base";
$lang['Location'] = "ubicación";
$lang['Location2'] = "donde";
$lang['AdrFirstName'] = "Nombre";
$lang['AdrMiddleName'] = "Iniciales";
$lang['AdrLastName'] = "Apellidos";
$lang['AdrBirthday'] = "Fecha nacimiento";
$lang['AdrPicture'] = "Foto";
$lang['AdrCat1'] = "Casa";
$lang['AdrCat2'] = "Oficina";
$lang['AdrCpLoc'] = "Copia dirección de compañía";
$lang['ZIP'] = "Código postal";
$lang['State'] = "País";
$lang['Country'] = "Estado";
$lang['Street'] = "Calle";
$lang['City'] = "Ciudad";
$lang['Phone'] = "teléfono";
$lang['AdrFax'] = "fax";
$lang['AdrEmail'] = "Email";
$lang['ChangeLocInfo'] = "Modifica la dirección '%s' de %s";
$lang['DeleteLocInfo'] = "Eliminar la dirección '%s' de %s";
$lang['AdrLinks'] = "Marcadores";
$lang['AdrCategory'] = "Categoría";
$lang['AdrDescription'] = "Descripción de la dirección";
$lang['ShowCal'] = "Ver citas de '%s'";
$lang['SearchForAdr'] = "Buscar en la libreta de direcciones";
$lang['SearchForAdrExt'] = "Búsqueda avanzada en la libreta de direcciones";
$lang['SearchForCmp'] = "Buscar una empresa";
$lang['SearchLdapAdr'] = "Búsqueda en Internet";
$lang['LDAPServer'] = "Servidor";
# URL
$lang['URLName'] = "Descripción";
$lang['URL'] = "Marcador";
$lang['URLAdd'] = "Añadir marcador";
$lang['URLDel'] = "Eliminar marcador";
# Main Menu
$lang['Calendar'] = "Calendario";
$lang['Addresses'] = "Direcciones";
$lang['BugTrack'] = "Fallos";
$lang['ProductMenu'] = "Productos/Proyectos";
$lang['Logout'] = "Salir";
$lang['CalendarInfo'] = "Citas de hoy";
$lang['AddressesInfo'] = "Buscar direccion";
$lang['BugTrackInfo'] = "Base de datos de fallos";
$lang['ProductInfo'] = "Productos y Proyectos";
$lang['LogoutInfo'] = "Salir del sistema";
# Help
$lang['Help'] = "ayuda";
$lang['HelpInfo'] = "ayuda para esta pagina";
# Resource
$lang['ResCal'] = "Uso de recursos";
$lang['ResCalDetail'] = "Uso de recursos de %s en %s";
# Filehandling
$lang['File'] = "Archivo";
$lang['Files'] = "Archivos";
$lang['FileDetail'] = "Detalles archivo";
$lang['FileOverview'] = "Vista general archivo";
$lang['FileMod'] = "Modificar archivo";
$lang['FileModifyI'] = "Modificar archivo %s";
$lang['FileDeleteI'] = "Eliminar archivo %s";
$lang['FileCreation'] = "Añadir archivo";
$lang['FileCreate'] = "Añadir archivo";
$lang['FileCreateInfo'] = "Añadir un archivo a %s";
$lang['FileNameDoc'] = "Nombre archivo";
$lang['FileName'] = "Nombre original";
$lang['FileSize'] = "Tamaño";
$lang['FileType'] = "Tipo";
$lang['FileAuthor'] = "Autor";
$lang['FileMore'] = "Información adicional";
$lang['FileLog'] = "Historial";
$lang['FileVersion'] = "Versión";
$lang['FileReference'] = "Referencia";
$lang['FileLockedBy'] = "bloqueado por";
$lang['FileOldVersion'] = "versiones anteriores";
$lang['FileLocking'] = "Bloqueo";
$lang['FileUnlocked'] = "desbloqueado";
$lang['FileLocked'] = "el archivo ha sido bloqueado por %s";
$lang['FileOverwrite'] = "sobrescribir archivo %s";
$lang['FileSave'] = "guardar el archivo %s como versión %s";
$lang['FileShow'] = "Ver archivo";
$lang['FileShowI'] = "Ver archivo %s";
$lang['FileDownload'] = "Descargar";
$lang['FileDownloadI'] = "Descargar archivo %s";
$lang['FileVersionType'] = "Control de versiones";
$lang['FileVersionTypeI']= "(no se puede cambiar después)";
$lang['FileVersioning'] = "Control de versiones";
$lang['FileVersioningI'] = "Si hay un nombre de archivo.";
$lang['FileSearch'] = "Document Search";
$lang['SearchForFile'] = "Document Search";
$lang['SearchForFileExt']= "Extended Document Search";
# MAP
$lang['MapSearch'] = "Seleccionar mapa";
$lang['MapHeader'] = "Obtener un mapa desde %s";
# History
$lang['HistoryDetail'] = "Historial de %s";
$lang['HistoryShow'] = "Historial de %s %s";
$lang['HistoryFld'] = "Campo";
$lang['HistoryOldV'] = "Valor anterior";
$lang['HistoryNewV'] = "Valor nuevo";
$lang['HistoryLink'] = "ver historial";
$lang['HistoryLinkI'] = "ver historial de %s";
$lang['HistoryDeleted'] = "borrado";
#Timetrack
$lang['Timetrack'] = "Control de horas";
$lang['TimetrackCreate'] = "Introducir horas";
$lang['TimetrackCreateI'] = "introducir horas empleadas en %s";
$lang['TimetrackDelI'] = "eliminar horas de %s";
$lang['TimetrackNew'] = "Nueva introducción de horas";
$lang['TimetrackModify'] = "Modificar horas";
$lang['TimetrackOverview'] = "Vista general de horas";
$lang['TimetrackWorker'] = "Empleado";
$lang['TimetrackRef'] = "Referencia";
$lang['TimetrackDate'] = "Fecha";
$lang['TimetrackSearch'] = "Búsqueda timetrack";
$lang['SearchForTT'] = "Búsqueda timetrack";
$lang['SearchForTTExt'] = "Búsqueda avanzada de timetrack";
$lang['TimetrackBetween'] = "entre";
$lang['TimetrackBooked'] = "tiempo introducido";
$lang['TimetrackBookedI'] = "tiempo introducido para %s";
$lang['TTStatsTitle'] = "Estadísticas de Timetrack";
# Fax
$lang['FaxCreate'] = "Nuevo FAX";
$lang['FaxSendTo'] = "Enviar un fax a %s";
$lang['FaxTo'] = "Para:";
$lang['FaxNr'] = "No. FAX:";
$lang['FaxNote'] = "Salvar este fax como una nota para %s";
$lang['FaxSpooledTo'] = "Fax fue encolado para %s";
# SMS
$lang['SMSCreate'] = "SMS";
$lang['SMSSendTo'] = "Enviar un SMS a %s";
# WatchList
$lang['WatchAdd'] = "Agregar a watchlist";
$lang['WatchAddI'] = "Agregar %s a tu watchlist";
$lang['WatchDel'] = "Borrar de watchlist";
$lang['WatchDelI'] = "Borrar %s de tu watchlist";
$lang['WatchOverview'] = "Watchlist";
$lang['WatchOverviewI'] = "Ver watchlist para %s";
$lang['Watcher'] = "Observador";
# Resource
$lang['Resource'] = "Recurso";
$lang['Resources'] = "Recursos";
$lang['ResDetail'] = "Detalle de Recurso";
$lang['ResCreate'] = "Crear Recurso";
$lang['ResModify'] = "Modificar Recurso";
$lang['ResModifyI'] = "Modificar Recurso %s";
$lang['ResName'] = "Nombre";
$lang['ResDesc'] = "Descripción";
$lang['ResShow'] = "Mostrar Recurso %s";
$lang['ResUsage'] = "Uso de Recurso";
$lang['ResOverview'] = "Resumen de Recurso";
$lang['ResDelI'] = "borrar Recurso %s";
# Admin Pages
$lang['AdminShow'] = "Administración";
$lang['AdminDBInfo'] = "Información de Base de Datos";
$lang['AdminDBTable'] = "Tabla";
$lang['AdminDBCount'] = "Entradas";
$lang['AdminDBName'] = "Nombre de Base de Datos";
$lang['AdminDBAlias'] = "Database Alias";
$lang['AdminDBUser'] = "Usuario de Base de Datos";
$lang['AdminDBPass'] = "Password";
$lang['AdminDBHost'] = "Host";
$lang['AdminDBPort'] = "Puertos";
$lang['AdminDBType'] = "Type";
$lang['AdminDBHome'] = "ORA_HOME";
$lang['AdminLoginInfo'] = "Conecciones Recientes";
$lang['AdminDBSync'] = "Database Sync";
$lang['AdminDBSource'] = "Source DB";
$lang['AdminDBWhat'] = "What/How";
$lang['AdminDBTarget'] = "Target DB";
$lang['AdminDBRep'] = "File Repository";
# Database
$lang['DB'] = "Database";
$lang['DBInit'] = "Initialización de Base de Datos";
$lang['DBModify'] = "Database Modify";
$lang['DBModifyI'] = "Modify DB %s";
$lang['DBCreate'] = "Database Create";
$lang['DBDetail'] = "Database Detail";
$lang['DBLastDate'] = "LastSync Date";
$lang['DBCurrID'] = "ID";
$lang['DBLastID'] = "LastSync ID";
$lang['DBrelogin'] = "use Database";
$lang['DBreloginI'] = "relogin on %s";
# Permissions
$lang['perm'][usecalendar] = "usar calendario";
$lang['perm'][usebugtracking] = "usar seguimeinto de fallos";
$lang['perm'][usedocmanagement] = "usar admin. documentos";
$lang['perm'][useinstmanagement] = "usar instalaciones";
$lang['perm'][usetaskmanagement] = "usar tareas";
$lang['perm'][usenotes] = "usar notas";
$lang['perm'][usemaplink] = "usar maplink";
$lang['perm'][useprojects] = "usar proyectos";
$lang['perm'][usetimetrack] = "usar timetrack";
$lang['perm'][usefax] = "usar fax";
$lang['perm'][usesms] = "usar sms";
$lang['perm'][useoverlib] = "usar popups";
$lang['perm'][usewatchlist] = "usar watchlist";
$lang['perm'][useresource] = "usar recursos";
$lang['perm'][useaddressbook] = "usar libros de dirrecciones";
$lang['perm'][usemailboxes] = "usar buzones de correo";
$lang['perm'][usemail] = "usar correo";
$lang['perm'][useldap] = "usar LDAP";
$lang['FeatureOff'] = "Caraterística globalmente desabilitada";
# Error Messages
$lang['Err0001'] = "No hay participantes !";
$lang['Err0002'] = "inicio después de fin !";
$lang['Err0003'] = "Falta descripción de cita !";
$lang['Err0004'] = "Producto desconocido <I>%s</I> !";
$lang['Err0005'] = "La descripción <I>%s</I> sirve para <B>%d</B> productos !";
$lang['Err0006'] = "Por favor haga una selección detallada";
$lang['Err0007'] = "Cliente desconocido. <I>%s</I> no se ha encontrado en la <A HREF=address_select.php>libreta de direcciones</A>";
$lang['Err0008'] = "Nombre cliente <I>%s</I> sirve para %d Entradas";
$lang['Err0009'] = "Por favor rellene el campo <I>%s</I>";
$lang['Err0010'] = "Nombre departamento <I>%s</I> sirve para <B>%d</B> departamentos !";
$lang['Err0011'] = "Nombre empresa <I>%s</I> sirve para <B>%d</B> empresa !";
$lang['Err0012'] = "Empresa desconocida <I>%s</I> !";
$lang['Err0013'] = "Departamento desconocido <I>%s</I> !";
$lang['Err0014'] = "Por favor haga su selección en el campo <I>%s</I>";
$lang['Err0015'] = "No se permiten modificaciones !";
$lang['Err0016'] = "No tiene permiso para eliminar la nota !";
$lang['Err0017'] = "Por favor introduzca un numero en el campo <I>%s</I> field !";
$lang['Err0018'] = "El nombre <I>%s</I> sirve para %d entradas";
$lang['Err0019'] = "Persona desconocida <I>%s</I> !";
$lang['Err0020'] = "No tiene permiso para elimnar el archivo!";
$lang['Err0021'] = "No se puede modificar el equipo virtual 0";
$lang['Err0022'] = "Lo siento, no tiene permiso para ver %s";
$lang['Err0023'] = "Lo siento, no tiene permiso para eliminar %s";
$lang['Err0024'] = "Lo siento, no tiene permiso para modificar %s";
$lang['Err0025'] = "Usuario o Password Faltante";
$lang['Err0026'] = "Login no es posible";
$lang['Err0027'] = "Login fallo";
$lang['Err0028'] = "No hay Productos/Proyectos definidos";
$lang['Err0029'] = "No hay Productos/Proyectos visibles";
$lang['Err0030'] = "Fax no fue encolado !";
$lang['Err0031'] = "Falta Número de Fax !";
$lang['Err0032'] = "Envio de fax desabilitado !";
$lang['Err0033'] = "envio de correo desabilitado ! El correo \"%s\" <U>no</U> fue enviado.";
$lang['Err0034'] = "correo no enviado ! faltas remitentes \"%s\" del mensaje.";
$lang['Err0035'] = "correo no enviado ! no tiene destinatario.";
$lang['Err0036'] = "El Producto/Proyecto ya existe aqui (%s) el Nombre y Versión dados !";
$lang['Err0037'] = "el correo '%s' no fue enviado ! Falta Archivo de Prototipo de Correo (%s) !";
$lang['Err0038'] = "Fecha invalida en el campo %s!";
$lang['Err0039'] = "Entrada de directorio ya existe aqui (%s) !";
$lang['Err0040'] = "%s no encontrado !";
$lang['Err0041'] = "Los Passwords no son identicos !";
$lang['Err0042'] = "El Password anterior es incorrecto !";
$lang['Err0043'] = "La dirección %s no esta en el formato de dirección valido (xx...@ab...) !";
$lang['Err0044'] = "La Compañía ya existe aqui (%s) !";
$lang['Err0045'] = "El Departmento ya existe aqui (%s) !";
$lang['Err0046'] = "El Equipo ya existe aqui (%s) !";
$lang['Err0047'] = "No se pudo eliminar los privilegios de admin. Debe haber por lo menos un admin !";
$lang['Err0048'] = "Nada encontrado !";
### Local Variables: ***
### End: ***
?>
Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -r1.78 -r1.79
*** webelements.p3 2001/09/13 14:49:48 1.78
--- webelements.p3 2001/09/13 19:08:00 1.79
***************
*** 83,87 ****
include("en.p3");
if ( ereg("^en-us", "$tok" ) ) {
! include("en-us.p3");
}
$tutos[lang] = $tok;
--- 83,87 ----
include("en.p3");
if ( ereg("^en-us", "$tok" ) ) {
! include("en-us.p3");
}
$tutos[lang] = $tok;
***************
*** 104,111 ****
return;
}
if ( ereg("^es", "$tok" ) ) {
! include("en.p3");
$tutos[lang] = $tok;
! ReadCustomLang($lang,"de");
return;
}
--- 104,117 ----
return;
}
+ if ( ereg("^es-mx", "$tok" ) ) {
+ include("es-mx.p3");
+ $tutos[lang] = $tok;
+ ReadCustomLang($lang,"es-mx");
+ return;
+ }
if ( ereg("^es", "$tok" ) ) {
! include("es.p3");
$tutos[lang] = $tok;
! ReadCustomLang($lang,"es");
return;
}
***************
*** 120,123 ****
--- 126,135 ----
$tutos[lang] = $tok;
ReadCustomLang($lang,"ru");
+ return;
+ }
+ if ( ereg("^pt", "$tok" ) ) {
+ include("pt-br.p3");
+ $tutos[lang] = $tok;
+ ReadCustomLang($lang,"pt");
return;
}
Index: pt-br.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/pt-br.p3,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** pt-br.p3 2001/09/10 19:39:23 1.36
--- pt-br.p3 2001/09/13 19:08:00 1.37
***************
*** 91,94 ****
--- 91,95 ----
$lang['lang']['fr'] = "francês";
$lang['lang']['es'] = "espanhol";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "italiano";
$lang['lang']['tw'] = "chinês tradicional";
Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/de.p3,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** de.p3 2001/09/11 15:29:10 1.70
--- de.p3 2001/09/13 19:08:00 1.71
***************
*** 91,94 ****
--- 91,95 ----
$lang['lang']['fr'] = "Französisch";
$lang['lang']['es'] = "Spanisch";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "Italienisch";
$lang['lang']['tw'] = "Traditionelles Chinesisch";
Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/en.p3,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** en.p3 2001/09/10 19:39:23 1.64
--- en.p3 2001/09/13 19:08:00 1.65
***************
*** 91,94 ****
--- 91,95 ----
$lang['lang']['fr'] = "french";
$lang['lang']['es'] = "spanish";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "italian";
$lang['lang']['tw'] = "Traditional chinese";
Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/es.p3,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** es.p3 2001/09/10 19:39:23 1.49
--- es.p3 2001/09/13 19:08:00 1.50
***************
*** 93,96 ****
--- 93,97 ----
$lang['lang']['fr'] = "Francés";
$lang['lang']['es'] = "Castellano";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "Italiano";
$lang['lang']['tw'] = "Traditional Chinese";
***************
*** 751,758 ****
$lang['AdminDBRep'] = "File Repository";
-
# Database
$lang['DB'] = "Database";
! $lang['DBInit'] = "Database Initialization";
$lang['DBModify'] = "Database Modify";
$lang['DBModifyI'] = "Modify DB %s";
--- 752,758 ----
$lang['AdminDBRep'] = "File Repository";
# Database
$lang['DB'] = "Database";
! $lang['DBInit'] = "Initialización de Base de Datos";
$lang['DBModify'] = "Database Modify";
$lang['DBModifyI'] = "Modify DB %s";
Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/fr.p3,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** fr.p3 2001/09/10 19:39:23 1.48
--- fr.p3 2001/09/13 19:08:00 1.49
***************
*** 93,96 ****
--- 93,97 ----
$lang['lang']['fr'] = "Francais";
$lang['lang']['es'] = "Espagnol";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "Italien";
$lang['lang']['tw'] = "Chinois";
Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/it.p3,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** it.p3 2001/09/10 19:39:23 1.57
--- it.p3 2001/09/13 19:08:00 1.58
***************
*** 91,94 ****
--- 91,95 ----
$lang['lang']['fr'] = "francese";
$lang['lang']['es'] = "spagnolo";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "italiano";
$lang['lang']['tw'] = "Chinese tradizionale";
Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ko.p3,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** ko.p3 2001/09/10 19:39:23 1.23
--- ko.p3 2001/09/13 19:08:00 1.24
***************
*** 91,94 ****
--- 91,95 ----
$lang['lang']['fr'] = "french";
$lang['lang']['es'] = "spanish";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "italian";
$lang['lang']['tw'] = "Traditional chinese";
Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/nl.p3,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** nl.p3 2001/09/10 19:39:23 1.16
--- nl.p3 2001/09/13 19:08:00 1.17
***************
*** 93,96 ****
--- 93,97 ----
$lang['lang']['fr'] = "frans";
$lang['lang']['es'] = "spaans";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "italiaans";
$lang['lang']['tw'] = "Traditioneel chinees";
Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/pl.p3,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** pl.p3 2001/09/10 19:39:23 1.21
--- pl.p3 2001/09/13 19:08:00 1.22
***************
*** 97,100 ****
--- 97,101 ----
$lang['lang']['fr'] = "francuski";
$lang['lang']['es'] = "hiszpañski";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "w³oski";
$lang['lang']['tw'] = "chiñski tradycyjny";
Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ru.p3,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** ru.p3 2001/09/10 19:39:23 1.43
--- ru.p3 2001/09/13 19:08:00 1.44
***************
*** 91,94 ****
--- 91,95 ----
$lang['lang']['fr'] = "ÆÒÁÎÃÕÚÓËÉÊ";
$lang['lang']['es'] = "ÉÓÐÁÎÓËÉÊ";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "ÉÔÁÌØÑÎÓËÉÊ";
$lang['lang']['tw'] = "ËÉÔÁÊÓËÉÊ (ÓÌÏÖÎÙÊ)";
Index: tw.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/tw.p3,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** tw.p3 2001/09/10 19:39:23 1.43
--- tw.p3 2001/09/13 19:08:00 1.44
***************
*** 95,98 ****
--- 95,99 ----
$lang['lang']['fr'] = "french";
$lang['lang']['es'] = "spanish";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "italian";
$lang['lang']['tw'] = "Traditional Chinese";
Index: zh.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/zh.p3,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** zh.p3 2001/09/10 19:39:23 1.43
--- zh.p3 2001/09/13 19:08:00 1.44
***************
*** 95,98 ****
--- 95,99 ----
$lang['lang']['fr'] = "french";
$lang['lang']['es'] = "spanish";
+ $lang['lang']['es-MX'] = "Español/México";
$lang['lang']['it'] = "italian";
$lang['lang']['tw'] = "Traditional Chinese";
|
|
From: Gero K. <gok...@us...> - 2001-09-13 19:08:06
|
Update of /cvsroot/tutos/tutos In directory usw-pr-cvs1:/tmp/cvs-serv10262 Modified Files: Makefile.in ChangeLog Log Message: added mexican spanish Index: Makefile.in =================================================================== RCS file: /cvsroot/tutos/tutos/Makefile.in,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -r1.65 -r1.66 *** Makefile.in 2001/09/12 21:20:55 1.65 --- Makefile.in 2001/09/13 19:07:59 1.66 *************** *** 11,14 **** --- 11,17 ---- # # $Log$ + # Revision 1.66 2001/09/13 19:07:59 gokohnert + # added mexican spanish + # # Revision 1.65 2001/09/12 21:20:55 gokohnert # new mexican holiday support *************** *** 375,378 **** --- 378,382 ---- php/fr.p3 \ php/es.p3 \ + php/es-mx.p3 \ php/it.p3 \ php/tw.p3 \ *************** *** 957,960 **** --- 961,965 ---- cut -f1 -d "=" php/pl.p3 | grep "^.lang" > l.pl cut -f1 -d "=" php/nl.p3 | grep "^.lang" > l.nl + cut -f1 -d "=" php/es-mx.p3 | grep "^.lang" > l.mx cut -f1 -d "=" php/pt-br.p3 | grep "^.lang" > l.pt @echo "----------------------------------------" *************** *** 978,981 **** --- 983,988 ---- @echo "----------------------------------------" -diff l.en l.pt + @echo "----------------------------------------" + -diff l.en l.mx @echo "----------------------------------------" -diff l.en l.nl Index: ChangeLog =================================================================== RCS file: /cvsroot/tutos/tutos/ChangeLog,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -r1.61 -r1.62 *** ChangeLog 2001/09/12 15:46:06 1.61 --- ChangeLog 2001/09/13 19:07:59 1.62 *************** *** 1,3 **** --- 1,9 ---- $Header$ + September 13 2001 + * added mexican spanish translation < hcartagena at si-mx.com > + September 12 2001 + * added mexican holidays < hcartagena at si-mx.com > holiday_mx.pinc + September 11 2001 + * moved holidays to own files September 9 2001 * added a new database table "tutos_dbs" to store info about |
|
From: Gero K. <gok...@us...> - 2001-09-13 15:12:21
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv14040/php
Modified Files:
url.pinc
Log Message:
translation
Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url.pinc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** url.pinc 2001/09/11 19:41:36 1.24
--- url.pinc 2001/09/13 15:12:18 1.25
***************
*** 52,56 ****
showfieldc($lang['URLName'],1);
echo " <TD COLSPAN=2><INPUT SIZE=50 MAXLENGTH=200 name=\"urlname\" value=\"\"></TD>\n";
! echo " <TD ROWSPAN=2><CENTER><input type=\"submit\" value=\" Enter \"></CENTER></TD>\n";
echo " </TR><TR>\n";
showfieldc($lang['URL'],1);
--- 52,56 ----
showfieldc($lang['URLName'],1);
echo " <TD COLSPAN=2><INPUT SIZE=50 MAXLENGTH=200 name=\"urlname\" value=\"\"></TD>\n";
! echo " <TD ROWSPAN=2><CENTER><input type=\"submit\" value=\"". $lang['Enter'] ."\"></CENTER></TD>\n";
echo " </TR><TR>\n";
showfieldc($lang['URL'],1);
|
|
From: Gero K. <gok...@us...> - 2001-09-13 14:49:51
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv6941/php
Modified Files:
company_new.php bug_new.php address_new.php department_new.php
file_new.php mailbox_new.php note_new.php product_new.php
resource_new.php task_new.php team_new.php timetrack_new.php
user_new.php webelements.p3
Log Message:
html fixes by using entities
Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** company_new.php 2001/09/10 16:40:40 1.13
--- company_new.php 2001/09/13 14:49:48 1.14
***************
*** 46,50 ****
echo "<INPUT type=hidden name=\"department\" value=\"\">\n";
} else {
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". $c->name ."\"></TD>\n";
}
echo "</TR>\n";
--- 46,50 ----
echo "<INPUT type=hidden name=\"department\" value=\"\">\n";
} else {
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". htmlentities($c->name) ."\"></TD>\n";
}
echo "</TR>\n";
***************
*** 53,96 ****
echo "<TR>\n";
showfieldc($lang['AdrDescription'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"lname\" value=\"". $loc->lname ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Phone'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"phone_1\" value=\"". $loc->phone_1 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdrFax'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"fax_1\" value=\"". $loc->fax_1 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdrEmail'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"email_1\" value=\"". $loc->email_1 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Street'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"street1\" value=\"". $loc->street1 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Street'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"street2\" value=\"". $loc->street2 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['City'],0);
! echo "<TD COLSPAN=1><INPUT SIZE=30 MAXLENGTH=30 name=\"city\" value=\"". $loc->city ."\"></TD>\n";
showfieldc($lang['ZIP'],0);
! echo "<TD COLSPAN=2><INPUT SIZE=10 MAXLENGTH=10 name=\"zip\" value=\"". $loc->zip ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['State'],0);
! echo "<TD COLSPAN=1><INPUT SIZE=30 MAXLENGTH=30 name=\"state\" value=\"". $loc->state ."\"></TD>\n";
showfieldc($lang['Country'],0);
! echo "<TD COLSPAN=2><INPUT SIZE=3 MAXLENGTH=3 name=\"country\" value=\"". $loc->country ."\"></TD>\n";
echo "</TR>\n";
}
--- 53,96 ----
echo "<TR>\n";
showfieldc($lang['AdrDescription'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"lname\" value=\"". htmlentities($loc->lname) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Phone'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"phone_1\" value=\"". htmlentities($loc->phone_1) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdrFax'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"fax_1\" value=\"". htmlentities($loc->fax_1) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdrEmail'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"email_1\" value=\"". htmlentities($loc->email_1) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Street'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"street1\" value=\"". htmlentities($loc->street1) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Street'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"street2\" value=\"". htmlentities($loc->street2) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['City'],0);
! echo "<TD COLSPAN=1><INPUT SIZE=30 MAXLENGTH=30 name=\"city\" value=\"". htmlentities($loc->city) ."\"></TD>\n";
showfieldc($lang['ZIP'],0);
! echo "<TD COLSPAN=2><INPUT SIZE=10 MAXLENGTH=10 name=\"zip\" value=\"". htmlentities($loc->zip) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['State'],0);
! echo "<TD COLSPAN=1><INPUT SIZE=30 MAXLENGTH=30 name=\"state\" value=\"". htmlentities($loc->state) ."\"></TD>\n";
showfieldc($lang['Country'],0);
! echo "<TD COLSPAN=2><INPUT SIZE=3 MAXLENGTH=3 name=\"country\" value=\"". htmlentities($loc->country) ."\"></TD>\n";
echo "</TR>\n";
}
Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_new.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** bug_new.php 2001/09/10 16:39:04 1.18
--- bug_new.php 2001/09/13 14:49:48 1.19
***************
*** 59,63 ****
echo "<TR>\n";
showfieldc($lang['BugShort'],1);
! echo " <TD COLSPAN=3 VALIGN=top><INPUT SIZE=40 MAXLENGTH=40 name=\"short\" value=\"". $b->short ."\"></TD>";
echo "</TR>\n";
--- 59,63 ----
echo "<TR>\n";
showfieldc($lang['BugShort'],1);
! echo " <TD COLSPAN=3 VALIGN=top><INPUT SIZE=40 MAXLENGTH=40 name=\"short\" value=\"". htmlentities($b->short) ."\"></TD>";
echo "</TR>\n";
Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** address_new.php 2001/09/10 16:35:44 1.17
--- address_new.php 2001/09/13 14:49:48 1.18
***************
*** 301,309 ****
$cchecked[2] = "";
$cchecked[$varvalue] = "CHECKED";
! echo $lang['AdrCat1'] ."<INPUT type=\"radio\" name=\"$varname\" value=\"1\" $cchecked[1]>";
! echo " ". $lang['AdrCat2'] ."<INPUT type=\"radio\" name=\"$varname\" value=\"2\" $cchecked[2]>";
} elseif ( $varname == "company" ) {
if ( $mod == 1 ) {
! echo "<INPUT name=\"$varname\" size=\"$showsize\" maxlength=\"$size\" value=\"". $varvalue->company_name ."\">";
# Copy company location
if ( $varvalue->cploc == 1 ) {
--- 301,309 ----
$cchecked[2] = "";
$cchecked[$varvalue] = "CHECKED";
! echo $lang['AdrCat1'] ."<INPUT type=\"radio\" name=\"". $varname ."\" value=\"1\" $cchecked[1]>";
! echo " ". $lang['AdrCat2'] ."<INPUT type=\"radio\" name=\"". $varname ."\" value=\"2\" $cchecked[2]>";
} elseif ( $varname == "company" ) {
if ( $mod == 1 ) {
! echo "<INPUT name=\"$varname\" size=\"$showsize\" maxlength=\"". $size ."\" value=\"". htmlentities($varvalue->company_name) ."\">";
# Copy company location
if ( $varvalue->cploc == 1 ) {
***************
*** 319,327 ****
echo "$varvalue";
}
! echo "<INPUT type=\"hidden\" name=\"$varname\" value=\"$varvalue\">";
}
} else {
if ( $mod == 1 ) {
! echo "<INPUT name=\"$varname\" size=\"$showsize\" maxlength=\"$size\" value=\"$varvalue\">";
} else {
if ( $varvalue == "" ) {
--- 319,327 ----
echo "$varvalue";
}
! echo "<INPUT type=\"hidden\" name=\"". $varname ."\" value=\"". htmlentities($varvalue) ."\">";
}
} else {
if ( $mod == 1 ) {
! echo "<INPUT name=\"$varname\" size=\"". $showsize ."\" maxlength=\"". $size ."\" value=\"". htmlentities($varvalue) ."\">";
} else {
if ( $varvalue == "" ) {
***************
*** 330,334 ****
echo "$varvalue";
}
! echo "<INPUT type=\"hidden\" name=\"$varname\" value=\"$varvalue\">";
}
}
--- 330,334 ----
echo "$varvalue";
}
! echo "<INPUT type=\"hidden\" name=\"". $varname ."\" value=\"". htmlentities($varvalue) ."\">";
}
}
Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** department_new.php 2001/09/10 16:40:40 1.11
--- department_new.php 2001/09/13 14:49:48 1.12
***************
*** 41,45 ****
echo "<INPUT type=hidden name=\"d_id\" value=\"". $d->id ."\">\n";
} else {
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". $d->name ."\"></TD>\n";
}
echo "</TR>\n";
--- 41,45 ----
echo "<INPUT type=hidden name=\"d_id\" value=\"". $d->id ."\">\n";
} else {
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". htmlentities($d->name) ."\"></TD>\n";
}
echo "</TR>\n";
***************
*** 64,68 ****
echo "</SELECT>\n";
} else {
! echo "<INPUT name=company value=\"". $d->company->name ."\">\n";
}
echo "</TD>\n";
--- 64,68 ----
echo "</SELECT>\n";
} else {
! echo "<INPUT name=company value=\"". htmlentities($d->company->name) ."\">\n";
}
echo "</TD>\n";
***************
*** 73,114 ****
echo "<TR>\n";
showfieldc($lang['AdrDescription'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"lname\" value=\"". $loc->lname ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Phone'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"phone_1\" value=\"". $loc->phone_1 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdrFax'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"fax_1\" value=\"". $loc->fax_1 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdrEmail'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"email_1\" value=\"". $loc->email_1 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Street'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"street1\" value=\"". $loc->street1 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Street'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"street2\" value=\"". $loc->street2 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['City'],0);
! echo "<TD COLSPAN=1><INPUT SIZE=30 MAXLENGTH=30 name=\"city\" value=\"". $loc->city ."\"></TD>\n";
showfieldc($lang['ZIP'],0);
! echo "<TD COLSPAN=2><INPUT SIZE=10 MAXLENGTH=10 name=\"zip\" value=\"". $loc->zip ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['State'],0);
! echo "<TD COLSPAN=1><INPUT SIZE=30 MAXLENGTH=30 name=\"state\" value=\"". $loc->state ."\"></TD>\n";
showfieldc($lang['Country'],0);
! echo "<TD COLSPAN=2><INPUT SIZE=3 MAXLENGTH=3 name=\"country\" value=\"". $loc->country ."\"></TD>\n";
echo "</TR>\n";
}
--- 73,114 ----
echo "<TR>\n";
showfieldc($lang['AdrDescription'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"lname\" value=\"". htmlentities($loc->lname) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Phone'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"phone_1\" value=\"". htmlentities($loc->phone_1) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdrFax'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"fax_1\" value=\"". htmlentities($loc->fax_1) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['AdrEmail'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"email_1\" value=\"". htmlentities($loc->email_1) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Street'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"street1\" value=\"". htmlentities($loc->street1) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['Street'],0);
! echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"street2\" value=\"". htmlentities($loc->street2) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['City'],0);
! echo "<TD COLSPAN=1><INPUT SIZE=30 MAXLENGTH=30 name=\"city\" value=\"". htmlentities($loc->city) ."\"></TD>\n";
showfieldc($lang['ZIP'],0);
! echo "<TD COLSPAN=2><INPUT SIZE=10 MAXLENGTH=10 name=\"zip\" value=\"". htmlentities($loc->zip) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['State'],0);
! echo "<TD COLSPAN=1><INPUT SIZE=30 MAXLENGTH=30 name=\"state\" value=\"". htmlentities($loc->state) ."\"></TD>\n";
showfieldc($lang['Country'],0);
! echo "<TD COLSPAN=2><INPUT SIZE=3 MAXLENGTH=3 name=\"country\" value=\"". htmlentities($loc->country) ."\"></TD>\n";
echo "</TR>\n";
}
Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_new.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** file_new.php 2001/09/10 16:39:04 1.17
--- file_new.php 2001/09/13 14:49:48 1.18
***************
*** 57,61 ****
echo "<TR>\n";
showfield("<BR>".$lang['FileName']);
! echo " <TD COLSPAN=3><INPUT SIZE=40 NAME=file TYPE=\"file\" VALUE=\"". $f->filename ."\">\n";
if ( $f->id != -1 ) {
echo "<BR><FONT SIZE=-1>". $f->filename ."</FONT>";
--- 57,61 ----
echo "<TR>\n";
showfield("<BR>".$lang['FileName']);
! echo " <TD COLSPAN=3><INPUT SIZE=40 NAME=file TYPE=\"file\" VALUE=\"". htmlentities($f->filename) ."\">\n";
if ( $f->id != -1 ) {
echo "<BR><FONT SIZE=-1>". $f->filename ."</FONT>";
Index: mailbox_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_new.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** mailbox_new.php 2001/09/10 16:40:40 1.8
--- mailbox_new.php 2001/09/13 14:49:48 1.9
***************
*** 40,44 ****
showfieldc($lang['MailboxHost'],1);
echo " <TD>\n";
! echo " <INPUT size=40 maxlength=40 name=host value=". $m->host .">\n";
echo " </TD>\n";
showfieldc($lang['MailboxProt'],1);
--- 40,44 ----
showfieldc($lang['MailboxHost'],1);
echo " <TD>\n";
! echo " <INPUT size=40 maxlength=40 name=host value=". htmlentities($m->host) .">\n";
echo " </TD>\n";
showfieldc($lang['MailboxProt'],1);
***************
*** 51,55 ****
showfieldc($lang['MailboxPort']);
echo " <TD>\n";
! echo " <INPUT size=5 maxlength=5 name=port value=". $m->port .">\n";
echo " </TD>\n";
echo "</TR>\n";
--- 51,55 ----
showfieldc($lang['MailboxPort']);
echo " <TD>\n";
! echo " <INPUT size=5 maxlength=5 name=port value=\"". htmlentities($m->port) ."\">\n";
echo " </TD>\n";
echo "</TR>\n";
***************
*** 58,62 ****
showfieldc($lang['MailboxPath'],1);
echo " <TD COLSPAN=5>\n";
! echo " <INPUT size=60 maxlength=60 name=\"path\" value=\"". $m->path ."\">\n";
echo " </TD>\n";
--- 58,62 ----
showfieldc($lang['MailboxPath'],1);
echo " <TD COLSPAN=5>\n";
! echo " <INPUT size=60 maxlength=60 name=\"path\" value=\"". htmlentities($m->path) ."\">\n";
echo " </TD>\n";
***************
*** 66,70 ****
showfieldc($lang['MailboxUser'],1);
echo " <TD COLSPAN=2>\n";
! echo " <INPUT size=20 maxlength=20 name=user value=". $m->user .">\n";
echo " <B>". $lang['MailboxPass'] ."</B>\n";
echo " <INPUT type=password name=pw value=". $m->pw .">\n";
--- 66,70 ----
showfieldc($lang['MailboxUser'],1);
echo " <TD COLSPAN=2>\n";
! echo " <INPUT size=20 maxlength=20 name=user value=\"". htmlentities($m->user) ."\">\n";
echo " <B>". $lang['MailboxPass'] ."</B>\n";
echo " <INPUT type=password name=pw value=". $m->pw .">\n";
***************
*** 75,79 ****
showfieldc($lang['MailboxEmail']);
echo " <TD COLSPAN=5>\n";
! echo " <INPUT size=60 maxlength=60 name=email value=". $m->email .">\n";
echo " </TD>\n";
echo "</TR>\n";
--- 75,79 ----
showfieldc($lang['MailboxEmail']);
echo " <TD COLSPAN=5>\n";
! echo " <INPUT size=60 maxlength=60 name=email value=\"". htmlentities($m->email) ."\">\n";
echo " </TD>\n";
echo "</TR>\n";
Index: note_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note_new.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** note_new.php 2001/09/10 16:39:04 1.14
--- note_new.php 2001/09/13 14:49:48 1.15
***************
*** 43,47 ****
echo "<TR>\n";
showfieldc($lang['NoteName'],1);
! echo " <TD COLSPAN=5><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". $n->name ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
--- 43,47 ----
echo "<TR>\n";
showfieldc($lang['NoteName'],1);
! echo " <TD COLSPAN=5><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". htmlentities($n->name) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** product_new.php 2001/09/10 16:39:04 1.25
--- product_new.php 2001/09/13 14:49:48 1.26
***************
*** 39,48 ****
echo "<TR>\n";
showfieldc($lang['ProdName'],1);
! echo " <TD COLSPAN=3><INPUT SIZE=40 MAXLENGTH=40 name=\"name\" value=\"". $p->name ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['ProdVersion']);
! echo " <TD COLSPAN=3><INPUT SIZE=20 MAXLENGTH=20 name=\"version\" value=\"". $p->version ."\">\n";
echo " <SPAN CLASS=desc>". $lang['ProdState'] ."</SPAN> \n";
echo "<SELECT name=\"state\">\n";
--- 39,48 ----
echo "<TR>\n";
showfieldc($lang['ProdName'],1);
! echo " <TD COLSPAN=3><INPUT SIZE=40 MAXLENGTH=40 name=\"name\" value=\"". htmlentities($p->name) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['ProdVersion']);
! echo " <TD COLSPAN=3><INPUT SIZE=20 MAXLENGTH=20 name=\"version\" value=\"". htmlentities($p->version) ."\">\n";
echo " <SPAN CLASS=desc>". $lang['ProdState'] ."</SPAN> \n";
echo "<SELECT name=\"state\">\n";
***************
*** 115,129 ****
echo "<TR>\n";
showfieldc($lang['ProdDesc']);
! echo " <TD COLSPAN=3><INPUT SIZE=40 MAXLENGTH=40 name=\"description\" value=\"". $p->description ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['ProdDesc1']);
! echo " <TD COLSPAN=3><INPUT SIZE=50 MAXLENGTH=50 name=\"desc1\" value=\"". $p->desc1 ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['ProdDesc2']);
! echo " <TD COLSPAN=3><INPUT SIZE=50 MAXLENGTH=50 name=\"desc2\" value=\"". $p->desc2 ."\"></TD>\n";
echo "</TR>\n";
--- 115,129 ----
echo "<TR>\n";
showfieldc($lang['ProdDesc']);
! echo " <TD COLSPAN=3><INPUT SIZE=40 MAXLENGTH=40 name=\"description\" value=\"". htmlentities($p->description) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['ProdDesc1']);
! echo " <TD COLSPAN=3><INPUT SIZE=50 MAXLENGTH=50 name=\"desc1\" value=\"". htmlentities($p->desc1) ."\"></TD>\n";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['ProdDesc2']);
! echo " <TD COLSPAN=3><INPUT SIZE=50 MAXLENGTH=50 name=\"desc2\" value=\"". htmlentities($p->desc2) ."\"></TD>\n";
echo "</TR>\n";
***************
*** 177,181 ****
echo "<TR>\n";
showfieldc($lang['ProdPath']);
! echo " <TD COLSPAN=3><INPUT SIZE=60 MAXLENGTH=100 name=\"path\" value=\"". $p->path ."\"></TD>\n";
echo "</TR>\n";
--- 177,181 ----
echo "<TR>\n";
showfieldc($lang['ProdPath']);
! echo " <TD COLSPAN=3><INPUT SIZE=60 MAXLENGTH=100 name=\"path\" value=\"". htmlentities($p->path) ."\"></TD>\n";
echo "</TR>\n";
Index: resource_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource_new.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** resource_new.php 2001/09/10 16:37:54 1.8
--- resource_new.php 2001/09/13 14:49:48 1.9
***************
*** 35,44 ****
echo "<TR>\n";
showfieldc($lang['ResName'],1);
! echo " <TD COLSPAN=3 VALIGN=top><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". $b->name ."\"></TD>";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['ResDesc'],0);
! echo " <TD COLSPAN=3 VALIGN=top><INPUT SIZE=60 MAXLENGTH=60 name=\"desc\" value=\"". $b->desc ."\"></TD>";
echo "</TR>\n";
--- 35,44 ----
echo "<TR>\n";
showfieldc($lang['ResName'],1);
! echo " <TD COLSPAN=3 VALIGN=top><INPUT SIZE=30 MAXLENGTH=30 name=\"name\" value=\"". htmlentities($b->name) ."\"></TD>";
echo "</TR>\n";
echo "<TR>\n";
showfieldc($lang['ResDesc'],0);
! echo " <TD COLSPAN=3 VALIGN=top><INPUT SIZE=60 MAXLENGTH=60 name=\"desc\" value=\"". htmlentities($b->desc) ."\"></TD>";
echo "</TR>\n";
Index: task_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_new.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** task_new.php 2001/09/10 16:35:44 1.16
--- task_new.php 2001/09/13 14:49:48 1.17
***************
*** 41,45 ****
echo " <TR>\n";
showfieldc($lang['TaskName'],1);
! echo " <TD><INPUT name=name value=\"". $t->name ."\"></TD>\n";
showfieldc($lang['TaskState']);
echo " <TD>\n";
--- 41,45 ----
echo " <TR>\n";
showfieldc($lang['TaskName'],1);
! echo " <TD><INPUT name=name value=\"". htmlentities($t->name) ."\"></TD>\n";
showfieldc($lang['TaskState']);
echo " <TD>\n";
Index: team_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_new.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** team_new.php 2001/09/10 16:35:44 1.11
--- team_new.php 2001/09/13 14:49:48 1.12
***************
*** 32,36 ****
echo "<TR>\n";
showfieldc($lang['TeamName']);
! echo " <TD COLSPAN=4><INPUT name=name value=\"". $t->name ."\"></TD>\n";
echo "</TR>\n";
--- 32,36 ----
echo "<TR>\n";
showfieldc($lang['TeamName']);
! echo " <TD COLSPAN=4><INPUT name=name value=\"". htmlentities($t->name) ."\"></TD>\n";
echo "</TR>\n";
Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** timetrack_new.php 2001/09/10 16:37:54 1.12
--- timetrack_new.php 2001/09/13 14:49:48 1.13
***************
*** 58,62 ****
echo "<TR>\n";
showfieldc($lang['Description'],1);
! echo " <TD COLSPAN=3><INPUT SIZE=60 MAXLENGTH=60 name=\"desc\" value=\"". $tt->desc ."\"></TD>\n";
echo "</TR>\n";
--- 58,62 ----
echo "<TR>\n";
showfieldc($lang['Description'],1);
! echo " <TD COLSPAN=3><INPUT SIZE=60 MAXLENGTH=60 name=\"desc\" value=\"". htmlentities($tt->desc) ."\"></TD>\n";
echo "</TR>\n";
Index: user_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_new.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** user_new.php 2001/09/10 16:35:44 1.22
--- user_new.php 2001/09/13 14:49:48 1.23
***************
*** 31,35 ****
if ( $current_user->admin != 0) {
showfieldc($lang['Username'],1);
! echo " <TD COLSPAN=3><INPUT size=20 maxlength=20 name=\"login\" value=\"". $user->login ."\"></TD>\n";
} else {
showfieldc($lang['Username']);
--- 31,35 ----
if ( $current_user->admin != 0) {
showfieldc($lang['Username'],1);
! echo " <TD COLSPAN=3><INPUT size=20 maxlength=20 name=\"login\" value=\"". htmlentities($user->login) ."\"></TD>\n";
} else {
showfieldc($lang['Username']);
Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** webelements.p3 2001/09/10 16:43:22 1.77
--- webelements.p3 2001/09/13 14:49:48 1.78
***************
*** 1262,1271 ****
} else {
if ( $sobj->id > 0 ) {
! echo "<INPUT SIZE=20 MAXLENGTH=40 name=\"". $name ."fn\" value=\"". $sobj->getFullname() ."\">";
} else {
if ( ! isset($obj->xfn[$name]) ) {
$obj->xfn[$name] = "";
}
! echo "<INPUT SIZE=20 MAXLENGTH=40 name=\"". $name ."fn\" value=\"". $obj->xfn[$name] ."\">";
}
}
--- 1262,1271 ----
} else {
if ( $sobj->id > 0 ) {
! echo "<INPUT SIZE=20 MAXLENGTH=40 name=\"". $name ."fn\" value=\"". htmlentities($sobj->getFullname()) ."\">";
} else {
if ( ! isset($obj->xfn[$name]) ) {
$obj->xfn[$name] = "";
}
! echo "<INPUT SIZE=20 MAXLENGTH=40 name=\"". $name ."fn\" value=\"". htmlentities($obj->xfn[$name]) ."\">";
}
}
|
|
From: Gero K. <gok...@us...> - 2001-09-12 21:20:58
|
Update of /cvsroot/tutos/tutos
In directory usw-pr-cvs1:/tmp/cvs-serv26988
Modified Files:
Makefile.in
Log Message:
new mexican holiday support
Index: Makefile.in
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** Makefile.in 2001/09/11 21:04:56 1.64
--- Makefile.in 2001/09/12 21:20:55 1.65
***************
*** 11,14 ****
--- 11,17 ----
#
# $Log$
+ # Revision 1.65 2001/09/12 21:20:55 gokohnert
+ # new mexican holiday support
+ #
# Revision 1.64 2001/09/11 21:04:56 gokohnert
# added new holiday definition files
***************
*** 251,257 ****
php/Date.pinc \
php/database.pinc \
! php/database_show.php \
! php/database_new.php \
php/database_ins.php \
php/db.p3 \
php/db_msql.pinc \
--- 254,261 ----
php/Date.pinc \
php/database.pinc \
! php/database_del.php \
php/database_ins.php \
+ php/database_new.php \
+ php/database_show.php \
php/db.p3 \
php/db_msql.pinc \
***************
*** 281,284 ****
--- 285,289 ----
php/holiday_hu.pinc \
php/holiday_it.pinc \
+ php/holiday_mx.pinc \
php/holiday_us.pinc \
php/installation.pinc \
|
|
From: Gero K. <gok...@us...> - 2001-09-12 21:08:52
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv24308/php
Modified Files:
database.pinc
Added Files:
database_del.php
Log Message:
database deletion
--- NEW FILE: database_del.php ---
/*
* Copyright 2001 by Gero Kohnert
*
*/
include("webelements.p3");
include("permission.p3");
include("resource.pinc");
include("database.pinc");
/* Check if user is allowed to use it */
check_user();
/* Check Input */
$msg = "";
$gotourl = "admin_show.php";
$obj = new database($dbconn);
if ( !isset($id) ) {
$msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<BR>";
} else {
$obj->read($id);
$gotourl = $obj->getUrl();
}
if ( ! $obj->del_ok() ) {
$msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<BR>";
}
if ( $msg == "" ) {
$gotourl = "admin_show.php";
$dbconn->Begin("WORK");
$msg .= $obj->delete();
$dbconn->Commit("WORK");
}
$gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg));
$gotourl = addSessionKey($gotourl);
Header("Status: 302 Moved Temporarily");
Header("Location:". $gotourl);
$dbconn->Close();
/*
* CVS Info: $Id: database_del.php,v 1.1 2001/09/12 21:08:50 gokohnert Exp $
* $Author: gokohnert $
*/
?>
Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** database.pinc 2001/09/10 19:41:24 1.2
--- database.pinc 2001/09/12 21:08:50 1.3
***************
*** 262,265 ****
--- 262,283 ----
}
/* ---------------------------------------------------------------------------
+ * Delete database entry from DB
+ */
+ function delete() {
+ $msg = "";
+
+ $q = "DELETE FROM tutos_dbs WHERE id = ". $this->id;
+ $this->dbconn->Exec($q);
+
+ $msg .= note_delete_obj($this);
+ $msg .= acl_delete_obj($this);
+ $msg .= history_delete($this);
+
+ $this->modified[] = array ( "field" => "Delete" , "old" => $this->gettype() , "new" => -1 );
+ $msg .= history_save($this);
+
+ return $msg;
+ }
+ /* ---------------------------------------------------------------------------
* Return Info about connected notes of this resource
*/
|
|
From: Gero K. <gok...@us...> - 2001-09-12 21:07:56
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv24160/php
Modified Files:
Date.pinc config.pinc
Added Files:
holiday_mx.pinc
Log Message:
new mexican holiday support
--- NEW FILE: holiday_mx.pinc ---
<?
/*
* Copyright 2001 by Gero Kohnert
*
* CVS Info: $Id: holiday_mx.pinc,v 1.1 2001/09/12 21:07:54 gokohnert Exp $
* $Author: gokohnert $
*/
$tutos[cal][] = array(
array( Date => "01-01", Desc => "Año Nuevo (MX)"),
array( Date => "05-02", Desc => "Aniv. de la Constitución (MX)"),
array( Date => "24-02", Desc => "Día de la Bandera (MX)"),
array( Date => "21-03", Desc => "Nat. de Benito Juarez (MX)"),
array( Date => "01-05", Desc => "Día del Trabajo (MX)"),
array( Date => "05-05", Desc => "Batalla de Puebla (MX)"),
array( Date => "16-09", Desc => "Día de la Independencia (MX)"),
array( Date => "12-10", Desc => "Día de la Raza (MX)"),
array( Date => "20-11", Desc => "Aniv. de la Revolución (MX)"),
array( Date => "12-12", Desc => "Día de la Virgen de Guadalupe (MX)"),
array( Date => "31-12", Desc => "Fin de Año (MX)"),
array( Date => "GOODFRIDAY", Desc => "Viernes Santo (MX)"),
array( Date => "EASTERSUNDAY", Desc => "Domingo Santo (MX)"),
);
?>
Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** Date.pinc 2001/09/11 20:58:25 1.34
--- Date.pinc 2001/09/12 21:07:54 1.35
***************
*** 77,80 ****
--- 77,84 ----
include "holiday_us.pinc";
}
+
+ if ($tutos[holiday]['MX'] == 1) {
+ include "holiday_mx.pinc";
+ }
return;
}
Index: config.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config.pinc,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** config.pinc 2001/09/10 19:41:24 1.69
--- config.pinc 2001/09/12 21:07:54 1.70
***************
*** 310,313 ****
--- 310,314 ----
$tutos[holiday]['HU'] = 1;
$tutos[holiday]['IT'] = 1;
+ $tutos[holiday]['MX'] = 1;
#
# Location types for appointments
|
|
From: Boris W. <bw...@us...> - 2001-09-12 15:46:12
|
Update of /cvsroot/tutos/tutos In directory usw-pr-cvs1:/tmp/cvs-serv6625 Modified Files: ChangeLog Log Message: Database addition fix: 'name' instead of 'dbname' Formatting cleanups Index: ChangeLog =================================================================== RCS file: /cvsroot/tutos/tutos/ChangeLog,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** ChangeLog 2001/09/10 19:53:13 1.60 --- ChangeLog 2001/09/12 15:46:06 1.61 *************** *** 2,38 **** September 9 2001 * added a new database table "tutos_dbs" to store info about ! synced remote tutos databases. ! To add this to existing installations please do ! create table tutos_dbs ( ! id int4 primary key, -- a ID ! dbname varchar(30) not null, -- database name ! dbalias varchar(60), -- short text ! dbhost varchar(30), -- hostname [...1043 lines suppressed...] ! * state pre ongoing or finished ! * path for some url (e.g. cvs web) July 29 2000 Start ChangeLog ! Added product feature to calendar * links from appointments to products *************** *** 670,675 **** of a user. Up to now it was only possible to see calendars of your own or your teams ! ! ! ---------------------------------------------------------------- ! Please send all your feedback to gokohnert at users.sourceforge.net --- 722,725 ---- of a user. Up to now it was only possible to see calendars of your own or your teams ! ------------------------------------------------------------------- ! Please send all your feedback to gokohnert at users.sourceforge.net |
29 messages has been excluded from this view by a project administrator.