tutos-commits Mailing List for TUTOS

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

Modified Files:
	product_overview.php 
Log Message:
fix

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- product_overview.php	9 Jul 2008 08:26:28 -0000	1.123
+++ product_overview.php	30 Jul 2008 14:49:47 -0000	1.124
@@ -1034,7 +1034,7 @@
      }
      # custom selectors
      # get customized non textual search fields
-     $custom = get_custom_sql_select('product');
+     $custom = get_custom_sql_select('product','',$this->link1);
      foreach ($custom as $s) {
        $this->q .= $pre;
        $this->q .= $s;

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

Modified Files:
	product_ins.php 
Log Message:
fix the creator of cloned stuff


Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- product_ins.php	23 Nov 2007 05:32:14 -0000	1.65
+++ product_ins.php	23 Jul 2008 18:51:14 -0000	1.66
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2007 by Gero Kohnert
+ * Copyright 1999 - 2008 by Gero Kohnert
  * cloning option added by Michal Salaban, 2003
  *
  *  This program is free software; you can redistribute it and/or modify it 
@@ -40,6 +40,7 @@
    $p->readroles();
    $p->readTasks();
    $p->creation = new TUTOS_Date_Time();
+   $p->creator = $current_user;
    # get timestamp of beginning
    $tplstart = mktime( 0, 0, 0, $p->p_start->month, $p->p_start->day, $p->p_start->year );
    $gotourl= addurlParameter($gotourl,"tplid=". $_POST['tplid'],true);

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

Modified Files:
	ToDo 
Log Message:
update


Index: ToDo
===================================================================
RCS file: /cvsroot/tutos/tutos/ToDo,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ToDo	9 Jul 2008 08:24:45 -0000	1.52
+++ ToDo	23 Jul 2008 18:50:31 -0000	1.53
@@ -160,8 +160,12 @@
 Expenses in Freemind
 
 Search for CustomFields (Task/Projects...)
+partly done
 
 StateEngine to check allowed state transitions in objects
+
+File restore with correct former name and file type
+
 #
 #
 # EOF

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

Modified Files:
	task_overview.php custom.pinc webelements.p3 
Log Message:
more info & bugfix

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- task_overview.php	21 Jul 2008 04:39:11 -0000	1.106
+++ task_overview.php	23 Jul 2008 08:59:43 -0000	1.107
@@ -65,16 +65,17 @@
      $q .= " )";
 
      # get customized non textual search fields
-     $custom = get_custom_sql_select('task','t');
+     $custom = get_custom_sql_select('task','t',$this->link);
      foreach ($custom as $s) {
        $q .= " AND ";
-       $q .= $s;
+       $q .= $s[0];
+       $this->searchargs .= $s[1].' ';
      }
 
      # State limit
      if ($this->state != -2) {
        $q .= " AND t.status = ".$this->state;
-	 }
+     }
      # time limit
      if ($this->start->notime != 1) {
        $q .= " AND t.s_start >= ".$this->dbconn->Date($this->start);
@@ -506,48 +507,47 @@
          $this->stop = true;
        }
        $this->state = $_REQUEST['state'];
-       $this->addHidden("name",$this->state);
        if ($this->state != -2) {
          $this->searchargs .= $lang['TaskState'] .' = '. $lang['TaskStates'][$this->state].' ';
-         $this->link = addUrlParameter($this->link,'state='.$this->state);
          $_SESSION['tasksearchstate'] = $this->state;
-         $this->addHidden("state",$this->state);
        }
+       $this->addHidden("state",$this->state);
+       $this->link = addUrlParameter($this->link,'state='.$this->state);
        $this->extsearch = true;
      }
      # Timerange Start
      if ( isset($_REQUEST['start']) ) {
        $this->start->setDateTime($_REQUEST['start']);
-	   if ($this->start->notime != 1) {
+       if ($this->start->notime != 1) {
          $this->searchargs .= $lang['TaskS_Start'] .' >= '. $this->start->getDate().' ';
          $this->link = addUrlParameter($this->link,'start='.$this->start->getYYYYMMDD());
-	   }
+       }
        $_SESSION['tasksearchfrom'] = $this->start->getYYYYMMDD();
        $this->extsearch = true;
      } else {
        $this->start->setDateTimeF('start');
-	   if ($this->start->notime != 1) {
+       if ($this->start->notime != 1) {
          $this->searchargs .= $lang['TaskS_Start'] .' >= '. $this->start->getDate().' ';
          $this->link = addUrlParameter($this->link,'start='.$this->start->getYYYYMMDD());
-	   }
+       }
        $_SESSION['tasksearchfrom'] = $this->start->getYYYYMMDD();
        $this->extsearch = true;
      }
      # Timerange End
      if ( isset($_REQUEST['end']) ) {
        $this->end->setDateTime($_REQUEST['end']);
-	   if ($this->end->notime != 1) {
+       if ($this->end->notime != 1) {
          $this->searchargs .= $lang['TaskS_End'] .' < '. $this->end->getDate().'&nbsp;';
          $this->link = addUrlParameter($this->link,'end='.$this->start->getYYYYMMDD());
-	   }
+       }
        $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD();
        $this->extsearch = true;
      } else {
        $this->end->setDateTimeF('end');
-	   if ($this->end->notime != 1) {
+       if ($this->end->notime != 1) {
          $this->searchargs .= $lang['TaskS_End'] .' <= '. $this->end->getDate().'&nbsp;';
          $this->link = addUrlParameter($this->link,'end='.$this->start->getYYYYMMDD());
-	   }
+       }
        $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD();
        $this->extsearch = true;
      }
@@ -555,7 +555,7 @@
      # Worker
      if ( isset($_REQUEST['worker']) ) {
        $this->extsearch = true;
-	 }
+     }
 
      # Textual search
      if ( isset($_REQUEST['name']) ) {
@@ -608,9 +608,9 @@
 
      # menu
      $x = task::getSelectLink($this->user,$lang['Search']);
-	 if ($this->extsearch) {
+     if ($this->extsearch) {
        $x[url] = addUrlParameter($x[url],'ext=1');
-	 }
+     }
      $this->addMenu($x);
 
      // The PNG Gantt functionality, using JpGraph Tools, to be installed

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -d -r1.333 -r1.334
--- webelements.p3	22 Jul 2008 04:24:05 -0000	1.333
+++ webelements.p3	23 Jul 2008 08:59:43 -0000	1.334
@@ -69,6 +69,21 @@
   return;
 }
 
+/** 
+ * check if a lang variable is there oherwise return the key
+ */
+Function getLang($key,$index='') {
+  global $lang;
+
+  $r = $key;
+  if (isset($lang[$key])) {
+    if ($index == '') 
+      $r = $lang[$key];  
+    else
+      $r = (isset($lang[$key][$index]) ? $lang[$key][$index] : $key.$index);
+  }
+  return $r;
+}
 /**
  * Make a selection based on an language array
  */

Index: custom.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/custom.pinc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- custom.pinc	15 Jul 2008 13:09:43 -0000	1.20
+++ custom.pinc	23 Jul 2008 08:59:43 -0000	1.21
@@ -103,7 +103,7 @@
 
      $parsename = $section ."_". $ti;
      # Text
-     $x[0] = myentities(isset($lang[$tx['lang']]) ? $lang[$tx['lang']]:$tx['lang']);  
+     $x[0] = myentities(getLang($tx['lang']));
      $x[1] = '';  # Select/Search field
 
      if ($tx['ftype'] == 'SelectOne') {
@@ -121,8 +121,9 @@
  }
  /**
   * get select statements for searchable fields 
+  * (link will be expanded)
   */
- function get_custom_sql_select($section,$pre = '') {
+ function get_custom_sql_select($section,$pre = '',&$link) {
    global $table,$lang;
 
    $r = array();
@@ -138,25 +139,33 @@
 
      $parsename = $section ."_". $ti;
 
+     $l = myentities(getLang($tx['lang']));
+
      if (!isset($_REQUEST[$parsename])) continue;
 
 
      if ($tx['ftype'] == 'SelectOne') {
        $x = ' '.$pre.$ti.' in (';
        $p = '';
+       $larg = '';
+       $lpre = '';
        $out = false;
        foreach ($_REQUEST[$parsename] as $xx) {
          if ($xx == -1) $out = true;
          $x .= $p.$xx;
          $p = ',';
+         $link = addUrlParameter($link,$parsename.'[]='.$xx);
+	 $larg .= $lpre. myentities(getLang($tx['lang'].'_',$xx));
+         $lpre = ',&nbsp;';
        }
        $x .= ')';
        if ($out) continue;
-       $r[] = $x;
+       $r[] = array($x,$l .' = '.$larg);
      } else if ($tx['ftype'] == 'Boolean') {
        if ($_REQUEST[$parsename] == -1) continue; # ANY
        $x .= ' '.$pre.$ti .' = ' .$_REQUEST[$parsename];
-       $r[] = $x;
+       $r[] = array($x,$l .'='. $_REQUEST[$parsename]);
+       $link = addUrlParameter($link,$l.'='.$_REQUEST[$parsename]);
      } else {
        continue;
      }
@@ -241,7 +250,7 @@
        $sortby = '';
      }
 
-     $r .= $layout->orderHeader($sortby,myentities(isset($lang[$tx['lang']]) ? $lang[$tx['lang']]:$tx['lang']),$base);
+     $r .= $layout->orderHeader($sortby,myentities(getLang($tx['lang'])),$base);
      $layout->flds++;
    }
    return $r;
@@ -281,7 +290,7 @@
      if (!isset($x['ftype'])) $x['ftype'] = '';
      $fld = '_fld_'.$i;
      $r .= "<tr>\n";
-     $r .= $layout->showfield(myentities(isset($lang[$x['lang']]) ? $lang[$x['lang']]:$x['lang']));
+     $r .= $layout->showfield(myentities(getLang($x['lang'])));
      $r .= '  <td colspan="'.($cols-1)."\">\n";
      $r .= get_custom_field($x,$obj->$fld);
      $r .= "  </td>\n";
@@ -313,7 +322,7 @@
      $parsename = $section ."_". $i;
 
      $r .= "<tr>\n";
-     $r .= $layout->showfield(myentities(isset($lang[$x['lang']]) ? $lang[$x['lang']]:$x['lang']),$x['required']
+     $r .= $layout->showfield(myentities(getLang($x['lang'])),$x['required']
                             ,($x['ftype'] == 'Date' ? $parsename.'_d':$parsename));
      if ($x['ftype'] == 'Date') {
        $r .= ' <td colspan="'.($cols-1)."\">\n";
@@ -410,14 +419,14 @@
      } else if ($x['ftype'] == "number") {
        if (!isset($_POST[$parsename])) continue;
        if ( !checkfloat($_POST[$parsename]) ) {
-         $r .= sprintf($lang['Err0017'],isset($lang[$x['lang']]) ? $lang[$x['lang']]:$x['lang']) ."<br />";
+         $r .= sprintf($lang['Err0017'],myentities(getLang($x['lang']))) ."<br />";
        }
        $gotourl= addUrlParameter($gotourl,$parsename ."=". $_POST[$parsename],true);
        $obj->setFloatField($fld,$_POST[$parsename],$x['lang']);
      } else if ($x[type] == "float") {
        if (!isset($_POST[$parsename])) continue;
        if ( !checkfloat($_POST[$parsename]) ) {
-         $r .= sprintf($lang['Err0017'],isset($lang[$x['lang']]) ? $lang[$x['lang']]:$x['lang']) ."<br />";
+         $r .= sprintf($lang['Err0017'],myentities(getLang($x['lang']))) ."<br />";
          $gotourl = addBadField($gotourl,$parsename,true);
        }
        $gotourl= addUrlParameter($gotourl,$parsename ."=". $_POST[$parsename],true);
@@ -428,7 +437,7 @@
        $obj->setStrField($fld,StripSlashes($_POST[$parsename]),$x['lang']);
      }
      if ($x['required'] && (!isset($obj->$fld) || (trim($obj->$fld) == "")) ) {
-       $r .= sprintf($lang['Err0009'],myentities(isset($lang[$x['lang']]) ? $lang[$x['lang']]:$x['lang'])) ."<br />";
+       $r .= sprintf($lang['Err0009'],myentities(getLang($x['lang']))) ."<br />";
        $gotourl = addBadField($gotourl,$parsename,true);
      }
    }

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

Modified Files:
	task.pinc 
Log Message:
prepare

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- task.pinc	21 Jul 2008 04:39:11 -0000	1.202
+++ task.pinc	23 Jul 2008 07:36:51 -0000	1.203
@@ -1219,18 +1219,18 @@
        $x3b = round( ($max_end - $t )/$p);
 
        if ($small == 0) {
-         echo '  <td align="left" colspan="2" width="'.($w +1).'" nowrap="nowrap">';
+         echo '  <td align="left" colspan="2" width="'.($w +1).'" nowrap="nowrap"><span class="taskoverview_1">';
 
          if ( $x1a + $x1b > 0 ) {
            if ( $x1b < 0 ) {
-             echo "<img border=\"0\" height=\"". $h ."\" width=\"".( $x1a + $x1b) ."\" src=\"". $tutos['base'] ."/html/gray.png\" alt=\"\" />";
+             echo '<img border="0" height="'. $h .'" width="'.( $x1a + $x1b) .'" src="'. $tutos['base'] ."/html/gray.png\" alt=\"\" />";
            } else {
              if ( $x1a > 0 ) {
-               echo "<img border=\"0\" height=\"". $h ."\" width=\"". $x1a  ."\" src=\"". $tutos['base'] ."/html/gray.png\" alt=\"\" />";
+               echo '<img border="0" height="'. $h .'" width="'. $x1a  .'" src="'. $tutos['base'] ."/html/gray.png\" alt=\"\" />";
              }
            }
            if ( $x1b > 0 ) {
-             echo "<img border=\"0\" height=\"". $h ."\" width=\"".$x1b."\" src=\"". $tutos['base'] ."/html/white.png\" alt=\"\" />";
+             echo '<img border="0" height="'. $h .'" width="'. $x1b.'" src="'. $tutos['base'] ."/html/white.png\" alt=\"\" />";
            }
          }
          if ( $x2 == 0 )  $x2=1;
@@ -1256,7 +1256,7 @@
              }
            }
          }
-         echo "</td>\n";
+         echo "</span></td>\n";
        }
        echo '  <td valign="bottom">&nbsp;'. $this->s_end->getDate() ."&nbsp;</td>\n";
        echo "  <td>&nbsp;";

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

Modified Files:
	update.php 
Log Message:
fixes

Index: update.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/update.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- update.php	30 Dec 2007 22:23:04 -0000	1.11
+++ update.php	23 Jul 2008 07:34:14 -0000	1.12
@@ -97,27 +97,27 @@
        echo "<h3>Special update for ". $tutos[version] ." from ". $this->dbc->db->version ."</h3><br />";
        $tmpname = 'acl_temp';
        # drop temp table
-       if ($this->dbc->droptable($tmpname) == -1) {
+       if (!is_object($this->dbc->droptable($tmpname)) ) {
        }
-       if ($this->dbc->dropindex($tableidx['acl1']) == -1) {
+       if (!is_object($this->dbc->dropindex($tableidx['acl1'])) ) {
        }
-       if ($this->dbc->dropindex($tableidx['acl2']) == -1) {
+       if (!is_object($this->dbc->dropindex($tableidx['acl2'])) ) {
        }
        # rename acl
-       if ($this->dbc->renametable($table['acl'],$tmpname) == -1) {
+       if (!is_object($this->dbc->renametable($table['acl'],$tmpname)) ) {
          $updatefailed = true;
          echo "Table  not renamed:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
        }
        # create acl
-       if ($this->dbc->createtable($table['acl']) == -1) {
+       if (!is_object($this->dbc->createtable($table['acl'])) ) {
          $updatefailed = true;
          echo "Table  not created:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
        }
-       if ($this->dbc->createindex($tableidx['acl1']) == -1) {
+       if (!is_object($this->dbc->createindex($tableidx['acl1'])) ) {
          $updatefailed = true;
          echo "Index  not created:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
        }
-       if ($this->dbc->createindex($tableidx['acl2']) == -1) {
+       if (!is_object($this->dbc->createindex($tableidx['acl2'])) ) {
          $updatefailed = true;
          echo "Index  not created:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
        }

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

Modified Files:
	webelements.p3 
Log Message:
any option on top of selections


Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- webelements.p3	9 Jul 2008 08:26:30 -0000	1.332
+++ webelements.p3	22 Jul 2008 04:24:05 -0000	1.333
@@ -81,6 +81,13 @@
     $r .= ' multiple="multiple"';
   }
   $r .= '>'."\n";
+  if ( $any == true ) {
+    $r .= "<option value=\"-1\"";
+    if ( -1 == $default ) {
+      $r .= ' selected="selected" ';
+    }
+    $r .= ">". myentities($lang['any']) ."</option>\n";
+  }
   foreach ($lang[$lgname] as $f => $i) {
     if ( $f < 0 ) continue;
 
@@ -101,13 +108,6 @@
       $r .= '</option>'."\n";
     }
   }
-  if ( $any == true ) {
-    $r .= "<option value=\"-1\"";
-    if ( -1 == $default ) {
-      $r .= ' selected="selected" ';
-    }
-    $r .= ">". myentities($lang['any']) ."</option>\n";
-  }
   $r .= '</select>'."\n";
   return $r;
 }

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

Modified Files:
	bug.pinc 
Log Message:
fix


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- bug.pinc	12 Jul 2008 09:05:55 -0000	1.56
+++ bug.pinc	21 Jul 2008 04:41:23 -0000	1.57
@@ -589,7 +589,7 @@
    * set the solver
    */
   function setSolver(&$solver) {
-    if ($solver == 'auto') {
+    if (!is_object($solver) && ($solver == 'auto') ) {
       # set default
       if ( $this->parent->getType() == "product" ) {
         $this->parent->readroles();

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

Modified Files:
	task.pinc task_overview.php 
Log Message:
task overview : making better and more simple

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- task_overview.php	15 Jul 2008 04:34:52 -0000	1.105
+++ task_overview.php	21 Jul 2008 04:39:11 -0000	1.106
@@ -89,6 +89,8 @@
        if (is_object($wobj)) {
          $q .= " AND (( w.w_id = ".$w." AND w.t_id = t.id) OR (t.p_id=". $w."))";
          $this->searchargs .= $lang['TaskWorker'] .' = '. $wobj->getLink() .' ';
+         $this->link = addUrlParameter($this->link,'worker[]='.$wobj->id);
+         $_SESSION['tasksearchworker'][] = $wobj->id;
        }
      }
      $q .= " ORDER by t.s_start";
@@ -111,7 +113,7 @@
        $this->parent->min_start->setDateTimeTS($min_start);
        $this->parent->max_end->setDateTimeTS($max_end);
      }
-#     echo $n .' '.$q .'<br>';
+#     echo $n .' '.$q .' '.$this->link.'<br>';
 #     echo count($this->parent->tasklist) .'<br>';
    }
    /**
@@ -176,53 +178,14 @@
        $this->end   = $this->parent->max_end;
      }
 
-     /* We add some date selection */     
-     echo "<p align=\"center\" />\n";
-     echo $this->DataTableStart();
 
-     echo " <tr>\n";
-     echo $this->showfieldc($lang['StartDate'],0,"start_d");
-     echo "  <td colspan=\"3\">\n";
-     echo $this->start->EnterDate("start",1);
-     echo "  </td>\n";
-#die("XXX");
-     echo "  <td align=\"center\" rowspan=\"2\">";
-     echo "&nbsp;&nbsp;<input type=\"text\" value=\"". myentities($this->search) ."\" name=\"name\" size=\"30\" maxlength=\"50\"".
-          " title=\"". $lang['SearchForTask'] ." (". $lang['TaskDesc'] ."/". $lang['TaskNumber'] .")\" />";
-     echo "</td>\n";
-     
-     echo "  <td align=\"center\" rowspan=\"2\">";
-     echo "<input type=\"submit\" value=\"". $lang['Search'] ."\" />";
-     echo "</td>\n";
-     
-     echo "  <td align=\"center\" rowspan=\"2\">&nbsp;&nbsp;&nbsp;&nbsp;(";
-     $l = "task_overview.php";
-     if ( isset($_REQUEST['id']) ) {
-       $l = addUrlParameter($l,'id='.$_REQUEST['id']);
-     }
-     if ( isset($_REQUEST['fld']) ) {
-       $l = addUrlParameter($l,'fld='.$_REQUEST['fld']);
-     }
      if ( $this->small == 0 ) {
-       $l = addUrlParameter($l,'small=1');
+       $l = addUrlParameter($this->link,'small=1');
        echo makelink($l,$lang['TaskViewSmall']);
      } else {
-       $l = addUrlParameter($l,'small=0');
+       $l = addUrlParameter($this->link,'small=0');
        echo makelink($l,$lang['TaskViewNormal']);
      }
-     echo ")</td>\n";
-     echo " </tr>\n";
-
-     echo " <tr>\n";
-     echo $this->showfieldc($lang['EndDate'],0,"end_d");
-     echo "  <td colspan=\"3\">\n";
-     echo $this->end->EnterDate("end",1);
-     echo "  </td>\n";
-     echo " </tr>\n";
-     
-     echo $this->DataTableEnd();
-
-     echo "<p />\n";
 
      # The main display part
      if ( $this->small == 0 ) {
@@ -522,9 +485,12 @@
      $this->end = new TUTOS_Date_Time(0);
      $this->search = "";
      $this->searchargs = ""; # textual info about search
-     $this->state = 0;
+     $this->state = -2;
      $this->worker = -1;
      $this->parent = -1;
+     $this->small = 0;
+     $this->extsearch = false;
+	 $this->link = 'task_overview.php';
 
      if ( ! $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
        $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
@@ -543,32 +509,63 @@
        $this->addHidden("name",$this->state);
        if ($this->state != -2) {
          $this->searchargs .= $lang['TaskState'] .' = '. $lang['TaskStates'][$this->state].'&nbsp;';
+         $this->link = addUrlParameter($this->link,'state='.$this->state);
+         $_SESSION['tasksearchstate'] = $this->state;
+         $this->addHidden("state",$this->state);
        }
+       $this->extsearch = true;
      }
      # Timerange Start
      if ( isset($_REQUEST['start']) ) {
        $this->start->setDateTime($_REQUEST['start']);
-       $this->searchargs .= $lang['TaskS_Start'] .' >= '. $this->start->getDate().'&nbsp;';
+	   if ($this->start->notime != 1) {
+         $this->searchargs .= $lang['TaskS_Start'] .' >= '. $this->start->getDate().'&nbsp;';
+         $this->link = addUrlParameter($this->link,'start='.$this->start->getYYYYMMDD());
+	   }
+       $_SESSION['tasksearchfrom'] = $this->start->getYYYYMMDD();
+       $this->extsearch = true;
      } else {
        $this->start->setDateTimeF('start');
+	   if ($this->start->notime != 1) {
+         $this->searchargs .= $lang['TaskS_Start'] .' >= '. $this->start->getDate().'&nbsp;';
+         $this->link = addUrlParameter($this->link,'start='.$this->start->getYYYYMMDD());
+	   }
        $_SESSION['tasksearchfrom'] = $this->start->getYYYYMMDD();
-       $this->searchargs .= $lang['TaskS_Start'] .' >= '. $this->start->getDate().'&nbsp;';
+       $this->extsearch = true;
      }
      # Timerange End
      if ( isset($_REQUEST['end']) ) {
        $this->end->setDateTime($_REQUEST['end']);
-       $this->searchargs .= $lang['TaskS_End'] .' < '. $this->end->getDate().'&nbsp;';
+	   if ($this->end->notime != 1) {
+         $this->searchargs .= $lang['TaskS_End'] .' < '. $this->end->getDate().'&nbsp;';
+         $this->link = addUrlParameter($this->link,'end='.$this->start->getYYYYMMDD());
+	   }
+       $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD();
+       $this->extsearch = true;
      } else {
        $this->end->setDateTimeF('end');
+	   if ($this->end->notime != 1) {
+         $this->searchargs .= $lang['TaskS_End'] .' <= '. $this->end->getDate().'&nbsp;';
+         $this->link = addUrlParameter($this->link,'end='.$this->start->getYYYYMMDD());
+	   }
        $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD();
-       $this->searchargs .= $lang['TaskS_End'] .' <= '. $this->end->getDate().'&nbsp;';
+       $this->extsearch = true;
      }
 
+     # Worker
+     if ( isset($_REQUEST['worker']) ) {
+       $this->extsearch = true;
+	 }
 
-     # Worker     
-#     if ( isset($_REQUEST['worker']) && ($_REQUEST['worker'] != -1) ) {
-#       $_REQUEST['id'] = $_REQUEST['worker'];
-#     }
+     # Textual search
+     if ( isset($_REQUEST['name']) ) {
+       $this->search = $_REQUEST['name'];
+       $this->addHidden("name",$this->search);
+       $this->link = addUrlParameter($this->link,'name='.$this->search);
+       $_SESSION['tasksearch'] = $this->search;
+	 }
+
+     # Call via other object
      if ( isset($_REQUEST['id']) ) {
        # We show everything that belongs to id (no other filter apply)
        if (false == is_numeric($_REQUEST['id'])) {
@@ -582,6 +579,7 @@
          $this->stop = true;
          return;
        }
+       $this->link = addUrlParameter($this->link,'id='.$this->parent->id);
        if (! $this->parent->see_ok()) {
          $msg .= sprintf($lang['Err0022'],"'".$this->parent->getFullName()."'");
          $this->stop = true;
@@ -597,21 +595,11 @@
        
        $x = task::getaddlink($this->user,$this->parent,$lang['NewEntry']);
        $this->addMenu($x);
-       
-       if ( (isset($_REQUEST['name'])) && ($_REQUEST['name'] != '') ) {
-         $this->search = $_REQUEST['name'];
-         $this->parent = new tutos_base($this->dbconn);
-         #$this->fld = "worker";
-         $this->select_by_name();
-         #$this->addHidden("name",$this->search);
-       }
      } else if ( isset($_REQUEST['name']) ) {
        # Classical Search
-       $this->search = $_REQUEST['name'];
        $this->parent = new tutos_base($this->dbconn);
        $this->fld = "worker";
        $this->select_by_name();
-       #$this->addHidden("name",$this->search);
      } else {
        $this->parent = new tutos_base($this->dbconn);
        $this->parent->min_start = new TUTOS_Date_Time();
@@ -619,9 +607,14 @@
      }
 
      # menu
+     $x = task::getSelectLink($this->user,$lang['Search']);
+	 if ($this->extsearch) {
+       $x[url] = addUrlParameter($x[url],'ext=1');
+	 }
+     $this->addMenu($x);
 
      // The PNG Gantt functionality, using JpGraph Tools, to be installed
-     if( $tutos[usejpgraph] ) {
+     if( $tutos[usejpgraph] && ($this->parent->id != -1) ) {
        $x = array( url => "task_gantt.php?id=". $this->parent->id,
                    text => $lang['TaskGantt'],
                    info => $lang['TaskGantt'],
@@ -630,7 +623,7 @@
        $this->addMenu($x);
      }
 
-     if( is_object($this->parent) && ($this->search == "") && $this->parent->getType() !=  "address" ) {
+     if( ($this->parent->id > 0) && ($this->search == "") && $this->parent->getType() !=  "address" ) {
        $x = array( url =>  "task_overview.php?id=".$this->parent->id, 
                    info => ($this->parent->id != -1 ? sprintf($lang['TaskOverviewInfo'],$this->parent->getFullName()):$lang['TaskOverview']),
                    category => array("task","view")
@@ -654,8 +647,6 @@
               
      if ( isset($_REQUEST['small']) ) {
        $this->small = $_REQUEST['small'];
-     } else {
-       $this->small = 0;
      }
      $this->addHidden("small",$this->small);
    }

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- task.pinc	15 Jul 2008 04:07:22 -0000	1.201
+++ task.pinc	21 Jul 2008 04:39:11 -0000	1.202
@@ -1268,11 +1268,11 @@
        # Info about connected docs and bugs
        if ($tutos[task_show_fileinfo] == 1) {
          tutos_file::obj_read($this);
-         echo '<td>'.tutos_file::summary($this).'</td>';
+         echo '<td>'.tutos_file::summary($this).'&nbsp;</td>';
        }
        if ($tutos[task_show_buginfo] == 1) {
          bug::obj_read($this);
-         echo '<td>'.bug::summary($this).'</td>';
+         echo '<td>'.bug::summary($this).'&nbsp;</td>';
        }
 
        # Custom fields

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

Modified Files:
	bug_show.php 
Log Message:
fix. wrap old history entries. new ones will be stored wrapped


Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- bug_show.php	4 Apr 2007 19:14:35 -0000	1.24
+++ bug_show.php	17 Jul 2008 14:50:49 -0000	1.25
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 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   
@@ -118,7 +118,7 @@
      echo "</tr><tr>\n";
      echo $this->showfield($lang['BugHistory']);
      echo " <td class=\"pre\" colspan=\"3\">";
-     echo $this->obj->getBugHistory(true);
+     echo wordwrap($this->obj->getBugHistory(true),90);# wrap only neccessary for old info/ new info is already wrapped
      echo "</td></tr>\n";
      #
      # Show additional custom fields

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

Modified Files:
	custom.pinc 
Log Message:
fix

Index: custom.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/custom.pinc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- custom.pinc	10 Jul 2008 11:49:12 -0000	1.19
+++ custom.pinc	15 Jul 2008 13:09:43 -0000	1.20
@@ -255,7 +255,8 @@
    $r ='';
    foreach(get_custom_overview_fields(&$layout,$section) as $ti => $tx) {
      $f = '_fld_'.$ti;
-     $r .= ' <td>'.get_custom_field($tx,$obj->$f) .'</td>'."\n";
+     $d = get_custom_field($tx,$obj->$f);
+     $r .= ' <td>'.($d != '' ? $d:'&nbsp;').'</td>'."\n";
    }
    return $r;
  }

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

Modified Files:
	task_overview.php 
Log Message:
fix the fix :-((

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- task_overview.php	15 Jul 2008 04:07:22 -0000	1.104
+++ task_overview.php	15 Jul 2008 04:34:52 -0000	1.105
@@ -73,7 +73,7 @@
 
      # State limit
      if ($this->state != -2) {
-       $q .= " AND t.state = ".$this->state;
+       $q .= " AND t.status = ".$this->state;
 	 }
      # time limit
      if ($this->start->notime != 1) {
@@ -664,4 +664,4 @@
  $l = new task_overview($current_user);
  $l->display();
  $dbconn->Close();
-?>
\ No newline at end of file
+?>

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

Modified Files:
	task.pinc task_overview.php 
Log Message:
more fix

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- task_overview.php	13 Jul 2008 11:21:06 -0000	1.103
+++ task_overview.php	15 Jul 2008 04:07:22 -0000	1.104
@@ -71,23 +71,27 @@
        $q .= $s;
      }
 
+     # State limit
+     if ($this->state != -2) {
+       $q .= " AND t.state = ".$this->state;
+	 }
      # time limit
      if ($this->start->notime != 1) {
-       $q .= " AND s_start >= ".$this->dbconn->Date($this->start);
+       $q .= " AND t.s_start >= ".$this->dbconn->Date($this->start);
      }
      if ($this->end->notime != 1) {
-       $q .= " AND s_end <= ".$this->dbconn->Date($this->end);
+       $q .= " AND t.s_end <= ".$this->dbconn->Date($this->end);
      }
 
      if ( isset($_REQUEST['worker']) && is_numeric($_REQUEST['worker']) && ($_REQUEST['worker'] != -1)  ) {
        $w = $_REQUEST['worker'];
        $wobj = getObject($this->dbconn,$w);
        if (is_object($wobj)) {
-         $q .= " AND (( w.w_id = ".$w." AND w.t_id = t.id) OR (p_id=". $w."))";
+         $q .= " AND (( w.w_id = ".$w." AND w.t_id = t.id) OR (t.p_id=". $w."))";
          $this->searchargs .= $lang['TaskWorker'] .' = '. $wobj->getLink() .'&nbsp;';
        }
      }
-     $q .= " ORDER by s_start";
+     $q .= " ORDER by t.s_start";
      $r = $this->dbconn->Exec($q);
      $n = $r->numrows();
      $a = 0;

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- task.pinc	14 Jul 2008 19:32:21 -0000	1.200
+++ task.pinc	15 Jul 2008 04:07:22 -0000	1.201
@@ -1298,7 +1298,7 @@
        echo $layout->OverviewRowEnd($layout->line++);
      } else {
 # skipped by timerange
-echo "skip ". $slimit->getDate() . $elimit->getDate();
+#echo "skip ". $slimit->getDate() . $elimit->getDate();
      }
 
      if ( $recursive ) {

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

Modified Files:
	task.pinc 
Log Message:
fix

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- task.pinc	10 Jul 2008 10:22:31 -0000	1.199
+++ task.pinc	14 Jul 2008 19:32:21 -0000	1.200
@@ -1082,12 +1082,20 @@
      if (($s_end->notime == 1) && $this->s_start->notime != 1 ) {
        $s_end = $this->s_start;
      }
+
+     if (is_numeric($slimit) && $slimit == 0) {
+       $slimit = new TUTOS_Date_Time();
+       $slimit->ts = $s_start->ts;
+     }
+     if (is_numeric($elimit) && $elimit == 0) {
+       $elimit = new TUTOS_Date_Time();
+       $elimit->ts = $s_end->ts;
+     }
+
      /* we limit the date range of printed tasks */
-     if( (is_numeric($slimit) && $slimit == 0 && is_numeric($elimit) && $elimit == 0)
-      || (is_object($slimit) && is_object($elimit) 
-         && $slimit->datecmp($this->s_start) <= 0
-         && ($elimit->datecmp($slimit) == 0
-         || $elimit->datecmp($this->s_end) >= 0) )) {
+     if(  ($this->s_start->ts  >= $slimit->ts) || 
+          ($this->s_end->ts  <= $elimit->ts) 
+      ) {
 
        $c = $this->getcompletion();
 
@@ -1288,6 +1296,9 @@
        }
        echo "&nbsp;</td>\n";
        echo $layout->OverviewRowEnd($layout->line++);
+     } else {
+# skipped by timerange
+echo "skip ". $slimit->getDate() . $elimit->getDate();
      }
 
      if ( $recursive ) {

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

Modified Files:
	foot1.html 
Log Message:
check


Index: foot1.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/foot1.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- foot1.html	4 May 2007 08:35:33 -0000	1.8
+++ foot1.html	13 Jul 2008 13:05:15 -0000	1.9
@@ -35,5 +35,7 @@
 <!--#echo var="DOCUMENT_NAME" --> was last modified on <!--#echo var="LAST_MODIFIED" --> 
 </font>
 </address>
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+<script type="text/javascript"> _uacct = "UA-3151057-1"; urchinTracker(); </script>
 </body>
 </html>

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

Modified Files:
	task_overview.php 
Log Message:
fixed and new info about filter


Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- task_overview.php	10 Jul 2008 11:49:16 -0000	1.102
+++ task_overview.php	13 Jul 2008 11:21:06 -0000	1.103
@@ -32,6 +32,8 @@
     * free search
     */
    function select_by_name() {
+     global $lang;
+    
      $this->parent->min_start = new TUTOS_Date_Time();
      $this->parent->max_end = new TUTOS_Date_Time(0);
      $this->parent->sum['volume'] = 0.0;
@@ -69,8 +71,21 @@
        $q .= $s;
      }
 
+     # time limit
+     if ($this->start->notime != 1) {
+       $q .= " AND s_start >= ".$this->dbconn->Date($this->start);
+     }
+     if ($this->end->notime != 1) {
+       $q .= " AND s_end <= ".$this->dbconn->Date($this->end);
+     }
+
      if ( isset($_REQUEST['worker']) && is_numeric($_REQUEST['worker']) && ($_REQUEST['worker'] != -1)  ) {
-       $q .= " AND (( w.w_id = ".$_REQUEST['worker']." AND w.t_id = t.id) OR (p_id=". $_REQUEST['worker']."))";
+       $w = $_REQUEST['worker'];
+       $wobj = getObject($this->dbconn,$w);
+       if (is_object($wobj)) {
+         $q .= " AND (( w.w_id = ".$w." AND w.t_id = t.id) OR (p_id=". $w."))";
+         $this->searchargs .= $lang['TaskWorker'] .' = '. $wobj->getLink() .'&nbsp;';
+       }
      }
      $q .= " ORDER by s_start";
      $r = $this->dbconn->Exec($q);
@@ -235,6 +250,9 @@
        echo ' '. $lang['forphrase'] .' ';
        echo '"'. $this->search .'"';
      }
+     if ($this->searchargs != "") {
+       echo '<br />'. $this->searchargs;
+     }
      echo "</th>\n";
      echo " </tr>\n";
 
@@ -298,7 +316,7 @@
        $skipped += $this->parent->printRow($this,0,$this->small,$this->parent,$this->fld, $this->start, $this->end);
      } else {
        foreach ($this->parent->tasklist as $i => $f) {
-#	 echo 'XXX '.$this->start->getDateTime().' '.$this->end->getDateTime().'<br>';
+#    echo 'XXX '.$this->start->getDateTime().' '.$this->end->getDateTime().'<br>';
          $skipped += $this->parent->tasklist[$i]->printRow($this,0,$this->small,$this->parent,$this->fld, $this->start, $this->end);
          $a++;
        }
@@ -499,6 +517,7 @@
      $this->start = new TUTOS_Date_Time(0);
      $this->end = new TUTOS_Date_Time(0);
      $this->search = "";
+     $this->searchargs = ""; # textual info about search
      $this->state = 0;
      $this->worker = -1;
      $this->parent = -1;
@@ -518,14 +537,36 @@
        }
        $this->state = $_REQUEST['state'];
        $this->addHidden("name",$this->state);
+       if ($this->state != -2) {
+         $this->searchargs .= $lang['TaskState'] .' = '. $lang['TaskStates'][$this->state].'&nbsp;';
+       }
      }
+     # Timerange Start
+     if ( isset($_REQUEST['start']) ) {
+       $this->start->setDateTime($_REQUEST['start']);
+       $this->searchargs .= $lang['TaskS_Start'] .' >= '. $this->start->getDate().'&nbsp;';
+     } else {
+       $this->start->setDateTimeF('start');
+       $_SESSION['tasksearchfrom'] = $this->start->getYYYYMMDD();
+       $this->searchargs .= $lang['TaskS_Start'] .' >= '. $this->start->getDate().'&nbsp;';
+     }
+     # Timerange End
+     if ( isset($_REQUEST['end']) ) {
+       $this->end->setDateTime($_REQUEST['end']);
+       $this->searchargs .= $lang['TaskS_End'] .' < '. $this->end->getDate().'&nbsp;';
+     } else {
+       $this->end->setDateTimeF('end');
+       $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD();
+       $this->searchargs .= $lang['TaskS_End'] .' <= '. $this->end->getDate().'&nbsp;';
+     }
+
 
      # Worker     
 #     if ( isset($_REQUEST['worker']) && ($_REQUEST['worker'] != -1) ) {
 #       $_REQUEST['id'] = $_REQUEST['worker'];
 #     }
      if ( isset($_REQUEST['id']) ) {
-       # We show everything that belongs to id (no other filter apply
+       # We show everything that belongs to id (no other filter apply)
        if (false == is_numeric($_REQUEST['id'])) {
          $msg .= sprintf($lang['Err0012'],"id",$_REQUEST['id']);
          $this->stop = true;
@@ -573,24 +614,6 @@
        $this->parent->max_end = new TUTOS_Date_Time(0);
      }
 
-     # Timerange Start
-     if ( isset($_REQUEST['start']) ) {
-       $this->start->setDateTime($_REQUEST['start']);
-     } else {
-       if( isset($_REQUEST['start_d']) ) {
-         $this->start->setDateTimeF('start');
-         $_SESSION['tasksearchfrom'] = $this->start->getYYYYMMDD();
-       }
-     }
-     # Timerange End
-     if ( isset($_REQUEST['end']) ) {
-       $this->end->setDateTime($_REQUEST['end']);
-     } else {
-       if( isset($_REQUEST['end_d']) ) {
-         $this->end->setDateTimeF('end');
-         $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD();
-       }
-     }
      # menu
 
      // The PNG Gantt functionality, using JpGraph Tools, to be installed
@@ -637,4 +660,4 @@
  $l = new task_overview($current_user);
  $l->display();
  $dbconn->Close();
-?>
+?>
\ No newline at end of file

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

Modified Files:
	bug.pinc 
Log Message:
border for long popups


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- bug.pinc	9 Jul 2008 09:10:44 -0000	1.55
+++ bug.pinc	12 Jul 2008 09:05:55 -0000	1.56
@@ -484,8 +484,10 @@
 
     if (!isset($tutos['bug_long_pop']) || ($tutos['bug_long_pop'] == false) ) {
       $n =str_replace("\n","<br />",myentities(wordwrap($this->short,80)));
+      $border = 0;
     } else {
       $n = str_replace("\n","<br />",$this->getBugHistory(false));
+      $border = 1;
     }
     $n =str_replace("\r","",$n);
     $n =str_replace("\\","\\\\",$n);
@@ -498,7 +500,7 @@
     $info = '';
     $info .= '<html>';
     $info .= '<body>';
-    $info .= '<table class="inner" border="0" cellspacing="0" cellpadding="1">';
+    $info .= '<table class="inner" border="'. $border .'" cellspacing="0" cellpadding="1">';
     $info .= '<tr><th>'. $lang[$this->getType()] .' '. $t  .'</th></tr>';
     $info .= '<tr><td><font size="-1"><pre>';
     $info .= $n;
@@ -1246,4 +1248,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

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

Modified Files:
	bug_ins.php 
Log Message:
wrap flowing text to 60 chars (better for popups)


Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- bug_ins.php	13 Jun 2008 19:54:31 -0000	1.23
+++ bug_ins.php	10 Jul 2008 15:43:36 -0000	1.24
@@ -163,7 +163,7 @@
  if ( $b->id > 0 )  {
    $newlines = "";
    if ( !empty($description) ) {
-     $newlines =  myentities($description);
+     $newlines =  myentities(wordwrap($description,60));
    }
    #
    # Solver Change
@@ -230,7 +230,7 @@
    # New Bug
    #
    $b->bughist[0] = new bugdata($dbconn);
-   $b->bughist[0]->description = myentities($description);
+   $b->bughist[0]->description = myentities(wordwrap($description,60));
 
    if ( $b->parent->getType() == "product" ) {
      $b->setSolver($solver);

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

Modified Files:
	custom.pinc task_overview.php 
Log Message:
custom search for Booleans

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- task_overview.php	10 Jul 2008 11:00:32 -0000	1.101
+++ task_overview.php	10 Jul 2008 11:49:16 -0000	1.102
@@ -511,7 +511,7 @@
 
      # State
      if ( isset($_REQUEST['state']) ) {
-       $tutos[task_skip_finished] == 0; # no need/sense when selecting state
+       $tutos[task_skip_finished] = 0; # no need/sense when selecting state
        if (false == is_numeric($_REQUEST['state'])) {
          $msg .= sprintf($lang['Err0012'],"state",$_REQUEST['state']);
          $this->stop = true;

Index: custom.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/custom.pinc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- custom.pinc	9 Jul 2008 08:26:28 -0000	1.18
+++ custom.pinc	10 Jul 2008 11:49:12 -0000	1.19
@@ -108,6 +108,10 @@
 
      if ($tx['ftype'] == 'SelectOne') {
        $x[1] .= SelectLangArray($parsename.'[]',$tx['lang'].'_',-1,true,0,true);
+     } else if ($tx['ftype'] == 'Boolean') {
+       $x[1] .= '<input id="'.$parsename.'_yes" name="'. $parsename .'" value="1" type="radio">'.$lang['yes'].'&nbsp;</input>';
+       $x[1] .= '<input id="'.$parsename.'_no" name="'. $parsename .'" value="0" type="radio">'.$lang['no'].'&nbsp;</input>';
+       $x[1] .= '<input id="'.$parsename.'_any" name="'. $parsename .'" value="-1" type="radio">'.$lang['any'].'&nbsp;</input>';
      } else {
        continue;
      }
@@ -123,6 +127,8 @@
 
    $r = array();
 
+   if ($pre != '') $pre = $pre.'.';
+
    foreach($table[$section] as $ti => $tx) {
      if (!is_array($tx)) continue;
      if (!isset($tx['custom'])) continue;
@@ -134,21 +140,23 @@
 
      if (!isset($_REQUEST[$parsename])) continue;
 
-     if ($pre != '') $pre = $pre.'.';
 
      if ($tx['ftype'] == 'SelectOne') {
-#       $parsename .= '[]';
        $x = ' '.$pre.$ti.' in (';
-       $pre = '';
+       $p = '';
        $out = false;
        foreach ($_REQUEST[$parsename] as $xx) {
-	     if ($xx == -1) $out = true;
-         $x .= $pre.$xx;
-         $pre = ',';
+         if ($xx == -1) $out = true;
+         $x .= $p.$xx;
+         $p = ',';
        }
        $x .= ')';
        if ($out) continue;
        $r[] = $x;
+     } else if ($tx['ftype'] == 'Boolean') {
+       if ($_REQUEST[$parsename] == -1) continue; # ANY
+       $x .= ' '.$pre.$ti .' = ' .$_REQUEST[$parsename];
+       $r[] = $x;
      } else {
        continue;
      }

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

Modified Files:
	task_overview.php 
Log Message:
fix


Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- task_overview.php	10 Jul 2008 10:22:31 -0000	1.100
+++ task_overview.php	10 Jul 2008 11:00:32 -0000	1.101
@@ -509,6 +509,17 @@
      }
 
 
+     # State
+     if ( isset($_REQUEST['state']) ) {
+       $tutos[task_skip_finished] == 0; # no need/sense when selecting state
+       if (false == is_numeric($_REQUEST['state'])) {
+         $msg .= sprintf($lang['Err0012'],"state",$_REQUEST['state']);
+         $this->stop = true;
+       }
+       $this->state = $_REQUEST['state'];
+       $this->addHidden("name",$this->state);
+     }
+
      # Worker     
 #     if ( isset($_REQUEST['worker']) && ($_REQUEST['worker'] != -1) ) {
 #       $_REQUEST['id'] = $_REQUEST['worker'];
@@ -561,16 +572,6 @@
        $this->parent->min_start = new TUTOS_Date_Time();
        $this->parent->max_end = new TUTOS_Date_Time(0);
      }
-     # State
-     if ( isset($_REQUEST['state']) ) {
-       $tutos[task_skip_finished] == 0; # no need/sense when selecting state
-       if (false == is_numeric($_REQUEST['state'])) {
-         $msg .= sprintf($lang['Err0012'],"state",$_REQUEST['state']);
-         $this->stop = true;
-       }
-       $this->state = $_REQUEST['state'];
-       $this->addHidden("name",$this->state);
-     }
 
      # Timerange Start
      if ( isset($_REQUEST['start']) ) {

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

Modified Files:
	task.pinc task_overview.php 
Log Message:
fixes for task overview

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- task_overview.php	9 Jul 2008 08:42:19 -0000	1.99
+++ task_overview.php	10 Jul 2008 10:22:31 -0000	1.100
@@ -41,9 +41,11 @@
      $min_start = $this->parent->min_start->ts;
 
      $q = "SELECT t.* from ". $this->dbconn->prefix ."tasks t";
-     if ( isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ) {
+     if ( isset($_REQUEST['worker']) && is_numeric($_REQUEST['worker']) && ($_REQUEST['worker'] != -1)  ) {
        $q .= ", ". $this->dbconn->prefix ."taskworker w ";
      }
+#     if ( isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ) {
+#     }
      $q .= " WHERE (";
      $q .= $this->dbconn->like("t.name", $this->search);
      $q .= " OR ";
@@ -67,15 +69,14 @@
        $q .= $s;
      }
 
-     if ( isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ) {
-       $q .= " AND (( w.w_id = ".$_REQUEST['id']." AND w.t_id = t.id) OR (p_id=". $_REQUEST['id']."))";
+     if ( isset($_REQUEST['worker']) && is_numeric($_REQUEST['worker']) && ($_REQUEST['worker'] != -1)  ) {
+       $q .= " AND (( w.w_id = ".$_REQUEST['worker']." AND w.t_id = t.id) OR (p_id=". $_REQUEST['worker']."))";
      }
      $q .= " ORDER by s_start";
      $r = $this->dbconn->Exec($q);
      $n = $r->numrows();
      $a = 0;
 #    die ($q);
-#    echo $q;
      while ($a < $n) {
        $t = new task($this->dbconn);
        $t->read_result($r,$a);
@@ -88,9 +89,11 @@
        $this->parent->sum['volume_done'] += $t->timetracksum;
        $this->parent->sum['volume'] += $t->volume;
        unset($t);
+       $this->parent->min_start->setDateTimeTS($min_start);
+       $this->parent->max_end->setDateTimeTS($max_end);
      }
-     $this->parent->min_start->setDateTimeTS($min_start);
-     $this->parent->max_end->setDateTimeTS($max_end);
+#     echo $n .' '.$q .'<br>';
+#     echo count($this->parent->tasklist) .'<br>';
    }
    /**
     * display the info
@@ -223,10 +226,13 @@
      echo " <thead>\n";
 
      echo " <tr>\n";
-     echo '  <th colspan="'. $cols .'" width="100%">'. $lang['TaskOverview'] .' '. $lang['forphrase'] .' ';
-     if ($this->search == "") {
+     echo '  <th colspan="'. $cols .'" width="100%">';
+     echo  $lang['TaskOverview'];
+     if ( ($this->search == "") && ($this->parent->getType() != 'base') ) {
+       echo ' '. $lang['forphrase'] .' ';
        echo menulink($this->parent->getURL(),myentities($this->parent->getFullName()));
-     } else {
+     } else if ($this->search != ''){
+       echo ' '. $lang['forphrase'] .' ';
        echo '"'. $this->search .'"';
      }
      echo "</th>\n";
@@ -292,6 +298,7 @@
        $skipped += $this->parent->printRow($this,0,$this->small,$this->parent,$this->fld, $this->start, $this->end);
      } else {
        foreach ($this->parent->tasklist as $i => $f) {
+#	 echo 'XXX '.$this->start->getDateTime().' '.$this->end->getDateTime().'<br>';
          $skipped += $this->parent->tasklist[$i]->printRow($this,0,$this->small,$this->parent,$this->fld, $this->start, $this->end);
          $a++;
        }
@@ -503,10 +510,11 @@
 
 
      # Worker     
-     if ( isset($_REQUEST['worker']) && ($_REQUEST['worker'] != -1) ) {
-       $_REQUEST['id'] = $_REQUEST['worker'];
-     }
+#     if ( isset($_REQUEST['worker']) && ($_REQUEST['worker'] != -1) ) {
+#       $_REQUEST['id'] = $_REQUEST['worker'];
+#     }
      if ( isset($_REQUEST['id']) ) {
+       # We show everything that belongs to id (no other filter apply
        if (false == is_numeric($_REQUEST['id'])) {
          $msg .= sprintf($lang['Err0012'],"id",$_REQUEST['id']);
          $this->stop = true;
@@ -541,7 +549,7 @@
          $this->select_by_name();
          #$this->addHidden("name",$this->search);
        }
-     } else if ( isset($_REQUEST['name'])) {
+     } else if ( isset($_REQUEST['name']) ) {
        # Classical Search
        $this->search = $_REQUEST['name'];
        $this->parent = new tutos_base($this->dbconn);
@@ -555,6 +563,7 @@
      }
      # State
      if ( isset($_REQUEST['state']) ) {
+       $tutos[task_skip_finished] == 0; # no need/sense when selecting state
        if (false == is_numeric($_REQUEST['state'])) {
          $msg .= sprintf($lang['Err0012'],"state",$_REQUEST['state']);
          $this->stop = true;

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- task.pinc	19 May 2008 13:30:43 -0000	1.198
+++ task.pinc	10 Jul 2008 10:22:31 -0000	1.199
@@ -1082,7 +1082,6 @@
      if (($s_end->notime == 1) && $this->s_start->notime != 1 ) {
        $s_end = $this->s_start;
      }
-
      /* we limit the date range of printed tasks */
      if( (is_numeric($slimit) && $slimit == 0 && is_numeric($elimit) && $elimit == 0)
       || (is_object($slimit) && is_object($elimit) 
@@ -1172,9 +1171,9 @@
        } // end of switch $parent->getType()
 
        // I have some strange bug where I reach non existing entities.
-       if( $this->getLink() == "" )
+       if( $this->getLink() == "" ) {
          return 0;
-
+       }
        // When displaying an address time overview, we have to compute
        // the volume done by the $parent address !
        if( $parent->getType() == "address" ) {

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

Modified Files:
	bug.pinc mconfig.pinc 
Log Message:
new long popup feature for bugs (enabled by $tutos['bug_long_pop'])



Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- bug.pinc	13 Jun 2008 19:54:31 -0000	1.54
+++ bug.pinc	9 Jul 2008 09:10:44 -0000	1.55
@@ -364,12 +364,12 @@
         } else {
           $msg .= '&nbsp;<i>'. $lang['HistoryDeleted'] ."</i><br />\n";
         }
-        $msg .= "<pre>\n". wordwrap(urlReplace($i->description,0),80) ."\n</pre>\n";
+        $msg .= "<pre>\n". urlReplace($i->description,0) ."\n</pre>\n";
         $sep = '<hr noshade size="1">';
       } else {
         $msg .= $sep. $i->creation->getDateTime();
         $msg .= " ". $i->creator->getFullName() ."\n";
-        $msg .= wordwrap($i->description,80) ."\n\n";
+        $msg .= $i->description ."\n\n";
         $sep = "---------\n";
       }
     }
@@ -480,10 +480,13 @@
    * Popup for overlib
    */
   function getPopInfo() {
-    global $lang;
-
+    global $tutos,$lang;
 
-    $n =str_replace("\n","<br />",myentities(wordwrap($this->short,80)));
+    if (!isset($tutos['bug_long_pop']) || ($tutos['bug_long_pop'] == false) ) {
+      $n =str_replace("\n","<br />",myentities(wordwrap($this->short,80)));
+    } else {
+      $n = str_replace("\n","<br />",$this->getBugHistory(false));
+    }
     $n =str_replace("\r","",$n);
     $n =str_replace("\\","\\\\",$n);
     $n =str_replace("'","\'",$n);

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/mconfig.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mconfig.pinc	14 Jul 2004 18:40:11 -0000	1.4
+++ mconfig.pinc	9 Jul 2008 09:10:45 -0000	1.5
@@ -52,4 +52,10 @@
 $tutos[modulesinc]['file'][] = "bugtracking";
 $tutos[modulesinc]['watchlist'][] = "bugtracking";
 
+
+# features
+#
+# Show long popups with the whole history (default = false)
+#
+$tutos['bug_long_pop'] = false;
 ?>
\ No newline at end of file

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

Modified Files:
	task_overview.php 
Log Message:
bugfix

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- task_overview.php	9 Jul 2008 08:26:28 -0000	1.98
+++ task_overview.php	9 Jul 2008 08:42:19 -0000	1.99
@@ -58,6 +58,8 @@
        $q .= $this->dbconn->like('t.'.$ti, $this->search);
      }
 
+     $q .= " )";
+
      # get customized non textual search fields
      $custom = get_custom_sql_select('task','t');
      foreach ($custom as $s) {
@@ -65,7 +67,6 @@
        $q .= $s;
      }
 
-     $q .= " )";
      if ( isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ) {
        $q .= " AND (( w.w_id = ".$_REQUEST['id']." AND w.t_id = t.id) OR (p_id=". $_REQUEST['id']."))";
      }
@@ -626,4 +627,4 @@
  $l = new task_overview($current_user);
  $l->display();
  $dbconn->Close();
-?>
\ No newline at end of file
+?>

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

Modified Files:
	config_default.pinc 
Log Message:
changed to 1.4


Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- config_default.pinc	9 Jul 2008 08:24:45 -0000	1.131
+++ config_default.pinc	9 Jul 2008 08:28:05 -0000	1.132
@@ -853,7 +853,7 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.3beta.20080626';
+$tutos[version] = '1.4beta.20080709';
 #
 ### Local Variables: ***
 ### mode:iso-accents ***

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

Modified Files:
	custom.pinc product_overview.php product_select.php 
	task_overview.php task_select.php webelements.p3 
Log Message:
added searchable feature to custom fields (example in task and product_select)

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -d -r1.331 -r1.332
--- webelements.p3	7 Jul 2008 14:04:53 -0000	1.331
+++ webelements.p3	9 Jul 2008 08:26:30 -0000	1.332
@@ -72,11 +72,15 @@
 /**
  * Make a selection based on an language array
  */
-Function SelectLangArray($fldname,$lgname,$default,$any = false,$additional = 0) {
+Function SelectLangArray($fldname,$lgname,$default,$any = false,$additional = 0,$multi = false) {
   global $lang,$tutos;
 
   $r = '';
-  $r .= '<select id="'. $fldname .'" name="'.$fldname.'">'."\n";
+  $r .= '<select id="'. $fldname .'" name="'.$fldname.'"';
+  if ($multi) {
+    $r .= ' multiple="multiple"';
+  }
+  $r .= '>'."\n";
   foreach ($lang[$lgname] as $f => $i) {
     if ( $f < 0 ) continue;
 

Index: custom.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/custom.pinc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- custom.pinc	13 Jun 2008 19:54:31 -0000	1.17
+++ custom.pinc	9 Jul 2008 08:26:28 -0000	1.18
@@ -87,6 +87,75 @@
    return $r;
  }
  /**
+  * get select fields for a custom table
+  */
+ function get_custom_selectors($section) {
+   global $table,$lang;
+
+   $r = array();
+
+   foreach($table[$section] as $ti => $tx) {
+     if (!is_array($tx)) continue;
+     if (!isset($tx['custom'])) continue;
+     if (!$tx['custom']) continue;
+     if (!isset($tx['searchable'])) continue;
+     if (!$tx['searchable']) continue;
+
+     $parsename = $section ."_". $ti;
+     # Text
+     $x[0] = myentities(isset($lang[$tx['lang']]) ? $lang[$tx['lang']]:$tx['lang']);  
+     $x[1] = '';  # Select/Search field
+
+     if ($tx['ftype'] == 'SelectOne') {
+       $x[1] .= SelectLangArray($parsename.'[]',$tx['lang'].'_',-1,true,0,true);
+     } else {
+       continue;
+     }
+     $r[] = $x;
+   }
+   return $r;
+ }
+ /**
+  * get select statements for searchable fields 
+  */
+ function get_custom_sql_select($section,$pre = '') {
+   global $table,$lang;
+
+   $r = array();
+
+   foreach($table[$section] as $ti => $tx) {
+     if (!is_array($tx)) continue;
+     if (!isset($tx['custom'])) continue;
+     if (!$tx['custom']) continue;
+     if (!isset($tx['searchable'])) continue;
+     if (!$tx['searchable']) continue;
+
+     $parsename = $section ."_". $ti;
+
+     if (!isset($_REQUEST[$parsename])) continue;
+
+     if ($pre != '') $pre = $pre.'.';
+
+     if ($tx['ftype'] == 'SelectOne') {
+#       $parsename .= '[]';
+       $x = ' '.$pre.$ti.' in (';
+       $pre = '';
+       $out = false;
+       foreach ($_REQUEST[$parsename] as $xx) {
+	     if ($xx == -1) $out = true;
+         $x .= $pre.$xx;
+         $pre = ',';
+       }
+       $x .= ')';
+       if ($out) continue;
+       $r[] = $x;
+     } else {
+       continue;
+     }
+   }
+   return $r;
+ }
+ /**
   * set a object according to massupdate inputs 
   */
  function set_custom_massupdate_object(&$layout,$section,&$obj,$action) {

Index: task_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_select.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- task_select.php	28 Oct 2007 16:16:35 -0000	1.6
+++ task_select.php	9 Jul 2008 08:26:30 -0000	1.7
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2003 - 2007 by Gero Kohnert
+ *  Copyright 2003 - 2008 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   
@@ -76,8 +76,19 @@
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['TaskWorker']);
        echo " <td colspan=\"2\">\n";
-       echo $this->user->askPeople("worker",$this->user->id,0);
+       echo $this->user->askPeople("worker",-1,0,-1,true);
        echo " </td>\n";
+
+
+       # add custom selectors
+       $x = get_custom_selectors('task');
+	   foreach ($x as $s) {
+         echo "</tr><tr>\n";
+         echo $this->showfieldc($s[0]);
+         echo " <td colspan=\"2\">\n";
+         echo $s[1];
+         echo " </td>\n";
+	   }
      }
      echo "</tr>\n";
      echo DoubleTableEnd();
@@ -104,7 +115,7 @@
      if ( ! $this->user->feature_ok(usetaskmanagement,PERM_SEL) ) {
        $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
        $this->stop = true;
-	   return;
+       return;
      }
 
      # Defaults for search

Index: product_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_select.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- product_select.php	28 Oct 2007 16:16:35 -0000	1.36
+++ product_select.php	9 Jul 2008 08:26:28 -0000	1.37
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 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   
@@ -73,6 +73,16 @@
        echo " <td colspan=\"2\">&nbsp;";
        echo $this->to->EnterDate("t",1);
        echo "&nbsp;</td>\n";
+
+       # add custom selectors
+       $x = get_custom_selectors('product');
+	   foreach ($x as $s) {
+         echo "</tr><tr>\n";
+         echo $this->showfieldc($s[0]);
+         echo " <td colspan=\"2\">\n";
+         echo $s[1];
+         echo " </td>\n";
+	   }
      }
      echo "</tr>\n";
 

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- product_overview.php	13 Mar 2008 12:33:39 -0000	1.122
+++ product_overview.php	9 Jul 2008 08:26:28 -0000	1.123
@@ -940,7 +940,7 @@
      #
      if ( ($state != -1) && ($state != "") ) {
        if ( $state < 0 ) {
-         $this->q .= $pre . " ( state != 2 AND state != 3 and state != 5 ) " ;
+         $this->q .= $pre . " ( state != ".PROD_STATE_FINISH." AND state != ".PROD_STATE_CANCEL." and state != ".PROD_STATE_QCANCEL.") " ;
        } else {
          $this->q .= $pre . " state = " . $state ;
        }
@@ -967,7 +967,9 @@
          $a = 0;
          $pre1 = "";
          $z = "";
-         while ($a < $n) {
+		 if ($n == 0) {
+		   $z = -1; # nothing
+		 } else while ($a < $n) {
            $z .= $pre1 . $r->get($a, "pro_id");
            $pre1 = ",";
            $a++;
@@ -1030,6 +1032,15 @@
        }
        $pre = " AND ";
      }
+     # custom selectors
+     # get customized non textual search fields
+     $custom = get_custom_sql_select('product');
+     foreach ($custom as $s) {
+       $this->q .= $pre;
+       $this->q .= $s;
+       $pre = " AND ";
+     }
+#	 die($this->q);
 
      check_dbacl($this->dbconn, $this->q, $this->user->id);
 

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- task_overview.php	7 Jul 2008 18:28:31 -0000	1.97
+++ task_overview.php	9 Jul 2008 08:26:28 -0000	1.98
@@ -58,6 +58,13 @@
        $q .= $this->dbconn->like('t.'.$ti, $this->search);
      }
 
+     # get customized non textual search fields
+     $custom = get_custom_sql_select('task','t');
+     foreach ($custom as $s) {
+       $q .= " AND ";
+       $q .= $s;
+     }
+
      $q .= " )";
      if ( isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ) {
        $q .= " AND (( w.w_id = ".$_REQUEST['id']." AND w.t_id = t.id) OR (p_id=". $_REQUEST['id']."))";
@@ -66,6 +73,7 @@
      $r = $this->dbconn->Exec($q);
      $n = $r->numrows();
      $a = 0;
+#    die ($q);
 #    echo $q;
      while ($a < $n) {
        $t = new task($this->dbconn);
@@ -494,7 +502,7 @@
 
 
      # Worker     
-     if ( isset($_REQUEST['worker']) ) {
+     if ( isset($_REQUEST['worker']) && ($_REQUEST['worker'] != -1) ) {
        $_REQUEST['id'] = $_REQUEST['worker'];
      }
      if ( isset($_REQUEST['id']) ) {
@@ -618,4 +626,4 @@
  $l = new task_overview($current_user);
  $l->display();
  $dbconn->Close();
-?>
+?>
\ No newline at end of file