[Tutos-commits] CVS: tutos/php address_ins.php,1.35,1.36 app_ins.php,1.29,1.30 config_default.pinc,1
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
Menu
▾
▴
[Tutos-commits] CVS: tutos/php address_ins.php,1.35,1.36 app_ins.php,1.29,1.30 config_default.pinc,1.50,1.51 task.pinc,1.103,1.104 task_overview.php,1.48,1.49 team_ins.php,1.23,1.24 team_new.php,1.36,1.37 timetrack.pinc,1.49,1.50
Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv21595/php
Modified Files:
address_ins.php app_ins.php config_default.pinc task.pinc
task_overview.php team_ins.php team_new.php timetrack.pinc
Log Message:
fixes
Index: address_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_ins.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- address_ins.php 7 Feb 2003 05:22:19 -0000 1.35
+++ address_ins.php 1 Mar 2003 19:12:38 -0000 1.36
@@ -109,6 +109,7 @@
if ( $msg == "" ) {
if ( isset($file) && ($file != "none") ) {
$farr = $HTTP_POST_FILES['file'];
+ $a->pic_file = new tutos_file($dbconn);
$a->pic_file->tmploc = $farr['tmp_name'];
$a->pic_file->filesize = $farr['size'];
$a->pic_file->filename = $farr['name'];
@@ -121,7 +122,6 @@
}
}
}
-
# other modules
$msg .= module_parseforms($current_user,$a,$gotourl);
Index: app_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_ins.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- app_ins.php 31 Dec 2002 14:33:35 -0000 1.29
+++ app_ins.php 1 Mar 2003 19:12:39 -0000 1.30
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999/2000 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
*
* this script parses all the inputs and stores the object into the database.
* on completition it jumps to the detail screen of the stored object
@@ -77,21 +77,15 @@
$msg .= $lang['Err0001'] ."<br>";
} else {
$cnt = 0;
- @reset($_POST['people']);
- while ( list ($i,$f) = @each ($_POST['people']) ) {
+ foreach ($_POST['people'] as $f) {
if ( $f != "" ) {
$gotourl= addUrlParameter($gotourl,"people[]=".$f );
$cnt++;
- $obj = new tutos_user($dbconn);
- $obj->read($f);
- if ( $obj->id == -1 ) {
- $obj = new team($dbconn);
- $obj->read($f);
- }
+ $obj = GetObject($dbconn, $f);
if ( $obj->id == $f ) {
$a->participant[$f] = &$obj;
}
- unset($obj);
+ unset($obj);
}
}
if ( $cnt == 0 ) {
Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- config_default.pinc 28 Feb 2003 16:25:28 -0000 1.50
+++ config_default.pinc 1 Mar 2003 19:12:39 -0000 1.51
@@ -465,7 +465,7 @@
$tutos[applocdesc][1] = 1;
$tutos[applocdesc][2] = 0;
$tutos[applocdesc][3] = 0;
-$tutos[applocdesc][4] = 0;
+$tutos[applocdesc][4] = 1;
$tutos[applocdesc][5] = 0;
$tutos[applocdesc][6] = 0;
#
Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- task.pinc 8 Jan 2003 12:08:42 -0000 1.103
+++ task.pinc 1 Mar 2003 19:12:40 -0000 1.104
@@ -639,13 +639,12 @@
}
} # end of switch $parent->getType()
- echo " <td align=\"right\" valign=\"top\" nowrap> ".
- sprintf("%3.2f",$c ).
- " % <br> ".
- number_format($this->volume,2) ." / ". number_format($this->volume_done,2) ." ".
- $lang['hours'] ."</td>\n";
+ echo " <td align=\"right\" valign=\"top\" nowrap>".
+ sprintf("%3.2f %%",$c ).
+ " <br> ".
+ hour_format($this->volume,2) ." / ". hour_format($this->volume_done,2) ." ". $lang['hours'] ." </td>\n";
- echo " <td valign=\"top\"> ". $this->s_start->getDate() ." </td>\n";
+ echo " <td valign=\"top\" align=\"right\">". $this->s_start->getDate() ." </td>\n";
$w = 200;
$h = 32; # height
Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- task_overview.php 31 Dec 2002 14:33:40 -0000 1.48
+++ task_overview.php 1 Mar 2003 19:12:41 -0000 1.49
@@ -75,7 +75,7 @@
} else {
$c = 0.0;
}
- echo " <td colspan=\"2\" rowspan=\"3\" align=\"right\" class=\"desc\"> ". $lang['Completed'] .": <font size=\"+2\">". sprintf("%3.2f",$c) ." %</font></td>\n";
+ echo " <td colspan=\"2\" rowspan=\"3\" align=\"right\" class=\"desc\"> ". $lang['Completed'] .": <font size=\"+2\">". sprintf("%3.2f %%",$c) ."</font></td>\n";
if ( $tutos[massupdate] == 1 ) {
# Checkbox column for massupdate
echo " <th rowspan=\"3\" nowrap><input type=\"checkbox\" name=\"checkit\" onClick=\"CheckAll2();\"></th>\n";
@@ -91,14 +91,14 @@
$a = 0;
echo "<tr>";
- echo "<td colspan=\"2\"><img width=\"202\" height=\"2\" src=\"". $tutos['base'] ."/html/black.png\" alt=\"--------\"></td>";
+ echo "<td colspan=\"2\"><img width=\"208\" height=\"2\" src=\"". $tutos['base'] ."/html/black.png\" alt=\"--------\"></td>";
if ( $tutos[massupdate] == 1 ) {
# Checkbox column for massupdate
# echo " <td></td>\n";
}
echo "</tr>";
echo " </thead>\n";
- echo " <tbody>\n";
+
$skipped = 0;
$this->line = 0;
if ( $this->parent->getType() == "task" ) {
@@ -109,10 +109,8 @@
$a++;
}
}
- echo " </tbody>\n";
if ( $tutos[massupdate] == 1 ) {
- echo " <tfoot>\n";
echo $this->UpdateRowStart($cols-1);
echo sprintf($lang['withmarked'],$lang['Tasks']);
echo "<select name=\"action\" onChange=\"disableArg();\">\n";
@@ -129,7 +127,6 @@
echo "</select>\n";
echo " <input name=\"arg\" type=\"text\" value=\"0\" size=\"3\">\n";
echo $this->UpdateRowEnd(1);
- echo " </tfoot>\n";
}
echo $this->OverviewTableEnd();
Index: team_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_ins.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- team_ins.php 31 Dec 2002 14:33:40 -0000 1.23
+++ team_ins.php 1 Mar 2003 19:12:41 -0000 1.24
@@ -11,7 +11,7 @@
/* Check if user is allowed to use it */
check_user();
- loadmodules("team");
+ loadmodules("team","ins");
$msg = "";
$gotourl = "team_new.php";
Index: team_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_new.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- team_new.php 31 Dec 2002 14:33:40 -0000 1.36
+++ team_new.php 1 Mar 2003 19:12:42 -0000 1.37
@@ -87,7 +87,7 @@
@reset($this->obj->member);
while( list ($i,$f) = @each ($this->obj->member)) {
echo $this->OverviewRowStart($line);
- echo "<td>". $pre.myentities($f->getFullName()) ."</td>";
+ echo "<td>". myentities($f->getFullName()) ."</td>";
if ( $this->obj->owner->id == $i ) {
echo "<td valign=\"top\"><i>". $lang['TeamManager'] ."</i></td>\n";
} else {
Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- timetrack.pinc 28 Feb 2003 11:10:28 -0000 1.49
+++ timetrack.pinc 1 Mar 2003 19:12:42 -0000 1.50
@@ -109,7 +109,12 @@
if ( $this->cph == "" ) {
$this->cph = 0.00;
}
+
+ $this->creator->read($r->get($pos, "creator"));
+
$g_hash[$this->id] = &$this;
+ parent::read_result($r,$pos);
+ return;
}
/**
* set the Description
@@ -222,6 +227,7 @@
$q->addFV("id",$this->id,"");
} else {
$this->id = $q->addFV("id",-1,"NEXTID");
+ acl_default($this,$current_user);
# Prepare the history
$this->modified[] = array ( "field" => "TimetrackCreate" ,
"old" => "" ,
@@ -235,6 +241,7 @@
);
}
$q->addFV("creation",$this->creation,"DATETIME");
+ $q->addFV("creator",$this->creator,"OBJ");
$query = $q->getInsert();
} else {
|