tutos-commits Mailing List for TUTOS

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

Modified Files:
	mconfig.pinc 
Log Message:
allow checklists for jobs

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/mconfig.pinc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mconfig.pinc	27 Apr 2008 08:45:28 -0000	1.8
+++ mconfig.pinc	28 May 2008 12:46:38 -0000	1.9
@@ -46,6 +46,7 @@
       "product",
       "bugtracking",
       "file",
+      "task",
       "scheme"
       );
 

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

Modified Files:
	rep_freemind.pinc 
Log Message:
fix

Index: rep_freemind.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_freemind/rep_freemind.pinc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rep_freemind.pinc	28 Aug 2007 11:46:20 -0000	1.9
+++ rep_freemind.pinc	20 May 2008 17:58:32 -0000	1.10
@@ -111,7 +111,7 @@
  
       if ( $this->user->feature_ok(usenotes,PERM_SEE) ) {
         note::obj_read($this->obj);
-        if (count($this->list[usenotes]) > 0) {
+        if (count($this->obj->list[usenotes]) > 0) {
           $r .= " <node TEXT=\"". $lang['Notes'] ."\">\n";
           $r .= '   <font BOLD="true" SIZE="14" />'."\n";
           foreach ($this->obj->list[usenotes] as $i => $f) {
@@ -128,7 +128,7 @@
 
       if ( $this->user->feature_ok(usebugtracking,PERM_SEE) ) {
         bug::obj_read($this->obj);
-        if (count($this->list[usebugtracking]) > 0) {
+        if (count($this->obj->list[usebugtracking]) > 0) {
           $r .= " <node TEXT=\"". $lang['Bugs'] ."\">\n";
           $r .= '   <font BOLD="true" SIZE="14" />'."\n";
           foreach ($this->obj->list[usebugtracking] as $i => $f) {

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

Modified Files:
	mail.pinc mail_new.php product_show.php 
Log Message:
fix

Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- mail.pinc	5 Apr 2007 16:14:55 -0000	1.89
+++ mail.pinc	20 May 2008 17:42:34 -0000	1.90
@@ -983,10 +983,10 @@
     if ( count($this->to_adr) ) {
       foreach($this->to_adr as $i => $obj) {
         list($name,$em) = mail::split_name_email($obj);
-        if (isset($this->charset) ) {
+        if ( ($name != "") && isset($this->charset) ) {
           $name = "=?". $this->charset ."?B?" .  base64_encode( $name ) . "?=";
         }
-        $to .= $name ." <". $em .">";
+        $to .= $pre. $name ." <". $em .">";
         $pre = ",";
       }
     }

Index: mail_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail_new.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- mail_new.php	5 Apr 2007 16:14:56 -0000	1.43
+++ mail_new.php	20 May 2008 17:42:34 -0000	1.44
@@ -67,16 +67,28 @@
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['MailTo'],1,"to");
-     echo " <td colspan=\"3\">\n";
-     echo "  <input size=\"40\" maxlength=\"200\" id=\"to\" name=\"to\" value=\"". myentities($this->obj->getToAscii()) ."\" />\n";
-     echo " </td>\n";
+     $xx = $this->obj->getToAscii();
+     if ( strlen($xx) < 200 ) {
+       echo " <td colspan=\"3\">\n";
+       echo "  <input size=\"40\" maxlength=\"600\" id=\"to\" name=\"to\" value=\"". myentities($xx) ."\" />\n";
+       echo " </td>\n";
+	 } else {
+       echo $this->showdata($lang[$this->to->getType()] ." ". $this->to->getLink(),3);
+       $this->addHidden("toid",$_GET['toid']);
+	 }
      echo "</tr>\n"; 
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['MailCc'],0,"cc");
-     echo " <td colspan=\"3\">\n";
-     echo "  <input size=\"40\" maxlength=\"200\" id=\"cc\" name=\"cc\" value=\"". myentities($this->obj->getCcAscii()) ."\" />\n";
-     echo " </td>\n";
+     $xx = $this->obj->getCcAscii();
+     if ( strlen($xx) < 200 ) {
+       echo " <td colspan=\"3\">\n";
+       echo "  <input size=\"40\" maxlength=\"600\" id=\"cc\" name=\"cc\" value=\"". myentities($xx) ."\" />\n";
+       echo " </td>\n";
+	 } else {
+       echo $this->showdata($lang[$this->to->getType()] ." ". $this->to->getLink(),3);
+       $this->addHidden("toid",$_GET['toid']);
+	 }
      echo "</tr>\n";
      
      echo "<tr>\n";

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- product_show.php	15 Apr 2008 11:59:55 -0000	1.118
+++ product_show.php	20 May 2008 17:42:34 -0000	1.119
@@ -203,21 +203,21 @@
            # Additional conntected stuff
            $r = '';
            if ($tutos[task_show_fileinfo] == 1) {
-	     tutos_file::obj_read($f);
+             tutos_file::obj_read($f);
              if (count($f->list[usedocmanagement]) > 0) {
-  	       $r .= count($f->list[usedocmanagement]).' '.$lang['Files'];
-	     }
-	   }
-	   if ($tutos[task_show_buginfo] == 1) {
-	     bug::obj_read($f);
-	     if (count($f->list[usebugtracking]) > 0) {
-	       if ($r != '') $r .= '&nbsp;';
-	       $r .= count($f->list[usebugtracking]).' '.$lang['Bugs'];
+               $r .= count($f->list[usedocmanagement]).' '.$lang['Files'];
              }
-	   }
-	   if ($r != '') {
-	     echo '&nbsp;('.$r.')';
-	   }
+           }
+           if ($tutos[task_show_buginfo] == 1) {
+             bug::obj_read($f);
+             if (count($f->list[usebugtracking]) > 0) {
+               if ($r != '') $r .= '&nbsp;';
+               $r .= count($f->list[usebugtracking]).' '.$lang['Bugs'];
+             }
+           }
+           if ($r != '') {
+             echo '&nbsp;('.$r.')';
+           }
            echo "<br />\n";
            $n++;
          }

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

Modified Files:
	task.pinc 
Log Message:
fix

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- task.pinc	14 Apr 2008 18:49:16 -0000	1.197
+++ task.pinc	19 May 2008 13:30:43 -0000	1.198
@@ -261,7 +261,7 @@
     $t->modified[] = array ( "field" => "CloneEntry" ,
                               "old" => $oldid ,
                               "new" => $t->id,
-                              "obj_id" => $nf->id
+                              "obj_id" => $t->id
                             );
     history_save($t);
 
@@ -1650,4 +1650,4 @@
     return $r;
   }
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
	timetrack_overview.php 
Log Message:
fix

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- timetrack_overview.php	10 Feb 2008 07:13:58 -0000	1.104
+++ timetrack_overview.php	11 May 2008 14:28:48 -0000	1.105
@@ -455,7 +455,7 @@
        while (list ($key,$val) = @each ($_GET['mark'])) {
          $p = new timetrack($this->dbconn);
          $p = $p->read($val,$p);
-         if ( $p->id != $val ) {
+         if ( !is_object($p) || ($p->id != $val) ) {
            $msg .= "Unknown ". $lang['Timetrack'] ." ". $val ."<br />\n";
            continue;
          }

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

Modified Files:
	bug.pinc 
Log Message:
bugfix


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- bug.pinc	9 Apr 2008 07:43:41 -0000	1.52
+++ bug.pinc	10 May 2008 14:40:38 -0000	1.53
@@ -233,6 +233,7 @@
     $this->tablename2 = $this->dbconn->prefix .$table['bug2'][name];
     $this->tablename3 = $this->dbconn->prefix .$table['bug3'][name];
     $this->acl[$current_user->id] = $tutos[modok];
+	$this->bughist = array();
   }
 
   function exportXML_body ($only_ids = false) {
@@ -617,7 +618,7 @@
       $this->modified[] = array ( "field" => "ProductP" , "old" => $this->parent->id,"new" => $parent->id);
       $this->parent = $parent;
     } else
-    if ($this->parent == -1) {
+    if (! is_object($this->parent)) {
       $this->modified[] = array ("field" => "ProductP" , "old" => -1,"new" => $parent->id);
       $this->parent = $parent;
     }

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

Modified Files:
	checklist.pinc checklist_ins.php checklist_show.php 
Log Message:
use permission should be sufficient for creating working copies

Index: checklist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist.pinc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- checklist.pinc	25 Apr 2008 15:40:59 -0000	1.35
+++ checklist.pinc	5 May 2008 12:07:06 -0000	1.36
@@ -12,6 +12,7 @@
  *
  */
 
+include_once 'checklist/checkfield.pinc';
 
 define ("CL_TYPE_UNKNOWN" , 0);
 define ("CL_TYPE_DRAFT"   , 1);
@@ -424,21 +425,25 @@
     global $lang;
 
     if (! is_object($obj) ) return "";
-    if (! $user->feature_ok(usechecklists,PERM_NEW) ) return "";
+    if (! $user->feature_ok(usechecklists,PERM_USE) ) return "";
     if (! $obj->see_ok() ) return "";
 
-    $x1 = array( url => "checklist/checklist_new.php?link_id=". $obj->id."&type=".CL_TYPE_TEMPL,
-                confirm => false,
-                text => ($text == "" ? $lang['ChecklistCreate']:$text),
-                info => sprintf($lang['ChecklistCreateInfo'], $obj->getFullName()),
-                category => array("checklist","new","module")
-              );
-    $x2 = array( url => "checklist/checklist_new.php?link_id=". $obj->id."&type=".CL_TYPE_WORKING,
-                confirm => false,
-                text => ($text == "" ? $lang['ChecklistInstance']:$text),
-                info => sprintf($lang['ChecklistInstanceInfo'], $obj->getFullName()),
-                category => array("checklist","new","module")
-              );
+    if ($user->feature_ok(usechecklists,PERM_NEW) ) {
+      $x1 = array(url => "checklist/checklist_new.php?link_id=". $obj->id."&type=".CL_TYPE_TEMPL,
+                  confirm => false,
+                  text => ($text == "" ? $lang['ChecklistCreate']:$text),
+                  info => sprintf($lang['ChecklistCreateInfo'], $obj->getFullName()),
+                  category => array("checklist","new","module")
+                );
+	}
+    if ($user->feature_ok(usechecklists,PERM_USE) ) {
+      $x2 = array( url => "checklist/checklist_new.php?link_id=". $obj->id."&type=".CL_TYPE_WORKING,
+                  confirm => false,
+                  text => ($text == "" ? $lang['ChecklistInstance']:$text),
+                  info => sprintf($lang['ChecklistInstanceInfo'], $obj->getFullName()),
+                  category => array("checklist","new","module")
+                );
+	}
 
     $x = array( $x1, $x2);
 
@@ -589,7 +594,7 @@
   function makeInstance( $connectnode_id) {
     $cl_inst = new checklist( $this->dbconn);
     $cl_inst->class_id=$this->id;
-    $cl_inst->type = 3;
+    $cl_inst->type = CL_TYPE_WORKING;
     $cl_inst->link_id = $connectnode_id;
     $cl_inst->save();
     return $cl_inst;

Index: checklist_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist_ins.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- checklist_ins.php	24 Apr 2008 14:00:39 -0000	1.14
+++ checklist_ins.php	5 May 2008 12:07:06 -0000	1.15
@@ -15,7 +15,7 @@
 ini_set("include_path","..");
 include_once 'webelements.p3';
 include_once 'permission.p3';
-include_once 'checkfield.pinc';
+include_once 'checklist/checkfield.pinc';
 
 /* Check if user is allowed to use it */
 check_user();
@@ -131,10 +131,10 @@
   $new_cl_inst = $new_cl_class->makeinstance( $link_id);
 
   if ( isset( $_POST['name']) ) {
-    $new_cl_inst->setName( $HTTP_POST_VARS['name']);
+    $new_cl_inst->setName( $_POST['name']);
   }
-  if ( isset( $HTTP_POST_VARS['desc']) ) {
-    $new_cl_inst->setDesc( $HTTP_POST_VARS['desc']);
+  if ( isset( $_POST['desc']) ) {
+    $new_cl_inst->setDesc( $_POST['desc']);
   }
   $new_cl_inst->generateCheckFields();
   $new_cl_inst->save();
@@ -150,6 +150,7 @@
   }
   if ( empty($_POST['name']) || !isset($_POST['name']) || ($_POST['name'] == $lang['PlsChangeName']) ) {
     $msg .= sprintf($lang['Err0009'],$lang['ChecklistName']) ."<br />";
+    $gotourl = addBadField($gotourl,'name',true);
   } else {
     $b->setName(trim(StripSlashes($_POST['name'])));
     $gotourl = addUrlParameter($gotourl,"name=". UrlEncode($b->name),true);
@@ -160,12 +161,14 @@
   }
   if ( empty($_POST['type']) || !isset($_POST['type']) ) {
     $msg .= sprintf($lang['Err0009'],$lang['ChecklistType']) ."<br />";
+    $gotourl = addBadField($gotourl,'type',true);
   } else {
     $b->type = $_POST['type'];
     $gotourl= addUrlParameter($gotourl,"type=". $b->type,true);
   }
   if ( empty($_POST['link_id']) ) {
     $msg .= "No Link ID given !<br />";
+    $gotourl = addBadField($gotourl,'link_id',true);
   } else {
     $b->link_id = $_POST['link_id'];
     $gotourl= addUrlParameter($gotourl,"link_id=". $b->link_id,true);

Index: checklist_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist_show.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- checklist_show.php	24 Apr 2008 14:00:40 -0000	1.14
+++ checklist_show.php	5 May 2008 12:07:06 -0000	1.15
@@ -98,7 +98,9 @@
     */
    Function navigate() {
      global $tutos,$lang;
-
+	 if (!is_object($this->obj)) {
+	   return;
+	 }
      echo "<tr><td nowrap>";
      if ( $this->user->feature_ok(usechecklists,PERM_NEW) ) {
        echo menulink("checklist/checklist_new.php",$lang['NewEntry'],$lang['ChecklistCreate']) ."<br />";
@@ -135,12 +137,19 @@
      $this->obj = new checklist($this->dbconn);
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
-       $this->obj->read_reference();
      }
+	 if (!is_object($this->obj)) {
+       $msg .= sprintf($lang['Err0040'],$lang['Checklist']);
+       $this->stop = true;
+       $this->format = "html";
+       return;
+	 }
+     $this->obj->read_reference();
      if ( $this->obj->size( $this->obj) < 1 ) {
        $msg .= $lang['CheckfieldNoFields'];
        $this->stop = true;
      }
+
      if ( ! $this->obj->see_ok() ) {
        $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
        $this->stop = true;

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

Modified Files:
	file.pinc file_ins.php file_new.php 
Log Message:
fixes

Index: file_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_ins.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- file_ins.php	2 Mar 2008 18:07:26 -0000	1.25
+++ file_ins.php	5 May 2008 12:06:04 -0000	1.26
@@ -146,6 +146,14 @@
    $farr['size'] =  filesize($farr['tmp_name']);
    if (isset($_REQUEST['ct'])) {
      $farr['type'] = $_REQUEST['ct'];
+   } else if (ereg("\.png$",$file)) {
+     $farr['type'] = 'image/png';
+   } else if (ereg("\.gif$",$file)) {
+     $farr['type'] = 'image/gif';
+   } else if (ereg("\.jpg$",$file)) {
+     $farr['type'] = 'image/jpeg';
+   } else if (ereg("\.pdf$",$file)) {
+     $farr['type'] = 'application/pdf';
    } else {
      $farr['type'] = 'any';
    }

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- file_new.php	27 Mar 2008 13:10:32 -0000	1.26
+++ file_new.php	5 May 2008 12:06:04 -0000	1.27
@@ -132,20 +132,7 @@
        echo " <td></td>\n";
        echo " <td id=\"file\" colspan=\"3\">\n";
 
-       # javascript & ajax
-       $js = '  ';
-
-       echo "  <select id=\"file2\" name=\"file2\" ". $js .">";
-       echo "    <option> </option>\n"; # Empty entry if working via upload
-       # read the directory
-       if ($dh = opendir($tutos['file_local_searchpath'])) {
-         while (($file = readdir($dh)) !== false) {
-           if (filetype($tutos['file_local_searchpath'].'/'.$file) == 'dir') continue;
-           echo "    <option>". $file."</option>\n";
-         }
-         closedir($dh);
-       }
-       echo "  </select>";
+	   echo tutos_file::get_local_selection();
        echo " </td>\n";
        echo "</tr>\n";
      }

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- file.pinc	13 Mar 2008 13:40:08 -0000	1.71
+++ file.pinc	5 May 2008 12:06:04 -0000	1.72
@@ -1273,5 +1273,31 @@
     $r .= "</ul>\n";
     return $r;
   }
+
+
+  /**
+   * get the local file list for uploading into tutos
+   * formatted as html select
+   */
+  function get_local_selection() {
+    global $tutos;
+
+	$r = '';
+    # javascript & ajax
+    $js = '  ';
+    $r .= "  <select id=\"file2\" name=\"file2\" ". $js .">";
+    $r .= "    <option> </option>\n"; # Empty entry if working via upload
+    # read the directory
+    if ($dh = opendir($tutos['file_local_searchpath'])) {
+      while (($file = readdir($dh)) !== false) {
+        if (filetype($tutos['file_local_searchpath'].'/'.$file) == 'dir') continue;
+        $r .= '    <option>'. $file."</option>\n";
+      }
+      closedir($dh);
+    }
+    $r .= "  </select>";
+	return $r;
+  }
+
 }
 ?>

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

Modified Files:
	en.p3 mconfig.pinc report_list_default.php report_overview.php 
	reporter.pinc 
Added Files:
	de.p3 
Log Message:
now support different Report Categories

Index: report_list_default.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/report_list_default.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- report_list_default.php	14 Nov 2006 19:45:58 -0000	1.11
+++ report_list_default.php	5 May 2008 12:03:57 -0000	1.12
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2004 - 2005 by Gero Kohnert
+ * Copyright 2004 - 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   
@@ -16,6 +16,10 @@
  * this default/example file will be overwritten without warning when you update !!!!
  */
 
+#
+# The Categories text are defined in the language files (en.p3 etc.)
+# category 1 is REPORT
+# category 2 is WORKFLOW
 
 # A milestone trend analysis
 #  (available in product_show
@@ -25,6 +29,7 @@
                           'dir' => "rep_mta",
                           'file' => "rep_mta.pinc",
                           'classname' => "rep_mta",
+                          'category' => 1,
                             );
 # A analysis of bug stae durations
 #  (available in bug_show product_show and bug_select)
@@ -34,6 +39,7 @@
                           'dir' => "rep_bug_state_duration",
                           'file' => "rep_bug_state_duration.pinc",
                           'classname' => "rep_bug_state_duration",
+                          'category' => 1,
                             );
 
 # A freemind map about the project
@@ -43,6 +49,7 @@
                           'dir' => "rep_freemind",
                           'file' => "rep_freemind.pinc",
                           'classname' => "rep_freemind",
+                          'category' => 1,
                             );
 
 # A ganttproject map about the project
@@ -52,6 +59,7 @@
                           'dir' => "rep_ganttproject",
                           'file' => "rep_ganttproject.pinc",
                           'classname' => "rep_ganttproject",
+                          'category' => 1,
                             );
 
 # A index paper
@@ -61,6 +69,7 @@
                           'dir' => "rep_index",
                           'file' => "rep_index.pinc",
                           'classname' => "rep_index",
+                          'category' => 1,
                             );
 # A spine for a folder
 $report['rep_spine'] = array(
@@ -69,6 +78,7 @@
                           'dir' => "rep_spine",
                           'file' => "rep_spine.pinc",
                           'classname' => "rep_spine",
+                          'category' => 1,
                             );
 $report['rep_envelope1'] = array(
                           'class' => "address",
@@ -76,6 +86,7 @@
                           'dir' => "rep_envelope",
                           'file' => "rep_envelope.pinc",
                           'classname' => "rep_envelope",
+                          'category' => 1,
                             );
 $report['rep_envelope2'] = array(
                           'class' => "company",
@@ -83,6 +94,7 @@
                           'dir' => "rep_envelope",
                           'file' => "rep_envelope.pinc",
                           'classname' => "rep_envelope",
+                          'category' => 1,
                             );
 $report['rep_prodstat'] = array(
                           'class' => "product",
@@ -90,6 +102,7 @@
                           'dir' => "rep_prodstat",
                           'file' => "rep_prodstat.pinc",
                           'classname' => "rep_prodstat",
+                          'category' => 1,
                             );
 
 $report['rep_prod_excel'] = array(
@@ -98,6 +111,7 @@
                           'dir' => "rep_prod_excel",
                           'file' => "rep_prod_excel.pinc",
                           'classname' => "rep_prod_excel",
+                          'category' => 1,
                             );
 
 $report['rep_group_excel'] = array(
@@ -106,6 +120,7 @@
                           'dir' => "rep_group_excel",
                           'file' => "rep_group_excel.pinc",
                           'classname' => "rep_group_excel",
+                          'category' => 1,
                             );
 #
 # Creating a directory structure for a project
@@ -133,6 +148,8 @@
                           'copy_replace' => array(
                                             array("%PROJECT%.URL",""),  # copy to basedir
                                             array("example.rtf","/01"), # copy to 01
-                                            ),                            );
+                                            ),                            
+                          'category' => 1,
+                            );
 
 ?>
\ No newline at end of file

Index: report_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/report_overview.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- report_overview.php	28 Oct 2007 18:34:07 -0000	1.7
+++ report_overview.php	5 May 2008 12:03:57 -0000	1.8
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2007 by Gero Kohnert
+ *  Copyright 2004 - 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   
@@ -41,6 +41,8 @@
      }
      echo $this->OverviewTableStart();
      foreach ($this->obj->list[usereporter] as $i => $j) {
+	   if ($j['category'] != $this->rep_category) continue;
+
        $x = new report($this->dbconn);
        echo "<tr>\n";
        $x->read($i);
@@ -75,8 +77,8 @@
    Function prepare() {
      global $lang,$tutos;
 
-     $this->name = $lang['ReportOverview'];
      $this->css_class = 'overviewbox';
+     $this->rep_category = 1; #default
 
      $this->obj = new report($this->dbconn);
      if (isset($_GET['id'])) {
@@ -89,6 +91,13 @@
      if (isset($_GET['type'])) {
        $this->obj->type = $_GET['type'];
      }
+     if (isset($_GET['cat'])) {
+       $this->rep_category = $_GET['cat'];
+     }
+
+
+     $this->name = $lang['rep_category_overview'][$this->rep_category];
+
      report::obj_read($this->obj,$this->obj->class,$this->obj->type);
    }
  }

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/mconfig.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mconfig.pinc	14 Nov 2006 19:45:58 -0000	1.3
+++ mconfig.pinc	5 May 2008 12:03:57 -0000	1.4
@@ -44,6 +44,7 @@
       "company",
       "product",
       "bugtracking",
+      "task",
       "scheme",
       );
 #

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/en.p3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en.p3	2 Oct 2004 17:17:03 -0000	1.1
+++ en.p3	5 May 2008 12:03:57 -0000	1.2
@@ -10,9 +10,12 @@
 
 # Report Engine
 
-$lang['Reports']        = "REPORTS";
-$lang['ReportsInfo']    = "REPORTS";
-$lang['ReportOverview'] = "Report Selection";
+$lang['rep_category'][1]          = "Reports";
+$lang['rep_category_info'][1]     = "additional reports";
+$lang['rep_category_overview'][1] = "Report Selection";
+$lang['rep_category'][2]          = "Workflow";
+$lang['rep_category_info'][2]     = "Workflows";
+$lang['rep_category_overview'][2] = "Workflow Selection";
 
 $lang['perm'][usereporter]  = "use report engine";
 ?>

Index: reporter.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/reporter.pinc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- reporter.pinc	12 Oct 2007 14:32:42 -0000	1.12
+++ reporter.pinc	5 May 2008 12:03:57 -0000	1.13
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2005 by Gero Kohnert
+ *  Copyright 2004 - 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   
@@ -97,6 +97,9 @@
     $obj->list[usereporter] = array();
 
     foreach ($report as $i => $j) {
+	  if (!isset($j['category'])) {
+		$j['category'] = 1; # default
+	  }
       if (is_array($j['class'])) {
         foreach($j['class'] as $i2 => $j2) {
           if ($j['class'][$i2] != $c) continue;
@@ -126,11 +129,21 @@
       return '';
     }
 
-    return array( url => "report-engine/report_overview.php?class=".$tutos['pageclass']."&amp;type=".$tutos['pagetype'],
-                  text => ($text == "" ? $lang['Reports'] : $text),
-                  info => $lang['Reports'],
+	$xa = array();
+	foreach ($lang['rep_category'] as $i) {
+	  $x[$i] = 0;
+	  foreach ($user->list[usereporter] as $j) {
+		if($j['category'] == $i) $x[$i]++;
+	  }
+	  if ($x[$i] > 0) {
+       $xa[$i] = array( url => "report-engine/report_overview.php?class=".$tutos['pageclass']."&amp;type=".$tutos['pagetype'].'&amp;cat='.$i,
+                  text => ($text == "" ? $lang['rep_category'][$i] : $text),
+                  info => $lang['rep_category_info'][$i],
                   category => array("module")
                 );
+	  }
+	}
+	return $xa;
   }
   /**
    * create a link where a report for the given object could be found
@@ -147,13 +160,24 @@
     if (count( $obj->list[usereporter]) == 0 ) {
       return '';
     }
-    $x = array( url => 'report-engine/report_overview.php?class='.$tutos['pageclass'].'&amp;type='.$tutos['pagetype'].'&amp;id='.$obj->id,
+	$xa = array();
+	foreach ($lang['rep_category'] as $i => $f) {
+	  $x[$i] = 0;
+	  foreach ($obj->list[usereporter] as $j) {
+		if($j['category'] == $i) $x[$i]++;
+	  }
+	  if ($x[$i] > 0) {
+        $xa[] = array( url => 'report-engine/report_overview.php?class='.$tutos['pageclass'].'&amp;type='.$tutos['pagetype'].'&amp;id='.$obj->id.'&amp;cat='.$i,
                 confirm => false,
-                text => ($text == '' ? $lang['Reports']:$text),
-                info => $lang['ReportsInfo'],
+                text => ($text == '' ? $lang['rep_category'][$i]:$text),
+                info => $lang['rep_category_info'][$i],
                 category => array('module')
               );
-    return $x;
+	  }
+	}
+#    print_r($xa);
+	return $xa;
+
   }
 }
 ?>

--- NEW FILE: de.p3 ---
<?php
# $Id: de.p3,v 1.1 2008/05/05 12:03:56 gokohnert Exp $
#
# ========================= NOTE ========================
# Please put site specific extensions and changes
# to TUTOS language files in a file called "de_custom.p3"
# or "lang_custom.p3" (for all languages)
# using the same format like here
# =======================================================

# Report Engine

$lang['rep_category'][1]          = "Berichte";
$lang['rep_category_info'][1]     = "zusätzliche Berichte";
$lang['rep_category_overview'][1] = "Berichtsauswahl";
$lang['rep_category'][2]          = "Abläufe";
$lang['rep_category_info'][2]     = "vereinfachte Abläufe";
$lang['rep_category_overview'][2] = "Ablaufauswahl";

$lang['perm'][usereporter]  = "'report engine' benutzen";
### Local Variables: ***
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
?>

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

Modified Files:
	de.p3 
Log Message:
now support different Report Categories

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_mta/de.p3,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- de.p3	5 Apr 2007 16:14:58 -0000	1.2
+++ de.p3	5 May 2008 12:03:58 -0000	1.3
@@ -8,7 +8,7 @@
  */
 
 $lang['rep_mta_name'] = "Meilenstein Trend Analyse";
-$lang['rep_mta_info'] = "der Verlauif der Meilensteintermine über die Zeit";
+$lang['rep_mta_info'] = "der Verlauf der Meilensteintermine über die Zeit";
 
 
 ### Local Variables: ***