tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv652

Modified Files:
	acl_new.php 
Log Message:
fix

Index: acl_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_new.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- acl_new.php	26 Sep 2007 06:35:59 -0000	1.40
+++ acl_new.php	26 Sep 2007 06:36:43 -0000	1.41
@@ -215,7 +215,7 @@
      }
      foreach($id as $val) {
        $x = getObject($this->dbconn,$val);
-       if ( $x == -1 ) {
+       if ( !is_object($x) ) {
          $msg .= sprintf($lang['Err0040'],"Object ". $val);
          $this->stop = true;
        } else if ( ! $current_user->isadmin() && ! $x->del_ok() ) {

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32690

Modified Files:
	acl_new.php acl_ins.php 
Log Message:
fix

Index: acl_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_new.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- acl_new.php	4 Apr 2007 19:14:34 -0000	1.39
+++ acl_new.php	26 Sep 2007 06:35:59 -0000	1.40
@@ -99,7 +99,7 @@
        foreach ($val->acl as $i => $f) {
          if ( ! isset($this->user->parties[$i]) || ($this->user->parties[$i] == "") ) {
            $x = getObject($this->dbconn,$i);
-           if ( $x == -1 ) {
+           if ( !is_object($x) ) {
              continue;
            }
            $pre = "";

Index: acl_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_ins.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- acl_ins.php	4 Apr 2007 19:14:34 -0000	1.31
+++ acl_ins.php	26 Sep 2007 06:35:59 -0000	1.32
@@ -25,7 +25,7 @@
    global $dbconn, $lang, $msg, $current_user, $gotourl;
    $list = array();
    $x = getObject($dbconn,$id);
-   if ( $x == -1 ) {
+   if ( !is_object($x) ) {
      $msg .= sprintf($lang['Err0040'],"Object ". $id);
    } else if ( ! $current_user->isadmin() && ! $x->del_ok() ) {
      # we need delete permissions but talk about modify !
@@ -147,4 +147,4 @@
   *  CVS Info:  $Id$
   *  $Author$
   */
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28166

Modified Files:
	history_show.php 
Log Message:
update

Index: history_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history_show.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- history_show.php	1 Jun 2007 19:06:50 -0000	1.75
+++ history_show.php	25 Sep 2007 13:42:36 -0000	1.76
@@ -226,13 +226,6 @@
          } else {
            echo " <td><i>". makelink("history_show.php?id=". $f["new"],$lang['HistoryDeleted']) ."</i></td>\n";
          }
-#       } else if ( $f['field'] == "UserLastSeen" ) {
-#         echo " <td><b>&nbsp;". (isset( $lang[$f["field"]]) ? $lang[$f["field"]] : $f["field"]) ."</b></td>\n";
-#        $b =  new TUTOS_Date_Time();
-#         $b->setDateTime($f["old"]);
-#         echo " <td>&nbsp;". $b->getDateTime() ."</td>\n";
-#         $b->setDateTime($f["new"]);
-#         echo " <td>&nbsp;". $b->getDateTime() ."</td>\n";
        } else if ( $f['field'] == "AppointCommit" ) {
          echo " <td><b>&nbsp;". (isset( $lang[$f["field"]]) ? $lang[$f["field"]] : $f["field"]) ."</b></td>\n";
          echo " <td>&nbsp;". $lang['AppState'][$f["old"]] ."</td>\n";
@@ -265,6 +258,7 @@
          echo " <td>&nbsp;". $lang['ProdStates'][$f["new"]] ."</td>\n";
        } else if ( ereg("ProdRole?",$f['field'])
                  ||  ($f['field'] == "Customer")
+                 ||  ($f['field'] == "TaskWorker")
                  ||  ($f['field'] == "SoldBy")
                  ||  ($f['field'] == "FileAuthor")
                  ||  ($f['field'] == "TeamDel")
@@ -376,7 +370,7 @@
 
      if ($arg == 0) {
        $this->id = -1;
-       if ( ! $this->user->isadmin() ) {
+       if ( ! $this->user->isadmin() && ($tutos[demo] != 1) ) {
          $msg .= "Missing Filter";
          $this->stop = true;
        }

Update of /cvsroot/tutos/tutos/php/report-engine/rep_envelope
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24669/report-engine/rep_envelope

Modified Files:
	rep_envelope.pinc 
Log Message:
fix

Index: rep_envelope.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_envelope/rep_envelope.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rep_envelope.pinc	23 Jun 2006 12:06:03 -0000	1.3
+++ rep_envelope.pinc	25 Sep 2007 13:34:58 -0000	1.4
@@ -43,22 +43,22 @@
     $pdf->AddPage();
 
     $h = 5;
-	$x = 7;
-	$y = 9;
+    $x = 7;
+    $y = 9;
     $pdf->SetFont('Arial','',14);
 
     $pdf->Text($x,$y,$this->obj->getFullName());
-	$y += $h;
+    $y += $h;
     $pdf->Text($x,$y,$this->loc->street1);
-	$y += $h;
+    $y += $h;
     $pdf->Text($x,$y,$this->loc->street2);
-	$y += $h;
+    $y += $h;
     $pdf->Text($x,$y,$this->loc->city);
-	$y += $h;
+    $y += $h;
     $pdf->Text($x,$y,$this->loc->zip);
-	$y += $h;
+    $y += $h;
     $pdf->Text($x,$y,$lang['countrycde'][$this->loc->country]);
-	$y += $h;
+    $y += $h;
 
 
     $pdf->Close();
@@ -68,7 +68,7 @@
     if(headers_sent()) {
       Fatal_Error('Some data has already been output to browser, can\'t send PDF file');
     }
-    Header("Content-Disposition: inline; filename=\"". $this->obj->name .".pdf\"");
+    Header("Content-Disposition: inline; filename=\"". $this->obj->getFullName() .".pdf\"");
     Header("Content-Description: Upload from TUTOS" );
     Header('Content-Length: '.strlen($data));
     return $data;
@@ -89,9 +89,9 @@
     $r .= "<select name=\"loc\">\n";
     foreach ($this->obj->location as $i => $f) {
       $r .= "<option value=\"".$i."\">". $f->getFullname() ."</option>\n";
-	}
+    }
     $r .= "</select>\n";
-	return $r;
+    return $r;
   }
 
   function getFullname() {

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7730

Modified Files:
	task_overview.php task.pinc 
Log Message:
updates

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- task_overview.php	22 Aug 2007 17:35:17 -0000	1.85
+++ task_overview.php	25 Sep 2007 10:26:38 -0000	1.86
@@ -465,7 +465,7 @@
          return;
        }
        $this->parent = GetObject($this->dbconn,$_REQUEST['id']);
-       if ($this->parent == -1) {
+       if (!is_object($this->parent)) {
          $msg .= $lang['Err0048'];
          $this->stop = true;
          return;

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- task.pinc	30 Aug 2007 09:32:51 -0000	1.185
+++ task.pinc	25 Sep 2007 10:26:38 -0000	1.186
@@ -624,6 +624,28 @@
     return $this->setFloatField("volume",$value,"TaskVolumeFull");
   }
   /**
+   * add a new worker
+   */
+  function addWorker($worker) {
+    if (isset($this->worker[$worker->id])) {
+      return false;
+    }
+    $this->modified[] = array ( "field" => 'TaskWorker' , "old" => $worker->id , "new" => -1  );
+    $this->worker[$worker->id] = $worker;
+    return true;
+  }
+  /**
+   * delete a exisitng worker
+   */
+  function delWorker($workerid) {
+    if (!isset($this->worker[$workerid])) {
+      return false;
+    }
+    $this->modified[] = array ( "field" => 'TaskWorker' , "old" => -1 , "new" => $workerid  );
+    unset($this->worker[$workerid]);
+    return true;
+  }
+  /**
    * set the VolumeDone
    */
   function setVolumeDone($value) {

Update of /cvsroot/tutos/tutos/php/expense
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7305/expense

Modified Files:
	expense.pinc expense_show.php 
Log Message:
updates

Index: expense_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense_show.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- expense_show.php	17 Aug 2007 13:27:38 -0000	1.8
+++ expense_show.php	25 Sep 2007 10:25:56 -0000	1.9
@@ -138,11 +138,12 @@
      echo $this->showfield($lang['ExpenseDescription']);
      echo " <td colspan=\"4\" class=\"pre\"><pre>". wordwrap(urlReplace($this->obj->description),80) ."</pre></td>";
      echo "</tr>\n";
-     
-     if ( $this->obj->invoice != 0 ) {
+
+     if ( $this->obj->invoice != -1 ) {
        echo "<tr>\n";
        echo $this->showfield('Rechnung');
-       echo $this->showdata(myentities($this->obj->invoice));
+       $i = getObject($this->dbconn,$this->obj->invoice);
+       echo $this->showdata($i->getLink());
        echo "</tr>\n";
      }
      
@@ -222,4 +223,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: expense.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense.pinc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- expense.pinc	22 Aug 2007 17:35:17 -0000	1.17
+++ expense.pinc	25 Sep 2007 10:25:56 -0000	1.18
@@ -116,22 +116,22 @@
 
     $this->init($dbconn);
 
-    $this->name        = "";
-    $this->description = "";
+    $this->name        = '';
+    $this->description = '';
     $this->link_id     = $current_user->id;
     $this->adr_id      = $current_user->id;
     $this->gamount     = 0.0;
     $this->currency    = $tutos[currencies][0];
     $this->deduction   = 0.0;
     $this->itax        = 0.0;
-    $this->category    = "";
-    $this->reason      = "";
-    $this->people      = "";
-    $this->mop         = "";
-    $this->ccentre     = "";
-    $this->invoice     = "";
-    $this->city        = "";
-    $this->country     = "";
+    $this->category    = '';
+    $this->reason      = '';
+    $this->people      = '';
+    $this->mop         = '';
+    $this->ccentre     = '';
+    $this->invoice     = -1;
+    $this->city        = '';
+    $this->country     = '';
     $this->t_start     = new TUTOS_Date_Time();
     $this->t_end       = new TUTOS_Date_Time();
     $this->tablename   = $this->dbconn->prefix ."expenses";
@@ -162,9 +162,7 @@
     $this->t_start     = $r->getDateTime($pos, "t_start");
     $this->t_end       = $r->getDateTime($pos, "t_end");
 
-    $cid = $r->get($pos, "creator");
-    $this->creator     = new tutos_address($this->dbconn);
-    $this->creator     = $this->creator->read($cid,$this->creator);
+    $this->creator = getObject($this->dbconn,$r->get($pos, "creator"));
 
     parent::read_result($r,$pos);
     return;
@@ -492,8 +490,13 @@
   /**
    * set the expense invoice
    */
-  function setInvoice($value) {
-    return $this->setIntField("invoice",$value,"ExpenseInvoice");
+  function setInvoice($new) {
+    if ( !is_object($new) ) {
+      $id = $new;
+    } else {
+      $id = $new->id;
+    }
+    return $this->setFloatField("invoice",$id,"ExpenseInvoice");
   }
   /**
    * set the expense gross amount
@@ -644,7 +647,9 @@
     $r .= " <itax>". utf8_encode(htmlspecialchars($this->itax)) ."</itax>\n";
     $r .= " <mop>". utf8_encode(htmlspecialchars($this->mop)) ."</mop>\n";
     $r .= " <ccentre>". utf8_encode(htmlspecialchars($this->ccentre)) ."</ccentre>\n";
-    $r .= " <invoice>". utf8_encode(htmlspecialchars($this->invoice)) ."</invoice>\n";
+    if (is_object($this->invoice)) {
+      $r .= " <invoice>". utf8_encode(htmlspecialchars($this->invoice->id)) ."</invoice>\n";
+    }
     $r .= " <t_start>". $this->t_start->exportXML_body() ."</t_start>\n";
     $r .= " <t_end>". $this->t_end->exportXML_body() ."</t_end>\n";
     #$r .=  $this->exportXML_end();

Update of /cvsroot/tutos/tutos/php/file
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5966/file

Modified Files:
	file.pinc 
Log Message:
fix

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- file.pinc	2 Jan 2007 19:59:57 -0000	1.64
+++ file.pinc	25 Sep 2007 10:22:25 -0000	1.65
@@ -236,7 +236,7 @@
     while ($a < $n) {
       $xx = $result->get($a, "link_id");
       $p = getObject($this->dbconn,$xx);
-      if ($p != -1) {
+      if (is_object($p)) {
         $this->links[$xx] = &$p;
       }
       $a++;
@@ -1223,4 +1223,4 @@
     return $r;
   }
 }
-?>
\ No newline at end of file
+?>