tutos-commits Mailing List for TUTOS

Revision: 189
          http://tutos.svn.sourceforge.net/tutos/?rev=189&view=rev
Author:   gokohnert
Date:     2011-05-26 18:58:03 +0000 (Thu, 26 May 2011)

Log Message:
-----------
search on multiple fields via name search

Modified Paths:
--------------
    trunk/php/webelements.p3

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2011-05-26 18:29:38 UTC (rev 188)
+++ trunk/php/webelements.p3	2011-05-26 18:58:03 UTC (rev 189)
@@ -436,7 +436,7 @@
                 case 'integer':
                 case 'double':
                     $msg .= $a;
-                break;
+                    break;
                 case 'boolean':
                     if (true === $a){
                         $msg .= 'T';
@@ -1256,6 +1256,9 @@
         if ( strstr($types,"t") != FALSE ) {
             $ma[] = useteams;
         }
+        if ( strstr($types,"j") != FALSE ) {
+            $ma[] = usetaskmanagement;
+        }
         if ( strstr($types,"p") != FALSE ) {
             $ma[] = useprojects;
         }
@@ -1305,6 +1308,7 @@
  * mode   = where to search
  *          a = addresses
  *          t = teams
+ *          j = tasks
  *          c = companies
  *          d = departments
  *          p = products
@@ -2435,6 +2439,8 @@
 
     if (!isset($obj->header)) {
         $obj->header = '';
+    }
+    if (!isset($obj->hpre)) {
         $obj->hpre = '';
     }
 
@@ -2671,12 +2677,24 @@
     }
     if ($type == OVERVIEW_ARG_FN) {
         if (!isset($_REQUEST[$arg]) || empty($_REQUEST[$arg])) return false;
-        $arr = search_by_name($_REQUEST[$arg],$mode);
+        $myarg = trim($_REQUEST[$arg]);
+        $arr = search_by_name($myarg,$mode);
 
         $obj->link1 = addUrlParameter($obj->link1,$arg.'='.UrlEncode($_REQUEST[$arg]) );
-        $obj->header .= $obj->hpre.$lang[$lgid] .' = '. htmlentities($_REQUEST[$arg]);
+
+        $hpre = '';
+        $obj->header .= $obj->hpre ;
+        if (is_array($lgid)) {
+            foreach($lgid as $l) {
+                $obj->header .= $hpre .$lang[$l];
+                $hpre = ' / ';
+            }
+        } else {
+            $obj->header .= $hpre .$lang[$lgid];
+        }
+        $obj->header .= ' = '. htmlentities($_REQUEST[$arg]);
+
         $obj->hpre = '<br />';
-        $obj->filter[$arg] = $_REQUEST[$arg];
         $obj->addHidden($arg,$_REQUEST[$arg]);
 
         if (count($arr) == 0) {
@@ -2685,17 +2703,30 @@
             return false;
         }
 
-        $obj->q .= $obj->qpre .$prefix.$cnames[0]." in(";
-        $sep = '';
-        if (count($arr) == 0) {
-            $obj->q .= "0";
-        } else
-            foreach($arr as $a) {
-                $obj->q .= $sep.$a->id;
-                $sep = ',';
-            }
-        $obj->q .= ")";
+        $obj->q .= $obj->qpre;
+        if (count($cnames) > 1) {
+            $obj->q .= ' (';
+        }
+        $subpre = '';
+        foreach($cnames as $cn) {
+            $obj->q .= $subpre.$prefix.$cn." in(";
+            $sep = '';
+            if (count($arr) == 0) {
+                $obj->q .= "0";
+            } else
+                foreach($arr as $a) {
+                    $obj->q .= $sep.$a->id;
+                    $sep = ',';
+                }
+            $obj->q .= ")";
+            $subpre = ' OR ';
+            $obj->filter[$cn] = $myarg;
+        }
+        if (count($cnames) > 1) {
+            $obj->q .= ') ';
+        }
 
+
         $obj->qpre = " AND ";
         $obj->head[$cnames[0]] = true;
         return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 188
          http://tutos.svn.sourceforge.net/tutos/?rev=188&view=rev
Author:   gokohnert
Date:     2011-05-26 18:29:38 +0000 (Thu, 26 May 2011)

Log Message:
-----------
better resolve of history

Modified Paths:
--------------
    trunk/php/expense/expense.pinc

Modified: trunk/php/expense/expense.pinc
===================================================================
--- trunk/php/expense/expense.pinc	2011-05-25 09:15:21 UTC (rev 187)
+++ trunk/php/expense/expense.pinc	2011-05-26 18:29:38 UTC (rev 188)
@@ -809,8 +809,9 @@
         case 'ExpenseSupplier':
         case 'ExpenseReference':
         case 'ExpenseInvoice':
+        case 'ExpenseCreate':
             $x = resolve_history_obj($f,$this->dbconn);
-        break;
+            break;
         case 'ExpenseCategory':
             $x = resolve_history_lgarr ($f,'ExpenseCategories');
             break;
@@ -820,7 +821,7 @@
         case 'ExpenseStartTime':
         case 'ExpenseEndTime':
             $x = resolve_history_datetime($f,$this->dbconn,false);
-        break;
+            break;
         default:
             return null;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 187
          http://tutos.svn.sourceforge.net/tutos/?rev=187&view=rev
Author:   gokohnert
Date:     2011-05-25 09:15:21 +0000 (Wed, 25 May 2011)

Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/group/group_show.php

Modified: trunk/php/group/group_show.php
===================================================================
--- trunk/php/group/group_show.php	2011-05-25 09:06:00 UTC (rev 186)
+++ trunk/php/group/group_show.php	2011-05-25 09:15:21 UTC (rev 187)
@@ -25,7 +25,7 @@
 function member_sort(&$a,&$b) {
     $r = 0;
 
-    if ($_REQUEST['xf'] == 'name') {
+    if ($_GET['xf'] == 'name') {
         if ( $a[0]->gettype() != $b[0]->gettype() ) {
             $r = $a[0]->gettype() > $b[0]->gettype();
         } else if ( ($b[0]->gettype() == 'address') ) {
@@ -33,12 +33,14 @@
         } else if ( ($b[0]->gettype() == 'company') ) {
             $r = ($a[0]->name < $b[0]->name) ? -1 : 1;
         }
-    } else if ($_REQUEST['xf'] == 'created') {
+    } else if ($_GET['xf'] == 'created') {
         $r = ($a[2]->ts < $b[2]->ts) ? -1 : 1;
-    } else if ($_REQUEST['xf'] == 'comment') {
+    } else if ($_GET['xf'] == 'comment') {
         $r = ($a[1] < $b[1]) ? -1 : 1;
+    } else {
+        // unknown sort
     }
-    if ($_REQUEST['xo'] == 1)
+    if ($_GET['xo'] == 1)
         return $r;
     else
         return -1 * $r;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 186
          http://tutos.svn.sourceforge.net/tutos/?rev=186&view=rev
Author:   gokohnert
Date:     2011-05-25 09:06:00 +0000 (Wed, 25 May 2011)

Log Message:
-----------
allow sortiung of group members

Modified Paths:
--------------
    trunk/php/group/group.pinc
    trunk/php/group/group_show.php

Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc	2011-05-25 08:02:05 UTC (rev 185)
+++ trunk/php/group/group.pinc	2011-05-25 09:06:00 UTC (rev 186)
@@ -73,9 +73,11 @@
             $i = $r->get($a, 'obj_id');
             $obj = getObject($this->dbconn,$i);
             if ( is_object($obj) && $obj->id != -1 ) {
-                $this->member[$i][0] = &$obj;
-                $this->member[$i][1] = $r->get($a, 'm_comment');
-                $this->member[$i][2] = $r->getDateTime($a, 'creation');
+                $x = array();
+                $x[0] = &$obj;
+                $x[1] = $r->get($a, 'm_comment');
+                $x[2] = $r->getDateTime($a, 'creation');
+                $this->member[$obj->id] = $x;
             }
             unset($obj);
             $a++;
@@ -212,7 +214,7 @@
         $this->read_member();
         $x = "mailto:";
         $sep = "";
-        foreach( $this->member as $i => $f) {
+        foreach( $this->member as $f) {
             if ($f->getType() == "address") {
                 $e = $f->default_email();
                 if ( !empty($e) ) {
@@ -250,7 +252,7 @@
         $r .= "<name>". htmlspecialchars($this->name)."</name>\n";
         $r .= "<description>". htmlspecialchars($this->desc) ."</description>\n";
         //building the group-member block
-        foreach($this->member as $i => $f) {
+        foreach($this->member as $f) {
             $r .= "<member><id>". $f->id ."</id></member>\n";
         }
         $this->member   = array();

Modified: trunk/php/group/group_show.php
===================================================================
--- trunk/php/group/group_show.php	2011-05-25 08:02:05 UTC (rev 185)
+++ trunk/php/group/group_show.php	2011-05-25 09:06:00 UTC (rev 186)
@@ -23,15 +23,25 @@
 loadlayout();
 
 function member_sort(&$a,&$b) {
-    if ( $a[0]->gettype() != $b[0]->gettype() ) {
-        return $a[0]->gettype() > $b[0]->gettype();
+    $r = 0;
+
+    if ($_REQUEST['xf'] == 'name') {
+        if ( $a[0]->gettype() != $b[0]->gettype() ) {
+            $r = $a[0]->gettype() > $b[0]->gettype();
+        } else if ( ($b[0]->gettype() == 'address') ) {
+            $r = ($a[0]->l_name < $b[0]->l_name) ? -1 : 1;
+        } else if ( ($b[0]->gettype() == 'company') ) {
+            $r = ($a[0]->name < $b[0]->name) ? -1 : 1;
+        }
+    } else if ($_REQUEST['xf'] == 'created') {
+        $r = ($a[2]->ts < $b[2]->ts) ? -1 : 1;
+    } else if ($_REQUEST['xf'] == 'comment') {
+        $r = ($a[1] < $b[1]) ? -1 : 1;
     }
-    if ( ($b[0]->gettype() == 'address') ) {
-        return ($a[0]->l_name < $b[0]->l_name) ? -1 : 1;
-    }
-    if ( ($b[0]->gettype() == 'company') ) {
-        return ($a[0]->name < $b[0]->name) ? -1 : 1;
-    }
+    if ($_REQUEST['xo'] == 1)
+        return $r;
+    else
+        return -1 * $r;
 }
 
 /**
@@ -47,7 +57,7 @@
         $data = '';
         // Firstname Lastname Company Department Street1 Street2 City Zipcode Phone Fax email
 
-        foreach($this->obj->member as $i => $obj) {
+        foreach($this->obj->member as $obj) {
             $x = $obj[0]->gettype();
 
         }
@@ -254,13 +264,13 @@
             $r .= $this->showdata(count($this->obj->member),9);
             $r .= "</tr><tr>\n";
             $r .= '<th>&nbsp;</th>';
-            $r .= '<th>'. $lang['AdrName'].'</th>';
+            $r .= $this->orderHeader("name",$lang['AdrName'],$this->link2);
             $r .= '<th colspan="3">'. $lang['Description'].'</th>';
             $r .= '<th>'. $lang['AdrEmail'].'</th>';
             $r .= '<th>'. $lang['Phone'].'</th>';
             $r .= '<th>'. $lang['AdrFax'].'</th>';
-            $r .= '<th>'. $lang['Comment'].'</th>';
-            $r .= '<th>'. $lang['created'].'</th>';
+            $r .= $this->orderHeader('comment',$lang['Comment'],$this->link2);
+            $r .= $this->orderHeader('created',$lang['created'],$this->link2);
             $r .= "</tr>\n";
             $line = 1;
             $url = 'group/group2_new.php?id='.$this->obj->id;
@@ -341,6 +351,13 @@
         } else {
             $this->name .=": ". $this->obj->getFullName();
         }
+        if (!isset($_GET['xf'])) {
+            $_GET['xf'] = "name";
+            $_GET['xo'] = 1;
+        }
+        $this->link1 = $this->obj->getUrl();
+        $this->link2 = $this->link1;
+
         // menu
         $m = group::getSelectLink($this->user,$lang['Search']);
         $m[category][] = 'obj';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 185
          http://tutos.svn.sourceforge.net/tutos/?rev=185&view=rev
Author:   gokohnert
Date:     2011-05-25 08:02:05 +0000 (Wed, 25 May 2011)

Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/custom.pinc

Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc	2011-05-22 19:07:27 UTC (rev 184)
+++ trunk/php/custom.pinc	2011-05-25 08:02:05 UTC (rev 185)
@@ -650,8 +650,8 @@
             $layout->addHidden($parsename.'id',$_REQUEST[$parsename.'id']);
         $r .= " </td>\n";
         return $r;
-    } else {
-        $r .= $parsename;
+        #    } else {
+        #        $r .= $parsename;
     }
 
     if ($x['ftype'] == 'Date') {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 184
          http://tutos.svn.sourceforge.net/tutos/?rev=184&view=rev
Author:   gokohnert
Date:     2011-05-22 19:07:27 +0000 (Sun, 22 May 2011)

Log Message:
-----------
updates

Modified Paths:
--------------
    trunk/php/custom.pinc

Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc	2011-05-22 19:06:49 UTC (rev 183)
+++ trunk/php/custom.pinc	2011-05-22 19:07:27 UTC (rev 184)
@@ -295,8 +295,6 @@
 
         $l = myentities(getLang($tx['lang']));
 
-
-
         if ($tx['ftype'] == 'SelectOne') {
             if ( !isset($_REQUEST[$parsename])) continue;
             $x = ' '.$pre.$ti.' in (';
@@ -336,7 +334,14 @@
                 // a single id was given
                 $x .= ' '.$pre.$ti .' = ';
                 $x .= $_REQUEST[$parsename.'id'];
-                $r[] = array($x,$l .' = '. $_REQUEST[$parsename.'id']);
+                $xx = getObject($current_user->dbconn,$_REQUEST[$parsename.'id']);
+                // resolve the id and create a usable link for the header
+                if (is_object($xx)) {
+                    $txt = $xx->getLink();
+                } else {
+                    $txt = $_REQUEST[$parsename.'id'];
+                }
+                $r[] = array($x,$l .' = '. $txt);
                 $layout->filter['_fld_'.$ti] = $_REQUEST[$parsename.'id'];
                 $link = addUrlParameter($link,$parsename.'id='.$_REQUEST[$parsename.'id']);
             } else {
@@ -634,6 +639,21 @@
     $r .= "<tr>\n";
     $r .= $layout->showfield(myentities(getLang($x['lang'])),$x['required']
                              ,($x['ftype'] == 'Date' ? $parsename.'_d':$parsename));
+
+    // do not let us edit fixed fields
+    if (isset($layout->fixate[$parsename]) && (true == $layout->fixate[$parsename]) ) {
+        $r .= ' <td colspan="'.($cols-1)."\">\n";
+        $r .= ''. get_custom_field($x,$obj->$fld,$obj);
+        if (isset($_REQUEST[$parsename]))
+            $layout->addHidden($parsename,$_REQUEST[$parsename]);
+        if (isset($_REQUEST[$parsename.'id']))
+            $layout->addHidden($parsename.'id',$_REQUEST[$parsename.'id']);
+        $r .= " </td>\n";
+        return $r;
+    } else {
+        $r .= $parsename;
+    }
+
     if ($x['ftype'] == 'Date') {
         $r .= ' <td colspan="'.($cols-1)."\">\n";
         $xx = &$obj->$fld;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 183
          http://tutos.svn.sourceforge.net/tutos/?rev=183&view=rev
Author:   gokohnert
Date:     2011-05-22 19:06:49 +0000 (Sun, 22 May 2011)

Log Message:
-----------
handle custom sfileds

Modified Paths:
--------------
    trunk/php/expense/expense_overview.php
    trunk/php/expense/expense_select.php

Modified: trunk/php/expense/expense_overview.php
===================================================================
--- trunk/php/expense/expense_overview.php	2011-05-20 11:00:17 UTC (rev 182)
+++ trunk/php/expense/expense_overview.php	2011-05-22 19:06:49 UTC (rev 183)
@@ -165,12 +165,15 @@
             }
 
             $r .= ' <td>&nbsp;'. $b->getAdrRefLink() ."</td>\n";
+
             if ($this->head['category']) {
-                $r .= ' <td>'. $b->getCategory() ."</td>\n";
+                $r .= ' <td>'. $b->getCategory() ."&nbsp;</td>\n";
             }
+
             if ($this->head['quantity']) {
                 $r .= ' <td align="right">'. $b->quantity ."</td>\n";
             }
+
             $r .= ' <td align="right">&nbsp;'. number_format($b->gamount,2,$lang['DecPoint'],$lang['ThousandPoint'])
                  ." ". myentities($b->currency) ."</td>\n";
             if ($b->itax != 0) {
@@ -478,6 +481,21 @@
         overview_arg($this,'cat',OVERVIEW_ARG_INT,'expense',array('category'),array('ExpenseCategory','ExpenseCategories'),'e.');
 
 
+        // custom selectors
+        // get customized non textual search fields
+        $custom = get_custom_sql_select($this,'expense','e',$this->link1);
+        foreach ($custom[0] as $s) {
+            $this->q .= $this->qpre;
+            $this->q .= $s[0];
+            $this->qpre = ' AND ';
+            $this->header .= $this->hpre.$s[1];
+            $this->hpre = '<br />';
+        }
+        foreach ($custom[1] as $s) {
+            $this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
+        }
+        #        $msg .= $this->q;
+
         check_dbacl($this->dbconn,$this->q, $this->user->id);
 
         // sorting

Modified: trunk/php/expense/expense_select.php
===================================================================
--- trunk/php/expense/expense_select.php	2011-05-20 11:00:17 UTC (rev 182)
+++ trunk/php/expense/expense_select.php	2011-05-22 19:06:49 UTC (rev 183)
@@ -61,7 +61,7 @@
 
             $r .= "</tr><tr>\n";
             $r .= $this->showfieldc($lang['ExpenseRefType']);
-            $r .= " <td colspan=\"2\">&nbsp;<b>". $this->ExpenseAskRefType($this->nsrt,0) ."</b>&nbsp;</td>\n";
+            $r .= " <td colspan=\"2\">&nbsp;<b>". $this->ExpenseAskRefType($this->nsrt,1) ."</b>&nbsp;</td>\n";
 
             $r .= "</tr><tr>\n";
             $r .= $this->showfieldc($lang['ExpenseRefName']);
@@ -91,6 +91,16 @@
             $r .= " <td colspan=\"2\">&nbsp;";
             $r .= $this->nstd->EnterDate("t",1);
             $r .= "&nbsp;</td>\n";
+
+            // add custom selectors
+            $x = get_custom_selectors('expense');
+            foreach ($x as $s) {
+                $r .= "</tr><tr>\n";
+                $r .= $this->showfieldc($s[0]);
+                $r .= " <td colspan=\"2\">\n";
+                $r .= $s[1];
+                $r .= " </td>\n";
+            }
         }
 
         $r .= "</tr>\n";
@@ -108,6 +118,7 @@
         $r .= $this->setfocus("expensesearch.name");
         return $r;
     }
+
     /**
      */
     function ExpenseAskRefType ($default,$any) {
@@ -131,6 +142,7 @@
         $r .= "\n</select>";
         return $r;
     }
+
     /**
      * prepare
      */
@@ -186,5 +198,5 @@
 ?>
 <!--
 SVN Info  $Id$
-     $Author$
-     -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 182
          http://tutos.svn.sourceforge.net/tutos/?rev=182&view=rev
Author:   gokohnert
Date:     2011-05-20 11:00:17 +0000 (Fri, 20 May 2011)

Log Message:
-----------
quick fix for password reminder send

Modified Paths:
--------------
    trunk/php/db.p3

Modified: trunk/php/db.p3
===================================================================
--- trunk/php/db.p3	2011-05-20 07:33:24 UTC (rev 181)
+++ trunk/php/db.p3	2011-05-20 11:00:17 UTC (rev 182)
@@ -544,12 +544,18 @@
 $tutos['task_book_state'] = 1;
 $tutos['task_finish_state'] = 2;
 $tutos['task_exact'] = 0;
-$tutos['mailmode'] = 1;
-$tutos['sendmail'] = '/usr/lib/sendmail';
-$tutos['smtphost'] = 'localhost';
-$tutos['smtpport'] = 25;
-$tutos['smtp_username'] = 'change me';
-$tutos['smtp_password'] = 'change me';
+if (!isset($tutos['mailmode']))
+    $tutos['mailmode'] = 1;
+if (!isset($tutos['sendmail']))
+    $tutos['sendmail'] = '/usr/lib/sendmail';
+if (!isset($tutos['smtphost']))
+    $tutos['smtphost'] = 'localhost';
+if (!isset($tutos['smtpport']))
+    $tutos['smtpport'] = 25;
+if (!isset($tutos['smtp_username']))
+    $tutos['smtp_username'] = 'change me';
+if (!isset($tutos['smtp_password']))
+    $tutos['smtp_password'] = 'change me';
 
 $tutos['pagescript'] = '';
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 181
          http://tutos.svn.sourceforge.net/tutos/?rev=181&view=rev
Author:   gokohnert
Date:     2011-05-20 07:33:24 +0000 (Fri, 20 May 2011)

Log Message:
-----------
do not show reference column if filtered by reference

Modified Paths:
--------------
    trunk/php/testmanager/testsuite_overview.php

Modified: trunk/php/testmanager/testsuite_overview.php
===================================================================
--- trunk/php/testmanager/testsuite_overview.php	2011-05-16 13:43:09 UTC (rev 180)
+++ trunk/php/testmanager/testsuite_overview.php	2011-05-20 07:33:24 UTC (rev 181)
@@ -54,7 +54,7 @@
             $r .= $this->orderHeader('pos',$lang['TestsuitePosition'],$this->link2);
             $this->flds++;
         }
-        if ($this->head['refid']) {
+        if ($this->head['ref_id']) {
             $r .= $this->orderHeader('ref_id',$lang['TestsuiteRef'],$this->link2);
             $this->flds++;
         }
@@ -92,7 +92,7 @@
                 }
                 $r .= '</td>'."\n";
             }
-            if ($this->head['refid']) {
+            if ($this->head['ref_id']) {
                 if (is_object($b->ref)) {
                     $x = $this->mark_filter(myentities($b->ref->getFullName()),'reffn');
                 } else {
@@ -206,7 +206,7 @@
 
         $this->header = '';
         $this->hpre = '';
-        $this->head['refid'] = true;
+        $this->head['ref_id'] = true;
         $this->head['t_state'] = true;
         $this->head['pos'] = false;
 
@@ -284,6 +284,12 @@
         $m[category][] = "obj";
         $this->addmenu($m);
 
+        if ( isset($_REQUEST['refid']) && is_numeric($_REQUEST['refid']) ) {
+            $obj = getObject($this->user->dbconn,$_REQUEST['refid']);
+            $m = testsuite::getaddLink($this->user,$obj);
+            $m[category][] = "obj";
+            $this->addmenu($m);
+        }
 
         if (class_exists('url')) {
             $this->addMenu(url::getAddLinkPreset($this->user,$this));
@@ -298,5 +304,5 @@
 ?>
 <!--
 SVN Info  $Id$
-     $Author$
-     -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 180
          http://tutos.svn.sourceforge.net/tutos/?rev=180&view=rev
Author:   gokohnert
Date:     2011-05-16 13:43:09 +0000 (Mon, 16 May 2011)

Log Message:
-----------
fix missing linefeed

Modified Paths:
--------------
    trunk/php/timetrack/timetrack_overview.php

Modified: trunk/php/timetrack/timetrack_overview.php
===================================================================
--- trunk/php/timetrack/timetrack_overview.php	2011-05-16 12:30:40 UTC (rev 179)
+++ trunk/php/timetrack/timetrack_overview.php	2011-05-16 13:43:09 UTC (rev 180)
@@ -743,7 +743,7 @@
             $this->link1 = addUrlParameter($this->link1,"worker=".$_GET['worker']);
             $this->addHidden("worker",$_GET['worker']);
             $this->head['worker'] = false;
-            $this->header .= $lang['TimetrackWorker'].' = '.$x->getLink();
+            $this->header .= $this->hpre.$lang['TimetrackWorker'].' = '.$x->getLink();
             $this->hpre = '<br />';
         }
         check_dbacl($this->dbconn, $this->q, $this->user->id);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 179
          http://tutos.svn.sourceforge.net/tutos/?rev=179&view=rev
Author:   gokohnert
Date:     2011-05-16 12:30:40 +0000 (Mon, 16 May 2011)

Log Message:
-----------
fix some timezone problem

Modified Paths:
--------------
    trunk/php/Date.pinc
    trunk/php/app_new.php
    trunk/php/app_new_r.php
    trunk/php/history.pinc
    trunk/php/history_show.php

Modified: trunk/php/Date.pinc
===================================================================
--- trunk/php/Date.pinc	2011-05-16 11:42:45 UTC (rev 178)
+++ trunk/php/Date.pinc	2011-05-16 12:30:40 UTC (rev 179)
@@ -939,6 +939,17 @@
 
     /**
      */
+    function getDateTime_notz() {
+        global $lang;
+
+        if ( $this->notime == 1) {
+            return sprintf ($lang['DateTimeFormat'],"--","--","----","--","--","   ");
+        }
+        return Date(str_replace(' T','',$lang['DateTimePHP']),$this->ts);
+    }
+
+    /**
+     */
     function getDateTime() {
         global $lang;
 

Modified: trunk/php/app_new.php
===================================================================
--- trunk/php/app_new.php	2011-05-16 11:42:45 UTC (rev 178)
+++ trunk/php/app_new.php	2011-05-16 12:30:40 UTC (rev 179)
@@ -268,8 +268,8 @@
             $this->name = $lang['AppointCreate'];
             /* New event */
             if (isset($_GET['t']) && is_numeric($_GET['t']) && ($_GET['t'] != -1) ) {
-                $this->obj->start->setDateTime($_GET['t']);
-                $this->obj->end->setDateTime($_GET['t']);
+                $this->obj->start->setDateTime($_GET['t'],1);
+                $this->obj->end->setDateTime($_GET['t'],1);
             }
             $p[$this->user->id] = 2;
         }
@@ -289,10 +289,10 @@
             $this->obj->mod_allow = $_GET['mod_allow'];
         }
         if ( isset($_GET['start']) ) {
-            $this->obj->start->setDateTime($_GET['start']);
+            $this->obj->start->setDateTime($_GET['start'],1);
         }
         if ( isset($_GET['end']) ) {
-            $this->obj->end->setDateTime($_GET['end']);
+            $this->obj->end->setDateTime($_GET['end'],1);
         }
         if ( isset($_GET['remember']) ) {
             $this->obj->remember = $_GET['remember'];
@@ -372,5 +372,5 @@
 ?>
 <!--
 SVN Info  $Id$
-     $Author$
-     -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file

Modified: trunk/php/app_new_r.php
===================================================================
--- trunk/php/app_new_r.php	2011-05-16 11:42:45 UTC (rev 178)
+++ trunk/php/app_new_r.php	2011-05-16 12:30:40 UTC (rev 179)
@@ -246,8 +246,8 @@
             $this->name = $lang['AppointCreate'];
             /* New event */
             if (isset($_GET['t']) && is_numeric($_GET['t']) && ($_GET['t'] != -1) ) {
-                $this->obj->start->setDateTime($_GET['t']);
-                $this->obj->end->setDateTime($_GET['t']);
+                $this->obj->start->setDateTime($_GET['t'],1);
+                $this->obj->end->setDateTime($_GET['t'],1);
             }
             $this->obj->repeat = 1;
             $p[$this->user->id] = 2;
@@ -267,10 +267,10 @@
             $this->obj->mod_allow = $_GET['mod_allow'];
         }
         if ( isset($_GET['start']) ) {
-            $this->obj->start->setDateTime($_GET['start']);
+            $this->obj->start->setDateTime($_GET['start'],1);
         }
         if ( isset($_GET['end']) ) {
-            $this->obj->end->setDateTime($_GET['end']);
+            $this->obj->end->setDateTime($_GET['end'],1);
         }
         if ( isset($_GET['remember']) ) {
             $this->obj->remember = $_GET['remember'];
@@ -343,5 +343,5 @@
 ?>
 <!--
 SVN Info  $Id$
-     $Author$
-     -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file

Modified: trunk/php/history.pinc
===================================================================
--- trunk/php/history.pinc	2011-05-16 11:42:45 UTC (rev 178)
+++ trunk/php/history.pinc	2011-05-16 12:30:40 UTC (rev 179)
@@ -235,13 +235,13 @@
     $f['field'] = (isset( $lang[$h['field']]) ? $lang[$h['field']] : $h['field']);
     $b = new TUTOS_Date_Time();
     if ( $h['old'] != '' ) {
-        $b->setDateTime($h['old']);
-        $f['old'] = ($dateonly ? $b->getDate():$b->getDateTime());
+        $b->setDateTime($h['old'],1);
+        $f['old'] = ($dateonly ? $b->getDate():$b->getDateTime_notz());
     }
 
     if ( $h['new'] != '' ) {
-        $b->setDateTime($h['new']);
-        $f['new'] = ($dateonly ? $b->getDate():$b->getDateTime());
+        $b->setDateTime($h['new'],1);
+        $f['new'] = ($dateonly ? $b->getDate():$b->getDateTime_notz());
     }
 
     return $f;

Modified: trunk/php/history_show.php
===================================================================
--- trunk/php/history_show.php	2011-05-16 11:42:45 UTC (rev 178)
+++ trunk/php/history_show.php	2011-05-16 12:30:40 UTC (rev 179)
@@ -197,7 +197,7 @@
             }
             $mt = new TUTOS_Date_Time();
             $mt->setDateTime($f["m_time"]);
-            $r .= " <td>&nbsp;". $mt->getDateTime() ."</td>\n";
+            $r .= ' <td>&nbsp;'. $mt->getDateTime() ."</td>\n";
             $r .= $this->OverviewRowEnd($line++);
             flush();
             unset($adr);
@@ -313,5 +313,5 @@
 ?>
 <!--
 SVN Info  $Id$
-     $Author$
-     -->
+$Author$
+-->
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 178
          http://tutos.svn.sourceforge.net/tutos/?rev=178&view=rev
Author:   gokohnert
Date:     2011-05-16 11:42:45 +0000 (Mon, 16 May 2011)

Log Message:
-----------
search tasks by name

Modified Paths:
--------------
    trunk/php/product.pinc

Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc	2011-05-16 11:40:47 UTC (rev 177)
+++ trunk/php/product.pinc	2011-05-16 11:42:45 UTC (rev 178)
@@ -605,6 +605,29 @@
     }
 
     /**
+     * search for a task
+     * fill a array with possible entries
+     */
+    function search_tasks_by_name(&$arr,&$user,$name) {
+        global $tutos;
+
+        $n = 0;
+
+        task::obj_read($this);
+        foreach ($this->fulltasklist as $a => $b) {
+            if (stristr($b->getFullName(),$name)) {
+                if ($b->use_ok() ) {
+                    $arr[$b->id] = $b;
+                    unset($b);
+                    $n++;
+                }
+            }
+        }
+
+        return $n;
+    }
+
+    /**
      * search for a product/project
      * fill a array with possible projects
      * mode 1 fill objects


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 177
          http://tutos.svn.sourceforge.net/tutos/?rev=177&view=rev
Author:   gokohnert
Date:     2011-05-16 11:40:47 +0000 (Mon, 16 May 2011)

Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/layout/layout_base.pinc

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2011-05-16 08:33:57 UTC (rev 176)
+++ trunk/php/layout/layout_base.pinc	2011-05-16 11:40:47 UTC (rev 177)
@@ -39,6 +39,9 @@
     function init (tutos_user &$user) {
         global $tutos,$msg;
 
+        if (!isset($tutos['shorthtml'])) {
+            $tutos['shorthtml'] = 0;
+        }
         list($usec,$sec) = explode(" ",microtime());
         $this->start_ts = (float)$usec + (float)$sec;
         $this->user = &$user;
@@ -927,4 +930,4 @@
         return $html;
     }
 }
-?>
\ No newline at end of file
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 176
          http://tutos.svn.sourceforge.net/tutos/?rev=176&view=rev
Author:   gokohnert
Date:     2011-05-16 08:33:57 +0000 (Mon, 16 May 2011)

Log Message:
-----------
search by tasks name inside a project

Modified Paths:
--------------
    trunk/php/ajax.php
    trunk/php/webelements.p3

Modified: trunk/php/ajax.php
===================================================================
--- trunk/php/ajax.php	2011-05-15 16:45:43 UTC (rev 175)
+++ trunk/php/ajax.php	2011-05-16 08:33:57 UTC (rev 176)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2005 - 2010 by Gero Kohnert
+ *  Copyright 2005 - 2011 by Gero Kohnert
  *
  *  SVN Info  $Id$
  *  $Author$
@@ -51,6 +51,7 @@
     return $r;
 }
 
+
 $r = '';
 $r .= '<?xml version="1.0" encoding="'. $lang['content_encoding'] .'" ?>'."\n";
 $r .= '<tutos generated="'.time().'">'."\n";
@@ -95,13 +96,13 @@
 }
 
 foreach ($grp as $c) {
-    if ($c == usetaskmanagement) {
+    if ( ($c == usetaskmanagement) || ($c == 'J') ) {
         require_once 'task.pinc';
     }
 
     $res = array();
     $cnt = 0;
-#    error_log('G|'.$c.'| '.$item.' '.json_encode($mods)."\r\n",3,$tutos[errlog]);
+#    error_log('G|'.$c.'| '.$item.' '.json_encode($mods).' '.$id."\r\n",3,$tutos[errlog]);
 
     if ($c == 'R') {
         // search for roles in a given project
@@ -120,6 +121,23 @@
             }
         }
         continue;
+    } else if ($c == 'J') {
+        // search for tasks in a given project
+        if ($id == -1) continue;
+        require_once 'product.pinc';
+        $obj = getObject($dbconn,$id);
+        if (method_exists($obj,'search_tasks_by_name')) {
+            $obj->search_tasks_by_name($res,$current_user,$item);
+            foreach ($res as $a => $b) {
+                if (! $b->see_ok()) continue;
+                $r .= add_item ($b);
+                if($cnt++ == 5) {
+                    $cut = true;
+                    break;
+                }
+            }
+        }
+        continue;
     } else if ($c == 'f') {
         read_config_values_by_tag($current_user->dbconn,array('file'));
         if (! $tutos['file_local_allow']) continue;

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2011-05-15 16:45:43 UTC (rev 175)
+++ trunk/php/webelements.p3	2011-05-16 08:33:57 UTC (rev 176)
@@ -436,7 +436,7 @@
                 case 'integer':
                 case 'double':
                     $msg .= $a;
-                    break;
+                break;
                 case 'boolean':
                     if (true === $a){
                         $msg .= 'T';
@@ -1333,6 +1333,9 @@
         if ( strstr($mode,"t") != FALSE ) {
             $ma[] = useteams;
         }
+        if ( strstr($mode,"j") != FALSE ) {
+            $ma[] = usetaskmanagement;
+        }
         if ( strstr($mode,"c") != FALSE ) {
             $ma[] = usecompany;
         }
@@ -1368,6 +1371,19 @@
     $nullmsg = '';
 
     foreach ($ma as $c) {
+        if ($c == 'J') {
+            if (!is_object($obj) || !isset($obj->search_id)) {
+                continue;
+            }
+            $sobj = getObject($obj->dbconn,$obj->search_id);
+            if (method_exists($sobj,'search_tasks_by_name')) {
+                $cnt = $sobj->search_tasks_by_name($res,$obj,$name);
+                $n += $cnt;
+                unset($sobj);
+            }
+            $nullmsg .= sprintf($lang['Err0012'],$lang['ProdRoles'],$name) ."<br />";
+            continue;
+        }
         if ($c == 'R') {
             if (!is_object($obj) || !isset($obj->search_id)) {
                 continue;
@@ -1772,6 +1788,12 @@
         if ( strstr($grp,"t") != FALSE ) {
             $ma[] = useteams;
         }
+        if ( strstr($grp,"j") != FALSE ) {  // j = task (job)
+            $ma[] = usetaskmanagement;
+        }
+        if ( strstr($grp,"J") != FALSE ) {  // j = task (job)
+            $ma[] = 'J';
+        }
         if ( strstr($grp,"c") != FALSE ) {
             $ma[] = usecompany;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 175
          http://tutos.svn.sourceforge.net/tutos/?rev=175&view=rev
Author:   gokohnert
Date:     2011-05-15 16:45:43 +0000 (Sun, 15 May 2011)

Log Message:
-----------
new default_phone function

Modified Paths:
--------------
    trunk/php/address.pinc

Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc	2011-05-15 16:45:04 UTC (rev 174)
+++ trunk/php/address.pinc	2011-05-15 16:45:43 UTC (rev 175)
@@ -383,6 +383,33 @@
     }
 
     /**
+     * Read all locations data and find the phone number.
+     */
+    function default_phone() {
+        if ( ! $this->rl2 ) {
+            $this->read_locs_data();
+        };
+        $e = "";
+
+        if ( isset($this->locall) ) {
+            foreach($this->locall as $i => $f) {
+                if ( $f->phone_1 != "") {
+                    $e = $f->phone_1;
+                    if ( $f->category == 2 ) {
+                        return $e;
+                    }
+                } elseif ( $f->phone_2 != "" ) {
+                    $e = $f->phone_2;
+                    if ( $f->category == 2 ) {
+                        return $e;
+                    }
+                }
+            }
+        }
+        return $e;
+    }
+
+    /**
      * Return a URL to modify this address
      */
     function getModURL() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 174
          http://tutos.svn.sourceforge.net/tutos/?rev=174&view=rev
Author:   gokohnert
Date:     2011-05-15 16:45:04 +0000 (Sun, 15 May 2011)

Log Message:
-----------
handle fixaton of values / empty nodata values in SelectOne

Modified Paths:
--------------
    trunk/php/webelements.p3

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2011-05-15 16:43:46 UTC (rev 173)
+++ trunk/php/webelements.p3	2011-05-15 16:45:04 UTC (rev 174)
@@ -436,7 +436,7 @@
                 case 'integer':
                 case 'double':
                     $msg .= $a;
-                break;
+                    break;
                 case 'boolean':
                     if (true === $a){
                         $msg .= 'T';
@@ -989,6 +989,10 @@
         foreach ($_REQUEST['hide'] as $i) {
             $gotourl =  addUrlParameter($gotourl,'hide[]='.$i,$http);
         }
+    if (isset($_REQUEST['fix']) && is_array($_REQUEST['fix']))
+        foreach ($_REQUEST['fix'] as $i) {
+            $gotourl =  addUrlParameter($gotourl,'fix[]='.$i,$http);
+        }
     return $gotourl;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 173
          http://tutos.svn.sourceforge.net/tutos/?rev=173&view=rev
Author:   gokohnert
Date:     2011-05-15 16:43:46 +0000 (Sun, 15 May 2011)

Log Message:
-----------
handle fixaton of values / empty nodata values in SelectOne

Modified Paths:
--------------
    trunk/php/layout/layout_base.pinc
    trunk/php/layout/new2_layout.pinc
    trunk/php/layout/new_layout.pinc

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2011-05-15 16:42:34 UTC (rev 172)
+++ trunk/php/layout/layout_base.pinc	2011-05-15 16:43:46 UTC (rev 173)
@@ -459,6 +459,12 @@
     function nodata($obj,$tarr) {
         if ($tarr[type] == 'TS_TYPE') {
             return $obj->$tarr['field']->notime;
+        } else if ($tarr[type] == 'ID_TYPE') {
+            if ( isset($tarr['ftype']) && ($tarr['ftype'] == 'SelectOne') ) {
+                if ( isset($tarr['empty']) && ($tarr['empty'] == $obj->$tarr['field'] ) ) {
+                    return true;
+                }
+            }
         } else if ('' == ($obj->$tarr['field'])) {
             return true;
         }
@@ -520,7 +526,20 @@
                 $r .= $this->showdata('## unsupported TS type/field ## '.$tarr[type].'/'.$tarr['field'] .'/'.$tarr['ftype'],$colsd);
             }
         } else if ($tarr[type] == 'ID_TYPE' && is_numeric($obj->$tarr['field']) ) {
-            $r .= $this->showdata(myentities($obj->$tarr['field']) ,$colsd);
+            // Handle index in an lang array
+            if ( isset($tarr['ftype']) && ($tarr['ftype'] == 'SelectOne') ) {
+                if ( isset($tarr['empty']) && ($tarr['empty'] == $obj->$tarr['field']) ) {
+                    $r .= $this->showdata('-',$colsd);
+                } else if ( isset($tarr['lang']) && isset($lang[$tarr['lang'].'_']) && is_array($lang[$tarr['lang'].'_']) && isset($lang[$tarr['lang'].'_'][$obj->$tarr['field']]) ) {
+                    $r .= $this->showdata(myentities($lang[$tarr['lang'].'_'][$obj->$tarr['field']]) ,$colsd);
+                } else if ( isset($tarr['langI']) && isset($lang[$tarr['langI']]) && is_array($lang[$tarr['langI']]) && isset($lang[$tarr['langI']][$obj->$tarr['field']]) ) {
+                    $r .= $this->showdata(myentities($lang[$tarr['langI']][$obj->$tarr['field']]) ,$colsd);
+                } else {
+                    $r .= $this->showdata('??? '.myentities($obj->$tarr['field']) ,$colsd);
+                }
+            } else {
+                $r .= $this->showdata(myentities($obj->$tarr['field']) ,$colsd);
+            }
         } else {
             $r .= $this->showdata('## unsupported type/field ## '.$tarr[type].'/'.$tarr['field'] ,$colsd);
         }

Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc	2011-05-15 16:42:34 UTC (rev 172)
+++ trunk/php/layout/new2_layout.pinc	2011-05-15 16:43:46 UTC (rev 173)
@@ -366,6 +366,10 @@
             if ($v == true)
                 $r .= '<input type="hidden" name="hide[]" value="'. $i ."\" />\n";
         }
+        foreach ($this->fixate as $i => $v ) {
+            if ($v == true)
+                $r .= '<input type="hidden" name="fix[]" value="'. $i ."\" />\n";
+        }
         $this->hidden = array();
         return $r;
     }

Modified: trunk/php/layout/new_layout.pinc
===================================================================
--- trunk/php/layout/new_layout.pinc	2011-05-15 16:42:34 UTC (rev 172)
+++ trunk/php/layout/new_layout.pinc	2011-05-15 16:43:46 UTC (rev 173)
@@ -372,6 +372,14 @@
         foreach ($this->hidden as $v ) {
             $r .= '<input type="hidden" name="'. $v[0] .'" value="'. $v[1] ."\" />\n";
         }
+        foreach ($this->hide as $i => $v ) {
+            if ($v == true)
+                $r .= '<input type="hidden" name="hide[]" value="'. $i ."\" />\n";
+        }
+        foreach ($this->fixate as $i => $v ) {
+            if ($v == true)
+                $r .= '<input type="hidden" name="fix[]" value="'. $i ."\" />\n";
+        }
         $this->hidden = array();
         return $r;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 172
          http://tutos.svn.sourceforge.net/tutos/?rev=172&view=rev
Author:   gokohnert
Date:     2011-05-15 16:42:34 +0000 (Sun, 15 May 2011)

Log Message:
-----------
more generic

Modified Paths:
--------------
    trunk/php/expense/expense_ins.php
    trunk/php/expense/expense_new.php
    trunk/php/expense/expense_show.php
    trunk/php/expense/mtable.pinc

Modified: trunk/php/expense/expense_ins.php
===================================================================
--- trunk/php/expense/expense_ins.php	2011-05-14 15:48:17 UTC (rev 171)
+++ trunk/php/expense/expense_ins.php	2011-05-15 16:42:34 UTC (rev 172)
@@ -110,7 +110,7 @@
 }
 
 
-if ( empty($_POST['gamount']) ) {
+if ( empty($_POST['quantity']) ) {
     $msg .= sprintf($lang['Err0009'],$lang['ExpenseQuantity']) ."<br />";
     $gotourl = addBadField($gotourl,'quantity',true);
 } else {

Modified: trunk/php/expense/expense_new.php
===================================================================
--- trunk/php/expense/expense_new.php	2011-05-14 15:48:17 UTC (rev 171)
+++ trunk/php/expense/expense_new.php	2011-05-15 16:42:34 UTC (rev 172)
@@ -66,14 +66,24 @@
         $r .= "<tr>\n";
         $r .= $this->showfieldc($lang['ExpenseSupplier'],1,"sid");
         $r .= " <td colspan=\"5\">\n";
-        $r .= select_from_array_or_input($this->obj,'s',$this->obj->supplier,0,'cd');
+        if (!isset($this->fixate['sid']) || !$this->fixate['sid'] )  {
+            $r .= select_from_array_or_input($this->obj,'s',$this->obj->supplier,0,'cd');
+        } else {
+            $r .= $this->obj->supplier->getLink();
+            $this->addhidden("sid",$this->obj->supplier->id);
+        }
         $r .= " </td>\n";
         $r .= "</tr>\n";
 
         $r .= "<tr>\n";
         $r .= $this->showfieldc($lang['ExpenseAddress'],1,"aid");
         $r .= " <td colspan=\"5\">\n";
-        $r .= select_from_array_or_input($this->obj,'a',$this->obj->adr_ref,0,'a');
+        if (!isset($this->fixate['aid']) || !$this->fixate['aid'] )  {
+            $r .= select_from_array_or_input($this->obj,'a',$this->obj->adr_ref,0,'a');
+        } else {
+            $r .= $this->obj->adr_ref->getLink();
+            $this->addhidden("aid",$this->obj->adr_ref->id);
+        }
         $r .= " </td>\n";
         $r .= "</tr>\n";
 
@@ -133,10 +143,14 @@
         $r .= " <td colspan=\"2\">\n";
         $r .= $this->obj->t_start->EnterDateTime("t_start");
         $r .= " </td>\n";
-        $r .= $this->showfieldc($lang['ExpenseEndTime'],0,"t_end");
-        $r .= " <td colspan=\"2\">\n";
-        $r .= $this->obj->t_end->EnterDateTime("t_end",1,true);
-        $r .= " </td>\n";
+        if (!isset($this->hide['t_end']) || !$this->hide['t_end'] )  {
+            $r .= $this->showfieldc($lang['ExpenseEndTime'],0,"t_end");
+            $r .= " <td colspan=\"2\">\n";
+            $r .= $this->obj->t_end->EnterDateTime("t_end",1,true);
+            $r .= " </td>\n";
+        } else {
+            $r .= " <td colspan=\"3\">&nbsp;</td>\n";
+        }
         $r .= "</tr>\n";
 
         if (!isset($this->hide['mop']) || !$this->hide['mop'] )  {
@@ -149,24 +163,33 @@
         } else {
             $this->addhidden("mop",-1);
         }
+        if (!isset($this->hide['city']) || !$this->hide['city'] )  {
+            $r .= "<tr>\n";
+            $r .= $this->showfieldc($lang['City'],0,"city");
+            $r .= ' <td colspan="5"><input id="city" size="80" maxlength="'. $table['expense']['city'][size] .'" name="city" value="'. myentities($this->obj->city) ."\" /></td>\n";
+            $r .= "</tr>\n";
+        }
+        if (!isset($this->hide['country']) || !$this->hide['country'] )  {
+            $r .= "<tr>\n";
+            $r .= $this->showfieldc($lang['Country'],0,"country");
+            $r .= "<td colspan=\"5\">\n";
+            $r .= SelectCntryCde("country", $this->obj->country);
+            $r .= " </td>\n";
+            $r .= "</tr>\n";
+        }
         $r .= "<tr>\n";
-        $r .= $this->showfieldc($lang['City'],0,"city");
-        $r .= ' <td colspan="5"><input id="city" size="80" maxlength="'. $table['expense']['city'][size] .'" name="city" value="'. myentities($this->obj->city) ."\" /></td>\n";
-        $r .= "</tr>\n";
-
-        $r .= "<tr>\n";
-        $r .= $this->showfieldc($lang['Country'],0,"country");
+        $r .= $this->showfieldc($lang['ExpenseCCentre'],0,"ccentre");
         $r .= "<td colspan=\"5\">\n";
-        $r .= SelectCntryCde("country", $this->obj->country);
+        if (!isset($this->fixate['ccentre']) || !$this->fixate['ccentre'] )  {
+            $r .= '<input id="ccentre" size="80" maxlength="'. $table['expense']['ccentre'][size] .'" name="ccentre" value="'. myentities($this->obj->ccentre) ."\" />\n";
+        } else {
+            $r .= myentities($this->obj->ccentre);
+            $this->addhidden("ccentre",$this->obj->ccentre);
+        }
         $r .= " </td>\n";
         $r .= "</tr>\n";
 
         $r .= "<tr>\n";
-        $r .= $this->showfieldc($lang['ExpenseCCentre'],0,"ccentre");
-        $r .= ' <td colspan="5"><input id="ccentre" size="80" maxlength="'. $table['expense']['ccentre'][size] .'" name="ccentre" value="'. myentities($this->obj->ccentre) ."\" /></td>\n";
-        $r .= "</tr>\n";
-
-        $r .= "<tr>\n";
         $r .= $this->showfield($lang['ExpenseDescription'],0,"description");
         $r .= ' <td colspan="5"><textarea id="description"  rows="10" cols="60" name="description">'. $this->obj->description ."</textarea></td>\n";
         $r .= "</tr>\n";
@@ -252,7 +275,9 @@
 
         preset_from_array_or_input($this->obj,'adr_ref','a');
         preset_from_array_or_input($this->obj,'supplier','s');
-
+        if (is_object($this->obj->supplier)) {
+            $this->obj->sup_id = $this->obj->supplier->id;
+        }
         if (($this->obj->id < 0) && !$this->user->feature_ok(useexpenses,PERM_NEW) ) {
             $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
             $this->stop = true;
@@ -266,6 +291,7 @@
         $this->obj->read_adr_reference();
         $this->obj->read_relations();
 
+
         if ( is_object($this->obj->ref) && !$this->obj->ref->use_ok() ) {
             $msg .= sprintf($lang['Err0001'],$lang[$this->obj->ref->getType()],$this->obj->ref->getFullName());
             $this->stop = true;

Modified: trunk/php/expense/expense_show.php
===================================================================
--- trunk/php/expense/expense_show.php	2011-05-14 15:48:17 UTC (rev 171)
+++ trunk/php/expense/expense_show.php	2011-05-15 16:42:34 UTC (rev 172)
@@ -68,11 +68,7 @@
         $r .= $this->showdata($this->obj->getAdrRefLink(),3);
         $r .= "</tr>\n";
 
-        $r .= "<tr>\n";
-        $r .= $this->showfield($lang['ExpenseCategory']);
-        $r .= $this->showdata($this->obj->getCategory(),3);
-        $r .= "</tr>\n";
-
+        $r .= $this->showfield_data_row($this->obj,$table['expense']['category'],3,1);
         $r .= $this->showfield_data_row($this->obj,$table['expense']['reason'],3,1);
         $r .= $this->showfield_data_row($this->obj,$table['expense']['people'],3,1);
 
@@ -103,12 +99,7 @@
 
         $r .= $this->showfield_data_row($this->obj,$table['expense']['t_start'],3,1);
         $r .= $this->showfield_data_row($this->obj,$table['expense']['t_end'],3,1);
-
-        $r .= "<tr>\n";
-        $r .= $this->showfield($lang['ExpenseMOP']);
-        $r .= $this->showdata($this->obj->getMOP(),3);
-        $r .= "</tr>\n";
-
+        $r .= $this->showfield_data_row($this->obj,$table['expense']['mop'],3,1);
         $r .= $this->showfield_data_row($this->obj,$table['expense']['city'],3,1);
 
         $r .= "<tr>\n";

Modified: trunk/php/expense/mtable.pinc
===================================================================
--- trunk/php/expense/mtable.pinc	2011-05-14 15:48:17 UTC (rev 171)
+++ trunk/php/expense/mtable.pinc	2011-05-15 16:42:34 UTC (rev 172)
@@ -28,7 +28,15 @@
                                          'field'       => 'description',
                                          'lang'        => 'ExpenseDescription',
     );
-$table['expense']['category']    = array(type => 'ID_TYPE',              constraints => '',    Desc => 'category of expenses');
+$table['expense']['category']    = array(type => 'ID_TYPE',              constraints => '',
+                                         Desc => 'category of expenses',
+                                         'ftype'       => 'SelectOne',
+                                         'field'       => 'category',
+                                         'hideempty'   => true,
+                                         'empty'       => -1,
+                                         'lang'        => 'ExpenseCategory',
+                                         'langI'       => 'ExpenseCategories',
+    );
 $table['expense']['reason']      = array(type => 'VARCHAR', size => 50,  constraints => '',
                                          Desc => 'reason of the expense',
                                          'hideempty'   => true,
@@ -56,7 +64,15 @@
 $table['expense']['currency']    = array(type => 'VARCHAR', size =>  4,  constraints => 'NN',  Desc => 'currency for gross amount');
 $table['expense']['deduction']   = array(type => 'float',                constraints => '',    Desc => 'possible deduction');
 $table['expense']['itax']        = array(type => 'float',                constraints => '',    Desc => 'input tax for gross amount');
-$table['expense']['mop']         = array(type => 'ID_TYPE',              constraints => '',    Desc => 'method of payment');
+$table['expense']['mop']         = array(type => 'ID_TYPE',              constraints => '',
+                                         Desc => 'method of payment',
+                                         'ftype'       => 'SelectOne',
+                                         'hideempty'   => true,
+                                         'empty'       => -1,
+                                         'field'       => 'mop',
+                                         'lang'        => 'ExpenseMOP',
+                                         'langI'       => 'ExpenseMOPs',
+    );
 $table['expense']['ccentre']     = array(type => 'VARCHAR', size => 50,  constraints => '',
                                          Desc => 'cost centre',
                                          'hideempty'   => true,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 171
          http://tutos.svn.sourceforge.net/tutos/?rev=171&view=rev
Author:   gokohnert
Date:     2011-05-14 15:48:17 +0000 (Sat, 14 May 2011)

Log Message:
-----------
more checks

Modified Paths:
--------------
    trunk/php/scrum/log_new.php

Modified: trunk/php/scrum/log_new.php
===================================================================
--- trunk/php/scrum/log_new.php	2011-05-14 15:47:34 UTC (rev 170)
+++ trunk/php/scrum/log_new.php	2011-05-14 15:48:17 UTC (rev 171)
@@ -908,7 +908,11 @@
             }
             $this->name .= ' : '. $this->sprint->getFullName();
             $this->sprint->read_reference();
-
+            if (!is_object($this->sprint->pref)) {
+                $msg .= 'no project';
+                $this->stop = true;
+                return;
+            }
             ScrumLog::obj_read($this->sprint);
             ScrumLog::obj_read($this->sprint->pref);
         } else if ($this->mode == 'manage_p') {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 170
          http://tutos.svn.sourceforge.net/tutos/?rev=170&view=rev
Author:   gokohnert
Date:     2011-05-14 15:47:34 +0000 (Sat, 14 May 2011)

Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/layout/layout_base.pinc

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2011-05-14 15:03:33 UTC (rev 169)
+++ trunk/php/layout/layout_base.pinc	2011-05-14 15:47:34 UTC (rev 170)
@@ -457,8 +457,8 @@
      * check if there is no data to display
      */
     function nodata($obj,$tarr) {
-        if (($tarr[type] == 'TS_TYPE') && ($obj->$tarr['field']->notime) ) {
-            return true;
+        if ($tarr[type] == 'TS_TYPE') {
+            return $obj->$tarr['field']->notime;
         } else if ('' == ($obj->$tarr['field'])) {
             return true;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 169
          http://tutos.svn.sourceforge.net/tutos/?rev=169&view=rev
Author:   gokohnert
Date:     2011-05-14 15:03:33 +0000 (Sat, 14 May 2011)

Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/timetrack/mtable.pinc

Modified: trunk/php/timetrack/mtable.pinc
===================================================================
--- trunk/php/timetrack/mtable.pinc	2011-05-14 15:01:28 UTC (rev 168)
+++ trunk/php/timetrack/mtable.pinc	2011-05-14 15:03:33 UTC (rev 169)
@@ -12,31 +12,28 @@
  *  $Author$
  */
 
+$table['timetrack'][name] = 'timetrack';
+$table['timetrack'][Desc] = 'TUTOS timetrack';
+$table['timetrack']['id']          = array(type => 'ID_TYPE',     constraints => 'PK',  Desc => 'Object ID');
+$table['timetrack']['adr_id']      = array(type => 'ID_TYPE',     constraints => 'NN',  Desc => 'id of worker');
+$table['timetrack']['link_id']     = array(type => 'ID_TYPE',     constraints => 'NN',  Desc => 'id of worked object');
+$table['timetrack']['volume']      = array(type => 'float',       constraints => '',    Desc => 'work volume in hours');
+$table['timetrack']['volume_todo'] = array(type => 'float',       constraints => '',    Desc => 'work volume still to do in hours');
+$table['timetrack']['distance']    = array(type => 'float',       constraints => '',    Desc => 'distance travelled',
+                                           'hideempty' => true,
+                                           'field'     => 'distance',
+                                           'lang'      => 'Distance'  );
+$table['timetrack']['t_start']     = array(type => 'TS_TYPE',     constraints => '',    Desc => 'start of work');
+$table['timetrack']['t_end']       = array(type => 'TS_TYPE',     constraints => '',    Desc => 'end of work');
+$table['timetrack']['description'] = array(type => 'VARCHAR', size => 120, constraints => '',    Desc => 'description');
+$table['timetrack']['invoice']     = array(type => 'ID_TYPE',     constraints => '',    Desc => 'id of invoice');
+$table['timetrack']['state']       = array(type => 'ID_TYPE',     constraints => '',    Desc => 'state of this object');
+$table['timetrack']['cph']         = array(type => 'float',       constraints => '',    Desc => 'cost per hour for this work');
+$table['timetrack']['currency']    = array(type => 'VARCHAR', size => 4,  constraints => '',    Desc => 'currency for cph');
+$table['timetrack']['vtime']       = array(type => 'TS_TYPE',     constraints => '',    Desc => 'work date');
+$table['timetrack']['creator']     = array(type => 'ID_TYPE',     constraints => '',    Desc => 'creator ID');
+$table['timetrack']['creation']    = array(type => 'TS_TYPE',     constraints => '',    Desc => 'creation date');
 
-$table['timetrack'] = array(
-    name => 'timetrack',
-    Desc => 'TUTOS timetrack',
-    'id'          => array(type => 'ID_TYPE',     constraints => 'PK',  Desc => 'Object ID'),
-    'adr_id'      => array(type => 'ID_TYPE',     constraints => 'NN',  Desc => 'id of worker'),
-    'link_id'     => array(type => 'ID_TYPE',     constraints => 'NN',  Desc => 'id of worked object'),
-    'volume'      => array(type => 'float',       constraints => '',    Desc => 'work volume in hours'),
-    'volume_todo' => array(type => 'float',       constraints => '',    Desc => 'work volume still to do in hours'),
-    'distance'    => array(type => 'float',       constraints => '',    Desc => 'distance travelled',
-                           'hideempty' => true,
-                           'field'     => 'distance',
-                           'lang'      => 'Distance',
-        ),
-    't_start'     => array(type => 'TS_TYPE',     constraints => '',    Desc => 'start of work'),
-    't_end'       => array(type => 'TS_TYPE',     constraints => '',    Desc => 'end of work'),
-    'description' => array(type => 'VARCHAR', size => 120, constraints => '',    Desc => 'description'),
-    'invoice'     => array(type => 'ID_TYPE',     constraints => '',    Desc => 'id of invoice'),
-    'state'       => array(type => 'ID_TYPE',     constraints => '',    Desc => 'state of this object'),
-    'cph'         => array(type => 'float',       constraints => '',    Desc => 'cost per hour for this work'),
-    'currency'    => array(type => 'VARCHAR', size => 4,  constraints => '',    Desc => 'currency for cph'),
-    'vtime'       => array(type => 'TS_TYPE',     constraints => '',    Desc => 'work date'),
-    'creator'     => array(type => 'ID_TYPE',     constraints => '',    Desc => 'creator ID'),
-    'creation'    => array(type => 'TS_TYPE',     constraints => '',    Desc => 'creation date'),
-    );
 $tableidx['timetrack1'] = array(
     name  => 'timetrack_idx1',
     table => 'timetrack',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 168
          http://tutos.svn.sourceforge.net/tutos/?rev=168&view=rev
Author:   gokohnert
Date:     2011-05-14 15:01:28 +0000 (Sat, 14 May 2011)

Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/module_base.pinc

Modified: trunk/php/module_base.pinc
===================================================================
--- trunk/php/module_base.pinc	2011-05-12 07:13:33 UTC (rev 167)
+++ trunk/php/module_base.pinc	2011-05-14 15:01:28 UTC (rev 168)
@@ -27,7 +27,6 @@
         return true;
     }
 
-
     if (! isset($tutos[modules][$key]) ) {
         return false;
     }
@@ -39,7 +38,7 @@
         die(getcwd().' NO module class file for "'. $key .'" :'.$tutos['base'] .'/'. $tutos[modules][$key][file]);
         return false;
     }
-    require_once  $tutos['base'] ."/". $tutos[modules][$key][file];
+    require_once  $tutos['base'] .'/'. $tutos[modules][$key][file];
     if (! class_exists($tutos[modules][$key][name]) ) {
         die ('NO module class for "'. $tutos[modules][$key][name] .'" :'.$tutos['base'] .'/'. $tutos[modules][$key][file] ." defined");
         return false;
@@ -50,7 +49,7 @@
     ReadLang1($lang,dirname($tutos['base'] .'/'. $tutos[modules][$key][file]),$current_user);
 
     if (file_exists(dirname($tutos['base'] .'/'. $tutos[modules][$key][file]) .'/mtable.pinc') ) {
-        @include_once dirname($tutos['base'] .'/'. $tutos[modules][$key][file]) .'/mtable.pinc';
+        @include dirname($tutos['base'] .'/'. $tutos[modules][$key][file]) .'/mtable.pinc';
     }
 
     // Load Config Values


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 167
          http://tutos.svn.sourceforge.net/tutos/?rev=167&view=rev
Author:   gokohnert
Date:     2011-05-12 07:13:33 +0000 (Thu, 12 May 2011)

Log Message:
-----------
use subnavigation in testrun overview

Modified Paths:
--------------
    trunk/php/testmanager/testrun_overview.php

Modified: trunk/php/testmanager/testrun_overview.php
===================================================================
--- trunk/php/testmanager/testrun_overview.php	2011-05-11 19:22:51 UTC (rev 166)
+++ trunk/php/testmanager/testrun_overview.php	2011-05-12 07:13:33 UTC (rev 167)
@@ -34,6 +34,16 @@
         $r = '';
         $n = $this->result->numrows();
 
+        $nav = $this->getSubSession();
+        $nav['link'] = $this->link1;
+        $nav['list'] = array();
+        $a = 0;
+        while ($a < $n) {
+            $nav['list'][] = $this->result->get($a, "id");
+            $a++;
+        }
+        $ss = $this->putSubSession($nav);
+
         if ( $this->start == -1 ) {
             // Show the last part
             $a = $n - $tutos['maxshow'];
@@ -44,6 +54,7 @@
             $end = $this->start + $tutos['maxshow'];
         }
 
+
         $r .= $this->header;
         $r .= $this->actionformStart('testrun_overview.php');
         $r .= $this->OverviewTableStart();
@@ -83,7 +94,7 @@
             $r .= $this->OverviewRowStart($line);
 
             $x = $this->mark_filter(myentities($b->getFullName()),'name');
-            $r .= ' <td>&nbsp;'.makeLink($b->getUrl(),$x).'</td>'."\n";
+            $r .= ' <td>&nbsp;'.$b->getLink($x,'ss='.$ss).'</td>'."\n";
 
             if ($this->head['ref_id']) {
                 $x = $this->mark_filter(myentities($b->ref->getFullName()),'refidfn');
@@ -289,5 +300,5 @@
 ?>
 <!--
 SVN Info  $Id$
-     $Author$
-     -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 166
          http://tutos.svn.sourceforge.net/tutos/?rev=166&view=rev
Author:   gokohnert
Date:     2011-05-11 19:22:51 +0000 (Wed, 11 May 2011)

Log Message:
-----------
allow shortening of html output

Modified Paths:
--------------
    trunk/php/layout/layout_base.pinc
    trunk/php/layout/new2_layout.pinc

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2011-05-11 19:20:53 UTC (rev 165)
+++ trunk/php/layout/layout_base.pinc	2011-05-11 19:22:51 UTC (rev 166)
@@ -895,5 +895,17 @@
         $_SESSION['nav'][$ss['id']] = $ss;
         return $ss['id'];
     }
+
+    /**
+     * remove some stuff from html
+     */
+    function shorthtml($html) {
+        global $tutos;
+
+        if ($tutos['shorthtml'] == 1) {
+            return preg_replace('#>[[:space:]]*<#m','><',$html);
+        }
+        return $html;
+    }
 }
 ?>
\ No newline at end of file

Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc	2011-05-11 19:20:53 UTC (rev 165)
+++ trunk/php/layout/new2_layout.pinc	2011-05-11 19:22:51 UTC (rev 166)
@@ -1311,7 +1311,7 @@
      * display the screen
      */
     function display () {
-        global $msg,$info;
+        global $tutos,$msg,$info;
 
         if ( isset($_REQUEST['mark']) && isset($_REQUEST['action']) && ($_REQUEST['action'] != -1) ) {
             $this->actionresult = $this->action();
@@ -1325,18 +1325,19 @@
         }
         if ( ($this->format == 'html') || ($this->format == 'stat') || ($this->format == 'checklist')) {
             // Start the HTML
-            echo $this->HTML_Start();
+            echo $this->shorthtml($this->HTML_Start());
             flush();
             $this->read_data();
             flush();
-            echo $this->layout_start();
+            echo $this->shorthtml($this->layout_start());
             flush();
             if ($this->stop == false ) {
-                echo $this->info();
+                #                $r = preg_replace('#>[[:space:]]*<#m','><',$this->info());
+                echo $this->shorthtml($this->info());
             }
-            echo $this->showContent();
-            echo $this->layout_stop();
-            echo $this->HTML_Stop();
+            echo $this->shorthtml($this->showContent());
+            echo $this->shorthtml($this->layout_stop());
+            echo $this->shorthtml($this->HTML_Stop());
         } else if ( $this->format == 'paper' ) {
             $this->read_data();
             echo $this->PrintHeader($this->name);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 165
          http://tutos.svn.sourceforge.net/tutos/?rev=165&view=rev
Author:   gokohnert
Date:     2011-05-11 19:20:53 +0000 (Wed, 11 May 2011)

Log Message:
-----------
acl group fot participants of an event

Modified Paths:
--------------
    trunk/php/appointment.pinc

Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc	2011-05-11 19:20:21 UTC (rev 164)
+++ trunk/php/appointment.pinc	2011-05-11 19:20:53 UTC (rev 165)
@@ -890,28 +890,20 @@
         $this->acl = array();
         if ( $this->mod_allow == CAL_MODPRIV ) {
             acl_raise($this,$this->creator->id,$tutos[delok]);
-            foreach($this->participant as $i => $f) {
-                acl_raise($this,$i,$tutos[delok]);
-            }
+            acl_raise($this,$this->getObjectGroupId(2),$tutos[delok]);
         } else if ( $this->mod_allow == CAL_MODUSER ) {
             acl_default($this,$current_user);
             acl_raise($this,$current_user->id,$tutos[delok]);
         } else if ( $this->mod_allow == CAL_MODPART ) {
             acl_default($this,$current_user);
-            foreach($this->participant as $i => $f) {
-                acl_raise($this,$i,$tutos[delok]);
-            }
+            acl_raise($this,$this->getObjectGroupId(2),$tutos[delok]);
         } else if ( $this->mod_allow == CAL_MODALL ) {
             acl_default($this,$current_user);
-            foreach($this->participant as $i => $f) {
-                acl_raise($this,$i,$tutos[delok]);
-            }
+            acl_raise($this,$this->getObjectGroupId(2),$tutos[delok]);
             acl_raise($this,0,$tutos[delok]);
         }
         // Participants can (at least) SEE
-        foreach($this->participant as $i => $f) {
-            acl_raise($this,$i,$tutos[seeok]);
-        }
+        acl_raise($this,$this->getObjectGroupId(2),$tutos[seeok]);
 
 
         /* Now we add all references to the participants  */
@@ -1702,8 +1694,8 @@
         case 'StartTime':
         case 'EndTime':
             $x = resolve_history_datetime($f,$this->dbconn,false);
-        return $x;
-        break;
+            return $x;
+            break;
         default:
             return null;
         }
@@ -1727,9 +1719,45 @@
      * get the type id of object
      */
     function getHtmlIcon () {
-        return "appointments";
+        return 'appointments';
     }
 
+    /**
+     * get a array with virtual groups
+     */
+    function getObjectGroups() {
+        global $lang,$tutos;
+
+        $x = parent::getObjectGroups();
+
+        $x[$this->getTypeId()][2] = $lang[$this->getType()].':'.$lang['Participants'];
+        return $x;
+    }
+
+    /**
+     * get a array with virtual groups members
+     */
+    function getObjectGroupList($id) {
+        global $lang;
+
+        if ($id < 0) {
+            $id2 = -($id - ($this->getTypeId() << ACLSHIFT));
+        } else {
+            $id2 = $id;
+        }
+
+        $x = parent::getObjectGroupList($id);
+        $this->read_participants();
+
+        if ($id2 == 2) {
+            foreach ( $this->participant as $i => $f) {
+                $x[$i] = &$f;
+            }
+        }
+
+        return $x;
+    }
+
     /* ---------------------------------------------------------------------------
      * The following methods are abstract factory functions for groups
      * which handle the membership list of an object


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.