tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23348/php/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug_overview.php 
Log Message:
* add printable view link in bug overview

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.8.2.28
retrieving revision 1.8.2.29
diff -u -r1.8.2.28 -r1.8.2.29
--- bug_overview.php	19 Sep 2005 16:10:41 -0000	1.8.2.28
+++ bug_overview.php	7 Dec 2005 11:02:07 -0000	1.8.2.29
@@ -605,6 +605,27 @@
      $this->menu_categories['obj'] =
        array('label' => $lang['Bugs'],
 	     'icon'  => 'bugs');
+
+     $param = "";
+     if ( isset($_GET['pid']) ) {
+       $param .= "&pid=".$_GET['pid'];
+     }
+     if ( isset($_GET['solverid']) ) {
+       $param .= "&solverid=".$_GET['solverid'];
+     }
+     if ( isset($_GET['state']) ) {
+       $param .= "&state=".$_GET['state'];
+     }
+     if ($param) {
+       $x = array('url'   => 
+  		  "bugtracking/bug_overview.php?show=all".$param."&format=paper",
+		  'text'  => $lang['Printable'],
+		  'image' => 'format',
+		  'info'  => $lang['PrintableInfo'],
+		  'category' => array("obj", "bug_overview"));
+       $this->addMenu($x);
+     }
+
    }
 
    /**

Update of /cvsroot/tutos/tutos/php/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26329/layout

Modified Files:
	layout_base.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: layout_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/layout_base.pinc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- layout_base.pinc	1 Dec 2005 21:05:14 -0000	1.37
+++ layout_base.pinc	1 Dec 2005 22:31:00 -0000	1.38
@@ -217,7 +217,7 @@
 	}
 	$r .= '<tr>'."\n";
 	$r .= ' <td colspan="'. $cols .'">';
-	$r .= $lang['createdby']  .'&nbsp;'.(-1 != $obj->creator ? $obj->creator->getLink():$lang['HistoryDeleted']) ."\n";
+	$r .= $lang['createdby']  .'&nbsp;'.(is_object($obj->creator) ? $obj->creator->getLink():$lang['HistoryDeleted']) ."\n";
 	$r .= $lang['atDateTime'] .'&nbsp;'. $obj->creation->getLinkDateTime() ."\n";
 	$r .= ' </td>';
 	$r .= '</tr>'."\n";

Update of /cvsroot/tutos/tutos/php/rate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26329/rate

Modified Files:
	rate.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: rate.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate.pinc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rate.pinc	1 Dec 2005 22:26:22 -0000	1.31
+++ rate.pinc	1 Dec 2005 22:31:01 -0000	1.32
@@ -37,7 +37,7 @@
       }
       break;
     }
-    echo "  ". $user->layout->theme->getImage(rate::getHtmlIcon(),'list') ." ". $f->getLink() ." ". number_format($f->cph,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". $f->currency ." (". ($f->worker > 0 ? $f->worker->getLink():$lang['HistoryDeleted']) .")<br />\n";
+    echo "  ". $user->layout->theme->getImage(rate::getHtmlIcon(),'list') ." ". $f->getLink() ." ". number_format($f->cph,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". $f->currency ." (". (is_object($f->worker) ? $f->worker->getLink():$lang['HistoryDeleted']) .")<br />\n";
     if ( $cols > 0 ) {
       echo "</td></tr>\n";
     }
@@ -135,7 +135,7 @@
     if ( empty($this->link_id) ) return;
 
     $this->ref = getObject($this->dbconn,$this->link_id);
-    if ( $this->ref == -1 ) {
+    if ( !is_object($this->ref) ) {
       $this->ref = $this->creator;
     }
     return;
@@ -239,7 +239,7 @@
       $text = $this->getFullName();
     }
     
-    if ($this->creator > 1) {
+    if (is_object($this->creator)) {
       $newcreator = $this->creator->getFullName();
     } else {
       $newcreator = $lang['HistoryDeleted'];

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

Modified Files:
	product.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- product.pinc	1 Dec 2005 22:26:17 -0000	1.155
+++ product.pinc	1 Dec 2005 22:31:00 -0000	1.156
@@ -238,7 +238,7 @@
       $adr_id = $r->get($a, "adr_id");
       $desc   = $r->get($a, "description");
       $obj = getObject($this->dbconn,$adr_id);
-      if ( $obj != -1 ) {
+      if ( is_object($obj) ) {
         $this->role[$role][$obj->id] = &$obj;
         $this->roledesc[$role][$obj->id] = $desc;
       }

Update of /cvsroot/tutos/tutos/php/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26329/installation

Modified Files:
	installation.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- installation.pinc	1 Dec 2005 22:26:19 -0000	1.40
+++ installation.pinc	1 Dec 2005 22:31:00 -0000	1.41
@@ -49,7 +49,7 @@
 	}
     if ( $obj->getType() == "product" ) {
       echo $f->getLink($f->salesdate->getDate());
-      if ( $f->customer != -1 ) {
+      if ( is_object($f->customer) ) {
         echo " : ". $f->customer->getLink();
       } else {
         echo " : ". $lang['HistoryDeleted'];

Update of /cvsroot/tutos/tutos/php/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/installation

Modified Files:
	installation.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- installation.pinc	9 Jun 2005 10:50:21 -0000	1.39
+++ installation.pinc	1 Dec 2005 22:26:19 -0000	1.40
@@ -498,7 +498,7 @@
    * Return a list of all installed products at this object
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
     if (! isset($obj->id) )  return;
     if ( isset($obj->list[useinstmanagement]) ) return;
@@ -540,7 +540,7 @@
    * a object that may hold installations is deleted
    */
   Function obj_delete(&$user,&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
 
     $msg = "";
@@ -558,7 +558,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -586,11 +585,10 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if ( $obj == -1 ) return ""; 
-    if (! is_object($obj) ) return "";
-    if ( $obj->id == -1 ) return "";
-    if (! $user->feature_ok(useinstmanagement,PERM_NEW) ) return "";
-    if (! $obj->use_ok() ) return ""; // we need the use permission
+    if (! is_object($obj) ) return '';
+    if ( $obj->id == -1 ) return '';
+    if (! $user->feature_ok(useinstmanagement,PERM_NEW) ) return '';
+    if (! $obj->use_ok() ) return ''; // we need the use permission
     if ($obj->gettype() != "product" ) return "";
           
     $x = array( url => "installation/installation_new.php?pid=". $obj->id,

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

Modified Files:
	invoice.pinc invoice_show.php 
Log Message:
bugfixes and php5.1.0 support

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- invoice.pinc	1 Dec 2005 21:05:14 -0000	1.54
+++ invoice.pinc	1 Dec 2005 22:26:20 -0000	1.55
@@ -1003,7 +1003,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -1031,9 +1030,8 @@
   function getaddlink (&$user,&$obj,$text = "") {
      global $lang;
 
-     if ( $obj == -1 ) return ""; 
-     if (! is_object($obj) ) return "";
-     if ( $obj->id == -1 ) return "";
+     if (! is_object($obj) ) return '';
+     if ( $obj->id == -1 ) return '';
      if (! $user->feature_ok(useinvoice,PERM_NEW) ) return "";
      if (! $obj->use_ok() ) return ""; // wee need the use permission
 

Index: invoice_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_show.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- invoice_show.php	23 May 2005 15:44:12 -0000	1.37
+++ invoice_show.php	1 Dec 2005 22:26:20 -0000	1.38
@@ -214,7 +214,7 @@
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
      }
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Invoice']);
        $this->stop = true;
        $this->format = "html";

Update of /cvsroot/tutos/tutos/php/mailbox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/mailbox

Modified Files:
	mailbox.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: mailbox.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mailbox.pinc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mailbox.pinc	3 Apr 2005 18:32:15 -0000	1.21
+++ mailbox.pinc	1 Dec 2005 22:26:20 -0000	1.22
@@ -567,7 +567,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $tutos,$lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -594,7 +593,7 @@
    * Return Info about connected mailboxes to an object
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
     if ( $obj->id == -1 )  return;
 
@@ -635,7 +634,6 @@
   function getNewLink (&$user,&$obj) {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
     if ( ! $obj->mod_ok() ) return;

Update of /cvsroot/tutos/tutos/php/group
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/group

Modified Files:
	group.pinc group_show.php 
Log Message:
bugfixes and php5.1.0 support

Index: group.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group.pinc,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- group.pinc	25 May 2005 06:05:07 -0000	1.52
+++ group.pinc	1 Dec 2005 22:26:19 -0000	1.53
@@ -460,7 +460,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 

Index: group_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_show.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- group_show.php	25 May 2005 06:05:07 -0000	1.36
+++ group_show.php	1 Dec 2005 22:26:19 -0000	1.37
@@ -290,7 +290,7 @@
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
      }
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Group']);
        $this->stop = true;
        $this->format = "html";

Update of /cvsroot/tutos/tutos/php/checklist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/checklist

Modified Files:
	checkfield.pinc checklist.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: checkfield.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield.pinc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- checkfield.pinc	17 Apr 2005 18:16:43 -0000	1.19
+++ checkfield.pinc	1 Dec 2005 22:26:18 -0000	1.20
@@ -483,7 +483,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( ! $user->feature_ok(usechecklists,PERM_SEE) ) {
       return;

Index: checklist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist.pinc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- checklist.pinc	3 Apr 2005 18:32:12 -0000	1.26
+++ checklist.pinc	1 Dec 2005 22:26:18 -0000	1.27
@@ -212,7 +212,7 @@
    * read fields for this checklist
    */
   function read_checkfields( &$obj ) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
     if ( $obj->gettype() != "checklist" ) return;
@@ -430,7 +430,6 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if ( $obj == -1 ) return ""; 
     if (! is_object($obj) ) return "";
     if ( $obj->id < 1000 ) return "";
     if (! $user->feature_ok(usechecklists,PERM_NEW) ) return "";
@@ -670,13 +669,11 @@
   function changelist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
     $cl_obj = $obj->getCL_Class();
 
-    if ( $cl_obj == -1 ) return; 
     if (! is_object($cl_obj) ) return;
     if ( $cl_obj->id < 1000 ) return;
 
@@ -756,7 +753,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -787,7 +783,7 @@
    * Return Info about connected checklist to an object
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 

Update of /cvsroot/tutos/tutos/php/drawboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/drawboard

Modified Files:
	drawboard.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: drawboard.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/drawboard/drawboard.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drawboard.pinc	15 Aug 2005 18:06:19 -0000	1.2
+++ drawboard.pinc	1 Dec 2005 22:26:18 -0000	1.3
@@ -210,7 +210,7 @@
    * Return Info about connected drawboards to a object
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
 
     if ( ! isset($obj->id) ) {

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

Modified Files:
	acl_show.php appointment.pinc company_show.php department.pinc 
	department_show.php product.pinc product_show.php 
	task_show.php 
Log Message:
bugfixes and php5.1.0 support

Index: acl_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_show.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- acl_show.php	3 Apr 2005 18:31:52 -0000	1.20
+++ acl_show.php	1 Dec 2005 22:26:16 -0000	1.21
@@ -103,7 +103,7 @@
      $id = $_GET['id'];
      $this->obj = getObject($this->dbconn,$id);
 
-     if ( $this->obj == -1) {
+     if ( !is_object($this->obj)) {
        $msg .= sprintf($lang['Err0040'],"Object");
        $this->stop = true;
      } else if ( ! $this->obj->see_ok() ) {

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- appointment.pinc	1 Dec 2005 21:05:14 -0000	1.192
+++ appointment.pinc	1 Dec 2005 22:26:17 -0000	1.193
@@ -82,16 +82,16 @@
     echo ' <optgroup label="-----">'."\n";
   }
   echo '  <option value="'. CAL_OWNTEAMS .'"'. (isset($team[CAL_OWNTEAMS]) ? ' selected="selected"' : '') .'>'. $lang['AppAllTeams'] ."</option>\n";
-  if ( $team == CAL_OWNTEAMS ) {
+  if ( isset($team[CAL_OWNTEAMS]) ) {
     $showed[CAL_OWNTEAMS] = 1;
   }
   echo '  <option value="'. CAL_ALLTOSEE .'"'. (isset($team[CAL_ALLTOSEE]) ? ' selected="selected"' : '') .'>'. $lang['AppAllSee'] ."</option>\n";
-  if ( $team == CAL_ALLTOSEE ) {
+  if ( isset($team[CAL_ALLTOSEE]) ) {
     $showed[CAL_ALLTOSEE] = 1;
   }
   if ( $current_user->isadmin() ) {
     echo '  <option value="'. CAL_EVERYTHING .'"'. (isset($team[CAL_EVERYTHING]) ? ' selected="selected"' : '') .'>'. $lang['AppEverything'] ."</option>\n";
-    if ( $team == CAL_EVERYTHING ) {
+    if ( isset($team[CAL_EVERYTHING]) ) {
       $showed[CAL_EVERYTHING] = 1;
     }
   }
@@ -225,10 +225,15 @@
   global $msg,$lang;
 
   $uids = array();
+  $first = true;
   if ( isset($_GET['team']) ) {
     if (is_array($_GET['team'])) {
       foreach ($_GET['team'] as $i) {
         $tt[$i] = $i;
+		if ($first) {
+          $x = $user->set_prefteam($i);
+		  $first = false;
+		}
       }
     } else {
       $tt[$_GET['team']] = $_GET['team'];
@@ -1596,7 +1601,6 @@
   function obj_read(&$obj) {
     global $current_user,$table;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
 
     if ( isset($obj->applist) ) {

Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- company_show.php	22 May 2005 14:23:41 -0000	1.77
+++ company_show.php	1 Dec 2005 22:26:17 -0000	1.78
@@ -172,15 +172,10 @@
      $this->name = $lang['CompanyDetail'];
      $this->obj = new company($this->dbconn);
 
-     if (!isset($_GET['id'])) {
-       $msg .= "Missing ID";
-       $this->stop = true;
-       $this->format = "html";
-       return;
-     } else {
+     if (isset($_GET['id'])) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
      }
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Company']);
        $this->stop = true;
        $this->format = "html";

Index: department.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department.pinc,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- department.pinc	1 Aug 2005 18:44:47 -0000	1.65
+++ department.pinc	1 Dec 2005 22:26:17 -0000	1.66
@@ -295,7 +295,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
 
     department::obj_read($obj);
@@ -318,7 +317,6 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if ( $obj == -1 ) return ""; 
     if (! is_object($obj) ) return "";
     if (! $obj->see_ok() ) return "";
    
@@ -343,7 +341,7 @@
    * Read all departments for given company
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
     if ( isset($obj->list[usedepartment]) ) return;
 

Index: department_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_show.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- department_show.php	8 Jul 2005 17:42:36 -0000	1.60
+++ department_show.php	1 Dec 2005 22:26:17 -0000	1.61
@@ -133,13 +133,10 @@
 
      $this->name = $lang['DepartmentDetail'];
      $this->obj = new department($this->dbconn);
-     if (!isset($_GET['id'])) {
-       $msg .= "Missing ID";
-       $this->stop = true;
-     } else {
+     if (isset($_GET['id'])) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
      }
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Department']);
        $this->stop = true;
        $this->format = "html";

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- product.pinc	19 Feb 2005 13:48:43 -0000	1.154
+++ product.pinc	1 Dec 2005 22:26:17 -0000	1.155
@@ -808,7 +808,6 @@
   function obj_read(&$obj) {
     global $lang,$table;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id == -1 )  return;
 
@@ -891,7 +890,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang,$tutos;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
 
     if ( ! $user->feature_ok(useprojects,PERM_SEE) ) {

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- product_show.php	22 May 2005 14:23:41 -0000	1.109
+++ product_show.php	1 Dec 2005 22:26:17 -0000	1.110
@@ -327,7 +327,7 @@
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
      }
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Product']);
        $this->stop = true;
        $this->format = "html";

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- task_show.php	23 May 2005 15:44:12 -0000	1.77
+++ task_show.php	1 Dec 2005 22:26:17 -0000	1.78
@@ -272,7 +272,7 @@
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
      }
 
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Task']);
        $this->stop = true;
        $this->format = "html";

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/bugtracking

Modified Files:
	bug.pinc bug_show.php 
Log Message:
bugfixes and php5.1.0 support

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- bug.pinc	1 Dec 2005 21:05:14 -0000	1.36
+++ bug.pinc	1 Dec 2005 22:26:17 -0000	1.37
@@ -214,7 +214,7 @@
   }
 
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
 
     if ( ! isset($obj->id) ) {
@@ -962,7 +962,7 @@
    * Return Info about connected bugs to a object
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
 
     if ( ! isset($obj->id) ) {
@@ -1030,7 +1030,6 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if ( $obj == -1 ) return ""; 
     if (! is_object($obj) ) return "";
     if ( $obj->id == -1 ) return "";
     if (! $user->feature_ok(usebugtracking,PERM_NEW) ) return "";

Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bug_show.php	23 May 2005 15:44:12 -0000	1.19
+++ bug_show.php	1 Dec 2005 22:26:17 -0000	1.20
@@ -138,12 +138,8 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
-     } else {
-       $msg .= $lang['Err0048'] ."<br />";
-       $this->stop = true;
-       return;
      }
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Bug']);
        $this->stop = true;
        $this->format = "html";

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

Modified Files:
	expense.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: expense.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense.pinc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- expense.pinc	22 May 2005 14:23:42 -0000	1.7
+++ expense.pinc	1 Dec 2005 22:26:18 -0000	1.8
@@ -720,7 +720,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -748,7 +747,6 @@
   function small_infolist (&$user,&$obj,$cols,$class) {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -773,7 +771,6 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if ( $obj == -1 ) return ""; 
     if (! is_object($obj) ) return "";
     if ( $obj->id < 1000 ) return "";
     if (! $user->feature_ok(useexpenses,PERM_NEW) ) return "";
@@ -791,7 +788,7 @@
    * Return Info about connected expenses to a object
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 

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

Modified Files:
	file.pinc file_show.php 
Log Message:
bugfixes and php5.1.0 support

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- file.pinc	1 Dec 2005 21:05:14 -0000	1.60
+++ file.pinc	1 Dec 2005 22:26:18 -0000	1.61
@@ -1113,11 +1113,10 @@
   function getaddlink (&$user,&$obj,$text = "") {
      global $lang;
 
-     if ( $obj == -1 ) return "";
-     if (! is_object($obj) ) return "";
-     if ( $obj->id == -1 ) return "";
-     if (! $user->feature_ok(usedocmanagement,PERM_NEW) ) return "";
-     if (! $obj->use_ok() ) return "";
+     if (! is_object($obj) ) return '';
+     if ( $obj->id == -1 ) return '';
+     if (! $user->feature_ok(usedocmanagement,PERM_NEW) ) return '';
+     if (! $obj->use_ok() ) return '';
 
       $x = array( url => "file/file_new.php?link_id=". $obj->id,
                   confirm => false,

Index: file_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_show.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- file_show.php	4 Jun 2005 20:24:17 -0000	1.22
+++ file_show.php	1 Dec 2005 22:26:18 -0000	1.23
@@ -220,7 +220,7 @@
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
      }
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['File']);
        $this->stop = true;
        $this->format = "html";

Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/note

Modified Files:
	note.pinc note_show.php 
Log Message:
bugfixes and php5.1.0 support

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- note.pinc	1 Dec 2005 21:05:15 -0000	1.60
+++ note.pinc	1 Dec 2005 22:26:21 -0000	1.61
@@ -460,7 +460,6 @@
   function small_infolist (&$user,&$obj,$cols,$class) {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 0 ) return;
 
@@ -485,9 +484,8 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if ( $obj == -1 ) return ""; 
-    if (! is_object($obj) ) return "";
-    if ( $obj->id < 0 ) return "";
+    if (! is_object($obj) ) return '';
+    if ( $obj->id < 0 ) return '';
     if (! $user->feature_ok(usenotes,PERM_NEW) ) return "";
     if (! $obj->see_ok() ) return "";
     if ($obj->getType() == "note" ) return "";

Index: note_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_show.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- note_show.php	23 May 2005 15:44:13 -0000	1.34
+++ note_show.php	1 Dec 2005 22:26:21 -0000	1.35
@@ -90,13 +90,8 @@
      $this->obj = new note($this->dbconn);
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
-     } else {
-       $msg .= $lang['Err0048'] ."<br />";
-       $this->stop = true;
-       $this->format = "html";
-       return;
      }
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Note']);
        $this->stop = true;
        $this->format = "html";

Update of /cvsroot/tutos/tutos/php/resource
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/resource

Modified Files:
	resource.pinc resource_show.php 
Log Message:
bugfixes and php5.1.0 support

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource.pinc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- resource.pinc	23 May 2005 15:42:11 -0000	1.40
+++ resource.pinc	1 Dec 2005 22:26:23 -0000	1.41
@@ -282,7 +282,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
 
     if ( ! $user->feature_ok(useresource,PERM_SEE) ) {
@@ -308,7 +307,6 @@
   function small_infolist (&$user,&$obj,$cols,$class) {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
 
     if ( ! $user->feature_ok(useresource,PERM_SEE) ) {
@@ -332,7 +330,7 @@
   Function obj_read(&$obj) {
     global $current_user;
 
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
 
     if ( isset($obj->resuselist) ) {
@@ -384,7 +382,6 @@
   function obj_save(&$user,&$obj) {
     global $tutos;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
 
     if (! isset($obj->res) ) {

Index: resource_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_show.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- resource_show.php	23 May 2005 15:42:11 -0000	1.29
+++ resource_show.php	1 Dec 2005 22:26:23 -0000	1.30
@@ -143,13 +143,8 @@
      $this->obj = new resource($this->dbconn);
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
-     } else {
-       $msg .= $lang['Err0048'] ."<br />";
-       $this->stop = true;
-       $this->format = "html";
-       return;
      }
-     if ( $this->obj == -1 ) {
+     if ( !is_object($this->obj) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Resource']);
        $this->stop = true;
        $this->format = "html";

Update of /cvsroot/tutos/tutos/php/url
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/url

Modified Files:
	url.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url.pinc,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- url.pinc	1 Dec 2005 21:05:15 -0000	1.22
+++ url.pinc	1 Dec 2005 22:26:23 -0000	1.23
@@ -207,9 +207,7 @@
   function getaddlink (&$user,&$obj,$text = "") {
      global $lang;
 
-     if ( $obj == -1 ) return ""; 
      if (! is_object($obj) ) return "";
-     if ( $obj->id == -1 ) return "";
      if (! $user->feature_ok(useurl,PERM_NEW) ) return "";
      if (! $obj->see_ok() ) return "";
 

Update of /cvsroot/tutos/tutos/php/reminder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/reminder

Modified Files:
	reminder.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: reminder.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder.pinc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- reminder.pinc	1 Dec 2005 21:05:15 -0000	1.17
+++ reminder.pinc	1 Dec 2005 22:26:23 -0000	1.18
@@ -606,12 +606,11 @@
   function getaddlink (&$user,&$obj,$text = "") {
      global $tutos,$lang;
 
-     if ( $obj == -1 ) return ""; 
-     if (! is_object($obj) ) return "";
-     if ( $obj->id == -1 ) return "";
-     if (! $user->feature_ok(usereminder,PERM_NEW) ) return "";
-     if (! $obj->use_ok() ) return ""; // wee need the use permission
-     if ($tutos['pageclass'] == reminder::gettype()) return "";
+     if (! is_object($obj) ) return '';
+     if ( $obj->id == -1 ) return '';
+     if (! $user->feature_ok(usereminder,PERM_NEW) ) return '';
+     if (! $obj->use_ok() ) return ''; // wee need the use permission
+     if ($tutos['pageclass'] == reminder::gettype()) return '';
 
      if ( "department_show.php" == basename($_SERVER['PHP_SELF']) ) {
        return;

Update of /cvsroot/tutos/tutos/php/rate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/rate

Modified Files:
	rate.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: rate.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate.pinc,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- rate.pinc	1 Dec 2005 21:05:15 -0000	1.30
+++ rate.pinc	1 Dec 2005 22:26:22 -0000	1.31
@@ -83,20 +83,20 @@
     $s =  $r->get($pos, "worker");
     $this->worker = getObject($this->dbconn,$s);
     # Check for unfilled worker
-    if ( $this->worker == 1 ) {
+    if ( !is_object($this->worker) ) {
       # set default
-      if ( $this->parent->getType() == "product" ) {
-        $this->parent->readroles();
-        if ( count($this->parent->role[PROD_ROLE_MANAGER]) > 0 ) {
-          $this->worker = current($this->parent->role[PROD_ROLE_MANAGER]);
-        }else if ( count($this->parent->role[PROD_ROLE_MANAGER2]) > 0 ) {
-          $this->worker = current($this->parent->role[PROD_ROLE_MANAGER2]);
-        } else {
-          $this->worker = $this->creator;
-        }
-      } else {
+#      if ( $this->parent->getType() == "product" ) {
+#        $this->parent->readroles();
+#        if ( count($this->parent->role[PROD_ROLE_MANAGER]) > 0 ) {
+#          $this->worker = current($this->parent->role[PROD_ROLE_MANAGER]);
+#        }else if ( count($this->parent->role[PROD_ROLE_MANAGER2]) > 0 ) {
+#          $this->worker = current($this->parent->role[PROD_ROLE_MANAGER2]);
+#        } else {
+#          $this->worker = $this->creator;
+#        }
+#      } else {
         $this->worker = $this->creator;
-      }
+#      }
     }
     if ( is_object($this->worker) && ($this->worker->gettype() == "team") ) {
       $this->worker->read_member();
@@ -542,7 +542,6 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -570,7 +569,6 @@
   function small_infolist (&$user,&$obj,$cols,$class) {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -614,7 +612,6 @@
   function obj_read(&$obj) {
     global $current_user;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( isset($obj->ratelist) ) {
       return;

Update of /cvsroot/tutos/tutos/php/report-engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/report-engine

Modified Files:
	reporter.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: reporter.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/reporter.pinc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- reporter.pinc	1 May 2005 15:24:38 -0000	1.7
+++ reporter.pinc	1 Dec 2005 22:26:23 -0000	1.8
@@ -130,12 +130,10 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang,$tutos;
 
-
-    if ( $obj == -1 ) return ""; 
-    if (! is_object($obj) ) return "";
-    if ( $obj->id == -1 ) return "";
-    if (! $user->feature_ok(usereporter,PERM_USE) ) return "";
-    if (! $obj->use_ok() ) return "";
+    if (! is_object($obj) ) return '';
+    if ( $obj->id == -1 ) return '';
+    if (! $user->feature_ok(usereporter,PERM_USE) ) return '';
+    if (! $obj->use_ok() ) return '';
 
     report::obj_read($obj,$tutos['pageclass'],$tutos['pagetype']);
     if (count( $obj->list[usereporter]) == 0 ) {

Update of /cvsroot/tutos/tutos/php/merge
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/merge

Modified Files:
	merge.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: merge.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/merge/merge.pinc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- merge.pinc	3 Apr 2005 18:32:16 -0000	1.8
+++ merge.pinc	1 Dec 2005 22:26:21 -0000	1.9
@@ -110,7 +110,6 @@
   function getaddlink (&$user,&$obj,$text = "") {
      global $lang;
 
-     if ( $obj == -1 ) return; 
      if (! is_object($obj) ) return;
      if ( $obj->id == -1 ) return;
      if ( ! $obj->see_ok() ) return;

Update of /cvsroot/tutos/tutos/php/watchlist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5926/php/watchlist

Modified Files:
	watchlist.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- watchlist.pinc	25 Aug 2004 19:17:05 -0000	1.55
+++ watchlist.pinc	1 Dec 2005 21:05:15 -0000	1.56
@@ -142,7 +142,6 @@
   function obj_read (&$obj) {
     global $tutos;
 
-    if ( $obj == -1 ) return;
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
     if ( ! $obj->see_ok() ) return;
@@ -174,7 +173,6 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if ( $obj == -1 ) return;
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
     if ( ! $obj->see_ok() ) return;
@@ -208,7 +206,6 @@
   function getNewLink (&$user,&$obj) {
     global $lang,$tutos;
 
-    if ( $obj == -1 ) return;
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
     if ( ! $obj->mod_ok() ) return;
@@ -290,7 +287,6 @@
       break;
     }
 
-    if ( $obj == -1 ) return;
     if (! is_object($obj) ) return;
     if ( $tutos[usewatchlist] != 1 ) return;
     if ( count($obj->modified) < 1 )  return;
@@ -328,7 +324,6 @@
   function obj_delete (&$user,&$obj) {
     global $lang,$tutos,$tutos;
 
-    if ( $obj == -1 ) return;
     if (! is_object($obj) ) return;
     if ( ($tutos[usewatchlist] != 1) ) {
       return;

Update of /cvsroot/tutos/tutos/php/google_earth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5926/php/google_earth

Modified Files:
	google_earth.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: google_earth.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/google_earth/google_earth.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- google_earth.pinc	16 Sep 2005 19:30:53 -0000	1.1
+++ google_earth.pinc	1 Dec 2005 21:05:14 -0000	1.2
@@ -25,21 +25,23 @@
 	}
 	$x = explode (' ',$arg);
 	$arg = implode($x,",");
-    if (! isset($tutos['googlemapkey'][$current_user->dbconn->db->id])) {
+	$x = explode (',',$arg);
+   
   	  $url = 'http://maps.google.com';
-	  $url = addUrlParameter($url,"ll=".$obj);
+	  $url = addUrlParameter($url,"ll=".$x[1].','.$x[0]);
 	  $url = addUrlParameter($url,"t=h");
 	  $url = addUrlParameter($url,"spn=0.01,0.02");
 #	var_dump($obj);
 #	var_dump($arg);
 
       if ($cnt == 1) {
-        return '<a target="map" href="'. $url .'">'. $arg .'</a>';
+        $msg = '<a target="map" href="'. $url .'">'. $arg .'</a>';
 	  } else {
-        return ' [<a target="map" href="'. $url .'">Google</a>]';
+        $msg = ' [<a target="map" href="'. $url .'">Google</a>]';
 	  }
-	} else {
-      $msg = $arg .' ';
+
+    if (isset($tutos['googlemapkey'][$current_user->dbconn->db->id])) {
+
       $msg .= '<script src="http://maps.google.com/maps?file=api&v=1&key='.$tutos['googlemapkey'][$current_user->dbconn->db->id].'" type="text/javascript"></script>';
       $msg .= '<div id="gmap" style="width: 500px; height: 400px"></div>';
       $msg .= '<div id="message"></div>';
@@ -64,14 +66,14 @@
 
     GEvent.addListener(map, "moveend", function() {
      var center = map.getCenterLatLng();
-     var latLngStr =  "(" + center.y + " " + center.x + ")";
+     var latLngStr =  "(Latitude " + center.y + " Longitude " + center.x + ")";
      document.getElementById("message").innerHTML = latLngStr;
     });
 ';    
  	  $msg .= '//]]>';
 	  $msg .= '</script>';
-	  return $msg;
 	}
+    return $msg;
   }
 }
 

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

Modified Files:
	Date.pinc acl_overview.php admin_show.php appointment.pinc 
	config_default.pinc database.pinc location.pinc permission.p3 
	product_new.php task.pinc team.pinc timetrack.pinc user.pinc 
Log Message:
bugfixes and php5.1.0 support

Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- Date.pinc	15 Aug 2005 18:06:19 -0000	1.115
+++ Date.pinc	1 Dec 2005 21:05:14 -0000	1.116
@@ -673,7 +673,7 @@
     $this->ts = adodb_mktime($this->hour,$this->min,$this->sec,$this->month,$this->day,$this->year);
 
     $this->ts_def = $this->ts;
-    if ( ($current_user->offset != 0) && ($notz == 0) ) {
+    if ( is_object($current_user) && ($current_user->offset != 0) && ($notz == 0) ) {
       $this->ts += $current_user->offset;
       // Set the fields according to offset
       $this->setDateTimeTS($this->ts);

Index: acl_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_overview.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- acl_overview.php	1 May 2005 13:37:53 -0000	1.50
+++ acl_overview.php	1 Dec 2005 21:05:14 -0000	1.51
@@ -45,15 +45,17 @@
      if ( $this->type != ""  ) {
        $query->setTable($this->dbconn->prefix .$this->type);
        $query->addFld("DISTINCT id");
+       $query->addOrder("id","ASC");
      } else if ( $this->xtype != ""  ) {
        $query->setTable($this->xtype);
        $query->addFld("DISTINCT id");
+       $query->addOrder("id","ASC");
 	 } else {
        $query->setTable($this->dbconn->prefix ."acl");
        $query->addFld("DISTINCT obj_id","id");
        $query->addWC("obj_id",0,"INT",">");
+       $query->addOrder("obj_id","ASC");
 	 }
-     $query->addOrder("id","ASC");
      $query->addRange($this->start,$tutos[maxshow]);
 
      $result = $query->runSelect();

Index: admin_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- admin_show.php	13 Jun 2005 19:20:16 -0000	1.81
+++ admin_show.php	1 Dec 2005 21:05:14 -0000	1.82
@@ -52,8 +52,8 @@
  Function getTableCount($tbl,&$dbconn) {
    $q = "SELECT count(*) as c from ". $dbconn->prefix . $tbl;
    $r = @$dbconn->exec($q,0);
-   if ( ($r == -1) || (1 != $r->numrows()) ) {
-     return "";
+   if ( !is_object($r) || (1 != $r->numrows()) ) {
+     return '';
    }
    $cnt = $r->get(0, "c");
    $r->free();
@@ -110,11 +110,16 @@
        $adr = new tutos_user($this->dbconn);
        $uid = $result->get($a, "id");
        $adr = $adr->read($uid,$adr,1);
-       echo " <td colspan=\"1\">". $adr->getLink() ."&nbsp;</td>";
-       echo " <td colspan=\"1\" align=\"right\">". makelink("user_new.php?uid=".$uid ,$result->get($a, "login")) ."</td>";
+       echo ' <td colspan="1">'. $adr->getLink() .'&nbsp;</td>';
+       echo ' <td colspan="1" align="right">'. makelink('user_new.php?uid='.$uid ,$adr->login);
+	   if ($adr->isAdmin()) {
+		   echo ' (ADMIN)';
+	   }
+       echo '</td>';
        $ls = $result->getDateTime($a, "last_seen");
-       echo " <td colspan=\"1\">". $ls->getLinkDateTime() ."</td>";
+       echo ' <td colspan="1">'. $ls->getLinkDateTime() .'</td>';
        $x1 =  $result->get($a, "last_host");
+       $x2 = '';
        if (strstr($x1,".") && !strstr($x1," ")) {
          $x2 =  @gethostbyaddr($x1);
        } else {
@@ -257,6 +262,7 @@
        echo ' <td colspan="1">'. $data['server'] ."</td>\n";
        echo ' <td colspan="1" align="right">'. ($ts - $data['lastseen']) ." seconds ago</td>\n";
        $x1 =  $data['lasthost'];
+       $x2 = '';
        if (strstr($x1,".") && !strstr($x1," ")) {
          $x2 =  @gethostbyaddr($x1);
        } else {

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- appointment.pinc	4 Jul 2005 19:05:16 -0000	1.191
+++ appointment.pinc	1 Dec 2005 21:05:14 -0000	1.192
@@ -105,7 +105,7 @@
   foreach($team as $t => $tt) {
     if ( isset($showed[$t]) && ($showed[$t] == 1) ) continue;
     $obj = getObject($current_user->dbconn,$t);
-    if ($obj != -1) {
+    if (is_object($obj)) {
       echo '  <option value="'. $t .'" selected="selected">'.  $obj->getFullName() ."</option>\n";
     } 
 #   echo ("XXXX".$t);
@@ -296,7 +296,7 @@
       }
     } else {
       $tt = getObject($user->dbconn,$team);
-      if ( $tt == -1 ) continue;
+      if ( ! is_object($tt) ) continue;
 
       if ( $tt->getType() == "team" ) {
         cal_addteam($user,$tt,$teamname,$uids);
@@ -1546,7 +1546,7 @@
    */
   function getaddlink (&$user,&$obj,$text = '') {
     global $lang;
-    if ( $obj == -1 ) return ''; 
+
     if (! is_object($obj) ) return '';
     if ( $obj->id == -1 ) return '';
     if (! $user->feature_ok(usecalendar,PERM_NEW) ) return '';

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- config_default.pinc	5 Sep 2005 12:08:27 -0000	1.106
+++ config_default.pinc	1 Dec 2005 21:05:14 -0000	1.107
@@ -791,6 +791,6 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.3beta.20050904';
+$tutos[version] = '1.3beta.20051030';
 #
 ?>
\ No newline at end of file

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- database.pinc	3 Apr 2005 18:31:52 -0000	1.55
+++ database.pinc	1 Dec 2005 21:05:14 -0000	1.56
@@ -16,6 +16,7 @@
 define ('DB_TYPE_MSSQL',5);
 define ('DB_TYPE_INTERBASE',7);
 define ('DB_TYPE_OCI',8);
+define ('DB_TYPE_FIREBIRD',9);
 
 function CreateGUID(){
  srand((double)microtime()*1000000);
@@ -103,6 +104,7 @@
     $this->tlist[6] = "Sybase"; 
     $this->tlist[DB_TYPE_INTERBASE] = "Interbase"; 
     $this->tlist[DB_TYPE_OCI]       = "OracleOCI"; 
+    $this->tlist[DB_TYPE_FIREBIRD]  = "Firebird"; 
 
     $this->dbentryexist = false;
 	if (isset($dbconn->prefix)) {
@@ -162,10 +164,10 @@
 
     # First get all info from a connected database if available
 
-    if ( $obj->dbconn != -1 ) {
+    if ( is_object($obj->dbconn) ) {
       $q = "SELECT * from ". $obj->tablename ." WHERE id = ". $id;
       $r = $obj->dbconn->Exec($q,0);
-      if ( ($r != -1) && ($r->numrows() > 0) ) {
+      if ( is_object($r) && ($r->numrows() > 0) ) {
         $obj->read_result($r,0);
         $r->free();
         $obj->dbentryexist = true;
@@ -405,6 +407,12 @@
           return 1;
         }
         break;
+      case DB_TYPE_FIREBIRD:
+        # Firebird
+        if ( function_exists('ibase_connect') ) {
+          return 1;
+        }
+        break;
       case DB_TYPE_OCI:
         # Oracle OCI
         if ( function_exists('OCILogon') ) {
@@ -463,6 +471,10 @@
       # Interbase
       require_once 'db/db_interbase.pinc';
       $dbconn = new db_interbase($this);
+    } else if ( $this->type == DB_TYPE_FIREBIRD ) {
+      # Interbase
+      require_once 'db/db_firebird.pinc';
+      $dbconn = new db_firebird($this);
     } else {
       Fatal_Error("Unknown Database type for '".$this->id ."'", "Type is '". $this->type ."'");
     }
@@ -487,7 +499,7 @@
   function read_update() {
     global $tutos;
 
-    if ( $this->dbconn == -1 ) {
+    if ( is_int($this->dbconn) && $this->dbconn == -1 ) {
       Fatal_Error("no db connection","");
     }
     $x = $this->read($this->id,$this);

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- location.pinc	2 Jul 2005 15:02:17 -0000	1.78
+++ location.pinc	1 Dec 2005 21:05:14 -0000	1.79
@@ -19,7 +19,6 @@
   global $table;
 
   if (empty($obj->id))  return;
-  if ( $obj == -1 ) return; 
   if (! is_object($obj) ) return;
   if (-1 == $obj->id)   return;
   if ( $obj->rl1 == true ) return;
@@ -54,7 +53,6 @@
  */
 function read_locs_data (&$obj) {
   if (empty($obj->id))  return;
-  if ( $obj == -1 ) return; 
   if (! is_object($obj) ) return;
   if (-1 == $obj->id)   return;
 

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- permission.p3	21 Apr 2005 19:36:46 -0000	1.152
+++ permission.p3	1 Dec 2005 21:05:14 -0000	1.153
@@ -34,6 +34,7 @@
   }
 }
 
+@ini_set("session.bug_compat_warn","off");
 # use files to save session data
 @ini_set("session.save_handler","files");
 # We do that ourself

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- product_new.php	13 Aug 2005 07:47:07 -0000	1.93
+++ product_new.php	1 Dec 2005 21:05:14 -0000	1.94
@@ -129,7 +129,7 @@
            && in_array($role,$tutos['deprecated']['ProdRole']) ) {
          $old = true;
        }
-       echo "   <option" .($old ? ' class="deprecated"':''). " value=\"". $role ."\"". ($role == $this->obj->rsel1 ? " selected=\"selected\"":"") .">". myentities($lang['ProdRole'][$role]).($old ? $lang['deprecated']:'') ."</option>\n";
+       echo '   <option' .($old ? ' class="deprecated"':''). ' value="'. $role .'"'. ($role == $this->obj->rsel1 ? ' selected="selected"':'') .'>'. myentities($lang['ProdRole'][$role]).($old ? $lang['deprecated']:'') ."</option>\n";
      }
      echo "  </select>\n";
      echo " </td>\n";

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- task.pinc	30 Apr 2005 09:37:50 -0000	1.168
+++ task.pinc	1 Dec 2005 21:05:14 -0000	1.169
@@ -374,22 +374,22 @@
 
     $wid = $r->get($pos, "worker");
     $w = GetObject($this->dbconn,$wid);
-    if ( $w != -1 ) {
+    if ( is_object($w) ) {
       $this->worker[$wid] = &$w;
     }
     $this->readWorker();
 
     $cid = $r->get($pos, "creator");
     $this->creator = getObject($this->dbconn,$cid);
-    if ( $this->parent == -1 ) {
+    if ( !is_object($this->parent) ) {
       # Project not found
       $this->parent = $this->worker[$wid];
     }
-    if ( $this->parent == -1 ) {
+    if ( !is_object($this->parent) ) {
       # Project and worker  not found
       $this->parent = $this->creator;
     }
-    if ( $this->parent == -1 ) {
+    if ( !is_object($this->parent) ) {
       # Project, worker and creator not found
       $this->parent = $current_user;
     }
@@ -827,12 +827,12 @@
     $info .= "<table class=\"inner\" border=\"0\" cellspacing=\"0\" cellpadding=\"1\">";
 
     $x = $this->parent;
-    if( $x == -1 ) unset($x);
+    if( !is_object($x) ) unset($x);
     $pre = "";
     $name = "";
     while ( isset ( $x ) ) {
       $name = myentities($x->getFullName()) . $pre . $name;
-      if (isset($x->parent) && $x->parent != -1) {
+      if (isset($x->parent) && is_object($x->parent)) {
         $x = $x->parent;
       } else {
         unset($x);
@@ -1504,10 +1504,9 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if ( $obj == -1 ) return ""; 
-    if (! is_object($obj) ) return "";
-    if (! $user->feature_ok(usetaskmanagement,PERM_NEW) ) return "";
-    if (! $obj->mod_ok() ) return "";
+    if (! is_object($obj) ) return '';
+    if (! $user->feature_ok(usetaskmanagement,PERM_NEW) ) return '';
+    if (! $obj->mod_ok() ) return '';
 
     $x = array( url => "task_new.php?pid=". $obj->id,
                 confirm => false,
@@ -1529,7 +1528,6 @@
   function obj_read(&$obj) {
     global $table;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
 
     if ( isset($obj->tasklist) ) return;

Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- team.pinc	3 Apr 2005 18:31:55 -0000	1.93
+++ team.pinc	1 Dec 2005 21:05:14 -0000	1.94
@@ -625,7 +625,7 @@
    * Return Info about connected teams to a object (address/user/team)
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+
     if (! is_object($obj) ) return;
     if ( ! isset($obj->id) )  return;
 

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- timetrack.pinc	23 Jun 2005 18:27:51 -0000	1.78
+++ timetrack.pinc	1 Dec 2005 21:05:14 -0000	1.79
@@ -621,7 +621,6 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
     if ( $obj->id == -1 ) return;
     if (! $user->feature_ok(usetimetrack,PERM_NEW) ) return "";

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- user.pinc	13 Jun 2005 19:20:17 -0000	1.149
+++ user.pinc	1 Dec 2005 21:05:14 -0000	1.150
@@ -414,15 +414,15 @@
     if (isset($show[$id]) && ($show[$id] == 1) ) {
       return;
     }
-    $x = "<option value=\"".$id ."\"";
+    $x = '<option value="'.$id ."\"";
     if ( ($pre == $id) && ($multi == 0) ) {
-      $x .= " selected=\"selected\"";
+      $x .= ' selected="selected"';
     }
     else if (  ($multi == 1) && isset($pre[$id]) && ($pre[$id] != 0) ) {
-      $x .= " selected=\"selected\"";
+      $x .= ' selected="selected"';
     }
     $show[$id] = 1;
-    $x .= "> ". myentities($f) ."</option>\n";
+    $x .= '> '. myentities($f) ."</option>\n";
 
     $array[$f] = $x;
   }
@@ -442,7 +442,7 @@
     else if ( $o->getType() == "address" ) {
       $n = $o->getFullName();
 
-      $x = "<option value=\"". $pre ."\" selected=\"selected\">" . myentities($n) ."</option>\n";
+      $x = '<option value="'. $pre .'" selected="selected">' . myentities($n) ."</option>\n";
 
       if( array_key_exists($n, $parts) )
         $parts[$n] = $x;
@@ -451,7 +451,7 @@
     }
     else if ( $o->getType() == "team" ) {
       $n = $lang['Team'] ." ". $o->name;
-      $x = "<option value=\"". $pre ."\" label=\"" . myentities($o->name) ."\" selected=\"selected\">". myentities($n) ."</option>\n";
+      $x = '<option value="'. $pre .'" label="' . myentities($o->name) .'" selected="selected">'. myentities($n) ."</option>\n";
 
       $tlist[$n] = $x;
     }
@@ -486,18 +486,18 @@
       }
     }
 	$id = ereg_replace('\[\]','',$name);
-    $r = "<select id=\"". $id ."\" name=\"". $name ."\" ";
+    $r = '<select id="'. $id .'" name="'. $name .'" ';
     if ( $multi > 0 ) {
       $min = 4;
       $max = 8;
       $count = count($this->parties);
       $size  = max($min, min($count, $max));
-      $r .= " multiple=\"multiple\" size=\"". $size ."\"";
+      $r .= ' multiple="multiple" size="'. $size .'" ';
     }
     $r .=">\n";
 
     if ($any) {
-      $r .= "<option value=\"-1\">" .$lang['any'] ."</option>\n";
+      $r .= '<option value="-1">' .$lang['any'] ."</option>\n";
     }
     $r .= "\n<!-- PRE: ". $pre ." -->\n";
     $r .= "\n<!-- SIZE: ". count($this->parties) ." -->\n";
@@ -533,7 +533,7 @@
 
     if (count($rlist)) {
       if ($useOPTGROUP) {
-        $r .= "<optgroup label=\"". $lang['Participants'] ."\">\n";
+        $r .= '<optgroup label="'. $lang['Participants'] ."\">\n";
       }
       foreach ($rlist as $f) {
         $r .= $f;
@@ -543,7 +543,7 @@
       }
     }
     if ($useOPTGROUP) {
-      $r .= "<optgroup label=\"". $lang['User'] ."\">\n";
+      $r .= '<optgroup label="'. $lang['User'] ."\">\n";
     }
     @ksort($plist);
     foreach($plist as $f) {
@@ -551,7 +551,7 @@
     }
     if ($useOPTGROUP) {
       $r .= "</optgroup>\n";
-      $r .= "<optgroup label=\"". $lang['Teams'] ."\">\n";
+      $r .= '<optgroup label="'. $lang['Teams'] ."\">\n";
     }
     @ksort($tlist);
     foreach($tlist as $f) {