tutos-commits Mailing List for TUTOS

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

Modified Files:
	restore.php 
Log Message:
fix

Index: restore.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/restore.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- restore.php	30 Jul 2007 18:49:33 -0000	1.1
+++ restore.php	30 Nov 2007 14:19:00 -0000	1.2
@@ -24,7 +24,7 @@
    $dbnr = $_GET['dbnr'];
  }
  $_SESSION['dbnr'] = $dbnr;
- $dbconn = DB_Open($dbnr);
+ $dbconn = DB_Open($dbnr,false);
 
 
  echo $dbconn->moreinfo();
@@ -78,9 +78,9 @@
  }
 
  $newfile = $tutos[sessionpath].'/restore/'.basename($dbbackup);
-# if (! $dbconn->restore_from_file($newfile)) {
-#	 echo '<br>Restore of '. $newfile .' failed !';
-# }
+ if (! $dbconn->restore_from_file($newfile)) {
+	 echo '<br>Restore of '. $newfile .' failed !';
+ }
 
  $dbconn->close();
 

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

Modified Files:
	product_role_new.php task.pinc 
Log Message:
fix

Index: product_role_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_role_new.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- product_role_new.php	2 Jan 2007 19:59:56 -0000	1.9
+++ product_role_new.php	30 Nov 2007 14:18:59 -0000	1.10
@@ -131,7 +131,7 @@
      echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
-     echo $this->setfocus("productroleadd.name");
+     echo $this->setfocus("productroleadd.role1");
      #echo $lang['FldsRequired'] ."\n";
    }
    /**

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- task.pinc	28 Oct 2007 16:16:35 -0000	1.188
+++ task.pinc	30 Nov 2007 14:18:59 -0000	1.189
@@ -919,6 +919,19 @@
     $info .= "<tr><td><font size=\"-2\"><pre>";
     $info .= $n;
     $info .= "</pre></font></td></tr>";
+    $info .= "<tr><td><font size=\"-1\">";
+    $sep = '';
+    $c = 0;
+    foreach ($this->worker as $i => $x) {
+      $info .= $sep.$this->worker[$i]->getShortName();
+      $sep = ', ';
+      if ($c == 4) {
+        $c = 0;
+        $sep = ',<br />';
+      }
+      $c++;
+    }
+    $info .= "</font></td></tr>";
     $info .= "</table></body></html>";
     return $info;
   }

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

Modified Files:
	default.css 
Log Message:
fix

Index: default.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/default.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- default.css	23 Nov 2007 05:36:01 -0000	1.10
+++ default.css	26 Nov 2007 19:36:15 -0000	1.11
@@ -72,6 +72,22 @@
        background-color: #d8d8d8;
 }
 
+/* more red */
+.col4 { 
+       background-color: #f2e0e0;
+}
+.col5 { 
+       background-color: #e2d0d0;
+}
+.col6 { 
+       background-color: #fae8e8;
+}
+.col7 { 
+       background-color: #ead8d8;
+}
+
+
+
 .selectbox {
         padding-left: 60px;
         padding-top: 30px;

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

Modified Files:
	app_show.php 
Log Message:
added links


Index: app_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_show.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- app_show.php	28 Aug 2007 10:40:41 -0000	1.52
+++ app_show.php	24 Nov 2007 18:38:48 -0000	1.53
@@ -75,9 +75,11 @@
      $dinfo = GetDaysInfo( $this->obj->start->getTimeStamp() );
 
      if ( ($this->obj->t_ignore != 0) || ($this->obj->repeat != 0) ) {
-       echo $this->showdata($this->obj->start->getDate(),2);
+#       echo $this->showdata($this->obj->start->getDate(),2);
+       echo $this->showdata($this->obj->start->getLinkDate(),2);
      } else {
-       echo $this->showdata($this->obj->start->getDateTime(),2);
+#       echo $this->showdata($this->obj->start->getDateTime(),2);
+       echo $this->showdata($this->obj->start->getLinkDateTime(),2);
      }
 
      echo "<td><span class=\"dinfo\">";
@@ -99,10 +101,12 @@
        if ( ($this->obj->repeat != 0) && ($this->obj->r_ignore == 1) ) {
          echo  $this->showdata($lang['AppNoLastDate'],2);
        } else {
-         echo  $this->showdata($this->obj->end->getDate(),2);
+#         echo  $this->showdata($this->obj->end->getDate(),2);
+         echo  $this->showdata($this->obj->end->getLinkDate(),2);
        }
      } else {
-       echo  $this->showdata($this->obj->end->getDateTime(),2);
+#       echo  $this->showdata($this->obj->end->getDateTime(),2);
+       echo  $this->showdata($this->obj->end->getLinkDateTime(),2);
      }
      echo "<td><span class=\"dinfo\">";
      if ( isset ($dinfo[Desc]) ) {

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

Modified Files:
	default.css 
Log Message:
some fixes

Index: default.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/default.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- default.css	28 Oct 2007 18:34:06 -0000	1.9
+++ default.css	23 Nov 2007 05:36:01 -0000	1.10
@@ -90,33 +90,5 @@
         padding-right: 5px;
 	vertical-align: top;
 }
-
-
-ul.sortable li {
-        position: relative;
-}
-
-ul.boxy {
-        list-style-type: none;
-        padding: 4px 1px 0px 1px;
-        margin: 0px;
-	width: 100%;
-        border-width: 1px 0px;
-        border-style: solid;
-        border-color: #aaa;
-}
-
-ul.boxy li {
-        cursor:move;
-        font-size: 8px;
-        margin-bottom: 4px;
-        margin-right: 2px;
-        padding: 1px 1px;
-        border: 1px solid #000;
-        display: inline;
-        line-height: 14px;
-        white-space: nowrap
-}
-
 	
 /* EOF */

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

Modified Files:
	invoice.pinc invoice_ins.php invoice_new.php 
Log Message:
some fixes

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- invoice.pinc	15 Oct 2007 07:30:44 -0000	1.63
+++ invoice.pinc	23 Nov 2007 05:32:14 -0000	1.64
@@ -620,6 +620,7 @@
    * set the Customer
    */
   function setCustomer($obj) {
+	if (!is_object($obj)) return;
     if ( ($this->customer_id != $obj->id) ) {
       $this->modified[] = array ( "field" => "Customer", "old" => $this->customer_id , "new" => $obj->id );
       $this->customer = $obj;

Index: invoice_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_new.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- invoice_new.php	12 Nov 2007 09:39:47 -0000	1.55
+++ invoice_new.php	23 Nov 2007 05:32:15 -0000	1.56
@@ -436,7 +436,7 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
-       if ( $this->obj < 0 ) {
+       if ( !is_object($this->obj) ) {
          $msg .= sprintf($lang['Err0040'],$lang['invoice']);
          $this->stop = true;
          return;

Index: invoice_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_ins.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- invoice_ins.php	16 Dec 2006 13:08:27 -0000	1.21
+++ invoice_ins.php	23 Nov 2007 05:32:15 -0000	1.22
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   

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

Modified Files:
	db_pg.pinc 
Log Message:
some fixes

Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_pg.pinc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- db_pg.pinc	30 Jul 2007 18:49:32 -0000	1.37
+++ db_pg.pinc	23 Nov 2007 05:32:14 -0000	1.38
@@ -283,7 +283,7 @@
 
     // If the DB encoding is UNICODE, encode the query in UTF-8
     if ($this->encoding == 'UNICODE') {
-        $query = utf8_encode($query);
+      $query = utf8_encode($query);
     }
 
     $result = @pg_query($this->conn,$query);
@@ -738,4 +738,4 @@
   }
 
 }
-?>
+?>
\ No newline at end of file

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

Modified Files:
	product.pinc product_ins.php 
Log Message:
some fixes

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- product_ins.php	13 Nov 2007 15:43:44 -0000	1.64
+++ product_ins.php	23 Nov 2007 05:32:14 -0000	1.65
@@ -63,7 +63,7 @@
  # Add given People Role
  if ( isset($_POST['r1fn']) ) {
    $m = check_field(StripSlashes($_POST['r1fn']),"r1fn","r1l",$tutos[rolecheck][$_POST['role1']]);
-   if ( is_object($m->id) ) {
+   if ( is_object($m) ) {
      $p->setRole($m,$_POST['role1'],StripSlashes($_POST['r1desc']));
    }
  }
@@ -76,7 +76,7 @@
  # Add given Product Role
  if ( isset($_POST['r2fn']) ) {
    $m = check_field(StripSlashes($_POST['r2fn']),"r2fn","r2l",$tutos[rolecheck][$_POST['role2']]);
-   if ( is_object($m->id) ) {
+   if ( is_object($m) ) {
      $p->setRole($m,$_POST['role2'],StripSlashes($_POST['r2desc']));
    }
  }
@@ -258,4 +258,4 @@
   *  CVS Info:  $Id$
   *  $Author$
   */
-?>
\ No newline at end of file
+?>

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- product.pinc	28 Aug 2007 10:44:24 -0000	1.161
+++ product.pinc	23 Nov 2007 05:32:14 -0000	1.162
@@ -269,7 +269,7 @@
     foreach ($lang['ProdRole'] as $role => $f) {
       if ( isset ($this->role[$role] ) && is_array ($this->role[$role]) ) {
         foreach ($this->role[$role] as $i => $o) {
-          if ( $o->id > 0 ) {
+          if ( is_object($o) ) {
             $q = "INSERT INTO ". $this->tablename2 ." (pro_id,adr_id,role_id,description) VALUES (". $this->id .",". $i .",". $role .",". $this->dbconn->String($this->roledesc[$role][$o->id]).")";
             $r = $this->dbconn->Exec($q);
             if ( ($o->getType() == "address") || ($o->getType() == "team") ) {
@@ -607,6 +607,8 @@
         }
       }
     }
+    if (!is_object($obj)) return;
+
     $this->modified[] = array ( "field" => "ProdRole".$role, "old" => "" , "new" => $obj->id );
     $this->role[$role][$obj->id] = $obj;
     $this->roledesc[$role][$obj->id] = $desc;
@@ -1048,4 +1050,4 @@
     return $r;
   }
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
	create_config.php 
Log Message:
fixed typo

Index: create_config.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/create_config.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- create_config.php	2 Jan 2007 19:59:56 -0000	1.5
+++ create_config.php	21 Nov 2007 13:17:31 -0000	1.6
@@ -100,16 +100,16 @@
    $fc = 0;
    $msg = "";
    if (file_exists($cc['cfn2'])) {
-     $msg .=  "config file ". $cc['cfn2'] ." already exits<br />";
+     $msg .=  "config file ". $cc['cfn2'] ." already exists<br />";
      $fc++;
    }
    if (file_exists($cc['cfn1'])) {
      @include $cc['cfn1'];
      if (!isset($tutos['CCSID'])) {
-       $msg .= "config file ". $cc['cfn1'] ." already exits and is not usable for automatic changing<br />";
+       $msg .= "config file ". $cc['cfn1'] ." already exists and is not usable for automatic changing<br />";
        $fc++;
      } elseif ($tutos['CCSID'] != session_id() ) {
-       $msg .= "config file ". $cc['cfn1'] ." already exits and is not from this session<br />";
+       $msg .= "config file ". $cc['cfn1'] ." already exists and is not from this session<br />";
        $fc++;
      }
    }
@@ -479,4 +479,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	tutos.js 
Log Message:
fix

Index: tutos.js
===================================================================
RCS file: /cvsroot/tutos/tutos/html/tutos.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tutos.js	24 Aug 2007 13:05:31 -0000	1.6
+++ tutos.js	16 Nov 2007 20:02:35 -0000	1.7
@@ -185,12 +185,12 @@
                                                
        // Create and add a list item HTML element for this cart item
        var li = document.createElement("li");
-//       li.appendChild(document.createTextNode(b1.decode()));
+       // li.appendChild(document.createTextNode(b1.decode()));
        li = document.createTextNode(decodeBase64(t) + " ");
        contents.appendChild(li);
 
        li = document.createElement("a");
-li.setAttribute("onclick", "document.getElementById('"+ name +"').value = '" + decodeBase64(n) +"';");
+       li.setAttribute("onclick", "document.getElementById('"+ name +"').value = '" + decodeBase64(n) +"';");
        li.appendChild(document.createTextNode( decodeBase64(n) ));
        contents.appendChild(li);
 

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

Modified Files:
	ajax.php 
Log Message:
fix

Index: ajax.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ajax.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ajax.php	7 Dec 2006 20:39:16 -0000	1.3
+++ ajax.php	16 Nov 2007 20:02:34 -0000	1.4
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2005 - 2006 by Gero Kohnert
+ *  Copyright 2005 - 2007 by Gero Kohnert
  *
  *  CVS Info:  $Id$
  *  $Author$

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

Modified Files:
	holiday_hk.pinc 
Log Message:
updates for 2008


Index: holiday_hk.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/holiday_hk.pinc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- holiday_hk.pinc	9 Dec 2006 19:31:51 -0000	1.5
+++ holiday_hk.pinc	16 Nov 2007 15:06:34 -0000	1.6
@@ -18,23 +18,37 @@
         array( Date => "28-01-2006",     type => 1,    Desc => "before Lunar New Year's Day (HK)"),
         array( Date => "30-01-2006",     type => 1,    Desc => "second day of Lunar New Year (HK)"),
         array( Date => "31-01-2006",     type => 1,    Desc => " third day of Lunar New Year (HK)"),
+
         array( Date => "17-02-2007",     type => 1,    Desc => "Lunar New Year's Day (HK)"),
         array( Date => "19-02-2007",     type => 1,    Desc => "The third day of Lunar New Year (HK)"),
         array( Date => "20-02-2007",     type => 1,    Desc => "The fourth day of Lunar New Year (HK)"),
-        array( Date => "05-04",          type => 1,    Desc => "Ching Ming Festival  (HK)"),
+
+        array( Date => "07-02-2008",     type => 1,    Desc => "Lunar New Year's Day (HK)"),
+        array( Date => "08-02-2008",     type => 1,    Desc => "The second day of Lunar New Year (HK)"),
+        array( Date => "09-02-2008",     type => 1,    Desc => "The third day of Lunar New Year (HK)"),
+
+        array( Date => "05-04-2007",     type => 1,    Desc => "Ching Ming Festival  (HK)"),
+  	    array( Date => "04-04-2008",     type => 1,    Desc => "Ching Ming Festival  (HK)"),
         array( Date => "GOODFRIDAY",     type => 1,    Desc => "Good Friday (HK)"),
         array( Date => "EASTERSUNDAY",   type => 1,    Desc => "Easter Sunday (HK)"),
         array( Date => "EASTERMONDAY",   type => 1,    Desc => "Easter Monday (HK)"),
         array( Date => "01-05",          type => 1,    Desc => "Labour Day (HK)"),
         array( Date => "05-05-2006",     type => 1,    Desc => "Buddha's Birthday (HK)"),
         array( Date => "24-05-2007",     type => 1,    Desc => "Buddha's Birthday (HK)"),
+        array( Date => "12-05-2008",     type => 1,    Desc => "Buddha's Birthday (HK)"),
         array( Date => "31-05-2006",     type => 1,    Desc => "Tuen Ng Festival (HK)"),
         array( Date => "19-06-2007",     type => 1,    Desc => "Tuen Ng Festival (HK)"),
-        array( Date => "02-07",          type => 1,    Desc => "The following day of HK SAR Establishment Day (HK)"),
-        array( Date => "07-10",          type => 1,    Desc => "The day following Chinese Mid-Autumn Festival (HK)"),
-        array( Date => "02-10",          type => 1,    Desc => "The day following National Day (HK)"),
+        array( Date => "09-06-2008",     type => 1,    Desc => "The day following Tuen Ng Festival (HK)"),
+        array( Date => "01-07",          type => 1,    Desc => "HK SAR Establishment Day (HK)"),
+        array( Date => "02-07-2007",     type => 1,    Desc => "The following day of HK SAR Establishment Day (HK)"),
+
+        array( Date => "07-10-2007",     type => 1,    Desc => "The day following Chinese Mid-Autumn Festival (HK)"),
+   	    array( Date => "15-09-2008",     type => 1,    Desc => "The day following Chinese Mid-Autumn Festival (HK)"),
+        array( Date => "01-10",          type => 1,    Desc => "National Day (HK)"),
+        array( Date => "02-10-2007",     type => 1,    Desc => "The day following National Day (HK)"),
         array( Date => "30-10-2006",     type => 1,    Desc => "Chung Yeung Festival (HK)"),
         array( Date => "19-10-2007",     type => 1,    Desc => "Chung Yeung Festival (HK)"),
+        array( Date => "07-10-2008",     type => 1,    Desc => "Chung Yeung Festival (HK)"),
         array( Date => "22-12",          type => 0,    Desc => "Winter Festival (HK)"),
         array( Date => "25-12",          type => 1,    Desc => "Christmas Day (HK)"),
         array( Date => "26-12",          type => 1,    Desc => "Boxing Day (HK)")

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

Modified Files:
	base.pinc 
Log Message:
better info

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- base.pinc	29 Jun 2007 10:39:18 -0000	1.96
+++ base.pinc	13 Nov 2007 15:45:46 -0000	1.97
@@ -511,7 +511,9 @@
    * get a usefull human readable name
    */
   function getFullName () {
-    return $this->getType()." (". $this->id .")";
+    global $lang;
+
+    return $lang[$this->getType()]." (". $this->id .")";
   }
 
   function getShortName () {
@@ -813,8 +815,10 @@
    * get the id as a unique identifier
    */
   function __toString() {
-    return $this->id;
+    global $lang;
+
+    return 'TUTOS Object:'.$lang[$this->getType()].' '.$this->getFullName().' (ID='.$this->id.')';
   }
 
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
	product_ins.php 
Log Message:
fix

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- product_ins.php	16 Dec 2006 13:08:17 -0000	1.63
+++ product_ins.php	13 Nov 2007 15:43:44 -0000	1.64
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2006 by Gero Kohnert
+ * Copyright 1999 - 2007 by Gero Kohnert
  * cloning option added by Michal Salaban, 2003
  *
  *  This program is free software; you can redistribute it and/or modify it 
@@ -63,7 +63,7 @@
  # Add given People Role
  if ( isset($_POST['r1fn']) ) {
    $m = check_field(StripSlashes($_POST['r1fn']),"r1fn","r1l",$tutos[rolecheck][$_POST['role1']]);
-   if ( $m->id > 0 ) {
+   if ( is_object($m->id) ) {
      $p->setRole($m,$_POST['role1'],StripSlashes($_POST['r1desc']));
    }
  }
@@ -76,7 +76,7 @@
  # Add given Product Role
  if ( isset($_POST['r2fn']) ) {
    $m = check_field(StripSlashes($_POST['r2fn']),"r2fn","r2l",$tutos[rolecheck][$_POST['role2']]);
-   if ( $m->id > 0 ) {
+   if ( is_object($m->id) ) {
      $p->setRole($m,$_POST['role2'],StripSlashes($_POST['r2desc']));
    }
  }

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

Modified Files:
	invoice_new.php 
Log Message:
fix

Index: invoice_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_new.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- invoice_new.php	24 Aug 2007 12:01:09 -0000	1.54
+++ invoice_new.php	12 Nov 2007 09:39:47 -0000	1.55
@@ -33,7 +33,7 @@
    echo "<tr>\n";
    if ( $f->id != -1 ) {
      # EXISTING
-     if ( $f->ref != -1 ) {
+     if ( is_object($f->ref) ) {
        echo ' <td valign="top"><label for="del_'. $f->id .'">'. $f->ref->getLink(sprintf("%04d",$f->pos)) ."</label></td>";
      } else {
        echo ' <td valign="top"><label for="del_'. $f->id .'">'. sprintf("%04d",$f->pos) ."</label></td>";

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

Modified Files:
	user_overview.php 
Log Message:
fix

Index: user_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_overview.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- user_overview.php	28 Oct 2007 16:16:35 -0000	1.32
+++ user_overview.php	6 Nov 2007 13:14:41 -0000	1.33
@@ -106,7 +106,7 @@
        unset ($f);
      }
 
-     echo $this->list_navigation($this->link1,8 + $tutos[massupdate],$this->start,$a,$n);
+     echo $this->list_navigation($this->link1,9 + $tutos[massupdate],$this->start,$a,$n);
 
      if ( $tutos[massupdate] == 1 ) {
        echo $this->UpdateRowStart(8);
@@ -242,4 +242,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	file_ins.php 
Log Message:
fix


Index: file_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_ins.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- file_ins.php	4 Apr 2007 19:14:35 -0000	1.23
+++ file_ins.php	5 Nov 2007 18:47:44 -0000	1.24
@@ -57,7 +57,7 @@
  } else {
    foreach($_REQUEST['link_id'] as $i => $j) {
      $l = getObject($f->dbconn,$j);
-     if ($l != -1) {
+     if (is_object($l)) {
        $links[$l->id] = &$l;
      }
      $gotourl = addUrlParameter($gotourl,"link_id[]=". UrlEncode($l->id),true);

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

Modified Files:
	res_cal.php 
Log Message:
fix

Index: res_cal.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- res_cal.php	8 Aug 2007 11:36:05 -0000	1.44
+++ res_cal.php	1 Nov 2007 13:00:31 -0000	1.45
@@ -98,9 +98,9 @@
        $maxr = 0;
        $q1 = "SELECT t.* from ". $this->dbconn->prefix ."tasks t,". $this->dbconn->prefix ."taskworker w";
        $q1 = $q1 ." WHERE ( t.id = w.t_id) and (w.w_id =  ". $f->id ." or w.w_id = ". $this->base->id .")";
-       $q1 = $q1 ."   AND ( (t.s_start < " . $this->dbconn->Date($this->end) ." AND t.s_start   >= " . $this->dbconn->Date($this->start) .") ";
-       $q1 = $q1 ."    OR   (t.s_end < " . $this->dbconn->Date($this->end) ." AND t.s_end   >= " . $this->dbconn->Date($this->start) .") ";
-       $q1 = $q1 ."    OR   (t.s_start < " . $this->dbconn->Date($this->start) ." AND t.s_end   >= " . $this->dbconn->Date($this->end) .") ";
+       $q1 = $q1 ."   AND ( (t.s_start <= " . $this->dbconn->Date($this->end) ." AND t.s_start   >= " . $this->dbconn->Date($this->start) .") ";
+       $q1 = $q1 ."    OR   (t.s_end <= " . $this->dbconn->Date($this->end) ." AND t.s_end   >= " . $this->dbconn->Date($this->start) .") ";
+       $q1 = $q1 ."    OR   (t.s_start <= " . $this->dbconn->Date($this->start) ." AND t.s_end   >= " . $this->dbconn->Date($this->end) .") ";
        $q1 = $q1 ." )";
        $q1 = $q1 ." ORDER by t.s_start";