tutos-commits Mailing List for TUTOS (Page 449)
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-10-24 17:13:34
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv28317/php
Modified Files:
graph_bars.php
Log Message:
close db connection
Index: graph_bars.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/graph_bars.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** graph_bars.php 2001/09/16 19:29:00 1.8
--- graph_bars.php 2001/10/24 17:13:30 1.9
***************
*** 159,162 ****
basic($f,$t0,$t1);
}
!
?>
--- 159,162 ----
basic($f,$t0,$t1);
}
! $dbconn->Close();
?>
|
|
From: Gero K. <gok...@us...> - 2001-10-16 16:37:41
|
Update of /cvsroot/tutos/tutos/homepage In directory usw-pr-cvs1:/tmp/cvs-serv31272 Modified Files: install_faq.html Log Message: bugfix Index: install_faq.html =================================================================== RCS file: /cvsroot/tutos/tutos/homepage/install_faq.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** install_faq.html 2001/07/26 17:14:49 1.4 --- install_faq.html 2001/10/16 16:23:05 1.5 *************** *** 38,44 **** Such a cronjob line will look like this<BR> <FONT SIZE=-1> ! <PRE>*/5 * * * * /usr/bin/lynx -accept_all_cookies -dump http://[yourhost]/tutos/php/check.php3 > /dev/null </PRE> or ! <PRE>*/5 * * * * /usr/bin/wget -a /dev/null -O /dev/null http://[yourhost]/tutos/php/check.php3 2> /dev/null </PRE> </FONT> Ensure that the mail mechanism does work. See <I>config.pinc</I> $tutos[mailmode] --- 38,44 ---- Such a cronjob line will look like this<BR> <FONT SIZE=-1> ! <PRE>*/5 * * * * /usr/bin/lynx -accept_all_cookies -dump http://[yourhost]/tutos/php/check.php > /dev/null </PRE> or ! <PRE>*/5 * * * * /usr/bin/wget -a /dev/null -O /dev/null http://[yourhost]/tutos/php/check.php 2> /dev/null </PRE> </FONT> Ensure that the mail mechanism does work. See <I>config.pinc</I> $tutos[mailmode] |
|
From: Gero K. <gok...@us...> - 2001-10-06 18:10:48
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv16312/php
Modified Files:
user.pinc acl.pinc
Log Message:
fixed default/initial acl for users
Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** user.pinc 2001/09/30 18:41:18 1.52
--- user.pinc 2001/10/06 18:10:44 1.53
***************
*** 65,68 ****
--- 65,70 ----
// Start of week
$this->weekstart = $tutos[weekstart];
+
+ $this->tablename = "people";
}
/* ---------------------------------------------------------------------------
***************
*** 80,86 ****
if ( $mode == 0 ) {
! $query = "SELECT a.* ,p.*,p.id as u_id FROM addresses a,people p WHERE a.id = ". $id ." AND a.id = p.adr_id";
} else {
! $query = "SELECT a.* ,p.*,p.id as u_id FROM addresses a,people p WHERE p.id = ". $id ." AND a.id = p.adr_id";
}
$result = $this->dbconn->Exec($query);
--- 82,88 ----
if ( $mode == 0 ) {
! $query = "SELECT a.* ,p.*,p.id as u_id FROM addresses a,". $this->tablename ." p WHERE a.id = ". $id ." AND a.id = p.adr_id";
} else {
! $query = "SELECT a.* ,p.*,p.id as u_id FROM addresses a,". $this->tablename ." p WHERE p.id = ". $id ." AND a.id = p.adr_id";
}
$result = $this->dbconn->Exec($query);
***************
*** 219,222 ****
--- 221,225 ----
/* ---------------------------------------------------------------------------
* Read and set the permissions this user has
+ * feature permissions have an ID < 0
*/
function read_permissions() {
***************
*** 242,249 ****
/* ---------------------------------------------------------------------------
* Save the permissions of this user
*/
function save_permissions() {
- global $tutos;
-
$msg = "";
$q = "DELETE FROM acl where obj_id < 0 AND adr_id = ". $this->id;
--- 245,251 ----
/* ---------------------------------------------------------------------------
* Save the permissions of this user
+ * feature permissions have an ID < 0
*/
function save_permissions() {
$msg = "";
$q = "DELETE FROM acl where obj_id < 0 AND adr_id = ". $this->id;
***************
*** 340,344 ****
# users we may see by special (ACL) allowance
#
! $q = "SELECT distinct u.adr_id ,d.f_name , d.l_name FROM people u,addresses d , acl a WHERE (u.id = a.obj_id) AND (u.adr_id = d.id) AND (a.perm > 0) AND $t2 ORDER by l_name";
$r = $this->dbconn->Exec($q);
$n = $r->numrows();
--- 342,346 ----
# users we may see by special (ACL) allowance
#
! $q = "SELECT distinct u.adr_id ,d.f_name , d.l_name FROM ". $this->tablename ." u,addresses d , acl a WHERE (u.id = a.obj_id) AND (u.adr_id = d.id) AND (a.perm > 0) AND $t2 ORDER by l_name";
$r = $this->dbconn->Exec($q);
$n = $r->numrows();
***************
*** 499,507 ****
*/
function del_ok () {
- global $current_user,$tutos;
-
- # if ( $current_user->id == $this->id ) {
- # return $tutos[delok];
- # }
return acl_del_ok($this);
}
--- 501,504 ----
***************
*** 510,518 ****
*/
function mod_ok () {
- global $current_user,$tutos;
-
- if ( $current_user->id == $this->id ) {
- return $tutos[modok];
- }
return acl_mod_ok($this);
}
--- 507,510 ----
***************
*** 521,525 ****
*/
function save() {
! global $tutos;
$msg = "";
--- 513,517 ----
*/
function save() {
! global $current_user,$tutos;
$msg = "";
***************
*** 528,532 ****
}
$q = new query($this->dbconn);
! $q->setTable("people");
$q->addFV("login",$this->login,"STRING");
if ( $this->updatepw == 1 ) {
--- 520,524 ----
}
$q = new query($this->dbconn);
! $q->setTable($this->tablename);
$q->addFV("login",$this->login,"STRING");
if ( $this->updatepw == 1 ) {
***************
*** 556,559 ****
--- 548,556 ----
"obj_id" => $this->uid
);
+
+ $this->acl = array();
+ acl_default($this,$current_user);
+ acl_raise($this,$this->id,$tutos[modok]);
+ acl_raise($this,$current_user->id,$tutos[delok]);
} else {
$q->addWC("adr_id",$this->id,"");
***************
*** 576,580 ****
unset ($this->modified);
! $q = "DELETE FROM people WHERE adr_id =". $this->id ." AND id = ". $this->uid;
$this->dbconn->Exec($q);
--- 573,577 ----
unset ($this->modified);
! $q = "DELETE FROM ". $this->tablename ." WHERE adr_id =". $this->id ." AND id = ". $this->uid;
$this->dbconn->Exec($q);
***************
*** 636,640 ****
$q = new query($this->dbconn);
! $q->setTable("people");
$q->addFV("last_seen",$this->last_seen,"DATETIME");
$q->addFV("prefteam",$this->get_prefteam(),"");
--- 633,637 ----
$q = new query($this->dbconn);
! $q->setTable($this->tablename);
$q->addFV("last_seen",$this->last_seen,"DATETIME");
$q->addFV("prefteam",$this->get_prefteam(),"");
Index: acl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl.pinc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** acl.pinc 2001/09/19 20:50:10 1.17
--- acl.pinc 2001/10/06 18:10:45 1.18
***************
*** 28,39 ****
if ( ($adr->getType() == "address") || ($adr->getType() == "user") ) {
$adr->readTeamList();
! @reset($adr->teamids);
! while ( list ($i,$f) = @each ($adr->teamids) ) {
! acl_raise($obj,$i,$tutos[seeok]);
! }
}
return;
}
-
}
/* ---------------------------------------------------------------------------
--- 28,43 ----
if ( ($adr->getType() == "address") || ($adr->getType() == "user") ) {
$adr->readTeamList();
! # When no teams are defined everybody may see
! if ( count($adr->teamids) == 0 ) {
! $obj->acl[0] = $tutos[seeok];
! } else {
! @reset($adr->teamids);
! while ( list ($i,$f) = @each ($adr->teamids) ) {
! acl_raise($obj,$i,$tutos[seeok]);
! }
! }
}
return;
}
}
/* ---------------------------------------------------------------------------
***************
*** 43,46 ****
--- 47,51 ----
global $tutos;
+ $obj->acl = array();
if ( $obj->gettype() == "user" ) {
$id = $obj->uid;
|
|
From: Gero K. <gok...@us...> - 2001-10-06 18:09:22
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv15982/php
Modified Files:
app_ins.php bug_ins.php department_ins.php file_ins.php
installation_ins.php location_ins.php product_ins.php
timetrack_ins.php webelements.p3
Log Message:
extended check function with products
Index: app_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_ins.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** app_ins.php 2001/09/30 18:31:08 1.8
--- app_ins.php 2001/10/06 18:09:19 1.9
***************
*** 161,165 ****
$a->visitor = new tutos_address($dbconn);
if ( isset($vfn) && !empty($vfn) ) {
! $a->visitor = check_address($vfn,"vfn","vl","acd");
} else {
if ( isset($vid) && !empty($vid) ) {
--- 161,165 ----
$a->visitor = new tutos_address($dbconn);
if ( isset($vfn) && !empty($vfn) ) {
! $a->visitor = check_field($vfn,"vfn","vl","acd");
} else {
if ( isset($vid) && !empty($vid) ) {
***************
*** 174,178 ****
$a->product = new product($dbconn);
if ( isset($pfn) && !empty($pfn) ) {
! $a->product = check_product($pfn);
} else {
if ( isset($pid) && !empty($pid) ) {
--- 174,178 ----
$a->product = new product($dbconn);
if ( isset($pfn) && !empty($pfn) ) {
! $a->product = check_field($pfn,"pfn","pl","p");
} else {
if ( isset($pid) && !empty($pid) ) {
Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_ins.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** bug_ins.php 2001/09/17 20:24:55 1.10
--- bug_ins.php 2001/10/06 18:09:20 1.11
***************
*** 57,61 ****
if ( isset($sfn) ) {
! $solver = check_address($sfn,"sfn","sl");
} else {
if ( isset($sid) ) {
--- 57,61 ----
if ( isset($sfn) ) {
! $solver = check_field($sfn,"sfn","sl");
} else {
if ( isset($sid) ) {
Index: department_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_ins.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** department_ins.php 2001/09/30 18:39:06 1.9
--- department_ins.php 2001/10/06 18:09:20 1.10
***************
*** 41,45 ****
$msg .= sprintf($lang['Err0009'],$lang['Company']) ."<BR>";
} else {
! $d->company = check_address($company,"company","cl","c");
}
} else {
--- 41,45 ----
$msg .= sprintf($lang['Err0009'],$lang['Company']) ."<BR>";
} else {
! $d->company = check_field($company,"company","cl","c");
}
} else {
Index: file_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_ins.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** file_ins.php 2001/09/30 18:39:06 1.14
--- file_ins.php 2001/10/06 18:09:20 1.15
***************
*** 68,72 ****
if ( isset($afn) ) {
# Check the author full name
! $author = check_address($afn,"afn","al","at");
}
--- 68,72 ----
if ( isset($afn) ) {
# Check the author full name
! $author = check_field($afn,"afn","al","at");
}
Index: installation_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation_ins.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** installation_ins.php 2001/09/10 16:39:04 1.9
--- installation_ins.php 2001/10/06 18:09:20 1.10
***************
*** 33,37 ****
$msg .= sprintf($lang['Err0009'],$lang['Customer']) ."<BR>";
} else {
! $x = check_address($cfn,"cfn","cl","acd");
$i->setCustomer($x->id);
}
--- 33,37 ----
$msg .= sprintf($lang['Err0009'],$lang['Customer']) ."<BR>";
} else {
! $x = check_field($cfn,"cfn","cl","acd");
$i->setCustomer($x->id);
}
***************
*** 39,48 ****
if ( isset($ifn) ) {
! $x = check_address($ifn,"ifn","il");
$i->setInstaller($x->id);
}
if ( isset($sfn) ) {
! $x = check_address($sfn,"sfn","sl","at");
$i->setSeller($x->id);
}
--- 39,48 ----
if ( isset($ifn) ) {
! $x = check_field($ifn,"ifn","il");
$i->setInstaller($x->id);
}
if ( isset($sfn) ) {
! $x = check_field($sfn,"sfn","sl","at");
$i->setSeller($x->id);
}
Index: location_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location_ins.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** location_ins.php 2001/09/19 20:51:38 1.15
--- location_ins.php 2001/10/06 18:09:20 1.16
***************
*** 42,46 ****
# Check Company
if ( !isset($c_id) ) {
! $l->company = check_address($company,"company","cl","c");
} else {
if ( $c_id != -1 ) {
--- 42,46 ----
# Check Company
if ( !isset($c_id) ) {
! $l->company = check_field($company,"company","cl","c");
} else {
if ( $c_id != -1 ) {
***************
*** 51,55 ****
# Check Department
if ( !isset($d_id) ) {
! $l->department = check_address($department,"department","dl","d");
} else {
if ( $d_id != -1 ) {
--- 51,55 ----
# Check Department
if ( !isset($d_id) ) {
! $l->department = check_field($department,"department","dl","d");
} else {
if ( $d_id != -1 ) {
Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** product_ins.php 2001/09/19 20:46:07 1.21
--- product_ins.php 2001/10/06 18:09:20 1.22
***************
*** 42,46 ****
# Add given Role
if ( isset($rfn) ) {
! $m = check_address($rfn,"rfn","rl",$tutos[rolecheck][$role]);
if ( $m->id > 0 ) {
$p->setRole($m,$role);
--- 42,46 ----
# Add given Role
if ( isset($rfn) ) {
! $m = check_field($rfn,"rfn","rl",$tutos[rolecheck][$role]);
if ( $m->id > 0 ) {
$p->setRole($m,$role);
Index: timetrack_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_ins.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** timetrack_ins.php 2001/09/10 16:37:54 1.9
--- timetrack_ins.php 2001/10/06 18:09:20 1.10
***************
*** 33,37 ****
$msg .= sprintf($lang['Err0009'],$lang['TimetrackWorker']) ."<BR>";
} else {
! $tt->worker = check_address($wfn,"wfn","wl");
}
}
--- 33,37 ----
$msg .= sprintf($lang['Err0009'],$lang['TimetrackWorker']) ."<BR>";
} else {
! $tt->worker = check_field($wfn,"wfn","wl");
}
}
Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** webelements.p3 2001/09/30 18:41:18 1.84
--- webelements.p3 2001/10/06 18:09:20 1.85
***************
*** 952,992 ****
}
/* ---------------------------------------------------------------------------
! * check if a given String is a product
! *
! */
! Function check_product($name) {
! global $dbconn,$msg,$gotourl,$lang;
!
! $gotourl= addUrlParameter($gotourl,"pfn=".UrlEncode($name));
! if ( empty($name) ) {
! return new product($dbconn);
! }
! $q = "SELECT * from products WHERE". $dbconn->Like("name",$name,"version");
! $r = $dbconn->Exec($q);
! $n = $r->numrows();
! if ( 0 == $n) {
! $msg .= sprintf($lang['Err0004'],$name) ."<BR>";
! } else if ( $n > 10 ) {
! $msg .= sprintf($lang['Err0005'],$name,$n) ."<BR>";
! $msg .= $lang['Err0006'] ."<BR>";
! } else if ( $n > 1) {
! $msg .= sprintf($lang['Err0005'],$name,$n) ."<BR>";
! $msg .= $lang['Err0006'] ."<BR>";
! $a = 0;
! while ( $a < $n ) {
! $gotourl .="&pl[]=". $r->get($a, "id");
! $a++;
! }
! } else {
! $p = new product($dbconn);
! $p->read_result($r,0);
! $r->free();
! return $p;
! }
! $r->free();
! return;
! }
! /* ---------------------------------------------------------------------------
! * check a address name
* field = name in url
* field2 = arrayname for selections url
--- 952,956 ----
}
/* ---------------------------------------------------------------------------
! * check a given name
* field = name in url
* field2 = arrayname for selections url
***************
*** 996,1001 ****
* c = companies
* d = departments
*/
! Function check_address($name,$field,$field2,$mode = "at") {
global $dbconn,$msg,$gotourl,$lang;
--- 960,966 ----
* c = companies
* d = departments
+ * p = products
*/
! Function check_field($name,$field,$field2,$mode = "at") {
global $dbconn,$msg,$gotourl,$lang;
***************
*** 1009,1012 ****
--- 974,978 ----
$n3 = 0;
$n4 = 0;
+ $n5 = 0;
if ( strstr($mode,"a") != FALSE ) {
$q1 = "SELECT * from addresses WHERE". $dbconn->Like ("f_name",$name,"m_name","l_name");
***************
*** 1033,1036 ****
--- 999,1008 ----
$n += $n4;
}
+ if ( strstr($mode,"p") != FALSE ) {
+ $q5 = "SELECT * from products WHERE". $dbconn->Like("name",$name,"version");
+ $r5 = $dbconn->Exec($q5);
+ $n5 = $r5->numrows();
+ $n += $n5;
+ }
if ( 0 == $n) {
***************
*** 1051,1054 ****
--- 1023,1030 ----
$r1->free();
}
+ if ( strstr($mode,"p") != FALSE ) {
+ $msg .= sprintf($lang['Err0004'],$name,$n) ."<BR>";
+ $r5->free();
+ }
return;
}
***************
*** 1097,1100 ****
--- 1073,1084 ----
$r4->free();
}
+ if ( strstr($mode,"p") != FALSE ) {
+ $a = 0;
+ while ( $a < $n5 ) {
+ $gotourl = addUrlParameter($gotourl,$field2."[]=".$r5->get($a, "id"));
+ $a++;
+ }
+ $r5->free();
+ }
return;
}
***************
*** 1115,1118 ****
--- 1099,1106 ----
$a->read_result($r4,0);
}
+ if ( $n5 == 1 ) {
+ $a = new product($dbconn);
+ $a->read_result($r5,0);
+ }
if ( strstr($mode,"a") != FALSE ) {
***************
*** 1128,1131 ****
--- 1116,1122 ----
$r4->free();
}
+ if ( strstr($mode,"p") != FALSE ) {
+ $r5->free();
+ }
return $a;
}
***************
*** 1503,1505 ****
echo "</TR>\n";
}
! ?>
--- 1494,1496 ----
echo "</TR>\n";
}
! ?>
\ No newline at end of file
|
|
From: Gero K. <gok...@us...> - 2001-10-04 16:05:20
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv17264/php
Modified Files:
db_ora.pinc
Log Message:
Bugfix / non standard language support
Index: db_ora.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_ora.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** db_ora.pinc 2001/09/27 21:39:36 1.4
--- db_ora.pinc 2001/10/04 16:05:17 1.5
***************
*** 26,29 ****
--- 26,30 ----
putenv("ORACLE_SID=".$this->db->name);
putenv("ORACLE_HOME=".$this->db->home);
+ putenv("NLS_LANG=AMERICA_AMERICA.WE8ISO8859P1");
$of = $this->openfunc;
***************
*** 108,112 ****
# A Insert or Update
# echo "ROWS: $numrows COLS: $numcols | $query<BR>";flush();
! return $x;
}
--- 109,113 ----
# A Insert or Update
# echo "ROWS: $numrows COLS: $numcols | $query<BR>";flush();
! # return $x;
}
|
|
From: Gero K. <gok...@us...> - 2001-10-03 09:24:30
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv21073/php
Modified Files:
url.pinc note.pinc file.pinc
Log Message:
history save deletion
Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url.pinc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** url.pinc 2001/09/30 18:39:05 1.29
--- url.pinc 2001/10/03 09:24:27 1.30
***************
*** 13,19 ****
Function url_delete_obj(&$obj) {
$msg = "";
! # FIXME ( cleanup of history and acl needed ) !!
! $q = "DELETE FROM urls WHERE link_id = ". $obj->id;
! $r = $obj->dbconn->Exec($q);
return $msg;
}
--- 13,23 ----
Function url_delete_obj(&$obj) {
$msg = "";
! readUrls($obj);
! if ( count($this->urllist) > 0 ) {
! @reset ($this->urllist);
! while ( list ($i,$f) = @each ($this->urllist) ) {
! $msg .= $f->delete();
! }
! }
return $msg;
}
***************
*** 26,30 ****
global $lang;
! $obj->readUrls();
--- 30,34 ----
global $lang;
! readUrls($obj);
***************
*** 65,69 ****
function readUrls(&$obj) {
! $obj->urllist = array();
$q = "SELECT * from urls where link_id = ". $obj->id ." order by name";
$r = $obj->dbconn->Exec($q);
--- 69,73 ----
function readUrls(&$obj) {
! $obj->urllist = array();
$q = "SELECT * from urls where link_id = ". $obj->id ." order by name";
$r = $obj->dbconn->Exec($q);
Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note.pinc,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** note.pinc 2001/09/30 18:29:57 1.42
--- note.pinc 2001/10/03 09:24:27 1.43
***************
*** 13,19 ****
Function note_delete_obj(&$obj) {
$msg = "";
! # FIXME ( cleanup of history and acl needed ) !!
! $q = "DELETE FROM notes WHERE link_id = ". $obj->id;
! $r = $obj->dbconn->Exec($q);
return $msg;
}
--- 13,24 ----
Function note_delete_obj(&$obj) {
$msg = "";
! readNotes($obj);
!
! if ( count($this->notelist) > 0 ) {
! @reset ($this->notelist);
! while ( list ($i,$f) = @each ($this->notelist) ) {
! $msg .= $f->delete();
! }
! }
return $msg;
}
Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** file.pinc 2001/09/30 18:39:05 1.43
--- file.pinc 2001/10/03 09:24:27 1.44
***************
*** 11,14 ****
--- 11,28 ----
/* ---------------------------------------------------------------------------
+ * delete file entries for a object
+ */
+ Function file_delete_obj(&$obj) {
+ $msg = "";
+ readFiles($obj);
+ if ( count($this->filelist) > 0 ) {
+ @reset ($this->filelist);
+ while ( list ($i,$f) = @each ($this->filelist) ) {
+ $msg .= $f->delete();
+ }
+ }
+ return $msg;
+ }
+ /* ---------------------------------------------------------------------------
* Show links to all files
*/
|
|
From: Gero K. <gok...@us...> - 2001-10-03 09:23:51
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv20936/php
Modified Files:
task.pinc task_new.php task_show.php
Log Message:
url handling for tasks
Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** task.pinc 2001/09/19 20:47:29 1.47
--- task.pinc 2001/10/03 09:23:48 1.48
***************
*** 467,471 ****
$this->readBugs();
! if ( isset($this->buglist) && (count($this->buglist) > 0) ) {
@reset ($this->buglist);
while ( list ($i,$f) = @each ($this->buglist) ) {
--- 467,471 ----
$this->readBugs();
! if ( count($this->buglist) > 0 ) {
@reset ($this->buglist);
while ( list ($i,$f) = @each ($this->buglist) ) {
***************
*** 474,494 ****
}
- $this->readFiles();
- if ( isset($this->filelist) && (count($this->filelist) > 0) ) {
- @reset ($this->buglist);
- while ( list ($i,$f) = @each ($this->filelist) ) {
- $msg .= $f->delete();
- }
- }
$q = "UPDATE tasks SET p_id = ". $this->p_id ." WHERE p_id = ". $this->id;
$this->dbconn->Exec($q);
- $q = "UPDATE files SET link_id = ". $this->p_id ." WHERE link_id = ". $this->id;
- $this->dbconn->Exec($q);
-
$q = "DELETE FROM tasks WHERE id = ". $this->id;
$this->dbconn->Exec($q);
$msg .= timetrack_delete_obj($this);
$msg .= note_delete_obj($this);
--- 474,485 ----
}
$q = "UPDATE tasks SET p_id = ". $this->p_id ." WHERE p_id = ". $this->id;
$this->dbconn->Exec($q);
$q = "DELETE FROM tasks WHERE id = ". $this->id;
$this->dbconn->Exec($q);
+ $msg .= file_delete_obj($this);
$msg .= timetrack_delete_obj($this);
$msg .= note_delete_obj($this);
***************
*** 652,659 ****
}
/* ---------------------------------------------------------------------------
! * Return Info about connected files of this product
*/
function readFiles() {
readFiles($this);
return;
}
--- 643,657 ----
}
/* ---------------------------------------------------------------------------
! * Return Info about connected files of this task
*/
function readFiles() {
readFiles($this);
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ * Return Info about connected urls of this task
+ */
+ function readUrls() {
+ readUrls($this);
return;
}
Index: task_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_new.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** task_new.php 2001/09/13 14:49:48 1.17
--- task_new.php 2001/10/03 09:23:48 1.18
***************
*** 120,123 ****
--- 120,130 ----
echo "</TABLE>\n";
echo "</FORM>\n";
+
+ if ( ($current_user->p[useurl] == 1) && ($tutos[useurl] == 1) ) {
+ if ( $t->id != -1 ) {
+ url_form($t,"task_new.php?id=". $t->id);
+ }
+ }
+
echo $lang['FldsRequired'] ."\n";
}
Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** task_show.php 2001/09/10 16:35:44 1.16
--- task_show.php 2001/10/03 09:23:48 1.17
***************
*** 147,150 ****
--- 147,164 ----
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";
|
|
From: Gero K. <gok...@us...> - 2001-10-01 18:25:48
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv1420/php
Modified Files:
app_overview.php app_select.php
Log Message:
calendar search by location
Index: app_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_overview.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** app_overview.php 2001/09/19 20:47:29 1.6
--- app_overview.php 2001/10/01 18:25:45 1.7
***************
*** 171,175 ****
if ( $to->notime != 1 ) {
$q .= $pre ."(a_end <= ". $dbconn->Date($to) .")";
! $pre = "AND ";
$qarg .= "&td=". $to->getYYYYMMDD();
--- 171,175 ----
if ( $to->notime != 1 ) {
$q .= $pre ."(a_end <= ". $dbconn->Date($to) .")";
! $pre = " AND ";
$qarg .= "&td=". $to->getYYYYMMDD();
***************
*** 178,181 ****
--- 178,191 ----
$filter['to'] = $to;
+ }
+ if ( isset($loc) && ($loc != -1) ) {
+ $q .= $pre ."(outside = ". $loc .")";
+ $pre = " AND ";
+ $qarg .= "&td=". $to->getYYYYMMDD();
+
+ $link1 = addUrlParameter($link1,"loc=".$loc);
+ $link2 = addUrlParameter($link2,"loc=".$loc);
+
+ $filter['loc'] = $loc;
}
#
Index: app_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_select.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** app_select.php 2001/09/10 16:40:40 1.4
--- app_select.php 2001/10/01 18:25:45 1.5
***************
*** 57,60 ****
--- 57,69 ----
$tutos['astd']->EnterDate("t",1);
echo " </TD>\n";
+
+ echo "</TR><TR>\n";
+ showfieldc($lang['Location2']);
+ echo " <TD COLSPAN=2> <SELECT name=loc>\n";
+ echo " <OPTION value=-1>all</OPTION>\n";
+ for ( $i = 0 ; $i < count($lang['AppLoc']); $i++ ) {
+ echo " <OPTION VALUE=". $i .">". $lang['AppLoc'][$i] ."</OPTION>\n";
+ }
+ echo " </SELECT></TD>\n";
}
|
|
From: Gero K. <gok...@us...> - 2001-09-30 18:41:21
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv23723/php
Modified Files:
admin_sync.php config.pinc history_show.php mail.pinc
mailbox.pinc mailbox_ins.php message_overview.php
permission.p3 user.pinc webelements.p3
Log Message:
update
Index: admin_sync.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_sync.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** admin_sync.php 2001/09/28 09:00:41 1.6
--- admin_sync.php 2001/09/30 18:41:18 1.7
***************
*** 67,75 ****
echo "Deleted on target: ". $r2->numrows() ."<BR>\n";
$a = 0;
while ( $a < $n1) {
$xid = $r1->get($a,"obj_id");
$x = getObject($dbconn2,$xid,1);
! echo "NEW: ". $xid ." : ". $lang[$x->getType()] ." ". $x->getFullName() ."<BR>\n";
$a++;
}
--- 67,82 ----
echo "Deleted on target: ". $r2->numrows() ."<BR>\n";
+ # ALL NEW Objects in "target" DB will get a id for the "source" DB
$a = 0;
while ( $a < $n1) {
$xid = $r1->get($a,"obj_id");
$x = getObject($dbconn2,$xid,1);
! # GET a new ID on source DB for this object
! $newid = $dbconn1->NextID();
!
! echo "NEW: ". $xid ." : ". $lang[$x->getType()] ." ". $x->getFullName() ." --->". $newid ." T:". $x->tablename ."<BR>\n";
! $trans[$xid] = $newid;
! $table[$xid] = $x->tablename;
!
$a++;
}
***************
*** 109,116 ****
$fn = strtoupper($r->fieldname($b));
$fv = $r->get($a,$fn);
- if ( $fv == "" ) {
- $b++;
- continue;
- }
$ft = strtoupper($r->fieldtype($b));
# OLD VERSION
--- 116,119 ----
***************
*** 123,128 ****
continue;
}
- $flds .= $pre. $dbconn2->colname($fn);
if ( ($ft == "VARCHAR") || ($ft == "VARCHAR2") || ($ft == "STRING") || ($ft == "TEXT") || ($ft == "VARYING")) {
--- 126,133 ----
continue;
}
+ if ( ($f == "people") && ( ($fn == "ADMIN") && ($fv == '') ) ) {
+ $fv = 0;
+ }
if ( ($ft == "VARCHAR") || ($ft == "VARCHAR2") || ($ft == "STRING") || ($ft == "TEXT") || ($ft == "VARYING")) {
***************
*** 134,138 ****
$dt = new DateTime($fv);
$vals .= $pre. $dbconn2->DateTime($dt);
! } else if ( eregi("^INT",$ft) || ($ft == "REAL") || ($ft == "FLOAT8") || ($ft == "LONG") ) {
$vals .= $pre. $fv;
} else {
--- 139,146 ----
$dt = new DateTime($fv);
$vals .= $pre. $dbconn2->DateTime($dt);
! } else if ( eregi("^INT",$ft) || ($ft == "REAL") || eregi("^FLOAT",$ft) || ($ft == "LONG") ) {
! if ( !is_numeric($fv) ) {
! $fv = 'null';
! }
$vals .= $pre. $fv;
} else {
***************
*** 141,144 ****
--- 149,153 ----
exit;
}
+ $flds .= $pre. $dbconn2->colname($fn);
$pre = ",";
$b++;
Index: config.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config.pinc,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** config.pinc 2001/09/27 21:39:36 1.73
--- config.pinc 2001/09/30 18:41:18 1.74
***************
*** 316,319 ****
--- 316,320 ----
$tutos[holiday]['RU'] = 1;
$tutos[holiday]['KO'] = 1;
+ $tutos[holiday]['AU'] = 1;
#
# Location types for appointments
Index: history_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history_show.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** history_show.php 2001/09/17 20:18:14 1.18
--- history_show.php 2001/09/30 18:41:18 1.19
***************
*** 1,5 ****
<?
/*
! * Copyright 1999/2000 by Gero Kohnert
*/
include("webelements.p3");
--- 1,5 ----
<?
/*
! * Copyright 1999/2000/2001 by Gero Kohnert
*/
include("webelements.p3");
***************
*** 15,18 ****
--- 15,19 ----
include("timetrack.pinc");
include("resource.pinc");
+ include("appointment.pinc");
/* Check if user is allowed to use it */
***************
*** 140,143 ****
--- 141,147 ----
echo " <TD><I>". $lang['HistoryDeleted'] ."</I></TD>\n";
}
+ } else if ( $f['field'] == "Location2" ) {
+ echo " <TD> ". $lang['AppLoc'][$f["old"]] ."</TD>\n";
+ echo " <TD> ". $lang['AppLoc'][$f["new"]] ."</TD>\n";
} else if ( $f['field'] == "URLAdd" ) {
echo " <TD> </TD>\n";
Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** mail.pinc 2001/09/27 21:39:36 1.18
--- mail.pinc 2001/09/30 18:41:18 1.19
***************
*** 78,82 ****
@reset($this->to);
while ( list ($i,$obj) = @each ($this->to) ) {
! if ( $this->sent[$obj->id] == 1 ) {
continue;
}
--- 78,82 ----
@reset($this->to);
while ( list ($i,$obj) = @each ($this->to) ) {
! if ( isset($this->sent[$obj->id]) && ($this->sent[$obj->id] == 1) ) {
continue;
}
Index: mailbox.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox.pinc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** mailbox.pinc 2001/09/27 21:39:36 1.21
--- mailbox.pinc 2001/09/30 18:41:18 1.22
***************
*** 261,265 ****
$this->id = $r->get($pos, "id");
$this->host = $r->get($pos, "host");
! $this->type = $r->get($pos, $this->dbconn->colname("type"));
$this->port = $r->get($pos, "port");
$this->user = $r->get($pos, "uname");
--- 261,265 ----
$this->id = $r->get($pos, "id");
$this->host = $r->get($pos, "host");
! $this->type = $r->get($pos, "type");
$this->port = $r->get($pos, "port");
$this->user = $r->get($pos, "uname");
***************
*** 322,356 ****
}
! if ( $this->id == -1 ) {
! $this->id = $this->dbconn->NextID();
! $flds = "id";
! $vals = $this->id;
!
! $flds .= ",link_id";
! $vals .= ",". $this->parent->id;
!
! $flds .= ",host";
! $vals .= ",". $this->dbconn->String($this->host);
!
! $flds .= ",". $this->dbconn->colname("type");
! $vals .= ",". $this->dbconn->String($this->type);
!
! $flds .= ",port";
! $vals = sprintf("%s,%d",$vals,$this->port);
!
! $flds .= ",uname";
! $vals .= ",". $this->dbconn->String($this->user);
! $flds .= ",pw";
! $vals .= ",". $this->dbconn->String($this->pw);
!
! $flds .= ",path";
! $vals .= ",". $this->dbconn->String($this->path);
!
! $flds .= ",email";
! $vals .= ",". $this->dbconn->String($this->email);
!
! $q = "INSERT INTO mailboxes ($flds) VALUES ($vals)";
# Defaut Access Control
--- 322,340 ----
}
! $q = new query($this->dbconn);
! $q->setTable("mailboxes");
! $q->addFV("link_id",$this->parent->id,"");
! $q->addFV("host",$this->host,"STRING");
! $q->addFV("type",$this->type,"STRING");
! $q->addFV("port",$this->port,"");
! $q->addFV("uname",$this->user,"STRING");
! $q->addFV("pw",$this->pw,"STRING");
! $q->addFV("path",$this->path,"STRING");
! $q->addFV("email",$this->email,"STRING");
! if ( $this->id == -1 ) {
! $this->id = $q->addFV("id",-1,"NEXTID");
! $query = $q->getInsert();
# Defaut Access Control
***************
*** 370,392 ****
);
} else {
! $q = "UPDATE mailboxes SET";
!
! $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) );
! $q = sprintf("%s,pw = %s", $q,$this->dbconn->String($this->pw) );
! $q = sprintf("%s,path = %s", $q,$this->dbconn->String($this->path) );
! $q = sprintf("%s,email = %s", $q,$this->dbconn->String($this->email) );
!
! $q = sprintf("%s WHERE id = %d", $q,$this->id );
}
! $this->dbconn->Begin("WORK");
! $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
return $msg;
--- 354,364 ----
);
} else {
! $q->addWC("id",$this->id,"");
! $query = $q->getUpdate();
}
! $this->dbconn->Exec($query);
$msg .= acl_save($this);
$msg .= history_save($this);
return $msg;
Index: mailbox_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_ins.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mailbox_ins.php 2001/09/10 16:40:40 1.4
--- mailbox_ins.php 2001/09/30 18:41:18 1.5
***************
*** 37,41 ****
--- 37,44 ----
$m->email = $email;
+ $dbconn->Begin("WORK");
$m->save();
+ $dbconn->Commit("WORK");
+
$gotourl = $m->parent->getURL();
Index: message_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/message_overview.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** message_overview.php 2001/09/19 20:51:38 1.6
--- message_overview.php 2001/09/30 18:41:18 1.7
***************
*** 40,44 ****
echo "<TR>\n";
echo " <TD>". $result->get($a, "ts") ."</TD>\n";
! echo " <TD>". $result->get($a, $dbconn->colname("message")) ."</TD>\n";
echo "</TR>\n";
$a++;
--- 40,44 ----
echo "<TR>\n";
echo " <TD>". $result->get($a, "ts") ."</TD>\n";
! echo " <TD>". $result->get($a, "message") ."</TD>\n";
echo "</TR>\n";
$a++;
Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** permission.p3 2001/09/19 20:48:33 1.43
--- permission.p3 2001/09/30 18:41:18 1.44
***************
*** 210,214 ****
if ( ($userid == -1) OR ($userid == "") ) {
! if ( $uname == "" || $pw == "" ) {
/* No Username or no password supplied */
ReadLang($lang);
--- 210,214 ----
if ( ($userid == -1) OR ($userid == "") ) {
! if ( !isset($uname) || $uname == "" || $pw == "" ) {
/* No Username or no password supplied */
ReadLang($lang);
Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** user.pinc 2001/09/27 21:39:36 1.51
--- user.pinc 2001/09/30 18:41:18 1.52
***************
*** 39,43 ****
$this->uid = -1;
$this->admin = 0;
! $this->last_seen = new DateTime();
$this->last_host = "unknown";
$this->prefteam = 1;
--- 39,43 ----
$this->uid = -1;
$this->admin = 0;
! $this->last_seen = new DateTime(0);
$this->last_host = "unknown";
$this->prefteam = 1;
***************
*** 116,120 ****
$this->last_host = StripSlashes($r->get($pos, "last_host"));
$this->uid = $r->get($pos, "u_id");
! $this->admin = $r->get($pos,$this->dbconn->colname("admin"));
$this->prefteam = $r->get($pos, "prefteam");
$this->lang = StripSlashes($r->get($pos, "lang"));
--- 116,120 ----
$this->last_host = StripSlashes($r->get($pos, "last_host"));
$this->uid = $r->get($pos, "u_id");
! $this->admin = $r->get($pos,"admin");
$this->prefteam = $r->get($pos, "prefteam");
$this->lang = StripSlashes($r->get($pos, "lang"));
***************
*** 527,569 ****
return "Sorry Demo does not allow change of UserEntry<BR>";
}
! unset ($this->modified);
if ( -1 == $this->uid ) {
! $this->uid = $this->dbconn->NextID();
!
! $flds = "( id";
! $vals = "( ". $this->uid;
!
! $flds .= ",adr_id";
! $vals .= ",". $this->id;
!
! $flds .= ",login";
! $vals .= ",". $this->dbconn->String($this->login);
!
! $flds .= ",pw";
! $vals .= ",". $this->dbconn->Password($this->pw);
!
! $flds .= ",". $this->dbconn->colname("admin");
! $vals .= ",". sprintf("%d",$this->admin);
!
! # $flds .= ",overlib";
! # $vals .= ",". $this->p[useoverlib];
! $flds .= ",last_seen";
! $vals .= ",". $this->dbconn->notime();
! $flds .= ",lang";
! $vals .= ",". $this->dbconn->String($this->lang);
!
! $flds .= ",tz";
! $vals .= ",". $this->dbconn->String($this->tz);
!
! $flds .= ",theme";
! $vals .= ",". $this->dbconn->String($this->theme);
!
! $flds .= ")";
! $vals .= ")";
!
! $q = "INSERT INTO people ". $flds . " VALUES ". $vals;
$this->modified[] = array ( "field" => "UserCreate" ,
"old" => "-1" ,
--- 527,549 ----
return "Sorry Demo does not allow change of UserEntry<BR>";
}
! $q = new query($this->dbconn);
! $q->setTable("people");
! $q->addFV("login",$this->login,"STRING");
! if ( $this->updatepw == 1 ) {
! $q->addFV("pw",$this->pw,"PASSWORD");
! }
! $q->addFV("admin",$this->admin,"");
! $q->addFV("last_seen",$this->last_seen,"DATETIME");
! $q->addFV("lang",$this->lang,"STRING");
! $q->addFV("tz",$this->tz,"STRING");
! $q->addFV("theme",$this->theme,"STRING");
if ( -1 == $this->uid ) {
! $this->uid = $q->addFV("id",-1,"NEXTID");
! $q->addFV("adr_id",$this->id,"");
! $query = $q->getInsert();
! unset ($this->modified);
$this->modified[] = array ( "field" => "UserCreate" ,
"old" => "-1" ,
***************
*** 577,594 ****
);
} else {
! $q = "UPDATE people SET";
! $q .= " login = ". $this->dbconn->String($this->login);
! if ( $this->updatepw == 1 ) {
! $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);
! $q .= ",tz = ". $this->dbconn->String($this->tz);
! $q .= ",theme = ". $this->dbconn->String($this->theme);
! $q .= " WHERE adr_id = ". $this->id ." AND id =". $this->uid;
}
! $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
--- 557,567 ----
);
} else {
! $q->addWC("adr_id",$this->id,"");
! $q->addWC("id",$this->uid,"");
!
! $query = $q->getUpdate();
}
! $this->dbconn->Exec($query);
$msg .= acl_save($this);
$msg .= history_save($this);
Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** webelements.p3 2001/09/27 21:39:36 1.83
--- webelements.p3 2001/09/30 18:41:18 1.84
***************
*** 916,922 ****
if ( ($plus != "") && ($tutos[useoverlib] == 1) && ($current_user->p[useoverlib] == 1) ) {
! return sprintf ("<A CLASS=nodeco HREF=\"%s\" "return overlib('%s',STATUS,'%s',FULLHTML)\" "nd()\">%s</A>",$href,htmlentities($plus),AddSlashes($info),$text);
} else {
! return sprintf ("<A CLASS=nodeco HREF=\"%s\" "self.status='%s' ;return true\" TITLE=\"%s\">%s</A>",$href,AddSlashes($info),$info,$text);
}
}
--- 916,922 ----
if ( ($plus != "") && ($tutos[useoverlib] == 1) && ($current_user->p[useoverlib] == 1) ) {
! return sprintf ("<A CLASS=nodeco HREF=\"%s\" "return overlib('%s',STATUS,'%s',FULLHTML)\" "nd()\">%s</A>",$href,htmlentities($plus),htmlentities($info),$text);
} else {
! return sprintf ("<A CLASS=nodeco HREF=\"%s\" "self.status='%s' ;return true\" TITLE=\"%s\">%s</A>",$href,htmlentities($info),htmlentities($info),$text);
}
}
***************
*** 931,937 ****
if ( ($plus != "") && ($tutos[useoverlib] == 1) && ($current_user->p[useoverlib] == 1) ) {
! return sprintf ("<A HREF=\"%s\" "return overlib('%s',STATUS,'%s',FULLHTML)\" "nd()\">%s</A>",$href,htmlentities($plus),AddSlashes($info),$text);
} else {
! return sprintf ("<A HREF=\"%s\" "self.status='%s' ;return true\" TITLE=\"%s\">%s</A>",$href,AddSlashes($info),$info,$text);
}
}
--- 931,937 ----
if ( ($plus != "") && ($tutos[useoverlib] == 1) && ($current_user->p[useoverlib] == 1) ) {
! return sprintf ("<A HREF=\"%s\" "return overlib('%s',STATUS,'%s',FULLHTML)\" "nd()\">%s</A>",$href,htmlentities($plus),htmlentities($info),$text);
} else {
! return sprintf ("<A HREF=\"%s\" "self.status='%s' ;return true\" TITLE=\"%s\">%s</A>",$href,htmlentities($info),htmlentities($info),$text);
}
}
***************
*** 1485,1489 ****
echo " ";
if ( $start > 0 ) {
! $l = addUrlParameter($link,$paraname ."=".($start - $tutos[maxshow]));
echo menulink($l ,$tutos[image][left] ." ".$lang['NavBack'],$lang['NavBack']);
}
--- 1485,1489 ----
echo " ";
if ( $start > 0 ) {
! $l = addUrlParameter($link,$paraname ."=". max($start - $tutos[maxshow],0));
echo menulink($l ,$tutos[image][left] ." ".$lang['NavBack'],$lang['NavBack']);
}
***************
*** 1495,1499 ****
echo " ";
if ( $start < ($max - $tutos[maxshow]) ) {
! $l = addUrlParameter($link, $paraname ."=".($max - $tutos[maxshow]));
echo menulink($l ,$lang['NavLast'],$lang['NavLast']);
}
--- 1495,1500 ----
echo " ";
if ( $start < ($max - $tutos[maxshow]) ) {
! # $l = addUrlParameter($link, $paraname ."=".($max - $tutos[maxshow]));
! $l = addUrlParameter($link, $paraname ."=-1");
echo menulink($l ,$lang['NavLast'],$lang['NavLast']);
}
|
|
From: Gero K. <gok...@us...> - 2001-09-30 18:39:08
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv23295/php
Modified Files:
url.pinc url_ins.php file.pinc file_ins.php file_overview.php
company.pinc company_ins.php department.pinc
department_ins.php address.pinc address_ins.php
Log Message:
using query class
Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url.pinc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** url.pinc 2001/09/27 19:35:35 1.28
--- url.pinc 2001/09/30 18:39:05 1.29
***************
*** 91,94 ****
--- 91,95 ----
$this->url = "";
$this->link_id = -1;
+ $this->tablename = "urls";
}
/* ---------------------------------------------------------------------------
***************
*** 106,110 ****
}
! $q = "SELECT * from urls where id = ". $id;
$r = $this->dbconn->Exec($q);
$n = $r->numrows();
--- 107,111 ----
}
! $q = "SELECT * from ". $this->tablename ." where id = ". $id;
$r = $this->dbconn->Exec($q);
$n = $r->numrows();
***************
*** 147,155 ****
$msg = "";
if ( -1 == $this->id ) {
! $this->id = $this->dbconn->NextID();
! $q = "INSERT INTO urls (id,link_id,name,url) VALUES (". $this->id .",". $this->link_id .",". $this->dbconn->String($this->name) .",". $this->dbconn->String($this->url) .")";
# Prepare the history
! unset ($this->modified);
$this->modified[] = array ( "field" => "URLAdd" ,
"old" => "-1" ,
--- 148,163 ----
$msg = "";
+ $q = new query($this->dbconn);
+ $q->setTable($this->tablename);
+ $q->addFV("link_id",$this->link_id,"");
+ $q->addFV("name",$this->name,"STRING");
+ $q->addFV("url",$this->url,"STRING");
+
if ( -1 == $this->id ) {
! $this->id = $q->addFV("id",-1,"NEXTID");
! $query = $q->getInsert();
!
# Prepare the history
! $this->modified = array();
$this->modified[] = array ( "field" => "URLAdd" ,
"old" => "-1" ,
***************
*** 163,174 ****
);
} else {
! $q = "UPDATE urls SET name = ". $this->dbconn->String($this->name) .", url = ". $this->dbconn->String($this->url) ." WHERE id = ". $this->id;
}
! $this->dbconn->Begin("WORK");
! $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
return $msg;
--- 171,181 ----
);
} else {
! $q->addWC("id",$this->id,"");
! $query = $q->getUpdate();
}
! $this->dbconn->Exec($query);
$msg .= acl_save($this);
$msg .= history_save($this);
return $msg;
***************
*** 180,184 ****
$msg = "";
! $q = "DELETE FROM urls WHERE id = ". $this->id;
$this->dbconn->Exec($q);
--- 187,191 ----
$msg = "";
! $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
$this->dbconn->Exec($q);
Index: url_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url_ins.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** url_ins.php 2001/09/10 16:37:54 1.4
--- url_ins.php 2001/09/30 18:39:05 1.5
***************
*** 34,38 ****
$u->url = $url;
$u->link_id = $link_id;
! $msg = $u->save();
}
--- 34,41 ----
$u->url = $url;
$u->link_id = $link_id;
!
! $dbconn->Begin("WORK");
! $msg .= $u->save();
! $dbconn->Commit("WORK");
}
Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file.pinc,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** file.pinc 2001/09/19 20:48:33 1.42
--- file.pinc 2001/09/30 18:39:05 1.43
***************
*** 99,102 ****
--- 99,103 ----
$this->creation = new DateTime();
+ $this->tablename = "files";
}
/* ---------------------------------------------------------------------------
***************
*** 114,118 ****
}
! $q = "SELECT * from files where id = ". $id;
$r = $this->dbconn->Exec($q);
$n = $r->numrows();
--- 115,119 ----
}
! $q = "SELECT * from ". $this->tablename ." where id = ". $id;
$r = $this->dbconn->Exec($q);
$n = $r->numrows();
***************
*** 132,136 ****
$this->name = StripSlashes($r->get($pos, "name"));
$this->fileloc = StripSlashes($r->get($pos, "loc"));
! $this->filetype = StripSlashes($r->get($pos, $this->dbconn->colname("type")));
$this->filename = StripSlashes($r->get($pos, "filename"));
$this->filesize = $r->get($pos, "f_size");
--- 133,137 ----
$this->name = StripSlashes($r->get($pos, "name"));
$this->fileloc = StripSlashes($r->get($pos, "loc"));
! $this->filetype = StripSlashes($r->get($pos, "type"));
$this->filename = StripSlashes($r->get($pos, "filename"));
$this->filesize = $r->get($pos, "f_size");
***************
*** 498,503 ****
return $msg;
}
-
-
if ( $this->link_id == -1 ) {
$this->ref = $this->creator;
--- 499,502 ----
***************
*** 505,510 ****
}
if ( -1 == $this->id ) {
! $this->id = $this->dbconn->NextID();
$this->fileloc = $this->link_id ."/". $this->id ."/FILE";
$newfile = 1;
--- 504,513 ----
}
+ $q = new query($this->dbconn);
+ $q->setTable($this->tablename);
+
+
if ( -1 == $this->id ) {
! $this->id = $q->addFV("id",-1,"NEXTID");
$this->fileloc = $this->link_id ."/". $this->id ."/FILE";
$newfile = 1;
***************
*** 533,537 ****
--- 536,555 ----
}
+ $q->addFV("name",$this->name,"STRING");
+ $q->addFV("filename",$this->filename,"STRING");
+ $q->addFV("loc",$this->fileloc,"STRING");
+ $q->addFV("logtxt",$this->logtxt,"STRING");
+ $q->addFV("version",$this->version,"STRING");
+ $q->addFV("link_id",$this->link_id,"");
+ $q->addFV("author",$this->author->id ,"");
+ $q->addFV("f_size",$this->filesize ,"");
+ $q->addFV("type",$this->filetype ,"STRING");
+ $q->addFV("locked",$this->locked ,"");
+
if ( $newfile == 1 ) {
+ $q->addFV("creator",$this->creator->id,"");
+ $q->addFV("creation",$this->creation,"DATETIME");
+ $q->addFV("vsys",$this->vsys ,"");
+
# Transfer the file to the repository
copy ($this->tmploc , $this->base ."/". $this->fileloc);
***************
*** 552,585 ****
unlink($this->tmploc);
- $flds = "id";
- $vals = $this->id;
-
- $flds .= ",link_id";
- $vals .= "," . $this->link_id;
- $flds .= ",name";
- $vals .= "," . $this->dbconn->String($this->name);
- $flds .= ",filename";
- $vals .= "," . $this->dbconn->String($this->filename);
- $flds .= ",loc";
- $vals .= "," . $this->dbconn->String($this->fileloc);
- $flds .= ",logtxt";
- $vals .= "," . $this->dbconn->String($this->logtxt);
- $flds .= ",version";
- $vals .= "," . $this->dbconn->String($this->version);
- $flds .= ",f_size";
- $vals .= "," . $this->filesize;
- $flds .= ",". $this->dbconn->colname("type");
- $vals .= ",'" . $this->filetype ."'";
- $flds .= ",creator";
- $vals .= "," . $this->creator->id;
- $flds .= ",author";
- $vals .= "," . $this->author->id;
- $flds .= ",locked";
- $vals .= "," . $this->locked;
- $flds .= ",vsys";
- $vals .= "," . $this->vsys;
- $flds .= ",creation";
- $vals .= "," . $this->dbconn->DateTime($this->creation);
- $q = "INSERT INTO files (". $flds .") VALUES(". $vals .")";
# Defaut Access Control
$this->read_reference();
--- 570,573 ----
***************
*** 601,609 ****
"obj_id" => $this->id
);
} else {
- $q = "UPDATE files SET";
- $q .= " name = " . $this->dbconn->String($this->name);
- $q .= ",author = " . $this->author->id;
-
# A file was given
if ( isset($this->tmploc) ) {
--- 589,594 ----
"obj_id" => $this->id
);
+ $query = $q->getInsert();
} else {
# A file was given
if ( isset($this->tmploc) ) {
***************
*** 638,659 ****
chmod ($this->base ."/". $this->fileloc, 0600);
}
- $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 !!
unlink($this->tmploc);
}
! $q .= ",logtxt = " . $this->dbconn->String($this->logtxt);
! $q .= ",version = " . $this->dbconn->String($this->version);
! $q .= ",locked = " . $this->locked;
! $q .= " WHERE ID= " . $this->id;
}
! $this->dbconn->Begin("WORK");
! $r = $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
return $msg;
--- 623,637 ----
chmod ($this->base ."/". $this->fileloc, 0600);
}
# Remove tmpfile !!
unlink($this->tmploc);
}
!
! $q->addWC("id",$this->id,"");
! $query = $q->getUpdate();
}
! $this->dbconn->Exec($query);
$msg .= acl_save($this);
$msg .= history_save($this);
return $msg;
***************
*** 664,672 ****
function delete() {
$msg = "";
-
- $this->dbconn->Lock("files");
- $this->dbconn->Lock("addresses");
! $q = "DELETE FROM files WHERE id = ". $this->id;
$this->dbconn->Exec($q);
--- 642,647 ----
function delete() {
$msg = "";
! $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
$this->dbconn->Exec($q);
Index: file_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_ins.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** file_ins.php 2001/09/10 16:39:04 1.13
--- file_ins.php 2001/09/30 18:39:06 1.14
***************
*** 141,145 ****
--- 141,148 ----
$f->newlog = $log;
+ $dbconn->Begin("WORK");
$msg .= $f->save();
+ $dbconn->Commit("WORK");
+
if ( $f->id != -1 ) {
$gotourl = $f->getURL();
Index: file_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_overview.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** file_overview.php 2001/09/19 20:48:33 1.11
--- file_overview.php 2001/09/30 18:39:06 1.12
***************
*** 97,101 ****
$q = "SELECT * FROM files";
! $pre = " WHERE" ;
if ( ! isset($start) ) {
--- 97,101 ----
$q = "SELECT * FROM files";
! $pre = " WHERE " ;
if ( ! isset($start) ) {
***************
*** 127,131 ****
$link1 = addUrlParameter($link1,"type=". UrlEncode($type));
}
! if ( isset($name) ) {
$q .= $pre . "(";
$q .= $dbconn->Like("name",$name);
--- 127,131 ----
$link1 = addUrlParameter($link1,"type=". UrlEncode($type));
}
! if ( isset($name) && ($name != "") ) {
$q .= $pre . "(";
$q .= $dbconn->Like("name",$name);
Index: company.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company.pinc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** company.pinc 2001/09/19 20:46:07 1.26
--- company.pinc 2001/09/30 18:39:06 1.27
***************
*** 22,25 ****
--- 22,26 ----
$this->rl1 = 0;
$this->rl2 = 0;
+ $this->tablename = "companies";
}
/* ---------------------------------------------------------------------------
***************
*** 44,48 ****
}
! $query = "SELECT * FROM companies WHERE id = ". $id;
$result = $this->dbconn->Exec($query);
$n = $result->numrows();
--- 45,49 ----
}
! $query = "SELECT * FROM ". $this->tablename ." WHERE id = ". $id;
$result = $this->dbconn->Exec($query);
$n = $result->numrows();
***************
*** 202,214 ****
$msg = "";
if ( $this->id == -1 ) {
! #
! # INSERT
! #
! $this->id = $this->dbconn->NextID();
! $q = "INSERT INTO companies ( id,name,creation ) VALUES (". $this->id .",". $this->dbconn->String($this->name) .",". $this->dbconn->DateTime($this->creation).")";
$this->acl[$current_user->id] = $tutos[delok];
acl_default($this,$current_user);
! unset ($this->modified);
$this->modified[] = array ( "field" => "created" ,
"old" => $this->getType() ,
--- 203,219 ----
$msg = "";
+ $q = new query($this->dbconn);
+ $q->setTable($this->tablename);
+ $q->addFV("name",$this->name,"STRING");
+
if ( $this->id == -1 ) {
! $this->id = $q->addFV("id",-1,"NEXTID");
! $q->addFV("creation",$this->creation,"DATETIME");
!
! $query = $q->getInsert();
!
$this->acl[$current_user->id] = $tutos[delok];
acl_default($this,$current_user);
! $this->modified = array();
$this->modified[] = array ( "field" => "created" ,
"old" => $this->getType() ,
***************
*** 217,231 ****
);
} else {
! #
! # UPDATE
! #
! $q = "UPDATE companies SET name = ". $this->dbconn->String($this->name) ." WHERE id = ". $this->id;
}
! $this->dbconn->Begin("WORK");
! $r = $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
return $msg;
--- 222,232 ----
);
} else {
! $q->addWC("id",$this->id,"");
! $query = $q->getUpdate();
}
! $r = $this->dbconn->Exec($query);
$msg .= acl_save($this);
$msg .= history_save($this);
return $msg;
***************
*** 253,262 ****
}
}
-
- $this->dbconn->Lock("companies");
- $this->dbconn->Lock("location");
- $this->dbconn->Lock("adrloc");
! $this->dbconn->Exec("DELETE from companies WHERE id =" .$this->id);
$this->dbconn->Exec("UPDATE location SET c_id = null, d_id=null WHERE c_id =" .$this->id);
--- 254,259 ----
}
}
! $this->dbconn->Exec("DELETE from ". $this->tablename ." WHERE id =" .$this->id);
$this->dbconn->Exec("UPDATE location SET c_id = null, d_id=null WHERE c_id =" .$this->id);
Index: company_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_ins.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** company_ins.php 2001/09/19 20:46:07 1.7
--- company_ins.php 2001/09/30 18:39:06 1.8
***************
*** 35,39 ****
if ( $msg == "" ) {
if ( ($new == 1) || ($name != $c->name) ) {
! $q = "SELECT * FROM companies WHERE name = '". $name ."'";
$r = $dbconn->Exec($q);
$n = $r->numrows();
--- 35,39 ----
if ( $msg == "" ) {
if ( ($new == 1) || ($name != $c->name) ) {
! $q = "SELECT * FROM ". $c->tablename ." WHERE name = '". $name ."'";
$r = $dbconn->Exec($q);
$n = $r->numrows();
***************
*** 49,53 ****
--- 49,56 ----
if ( $msg == "" ) {
$c->setName($name);
+
+ $dbconn->Begin("WORK");
$msg = $c->save();
+ $dbconn->Commit("WORK");
$gotourl = $c->getURL();
***************
*** 59,63 ****
/* Go back to user mask */
Header("Status: 302 Moved Temporarily");
! Header("Location: $gotourl");
$dbconn->Close();
/*
--- 62,66 ----
/* Go back to user mask */
Header("Status: 302 Moved Temporarily");
! Header("Location: ". $gotourl );
$dbconn->Close();
/*
Index: department.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department.pinc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** department.pinc 2001/09/19 20:48:33 1.26
--- department.pinc 2001/09/30 18:39:06 1.27
***************
*** 23,26 ****
--- 23,27 ----
$this->rl1 = 0;
$this->rl2 = 0;
+ $this->tablename = "departments";
}
***************
*** 39,43 ****
}
! $query = "SELECT * FROM departments WHERE id = ". $id;
$result = $this->dbconn->Exec($query);
$n = $result->numrows();
--- 40,44 ----
}
! $query = "SELECT * FROM ". $this->tablename ." WHERE id = ". $id;
$result = $this->dbconn->Exec($query);
$n = $result->numrows();
***************
*** 175,187 ****
$msg = "";
if ( $this->id == -1 ) {
! #
! # INSERT
! #
! $this->id = $this->dbconn->NextID();
! $q = "INSERT INTO departments ( id,c_id,name,creation ) VALUES ( $this->id, $this->c_id, ". $this->dbconn->String($this->name) .",". $this->dbconn->DateTime($this->creation) .")";
$this->acl[$current_user->id] = $tutos[delok];
acl_default($this,$current_user);
! unset ($this->modified);
$this->modified[] = array ( "field" => "created" ,
"old" => $this->getType() ,
--- 176,193 ----
$msg = "";
+ $q = new query($this->dbconn);
+ $q->setTable($this->tablename);
+ $q->addFV("c_id",$this->c_id,"");
+ $q->addFV("name",$this->name,"STRING");
+
if ( $this->id == -1 ) {
! $this->id = $q->addFV("id",-1,"NEXTID");
! $q->addFV("creation",$this->creation,"DATETIME");
!
! $query = $q->getInsert();
!
$this->acl[$current_user->id] = $tutos[delok];
acl_default($this,$current_user);
! $this->modified = array();
$this->modified[] = array ( "field" => "created" ,
"old" => $this->getType() ,
***************
*** 190,204 ****
);
} else {
! #
! # UPDATE
! #
! $q = "UPDATE departments SET name = ". $this->dbconn->String($this->name) .", c_id =". $this->c_id ." WHERE id =". $this->id;
}
! $this->dbconn->Begin("WORK");
! $r = $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
return $msg;
--- 196,206 ----
);
} else {
! $q->addWC("id",$this->id,"");
! $query = $q->getUpdate();
}
! $this->dbconn->Exec($query);
$msg .= acl_save($this);
$msg .= history_save($this);
return $msg;
***************
*** 221,225 ****
}
! $r = $this->dbconn->Exec("DELETE from departments WHERE id =" .$this->id);
$r = $this->dbconn->Exec("UPDATE location SET d_id = null WHERE d_id =" .$this->id);
--- 223,227 ----
}
! $r = $this->dbconn->Exec("DELETE from ". $this->tablename ." WHERE id =" .$this->id);
$r = $this->dbconn->Exec("UPDATE location SET d_id = null WHERE d_id =" .$this->id);
Index: department_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_ins.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** department_ins.php 2001/09/19 20:48:33 1.8
--- department_ins.php 2001/09/30 18:39:06 1.9
***************
*** 49,53 ****
if ( $msg == "" ) {
if ( ($new == 1) || ($name != $d->name) ) {
! $q = "SELECT * FROM departments WHERE name = '". $name ."' AND c_id = ". $d->company->id;
$r = $dbconn->Exec($q);
$n = $r->numrows();
--- 49,53 ----
if ( $msg == "" ) {
if ( ($new == 1) || ($name != $d->name) ) {
! $q = "SELECT * FROM ". $d->tablename ." WHERE name = '". $name ."' AND c_id = ". $d->company->id;
$r = $dbconn->Exec($q);
$n = $r->numrows();
***************
*** 64,68 ****
$d->setName($name);
$d->c_id = $d->company->id;
! $msg = $d->save();
$gotourl = $d->getURL();
--- 64,71 ----
$d->setName($name);
$d->c_id = $d->company->id;
!
! $dbconn->Begin("WORK");
! $msg .= $d->save();
! $dbconn->Commit("WORK");
$gotourl = $d->getURL();
Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** address.pinc 2001/09/27 19:40:20 1.47
--- address.pinc 2001/09/30 18:39:06 1.48
***************
*** 33,36 ****
--- 33,37 ----
$this->rl1 = 0;
$this->rl2 = 0;
+ $this->tablename = "addresses";
}
***************
*** 90,94 ****
return;
}
! $query = "SELECT * FROM addresses WHERE id = ". $id;
$r = $this->dbconn->Exec($query);
if ( $r->numrows() != 0 ) {
--- 91,95 ----
return;
}
! $query = "SELECT * FROM ". $this->tablename ." WHERE id = ". $id;
$r = $this->dbconn->Exec($query);
if ( $r->numrows() != 0 ) {
***************
*** 162,166 ****
$info .= "<HTML>";
$info .= "<BODY>";
! $info .= "<TABLE CLASS=inner BORDER=0 CELLSPACING=0 CELLPADDING=1>";
$info .= "<TR><TH COLSPAN=2>". $fn ."</TH></TR>";
$info .= "<TR><TD VALIGN=top><FONT SIZE=-2>". $lang['Phone'] .":</FONT></TD><TD><FONT SIZE=-2>";
--- 163,167 ----
$info .= "<HTML>";
$info .= "<BODY>";
! $info .= "<TABLE CLASS=single BORDER=0 CELLSPACING=0 CELLPADDING=1>";
$info .= "<TR><TH COLSPAN=2>". $fn ."</TH></TR>";
$info .= "<TR><TD VALIGN=top><FONT SIZE=-2>". $lang['Phone'] .":</FONT></TD><TD><FONT SIZE=-2>";
***************
*** 234,237 ****
--- 235,251 ----
}
/* ---------------------------------------------------------------------------
+ * set the birthday date
+ */
+ function setBirthday(&$name) {
+ $a = $this->birthday->getYYYYMMDD();
+ $b = $name->getYYYYMMDD();
+
+ if ( $a != $b ) {
+ $this->modified[] = array ( "field" => "AdrBirthday", "old" => $a , "new" => $b );
+ $this->birthday = $name;
+ }
+ return;
+ }
+ /* ---------------------------------------------------------------------------
*
*/
***************
*** 240,266 ****
$msg = "";
! $b = $this->dbconn->Date($this->birthday);
if ( -1 == $this->id ) {
! $this->modified = array();
! $this->id = $this->dbconn->NextID();
! $flds = "id";
! $vals = $this->id;
! $flds .= ",title";
! $vals .= "," . $this->dbconn->String($this->title) ;
! $flds .= ",f_name";
! $vals .= "," . $this->dbconn->String($this->f_name) ;
! $flds .= ",l_name";
! $vals .= "," . $this->dbconn->String($this->l_name) ;
! $flds .= ",m_name";
! $vals .= "," . $this->dbconn->String($this->m_name) ;
! $flds .= ",birthday";
! $vals .= "," . $b;
! $flds .= ",pic_id";
! $vals .= "," . $this->pic_file->id;
! $flds .= ",creator";
! $vals .= "," . $this->creator->id;
!
! $q = "INSERT INTO addresses (". $flds .") VALUES(". $vals .")";
# Defaut Access Control
--- 254,270 ----
$msg = "";
! $q = new query($this->dbconn);
! $q->setTable($this->tablename);
! $q->addFV("birthday",$this->birthday,"DATETIME");
! $q->addFV("title",$this->title,"STRING");
! $q->addFV("f_name",$this->f_name,"STRING");
! $q->addFV("m_name",$this->m_name,"STRING");
! $q->addFV("l_name",$this->l_name,"STRING");
! $q->addFV("pic_id",$this->pic_file->id,"");
if ( -1 == $this->id ) {
! $this->id = $q->addFV("id",-1,"NEXTID");
! $q->addFV("creator",$this->creator->id,"");
! $query = $q->getInsert();
# Defaut Access Control
***************
*** 269,272 ****
--- 273,277 ----
$this->acl[$this->creator->id] = $tutos[delok];
+ $this->modified = array();
$this->modified[] = array ( "field" => "created" ,
"old" => $this->getType() ,
***************
*** 275,290 ****
);
} else {
! $q = "UPDATE addresses SET ";
! $q .= " title = " . $this->dbconn->String($this->title);
! $q .= ", f_name = " . $this->dbconn->String($this->f_name);
! $q .= ", l_name = " . $this->dbconn->String($this->l_name);
! $q .= ", m_name = " . $this->dbconn->String($this->m_name);
! $q .= ", birthday = " . $b ;
! $q .= ", pic_id = " . $this->pic_file->id ;
! $q .= " WHERE id = " . $this->id ;
}
! $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
--- 280,289 ----
);
} else {
! $q->addWC("id",$this->id,"");
! $query = $q->getUpdate();
}
! $this->dbconn->Exec($query);
$msg .= acl_save($this);
$msg .= history_save($this);
***************
*** 383,393 ****
$this->read_locs_data();
- $this->dbconn->Lock("location");
- $this->dbconn->Lock("adrloc");
- $this->dbconn->Lock("addresses");
- $this->dbconn->Lock("urls");
- $this->dbconn->Lock("notes");
- $this->dbconn->Lock("files");
-
@reset($this->location);
while( list ($i,$f) = @each ($this->location)) {
--- 382,385 ----
***************
*** 395,399 ****
}
! $q = "DELETE FROM addresses WHERE id = ". $this->id;
$r = $this->dbconn->Exec($q);
--- 387,391 ----
}
! $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
$r = $this->dbconn->Exec($q);
Index: address_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_ins.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** address_ins.php 2001/09/27 19:40:20 1.18
--- address_ins.php 2001/09/30 18:39:06 1.19
***************
*** 109,113 ****
$a->setMName($m_name);
$a->pic_id = $a->pic_file->id;
! $a->birthday = $birthday;
$dbconn->Begin("WORK");
--- 109,113 ----
$a->setMName($m_name);
$a->pic_id = $a->pic_file->id;
! $a->setBirthday($birthday);
$dbconn->Begin("WORK");
|
|
From: Gero K. <gok...@us...> - 2001-09-30 18:37:47
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv22991/php
Modified Files:
db.p3 db_interbase.pinc
Log Message:
reverse columnname lookup
Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** db.p3 2001/09/27 21:39:36 1.49
--- db.p3 2001/09/30 18:37:40 1.50
***************
*** 159,162 ****
--- 159,171 ----
return $col;
}
+ /* ---------------------------------------------------------------------------
+ * handle reserved words in this database type
+ */
+ function colnameREV($col) {
+ if ( isset($this->colR[strtoupper($col)]) ) {
+ return $this->colR[strtoupper($col)];
+ }
+ return $col;
+ }
}
/*
***************
*** 188,192 ****
$this->flds[$fld] = $this->dbconn->Password($val);
} else if ( $type == "NEXTID" ) {
! $this->flds[$fld] = $this->dbconn->NextID();
} else if ( $type == "DATETIME" ) {
$this->flds[$fld] = $this->dbconn->datetime($val);
--- 197,203 ----
$this->flds[$fld] = $this->dbconn->Password($val);
} else if ( $type == "NEXTID" ) {
! $id = $this->dbconn->NextID();
! $this->flds[$fld] = $id;
! return $id;
} else if ( $type == "DATETIME" ) {
$this->flds[$fld] = $this->dbconn->datetime($val);
***************
*** 216,221 ****
/* get an INSERT query */
function getInsert() {
! $flds .= "(";
! $vals .= "(";
$pre = "";
@reset($this->flds);
--- 227,232 ----
/* get an INSERT query */
function getInsert() {
! $flds = "(";
! $vals = "(";
$pre = "";
@reset($this->flds);
Index: db_interbase.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_interbase.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** db_interbase.pinc 2001/09/27 21:39:36 1.3
--- db_interbase.pinc 2001/09/30 18:37:40 1.4
***************
*** 21,27 ****
$this->openfunc = 'ibase_pconnect';
! $this->col["MESSAGE"] = "T_message";
! $this->col["TYPE"] = "T_type";
! $this->col["ADMIN"] = "T_admin";
}
/* ---------------------------------------------------------------------------
--- 21,29 ----
$this->openfunc = 'ibase_pconnect';
! $this->col["MESSAGE"] = "T_MESSAGE";
! $this->col["TYPE"] = "T_TYPE";
! $this->col["ADMIN"] = "T_ADMIN";
!
! $this->colR = array_flip($this->col);
}
/* ---------------------------------------------------------------------------
***************
*** 95,106 ****
# 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][strtoupper($fn['alias'])] = $row[$c];
! # echo $x ." ". $c ." N:". $fn['name'] ." A:". $fn['alias'] ." V:". $row[$c] ."<BR>\n";
}
}
--- 97,111 ----
# echo "<BR>P:" . $r ."<BR>\n";
$x = 0;
+ $nf = ibase_num_fields($r);
while ($row = ibase_fetch_row ($r)) {
# echo var_dump($row);
for ($c = 0 ; $c < $nf; $c++) {
$fn = ibase_field_info($r,$c);
+ $cn = $this->colnameREV(strtoupper($fn['alias']));
if ( isset( $row[$c] ) ) {
! $result[$x][$cn] = $row[$c];
! # echo $x ." ". $c ." N:". $fn['name'] ." A:". $fn['alias'] ." V:". $row[$c] ."<BR>\n";
! } else {
! $result[$x][$cn] = null;
}
}
***************
*** 109,112 ****
--- 114,118 ----
$x = new result_interbase();
+ $x->dbconn = $this;
$x->rs = $r;
$x->result = $result;
***************
*** 262,265 ****
--- 268,272 ----
class result_interbase extends result {
var $rs;
+ var $dbconn;
/* ---------------------------------------------------------------------------
***************
*** 267,274 ****
function get($pos,$fld) {
$fld = strtoupper($fld);
! if ( isset($this->result[$pos][$fld]) ) {
return $this->result[$pos][$fld];
} else {
! # echo "<BR>POS:".$pos ." | FLD:". $fld ." | * ". var_dump($r[$pos][$fld]) ."<BR>\n";
return;
}
--- 274,281 ----
function get($pos,$fld) {
$fld = strtoupper($fld);
! if ( isset($this->result[$pos][$fld]) || (0 == $this->result[$pos][$fld]) ) {
return $this->result[$pos][$fld];
} else {
! echo "<BR>POS:".$pos ." | FLD:". $fld ." | * <BR>\n";
return;
}
***************
*** 288,292 ****
function fieldname($nr) {
$fn = ibase_field_info($this->rs,$nr);
! return $fn['alias'];
}
/* ---------------------------------------------------------------------------
--- 295,299 ----
function fieldname($nr) {
$fn = ibase_field_info($this->rs,$nr);
! return $this->dbconn->colnameREV($fn['alias']);
}
/* ---------------------------------------------------------------------------
|
|
From: Gero K. <gok...@us...> - 2001-09-30 18:35:42
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv22470/php
Modified Files:
timetrack_overview.php product_overview.php
installation_overview.php address_overview.php
Log Message:
better navigation to last page
Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** timetrack_overview.php 2001/09/27 21:36:16 1.16
--- timetrack_overview.php 2001/09/30 18:35:39 1.17
***************
*** 40,49 ****
$sum = 0;
- $a = 0;
- # Fill the sum
- while ( $a < $start ) {
- $sum += $r->get($a, "volume");
- $a++;
- }
if ( $start == -1 ) {
--- 40,43 ----
***************
*** 54,57 ****
--- 48,58 ----
$a = $start;
$end = $start + $tutos[maxshow];
+ }
+
+ # Fill the sum
+ $x = 0;
+ while ( $x < $a ) {
+ $sum += $r->get($x, "volume");
+ $x++;
}
Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** product_overview.php 2001/09/19 20:46:07 1.29
--- product_overview.php 2001/09/30 18:35:39 1.30
***************
*** 163,166 ****
--- 163,170 ----
$a = 0;
$end = $n;
+ } else if ( $start == -1 ) {
+ $a = $n - $tutos[maxshow];
+ $end = $n;
+ $start = $a;
} else {
$a = $start;
***************
*** 944,948 ****
}
! if ( (! isset($start)) || ($start < 0) ) {
$start = 0;
$link2 = addUrlParameter($link2,"start=".$start);
--- 948,952 ----
}
! if ( ! isset($start) ) {
$start = 0;
$link2 = addUrlParameter($link2,"start=".$start);
Index: installation_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation_overview.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** installation_overview.php 2001/09/19 20:47:29 1.11
--- installation_overview.php 2001/09/30 18:35:39 1.12
***************
*** 128,132 ****
! if ( (! isset($start)) || ($start < 0) ) {
$start = 0;
}
--- 128,132 ----
! if ( ! isset($start) ) {
$start = 0;
}
Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** address_overview.php 2001/09/19 20:46:07 1.9
--- address_overview.php 2001/09/30 18:35:39 1.10
***************
*** 159,163 ****
$q .= " ORDER by l_name";
}
! if ( isset($astart) && ($astart > 0) ) {
$atool['start'] = $astart;
} else {
--- 159,163 ----
$q .= " ORDER by l_name";
}
! if ( isset($astart) ) {
$atool['start'] = $astart;
} else {
|
|
From: Gero K. <gok...@us...> - 2001-09-30 18:32:50
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv21776/php
Modified Files:
bug.pinc bug_overview.php bug_show.php
Log Message:
using query class
Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** bug.pinc 2001/09/19 20:50:10 1.43
--- bug.pinc 2001/09/30 18:32:47 1.44
***************
*** 155,161 ****
--- 155,163 ----
$this->class=1;
$this->creator = $current_user;
+ $this->creation = new DateTime();
$this->solver = new tutos_address($this->dbconn);
$this->short = "";
$this->modified = array();
+ $this->tablename = "bugs";
}
/* ---------------------------------------------------------------------------
***************
*** 483,486 ****
--- 485,504 ----
$msg = "";
+
+ $q = new query($this->dbconn);
+ $q->setTable($this->tablename);
+ $q->addFV("state",$this->state,"");
+ $q->addFV("class",$this->class,"");
+ $q->addFV("short",$this->short,"STRING");
+ $q->addFV("description",$this->description,"STRING");
+ $q->addFV("solver",$this->solver->id,"");
+ $q->addFV("product_id",$this->parent->id,"");
+ if ( $this->state == 3 ) {
+ $q->addFV("solvedate",$this->solvedate,"DATETIME");
+ } else {
+ $this->solvedate = new DateTime(0);
+ $q->addFV("solvedate",$this->solvedate,"DATETIME");
+ }
+
$mail = new mail();
$mail->setFrom($current_user);
***************
*** 491,531 ****
if ( -1 == $this->id ) {
! $this->creation = new DateTime();
! $this->id = $this->dbconn->NextID();
! $flds = "id";
! $vals = $this->id;
!
! $flds .= ",state";
! $vals = sprintf("%s,%d",$vals,$this->state);
!
! $flds .= ",class";
! $vals = sprintf("%s,%d",$vals,$this->class);
!
! $flds .= ",short";
! $vals = sprintf("%s,%s",$vals,$this->dbconn->String($this->short));
!
! $flds .= ",description";
! $vals = sprintf("%s,%s",$vals,$this->dbconn->String($this->description));
!
! $flds .= ",product_id";
! $vals = sprintf("%s,%d",$vals,$this->parent->id);
!
! $flds .= ",creation";
! $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->creation));
! $flds .= ",creator";
! $vals = sprintf("%s,%d",$vals,$this->creator->id);
- $flds .= ",solver";
- $vals = sprintf("%s,%d",$vals,$this->solver->id);
-
- $flds .= ",solvedate";
- if ( $this->state == 3 ) {
- $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->solvedate));
- } else {
- $vals = sprintf("%s,%s",$vals,$this->dbconn->notime());
- }
- $q = "INSERT INTO bugs ($flds) VALUES ($vals)";
-
# Prepare the mail
$mail->setSubject("New BUG in ". $this->parent->getFullName());
--- 509,518 ----
if ( -1 == $this->id ) {
! $this->id = $q->addFV("id",-1,"NEXTID");
! $q->addFV("creator",$this->creator->id,"");
! $q->addFV("creation",$this->creation,"DATETIME");
! $query = $q->getInsert();
# Prepare the mail
$mail->setSubject("New BUG in ". $this->parent->getFullName());
***************
*** 555,572 ****
);
} else {
! $q = "UPDATE bugs SET";
!
! $q = sprintf("%s description = %s", $q,$this->dbconn->String($this->description) );
! $q = sprintf("%s,short = %s", $q,$this->dbconn->String($this->short) );
! $q = sprintf("%s,state = %d", $q,$this->state );
! $q = sprintf("%s,class = %d", $q,$this->class );
! $q = sprintf("%s,product_id = %d", $q,$this->parent->id );
- $q = sprintf("%s,solver = %d", $q,$this->solver->id );
-
- $q = sprintf("%s,solvedate = %s", $q,$this->dbconn->DateTime($this->solvedate) );
-
- $q = sprintf("%s WHERE id = %d", $q,$this->id );
-
acl_raise($this,$this->solver->id,$tutos[modok]);
--- 542,548 ----
);
} else {
! $q->addWC("id",$this->id,"");
! $query = $q->getUpdate();
acl_raise($this,$this->solver->id,$tutos[modok]);
***************
*** 656,660 ****
# Make the DB access
! $r = $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
--- 632,636 ----
# Make the DB access
! $r = $this->dbconn->Exec($query);
$msg .= acl_save($this);
$msg .= history_save($this);
Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_overview.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** bug_overview.php 2001/09/19 20:50:10 1.22
--- bug_overview.php 2001/09/30 18:32:47 1.23
***************
*** 400,410 ****
if ( ! isset($format) ) {
- HTML_Header($lang['BugsOverview']);
} else if ( $format == "stat" ) {
- HTML_Header($lang['BugStatsTitle']);
$qarg .= "&format=".$format;
$link1 = addUrlParameter($link1,"format=".UrlEncode($format));
} else {
- Printable_Header($lang['BugsOverview']);
$qarg .= "&format=".$format;
$link1 = addUrlParameter($link1,"format=".UrlEncode($format));
--- 400,407 ----
***************
*** 548,553 ****
--- 545,562 ----
$start = 0;
}
+ if ( ! isset($format) && ($result->numrows() == 1) ) {
+ $b = new bug($dbconn);
+ $b->read_result($result,0);
+ Header("Location: ". addSessionKey("bug_show.php?id=".$b->id));
+ $dbconn->Close();
+ exit;
+ }
if ( ! isset($format) || ($format == "stat")) {
+ if ( $format == "stat") {
+ HTML_Header($lang['BugStatsTitle']);
+ } else {
+ HTML_Header($lang['BugsOverview']);
+ }
HTML_Base1();
navigate($link2);
***************
*** 555,558 ****
--- 564,568 ----
}
if ( ! isset($format) || ($format == "paper")) {
+ Printable_Header($lang['BugsOverview']);
info($dbconn,$result,$start);
}
Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_show.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** bug_show.php 2001/09/10 16:39:04 1.15
--- bug_show.php 2001/09/30 18:32:47 1.16
***************
*** 124,128 ****
echo "<TABLE>";
! echo "<TR><TD>";
echo menulink("bug_select.php",$lang['Search'],$lang['SearchForBug']) ."<BR>\n";
echo menulink("bug_new.php",$lang['NewEntry'],$lang['CreateNewBug']) ."<BR>";
--- 124,128 ----
echo "<TABLE>";
! echo "<TR><TD NOWRAP>";
echo menulink("bug_select.php",$lang['Search'],$lang['SearchForBug']) ."<BR>\n";
echo menulink("bug_new.php",$lang['NewEntry'],$lang['CreateNewBug']) ."<BR>";
|
|
From: Gero K. <gok...@us...> - 2001-09-30 18:31:11
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv21411/php
Modified Files:
app_ins.php app_new.php appointment.pinc
Log Message:
added more history management
Index: app_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_ins.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** app_ins.php 2001/09/27 21:39:36 1.7
--- app_ins.php 2001/09/30 18:31:08 1.8
***************
*** 102,106 ****
$trace = 0;
}
! $a->trace = $trace;
$gotourl= addUrlParameter($gotourl,"trace=".$trace );
#
--- 102,106 ----
$trace = 0;
}
! $a->setTrace($trace);
$gotourl= addUrlParameter($gotourl,"trace=".$trace );
#
***************
*** 145,149 ****
$remember = 0;
}
! $a->remember = $remember;
$gotourl= addUrlParameter($gotourl,"remember=".$remember );
#
--- 145,149 ----
$remember = 0;
}
! $a->setRemember($remember);
$gotourl= addUrlParameter($gotourl,"remember=".$remember );
#
Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** app_new.php 2001/09/19 20:47:29 1.8
--- app_new.php 2001/09/30 18:31:08 1.9
***************
*** 167,171 ****
echo " <TD COLSPAN=1>\n";
echo $lang['tracestate'];
! echo " <INPUT type=\"checkbox\" name=\"trace\" value=1 $trace_checked>\n";
echo "<BR><FONT SIZE=-1>". $lang['tracestate_desc'] ."</FONT>";
echo " </TD>\n";
--- 167,171 ----
echo " <TD COLSPAN=1>\n";
echo $lang['tracestate'];
! echo " <INPUT type=\"checkbox\" name=\"trace\" value=1 ". $trace_checked .">\n";
echo "<BR><FONT SIZE=-1>". $lang['tracestate_desc'] ."</FONT>";
echo " </TD>\n";
Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** appointment.pinc 2001/09/27 20:30:56 1.61
--- appointment.pinc 2001/09/30 18:31:08 1.62
***************
*** 576,586 ****
}
/* ---------------------------------------------------------------------------
*/
function save() {
global $lang , $current_user, $tutos;
$msg = "";
- $start = $this->dbconn->DateTime($this->start);
- $end = $this->dbconn->DateTime($this->end);
if ( $this->trace == 0 ) {
/* YES */
--- 576,624 ----
}
/* ---------------------------------------------------------------------------
+ * set the trace status
*/
+ function setTrace($new) {
+ if ( $this->trace != $new ) {
+ $this->modified[] = array ( "field" => "tracestate" , "old" => $this->trace , "new" => $new );
+ $this->trace = $new;
+ }
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ * set the reminder
+ */
+ function setRemember($new) {
+ if ( $this->remember != $new ) {
+ $this->modified[] = array ( "field" => "AppEmailRemind" , "old" => $this->trace , "new" => $new );
+ $this->remember = $new;
+ }
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ */
function save() {
global $lang , $current_user, $tutos;
+ $q = new query($this->dbconn);
+ $q->setTable("calendar");
+ $q->addFV("a_start",$this->start,"DATETIME");
+ $q->addFV("a_end",$this->end,"DATETIME");
+ $q->addFV("description",$this->descr,"STRING");
+ $q->addFV("outside",$this->outside,"");
+ $q->addFV("r_arg",$this->r_arg,"STRING");
+ $q->addFV("r_ignore",$this->r_ignore,"");
+ $q->addFV("trace",$this->trace,"");
+ $q->addFV("remember",$this->remember,"");
+ $q->addFV("remembered",$this->remembered,"");
+ $q->addFV("mod_allow",$this->mod_allow,"");
+ $q->addFV("repeat",$this->repeat,"");
+ if ( $this->visitor->id != -1 ) {
+ $q->addFV("visitor",$this->visitor->id,"");
+ }
+ if ( $this->product->id != -1 ) {
+ $q->addFV("product",$this->product->id,"");
+ }
+
$msg = "";
if ( $this->trace == 0 ) {
/* YES */
***************
*** 597,628 ****
/* We have to modify an existing appointment */
$new = 0;
-
- $q="UPDATE calendar SET";
- $q .= " mod_allow = ". $this->mod_allow;
- $q .= ",a_start = ". $start;
- $q .= ",a_end = ". $end;
- $q .= ",remember = ". $this->remember;
- $q .= ",remembered = 0";
- $q .= ",description = ". $this->dbconn->String($this->descr);
- $q .= ",outside = ". $this->outside;
- $q .= ",repeat = ". $this->repeat;
- $q .= ",r_arg = ". $this->dbconn->String($this->r_arg);
- $q .= ",r_ignore = ". $this->r_ignore;
-
- if ( $this->visitor->id != -1 ) {
- $q .= ",visitor = ". $this->visitor->id;
- } else {
- $q .= ",visitor = null";
- }
- if ( $this->product->id != -1 ) {
- $q .= ",product = ". $this->product->id;
- } else {
- $q .= ",product = null";
- }
- $q .= ",trace = ". $this->trace;
- $q .= " WHERE id = ". $this->id;
! $r = $this->dbconn->Exec($q);
/* Remove the old list of participants */
--- 635,642 ----
/* We have to modify an existing appointment */
$new = 0;
+ $q->addWC("id",$this->id,"");
! $r = $this->dbconn->Exec($q->getUpdate());
/* Remove the old list of participants */
***************
*** 633,693 ****
$new = 1;
/* Get an new appointment ID */
! $this->id = $this->dbconn->NextID();
!
! $flds = "INSERT INTO calendar (ID";
! $vals = "VALUES (". $this->id;
!
! $flds .= ",A_START";
! $vals = sprintf("%s,%s",$vals, $start);
!
! $flds .= ",A_END";
! $vals = sprintf("%s,%s",$vals, $end);
!
! $flds .= ",CREATOR";
! $vals = sprintf("%s,%d",$vals, $this->creator->id);
!
! $flds .= ",CREATION";
! $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->creation));
!
! $flds .= ",TRACE";
! $vals = sprintf("%s,%d",$vals, $this->trace);
!
! $flds .= ",MOD_ALLOW";
! $vals = sprintf("%s,%d",$vals, $this->mod_allow);
!
! $flds .= ",REMEMBER";
! $vals = sprintf("%s,%d",$vals, $this->remember);
!
! $flds .= ",REMEMBERED";
! $vals = sprintf("%s,%d",$vals, $this->remembered);
!
! $flds .= ",DESCRIPTION";
! $vals = sprintf("%s,%s",$vals, $this->dbconn->String($this->descr));
!
! $flds .= ",OUTSIDE";
! $vals = sprintf("%s,%d",$vals, $this->outside);
!
! if ( $this->visitor->id != -1 ) {
! $flds .= ",VISITOR";
! $vals = sprintf("%s,%d",$vals, $this->visitor->id);
! }
! if ( $this->product->id != -1 ) {
! $flds .= ",PRODUCT";
! $vals = sprintf("%s,%d",$vals, $this->product->id);
! }
!
! $flds .= ",REPEAT";
! $vals = sprintf("%s,%d",$vals, $this->repeat);
!
! $flds .= ",R_ARG";
! $vals = sprintf("%s,%s",$vals, $this->dbconn->String($this->r_arg));
!
! $flds .= ",R_IGNORE";
! $vals = sprintf("%s,%d",$vals, $this->r_ignore);
! $flds .= ")";
! $vals .= ")";
- $r = $this->dbconn->Exec($flds ." ". $vals);
acl_raise($this,$this->creator->id,$tutos[delok]);
--- 647,656 ----
$new = 1;
/* Get an new appointment ID */
! $this->id = $q->addFV("id",-1,"NEXTID");
! $q->addFV("creator",$this->creator->id,"");
! $q->addFV("creation",$this->creation,"DATETIME");
! $r = $this->dbconn->Exec($q->getInsert());
acl_raise($this,$this->creator->id,$tutos[delok]);
|
|
From: Gero K. <gok...@us...> - 2001-09-30 18:30:00
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv21109/php
Modified Files:
note.pinc note_ins.php
Log Message:
added history management
Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note.pinc,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** note.pinc 2001/09/19 20:51:38 1.41
--- note.pinc 2001/09/30 18:29:57 1.42
***************
*** 95,98 ****
--- 95,99 ----
$this->creator = $current_user;
$this->remember = new DateTime(0);
+ $this->tablename = "notes";
}
/* ---------------------------------------------------------------------------
***************
*** 133,137 ****
}
! $q = "SELECT * from notes where id = ". $id;
$r = $this->dbconn->Exec($q);
$n = $r->numrows();
--- 134,138 ----
}
! $q = "SELECT * from ". $this->tablename ." where id = ". $id;
$r = $this->dbconn->Exec($q);
$n = $r->numrows();
***************
*** 272,275 ****
--- 273,309 ----
}
/* ---------------------------------------------------------------------------
+ * set the note name
+ */
+ function setName($new) {
+ if ( $this->name != $new ) {
+ $this->modified[] = array ( "field" => "NoteName" , "old" => $this->name , "new" => $new );
+ $this->name = $new;
+ }
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ * set the note text
+ */
+ function setText($new) {
+ if ( $this->note != $new ) {
+ $this->modified[] = array ( "field" => "NoteDescription" , "old" => $this->note , "new" => $new );
+ $this->note = $new;
+ }
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ * set the remember date
+ */
+ function setRemember(&$name) {
+ $a = $this->remember->getYYYYMMDD();
+ $b = $name->getYYYYMMDD();
+
+ if ( $a != $b ) {
+ $this->modified[] = array ( "field" => "NoteRemember", "old" => $a , "new" => $b );
+ $this->remember = $name;
+ }
+ return;
+ }
+ /* ---------------------------------------------------------------------------
* Save NOTE to DB
*/
***************
*** 283,312 ****
$this->link_id = $this->creator->id;
}
if ( -1 == $this->id ) {
! $this->id = $this->dbconn->NextID();
!
! $flds = "id";
! $vals = $this->id;
!
! $flds .= ",link_id";
! $vals .= ",". $this->link_id;
!
! $flds .= ",name";
! $vals .= ",". $this->dbconn->String($this->name);
!
! $flds .= ",note";
! $vals .= ",". $this->dbconn->String($this->note);
!
! $flds .= ",creator";
! $vals .= ",". $this->creator->id;
!
! $flds .= ",creation";
! $vals .= ",". $this->dbconn->DateTime($this->creation);
!
! $flds .= ",remember";
! $vals .= ",". $this->dbconn->DateTime($this->remember);
!
! $q = "INSERT INTO notes (". $flds .") VALUES (". $vals .")";
# adopt the permissions from the referenced object
--- 317,332 ----
$this->link_id = $this->creator->id;
}
+ $q = new query($this->dbconn);
+ $q->setTable($this->tablename);
+ $q->addFV("name",$this->name,"STRING");
+ $q->addFV("note",$this->note,"STRING");
+ $q->addFV("remember",$this->remember,"DATETIME");
+ $q->addFV("link_id",$this->link_id,"");
if ( -1 == $this->id ) {
! $this->id = $q->addFV("id",-1,"NEXTID");
! $q->addFV("creator",$this->creator->id,"");
! $q->addFV("creation",$this->creation,"DATETIME");
! $query = $q->getInsert();
# adopt the permissions from the referenced object
***************
*** 316,320 ****
# Prepare the history
! unset ($this->modified);
$this->modified[] = array ( "field" => "NoteCreate" ,
"old" => "-1" ,
--- 336,340 ----
# Prepare the history
! $this->modified = array();
$this->modified[] = array ( "field" => "NoteCreate" ,
"old" => "-1" ,
***************
*** 328,339 ****
);
} else {
! $q = "UPDATE notes SET ";
! $q .= " name = ". $this->dbconn->String($this->name);
! $q .= ",note = ". $this->dbconn->String($this->note);
! $q .= ",remember = ". $this->dbconn->DateTime($this->remember) ;
! $q .= " WHERE id = ". $this->id;
}
! $this->dbconn->Exec($q);
$msg .= acl_save($this);
$msg .= history_save($this);
--- 348,356 ----
);
} else {
! $q->addWC("id",$this->id,"");
! $query = $q->getUpdate();
}
! $this->dbconn->Exec($query);
$msg .= acl_save($this);
$msg .= history_save($this);
***************
*** 347,351 ****
$msg = "";
! $q = "DELETE FROM notes WHERE id = ". $this->id;
$this->dbconn->Exec($q);
--- 364,368 ----
$msg = "";
! $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
$this->dbconn->Exec($q);
Index: note_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note_ins.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** note_ins.php 2001/09/16 14:27:27 1.10
--- note_ins.php 2001/09/30 18:29:57 1.11
***************
*** 35,39 ****
} else {
$gotourl= addUrlParameter($gotourl,"name=". UrlEncode(StripSlashes($name)));
! $u->name = $name;
}
if ( empty($note) ) {
--- 35,39 ----
} else {
$gotourl= addUrlParameter($gotourl,"name=". UrlEncode(StripSlashes($name)));
! $u->setName($name);
}
if ( empty($note) ) {
***************
*** 41,45 ****
} else {
$gotourl= addUrlParameter($gotourl,"note=". UrlEncode(StripSlashes($note)));
! $u->note = $note;
}
if ( empty($link_id) ) {
--- 41,45 ----
} else {
$gotourl= addUrlParameter($gotourl,"note=". UrlEncode(StripSlashes($note)));
! $u->setText($note);
}
if ( empty($link_id) ) {
***************
*** 51,55 ****
}
! $u->remember->setDateTimeF("remember");
$gotourl= addUrlParameter($gotourl,"remember=". $u->remember->getYYYYMMDD() );
if ( 1 != $u->remember->checkDMY() ) {
--- 51,58 ----
}
! $r = new DateTime(0);
! $r->setDateTimeF("remember");
! $u->setRemember($r);
!
$gotourl= addUrlParameter($gotourl,"remember=". $u->remember->getYYYYMMDD() );
if ( 1 != $u->remember->checkDMY() ) {
|
|
From: Gero K. <gok...@us...> - 2001-09-30 18:28:42
|
Update of /cvsroot/tutos/tutos In directory usw-pr-cvs1:/tmp/cvs-serv20877 Modified Files: Makefile.in Log Message: added australian holiday file Index: Makefile.in =================================================================== RCS file: /cvsroot/tutos/tutos/Makefile.in,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -r1.69 -r1.70 *** Makefile.in 2001/09/27 20:26:10 1.69 --- Makefile.in 2001/09/30 18:28:40 1.70 *************** *** 11,14 **** --- 11,17 ---- # # $Log$ + # Revision 1.70 2001/09/30 18:28:40 gokohnert + # added australian holiday file + # # Revision 1.69 2001/09/27 20:26:10 gokohnert # added holiday description files / document stuff *************** *** 295,298 **** --- 298,302 ---- php/history.pinc \ php/history_show.php \ + php/holiday_au.pinc \ php/holiday_de.pinc \ php/holiday_de_at.pinc \ |
|
From: Gero K. <gok...@us...> - 2001-09-30 18:28:08
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv20761/php
Added Files:
holiday_au.pinc
Log Message:
initial
--- NEW FILE: holiday_au.pinc ---
<?
/*
* Copyright 2001 by Gero Kohnert
*
* CVS Info: $Id: holiday_au.pinc,v 1.1 2001/09/30 18:28:05 gokohnert Exp $
* $Author: gokohnert $
*/
$tutos[cal][] = array(
array( Date => "26-01", Desc => "National Holiday (AU)"),
array( Date => "01-10", Desc => "Public Holiday (AU)"),
);
?>
|
|
From: Boris W. <bw...@us...> - 2001-09-28 09:00:47
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv30615
Modified Files:
Date.pinc admin_sync.php holiday_de.pinc holiday_de_at.pinc
Log Message:
Spelling fixes
Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** Date.pinc 2001/09/27 19:34:27 1.38
--- Date.pinc 2001/09/28 09:00:40 1.39
***************
*** 175,179 ****
}
! elseif ($tutos[cal][$ii][$ij][Date] == "FRONLEICHNAHM") {
$tp = mktime (0,0,0,$OM,$OT,$J);
$tp += (8*7 +4) * 86400;
--- 175,179 ----
}
! elseif ($tutos[cal][$ii][$ij][Date] == "FRONLEICHNAM") {
$tp = mktime (0,0,0,$OM,$OT,$J);
$tp += (8*7 +4) * 86400;
Index: admin_sync.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_sync.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** admin_sync.php 2001/09/27 21:39:36 1.5
--- admin_sync.php 2001/09/28 09:00:41 1.6
***************
*** 377,381 ****
if ( count($tutos[dbname]) <= 1 ) {
! echo "<SPAN CLASS=warn>You have to define more than one Database</SPAN>\n";
}
--- 377,381 ----
if ( count($tutos[dbname]) <= 1 ) {
! echo "<SPAN CLASS=warn>You have to define more than one database</SPAN>\n";
}
***************
*** 457,462 ****
# SyncModes
! $lang['AdminDBSyncM'][1] = "remove target than copy all from source to target";
! $lang['AdminDBSyncM'][2] = "copy all new (since last sync) from target to source , then copy all";
$lang['AdminDBSyncM'][3] = "copy selected new (since last sync) from target to source, then copy all";
--- 457,462 ----
# SyncModes
! $lang['AdminDBSyncM'][1] = "remove target, then copy all from source to target";
! $lang['AdminDBSyncM'][2] = "copy all new (since last sync) from target to source, then copy all";
$lang['AdminDBSyncM'][3] = "copy selected new (since last sync) from target to source, then copy all";
***************
*** 477,481 ****
}
if ( $from == $to ) {
! $msg .= "Source and Target must be different !";
$from = 0;
$to = 1;
--- 477,481 ----
}
if ( $from == $to ) {
! $msg .= "Source and target must be different !";
$from = 0;
$to = 1;
Index: holiday_de.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/holiday_de.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** holiday_de.pinc 2001/09/11 20:58:25 1.1
--- holiday_de.pinc 2001/09/28 09:00:41 1.2
***************
*** 23,27 ****
array( Date => "WHITSUNDAY", Desc => "Pfingstsonntag (D)"),
array( Date => "WHITMONDAY", Desc => "Pfingstmontag (D)"),
! array( Date => "FRONLEICHNAHM", Desc => "Fronleichnahm (D*)")
);
! ?>
\ No newline at end of file
--- 23,27 ----
array( Date => "WHITSUNDAY", Desc => "Pfingstsonntag (D)"),
array( Date => "WHITMONDAY", Desc => "Pfingstmontag (D)"),
! array( Date => "FRONLEICHNAM", Desc => "Fronleichnam (D*)")
);
! ?>
Index: holiday_de_at.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/holiday_de_at.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** holiday_de_at.pinc 2001/09/11 20:58:25 1.1
--- holiday_de_at.pinc 2001/09/28 09:00:41 1.2
***************
*** 22,26 ****
array( Date => "WHITSUNDAY", Desc => "Pfingstsonntag (A)"),
array( Date => "WHITMONDAY", Desc => "Pfingstmontag (A)"),
! array( Date => "FRONLEICHNAHM", Desc => "Fronleichnahm (A)")
);
! ?>
\ No newline at end of file
--- 22,26 ----
array( Date => "WHITSUNDAY", Desc => "Pfingstsonntag (A)"),
array( Date => "WHITMONDAY", Desc => "Pfingstmontag (A)"),
! array( Date => "FRONLEICHNAM", Desc => "Fronleichnam (A)")
);
! ?>
|
|
From: Gero K. <gok...@us...> - 2001-09-27 21:39:39
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv5716/php
Modified Files:
admin_show.php admin_sync.php app_ins.php config.pinc db.p3
db_interbase.pinc db_ora.pinc mail.pinc mailbox.pinc
mailbox_overview.php user.pinc user_new.php webelements.p3
Log Message:
working version
Index: admin_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** admin_show.php 2001/09/19 20:51:14 1.19
--- admin_show.php 2001/09/27 21:39:36 1.20
***************
*** 32,35 ****
--- 32,36 ----
$counts['mailboxes'] = 0;
$counts['resources'] = 0;
+ $counts['urls'] = 0;
$counts['tutos_dbs'] = 0;
$counts['watchlist'] = 0;
Index: admin_sync.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_sync.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** admin_sync.php 2001/09/19 20:51:14 1.4
--- admin_sync.php 2001/09/27 21:39:36 1.5
***************
*** 6,9 ****
--- 6,16 ----
include("permission.p3");
+ include("product.pinc");
+ include("appointment.pinc");
+ include("note.pinc");
+ include("bug.pinc");
+ include("file.pinc");
+ include("installation.pinc");
+
/* Check if user is allowed to use it */
check_user();
***************
*** 35,41 ****
--- 42,81 ----
$table[] = "watchlist";
$table[] = "mailboxes";
+ $table[] = "urls";
$table[] = "messages";
/* ---------------------------------------------------------------------------
+ * Copy a selection of objects
+ */
+ Function copy_selected(&$dbconn1,&$dbconn2) {
+ global $lang,$tutos,$table;
+
+ echo "changes since last sync (". $dbconn1->db->lastsync->getDateTime() .")<BR>\n";
+ $q1 = "SELECT obj_id from history where m_field = ". $dbconn2->String("created");
+ if ( $dbconn1->db->lastsync->notime != 1) {
+ $q1 .= " AND m_time > ". $dbconn2->DateTime($dbconn1->db->lastsync);
+ }
+ $r1 = $dbconn2->Exec($q1);
+ $n1 = $r1->numrows();
+ echo "New on target: ". $n1 ."<BR>\n";
+
+ $q2 = "SELECT obj_id from history where m_field = ". $dbconn2->String("Delete");
+ if ( $dbconn1->db->lastsync->notime != 1) {
+ $q2 .= " AND m_time > ". $dbconn2->DateTime($dbconn1->db->lastsync);
+ }
+ $r2 = $dbconn2->Exec($q2);
+ echo "Deleted on target: ". $r2->numrows() ."<BR>\n";
+
+ $a = 0;
+ while ( $a < $n1) {
+ $xid = $r1->get($a,"obj_id");
+ $x = getObject($dbconn2,$xid,1);
+ echo "NEW: ". $xid ." : ". $lang[$x->getType()] ." ". $x->getFullName() ."<BR>\n";
+ $a++;
+ }
+ $r1->free();
+ $r2->free();
+ }
+ /* ---------------------------------------------------------------------------
*
*/
***************
*** 75,79 ****
$ft = strtoupper($r->fieldtype($b));
# OLD VERSION
! if ( ($f == "products") && ( ($fn == "manager") || ($fn == "seller") || ($fn == "manager2") ) ) {
$b++;
continue;
--- 115,119 ----
$ft = strtoupper($r->fieldtype($b));
# OLD VERSION
! if ( ($f == "products") && ( ($fn == "MANAGER") || ($fn == "SELLER") || ($fn == "MANAGER2") ) ) {
$b++;
continue;
***************
*** 169,172 ****
--- 209,215 ----
if ( $what == 1 ) {
copy_all($dbconn1,$dbconn2);
+ } else if ( $what == 2 ) {
+ copy_selected($dbconn1,$dbconn2);
+ # copy_all($dbconn1,$dbconn2);
} else {
echo "<SPAN CLASS=warn>Action :". $lang['AdminDBSyncM'][$what] ." not yet implemented </SPAN>\n";
***************
*** 270,274 ****
echo " <TD>". $r4->numrows() ."</TD>\n";
echo "</TR>\n";
!
# Does this make sense ?
if ( ($what != 1 ) && ($db1->lastsync->notime) ) {
--- 313,321 ----
echo " <TD>". $r4->numrows() ."</TD>\n";
echo "</TR>\n";
!
! $r1->free();
! $r2->free();
! $r3->free();
! $r4->free();
# Does this make sense ?
if ( ($what != 1 ) && ($db1->lastsync->notime) ) {
***************
*** 410,416 ****
# SyncModes
! $lang['AdminDBSyncM'][1] = "remove target than copy all from source";
! $lang['AdminDBSyncM'][2] = "copy all new (since last sync) to target";
! $lang['AdminDBSyncM'][3] = "copy selected new (since last sync) to target";
if ( ! isset($step) ) {
--- 457,463 ----
# SyncModes
! $lang['AdminDBSyncM'][1] = "remove target than copy all from source to target";
! $lang['AdminDBSyncM'][2] = "copy all new (since last sync) from target to source , then copy all";
! $lang['AdminDBSyncM'][3] = "copy selected new (since last sync) from target to source, then copy all";
if ( ! isset($step) ) {
Index: app_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_ins.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** app_ins.php 2001/09/19 20:47:29 1.6
--- app_ins.php 2001/09/27 21:39:36 1.7
***************
*** 118,122 ****
$outside = 0;
}
! $a->outside = $outside;
$gotourl= addUrlParameter($gotourl,"outside=".$outside );
#
--- 118,122 ----
$outside = 0;
}
! $a->SetLocation($outside);
$gotourl= addUrlParameter($gotourl,"outside=".$outside );
#
***************
*** 154,158 ****
} else {
$gotourl="$gotourl&descr=". UrlEncode(StripSlashes($descr));
! $a->descr = AddSlashes(trim($descr));;
}
#
--- 154,158 ----
} else {
$gotourl="$gotourl&descr=". UrlEncode(StripSlashes($descr));
! $a->SetDescription($descr);;
}
#
***************
*** 221,225 ****
--- 221,227 ----
}
+ $dbconn->Begin("WORK");
$msg .= $a->save();
+ $dbconn->Commit("WORK");
/* Go back to calendar */
Index: config.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config.pinc,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** config.pinc 2001/09/19 20:51:38 1.72
--- config.pinc 2001/09/27 21:39:36 1.73
***************
*** 308,315 ****
$tutos[holiday]['US'] = 1;
$tutos[holiday]['DE'] = 1;
! $tutos[holiday]['AT'] = 1;
$tutos[holiday]['HU'] = 1;
$tutos[holiday]['IT'] = 1;
$tutos[holiday]['MX'] = 1;
#
# Location types for appointments
--- 308,319 ----
$tutos[holiday]['US'] = 1;
$tutos[holiday]['DE'] = 1;
! $tutos[holiday]['DE_AT'] = 1;
$tutos[holiday]['HU'] = 1;
$tutos[holiday]['IT'] = 1;
$tutos[holiday]['MX'] = 1;
+ $tutos[holiday]['FR'] = 1;
+ $tutos[holiday]['NL'] = 1;
+ $tutos[holiday]['RU'] = 1;
+ $tutos[holiday]['KO'] = 1;
#
# Location types for appointments
***************
*** 364,367 ****
--- 368,372 ----
$tutos[useldap] = 1;
$tutos[usevcard] = 1;
+ $tutos[useical] = 1;
$tutos[useurl] = 1;
#
***************
*** 408,412 ****
# The TUTOS Version number
#
! $tutos[version]="20010907";
#
$includes[config.pinc] = 1;
--- 413,417 ----
# The TUTOS Version number
#
! $tutos[version]="20010923";
#
$includes[config.pinc] = 1;
Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** db.p3 2001/09/19 20:50:10 1.48
--- db.p3 2001/09/27 21:39:36 1.49
***************
*** 107,110 ****
--- 107,111 ----
define (usevcard,-19);
define (useurl,-20);
+ define (useical,-21);
# Image IDs
***************
*** 163,166 ****
--- 164,250 ----
*/
class result {
+ }
+ /*
+ * Query class
+ */
+ class query {
+ function query(&$dbconn) {
+ $this->dbconn = $dbconn;
+ $this->flds = array();
+ # Fields in the Where Clause
+ $this->wc = array();
+ $this->table = "UNKNOWN";
+ }
+ /* Set the tablename */
+ function setTable($tbl) {
+ $this->table = $tbl;
+ }
+ /* Add Field Value Pairs */
+ function addFV($fld,$val,$type) {
+ $fld = $this->dbconn->colname($fld);
+ if ( $type == "STRING" ) {
+ $this->flds[$fld] = $this->dbconn->String($val);
+ } else if ( $type == "PASSWORD" ) {
+ $this->flds[$fld] = $this->dbconn->Password($val);
+ } else if ( $type == "NEXTID" ) {
+ $this->flds[$fld] = $this->dbconn->NextID();
+ } else if ( $type == "DATETIME" ) {
+ $this->flds[$fld] = $this->dbconn->datetime($val);
+ } else if ( $type == "DATE" ) {
+ $this->flds[$fld] = $this->dbconn->date($val);
+ } else {
+ $this->flds[$fld] = $val;
+ }
+ }
+ /* Add Field Value Pairs for the where clause of UPDATES using "AND" and " = " */
+ function addWC($fld,$val,$type) {
+ $fld = $this->dbconn->colname($fld);
+ if ( $type == "STRING" ) {
+ $this->wc[$fld] = $this->dbconn->String($val);
+ } else if ( $type == "PASSWORD" ) {
+ $this->wc[$fld] = $this->dbconn->Password($val);
+ } else if ( $type == "NEXTID" ) {
+ $this->wc[$fld] = $this->dbconn->NextID();
+ } else if ( $type == "DATETIME" ) {
+ $this->wc[$fld] = $this->dbconn->datetime($val);
+ } else if ( $type == "DATE" ) {
+ $this->wc[$fld] = $this->dbconn->date($val);
+ } else {
+ $this->wc[$fld] = $val;
+ }
+ }
+ /* get an INSERT query */
+ function getInsert() {
+ $flds .= "(";
+ $vals .= "(";
+ $pre = "";
+ @reset($this->flds);
+ while( list ($i,$f) = @each ($this->flds)) {
+ $flds .= $pre . $i;
+ $vals .= $pre . $f;
+ $pre = ",";
+ }
+ $flds .= ")";
+ $vals .= ")";
+ $q = "INSERT INTO ". $this->table ." ". $flds ." VALUES ". $vals;
+ return $q;
+ }
+ /* get an UPDATE query */
+ function getUpdate() {
+ $pre = " ";
+ $q = "UPDATE ". $this->table ." SET ";
+ @reset($this->flds);
+ while( list ($i,$f) = @each ($this->flds)) {
+ $q .= $pre . $i ." = ". $f;
+ $pre = ",";
+ }
+ $pre = " WHERE ";
+ @reset($this->wc);
+ while( list ($i,$f) = @each ($this->wc)) {
+ $q .= $pre ."(". $i ." = ". $f .")";
+ $pre = " AND ";
+ }
+ return $q;
+ }
}
Index: db_interbase.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_interbase.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** db_interbase.pinc 2001/09/19 20:45:09 1.2
--- db_interbase.pinc 2001/09/27 21:39:36 1.3
***************
*** 32,36 ****
$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() );
--- 32,36 ----
$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() );
***************
*** 269,276 ****
if ( isset($this->result[$pos][$fld]) ) {
return $this->result[$pos][$fld];
! } else {
# echo "<BR>POS:".$pos ." | FLD:". $fld ." | * ". var_dump($r[$pos][$fld]) ."<BR>\n";
return;
! }
}
/* ---------------------------------------------------------------------------
--- 269,276 ----
if ( isset($this->result[$pos][$fld]) ) {
return $this->result[$pos][$fld];
! } else {
# echo "<BR>POS:".$pos ." | FLD:". $fld ." | * ". var_dump($r[$pos][$fld]) ."<BR>\n";
return;
! }
}
/* ---------------------------------------------------------------------------
***************
*** 305,307 ****
}
$includes['db_interbase.pinc'] = 1;
! ?>
\ No newline at end of file
--- 305,307 ----
}
$includes['db_interbase.pinc'] = 1;
! ?>
Index: db_ora.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_ora.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** db_ora.pinc 2001/09/19 20:45:09 1.3
--- db_ora.pinc 2001/09/27 21:39:36 1.4
***************
*** 28,34 ****
$of = $this->openfunc;
! $c = $of($this->db->user."@".$this->db->name,$this->db->pass);
if ($c == false) {
! Fatal_Error("Opening the ORACLE database ".$this->getFullname() ,ora_errorcode());
}
$cur = Ora_Do($c,"ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'");
--- 28,34 ----
$of = $this->openfunc;
! $c = @$of($this->db->user."@".$this->db->name,$this->db->pass);
if ($c == false) {
! Fatal_Error("Opening the ORACLE database ".$this->getFullname() ,ora_error() );
}
$cur = Ora_Do($c,"ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'");
Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** mail.pinc 2001/08/31 08:33:10 1.17
--- mail.pinc 2001/09/27 21:39:36 1.18
***************
*** 92,97 ****
@reset($this->to_adr);
while ( list ($i,$obj) = @each ($this->to_adr) ) {
! $to = $to . $pre ." <". $obj .">";
! $pre = ",";
}
}
--- 92,97 ----
@reset($this->to_adr);
while ( list ($i,$obj) = @each ($this->to_adr) ) {
! $to = $to . $pre ." <". $obj .">";
! $pre = ",";
}
}
***************
*** 121,126 ****
@reset($this->to_adr);
while ( list ($i,$obj) = @each ($this->to_adr) ) {
! $to = $to . $pre . $obj ;
! $pre = " , ";
}
}
--- 121,126 ----
@reset($this->to_adr);
while ( list ($i,$obj) = @each ($this->to_adr) ) {
! $to = $to . $pre . $obj ;
! $pre = " , ";
}
}
***************
*** 166,179 ****
@reset($this->cc);
while ( list ($i,$obj) = @each ($this->cc) ) {
! if ( $this->sent[$obj->id] == 1 ) {
! continue;
! }
! $t = $obj->default_email();
! if ( $t == "" ) {
! continue;
! }
! $cc = $cc . $pre ."\"". $obj->getFullName() ."\" <". $t .">";
! $pre = ",";
! $this->sent[$obj->id] = 1;
}
}
--- 166,179 ----
@reset($this->cc);
while ( list ($i,$obj) = @each ($this->cc) ) {
! if ( $this->sent[$obj->id] == 1 ) {
! continue;
! }
! $t = $obj->default_email();
! if ( $t == "" ) {
! continue;
! }
! $cc = $cc . $pre ."\"". $obj->getFullName() ."\" <". $t .">";
! $pre = ",";
! $this->sent[$obj->id] = 1;
}
}
***************
*** 181,186 ****
@reset($this->cc_adr);
while ( list ($i,$obj) = @each ($this->cc_adr) ) {
! $cc = $cc . $pre ." <". $obj .">";
! $pre = ",";
}
}
--- 181,186 ----
@reset($this->cc_adr);
while ( list ($i,$obj) = @each ($this->cc_adr) ) {
! $cc = $cc . $pre ." <". $obj .">";
! $pre = ",";
}
}
***************
*** 197,209 ****
@reset($this->cc);
while ( list ($i,$obj) = @each ($this->cc) ) {
! if ( $this->sent[$obj->id] == 1 ) {
! continue;
! }
! $t = $obj->default_email();
! if ( $t == "" ) {
! continue;
! }
! $cc = $cc . $pre . $t ;
! $pre = " , ";
}
}
--- 197,209 ----
@reset($this->cc);
while ( list ($i,$obj) = @each ($this->cc) ) {
! if ( $this->sent[$obj->id] == 1 ) {
! continue;
! }
! $t = $obj->default_email();
! if ( $t == "" ) {
! continue;
! }
! $cc = $cc . $pre . $t ;
! $pre = " , ";
}
}
***************
*** 211,216 ****
@reset($this->cc_adr);
while ( list ($i,$obj) = @each ($this->cc_adr) ) {
! $cc = $cc . $pre . $obj ;
! $pre = " , ";
}
}
--- 211,216 ----
@reset($this->cc_adr);
while ( list ($i,$obj) = @each ($this->cc_adr) ) {
! $cc = $cc . $pre . $obj ;
! $pre = " , ";
}
}
***************
*** 354,360 ****
continue;
}
- $cc .= $pre ."\"". $obj->getFullName() ."\" <". $t .">";
- $pre = ",";
- $this->sent[$obj->id] = 1;
$msg .= sprintf($lang['MailSentCc'],$this->subject,$obj->getFullname($t)) ."<BR>\n";
}
--- 354,357 ----
***************
*** 363,373 ****
@reset($this->cc_adr);
while ( list ($i,$obj) = @each ($this->cc_adr) ) {
- $cc .= $pre ." <". $obj .">";
- $pre = ",";
$msg .= sprintf($lang['MailSentCc'],$this->subject,$obj) ."<BR>\n";
}
}
! if ( $to == "" ) {
# No recipents
return $msg;
--- 360,368 ----
@reset($this->cc_adr);
while ( list ($i,$obj) = @each ($this->cc_adr) ) {
$msg .= sprintf($lang['MailSentCc'],$this->subject,$obj) ."<BR>\n";
}
}
! if ( ($to == "") && ($cc = "") ) {
# No recipents
return $msg;
***************
*** 384,388 ****
$fd = fsockopen($tutos[smtphost],25,&$errno,&$errstr);
if ( $fd == false ) {
! return $msg . $errno ." ". $errstr;
}
fputs($fd,"HELO ". $SERVER_NAME . $eoln);
--- 379,383 ----
$fd = fsockopen($tutos[smtphost],25,&$errno,&$errstr);
if ( $fd == false ) {
! return $msg . $errno ." ". $errstr;
}
fputs($fd,"HELO ". $SERVER_NAME . $eoln);
***************
*** 392,420 ****
@reset($this->to);
while ( list ($i,$obj) = @each ($this->to) ) {
! $t = $obj->default_email();
! if ( $t == "" ) {
! continue;
! }
! fputs($fd,"RCPT To: ". $t . $eoln);
! $this->readsmtp($msg,$fd);
}
@reset($this->to_adr);
while ( list ($i,$obj) = @each ($this->to_adr) ) {
! fputs($fd,"RCPT To: ". $obj . $eoln);
! $this->readsmtp($msg,$fd);
}
@reset($this->cc);
while ( list ($i,$obj) = @each ($this->cc) ) {
! $t = $obj->default_email();
! if ( $t == "" ) {
! continue;
! }
! fputs($fd,"RCPT To: ". $t .$eoln);
! $this->readsmtp($msg,$fd);
}
@reset($this->cc_adr);
while ( list ($i,$obj) = @each ($this->cc_adr) ) {
! fputs($fd,"RCPT To: ". $obj .$eoln);
! $this->readsmtp($msg,$fd);
}
--- 387,415 ----
@reset($this->to);
while ( list ($i,$obj) = @each ($this->to) ) {
! $t = $obj->default_email();
! if ( $t == "" ) {
! continue;
! }
! fputs($fd,"RCPT To: ". $t . $eoln);
! $this->readsmtp($msg,$fd);
}
@reset($this->to_adr);
while ( list ($i,$obj) = @each ($this->to_adr) ) {
! fputs($fd,"RCPT To: ". $obj . $eoln);
! $this->readsmtp($msg,$fd);
}
@reset($this->cc);
while ( list ($i,$obj) = @each ($this->cc) ) {
! $t = $obj->default_email();
! if ( $t == "" ) {
! continue;
! }
! fputs($fd,"RCPT To: ". $t .$eoln);
! $this->readsmtp($msg,$fd);
}
@reset($this->cc_adr);
while ( list ($i,$obj) = @each ($this->cc_adr) ) {
! fputs($fd,"RCPT To: ". $obj .$eoln);
! $this->readsmtp($msg,$fd);
}
Index: mailbox.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox.pinc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** mailbox.pinc 2001/09/19 20:48:33 1.20
--- mailbox.pinc 2001/09/27 21:39:36 1.21
***************
*** 183,192 ****
$c = $this->getConnString();
$x = @imap_open($c, $this->user, $this->pw,OP_HALFOPEN);
! $this->errors();
# $this->folders = imap_listmailbox ($x, $c, "*");
$this->folders = imap_getmailboxes ($x, $c, "*");
! $this->errors();
imap_close($x);
! $this->errors();
if ($this->folders == false) {
$this->errors();
--- 183,192 ----
$c = $this->getConnString();
$x = @imap_open($c, $this->user, $this->pw,OP_HALFOPEN);
! $this->errors("imap_open");
# $this->folders = imap_listmailbox ($x, $c, "*");
$this->folders = imap_getmailboxes ($x, $c, "*");
! $this->errors("imap_getmailboxes");
imap_close($x);
! $this->errors("imap_close");
if ($this->folders == false) {
$this->errors();
***************
*** 222,226 ****
$this->mbox = @imap_open($c, $this->user, $this->pw,OP_READONLY);
! return $this->errors();
}
/* ---------------------------------------------------------------------------
--- 222,226 ----
$this->mbox = @imap_open($c, $this->user, $this->pw,OP_READONLY);
! return $this->errors("open");
}
/* ---------------------------------------------------------------------------
***************
*** 232,243 ****
}
if ( $this->mbox != "" ) {
! imap_close($this->mbox);
}
! $this->errors();
}
/* ---------------------------------------------------------------------------
* close the connection to the mailbox
*/
! function errors () {
if ( ! function_exists('imap_open') ) {
return ;
--- 232,243 ----
}
if ( $this->mbox != "" ) {
! @imap_close($this->mbox);
}
! $this->errors("close");
}
/* ---------------------------------------------------------------------------
* close the connection to the mailbox
*/
! function errors ($where = "") {
if ( ! function_exists('imap_open') ) {
return ;
***************
*** 246,253 ****
$e = imap_errors();
if ( $e ) {
! while (list ($key,$val) = each ($e)) {
! echo "ERROR: ". $this->mbox ." ". $val ."<BR>";
! $r = false;
! }
}
return $r;
--- 246,253 ----
$e = imap_errors();
if ( $e ) {
! while (list ($key,$val) = each ($e)) {
! echo "ERROR : ". $where ." ". $this->mbox ." - ". $val ."<BR>";
! $r = false;
! }
}
return $r;
***************
*** 427,429 ****
}
$includes[mailbox.pinc] = 1;
! ?>
\ No newline at end of file
--- 427,429 ----
}
$includes[mailbox.pinc] = 1;
! ?>
Index: mailbox_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_overview.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** mailbox_overview.php 2001/09/19 20:48:33 1.16
--- mailbox_overview.php 2001/09/27 21:39:36 1.17
***************
*** 45,49 ****
# $search = "Re:";
if ( $search ) {
! $headers = imap_search($m->mbox,'TEXT "'. $search .'"');
} else {
$headers = @imap_headers ($m->mbox);
--- 45,49 ----
# $search = "Re:";
if ( $search ) {
! $headers = @imap_search($m->mbox,'TEXT "'. $search .'"');
} else {
$headers = @imap_headers ($m->mbox);
***************
*** 104,121 ****
$s = "";
if ( $search ) {
! $hdr = imap_header($m->mbox,$hval,FT_PEEK );
$id = $hval;
! $sbj = imap_mime_header_decode($hdr->subject);
! if ( count($sbj) > 0 ) {
$s = $sbj[0]->text;
$s = eregi_replace("($search)","<B>\\1</B>",$s);
! }
} else {
! $hdr = imap_header($m->mbox,$hkey + 1,FT_PEEK );
$id = $hkey;
! $sbj = imap_mime_header_decode($hdr->subject);
! if ( count($sbj) > 0 ) {
$s = $sbj[0]->text;
! }
}
$d = new DateTime();
--- 104,121 ----
$s = "";
if ( $search ) {
! $hdr = @imap_header($m->mbox,$hval,FT_PEEK );
$id = $hval;
! $sbj = @imap_mime_header_decode($hdr->subject);
! if ( count($sbj) > 0 ) {
$s = $sbj[0]->text;
$s = eregi_replace("($search)","<B>\\1</B>",$s);
! }
} else {
! $hdr = @imap_header($m->mbox,$hkey + 1,FT_PEEK );
$id = $hkey;
! $sbj = @imap_mime_header_decode($hdr->subject);
! if ( count($sbj) > 0 ) {
$s = $sbj[0]->text;
! }
}
$d = new DateTime();
Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** user.pinc 2001/09/19 20:48:33 1.50
--- user.pinc 2001/09/27 21:39:36 1.51
***************
*** 662,667 ****
$this->last_seen = new DateTime();
! $query = "UPDATE people SET last_seen = ". $this->dbconn->datetime($this->last_seen) .", prefteam = ". $this->get_prefteam() ." ,last_host = ". $this->dbconn->String($this->last_host) ." WHERE login = ". $this->dbconn->String($this->login);
! $r = $this->dbconn->Exec($query);
}
/* ---------------------------------------------------------------------------
--- 662,675 ----
$this->last_seen = new DateTime();
! $q = new query($this->dbconn);
! $q->setTable("people");
! $q->addFV("last_seen",$this->last_seen,"DATETIME");
! $q->addFV("prefteam",$this->get_prefteam(),"");
! $q->addFV("last_host",$this->last_host,"STRING");
! $q->addWC("login",$this->login,"STRING");
! $query = $q->getUpdate();
!
! # $query = "UPDATE people SET last_seen = ". $this->dbconn->datetime($this->last_seen) .", prefteam = ". $this->get_prefteam() ." ,last_host = ". $this->dbconn->String($this->last_host) ." WHERE login = ". $this->dbconn->String($this->login);
! $this->dbconn->Exec($query);
}
/* ---------------------------------------------------------------------------
Index: user_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_new.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** user_new.php 2001/09/16 19:25:35 1.24
--- user_new.php 2001/09/27 21:39:36 1.25
***************
*** 93,110 ****
echo "</TR>\n";
! for ( $i = -1 ; $i > -18 ; $i-- ) {
! $ochecked[0] ="";
! $ochecked[1] ="";
! $ochecked[$user->p[$i]] ="CHECKED";
if ( (($current_user->admin == 1) && ($tutos[$i] == 1)) || ( $i == useoverlib ) ) {
echo "<TR>\n";
showfieldc($lang['perm'][$i]);
if ( $tutos[$i] == 1 ) {
! echo " <TD> ". $lang['yes'] ." <INPUT type=radio name=\"x[". $i ."]\" value=1 ". $ochecked[1] ."></TD>";
! echo " <TD>". $lang['no'] ." <INPUT type=radio name=\"x[". $i ."]\" value=0 ". $ochecked[0] ."></TD>";
! echo " <TD> </TD>";
} else {
! echo " <TD COLSPAN=3> ". $lang['FeatureOff'] ."</TD>";
! echo "<INPUT type=hidden name=\"x[". $i ."]\" value=0>\n";
}
echo "</TR>\n";
--- 93,109 ----
echo "</TR>\n";
! krsort($lang['perm']);
! for ( reset($lang['perm']); list($i,$scDescription) =each($lang['perm']);) {
! # for ( $i = -1 ; $i >= -18 ; $i-- ) {
if ( (($current_user->admin == 1) && ($tutos[$i] == 1)) || ( $i == useoverlib ) ) {
echo "<TR>\n";
showfieldc($lang['perm'][$i]);
if ( $tutos[$i] == 1 ) {
! echo " <TD> ". $lang['yes'] ." <INPUT type=radio name=\"x[". $i ."]\" value=1 ". ($user->p[$i] == 1 ? "CHECKED":"") ."></TD>";
! echo " <TD>". $lang['no'] ." <INPUT type=radio name=\"x[". $i ."]\" value=0 ". ($user->p[$i] != 1 ? "CHECKED":"") ."></TD>";
! echo " <TD> </TD>";
} else {
! echo " <TD COLSPAN=3> ". $lang['FeatureOff'] ."</TD>";
! echo "<INPUT type=hidden name=\"x[". $i ."]\" value=0>\n";
}
echo "</TR>\n";
Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** webelements.p3 2001/09/19 20:50:10 1.82
--- webelements.p3 2001/09/27 21:39:36 1.83
***************
*** 434,438 ****
echo "<!-- all rights reserved -->\n";
echo "<HEAD>\n";
! echo " <META NAME=\"GENERATOR\" CONTENT=\"TUTOS\">\n";
echo " <META NAME=\"language\" CONTENT=\"". $tutos[lang] ."\">\n";
# echo " <META HTTP-EQUIV=\"Expires\" CONTENT=\"0\">\n";
--- 434,438 ----
echo "<!-- all rights reserved -->\n";
echo "<HEAD>\n";
! echo " <META NAME=\"GENERATOR\" CONTENT=\"TUTOS ". $tutos[version] ."\">\n";
echo " <META NAME=\"language\" CONTENT=\"". $tutos[lang] ."\">\n";
# echo " <META HTTP-EQUIV=\"Expires\" CONTENT=\"0\">\n";
***************
*** 442,446 ****
echo "\n<!-- NO THEME ". $theme ." found -->\n";
}
! echo "<meta name=\"MSSmartTagsPreventParsing\" content=\"TRUE\">";
echo " <LINK REL=\"copyright\" HREF=\"../html/copyright.html\" TITLE=\"Copyright\">\n";
--- 442,446 ----
echo "\n<!-- NO THEME ". $theme ." found -->\n";
}
! echo "<META NAME=\"MSSmartTagsPreventParsing\" CONTENT=\"TRUE\">";
echo " <LINK REL=\"copyright\" HREF=\"../html/copyright.html\" TITLE=\"Copyright\">\n";
***************
*** 477,481 ****
echo " <TD WIDTH=\"16%\" COLSPAN=2 VALIGN=middle ALIGN=left> <A CLASS=nodeco HREF=\"../html/copyright.html\">TUTOS</A></TD>\n";
} else {
! echo " <TD WIDTH=\"8%\" VALIGN=middle ALIGN=left><A TARGET=map HREF=\"". $tutos[logolink] ."\"><IMG HEIGHT=40 BORDER=0 SRC=\"". $tutos[logo] ."\" ALT=\"LOGO\" ALIGN=middle></A></TD>\n";
echo " <TD WIDTH=\"8%\" VALIGN=middle ALIGN=left> <A CLASS=nodeco HREF=\"../html/copyright.html\">TUTOS</A></TD>\n";
}
--- 477,481 ----
echo " <TD WIDTH=\"16%\" COLSPAN=2 VALIGN=middle ALIGN=left> <A CLASS=nodeco HREF=\"../html/copyright.html\">TUTOS</A></TD>\n";
} else {
! echo " <TD WIDTH=\"8%\" VALIGN=middle ALIGN=left><A TARGET=url HREF=\"". $tutos[logolink] ."\"><IMG HEIGHT=40 BORDER=0 SRC=\"". $tutos[logo] ."\" ALT=\"LOGO\" ALIGN=middle></A></TD>\n";
echo " <TD WIDTH=\"8%\" VALIGN=middle ALIGN=left> <A CLASS=nodeco HREF=\"../html/copyright.html\">TUTOS</A></TD>\n";
}
***************
*** 604,608 ****
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";
}
}
--- 604,608 ----
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=url>". htmlentities($x->name) . "</A><BR>\n";
}
}
***************
*** 1154,1158 ****
*
*/
! Function getObject(&$dbconn,$id) {
global $tutos;
--- 1154,1158 ----
*
*/
! Function getObject(&$dbconn,$id, $usecache = 1) {
global $tutos;
***************
*** 1160,1176 ****
if ( empty($id) ) return -1;
! if ( isset($g_adr[$id]) ) {
! return $g_adr[$id];
! }
! if ( isset($g_app[$id]) ) {
! return $g_app[$id];
! }
! if ( isset($g_pro[$id]) ) {
! return $g_pro[$id];
! }
! if ( isset($g_com[$id]) ) {
! return $g_com[$id];
}
-
$type = -1;
--- 1160,1177 ----
if ( empty($id) ) return -1;
! if ( $usecache == 1 ) {
! if ( isset($g_adr[$id]) ) {
! return $g_adr[$id];
! }
! if ( isset($g_app[$id]) ) {
! return $g_app[$id];
! }
! if ( isset($g_pro[$id]) ) {
! return $g_pro[$id];
! }
! if ( isset($g_com[$id]) ) {
! return $g_com[$id];
! }
}
$type = -1;
|
|
From: Gero K. <gok...@us...> - 2001-09-27 21:39:39
|
Update of /cvsroot/tutos/tutos In directory usw-pr-cvs1:/tmp/cvs-serv5716 Modified Files: ChangeLog Log Message: working version Index: ChangeLog =================================================================== RCS file: /cvsroot/tutos/tutos/ChangeLog,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -r1.63 -r1.64 *** ChangeLog 2001/09/16 19:22:21 1.63 --- ChangeLog 2001/09/27 21:39:36 1.64 *************** *** 1,3 **** --- 1,9 ---- $Header$ + September 27 2001 + * new external holiday files (php/holiday_es.pinc + php/holiday_fr.pinc php/holiday_ko.pinc php/holiday_nl.pinc + php/holiday_pl.pinc php/holiday_ru.pinc ) Please expand and + translate ! + September 16 2001 * new urls that are added to team descriptions will appear in the |
|
From: Gero K. <gok...@us...> - 2001-09-27 21:37:43
|
Update of /cvsroot/tutos/tutos/documentation In directory usw-pr-cvs1:/tmp/cvs-serv5257/documentation Modified Files: .cvsignore tutos.sgml tutos_admin.sgml tutos_prog.sgml tutos_user.sgml Log Message: Intermediate Index: .cvsignore =================================================================== RCS file: /cvsroot/tutos/tutos/documentation/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** .cvsignore 2001/08/19 18:01:13 1.1 --- .cvsignore 2001/09/27 21:37:41 1.2 *************** *** 6,7 **** --- 6,8 ---- book2 book3 + index.sgml Index: tutos.sgml =================================================================== RCS file: /cvsroot/tutos/tutos/documentation/tutos.sgml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** tutos.sgml 2001/08/19 18:01:13 1.1 --- tutos.sgml 2001/09/27 21:37:41 1.2 *************** *** 4,7 **** --- 4,8 ---- <!ENTITY book2 SYSTEM "tutos_admin.sgml"> <!ENTITY book3 SYSTEM "tutos_prog.sgml"> + <!ENTITY index SYSTEM "index.sgml"> <!ENTITY % single-book "IGNORE"> ]> *************** *** 24,27 **** --- 25,30 ---- &book2; &book3; + &index; + </set> Index: tutos_admin.sgml =================================================================== RCS file: /cvsroot/tutos/tutos/documentation/tutos_admin.sgml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** tutos_admin.sgml 2001/08/30 17:02:17 1.2 --- tutos_admin.sgml 2001/09/27 21:37:41 1.3 *************** *** 1,4 **** <!-- ! $Header: --> <book id="admin"> --- 1,4 ---- <!-- ! $Header$ --> <book id="admin"> *************** *** 25,73 **** <!-- ***************************************************** --> ! <chapter label=1> <title>Intro</title> <para> This book will give you all information that is neccessary for installation and administration of a <productname>TUTOS</productname> system. </para> </chapter> <!-- ***************************************************** --> ! <chapter> ! <title>Customizing</title> <para> ! Timezones ! Project Roles ! Currencies </para> </chapter> <!-- ***************************************************** --> ! <chapter> <title>Mail</title> <para> </para> </chapter> <!-- ***************************************************** --> ! <chapter> <title>Persmissions</title> <para> </para> </chapter> <!-- ***************************************************** --> ! <chapter> <title>automated Reminders</title> <para> ! How to run the check.php script </para> </chapter> <!-- ***************************************************** --> ! <chapter> <title>Database Administration</title> ! <sect1> <title>Backup</title> <para> </para> </sect1> </chapter> --- 25,341 ---- <!-- ***************************************************** --> ! <chapter id=admin-intro> <title>Intro</title> <para> This book will give you all information that is neccessary for installation and administration of a <productname>TUTOS</productname> system. + + Nearly all features of TUTOS can be configured by the main config file + <filename>php/config.pinc</>. It is a good idea to make a backup of this file when + everything works fine. + New releases of TUTOS will come with a new <filename>php/config.pinc</> and require a migration + of your changes to the new file ! + </para> + </chapter> + <!-- ***************************************************** --> + <chapter id=install> + <title>Installation + <indexterm><primary>installation</primary></indexterm> + </title> + <para> + Preparations + + You need: + * the latest TUTOS release + * an apache webserver + * with PHP 4.0.??? + * a database either + - Postgres + - MySQL + - Oracle 8.0.5 ++ + - Interbase 5 + * some minutes of your time + * shell or FTP access to your webserver + + </para> + <para> + Using shellscripts + + call + ./createdb.sh + ./scheme.sh + ./inittutos.sh or ./example.sh + + </para> + <para> + Using PHP scripts + + A lot of webspace providers will give you access to a database but no to shell + access on their system. To handle this situation TUTOS could be initialized by + an PHP script called "php/scheme.php" which will create all neccessary tables + in the first (index 0) database you have defined in <filename>php/config.pinc</> + + Ensure that this script is no longer available for the public after + installation !!!! + </para> + </chapter> + <!-- ***************************************************** --> + <chapter id=setup> + <title>Main Setup + <indexterm><primary>setup</primary></indexterm> + </title> + <para> + Database(es) + + </para> + <para> + Creating Users + + TUTOS users are defined as an extension of an address entry. If you have + defined an address you will see a link on the left hand navigation bar to + create (or modify if already existant) an user with this address. + + User can be part of an team. + </para> </chapter> <!-- ***************************************************** --> ! <chapter id=customize> ! <title>Customizing ! <indexterm><primary>customize</primary></indexterm> ! </title> ! <sect1 id=customize-lang> ! <title>Text and language</title> ! <para>If you do not like the texts that are used in the default TUTOS release, you ! may change it as you like.</para> ! ! <para>Create a new file <filename>php/lang_custom.p3</> with the same format like <filename>php/en.p3</> and ! put all changed text in there. ! If you are working in an multilingual environment you can create custom ! language files named <filename>en_custom.p3</> or <filename>de_custom.p3</></para> ! ! <para>For example: in an english environment TUTOS first reads <filename>php/en.p3</> than it looks ! for <filename>php/en_custom.p3</> and after that for <filename>lang_custom.p3</> . Each of these fies ! overwrites the last definitions. ! ! These custom files will never be distributed with a new TUTOS release and ! should be a safe place if an update happens. ! ! Supported languages and their filenames: ! <informaltable> ! <tgroup cols="2"> ! <thead> ! <row> ! <entry>language</entry> ! <entry>file</entry> ! </row> ! </thead> ! <tbody> ! <row><entry>English</entry> <entry>en.p3</entry></row> ! <row><entry>English/US</entry><entry>en-us.p3</entry></row> ! <row><entry>German</entry> <entry>de.p3</entry></row> ! <row><entry>Spanish</entry> <entry>es.p3</entry></row> ! <row><entry>Italian</entry> <entry>it.p3</entry></row> ! <row><entry>French</entry> <entry>fr.p3</entry></row> ! <row><entry>Dutch</entry> <entry>nl.p3</entry></row> ! <row><entry>Polish</entry> <entry>pl.p3</entry></row> ! <row><entry>Korean</entry> <entry>ko.p3</entry></row> ! <row><entry>Chinese</entry> <entry>tw.p3 and zh.p3</entry></row> ! <row><entry>Mexican</entry> <entry>es_,x.p3</entry></row> ! <row><entry>Portugese/Brazilian</entry><entry>pt-br.p3</entry></row> ! </tbody> ! </tgroup> ! </informaltable> ! ! If you have any corrections or new translations please contact the author ! ! ! </para> ! </sect1> ! ! <sect1 id=customize-holidays> ! <title>Holidays</title> ! <para> ! You may enable the display of holidays in <filename>php/config.pinc</> ! For example: ! <programlisting>$tutos[holiday]['US'] = 1;</programlisting> ! will enable the display of US holidays and ! <programlisting>$tutos[holiday]['US'] = 0;</programlisting> ! will disable it. ! ! You have special holidays or yeardays in your organization. ! ! Create a file php/holiday_custom.pinc according to the format of php/holiday_us.p3 ! ! For example: ! <example> ! <title>Will show the 31st of October in every year as a fiscal year end "Holiday"</title> ! <programlisting> ! <? ! $tutos[cal][] = array( ! array( Date => "00-10", Desc => "Fiscal Year end"), ! ); ! ?> ! </programlisting> ! </example> ! </para> ! </sect1> ! ! <sect1 id=customize-timezone> ! <title>Timezones</title> ! <para> ! simply extend the given list in <filename>php/config.pinc</>. You must take care that your ! Web Servers Operating System understands these timezone names ! ! ! </para> ! </sect1> ! ! <sect1 id=customize-roles> ! <title>Project Roles</title> <para> ! you may add your own Role descriptions in lang_custom.p3 ! and the necessary rolechecks in <filename>php/config.pinc</>. ! ! <note><para> ! Take care that you do not reuse rolenumbers that where used before. TUTOS ! stores the numbers and not the descriptions ! ! </para></note> ! </para> ! </sect1> ! <sect1 id=customize-currency> ! <title>Currencies</title> ! <para> ! simply extend the given list in <filename>php/config.pinc</>. </para> + </sect1> </chapter> <!-- ***************************************************** --> ! <chapter id=mail> <title>Mail</title> <para> + There are two different ways of using mails. sendmail or SMTP. + + TUTOS will only send mails if the currently acting user has an defined email + address that could be used as the senders IP address ! + + In "demo" mode no mails are sent ! + + In mailmode 0 no mails are sent ! + + </para> + <para> + using sendmail + + define the path to your sendmail (or clone) location on you web server machine + + <programlisting>$tutos[mailmode] = 1; + $tutos[sendmail] = "/usr/lib/sendmail";</programlisting> + + </para> + <para> + using SMTP + + <programlisting>$tutos[mailmode] = 2; + $tutos[smtphost] = "127.0.0.1";</programlisting> + + Here TUTOS will try to connect to the localhost and deliver the mails. + </para> + + <sect1 id=customize-mail> + <title>Mailtext</title> + <para> + You can modify the mailtext of outgoing mails by changing the prototyp files in + the html subdirectory i.e. <filename>html/*.proto.*</filename>. </para> + </sect1> </chapter> <!-- ***************************************************** --> ! <chapter id=fax> ! <title>FAX</title> ! <para> ! If you have an mail to fax gateway or the faxspool programm TUTOS can use it to sent a fax by simply ! clicking the faxnumber. ! ! <programlisting>$tutos[faxmode] = 1;</programlisting> ! will use the faxspool programm (part of mgetty on most linux distributions) ! ! <programlisting> ! $tutos[faxmode] = 2; ! $tutos[faxmail] = "fa...@tu..."; ! $tutos[faxmail_user] = "tutos"; ! $tutos[faxmail_pass] = "xxx"; ! </programlisting> ! will use a the email address fa...@tu... and sent a mail to it. This feature ! is designed to work with mail2fax from the mgetty package. ! ! A @NR@ String in the faxmail variable will be substuted by the faxnumber. ! </para> ! </chapter> ! <!-- ***************************************************** --> ! <chapter id=acl> <title>Persmissions</title> <para> + TUTOS knows about three different permission types for objects. These + permissions could be granted to users , whole teams or everybody. + The "see" permissions allows to see all deteails of an object. The "modify" + permissions additionally allows to modify an entry and the last one , the + "delete" permission allows the deletion of an object. + To modify the permissions of an object a user will need the "delete" + permission. + </para> + <para> + The default permission setting is mainly influenced by the setting of the + "defaultacl" option in <filename>php/config.pinc</>. + 0 = everybody will see the object + 1 = all teams of the creator can see it </para> </chapter> <!-- ***************************************************** --> ! <chapter id=reminder> <title>automated Reminders</title> <para> ! How to run the check.php script. ! php/check.php will test the TUTOS system for reminder mails to sent out. These ! are reminders for notes , for old unhandeld bugs and for appointments. ! Best way to run this script is a cron job that periodically calls that page. ! ! here an example cronjob entry: ! */5 * * * * /usr/bin/lynx -dump ! ! http://DataMiner01.nbgm.siemens.de:81/tutos/php/check.php > /dev/null ! ! There is now user verification for this page ! </para> </chapter> <!-- ***************************************************** --> ! <chapter id=database-admin> <title>Database Administration</title> ! <sect1 id=database-backup> <title>Backup</title> <para> + The createdb.sh shellscript could do this for you (not all DB types are + supportted !) + call + + <programlisting>./createdb.sh POSTGRES DUMP</programlisting> + + Do not forget to backup your repository ! </para> </sect1> + </chapter> + + <!-- ***************************************************** --> + <chapter id=update> + <title>Updates</title> + <para> + Updating to an new TUTOS release is easy (TM). + * Grab the latest release from sourceforge.net + * make a copy of <filename>config.pinc</> and all other modified files + * install the new release + * migrate your changes ( a simple ooverwrite will not work everytime !! ) + * read the ChangeLog !! and perform the DB changes if neccessary !! + + </para> </chapter> Index: tutos_prog.sgml =================================================================== RCS file: /cvsroot/tutos/tutos/documentation/tutos_prog.sgml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** tutos_prog.sgml 2001/08/19 18:01:13 1.1 --- tutos_prog.sgml 2001/09/27 21:37:41 1.2 *************** *** 1,4 **** <!-- ! $Header: --> <book id="prog"> --- 1,4 ---- <!-- ! $Header$ --> <book id="prog"> *************** *** 24,28 **** </bookinfo> ! <chapter label=1> <title>Intro</title> --- 24,28 ---- </bookinfo> ! <chapter id=prog-intro> <title>Intro</title> *************** *** 31,34 **** --- 31,50 ---- programming inside of <productname>TUTOS</productname>. </para> + </chapter> + + <!-- ***************************************************** --> + + <chapter id=prog-db> + <title>Databases</title> + + <sect1 id=prog-db-new> + <title>Support for new Databases</title> + <para> + Adding support for new database is easy: + 1. write a database class like <filename>php/db_pg.pinc</> + 2. add this class to <filename>php/db.p3</> + 3. test + </para> + </sect1> </chapter> Index: tutos_user.sgml =================================================================== RCS file: /cvsroot/tutos/tutos/documentation/tutos_user.sgml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** tutos_user.sgml 2001/08/30 17:02:17 1.2 --- tutos_user.sgml 2001/09/27 21:37:41 1.3 *************** *** 1,4 **** <!-- ! $Header: --> <book id="user"> --- 1,4 ---- <!-- ! $Header$ --> <book id="user"> *************** *** 24,28 **** </bookinfo> ! <chapter> <title>Intro</title> --- 24,28 ---- </bookinfo> ! <chapter id=user-intro> <title>Intro</title> *************** *** 33,37 **** </chapter> <!-- ***************************************************** --> ! <chapter> <title>The Addressbook(s)</title> <para> --- 33,37 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=adr> <title>The Addressbook(s)</title> <para> *************** *** 40,44 **** </para> ! <sect1><title>Create</title> <para> A Addressbook entry needs at least the name of a person. Additonally you may --- 40,44 ---- </para> ! <sect1 id=adr-new><title>Create</title> <para> A Addressbook entry needs at least the name of a person. Additonally you may *************** *** 47,51 **** </sect1> ! <sect1><title>Display</title> <para> <mediaobject> --- 47,51 ---- </sect1> ! <sect1 id=adr-show><title>Display</title> <para> <mediaobject> *************** *** 65,74 **** </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> --- 65,74 ---- </sect1> ! <sect1 id=adr-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=adr-del><title>Delete</title> <para> </para> *************** *** 77,89 **** </chapter> <!-- ***************************************************** --> ! <chapter> <title>Appointments</title> ! <sect1><title>Create</title> <para> </para> </sect1> ! <sect1><title>Display</title> <para> <mediaobject><imageobject> --- 77,89 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=app> <title>Appointments</title> ! <sect1 id=app-new><title>Create</title> <para> </para> </sect1> ! <sect1 id=app-show><title>Display</title> <para> <mediaobject><imageobject> *************** *** 102,111 **** </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> --- 102,111 ---- </sect1> ! <sect1 id=app-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=app-del><title>Delete</title> <para> </para> *************** *** 114,126 **** </chapter> <!-- ***************************************************** --> ! <chapter label=3> <title>Projects and Products</title> ! <sect1><title>Create</title> <para> </para> </sect1> ! <sect1><title>Display</title> <para> <mediaobject> --- 114,126 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=prod> <title>Projects and Products</title> ! <sect1 id=prod-new><title>Create</title> <para> </para> </sect1> ! <sect1 id=prod-show><title>Display</title> <para> <mediaobject> *************** *** 140,149 **** </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> --- 140,149 ---- </sect1> ! <sect1 id=prod-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=prod-del><title>Delete</title> <para> </para> *************** *** 152,164 **** </chapter> <!-- ***************************************************** --> ! <chapter> <title>Tasks</title> ! <sect1><title>Create</title> <para> </para> </sect1> ! <sect1><title>Display</title> <para> <mediaobject> --- 152,164 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=task> <title>Tasks</title> ! <sect1 id=task-new><title>Create</title> <para> </para> </sect1> ! <sect1 id=task-show><title>Display</title> <para> <mediaobject> *************** *** 178,187 **** </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> --- 178,187 ---- </sect1> ! <sect1 id=task-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=task-del><title>Delete</title> <para> </para> *************** *** 190,202 **** </chapter> <!-- ***************************************************** --> ! <chapter> <title>Bugs</title> ! <sect1><title>Create</title> <para> </para> </sect1> ! <sect1><title>Display</title> <para> <mediaobject> --- 190,202 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=bug> <title>Bugs</title> ! <sect1 id=bug-new><title>Create</title> <para> </para> </sect1> ! <sect1 id=bug-show><title>Display</title> <para> <mediaobject> *************** *** 216,226 **** </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> </sect1> --- 216,230 ---- </sect1> ! <sect1 id=bug-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=bug-del><title>Delete</title> <para> + <note><para> + TUTOS will only allow the deletion of bugs if the administrator has enabled + this feature. + </para></note> </para> </sect1> *************** *** 228,240 **** </chapter> <!-- ***************************************************** --> ! <chapter> <title>Installations</title> ! <sect1><title>Create</title> <para> </para> </sect1> ! <sect1><title>Display</title> <para> <mediaobject> --- 232,244 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=inst> <title>Installations</title> ! <sect1 id=inst-new><title>Create</title> <para> </para> </sect1> ! <sect1 id=inst-show><title>Display</title> <para> <mediaobject> *************** *** 254,263 **** </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> --- 258,267 ---- </sect1> ! <sect1 id=inst-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=inst-del><title>Delete</title> <para> </para> *************** *** 266,288 **** </chapter> <!-- ***************************************************** --> ! <chapter> <title>Files</title> ! <sect1><title>Create</title> <para> </para> </sect1> ! <sect1><title>Display</title> <para> </para> </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> --- 270,292 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=file> <title>Files</title> ! <sect1 id=file-new><title>Create</title> <para> </para> </sect1> ! <sect1 id=file-show><title>Display</title> <para> </para> </sect1> ! <sect1 id=file-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=file-del><title>Delete</title> <para> </para> *************** *** 291,313 **** </chapter> <!-- ***************************************************** --> ! <chapter> <title>Notes</title> ! <sect1><title>Create</title> <para> </para> </sect1> ! <sect1><title>Display</title> <para> </para> </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> --- 295,317 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=note> <title>Notes</title> ! <sect1 id=note-new><title>Create</title> <para> </para> </sect1> ! <sect1 id=note-show><title>Display</title> <para> </para> </sect1> ! <sect1 id=note-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=note-del><title>Delete</title> <para> </para> *************** *** 316,338 **** </chapter> <!-- ***************************************************** --> ! <chapter> <title>Timetrack</title> ! <sect1><title>Create</title> <para> </para> </sect1> ! <sect1><title>Display</title> <para> </para> </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> --- 320,342 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=timetrack> <title>Timetrack</title> ! <sect1 id=timetrack-new><title>Create</title> <para> </para> </sect1> ! <sect1 id=timetrack-show><title>Display</title> <para> </para> </sect1> ! <sect1 id=timetrack-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=timetrack-del><title>Delete</title> <para> </para> *************** *** 341,363 **** </chapter> <!-- ***************************************************** --> ! <chapter> <title>Resources</title> ! <sect1><title>Create</title> <para> </para> </sect1> ! <sect1><title>Display</title> <para> </para> </sect1> ! <sect1><title>Modify</title> <para> </para> </sect1> ! <sect1><title>Delete</title> <para> </para> --- 345,367 ---- </chapter> <!-- ***************************************************** --> ! <chapter id=resource> <title>Resources</title> ! <sect1 id=resource-new><title>Create</title> <para> </para> </sect1> ! <sect1 id=resource-show><title>Display</title> <para> </para> </sect1> ! <sect1 id=resource-mod><title>Modify</title> <para> </para> </sect1> ! <sect1 id=resource-del><title>Delete</title> <para> </para> |
|
From: Gero K. <gok...@us...> - 2001-09-27 21:36:19
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv4869
Modified Files:
timetrack_overview.php
Log Message:
bugfix 465818
Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** timetrack_overview.php 2001/09/19 20:47:29 1.15
--- timetrack_overview.php 2001/09/27 21:36:16 1.16
***************
*** 261,264 ****
--- 261,265 ----
$qarg .= "&name=". UrlEncode($name);
$link1 = addUrlParameter($link1,"name=". UrlEncode($name));
+ $pre = " AND ";
}
|
|
From: Gero K. <gok...@us...> - 2001-09-27 20:30:59
|
Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv20284/php
Modified Files:
appointment.pinc
Log Message:
suuport history / ical fix / ical oprional
Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** appointment.pinc 2001/09/19 20:47:29 1.60
--- appointment.pinc 2001/09/27 20:30:56 1.61
***************
*** 555,559 ****
--- 555,580 ----
}
/* ---------------------------------------------------------------------------
+ * set the description
*/
+ function setDescription($new) {
+ $new = trim($new);
+ if ( $this->descr != $new ) {
+ $this->modified[] = array ( "field" => "Description" , "old" => $this->descr , "new" => $new );
+ $this->descr = $new;
+ }
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ * set the location
+ */
+ function setLocation($new) {
+ if ( $this->outside != $new ) {
+ $this->modified[] = array ( "field" => "Location2" , "old" => $this->outside , "new" => $new );
+ $this->outside = $new;
+ }
+ return;
+ }
+ /* ---------------------------------------------------------------------------
+ */
function save() {
global $lang , $current_user, $tutos;
***************
*** 569,577 ****
$def_state = 0;
}
- /* Encapsulate this */
- $this->dbconn->Begin("WORK");
- $this->dbconn->Lock("calendar");
- $this->dbconn->Lock("participants");
-
if ( $this->mod_allow != 3 ) {
acl_default($this,$current_user);
--- 590,593 ----
***************
*** 613,616 ****
--- 629,633 ----
$q = "DELETE FROM participants WHERE app_id = ". $this->id;
$r = $this->dbconn->Exec($q);
+
} else {
$new = 1;
***************
*** 674,677 ****
--- 691,701 ----
$r = $this->dbconn->Exec($flds ." ". $vals);
acl_raise($this,$this->creator->id,$tutos[delok]);
+
+ $this->modified = array();
+ $this->modified[] = array ( "field" => "created" ,
+ "old" => $this->getType() ,
+ "new" => $this->id,
+ "obj_id" => $this->id
+ );
}
***************
*** 723,727 ****
$msg .= resource_save($this);
$msg .= history_save($this);
- $this->dbconn->Commit("WORK");
--- 747,750 ----
***************
*** 760,765 ****
$m->addBody($body,"text/plain; charset=\"us-ascii\"",$lang['NewAppoint']);
! $m->addBody($this->getIcal(),"text/calendar","ICal Entry");
!
if ( ($current_user->p[usevcard] == 1) && ($tutos[usevcard] == 1) ) {
$m->addBody($this->creator->getIcard(),"text/x-vcard",sprintf($lang['MailCard'], $this->creator->getFullName()),"attachment; filename=\"". $this->creator->l_name .".vcf\"" );
--- 783,789 ----
$m->addBody($body,"text/plain; charset=\"us-ascii\"",$lang['NewAppoint']);
! if ( $tutos[useical] == 1 ) {
! $m->addBody($this->getIcal(),"text/calendar","ICal Entry");
! }
if ( ($current_user->p[usevcard] == 1) && ($tutos[usevcard] == 1) ) {
$m->addBody($this->creator->getIcard(),"text/x-vcard",sprintf($lang['MailCard'], $this->creator->getFullName()),"attachment; filename=\"". $this->creator->l_name .".vcf\"" );
***************
*** 877,883 ****
$ical .= "ATTENDEE;ROLE=CHAIR:MAILTO:". $f->default_Email() ."\n";
} else if ( $f->gettype() == "address" ) {
! $ical .= "ATTENDEE:MAILTO". $f->default_email() ."\n";
} else if ( $f->gettype() == "user" ) {
! $ical .= "ATTENDEE:MAILTO". $f->default_email() ."\n";
} else if ( $f->gettype() == "team" ) {
}
--- 901,907 ----
$ical .= "ATTENDEE;ROLE=CHAIR:MAILTO:". $f->default_Email() ."\n";
} else if ( $f->gettype() == "address" ) {
! $ical .= "ATTENDEE:MAILTO:". $f->default_email() ."\n";
} else if ( $f->gettype() == "user" ) {
! $ical .= "ATTENDEE:MAILTO:". $f->default_email() ."\n";
} else if ( $f->gettype() == "team" ) {
}
|
|
From: Gero K. <gok...@us...> - 2001-09-27 20:29:27
|
Update of /cvsroot/tutos/tutos/homepage
In directory usw-pr-cvs1:/tmp/cvs-serv19795/homepage
Modified Files:
about.html require.html
Log Message:
announce new db support
Index: about.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/about.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** about.html 2001/08/31 12:01:59 1.11
--- about.html 2001/09/27 20:29:25 1.12
***************
*** 61,67 ****
<B>What happens next ? / ToDo:</B>
<UL>
! <LI><STRIKE>find a home for <FONT COLOR=red>TUTOS</FONT> in the net to be able to show it live<BR>
! (i.e space, shell account, postgres database, and apache+php+jserv)</STRIKE>
! <LI>easier install
<LI>first steps towards JAVA servlets (delayed ! any takers ?)
<LI>more languages (personally I only speak german and english)
--- 61,65 ----
<B>What happens next ? / ToDo:</B>
<UL>
! <LI>find someone to make a KDE/GNOME userinterface
<LI>first steps towards JAVA servlets (delayed ! any takers ?)
<LI>more languages (personally I only speak german and english)
Index: require.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/require.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** require.html 2001/05/12 05:54:33 1.5
--- require.html 2001/09/27 20:29:25 1.6
***************
*** 15,18 ****
--- 15,19 ----
<LI><A HREF=http://www.mysql.com>MySQL Database</A> (I use <A HREF=" rel="nofollow">http://sourceforge.net/projects/mysql> MySQL-3.23.21-1.i386.rpm</A>) <FONT SIZE=-1>(external link)</FONT>
<LI><A HREF=http://www.oracle.com>Oracle Database</A><FONT SIZE=-1>(external link)</FONT>
+ <LI><A HREF=Borland" rel="nofollow">http://www.borland.com/interbase>Borland Interbase 5</A><FONT SIZE=-1>(external link)</FONT>
</UL>
</UL>
***************
*** 24,28 ****
<UL>
! The (outdated) <B>Servlet</B> Version requires some more tools:
<LI><A HREF=Apache" rel="nofollow">http://java.apache.org/jserv/index.html>Apache Jserv Servlet Engine</A><FONT SIZE=-1> (external link)</FONT>
<LI><A HREF=http://www.blackdown.org>Java for Linux</A> (or whatever you use)<FONT SIZE=-1> (external link)</FONT>
--- 25,29 ----
<UL>
! The (outdated and not longer maintained) <B>Servlet</B> Version requires some more tools:
<LI><A HREF=Apache" rel="nofollow">http://java.apache.org/jserv/index.html>Apache Jserv Servlet Engine</A><FONT SIZE=-1> (external link)</FONT>
<LI><A HREF=http://www.blackdown.org>Java for Linux</A> (or whatever you use)<FONT SIZE=-1> (external link)</FONT>
|
|
From: Gero K. <gok...@us...> - 2001-09-27 20:26:13
|
Update of /cvsroot/tutos/tutos
In directory usw-pr-cvs1:/tmp/cvs-serv19002
Modified Files:
Makefile.in
Log Message:
added holiday description files / document stuff
Index: Makefile.in
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** Makefile.in 2001/09/17 20:29:58 1.68
--- Makefile.in 2001/09/27 20:26:10 1.69
***************
*** 11,14 ****
--- 11,17 ----
#
# $Log$
+ # Revision 1.69 2001/09/27 20:26:10 gokohnert
+ # added holiday description files / document stuff
+ #
# Revision 1.68 2001/09/17 20:29:58 gokohnert
# added database_overview
***************
*** 294,300 ****
--- 297,309 ----
php/holiday_de.pinc \
php/holiday_de_at.pinc \
+ php/holiday_es.pinc \
+ php/holiday_fr.pinc \
php/holiday_hu.pinc \
php/holiday_it.pinc \
+ php/holiday_ko.pinc \
php/holiday_mx.pinc \
+ php/holiday_nl.pinc \
+ php/holiday_pl.pinc \
+ php/holiday_ru.pinc \
php/holiday_us.pinc \
php/installation.pinc \
***************
*** 707,710 ****
--- 716,721 ----
JAVADOCFLAGS = -private -use -version -author -d doc -classpath ${CLASS_PATH}
+ PERL = perl
+
ECS_PATH = @ECS_CLASSES@
ORC_PATH = @ORACLE_CLASSES@
***************
*** 771,775 ****
SGMLBASE=/usr/share/sgml
JADE=/usr/bin/jade
! JADEARGS=-V html-backend -ihtml -t sgml
CATALOGS=-c ${SGMLBASE}/CATALOG.jade_dsl -c ${SGMLBASE}/CATALOG.docbook_4 -c ${SGMLBASE}/CATALOG.docbook-dsssl-stylesheets
#DSLFILE=${SGMLBASE}/docbook-toys/suse-both.dsl\#html
--- 782,787 ----
SGMLBASE=/usr/share/sgml
JADE=/usr/bin/jade
! JADEARGS2=-V html-backend -ihtml -t sgml
! JADEARGS=-V html-index -ihtml -t sgml
CATALOGS=-c ${SGMLBASE}/CATALOG.jade_dsl -c ${SGMLBASE}/CATALOG.docbook_4 -c ${SGMLBASE}/CATALOG.docbook-dsssl-stylesheets
#DSLFILE=${SGMLBASE}/docbook-toys/suse-both.dsl\#html
***************
*** 779,785 ****
--- 791,801 ----
@rm -rf documentation/$@
@mkdir -p documentation/$@
+ (cd documentation/$@; ${PERL} ${SGMLBASE}/docbook/docbook-dsssl-stylesheets-1.64/bin/collateindex.pl -x -N -o ../index.sgml);
(cd documentation/$@; ${JADE} ${JADEARGS} ${CATALOGS} -D ${SGMLBASE}/docbook/docbook-dsssl-stylesheets-1.64/html -d ${DSLFILE} ../tutos.sgml)
+ (cd documentation/$@; ${PERL} ${SGMLBASE}/docbook/docbook-dsssl-stylesheets-1.64/bin/collateindex.pl -x -o ../index.sgml HTML.index);
+ (cd documentation/$@; ${JADE} ${JADEARGS2} ${CATALOGS} -D ${SGMLBASE}/docbook/docbook-dsssl-stylesheets-1.64/html -d ${DSLFILE} ../tutos.sgml)
@CHMOD@ 755 documentation/book0
+
book1: documentation/tutos_user.sgml
@rm -rf documentation/$@
***************
*** 1011,1018 ****
mkdir -p /net/zaphod/home/gero/src/tutos /net/zaphod/home/gero/src/tutos/html /net/zaphod/home/gero/src/tutos/homepage
mkdir -p /net/zaphod/home/gero/src/tutos/html/visual /net/zaphod/home/gero/src/tutos/html/blue
chmod 755 /net/zaphod/home/gero/src/tutos /net/zaphod/home/gero/src/tutos/html /net/zaphod/home/gero/src/tutos/homepage
chmod 755 /net/zaphod/home/gero/src/tutos/html/visual /net/zaphod/home/gero/src/tutos/html/blue
! cp ChangeLog createdb.sh example.sh scheme.sh inittutos.sh shellfunc.sh /net/zaphod/home/gero/src/tutos
cp ${PHP} ${LANGFILES} /net/zaphod/home/gero/src/tutos/php
cp html/*html html/*css html/*png html/*gif /net/zaphod/home/gero/src/tutos/html
--- 1027,1036 ----
mkdir -p /net/zaphod/home/gero/src/tutos /net/zaphod/home/gero/src/tutos/html /net/zaphod/home/gero/src/tutos/homepage
mkdir -p /net/zaphod/home/gero/src/tutos/html/visual /net/zaphod/home/gero/src/tutos/html/blue
+ mkdir -p /net/zaphod/home/gero/src/tutos/documentation/book0
chmod 755 /net/zaphod/home/gero/src/tutos /net/zaphod/home/gero/src/tutos/html /net/zaphod/home/gero/src/tutos/homepage
chmod 755 /net/zaphod/home/gero/src/tutos/html/visual /net/zaphod/home/gero/src/tutos/html/blue
+ chmod 755 /net/zaphod/home/gero/src/tutos/documentation/book0
! cp ChangeLog ToDo createdb.sh example.sh scheme.sh inittutos.sh shellfunc.sh /net/zaphod/home/gero/src/tutos
cp ${PHP} ${LANGFILES} /net/zaphod/home/gero/src/tutos/php
cp html/*html html/*css html/*png html/*gif /net/zaphod/home/gero/src/tutos/html
***************
*** 1025,1028 ****
--- 1043,1047 ----
cp html/visual/*.gif /net/zaphod/home/gero/src/tutos/html/visual
cp html/blue/*.gif /net/zaphod/home/gero/src/tutos/html/blue
+ cp documentation/book0/* /net/zaphod/home/gero/src/tutos/documentation0
include depend
|
29 messages has been excluded from this view by a project administrator.