tutos-commits Mailing List for TUTOS

Revision: 1207
          http://sourceforge.net/p/tutos/code/1207
Author:   gokohnert
Date:     2013-12-27 10:36:12 +0000 (Fri, 27 Dec 2013)
Log Message:
-----------
tag rlease 1.10.20131227

Added Paths:
-----------
    tags/RELEASE-1-10-20131227/

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

Revision: 1206
          http://sourceforge.net/p/tutos/code/1206
Author:   gokohnert
Date:     2013-12-27 10:34:37 +0000 (Fri, 27 Dec 2013)
Log Message:
-----------
start branch 1.10

Added Paths:
-----------
    branches/1.10/

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

Revision: 1205
          http://sourceforge.net/p/tutos/code/1205
Author:   gokohnert
Date:     2013-12-27 10:26:50 +0000 (Fri, 27 Dec 2013)
Log Message:
-----------
release 1.10.20131227

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile
    trunk/php/config_default.pinc

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2013-12-27 09:14:04 UTC (rev 1204)
+++ trunk/ChangeLog	2013-12-27 10:26:50 UTC (rev 1205)
@@ -1,11 +1,18 @@
 #$Id$
+	* allow to use a fiexed email for sending out emails (i.e a noreply email). Set in the config email tab.
+	* updated bundeled jquery and jqplot
+	* counter stats uses jqplot now
+	* new user search (user_select.php)
+	* updated burndown graph
+	* massupdate support for custom fields
+	* added shortcut to overview and new pages in detailpages (mouse over event)
 	* handle multiple invoices for an expense
 	* enable testruns on tasks
 	* allow company/dpeartment as author of documents
 	* allow documents and urls attached to appointments and show those links
 	* fix autoimport of mails
 	* installation will now default session/log/repository to a tutos_private subfolder
-	* appointment search shows more info
+	* appointment search shows more info / sort participants
 	* improved debugging possibilities (include revison numbers of all files) in admin_show dialog
 	* updated jquery libraries
 	* updated maps api in google_earth handler

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2013-12-27 09:14:04 UTC (rev 1204)
+++ trunk/Makefile	2013-12-27 10:26:50 UTC (rev 1205)
@@ -16,7 +16,7 @@
 #
 
 # Primary Version
-VERSION = 1.9
+VERSION = 1.10
 #
 # The full Version is VERSION.DATE
 #

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2013-12-27 09:14:04 UTC (rev 1204)
+++ trunk/php/config_default.pinc	2013-12-27 10:26:50 UTC (rev 1205)
@@ -732,7 +732,7 @@
 //
 // The TUTOS Version number
 //
-$tutos[version] = '1.9.20131227';
+$tutos[version] = '1.10.20131227';
 //
 ### Local Variables: ***
 ### mode:iso-accents ***

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

Revision: 1204
          http://sourceforge.net/p/tutos/code/1204
Author:   gokohnert
Date:     2013-12-27 09:14:04 +0000 (Fri, 27 Dec 2013)
Log Message:
-----------
fixes related to automated tests

Modified Paths:
--------------
    trunk/php/config_default.pinc
    trunk/php/counter/counter_show.php
    trunk/php/drawboard/drawboard.pinc
    trunk/php/fax/fax_ins.php
    trunk/php/graphs.pinc
    trunk/php/installation/installation_new.php
    trunk/php/installation/mconfig.pinc
    trunk/php/invoice/invoice_overview.php
    trunk/php/layout/new2_layout.pinc
    trunk/php/location_del.php
    trunk/php/module_template/AAA.pinc
    trunk/php/report-engine/rep_index/rep_index.pinc
    trunk/php/task_gantt.php

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/config_default.pinc	2013-12-27 09:14:04 UTC (rev 1204)
@@ -732,7 +732,7 @@
 //
 // The TUTOS Version number
 //
-$tutos[version] = '1.9.20131214';
+$tutos[version] = '1.9.20131227';
 //
 ### Local Variables: ***
 ### mode:iso-accents ***

Modified: trunk/php/counter/counter_show.php
===================================================================
--- trunk/php/counter/counter_show.php	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/counter/counter_show.php	2013-12-27 09:14:04 UTC (rev 1204)
@@ -202,7 +202,7 @@
             $x = $res->getDateTime($a,'creation');
             $a++;
             $cntx = floor(($x->ts - $from->ts) / $step);
-            if ($sbar['data'][$cntx]['cnt'] != '')
+            if (isset($sbar['data'][$cntx]['cnt']) && ($sbar['data'][$cntx]['cnt'] != ''))
                 $sbar['data'][$cntx]['cnt']++;
             else
                 $sbar['data'][$cntx]['cnt'] = 1;

Modified: trunk/php/drawboard/drawboard.pinc
===================================================================
--- trunk/php/drawboard/drawboard.pinc	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/drawboard/drawboard.pinc	2013-12-27 09:14:04 UTC (rev 1204)
@@ -112,7 +112,12 @@
         if ($this->info == -1) {
             return;
         }
-        $fp = @fsockopen($this->host,$this->info,$errno,$errstr,2);
+        try {
+            $fp = fsockopen($this->host,$this->info,$errno,$errstr,2);
+        }
+        catch (Exception $e) {
+            return;
+        }
         if (!$fp) {
             return;
         }

Modified: trunk/php/fax/fax_ins.php
===================================================================
--- trunk/php/fax/fax_ins.php	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/fax/fax_ins.php	2013-12-27 09:14:04 UTC (rev 1204)
@@ -46,7 +46,11 @@
      || ($tutos[demo] == 1) ) {
     $msg .= $lang['Err0032'] ."<br />\n";
 }
-$gotourl= addUrlParameter($gotourl,"fax=". Base64_Encode($_POST['fax']),true);
+if ( !isset($_POST['fax']) || empty($_POST['fax']) ) {
+    $msg = addLine($msg,sprintf($lang['Err0040'],$lang['EmailFax']));
+} else {
+    $gotourl= addUrlParameter($gotourl,"fax=". Base64_Encode($_POST['fax']),true);
+}
 
 // Call faxspool
 if ( $msg == "" ) {

Modified: trunk/php/graphs.pinc
===================================================================
--- trunk/php/graphs.pinc	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/graphs.pinc	2013-12-27 09:14:04 UTC (rev 1204)
@@ -306,7 +306,11 @@
             if ($e['cnt'] == '')
                 $e['cnt'] = 0;
             $data .= $pre.$e['cnt'];
-            $tick .= $pre.'"'.$e['title'].'"';
+            if (isset($e['title'])) {
+                $tick .= $pre.'"'.$e['title'].'"';
+            } else {
+                $tick .= $pre.'"?"';
+            }
             if (isset($e['color'])) {
                 $colors .= $pre.'"'.$e['color'].'"';
             }

Modified: trunk/php/installation/installation_new.php
===================================================================
--- trunk/php/installation/installation_new.php	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/installation/installation_new.php	2013-12-27 09:14:04 UTC (rev 1204)
@@ -182,7 +182,7 @@
         $this->obj->read_relations();
         if ( isset($_GET['pid']) ) {
             $this->obj->product = getObject($this->dbconn,$_GET['pid']);
-            if (!is_object($this->obj->product)) {
+            if (!is_object($this->obj->product) || ($this->obj->product->gettypeid() != useprojects) ) {
                 $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Product']));
                 $this->stop = true;
                 return;

Modified: trunk/php/installation/mconfig.pinc
===================================================================
--- trunk/php/installation/mconfig.pinc	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/installation/mconfig.pinc	2013-12-27 09:14:04 UTC (rev 1204)
@@ -8,10 +8,10 @@
  *  $Author$
  */
 $tutos['files'][__FILE__] = '$Rev$';
-#
-# Every module must have an individual ID ( < 0 > -100 ).
-# this is module 6
-#
+//
+// Every module must have an individual ID ( < 0 > -100 ).
+// this is module 6
+//
 define('useinstmanagement',-6);
 $tutos[modules]['installation'] = array(
     name => "installation",
@@ -20,16 +20,16 @@
     'overview' => "installation/installation_overview.php",
     'perm' => useinstmanagement
     );
-#
-# globally enable this module
-#
+//
+// globally enable this module
+//
 if(!isset($tutos[useinstmanagement])) {
     $tutos[useinstmanagement] = 1;
 }
-#
-# List of objects/modules where we do something with this module
-# and need to include this module
-#
+//
+// List of objects/modules where we do something with this module
+// and need to include this module
+//
 $tutos[modulesinc]['installation'][] = 'address';
 $tutos[modulesinc]['installation'][] = 'company';
 $tutos[modulesinc]['installation'][] = 'department';
@@ -37,16 +37,16 @@
 $tutos[modulesinc]['installation'][] = 'scheme';
 $tutos[modulesinc]['installation'][] = 'menu';
 
-# reverse include
+// reverse include
 $tutos[modulesinc]['file'][]        = 'installation';
 $tutos[modulesinc]['note'][]        = 'installation';
 $tutos[modulesinc]['bugtracking'][] = 'installation';
 $tutos[modulesinc]['stc'][]         = 'installation';
 $tutos[modulesinc]['timetrack'][]   = 'installation';
 
-#
-# skip
-#
+//
+// skip
+//
 $permskip[useinstmanagement][PERM_MYTUTOS] = 1;
 
-?>
+?>
\ No newline at end of file

Modified: trunk/php/invoice/invoice_overview.php
===================================================================
--- trunk/php/invoice/invoice_overview.php	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/invoice/invoice_overview.php	2013-12-27 09:14:04 UTC (rev 1204)
@@ -315,7 +315,7 @@
 
         if ($this->ext != 0) {
             overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice'));
-            overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice'));
+            overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference','');
         }
 
         // Start Date for search

Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/layout/new2_layout.pinc	2013-12-27 09:14:04 UTC (rev 1204)
@@ -248,10 +248,12 @@
             $this->addMenu($x);
         }
 
+        $adr_first = false;
         if ( $this->user->feature_ok(useaddressbook,PERM_SEL) ) {
             $x = tutos_address::getSelectLink($this->user);
             $x[category][] = 'main2';
             $x[category][] = 'first';
+            $adr_first = true;
             $this->addMenu($x);
         }
         if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
@@ -261,6 +263,10 @@
                         info => $lang['AdrCreateInfo'],
                         category => array('main2','new','address','default')
                 );
+            if (!$adr_first) {
+                $x[category][] = 'first';
+                $adr_first = true;
+            }
             $this->addMenu($x);
         }
         if ( $this->user->feature_ok(usecompany,PERM_NEW) ) {
@@ -270,6 +276,10 @@
                         info => $lang['CompanyCreateInfo'],
                         category => array('main2','new','company','default')
                 );
+            if (!$adr_first) {
+                $x[category][] = 'first';
+                $adr_first = true;
+            }
             $this->addMenu($x);
         }
 
@@ -302,7 +312,7 @@
             }
         }
 
-
+        $prod_first = false;
         if ( $this->user->feature_ok(useprojects,PERM_SEL) ) {
             require_once 'product.pinc';
             $x = product::getSelectLink($this->user,$lang['ProductMenu']);
@@ -316,6 +326,7 @@
             $xs[text] = '';
             $xs[code] = '<form action="%s" method="get">%s<input maxlength="16" name="name" /></form>';
             $this->addMenu($xs);
+            $prod_first = true;
         }
         if ( $this->user->feature_ok(useprojects,PERM_NEW) ) {
             require_once 'product.pinc';
@@ -325,6 +336,9 @@
                         info => $lang['ProdCreateInfo'],
                         category => array('main4','new','product','default')
                 );
+            if (!$prod_first) {
+                $x[category][] = 'first';
+            }
             $this->addMenu($x);
         }
 

Modified: trunk/php/location_del.php
===================================================================
--- trunk/php/location_del.php	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/location_del.php	2013-12-27 09:14:04 UTC (rev 1204)
@@ -29,13 +29,14 @@
     $obj = $obj->read($_REQUEST['id'],$obj);
 }
 
-if ( !isset($_REQUEST['id']) ) {
-    $obj->adr_loc = $_REQUEST['ref'];
+if ( is_object($obj)) {
     $obj->read_ref();
     $gotourl = $obj->ref->getUrl();
+} else {
+    $msg = addLine($msg,$lang['Err0048']);
 }
 
-if ( $msg == "" ) {
+if ( $msg == '' ) {
     $dbconn->Begin("WORK");
     $msg = addLine($msg,$obj->delete());
     $dbconn->Commit("WORK");

Modified: trunk/php/module_template/AAA.pinc
===================================================================
--- trunk/php/module_template/AAA.pinc	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/module_template/AAA.pinc	2013-12-27 09:14:04 UTC (rev 1204)
@@ -371,6 +371,7 @@
         $x = array( url => 'module_template/AAA_overview.php?refid='. $obj->id,
                     confirm => false,
                     text => ($text == '' ? $lang['AAAOverview']:$text),
+                    info => $lang['AAAOverview'],
                     category => array(AAA::getType(),'overview','module',USEAAA)
             );
         return $x;

Modified: trunk/php/report-engine/rep_index/rep_index.pinc
===================================================================
--- trunk/php/report-engine/rep_index/rep_index.pinc	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/report-engine/rep_index/rep_index.pinc	2013-12-27 09:14:04 UTC (rev 1204)
@@ -57,10 +57,12 @@
             $pdf->Cell(90,$h,$i,'B',0,'R');
 
             $pdf->SetFont('Arial','B',$fs+1);
-            foreach($j as $i2 => $line) {
-                $pdf->SetY($y+$i2*5);
-                $pdf->SetX(120);
-                $pdf->Cell(0,$fs,myiconv($line),'',0,'L');
+            if (isset($j) && is_array($j)) {
+                foreach($j as $i2 => $line) {
+                    $pdf->SetY($y+$i2*5);
+                    $pdf->SetX(120);
+                    $pdf->Cell(0,$fs,myiconv($line),'',0,'L');
+                }
             }
             if (isset($lang['folder_info'][$i])) {
                 $pdf->SetFont('Arial','',$fs-4);

Modified: trunk/php/task_gantt.php
===================================================================
--- trunk/php/task_gantt.php	2013-12-18 07:03:39 UTC (rev 1203)
+++ trunk/php/task_gantt.php	2013-12-27 09:14:04 UTC (rev 1204)
@@ -56,7 +56,7 @@
         $r .= "<br /><br /><br /><tr><td>";
         $url1 = 'task_overview.php';
         $url2 = 'task_gantt.php';
-        if (count($this->parents)) {
+        if (isset($this->parents) && count($this->parents)) {
             foreach ($this->parents as $p) {
                 $url1 = addUrlParameter($url1,'id[]='.$p->id);
                 $url2 = addUrlParameter($url2,'id[]='.$p->id);
@@ -73,7 +73,7 @@
         }
         $r .= '</ul>';
 
-        if (count($this->parents)) {
+        if (isset($this->parents) && count($this->parents)) {
             foreach ($this->parents as $p) {
                 $r .= "<br />\n";
                 $r .= $lang[$p->getType()]." ".menulink($p->getURL(), myentities($p->getFullName()));
@@ -90,8 +90,9 @@
     Function prepare() {
         global $msg,$lang;
 
-        $this->name = $lang['TaskGantt'];
-        $this->level = -1; // everything
+        $this->name    = $lang['TaskGantt'];
+        $this->level   = -1; // everything
+        $this->parents = array();
 
         if ( ! isset($_GET['id']) ) {
             $msg = addLine($msg,$lang['Err0048']);
@@ -101,6 +102,7 @@
         }
 
         if (!load_jpgraph( array("jpgraph_gantt.php") )){
+            $this->stop = true;
             return;
         }
 
@@ -114,7 +116,6 @@
             $id = $_GET['id'];
         }
         $count = 0;
-        $this->parents = array();
         foreach($id as $i) {
             $p = GetObject($this->dbconn,$i);
             if (!is_object($p)) continue;

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

Revision: 1203
          http://sourceforge.net/p/tutos/code/1203
Author:   gokohnert
Date:     2013-12-18 07:03:39 +0000 (Wed, 18 Dec 2013)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/product_new.php
    trunk/php/user_ins.php

Modified: trunk/php/product_new.php
===================================================================
--- trunk/php/product_new.php	2013-12-14 19:54:29 UTC (rev 1202)
+++ trunk/php/product_new.php	2013-12-18 07:03:39 UTC (rev 1203)
@@ -265,14 +265,12 @@
 
         $this->name    = $lang['Product'];
         $this->obj     = new product($this->dbconn);
-        $this->obj->r1 = null;
-        $this->obj->r2 = null;
 
+        $this->template = false;
+
         $this->r1desc = "";
         $this->r2desc = "";
 
-        $this->template = false;
-
         if ( isset($_GET['id']) ) {
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
             if ( !is_object($this->obj) ) {
@@ -283,6 +281,9 @@
             $this->name = sprintf($lang['ProdModifyT'], $this->obj->getFullName());
             $this->obj->readroles();
             $this->obj->read_picture();
+            $this->obj->r1 = null;
+            $this->obj->r2 = null;
+
         } else if ( isset($_GET['tplid']) ) {
             $this->obj = $this->obj->read($_GET['tplid'],$this->obj);
             $this->template = true;
@@ -301,9 +302,12 @@
                 $msg = addLine($msg,$lang['Err0055']);
             }
             $this->obj->state = -1;
+            $this->obj->r1 = null;
+            $this->obj->r2 = null;
         } else {
             $this->name = $lang['ProdCreateT'];
             $this->obj->r1 = $this->user;
+            $this->obj->r2 = null;
         }
         $this->obj->set_string_from_arg('name','name',$lang['ProdName']);
         $this->obj->set_string_from_arg('version','version',$lang['ProdVersion']);

Modified: trunk/php/user_ins.php
===================================================================
--- trunk/php/user_ins.php	2013-12-14 19:54:29 UTC (rev 1202)
+++ trunk/php/user_ins.php	2013-12-18 07:03:39 UTC (rev 1203)
@@ -238,6 +238,7 @@
         $u->id = $adr->id;
         if ($saveloc) {
             $loc->adr_id = $adr->id;
+            $loc->ref = $adr;
             $msg = addLine($msg,$loc->save());
         }
     }

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

Revision: 1202
          http://sourceforge.net/p/tutos/code/1202
Author:   gokohnert
Date:     2013-12-14 19:54:29 +0000 (Sat, 14 Dec 2013)
Log Message:
-----------
fix for automated tests

Modified Paths:
--------------
    trunk/php/admin/table_custom_show.php
    trunk/php/config_default.pinc
    trunk/php/delobject.php
    trunk/php/invoice/invoice.pinc
    trunk/php/invoice/invoice_overview.php
    trunk/php/location_del.php
    trunk/php/module_template/AAA_ins.php
    trunk/php/resource/resource_new.php
    trunk/php/task.pinc
    trunk/php/task_gantt.php
    trunk/php/user_select.php

Modified: trunk/php/admin/table_custom_show.php
===================================================================
--- trunk/php/admin/table_custom_show.php	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/admin/table_custom_show.php	2013-12-14 19:54:29 UTC (rev 1202)
@@ -81,7 +81,7 @@
                     }
                 }
                 $r .= "</td>\n";
-                $r .= ' <td>'.(isset($x['otype']) ? $x['otype']:'')."</td>\n";
+                $r .= ' <td>'.(isset($x['otype']) ? print_r($x['otype'],true):'')."</td>\n";
                 $r .= ' <td>'.(isset($x[size]) ? $x[size]:'-')."</td>\n";
                 $r .= ' <td>'.(isset($x['searchable']) ? ($x['searchable']?$lang['yes']:$lang['no']):'-')."</td>\n";
                 $r .= ' <td>'.(isset($x['overview']) ? ($x['overview']?$lang['yes']:$lang['no']):'-')."</td>\n";

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/config_default.pinc	2013-12-14 19:54:29 UTC (rev 1202)
@@ -732,7 +732,7 @@
 //
 // The TUTOS Version number
 //
-$tutos[version] = '1.9.20131213';
+$tutos[version] = '1.9.20131214';
 //
 ### Local Variables: ***
 ### mode:iso-accents ***

Modified: trunk/php/delobject.php
===================================================================
--- trunk/php/delobject.php	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/delobject.php	2013-12-14 19:54:29 UTC (rev 1202)
@@ -19,7 +19,8 @@
 check_user();
 
 /* Check Input */
-$msg = '';
+$msg     = '';
+$info    = '';
 $gotourl = 'mytutos.php';
 
 if ( !isset($_REQUEST['id']) ) {
@@ -51,7 +52,7 @@
     $msg = addLine($msg,$obj->delete());
     $dbconn->Commit("WORK");
 }
-leave_insert($dbconn,$gotourl,$msg);
+leave_insert($dbconn,$gotourl,$msg,$info);
 
 // SVN Info  $Id$
 //  $Author$

Modified: trunk/php/invoice/invoice.pinc
===================================================================
--- trunk/php/invoice/invoice.pinc	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/invoice/invoice.pinc	2013-12-14 19:54:29 UTC (rev 1202)
@@ -230,7 +230,7 @@
                 $this->sum_single = $obj->money;
                 $this->currency = $obj->currency;
                 $this->description = $lang[$obj->getType()] ."\n". $obj->getFullName();
-                $p->itype = $lang['pcs'];
+                $this->itype = $lang['pcs'];
             } else if ( $obj->gettype() == 'timetrack' ) {
                 $this->items = $obj->volume;
                 $this->itype = $lang['hours'];

Modified: trunk/php/invoice/invoice_overview.php
===================================================================
--- trunk/php/invoice/invoice_overview.php	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/invoice/invoice_overview.php	2013-12-14 19:54:29 UTC (rev 1202)
@@ -315,7 +315,7 @@
 
         if ($this->ext != 0) {
             overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice'));
-            overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference',get_parent_classes('invoice'));
+            overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice'));
         }
 
         // Start Date for search

Modified: trunk/php/location_del.php
===================================================================
--- trunk/php/location_del.php	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/location_del.php	2013-12-14 19:54:29 UTC (rev 1202)
@@ -19,17 +19,27 @@
 
 $msg  = '';
 $info = '';
-$l = new location($dbconn);
-$l = $l->read($_GET['id'],$l);
-$l->adr_loc = $_GET['ref'];
+$obj  = new location($dbconn);
 
-$l->read_ref();
-$gotourl = $l->ref->getUrl();
+$gotourl = 'mytutos.php';
 
-$dbconn->Begin("WORK");
-$msg = addLine($msg,$l->delete());
-$dbconn->Commit("WORK");
+if ( !isset($_REQUEST['id']) ) {
+    $msg = addLine($msg,$lang['Err0048']);
+} else {
+    $obj = $obj->read($_REQUEST['id'],$obj);
+}
 
+if ( !isset($_REQUEST['id']) ) {
+    $obj->adr_loc = $_REQUEST['ref'];
+    $obj->read_ref();
+    $gotourl = $obj->ref->getUrl();
+}
+
+if ( $msg == "" ) {
+    $dbconn->Begin("WORK");
+    $msg = addLine($msg,$obj->delete());
+    $dbconn->Commit("WORK");
+}
 leave_insert($dbconn,$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$

Modified: trunk/php/module_template/AAA_ins.php
===================================================================
--- trunk/php/module_template/AAA_ins.php	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/module_template/AAA_ins.php	2013-12-14 19:54:29 UTC (rev 1202)
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  *  Copyright 1999 - 2013 by Gero Kohnert
  *

Modified: trunk/php/resource/resource_new.php
===================================================================
--- trunk/php/resource/resource_new.php	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/resource/resource_new.php	2013-12-14 19:54:29 UTC (rev 1202)
@@ -75,6 +75,7 @@
         $r .= $lang['FldsRequired'] ."\n";
         return $r;
     }
+
     /**
      * prepare
      */
@@ -84,13 +85,14 @@
         $this->obj = new resource($this->dbconn);
 
         if ( isset($_GET['id']) ) {
+            $this->name = $lang['ResModify'] .": ";
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
             if ( !is_object($this->obj) ) {
                 $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Resource']));
                 $this->stop = true ;
                 return;
             }
-            $this->name = $lang['ResModify'] .": ". myentities($this->obj->getFullName());
+            $this->name .= myentities($this->obj->getFullName());
         } else {
             $this->name = $lang['ResCreate'];
             if (!$this->user->feature_ok(useresource,PERM_NEW) ) {
@@ -138,4 +140,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/task.pinc	2013-12-14 19:54:29 UTC (rev 1202)
@@ -158,6 +158,7 @@
 Function gantt_draw(array $parents,$maxdepth = -1) {
     global $lang, $font, $tutos;
 
+    if (count($parents) == 0) return;
     //
     //  If we use a non western laguage encoding force the use of truetype fonts
     //

Modified: trunk/php/task_gantt.php
===================================================================
--- trunk/php/task_gantt.php	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/task_gantt.php	2013-12-14 19:54:29 UTC (rev 1202)
@@ -56,9 +56,11 @@
         $r .= "<br /><br /><br /><tr><td>";
         $url1 = 'task_overview.php';
         $url2 = 'task_gantt.php';
-        foreach ($this->parents as $p) {
-            $url1 = addUrlParameter($url1,'id[]='.$p->id);
-            $url2 = addUrlParameter($url2,'id[]='.$p->id);
+        if (count($this->parents)) {
+            foreach ($this->parents as $p) {
+                $url1 = addUrlParameter($url1,'id[]='.$p->id);
+                $url2 = addUrlParameter($url2,'id[]='.$p->id);
+            }
         }
         $r .= menulink($url1, $lang['TaskOverview']);
         $r .= "<br />\n";
@@ -71,10 +73,12 @@
         }
         $r .= '</ul>';
 
-        foreach ($this->parents as $p) {
-            $r .= "<br />\n";
-            $r .= $lang[$p->getType()]." ".menulink($p->getURL(), myentities($p->getFullName()));
-            $r .= "<br />\n";
+        if (count($this->parents)) {
+            foreach ($this->parents as $p) {
+                $r .= "<br />\n";
+                $r .= $lang[$p->getType()]." ".menulink($p->getURL(), myentities($p->getFullName()));
+                $r .= "<br />\n";
+            }
         }
         $r .= "</td></tr>";
         return $r;
@@ -120,7 +124,7 @@
             unset($p);
         }
         if ($count == 0 ) {
-            $msg .= $lang['Err0048'];
+            $msg = addLine($msg,$lang['Err0048']);
             $this->stop = true;
             return;
         }

Modified: trunk/php/user_select.php
===================================================================
--- trunk/php/user_select.php	2013-12-14 11:43:49 UTC (rev 1201)
+++ trunk/php/user_select.php	2013-12-14 19:54:29 UTC (rev 1202)
@@ -63,10 +63,10 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['UserDisabled'],0,'disabled');
-        $x =  '<input id="disabled_yes" type="radio" name="disabled" value="1" /><label for="disabled_yes">'.$lang['yes'].'</label>';
-        $x .= '<input id="disabled_no" type="radio" name="disabled" value="0" /><label for="disabled_no">'.$lang['no'].'</label>';
-        $x .= '<input id="disabled_any" type="radio" name="disabled" value="-1" /><label for="disabled_any">'.$lang['any'].'</label>';
-        $r .= $this->showdata($x,2);
+        $rr =  '<input id="disabled_yes" type="radio" name="disabled" value="1" /><label for="disabled_yes">'.$lang['yes'].'</label>';
+        $rr .= '<input id="disabled_no" type="radio" name="disabled" value="0" /><label for="disabled_no">'.$lang['no'].'</label>';
+        $rr .= '<input id="disabled_any" type="radio" name="disabled" value="-1" /><label for="disabled_any">'.$lang['any'].'</label>';
+        $r .= $this->showdata($rr,2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
@@ -148,7 +148,7 @@
         if ( $this->user->feature_ok(useuser,PERM_NEW) ) {
             $x = array( url => 'user_new.php',
                         text => $lang['NewEntry'],
-                        info => $lang['UserCreateI'],
+                        info => $lang['UserCreate'],
                         category => array('user','new','obj',useuser)
                 );
             $this->addMenu($x);

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

Revision: 1201
          http://sourceforge.net/p/tutos/code/1201
Author:   gokohnert
Date:     2013-12-14 11:43:49 +0000 (Sat, 14 Dec 2013)
Log Message:
-----------
some standard fixes (flow of errormessages)

Modified Paths:
--------------
    trunk/Makefile
    trunk/php/address_ins.php
    trunk/php/app_do_vote.php
    trunk/php/app_vote.php
    trunk/php/base.pinc
    trunk/php/calendar_day.php
    trunk/php/config_default.pinc
    trunk/php/custom.pinc
    trunk/php/database.pinc
    trunk/php/database_del.php
    trunk/php/database_ins.php
    trunk/php/database_new.php
    trunk/php/database_show.php
    trunk/php/history_select.php
    trunk/php/invoice/invoice_config.php
    trunk/php/invoice/invoice_new.php
    trunk/php/invoice/invoice_overview.php
    trunk/php/location_del.php
    trunk/php/module_template/AAA_config.php
    trunk/php/reminder/reminder_new.php
    trunk/php/reminder/reminder_overview.php
    trunk/php/scrum/scrum_config.php
    trunk/php/scrum/sprint_overview.php
    trunk/php/stc/stc_new.php
    trunk/php/stc/stc_overview.php
    trunk/php/stc/stc_show.php
    trunk/php/stuff/stuff_config.php
    trunk/php/task_copy_ins.php
    trunk/php/testmanager/testcase_ins.php
    trunk/php/testmanager/testcase_new.php
    trunk/php/testmanager/testcase_overview.php
    trunk/php/testmanager/testcase_show.php
    trunk/php/testmanager/testmanager.pinc
    trunk/php/testmanager/testmanager_config.php
    trunk/php/testmanager/testrun_new.php
    trunk/php/testmanager/testrun_overview.php
    trunk/php/testmanager/testsuite_ins.php
    trunk/php/testmanager/testsuite_overview.php
    trunk/php/timetrack/timetrack_config.php
    trunk/php/url/urlcat_new.php
    trunk/php/url/urlcat_show.php
    trunk/php/webelements.p3
    trunk/test.sh

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/Makefile	2013-12-14 11:43:49 UTC (rev 1201)
@@ -806,17 +806,15 @@
 TESTPATH=$(shell dirname $(shell pwd))/tutos-test
 download-test:
 	@echo ${TESTPATH}
-	@$(RM) -rf ${TESTPATH}
+	@$(RM) -rf ${TESTPATH}/*
 	mkdir -p ${TESTPATH}
-	mkdir -p ${TESTPATH}/repo
-	@$(CHMOD) 777 ${TESTPATH}/repo
-	mkdir -p ${TESTPATH}/tmp
-	@$(CHMOD) 777 ${TESTPATH}/tmp
 	mkdir -p ${TESTPATH}/php
 
 	@$(foreach d,$(wildcard TUTOS-*.zip), \
 		unzip  -n -d ${TESTPATH} $(d); \
 	)
+	@${CHMOD} 777 ${TESTPATH}/tutos_private/repository
+
 	$(SED) \
 		-e 's;%HOST%;${HOST};g' \
 		-e 's;Alias /tutos;Alias /tutos-test;g' \

Modified: trunk/php/address_ins.php
===================================================================
--- trunk/php/address_ins.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/address_ins.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert
+ *  Copyright 1999 - 2013 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
@@ -10,6 +10,8 @@
  * @module address_ins
  * @package address
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 require_once 'webelements.p3';
 require_once 'permission.p3';
 

Modified: trunk/php/app_do_vote.php
===================================================================
--- trunk/php/app_do_vote.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/app_do_vote.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2009 by Gero Kohnert
+ * Copyright 1999 - 2013 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
@@ -12,6 +12,8 @@
  * @module app_do_vote
  * @package appointment
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 require_once 'webelements.p3';
 require_once 'permission.p3';
 require_once 'appointment.pinc';
@@ -26,17 +28,17 @@
 
 $gotourl = "calendar.php";
 if ( ! isset($_GET['id']) ) {
-    $msg .= "Missing Appointment ID<br />";
+    $msg = addLine($msg,"Missing Appointment ID");
 } else {
     $a = $a->read($_GET['id'],$a);
     $a->read_participants();
     $gotourl= addUrlParameter($gotourl,"id=".$_GET['id']);
 }
 if ( ! isset($_GET['adr_id']) ) {
-    $msg .= "Missing User ID<br />";
+    $msg = addLine($msg,"Missing User ID");
 }
 if ( ! isset($_GET['vote']) ) {
-    $msg .= "Missing Vote<br />";
+    $msg = addLine($msg,"Missing Vote");
 }
 
 if ( $msg == "" ) {
@@ -47,10 +49,9 @@
 $gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg));
 
 /* Go back to calendar */
-Header("Status: 302 Moved Temporarily");
-Header("Location: ". getBaseUrl() . $gotourl);
-$dbconn->Close();
-/*
+
+leave_insert($dbconn,$gotourl,$msg);
+/**
  *  SVN Info  $Id$
  *  $Author$
  */

Modified: trunk/php/app_vote.php
===================================================================
--- trunk/php/app_vote.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/app_vote.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2010 by Gero Kohnert
+ *  Copyright 1999 - 2013 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
@@ -17,6 +17,8 @@
  *  @modulegroup appointment
  *  @module app_vote
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 require_once 'webelements.p3';
 require_once 'permission.p3';
 require_once 'appointment.pinc';
@@ -112,13 +114,13 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang;
+        global $info,$msg,$lang;
 
         $this->name = $lang['AppointCommit'];
         $this->obj = new appointment($this->dbconn);
 
         if ( !isset($_GET['id']) || !isset($_GET['adr_id']) ) {
-            $msg .= "No appointment or no adr given !<br />";
+            $msg = addLine($msg,"No appointment or no adr given !");
             $this->stop = true;
         } else {
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
@@ -126,11 +128,11 @@
             $this->adr_id =  $_GET['adr_id'];
         }
         if ( ! $this->obj->see_ok() ) {
-            $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
+            $msg = addLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()]));
             $this->stop = true;
         }
         if ( 1 != $this->obj->trace ) {
-            $msg .= "You can not vote for this appointment<br />";
+            $msg = addLine($msg,"You can not vote for this appointment");
             $this->stop = true;
         }
         // menu
@@ -150,5 +152,5 @@
 ?>
 <!--
 SVN Info  $Id$
-     $Author$
-     -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file

Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/base.pinc	2013-12-14 11:43:49 UTC (rev 1201)
@@ -311,29 +311,29 @@
             if ($this->dbconn->prep) {
                 $this->dbconn->addPStatement('SELECT * from '.$this->dbconn->prefix.$this->tablename_rel.' WHERE obj_id = $1 or rel_id = $2','BASEREL');
                 $rr = $this->dbconn->execPStatement('BASEREL',1,$this->id,$this->id);
-        } else {
-                    $q = 'SELECT * from '.$this->dbconn->prefix.$this->tablename_rel.' WHERE obj_id = '.$this->id.' or rel_id = '.$this->id;
-                    $rr = $this->dbconn->Exec($q);
+            } else {
+                $q = 'SELECT * from '.$this->dbconn->prefix.$this->tablename_rel.' WHERE obj_id = '.$this->id.' or rel_id = '.$this->id;
+                $rr = $this->dbconn->Exec($q);
+            }
+            $n = $rr->numrows();
+            $a = 0;
+            while ($a < $n) {
+                $o = $rr->getInt($a,'obj_id');
+                $b = $rr->getInt($a,'rel_id');
+                if ($o == $this->id) {
+                    $this->relations[$rr->getInt($a,'type_id')][$b] = 1;
+                }
+                if ($b == $this->id) {
+                    $this->back_relations[$rr->getInt($a,'type_id')][$o] = 1;
+                }
+                $a++;
+            }
+            $rr->free();
+            // cache it
+            // update cache
+            $this->cache_store('_r'.$this->id,$this->relations);
+            $this->cache_store('_br'.$this->id,$this->back_relations);
         }
-                    $n = $rr->numrows();
-                    $a = 0;
-                    while ($a < $n) {
-                        $o = $rr->getInt($a,'obj_id');
-                        $b = $rr->getInt($a,'rel_id');
-                        if ($o == $this->id) {
-                            $this->relations[$rr->getInt($a,'type_id')][$b] = 1;
-                        }
-                        if ($b == $this->id) {
-                            $this->back_relations[$rr->getInt($a,'type_id')][$o] = 1;
-                        }
-                        $a++;
-                    }
-                    $rr->free();
-                    // cache it
-                    // update cache
-                    $this->cache_store('_r'.$this->id,$this->relations);
-                    $this->cache_store('_br'.$this->id,$this->back_relations);
-        }
         $g_hash[$this->id] = &$this;
 
         $this->run_after_read_hook();

Modified: trunk/php/calendar_day.php
===================================================================
--- trunk/php/calendar_day.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/calendar_day.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -262,11 +262,11 @@
      * prepare
      */
     Function prepare() {
-        global $lang,$msg;
+        global $lang,$msg,$info;
 
         $this->name = $lang['Calendar'];
         if ( ! $this->user->feature_ok(usecalendar,PERM_SEE) ) {
-            $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
+            $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'"));
             $this->stop = true;
             return;
         }

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/config_default.pinc	2013-12-14 11:43:49 UTC (rev 1201)
@@ -732,7 +732,7 @@
 //
 // The TUTOS Version number
 //
-$tutos[version] = '1.9.20131123';
+$tutos[version] = '1.9.20131213';
 //
 ### Local Variables: ***
 ### mode:iso-accents ***

Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/custom.pinc	2013-12-14 11:43:49 UTC (rev 1201)
@@ -533,6 +533,7 @@
         $rid = $this->x['rel_id'];
 
         if (!isset($this->obj->back_relations[$rid]) || !is_array($this->obj->back_relations[$rid])) return '';
+        #.print_r($this->obj->relations,true);
 
         $r   = '';
         $pre = '';

Modified: trunk/php/database.pinc
===================================================================
--- trunk/php/database.pinc	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/database.pinc	2013-12-14 11:43:49 UTC (rev 1201)
@@ -486,7 +486,7 @@
      * make a connection to the database
      */
     function getConnection() {
-        global $tutos;
+        global $tutos,$msg;
 
         if ( $this->type == DB_TYPE_POSTGRES ) {
             // Postgres
@@ -563,8 +563,8 @@
                 $repo    = getcwd()."/". $tutos['base'] ."/".  $this->repository;
             }
             if (! file_exists($repo)) {
-                $msg = "<br />\nDocument Management:<br />missing repository directory \"".normalize_url($repo)."\"<br />\n";
-                $msg .= "Please change repository path in your config file<br />or create the missing path<br />or disable docmanagement \$tutos[usedocmanagement] = 0; in your config file (php/file/mconfig.pinc)<br />\n";
+                $msg = addLine($msg,'Document Management: missing repository directory "'.normalize_url($repo).'"');
+                $msg = addLine($msg,'Please change repository path in your config file or create the missing path or disable docmanagement \$tutos[usedocmanagement] = 0; in your config file (php/file/mconfig.pinc)');
                 Fatal_Error($msg,$repo);
             }
         }

Modified: trunk/php/database_del.php
===================================================================
--- trunk/php/database_del.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/database_del.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -1,12 +1,14 @@
 <?php
-/*
- *  Copyright 2001 -2008 by Gero Kohnert
+/**
+ *  Copyright 2001 -2013 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   
+ *  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
  *  Free Software Foundation; version 2 of the License.
  *
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 require_once 'webelements.p3';
 require_once 'permission.p3';
 
@@ -15,33 +17,34 @@
 loadmodules("database","del");
 
 /* Check Input */
-$msg = "";
-$gotourl = "admin_show.php";
+$msg     = '';
+$info    = '';
+$gotourl = 'admin_show.php';
 $obj = new database($dbconn);
 
 if ( !isset($_GET['id']) ) {
-    $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<br />";
+    $msg = addLine($msg,sprintf($lang['Err0040'],$lang[$obj->getType()]));
 } else {
     $obj = $obj->read($_GET['id'],$obj);
     $gotourl = $obj->getUrl();
 }
 if ( $obj->id < 1 ) {
-    $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br />";
+    $msg = addLine($msg,sprintf($lang['Err0023'],$lang[$obj->getType()]));
 }
 if ( ! $obj->del_ok() ) {
-    $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br />";
+    $msg = addLine($msg,sprintf($lang['Err0023'],$lang[$obj->getType()]));
 }
 if ( $msg == "" ) {
     $gotourl = "admin_show.php";
 
     $dbconn->Begin("WORK");
-    $msg .= $obj->delete();
+    $msg = addLine($msg,$obj->delete());
     $dbconn->Commit("WORK");
 }
 
-leave_insert($dbconn,$gotourl,$msg);
-/*
+leave_insert($dbconn,$gotourl,$msg,$info);
+/**
  *  SVN Info  $Id$
  *  $Author$
  */
-?>
+?>
\ No newline at end of file

Modified: trunk/php/database_ins.php
===================================================================
--- trunk/php/database_ins.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/database_ins.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -17,7 +17,8 @@
 loadmodules('database','ins');
 
 $gotourl = 'database_new.php';
-$msg = '';
+$msg     = '';
+$info    = '';
 
 $obj = new database($dbconn);
 if ( isset($_POST['Xid']) ) {
@@ -26,7 +27,7 @@
 }
 
 if ( !isset($_POST['name']) || (trim($_POST['name']) == '') ) {
-    $msg .= sprintf($lang['Err0009'],$lang['AdminDBName']) ."<br />";
+    $msg = addLine($msg,sprintf($lang['Err0009'],$lang['AdminDBName']));
 } else {
     $name = trim($_POST['name']);
     $gotourl = addUrlParameter($gotourl,"name=". UrlEncode($name),true);
@@ -81,18 +82,18 @@
 //
 // other modules
 //
-$msg .= module_parseforms($current_user,$obj,$gotourl);
+$msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl));
 
 if ( $msg == "" ) {
     $dbconn->Begin("WORK");
-    $msg = $obj->save();
+    $msg = addLine($msg,$obj->save());
     $dbconn->Commit("WORK");
 
     $gotourl = $obj->getURL();
 }
 
-leave_insert($dbconn,$gotourl,$msg);
-/*
+leave_insert($dbconn,$gotourl,$msg,$info);
+/**
  *  SVN Info  $Id$
  *  $Author$
  */

Modified: trunk/php/database_new.php
===================================================================
--- trunk/php/database_new.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/database_new.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -158,21 +158,21 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang;
+        global $msg,$info,$lang;
 
         $this->obj = new database($this->dbconn);
         if ( isset($_GET['id']) && ($_GET['id'] > -1) ) {
             $this->name = $lang['DBModify'];
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
             if ( !is_object($this->obj) ) {
-                $msg .= sprintf($lang['Err0040'],$lang['database']);
+                $msg = addLine($msg,sprintf($lang['Err0040'],$lang['database']));
                 $this->stop = true;
                 return;
             }
         } else {
             $this->name = $lang['DBCreate'];
             if ( !$this->user->isadmin()) {
-                $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
+                $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()]));
                 $this->stop = true;
             }
         }
@@ -201,7 +201,7 @@
             $this->obj->type = $_GET['type'];
         }
         if ( ! $this->obj->mod_ok() ) {
-            $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
+            $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()]));
             $this->stop = true;
         }
         // menu
@@ -237,4 +237,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/database_show.php
===================================================================
--- trunk/php/database_show.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/database_show.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -35,103 +35,115 @@
     Function info() {
         global $tutos,$lang;
 
+        $this->width = 4;
+
         $r = '';
         $r .= $this->DataTableStart();
-        $r .= "<tr>\n";
-        $r .= ' <th colspan="3">'. sprintf($lang['Showing'],$this->obj->getFullName()) ."</th>\n";
-        $r .= $this->showGuiIcons('<th class="icons">','</th>',$this->obj,$this->obj,array('mod','del','perm'),false);
-        $r .= "</tr>\n";
+        $r .= $this->headline_gui();
+        $r .= $this->CreatorInfoLine($this->obj,$this->width);
 
-        $r .= $this->CreatorInfoLine($this->obj,4);
-
-        $r .= "<tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= $this->showfield($lang['AdminDBName']);
         $r .= $this->showdata($this->obj->name);
         $r .= $this->showfield($lang['AdminDBType']);
         $r .= $this->showdata($this->obj->tlist[$this->obj->type]);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= $this->showfield($lang['AdminDBAlias']);
         $r .= $this->showdata($this->obj->alias);
         $r .= $this->showfield($lang['AdminDBPrefix']);
         $r .= $this->showdata($this->obj->prefix);
+        $r .= $this->ContentRowEnd();
 
+
         // Do not show sensitive infos
         if ( $this->user->isAdmin() ) {
-            $r .= "</tr><tr>\n";
+            $r .= $this->ContentRowStart();
             $r .= $this->showfield($lang['AdminDBHost']);
             $r .= $this->showdata($this->obj->host);
             $r .= $this->showfield($lang['AdminDBPort']);
             $r .= $this->showdata($this->obj->port);
-            $r .= "</tr><tr>\n";
+            $r .= $this->ContentRowEnd();
+
+            $r .= $this->ContentRowStart();
             $r .= $this->showfield($lang['AdminDBUser']);
             $r .= $this->showdata($this->obj->user);
             $r .= $this->showfield($lang['AdminDBPass']);
             $r .= $this->showdata($this->obj->pass);
+            $r .= $this->ContentRowEnd();
         }
-        $r .= "</tr><tr>\n";
+
+        $r .= $this->ContentRowStart();
         $r .= $this->showfield($lang['DBSystemID']);
-        $r .= $this->showdata($this->obj->systemid,3);
-        $r .= "</tr><tr>\n";
+        $r .= $this->showdata($this->obj->systemid,$this->width-1);
+        $r .= $this->ContentRowEnd();
+
+        $r .= $this->ContentRowStart();
         $r .= $this->showfield($lang['DBLastAnalyze']);
         $r .= $this->showdata($this->obj->lastanalyze->getDateTime(),3);
-        $r .= "</tr><tr>\n";
+        $r .= $this->ContentRowEnd();
+
+        $r .= $this->ContentRowStart();
         $r .= $this->showfield($lang['DBLastDate']);
         $r .= $this->showdata($this->obj->lastsync->getDateTime());
         $r .= $this->showfield($lang['DBLastID']);
         $r .= $this->showdata($this->obj->lastid);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= $this->showfield('cryptpw');
         $r .= $this->showdata($this->obj->crypt);
         $r .= $this->showfield($lang['CfgVersion']);
         $r .= $this->showdata($this->obj->version);
+        $r .= $this->ContentRowEnd();
 
         if ( $this->obj->type == 3 ) {
-            $r .= "</tr><tr>\n";
+            $r .= $this->ContentRowStart();
             $r .= $this->showfield($lang['AdminDBHome']);
-            $r .= $this->showdata($this->obj->home,3);
+            $r .= $this->showdata($this->obj->home,$this->width-1);
+            $r .= $this->ContentRowEnd();
         }
         if ( ($tutos[usedocmanagement] == 1) ) {
-            $r .= "</tr><tr>\n";
+            $r .= $this->ContentRowStart();
             $r .= $this->showfield($lang['AdminDBRep']);
             $r .= $this->showdata($this->obj->repository,3);
+            $r .= $this->ContentRowEnd();
         }
 
-        $r .= "</tr>\n";
         /**
-         $r .= "<tr>\n";
-         $r .= $this->showfield($lang['CfgLogo']);
-         $r .= $this->showdata('<span class="missing">'.$this->obj->logo.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3);
+           $r .= "<tr>\n";
+           $r .= $this->showfield($lang['CfgLogo']);
+           $r .= $this->showdata('<span class="missing">'.$this->obj->logo.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3);
 
-         $r .= "</tr><tr>\n";
-         $r .= $this->showfield($lang['CfgLogoLink']);
-         $r .= $this->showdata('<span class="missing">'.$this->obj->logolink.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3);
+           $r .= "</tr><tr>\n";
+           $r .= $this->showfield($lang['CfgLogoLink']);
+           $r .= $this->showdata('<span class="missing">'.$this->obj->logolink.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3);
 
-         $r .= "</tr><tr>\n";
-         $r .= $this->showfield($lang['CfgBugAutoName']);
-         $r .= $this->showdata('<span class="missing">'.$this->obj->bugautoname.'</span> (deprecated go '.makelink('bugtracking/bug_config.php','here').')',3);
+           $r .= "</tr><tr>\n";
+           $r .= $this->showfield($lang['CfgBugAutoName']);
+           $r .= $this->showdata('<span class="missing">'.$this->obj->bugautoname.'</span> (deprecated go '.makelink('bugtracking/bug_config.php','here').')',3);
 
-         $r .= "</tr><tr>\n";
-         $r .= $this->showfield($lang['CfgInvAutoName']);
-         $r .= $this->showdata('<span class="missing">'.$this->obj->invautoname.'</span> (deprecated go '.makelink('invoice/invoice_config.php','here').')',3);
+           $r .= "</tr><tr>\n";
+           $r .= $this->showfield($lang['CfgInvAutoName']);
+           $r .= $this->showdata('<span class="missing">'.$this->obj->invautoname.'</span> (deprecated go '.makelink('invoice/invoice_config.php','here').')',3);
 
-         $r .= "</tr><tr>\n";
-         $r .= $this->showfield($lang['CfgTaskAutoName']);
-         $r .= $this->showdata('<span class="missing">'.$this->obj->taskautoname.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3);
+           $r .= "</tr><tr>\n";
+           $r .= $this->showfield($lang['CfgTaskAutoName']);
+           $r .= $this->showdata('<span class="missing">'.$this->obj->taskautoname.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3);
 
-         $r .= "</tr><tr>\n";
-         $r .= $this->showfield($lang['CfgVATlist']);
-         $r .= $this->showdata('<span class="missing">'.$this->obj->vatlist.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3);
+           $r .= "</tr><tr>\n";
+           $r .= $this->showfield($lang['CfgVATlist']);
+           $r .= $this->showdata('<span class="missing">'.$this->obj->vatlist.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3);
 
-         $r .= "</tr>\n";
+           $r .= "</tr>\n";
         */
         // Show additional custom fields
-        $r .= show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+        $r .= show_custom_fields($this,$this->obj->gettype(),$this->obj,$this->width);
 
         // References to modules
-        $r .= show_module_infolists($this->user,$this->obj,4,$this->format);
-        $r .= $this->obj->getHistoryLink(4);
+        $r .= show_module_infolists($this->user,$this->obj,$this->width,$this->format);
+        $r .= $this->obj->getHistoryLink($this->width);
         $r .= $this->DataTableEnd();
         return $r;
     }
@@ -149,11 +161,11 @@
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
         }
         if ( !is_object($this->obj) || (! $this->obj->see_ok()) ) {
-            $msg .= sprintf($lang['Err0040'],$lang['database']);
+            $msg = addLine($msg,sprintf($lang['Err0040'],$lang['database']));
             $this->stop = true;
             return;
         } else if ( $this->obj->id < 0 ) {
-            $msg .= sprintf($lang['Err0040'],$lang['database']);
+            $msg = addLine($msg,sprintf($lang['Err0040'],$lang['database']));
             $this->stop = true;
             return;
         }

Modified: trunk/php/history_select.php
===================================================================
--- trunk/php/history_select.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/history_select.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -85,7 +85,7 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang;
+        global $msg,$info,$lang;
 
         $this->layout_id = usehistory;
         $this->name = $lang['ObjHistory'];
@@ -93,12 +93,12 @@
         $this->css_class = 'selectbox';
 
         if ( ! $this->user->feature_ok(usehistory,PERM_SEL) ) {
-            $msg .= sprintf($lang['Err0022'],$this->name);
+            $msg = addLine($msg,sprintf($lang['Err0022'],$this->name));
             $this->stop = true;
             return;
         }
         if ( ! $this->user->feature_ok(usehistory,PERM_SEE) ) {
-            $msg .= sprintf($lang['Err0022'],$this->name);
+            $msg = addLine($msg,sprintf($lang['Err0022'],$this->name));
             $this->stop = true;
             return;
         }

Modified: trunk/php/invoice/invoice_config.php
===================================================================
--- trunk/php/invoice/invoice_config.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/invoice/invoice_config.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -99,7 +99,7 @@
      *
      */
     function prepare() {
-        global $lang,$msg,$tutos;
+        global $lang,$msg,$info,$tutos;
 
         $this->name      = $lang['InvoiceConfig'];
         $this->css_class = 'configbox';
@@ -110,7 +110,7 @@
         if (!isset($tutos['invoice_billable_tt'])) $tutos['invoice_billable_tt'] = '1';
 
         if ( ! $this->user->isAdmin() ) {
-            $msg .= $this->error("Only admins are allowed to see this");
+            $msg = addLine($msg,$this->error("Only admins are allowed to see this"));
             $this->stop = true;
             return;
         }
@@ -124,7 +124,7 @@
             $tutos['invoice_billable_tt'] = implode(',',$_REQUEST['invoice_billable_tt']);
             write_config_value($this->dbconn,'invoice_billable_tt','invoice');
 
-            $msg .= ' saving done ';
+            $info = addLine($info,'saving done');
         }
     }
 }

Modified: trunk/php/invoice/invoice_new.php
===================================================================
--- trunk/php/invoice/invoice_new.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/invoice/invoice_new.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -427,7 +427,7 @@
         if ( isset($_GET['id']) ) {
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
             if ( !is_object($this->obj) ) {
-                $msg .= sprintf($lang['Err0040'],$lang['invoice']);
+                $msg = addLine($msg,sprintf($lang['Err0040'],$lang['invoice']));
                 $this->stop = true;
                 return;
             }
@@ -436,7 +436,7 @@
         } else {
             $this->name = $lang['InvoiceCreate'];
             if ( !$this->user->feature_ok(useinvoice,PERM_NEW) ) {
-                $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
+                $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()]));
                 $this->stop = true;
                 return;
             }
@@ -447,7 +447,7 @@
             }
         }
         if ( ! $this->obj->mod_ok() ) {
-            $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
+            $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()]));
             $this->stop = true;
             return;
         }

Modified: trunk/php/invoice/invoice_overview.php
===================================================================
--- trunk/php/invoice/invoice_overview.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/invoice/invoice_overview.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2012 by Gero Kohnert
+ *  Copyright 2002 - 2013 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
@@ -12,6 +12,8 @@
  * @package invoice
  *
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -313,7 +315,7 @@
 
         if ($this->ext != 0) {
             overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice'));
-            overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference');
+            overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference',get_parent_classes('invoice'));
         }
 
         // Start Date for search
@@ -333,8 +335,8 @@
         }
         // Customer
         if ($this->ext != 0) {
-            overview_arg($this,'customerfn',OVERVIEW_ARG_FN,'invoice',array('customer'),'InvoiceCustomer','','atcdD');
-            overview_arg($this,'customerid',OVERVIEW_ARG_OBJID,'invoice',array('customer'),'InvoiceCustomer','','atcdD');
+            overview_arg($this,'customerfn',OVERVIEW_ARG_FN,'invoice',array('customer'),'InvoiceCustomer','',array(useaddressbook,useteams,usecompany,usedepartment,'D'));
+            overview_arg($this,'customerid',OVERVIEW_ARG_OBJID,'invoice',array('customer'),'InvoiceCustomer','');
         }
 
         // Position (join)

Modified: trunk/php/location_del.php
===================================================================
--- trunk/php/location_del.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/location_del.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2012 by Gero Kohnert
+ * Copyright 1999 - 2013 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
@@ -9,13 +9,16 @@
  * @package address
  * @module location_del
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 require_once 'webelements.p3';
 require_once 'permission.p3';
 
 /* Check if user is allowed to use it */
 check_user();
 
-$msg = "";
+$msg  = '';
+$info = '';
 $l = new location($dbconn);
 $l = $l->read($_GET['id'],$l);
 $l->adr_loc = $_GET['ref'];
@@ -24,11 +27,11 @@
 $gotourl = $l->ref->getUrl();
 
 $dbconn->Begin("WORK");
-$msg .= $l->delete();
+$msg = addLine($msg,$l->delete());
 $dbconn->Commit("WORK");
 
 leave_insert($dbconn,$gotourl,$msg,$info);
-/*
+/**
  *  SVN Info  $Id$
  *  $Author$
  */

Modified: trunk/php/module_template/AAA_config.php
===================================================================
--- trunk/php/module_template/AAA_config.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/module_template/AAA_config.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -66,18 +66,18 @@
      *
      */
     function prepare() {
-        global $lang,$msg,$tutos;
+        global $lang,$msg,$info,$tutos;
 
         $this->name      = $lang['AAAConfig'];
         $this->css_class = 'configbox';
 
         if ( ! $this->user->isAdmin() ) {
-            $msg .= $this->error("Only admins are allowed to see this");
+            $msg = addLine($msg,$this->error("Only admins are allowed to see this"));
             $this->stop = true;
             return;
         }
         if (isset($_REQUEST['save']) && ($_REQUEST['save'] == 1) ) {
-            $msg .= ' saving done ';
+            $info = addLine($info,'saving done');
         }
     }
 

Modified: trunk/php/reminder/reminder_new.php
===================================================================
--- trunk/php/reminder/reminder_new.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/reminder/reminder_new.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -180,7 +180,7 @@
         if ( isset($_GET['id']) ) {
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
             if ( !is_object($this->obj) ) {
-                $msg .= sprintf($lang['Err0040'],$lang['Reminder']);
+                $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Reminder']));
                 $this->stop = true;
                 return;
             }
@@ -192,7 +192,7 @@
         if ( isset($_GET['link_id']) ) {
             $this->obj->link_id = $_GET['link_id'];
         } else if ($this->obj->id == -1) {
-            $msg .= sprintf($lang['Err0040'],$lang['ReminderReference']);
+            $msg = addLine($msg,sprintf($lang['Err0040'],$lang['ReminderReference']));
             $this->stop = true;
             return;
         }
@@ -210,7 +210,7 @@
         $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());
+            $msg = addLine($msg,sprintf($lang['Err0001'],$lang[$this->obj->ref->getType()],$this->obj->ref->getFullName()));
             $this->stop = true;
         }
 
@@ -223,7 +223,7 @@
             unset($f);
         }
         if ( ! $this->obj->mod_ok() ) {
-            $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
+            $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()]));
             $this->stop = true;
         }
 
@@ -254,4 +254,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/reminder/reminder_overview.php
===================================================================
--- trunk/php/reminder/reminder_overview.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/reminder/reminder_overview.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -229,8 +229,8 @@
         }
 
         // adresses to display
-        overview_arg($this,'tofn',OVERVIEW_ARG_FN,'reminder',array('adr_id'),'ReminderTo','r.','at');
-        overview_arg($this,'toid',OVERVIEW_ARG_OBJID,'reminder',array('adr_id'),'ReminderTo','r.','at');
+        overview_arg($this,'tofn',OVERVIEW_ARG_FN,'reminder',array('adr_id'),'ReminderTo','r.',array(useaddressbook,useteams));
+        overview_arg($this,'toid',OVERVIEW_ARG_OBJID,'reminder',array('adr_id'),'ReminderTo','r.',array(useaddressbook,useteams));
         // projects to display
         overview_arg($this,'reffn',OVERVIEW_ARG_FN,'reminder',array('link_id'),'ReminderReference','r.','all');
         overview_arg($this,'refid',OVERVIEW_ARG_OBJID,'reminder',array('link_id'),'ReminderReference','r.');

Modified: trunk/php/scrum/scrum_config.php
===================================================================
--- trunk/php/scrum/scrum_config.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/scrum/scrum_config.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -81,13 +81,13 @@
      *
      */
     function prepare() {
-        global $lang,$msg,$tutos;
+        global $lang,$msg,$info,$tutos;
 
         $this->name      = $lang['ScrumConfig'];
         $this->css_class = 'configbox';
 
         if ( ! $this->user->isAdmin() ) {
-            $msg .= $this->error("Only admins are allowed to see this");
+            $msg = addLine($msg,$this->error("Only admins are allowed to see this"));
             $this->stop = true;
             return;
         }
@@ -96,7 +96,7 @@
         if (!isset($tutos['scrum_max_hours']))  $tutos['scrum_max_hours'] = 15;
         if (!isset($tutos['scrum_allow_weekend']))  $tutos['scrum_allow_weekend'] = 0;
         if (isset($_REQUEST['max_hours']) && !is_numeric($_REQUEST['max_hours'])) {
-            $msg .= $_REQUEST['max_hours'].' is not a number. Nothing saved';
+            $msg = addLIne($msg,$_REQUEST['max_hours'].' is not a number. Nothing saved');
             $_REQUEST['save'] = 0;
         }
 
@@ -106,8 +106,7 @@
             $tutos['scrum_allow_weekend'] = $_REQUEST['allow_weekend'];
             write_config_value($this->dbconn,'scrum_allow_weekend','scrumlog');
 
-
-            $msg .= ' saving done ';
+            $info = addLine($info,'saving done');
         }
     }
 

Modified: trunk/php/scrum/sprint_overview.php
===================================================================
--- trunk/php/scrum/sprint_overview.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/scrum/sprint_overview.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -180,14 +180,14 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang,$current_user,$table;
+        global $msg,$info,$lang,$table;
 
         $this->name = $lang['SprintOverview'];
 
         $this->layout_id = USESCRUMSPRINT;
 
         if ( ! $this->user->feature_ok(USESCRUMSPRINT,PERM_SEE) ) {
-            $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
+            $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'"));
             $this->stop = true;
             return;
         }
@@ -238,7 +238,7 @@
 
         overview_arg($this,'state',OVERVIEW_ARG_INT,'scrumsprint',array('state'),array('SprintState','SprintStates'),'d.');
 
-        //$msg .= $this->q;
+        //$msg = addLine($msg,$this->q);
 
         // sorting
         $xxx = '';

Modified: trunk/php/stc/stc_new.php
===================================================================
--- trunk/php/stc/stc_new.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/stc/stc_new.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2009 - 2012 by Gero Kohnert
+ *  Copyright 2009 - 2013 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
@@ -10,6 +10,8 @@
  * @module stc_new
  * @package stc
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -188,21 +190,21 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang,$current_user,$tutos;
+        global $msg,$info,$lang,$tutos;
 
         $this->obj = new stc($this->dbconn);
         if(isset($_GET['id']) && is_numeric($_GET['id'])) {
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
             $this->name = $lang['STCModify'];
             if (is_object($this->obj) && !$this->obj->mod_ok() ) {
-                $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
+                $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()]));
                 $this->stop = true;
                 return;
             }
         } else {
             $this->name = $lang['STCCreate'];
             if (!$this->user->feature_ok(usestc,PERM_NEW) ) {
-                $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
+                $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()]));
                 $this->stop = true;
             }
         }
@@ -211,10 +213,10 @@
         if(isset($_GET['lgarr']) ) {
             $this->obj->lang_array = $_GET['lgarr'];
         } else if (!is_object($this->obj)){
-            $msg .= sprintf($lang['Err0040'],$lang['STC']);
+            $msg = addLine($msg,sprintf($lang['Err0040'],$lang['STC']));
             $this->stop = true ;
         } else if ($this->obj->id == -1){
-            $msg .= sprintf($lang['Err0040'],$lang['STC']);
+            $msg = addLine($msg,sprintf($lang['Err0040'],$lang['STC']));
             $this->stop = true ;
         }
         if(isset($_GET['mod']) ) {
@@ -223,7 +225,7 @@
 
         if (($this->obj->lang_array != '') && (!isset($lang[$this->obj->lang_array]) || !is_array($lang[$this->obj->lang_array]))) {
             $this->stop = true;
-            $msg .= '"'.$this->obj->lang_array.'" is not a lang array';
+            $msg = addLine($msg,'"'.$this->obj->lang_array.'" is not a lang array');
             return;
         }
 

Modified: trunk/php/stc/stc_overview.php
===================================================================
--- trunk/php/stc/stc_overview.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/stc/stc_overview.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -11,6 +11,7 @@
  * @package stc
  */
 $tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -101,7 +102,7 @@
      * action via massupdate
      */
     Function action() {
-        global $lang,$msg;
+        global $lang,$msg,$info;
 
         if ( $_GET['action'] == -2 ) {
             $this->dbconn->Begin("WORK");
@@ -112,10 +113,10 @@
                     continue;
                 }
                 if ( $b->del_ok() ) {
-                    $msg .= $lang['Delete'].":". $b->getFullName() ."<br />";
-                    $msg .= $b->delete();
+                    $info = addLine($info,$lang['Delete'].":". $b->getFullName());
+                    $msg = addLine($msg,$b->delete());
                 } else {
-                    $msg .= $b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]) ."<br />\n";
+                    $msg = addLine($msg,$b->getLink() .': '. sprintf($lang['Err0023'],$lang[$b->getType()]));
                 }
                 unset($b);
             }
@@ -134,13 +135,14 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang,$current_user,$table;
+        global $msg,$lang,$table;
 
         $this->name = $lang['STCOverview'];
 
         if ( ! $this->user->feature_ok(usestc,PERM_SEE) ) {
-            $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
+            $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'"));
             $this->stop = true;
+            return;
         }
         $this->link1 = "stc/stc_overview.php";
 

Modified: trunk/php/stc/stc_show.php
===================================================================
--- trunk/php/stc/stc_show.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/stc/stc_show.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2009 - 2011 by Gero Kohnert
+ *  Copyright 2009 - 2013 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
@@ -10,6 +10,8 @@
  * @module stc_new
  * @package stc
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -267,7 +269,7 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang,$current_user;
+        global $msg,$info,$lang;
 
         $this->name = $lang['STCDetail'];
         $this->obj = new stc($this->dbconn);
@@ -275,17 +277,17 @@
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
         }
         if ( !is_object($this->obj) ) {
-            $msg .= sprintf($lang['Err0040'],$lang['STC']);
+            $msg = addLine($msg,sprintf($lang['Err0040'],$lang['STC']));
             $this->stop = true;
             $this->format = "html";
             return;
         } else if ( ! $this->obj->see_ok() ) {
-            $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
+            $msg = addLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()]));
             $this->stop = true;
             $this->format = "html";
             return;
         } else if ( $this->obj->id < 0 ) {
-            $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+            $msg = addLine($msg,sprintf($lang['Err0040'],$lang[$this->obj->getType()]));
             $this->stop = true;
             $this->format = "html";
             return;

Modified: trunk/php/stuff/stuff_config.php
===================================================================
--- trunk/php/stuff/stuff_config.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/stuff/stuff_config.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -63,7 +63,7 @@
      *
      */
     function prepare() {
-        global $lang,$msg,$tutos;
+        global $lang,$msg,$info,$tutos;
 
         $this->name      = $lang['StuffConfig'];
         $this->css_class = 'configbox';
@@ -72,14 +72,14 @@
         if (!isset($tutos['stuff_autoname'])) $tutos['stuff_autoname'] = 'I-%Y-&X';
 
         if ( ! $this->user->isAdmin() ) {
-            $msg .= $this->error("Only admins are allowed to see this");
+            $msg = addLine($msg,$this->error("Only admins are allowed to see this"));
             $this->stop = true;
             return;
         }
         if (isset($_REQUEST['save']) && ($_REQUEST['save'] == 1) ) {
             $tutos['stuff_autoname'] = $_REQUEST['autoname'];
             write_config_value($this->dbconn,'stuff_autoname','stuff');
-            $msg .= ' saving done ';
+            $info = addLine($info,'saving done');
         }
     }
 }

Modified: trunk/php/task_copy_ins.php
===================================================================
--- trunk/php/task_copy_ins.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/task_copy_ins.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert
+ *  Copyright 1999 - 2013 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
@@ -13,6 +13,8 @@
  * @module task_ins
  * @package task
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 require_once 'webelements.p3';
 require_once 'permission.p3';
 
@@ -29,7 +31,7 @@
  * - shiftdates if neccessary
  */
 function copy_task(task $obj,tutos_base $pobj) {
-    global $current_user,$msg,$cnt,$ref,$gotourl,$copytree,$shiftdates,$diff,$copyres;
+    global $current_user,$msg,$info,$cnt,$ref,$gotourl,$copytree,$shiftdates,$diff,$copyres;
 
     $obj->readWorker();
     task::obj_read($obj);
@@ -61,7 +63,7 @@
     }
 
     // save
-    $msg .= $obj->save();
+    $msg = addLine($msg,$obj->save());
     $obj->modified[] = array ( "field" => "Copy" ,
                                "old" => $oldid ,
                                "new" => $obj->id,
@@ -72,7 +74,7 @@
             $obj->res[] = $i;
         }
     }
-    $msg .= $obj->save();
+    $msg = addLine($msg,$obj->save());
 
     if ($gotourl == '')
         $gotourl = $obj->getUrl();
@@ -81,7 +83,7 @@
     if ($copytree) {
         // walk through subtasks
         foreach ($obj->tasklist as $i => $o) {
-            $msg .= copy_task($o,$obj);
+            $msg = addLine($msg,copy_task($o,$obj));
         }
     }
     unset($obj->tasklist);
@@ -89,15 +91,16 @@
 }
 
 
-$msg = '';
+$msg        = '';
+$info       = '';
 $gotourl    = 'task_new.php';
 $copytree   = false;
 $copyres    = false;
 $shiftdates = false;
 $diff       = 0;
 
-$obj = new task($dbconn);   // the copy
-$oobj = new task($dbconn);  // original
+$obj    = new task($dbconn);   // the copy
+$oobj   = new task($dbconn);  // original
 $parent = null;
 
 $ref = array(); // references old and new ids
@@ -140,7 +143,7 @@
     $newstart->setDateTimeF("newstart");
     $gotourl= addUrlParameter($gotourl,"newstart=". $newstart->getYYYYMMDDHHMM(),true);
     if ( !$newstart->checkDMY(true) ) {
-        $msg .= sprintf($lang['Err0038'],$lang['TaskS_Start']) ."<br />";
+        $msg = addLine($msg,sprintf($lang['Err0038'],$lang['TaskS_Start']));
     }
     $diff = $newstart->ts - $obj->s_start->ts;
 }
@@ -161,7 +164,7 @@
 }
 
 if ( !isset($_POST['name']) || (trim($_POST['name']) == '') ) {
-    $msg .= sprintf($lang['Err0009'],$lang['TaskName']) .'<br />';
+    $msg = addLine($msg,sprintf($lang['Err0009'],$lang['TaskName']));
     $gotourl = addBadField($gotourl,'name',true);
 } else {
     $obj->setName(trim($_POST['name']));
@@ -172,31 +175,31 @@
 if (is_object($parent)) {
     $oobj->fulltasklist[$oobj->id] = 1;
     if (array_key_exists($parent->id,$oobj->fulltasklist)) {
-        $msg .= 'Copy failed: Selfreference';
+        $msg = addLine($msg,'Copy failed: Selfreference');
     }
 }
 
 //
 // Parse additional custom fields
 //
-$msg .= parse_custom_fields($obj->gettype(),$obj);
+$msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj));
 
 // other modules (ignore here !!)
 #$msg .= module_parseforms($current_user,$obj,$gotourl);
 
 
-$msg .= $obj->run_check_hook();
+$msg = addLine($msg,$obj->run_check_hook());
 if ( $msg == "" ) {
     $dbconn->Begin("WORK");
     $gotourl = '';
-    $msg .= copy_task($obj,$parent);
+    $msg = addLine($msg,copy_task($obj,$parent));
 
     // Manage TaskLinks
 
     $dbconn->Commit("WORK");
 }
 
-leave_insert($dbconn,$gotourl,$msg);
+leave_insert($dbconn,$gotourl,$msg,$info);
 
 /**
  *  SVN Info  $Id$

Modified: trunk/php/testmanager/testcase_ins.php
===================================================================
--- trunk/php/testmanager/testcase_ins.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testcase_ins.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -25,7 +25,8 @@
 loadmodules('testcase','ins');
 loadmodule('testcase');
 
-$msg = '';
+$msg     = '';
+$info    = '';
 $gotourl = 'testmanager/testcase_new.php';
 
 $obj = array();
@@ -104,7 +105,7 @@
         $gotourl = $o->ref->getURL();
     }
 }
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/testmanager/testcase_new.php
===================================================================
--- trunk/php/testmanager/testcase_new.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testcase_new.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -192,11 +192,11 @@
             $this->obj[1]->read_reference();
             $this->name = $lang['TestcaseMod'];
             if ( !is_object($this->obj[1]) ) {
-                $msg .= sprintf($lang['Err0040'],$lang['Testcase']);
+                $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Testcase']));
                 $this->stop = true ;
                 return;
             } else if ( ! $this->obj[1]->mod_ok() ) {
-                $msg .= sprintf($lang['Err0024'],$lang[$this->obj[1]->getType()]);
+                $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj[1]->getType()]));
                 $this->stop = true;
                 return;
             }
@@ -206,7 +206,7 @@
             $this->name = $lang['TestcaseCreation'];
 
             if ( !$this->user->feature_ok(usetestcase,PERM_NEW) ) {
-                $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
+                $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()]));
                 $this->stop = true;
                 return;
             }
@@ -233,13 +233,13 @@
             $this->obj[$i]->read_reference();
             $this->obj[$i]->read_relations();
             if ( ! $this->obj[$i]->mod_ok() ) {
-                $msg .= sprintf($lang['Err0024'],$lang[$this->obj[$i]->getType()]);
+                $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj[$i]->getType()]));
                 $this->stop = true;
                 return;
             }
 
             if ( !is_object($this->obj[$i]->ref) ) {
-                $msg .= sprintf($lang['Err0040'],$lang['Reference']);
+                $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Reference']));
                 $this->stop = true;
                 return;
             }

Modified: trunk/php/testmanager/testcase_overview.php
===================================================================
--- trunk/php/testmanager/testcase_overview.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testcase_overview.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -194,7 +194,7 @@
         $this->css_class = 'overviewbox';
         $defsort = array('creation',2);
         if ( ! $this->user->feature_ok(usetestcase,PERM_SEE) ) {
-            $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
+            $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'"));
             $this->stop = true;
             return;
         }

Modified: trunk/php/testmanager/testcase_show.php
===================================================================
--- trunk/php/testmanager/testcase_show.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testcase_show.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -143,7 +143,7 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang;
+        global $info,$msg,$lang;
 
         $this->name = $lang['TestcaseDetail'];
         $this->obj = new testcase($this->dbconn);
@@ -152,15 +152,15 @@
         }
 
         if ( ! is_object($this->obj) ) {
-            $msg .= sprintf($lang['Err0040'],$lang['Testcase']);
+            $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Testcase']));
             $this->stop = true;
             $this->format = "html";
             return;
         } else if ( ! $this->obj->see_ok() ) {
-            $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
+            $msg = addLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()]));
             $this->stop = true;
         } else if ( $this->obj->id < 0 ) {
-            $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+            $msg = addLine($msg,sprintf($lang['Err0040'],$lang[$this->obj->getType()]));
             $this->stop = true;
             return;
         } else {

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testmanager.pinc	2013-12-14 11:43:49 UTC (rev 1201)
@@ -2497,19 +2497,19 @@
      * manipulate name and description in order to indicate a retest
      */
     function make_retest(Testrun $orig) {
-        $msg = '';
+        $m = '';
         $r_nr = 1;
         $regs = array();
         if (preg_match('#([\p{L}[:print:]\X]*) RETEST ([0-9]+)#miu',$orig->name,$regs)) {
             $r_nr = $regs[2];
             $r_nr++;
-            $msg .= $this->setName($regs[1].' RETEST '.$r_nr);
-            $msg .= $this->setDesc("RETEST ".$r_nr.":\r\n".$orig->desc);
+            $m .= $this->setName($regs[1].' RETEST '.$r_nr);
+            $m .= $this->setDesc("RETEST ".$r_nr.":\r\n".$orig->desc);
         } else {
-            $msg .= $this->setName($orig->name.' RETEST '.$r_nr);
-            $msg .= $this->setDesc("RETEST ".$r_nr.":\r\n".$orig->desc);
+            $m .= $this->setName($orig->name.' RETEST '.$r_nr);
+            $m .= $this->setDesc("RETEST ".$r_nr.":\r\n".$orig->desc);
         }
-        return $msg;
+        return $m;
     }
 
     /**

Modified: trunk/php/testmanager/testmanager_config.php
===================================================================
--- trunk/php/testmanager/testmanager_config.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testmanager_config.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -66,7 +66,7 @@
      *
      */
     function prepare() {
-        global $lang,$msg,$tutos;
+        global $lang,$msg,$info,$tutos;
 
         $this->name      = $lang['TestmanagerConfig'];
         $this->css_class = 'configbox';
@@ -83,7 +83,7 @@
             $tutos['testcase_massadd'] = $_REQUEST['testcase_massadd'];
             write_config_value($this->dbconn,'testcase_massadd','testcase');
 
-            $msg = addLine($msg,'saving done');
+            $info = addLine($info,'saving done');
         }
     }
 }

Modified: trunk/php/testmanager/testrun_new.php
===================================================================
--- trunk/php/testmanager/testrun_new.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testrun_new.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -206,7 +206,7 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang,$current_user;
+        global $msg,$info,$lang,$current_user;
 
         $this->mode = '';
         if (isset($_GET['mode'])) {

Modified: trunk/php/testmanager/testrun_overview.php
===================================================================
--- trunk/php/testmanager/testrun_overview.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testrun_overview.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -322,7 +322,7 @@
         $this->name = $lang['TestrunOverview'];
 
         if ( ! $this->user->feature_ok(usetestrun,PERM_SEE) ) {
-            $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
+            $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'"));
             $this->stop = true;
             return;
         }

Modified: trunk/php/testmanager/testsuite_ins.php
===================================================================
--- trunk/php/testmanager/testsuite_ins.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testsuite_ins.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -13,6 +13,8 @@
  * @module testsuite_ins
  * @package testsuite
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -125,8 +127,9 @@
     }
 }
 
-$mode = '';
-$msg = '';
+$mode    = '';
+$msg     = '';
+$info    = '';
 $gotourl = 'testmanager/testsuite_new.php';
 $statechnage = false;
 
@@ -306,7 +309,7 @@
         $x->display();
         exit;
     }
-    leave_insert($dbconn,'../'.$gotourl,$msg);
+    leave_insert($dbconn,'../'.$gotourl,$msg,$info);
     exit;
 }
 

Modified: trunk/php/testmanager/testsuite_overview.php
===================================================================
--- trunk/php/testmanager/testsuite_overview.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/testmanager/testsuite_overview.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -212,7 +212,7 @@
         $defsort = array('name',1);
 
         if ( ! $this->user->feature_ok(usetestsuite,PERM_SEE) ) {
-            $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
+            $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'"));
             $this->stop = true;
             return;
         }

Modified: trunk/php/timetrack/timetrack_config.php
===================================================================
--- trunk/php/timetrack/timetrack_config.php	2013-12-11 08:47:44 UTC (rev 1200)
+++ trunk/php/timetrack/timetrack_config.php	2013-12-14 11:43:49 UTC (rev 1201)
@@ -135,7 +135,7 @@
      *
      */
     function prepare() {
-        global $lang,$msg,$tutos;
+        global $lang,$msg,$info,$tutos;
 
         $this->name      = $lang['TimetrackConfig'];
         $this->css_class = 'configbox';
@@ -146,7 +146,7 @@
         if (!isset($tutos['timetrack_payed_state']))   $tutos['timetrack_payed_state'] = 3;
 
         if ( ! $this->user->isAdmin() ) {
-            $msg .= $this->error("Only admins are allowed to see this");
+            $msg = addLine($msg,$this->error("Only ...
 
[truncated message content]

Revision: 1200
          http://sourceforge.net/p/tutos/code/1200
Author:   gokohnert
Date:     2013-12-11 08:47:44 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
added missing lang

Modified Paths:
--------------
    trunk/php/url/ca.p3
    trunk/php/url/cs.p3
    trunk/php/url/de.p3
    trunk/php/url/el.p3
    trunk/php/url/en.p3
    trunk/php/url/es-mx.p3
    trunk/php/url/es-ni.p3
    trunk/php/url/es-ve.p3
    trunk/php/url/es.p3
    trunk/php/url/fr.p3
    trunk/php/url/hu.p3
    trunk/php/url/it.p3
    trunk/php/url/ja.p3
    trunk/php/url/ko.p3
    trunk/php/url/nl.p3
    trunk/php/url/pl.p3
    trunk/php/url/pt-br.p3
    trunk/php/url/pt.p3
    trunk/php/url/ru.p3
    trunk/php/url/sv.p3
    trunk/php/url/tw.p3
    trunk/php/url/vi.p3
    trunk/php/url/zh.p3

Modified: trunk/php/url/ca.p3
===================================================================
--- trunk/php/url/ca.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/ca.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/cs.p3
===================================================================
--- trunk/php/url/cs.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/cs.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/de.p3
===================================================================
--- trunk/php/url/de.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/de.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'URL Kategorie anlegen';
 $lang['URLCatAddI']      = 'eine neue URL KAtegorie anlegen';
 $lang['URLCatMod']       = 'URL Kategorie ändern';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'URL Kategorie anlegen';
 
 $lang['URLStoreQuery']    = 'Abfrage speichern';

Modified: trunk/php/url/el.p3
===================================================================
--- trunk/php/url/el.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/el.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/en.p3
===================================================================
--- trunk/php/url/en.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/en.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -1,14 +1,14 @@
 <?php
-# $Id$
-#
-# ========================= NOTE ========================
-# Please put site specific extensions and changes
-# to TUTOS language files in a file called 'en_custom.p3'
-# or 'lang_custom.p3' (for all languages)
-# using the same format like here
-# =======================================================
+// $Id$
+//
+// ========================= NOTE ========================
+// Please put site specific extensions and changes
+// to TUTOS language files in a file called 'en_custom.p3'
+// or 'lang_custom.p3' (for all languages)
+// using the same format like here
+// =======================================================
 
-# URL
+// URL
 $lang['URLName']         = 'Name';
 $lang['URLDesc']         = 'Description';
 $lang['URL']             = 'URL';
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';
@@ -42,4 +43,4 @@
 ### mode:iso-accents ***
 ### coding:utf-8 ***
 ### End: ***
-?>
+?>
\ No newline at end of file

Modified: trunk/php/url/es-mx.p3
===================================================================
--- trunk/php/url/es-mx.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/es-mx.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/es-ni.p3
===================================================================
--- trunk/php/url/es-ni.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/es-ni.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/es-ve.p3
===================================================================
--- trunk/php/url/es-ve.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/es-ve.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -28,6 +28,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/es.p3
===================================================================
--- trunk/php/url/es.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/es.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/fr.p3
===================================================================
--- trunk/php/url/fr.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/fr.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/hu.p3
===================================================================
--- trunk/php/url/hu.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/hu.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/it.p3
===================================================================
--- trunk/php/url/it.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/it.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/ja.p3
===================================================================
--- trunk/php/url/ja.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/ja.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/ko.p3
===================================================================
--- trunk/php/url/ko.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/ko.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/nl.p3
===================================================================
--- trunk/php/url/nl.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/nl.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/pl.p3
===================================================================
--- trunk/php/url/pl.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/pl.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/pt-br.p3
===================================================================
--- trunk/php/url/pt-br.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/pt-br.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/pt.p3
===================================================================
--- trunk/php/url/pt.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/pt.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -27,6 +27,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/ru.p3
===================================================================
--- trunk/php/url/ru.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/ru.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/sv.p3
===================================================================
--- trunk/php/url/sv.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/sv.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/tw.p3
===================================================================
--- trunk/php/url/tw.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/tw.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = "建立分類";
 $lang['URLCatAddI']      = "建立新網址分類";
 $lang['URLCatMod']       = "修改網址分類";
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = "建立網址分類";
 
 $lang['URLStoreQuery']    = "存儲查詢";

Modified: trunk/php/url/vi.p3
===================================================================
--- trunk/php/url/vi.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/vi.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = 'Create Category';
 $lang['URLCatAddI']      = 'Create a new URL Category';
 $lang['URLCatMod']       = 'Modify URL Category';
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = 'Create URL Category';
 
 $lang['URLStoreQuery']    = 'Store Query';

Modified: trunk/php/url/zh.p3
===================================================================
--- trunk/php/url/zh.p3	2013-12-11 08:42:03 UTC (rev 1199)
+++ trunk/php/url/zh.p3	2013-12-11 08:47:44 UTC (rev 1200)
@@ -25,6 +25,7 @@
 $lang['URLCatAdd']       = "建立分類";
 $lang['URLCatAddI']      = "建立新的网址分類";
 $lang['URLCatMod']       = "修改网址分類";
+$lang['URLCatDel']       = 'Delete URL Category';
 $lang['URLCatCreate']    = "建立网址分類";
 
 $lang['URLStoreQuery']    = "存储查询";

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

Revision: 1199
          http://sourceforge.net/p/tutos/code/1199
Author:   gokohnert
Date:     2013-12-11 08:42:03 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
set default

Modified Paths:
--------------
    trunk/php/bugtracking/bug.pinc

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2013-12-11 08:36:37 UTC (rev 1198)
+++ trunk/php/bugtracking/bug.pinc	2013-12-11 08:42:03 UTC (rev 1199)
@@ -538,7 +538,7 @@
     /**
      * get the history as a formatted text
      */
-    function getBugHistory($showlinks,$showhtml) {
+    function getBugHistory($showlinks,$showhtml = false) {
         global $lang,$tutos;
 
         $url = addSessionKey('bug_overview.php');

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

Revision: 1198
          http://sourceforge.net/p/tutos/code/1198
Author:   gokohnert
Date:     2013-12-11 08:36:37 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
fix failing address copy

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

Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc	2013-12-11 08:35:48 UTC (rev 1197)
+++ trunk/php/location.pinc	2013-12-11 08:36:37 UTC (rev 1198)
@@ -597,7 +597,7 @@
             if ( isset ($this->company->id) ) {
                 $this->company->read_locs_data();
                 if ( count($this->company->location) > 0 ) {
-                    if ($locid != -1) {
+                    if ( ($locid != -1) && isset($this->company->location[$locid])) {
                         $x = $this->company->location[$locid];
                     } else {
                         reset ($this->company->location);
@@ -615,7 +615,7 @@
             if ( isset ($this->department->id) ) {
                 $this->department->read_locs_data();
                 if ( count($this->department->location) > 0 ) {
-                    if ($locid != -1) {
+                    if (($locid != -1) && isset($this->department->location[$locid])) {
                         $x = $this->department->location[$locid];
                     } else {
                         reset ($this->department->location);

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

Revision: 1197
          http://sourceforge.net/p/tutos/code/1197
Author:   gokohnert
Date:     2013-12-11 08:35:48 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
mail to companies/dpeartments via group mail

Modified Paths:
--------------
    trunk/php/company.pinc
    trunk/php/department.pinc

Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc	2013-12-11 08:26:45 UTC (rev 1196)
+++ trunk/php/company.pinc	2013-12-11 08:35:48 UTC (rev 1197)
@@ -258,6 +258,43 @@
     }
 
     /**
+     * fill mailing list
+     * this will work recursive and add all members
+     * and subteam members to the given mailing list
+     */
+    function fill_maillist(&$ml) {
+        $ml[$this->id] = &$this;
+        return;
+    }
+
+    /**
+     * Read all locations data and find the email adr.
+     */
+    function default_email() {
+        if ( ! $this->rl2 ) {
+            $this->read_locs_data();
+        };
+        $e = '';
+
+        if ( isset($this->locall) ) {
+            foreach($this->locall as $i => $f) {
+                if ( $f->email_1 != '') {
+                    $e = $f->email_1;
+                    if ( $f->category == 2 ) {
+                        return $e;
+                    }
+                } elseif ( $f->email_2 != '' ) {
+                    $e = $f->email_1;
+                    if ( $f->category == 2 ) {
+                        return $e;
+                    }
+                }
+            }
+        }
+        return $e;
+    }
+
+    /**
      * Returns HTML for popup infos
      */
     function getPopInfo() {

Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc	2013-12-11 08:26:45 UTC (rev 1196)
+++ trunk/php/department.pinc	2013-12-11 08:35:48 UTC (rev 1197)
@@ -249,6 +249,43 @@
     }
 
     /**
+     * fill mailing list
+     * this will work recursive and add all members
+     * and subteam members to the given mailing list
+     */
+    function fill_maillist(&$ml) {
+        $ml[$this->id] = &$this;
+        return;
+    }
+
+    /**
+     * Read all locations data and find the email adr.
+     */
+    function default_email() {
+        if ( ! $this->rl2 ) {
+            $this->read_locs_data();
+        };
+        $e = '';
+
+        if ( isset($this->locall) ) {
+            foreach($this->locall as $i => $f) {
+                if ( $f->email_1 != '') {
+                    $e = $f->email_1;
+                    if ( $f->category == 2 ) {
+                        return $e;
+                    }
+                } elseif ( $f->email_2 != '' ) {
+                    $e = $f->email_1;
+                    if ( $f->category == 2 ) {
+                        return $e;
+                    }
+                }
+            }
+        }
+        return $e;
+    }
+
+    /**
      * Returns HTML for popup infos
      */
     function getPopInfo() {

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

Revision: 1196
          http://sourceforge.net/p/tutos/code/1196
Author:   gokohnert
Date:     2013-12-11 08:26:45 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
fix

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

Modified: trunk/php/timetrack/timetrack_overview.php
===================================================================
--- trunk/php/timetrack/timetrack_overview.php	2013-12-09 10:18:48 UTC (rev 1195)
+++ trunk/php/timetrack/timetrack_overview.php	2013-12-11 08:26:45 UTC (rev 1196)
@@ -602,13 +602,14 @@
     Function prepare() {
         global $msg,$tutos,$lang,$table;
 
-        $this->layout_id = usetimetrack;
-        $this->name = $lang['TimetrackOverview'];
-        $this->css_class = 'overviewbox';
-        $this->head = array();
-        $this->head['ref'] = true;
-        $this->head['worker'] = true;
-        $this->head['state'] = true;
+        $this->layout_id        = usetimetrack;
+        $this->name             = $lang['TimetrackOverview'];
+        $this->css_class        = 'overviewbox';
+        $this->header           = '';
+        $this->head             = array();
+        $this->head['ref']      = true;
+        $this->head['worker']   = true;
+        $this->head['state']    = true;
         $this->head['distance'] = true;
         if (isset($this->hide['distance']) && $this->hide['distance'] )  {
             $this->head['distance'] = false;

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

Revision: 1195
          http://sourceforge.net/p/tutos/code/1195
Author:   gokohnert
Date:     2013-12-09 10:18:48 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/db/db.pinc
    trunk/php/history_show.php

Modified: trunk/php/db/db.pinc
===================================================================
--- trunk/php/db/db.pinc	2013-12-06 16:34:15 UTC (rev 1194)
+++ trunk/php/db/db.pinc	2013-12-09 10:18:48 UTC (rev 1195)
@@ -784,10 +784,9 @@
             $cnt = $rc->get(0, "c");
             $rc->free();
             if ($this->range_start == -1) {
-                $this->range_start = min(0,$cnt - $this->range_cnt);
+                $this->range_start = max(0,$cnt - $this->range_cnt);
             }
         }
-
         $q = $this->getSelect();
         $r = $this->dbconn->Exec($q);
 

Modified: trunk/php/history_show.php
===================================================================
--- trunk/php/history_show.php	2013-12-06 16:34:15 UTC (rev 1194)
+++ trunk/php/history_show.php	2013-12-09 10:18:48 UTC (rev 1195)
@@ -95,7 +95,7 @@
         if ( $n == 0 ) {
             $r .= $this->error ( $lang['Err0048'] );
             $r .= $this->OverviewTableEnd();
-            return;
+            return $r;
         }
         if ( $this->start == -1 ) {
             $a = $n - $tutos['maxshow'];
@@ -105,14 +105,13 @@
             $a = $this->start;
             $end = $this->start + $tutos['maxshow'];
         }
-
         while ( ($a < $n) && ($a < $end) ) {
             $f = &$this->xobj->history[$a];
             $r .= $this->OverviewRowStart($line);
             if ( $this->id == -1 ) {
                 $this->obj = getObject($this->dbconn,$f["obj_id"],1);
                 if ( !is_object($this->obj) || ($this->obj->getType() == 'base') ) {
-                    $r .= $this->OverviewRowBlock('<b>'.  $f["obj_id"] .'</b>','over_l');
+                    $r .= $this->OverviewRowBlock('<b>'.$f["obj_id"] .'</b>','over_l');
                     $r .= $this->OverviewRowBlock('&#160;','over_l');
                 } else {
                     $r .= $this->OverviewRowBlock((isset($lang[$this->obj->getType()]) ? $lang[$this->obj->getType()]:$this->obj->getType()),'over_l');

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

Revision: 1194
          http://sourceforge.net/p/tutos/code/1194
Author:   gokohnert
Date:     2013-12-06 16:34:15 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
fix cc list

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

Modified: trunk/php/mail.pinc
===================================================================
--- trunk/php/mail.pinc	2013-12-05 08:44:55 UTC (rev 1193)
+++ trunk/php/mail.pinc	2013-12-06 16:34:15 UTC (rev 1194)
@@ -1316,7 +1316,7 @@
                 if (isset($this->charset) ) {
                     $name = "=?". $this->charset ."?B?" .  base64_encode( $name ) . "?=";
                 }
-                $cc .= $name ." <". $em .">";
+                $cc .= $pre . $name ." <". $em .">";
                 $pre = ",";
             }
         }

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

Revision: 1193
          http://sourceforge.net/p/tutos/code/1193
Author:   gokohnert
Date:     2013-12-05 08:44:55 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/php/app_ins.php
    trunk/php/bugtracking/bug_ins.php
    trunk/php/db/table_custom_example.pinc
    trunk/php/expense/expense_ins.php
    trunk/php/file/file_ins.php
    trunk/php/group/group_ins.php
    trunk/php/module_template/AAA_ins.php
    trunk/php/note/note_ins.php
    trunk/php/rate/rate_ins.php
    trunk/php/reminder/reminder_ins.php
    trunk/php/resource/resource_ins.php
    trunk/php/scrum/sprint_ins.php
    trunk/php/stuff/stuff_ins.php
    trunk/php/subversion/svn_ins.php
    trunk/php/team_ins.php
    trunk/php/url/urlcat_ins.php
    trunk/php/user.pinc
    trunk/php/user_ins.php
    trunk/php/watchlist/watchlist_ins.php
    trunk/php/webelements.p3

Modified: trunk/php/app_ins.php
===================================================================
--- trunk/php/app_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/app_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert
+ *  Copyright 1999 - 2013 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
@@ -13,6 +13,8 @@
  * @module app_ins
  * @package appointment
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 require_once 'webelements.p3';
 require_once 'permission.p3';
 require_once 'appointment.pinc';
@@ -22,7 +24,8 @@
 check_user();
 loadmodules('appointment','new');
 
-$msg = '';
+$msg  = '';
+$info = '';
 if ( ! isset($_POST['gotourl']) ) {
     $gotourl="app_new.php";
 } else {
@@ -30,9 +33,9 @@
 }
 
 $a = new Appointment($dbconn);
-#
-# ID
-#
+//
+// ID
+//
 if ( isset($_POST['Xid']) ) {
     $gotourl= addUrlParameter($gotourl,"id=".$_POST['Xid'],true);
     $a = $a->read($_POST['Xid'],$a);
@@ -53,8 +56,7 @@
 $gotourl= addUrlParameter($gotourl,"t_ignore=".$a->t_ignore,true);
 $gotourl= addUrlParameter($gotourl,"r_ignore=".$a->r_ignore,true);
 
-# Set the Start and End time
-
+// Set the Start and End time
 $start = new TUTOS_Date_Time();
 $start->setDateTimeF("start");
 if ( ( !$start->checkDMY()) || (-1 == $start->getTimeStamp() ) ) {
@@ -76,11 +78,11 @@
     $a->setEndTime($end);
 }
 
-#
-# Checks
-#
+//
+// Checks
+//
 if ( ($a->start->ts > $a->end->ts) && ($a->r_ignore == 0) ) {
-# Start after End
+    // Start after End
     $msg = addLine($msg,$lang['Err0002']);
 }
 
@@ -105,8 +107,8 @@
         }
     }
 }
-# remove the remaining particiapants from the old list
-# those participants are no longer member of the app
+// remove the remaining particiapants from the old list
+// those participants are no longer member of the app
 foreach ($a->oldparticipant as $i => $f) {
     $a->delParticipant($i);
 }
@@ -121,36 +123,36 @@
     $gotourl= addUrlParameter($gotourl,"mod_allow=".$_POST['mod_allow'],true);
     $a->mod_allow = $_POST['mod_allow'];
 }
-#
-# TRACE
-#
+//
+// TRACE
+//
 if ( !isset($_POST['trace']) ) {
     $a->setTrace(0);
 } else {
     $a->setTrace($_POST['trace']);
 }
 $gotourl= addUrlParameter($gotourl,"trace=".$a->trace,true);
-#
-# EMAIL
-#
+//
+// EMAIL
+//
 if ( !isset($_POST['email']) ) {
     $a->email = 0;
 } else {
     $a->email = $_POST['email'];
 }
 $gotourl= addUrlParameter($gotourl,"email=".$a->email,true);
-#
-# OUTSIDE
-#
+//
+// OUTSIDE
+//
 if ( !isset($_POST['outside']) ) {
     $a->SetLocation(0);
 } else {
     $a->SetLocation($_POST['outside']);
 }
 $gotourl= addUrlParameter($gotourl,"outside=".$a->outside,true);
-#
-# REPEAT
-#
+//
+// REPEAT
+//
 if ( !isset($_POST['repeat']) ) {
     $a->repeat = 0;
 } else {
@@ -169,26 +171,26 @@
 } else if ( $a->repeat == 4 ) {
     $a->r_arg      = "";
 }
-#
-# REMEMBER
-#
+//
+// REMEMBER
+//
 if ( !isset($_POST['remember']) ) {
     $a->setRemember(0);
 } else {
     $a->setRemember($_POST['remember']);
 }
 $gotourl= addUrlParameter($gotourl,"remember=".$a->remember,true);
-#
-# DESCRIPTION
-#
+//
+// DESCRIPTION
+//
 if ( isset($_POST['descr']) && ! empty($_POST['descr']) ) {
     $a->SetDescription(trim($_POST['descr']));
 }
 $gotourl = addUrlParameter($gotourl,"descr=". UrlEncode($a->descr),true);
-#
-# VISITOR
-#
-# Clear Visitor Address
+//
+// VISITOR
+//
+// Clear Visitor Address
 $v = -1;
 if ( isset($_POST['vfn']) && !empty($_POST['vfn']) ) {
     $v = check_field($_POST['vfn'],"vfn","vl","acd");
@@ -206,9 +208,9 @@
 } else {
     $a->setVisitor(-1);
 }
-#
-# PRODUCT
-#
+//
+// PRODUCT
+//
 $p = -1;
 if ( isset($_POST['pfn']) && !empty($_POST['pfn']) ) {
     $p = check_field($_POST['pfn'],"pfn","pl","p");
@@ -226,15 +228,14 @@
 } else {
     $a->setProduct(-1);
 }
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$a,$gotourl));
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields('appointment1',$a));
 
-
-# check availability of participants and resources
+// check availability of participants and resources
 if ( ($msg == "") && (isset($_POST['check']) && $_POST['check'] == 1) ) {
     $gotourl= addUrlParameter($gotourl,"check=".$_POST['check'],true);
     $a->check_participants($msg);
@@ -242,9 +243,9 @@
 
 
 $msg = addLine($msg,$a->run_check_hook());
-##################################################
-# End of Checks
-##################################################
+//
+// End of Checks
+//
 if ( $msg == "" ) {
     $dbconn->Begin("WORK");
     $msg = addLine($msg,$a->save());
@@ -255,7 +256,7 @@
     $gotourl= addUrlParameter($gotourl,"id=".$a->id,true);
 }
 
-leave_insert($dbconn,$gotourl,$msg);
+leave_insert($dbconn,$gotourl,$msg,$info);
 /**
  *   SVN Info  $Id$
  *   $Author$

Modified: trunk/php/bugtracking/bug_ins.php
===================================================================
--- trunk/php/bugtracking/bug_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/bugtracking/bug_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -37,7 +37,8 @@
 if (isset($_REQUEST['ss'])) {
     $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
 }
-$msg = '';
+$msg  = '';
+$info = '';
 
 $b = new bug($dbconn);
 if ( isset($_POST['Xid']) ) {
@@ -235,18 +236,18 @@
         $gotourl = addUrlParameter($gotourl,"pic_path=". $file['name'],true);
     }
 }
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($b->gettype(),$b));
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$b,$gotourl));
 
 $msg = addLine($msg,$b->run_check_hook());
 
-#
-# Old Bug
-#
+//
+// Old Bug
+//
 if ( $b->id > 0 )  {
     $newlines = '';
     if ( !empty($description) ) {
@@ -428,7 +429,7 @@
     $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
 }
 
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /*
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/db/table_custom_example.pinc
===================================================================
--- trunk/php/db/table_custom_example.pinc	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/db/table_custom_example.pinc	2013-12-05 08:44:55 UTC (rev 1193)
@@ -145,7 +145,7 @@
                                    'lang'       => "FLOAT3",
                                    'hlang'      => "help for FLOAT3",
                                    'overview'   => true,                 // show in overview
-                                   'perm_see'   => array(10010),             // list of team/user ids
+                                   'perm_see'   => array(2192,10010),    // list of team/user ids who may see this
                                    'required'   => true);
 //
 // A boolean field

Modified: trunk/php/expense/expense_ins.php
===================================================================
--- trunk/php/expense/expense_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/expense/expense_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert and ECOsoft.net
+ *  Copyright 1999 - 2013 by Gero Kohnert and ECOsoft.net
  *
  *  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
@@ -13,6 +13,8 @@
  * @module expense_ins
  * @package expense
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -23,7 +25,8 @@
 loadmodules('expense','ins');
 loadmodule('expense');
 
-$msg = '';
+$msg  = '';
+$info = '';
 
 /* Check Input */
 $gotourl = 'expense/expense_new.php';
@@ -191,11 +194,11 @@
     $gotourl= addUrlParameter($gotourl,"aid=". $_POST['aid'],true);
 }
 
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($u->gettype(),$u));
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$u,$gotourl));
 
 $msg = addLine($msg,$u->run_check_hook());
@@ -210,7 +213,7 @@
     }
 }
 
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/file/file_ins.php
===================================================================
--- trunk/php/file/file_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/file/file_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -28,7 +28,8 @@
 loadmodules('file','ins');
 loadmodule('file');
 
-$msg = '';
+$msg  = '';
+$info = '';
 
 if ( empty($_REQUEST['gotourl']) ) {
     $gotourl = 'file/file_new.php';
@@ -163,19 +164,13 @@
     }
 }
 
-# Manage the list of links
-# unset($f->links);
-# foreach($links as $l) {
-#   $f->addReference($l);
-# }
+// check for at least one reference
+if (count($f->links) == 0) {
+    $msg = addLine($msg,sprintf($lang['Err0009'],$lang['FileReference']));
+}
 
-    # check for at least one reference
-    if (count($f->links) == 0) {
-        $msg = addLine($msg,sprintf($lang['Err0009'],$lang['FileReference']));
-    }
-
 $file = 'none';
-# Hack for Konquerer
+// Hack for Konquerer
 if ( isset($_REQUEST['file1']) ) {
     $file = $_REQUEST['file1'];
     if ( $file != "none" ) {
@@ -193,7 +188,7 @@
     $file = 'none';
 }
 
-# via filesystem import
+// via filesystem import
 $import = false;
 if ( ($tutos['file_local_allow'] == 1) && isset($_REQUEST['file2']) && $_REQUEST['file2'] != '' ) {
     $file = basename($_REQUEST['file2']); // Strip possible dirnames for security
@@ -219,7 +214,7 @@
 }
 
 $name = "";
-# New files need a path !
+// New files need a path !
 if ( ($file == "none") && ($f->id == -1)  ) {
     $msg = addLine($msg,sprintf($lang['Err0009'],$lang['FileName']));
     $gotourl = addBadField($gotourl,'file1',true);
@@ -295,11 +290,11 @@
     }
 }
 
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($f->gettype(),$f));
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$f,$gotourl));
 
 $msg = addLine($msg,$f->run_check_hook());

Modified: trunk/php/group/group_ins.php
===================================================================
--- trunk/php/group/group_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/group/group_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2012 by Gero Kohnert
+ *  Copyright 2002 - 2013 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
@@ -13,6 +13,8 @@
  * @module group_ins
  * @package group
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -23,7 +25,8 @@
 loadmodules('group','ins');
 loadmodule("group");
 
-$msg = '';
+$msg     = '';
+$info    = '';
 $gotourl = 'group/group_new.php';
 
 $obj = new group($dbconn);
@@ -42,12 +45,11 @@
 if ( isset($_POST['desc']) ) {
     $gotourl = addUrlParameter($gotourl,"desc=". UrlEncode($_POST['desc']),true);
 }
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj));
-
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl));
 
 $msg = addLine($msg,$obj->run_check_hook());
@@ -61,7 +63,7 @@
     $gotourl =  $obj->getURL();
 }
 
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/module_template/AAA_ins.php
===================================================================
--- trunk/php/module_template/AAA_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/module_template/AAA_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert
+ *  Copyright 1999 - 2013 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
@@ -13,6 +13,8 @@
  * @module AAA_ins
  * @package AAA
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -23,7 +25,8 @@
 loadmodules('AAA','ins');
 loadmodule('AAA');
 
-$msg = '';
+$msg     = '';
+$info    = '';
 $gotourl = 'module_template/AAA_new.php';
 if (isset($_REQUEST['ss'])) {
     $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
@@ -76,7 +79,7 @@
     }
 }
 
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/note/note_ins.php
===================================================================
--- trunk/php/note/note_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/note/note_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert
+ *  Copyright 1999 - 2013 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
@@ -13,6 +13,8 @@
  * @module note_ins
  * @package note
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -23,7 +25,8 @@
 loadmodules('note','ins');
 loadmodule('note');
 
-$msg = '';
+$msg     = '';
+$info    = '';
 $gotourl = 'note/note_new.php';
 
 $u = new note($dbconn);
@@ -70,11 +73,11 @@
     $msg = addLine($msg,sprintf($lang['Err0038'],$lang['NoteRemember']));
 }
 
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($u->gettype(),$u));
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$u,$gotourl));
 
 $msg = addLine($msg,$u->run_check_hook());
@@ -89,7 +92,7 @@
 if (isset($_REQUEST['ss'])) {
     $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
 }
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/rate/rate_ins.php
===================================================================
--- trunk/php/rate/rate_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/rate/rate_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert and ecosoft
+ *  Copyright 1999 - 2013 by Gero Kohnert and ecosoft
  *
  *  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
@@ -13,6 +13,8 @@
  * @module rate_ins
  * @package rate
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -24,18 +26,19 @@
 loadmodule("rate");
 
 /* Check Input */
+
+$msg     = '';
+$info    = '';
 $gotourl = 'rate/rate_new.php';
+$u    = new rate($dbconn);
 
-$msg = '';
-$u = new rate($dbconn);
-
 if ( isset($_POST['Xid']) ) {
     $u = $u->read($_POST['Xid'],$u);
     $gotourl= addUrlParameter($gotourl,"id=". $u->id,true);
 } else {
     $u->creator = $current_user;
 }
-# name
+// name
 if ( empty($_POST['name']) ) {
     $msg = addLine($msg,sprintf($lang['Err0009'],$lang['RateName']));
     $gotourl = addBadField($gotourl,'name',true);
@@ -43,26 +46,26 @@
     $u->setName(trim($_POST['name']));
     $gotourl= addUrlParameter($gotourl,"name=". UrlEncode($u->name),true);
 }
-# cph
+// cph
 if ( empty($_POST['cph']) ) {
     $msg = addLine($msg,sprintf($lang['Err0009'],$lang['Rate']));
 } else {
     $u->setCph($_POST['cph']);
     $gotourl= addUrlParameter($gotourl,"cph=". UrlEncode($u->cph),true);
 }
-# currency
+// currency
 if ( empty($_POST['currency']) ) {
     $msg = addLine($msg,sprintf($lang['Err0009'],$lang['Rate']));
 } else {
     $u->setCurrency($_POST['currency']);
     $gotourl= addUrlParameter($gotourl,"currency=". UrlEncode($u->currency),true);
 }
-# priority
+// priority
 if ( isset($_POST['priority']) ) {
     $u->setPriority($_POST['priority']);
     $gotourl= addUrlParameter($gotourl,"priority=". UrlEncode($u->priority),true);
 }
-# tax
+// tax
 if ( isset($_POST['vat']) ) {
     $val = trim($_POST['vat']);
     if (checkfloat($val) ) {
@@ -70,22 +73,22 @@
     }
     $gotourl= addUrlParameter($gotourl,"vat=". UrlEncode($_POST['vat']),true);
 }
-# state
+// state
 if ( isset($_POST['state']) ) {
     $u->setState($_POST['state']);
     $gotourl= addUrlParameter($gotourl,"state=". UrlEncode($u->state),true);
 }
-# role
+// role
 if ( isset($_POST['role_id']) ) {
     $u->setRole($_POST['role_id']);
     $gotourl= addUrlParameter($gotourl,"role_id=". UrlEncode($u->role_id),true);
 }
-# worker
+// worker
 if ( isset($_POST['worker']) ) {
     $u->setWorker($_POST['worker']);
     $gotourl= addUrlParameter($gotourl,"worker=". UrlEncode($u->worker),true);
 }
-# reference
+// reference
 if ( empty($_POST['link_id']) ) {
     $msg = addLine($msg,"No Link ID given !");
 } else {
@@ -94,11 +97,11 @@
     $u->read_reference();
 }
 
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($u->gettype(),$u));
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$u,$gotourl));
 
 $msg = addLine($msg,$u->run_check_hook());
@@ -109,7 +112,7 @@
     $gotourl = $u->ref->getURL();
 }
 
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info $Id$
  *  $Author$

Modified: trunk/php/reminder/reminder_ins.php
===================================================================
--- trunk/php/reminder/reminder_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/reminder/reminder_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2012 by Gero Kohnert
+ *  Copyright 2004 - 2013 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
@@ -13,6 +13,8 @@
  * @module reminder_ins
  * @package reminder
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -23,7 +25,8 @@
 loadmodules('reminder','ins');
 loadmodule('reminder');
 
-$msg = '';
+$msg     = '';
+$info    = '';
 $gotourl = 'reminder/reminder_new.php';
 if (isset($_REQUEST['ss'])) {
     $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
@@ -82,7 +85,7 @@
 } else {
     $msg = addLine($msg,sprintf($lang['Err0009'],$lang['ReminderType']));
 }
-if ($type  == REMINDER_SIMPLE)
+if ($type == REMINDER_SIMPLE)
     $obj->setOffset(0);
 else
     $obj->setOffset($_POST['offset']);
@@ -94,11 +97,11 @@
 $msg = addLine($msg,$obj->calc_date($r));
 $obj->setRemindDate($r);
 
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj));
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl));
 
 $msg = addLine($msg,$obj->run_check_hook());
@@ -111,7 +114,7 @@
         $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
     }
 }
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/resource/resource_ins.php
===================================================================
--- trunk/php/resource/resource_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/resource/resource_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2012 by Gero Kohnert
+ *  Copyright 2001 - 2013 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
@@ -13,6 +13,8 @@
  * @module resource_ins
  * @package resource
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -27,7 +29,8 @@
 if (isset($_REQUEST['ss'])) {
     $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
 }
-$msg = '';
+$msg  = '';
+$info = '';
 
 $b = new resource($dbconn);
 if ( isset($_POST['Xid']) ) {
@@ -47,12 +50,11 @@
     $b->setDesc(trim($_POST['desc']));
     $gotourl = addUrlParameter($gotourl,"desc=". UrlEncode($b->desc),true);
 }
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($b->gettype(),$b));
-
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$b,$gotourl));
 
 $msg = addLine($msg,$b->run_check_hook());
@@ -66,7 +68,7 @@
     }
 }
 
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /*
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/scrum/sprint_ins.php
===================================================================
--- trunk/php/scrum/sprint_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/scrum/sprint_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2012 by Gero Kohnert
+ *  Copyright 2004 - 2013 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
@@ -13,6 +13,8 @@
  * @module stuff_ins
  * @package stuff
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -24,10 +26,11 @@
 loadmodule('scrumsprint');
 
 $gotourl = 'scrum/sprint_new.php';
-$msg = '';
+$msg     = '';
+$info    = '';
 
-$obj = new scrumsprint($dbconn);
-$preobj = new scrumsprint($dbconn);
+$obj     = new scrumsprint($dbconn);
+$preobj  = new scrumsprint($dbconn);
 
 if ( isset($_POST['Xid']) ) {
     $obj = $obj->read($_POST['Xid'],$obj);
@@ -203,11 +206,11 @@
         }
     }
 }
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj));
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl));
 
 // Check
@@ -235,7 +238,7 @@
     $dbconn->Commit("WORK");
     $gotourl = $obj->getURL();
 }
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/stuff/stuff_ins.php
===================================================================
--- trunk/php/stuff/stuff_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/stuff/stuff_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2012 by Gero Kohnert
+ *  Copyright 2004 - 2013 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
@@ -13,6 +13,8 @@
  * @module stuff_ins
  * @package stuff
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -27,7 +29,8 @@
 if (isset($_REQUEST['ss'])) {
     $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
 }
-$msg = '';
+$msg  = '';
+$info = '';
 
 $obj = new stuff($dbconn);
 if ( isset($_POST['Xid']) ) {
@@ -158,13 +161,11 @@
     $obj->setCurrency(trim($_POST['currency']));
     $gotourl = addUrlParameter($gotourl,"currency=". UrlEncode($_POST['currency']),true);
 }
-
-
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj));
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl));
 
 $msg = addLine($msg,$obj->run_check_hook());
@@ -172,12 +173,12 @@
     $dbconn->Begin("WORK");
     $msg = addLine($msg,$obj->save());
     $dbconn->Commit("WORK");
-    $gotourl =  $obj->getURL();
+    $gotourl = $obj->getURL();
     if (isset($_REQUEST['ss'])) {
         $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
     }
 }
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/subversion/svn_ins.php
===================================================================
--- trunk/php/subversion/svn_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/subversion/svn_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert
+ *  Copyright 1999 - 2013 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
@@ -13,6 +13,8 @@
  * @module svn_ins
  * @package svn
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -23,7 +25,8 @@
 loadmodules('svn','ins');
 loadmodule('svn');
 
-$msg = '';
+$msg     = '';
+$info    = '';
 $gotourl = 'subversion/svn_new.php';
 
 $obj = new svn($dbconn);
@@ -69,11 +72,11 @@
 }
 
 $obj->read_reference();
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj));
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl));
 
 $msg = addLine($msg,$obj->run_check_hook());
@@ -84,7 +87,7 @@
     $gotourl = $obj->ref->getURL();
 }
 
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/team_ins.php
===================================================================
--- trunk/php/team_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/team_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -78,7 +78,7 @@
     }
 }
 
-# Permissions
+// Permissions
 $msg = addLine($msg,parse_permission_form($t));
 
 if (!isset($_POST['add']) ) {
@@ -92,12 +92,12 @@
     $del = $_POST['del'];
 }
 
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($t->gettype(),$t));
 
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$t,$gotourl));
 
 $msg = addLine($msg,$t->run_check_hook());

Modified: trunk/php/url/urlcat_ins.php
===================================================================
--- trunk/php/url/urlcat_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/url/urlcat_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert
+ *  Copyright 1999 - 2013 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
@@ -10,6 +10,8 @@
  * @module urlcat_ins
  * @package url
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';
@@ -21,7 +23,8 @@
 loadmodule('urlcat');
 
 /* Check Input */
-$msg = "";
+$msg  = '';
+$info = '';
 $u = new urlcat($dbconn);
 
 $gotourl = 'url/urlcat_new.php';
@@ -40,14 +43,11 @@
     $u->setName($_POST['urlcatname']);
     $gotourl= addUrlParameter($gotourl,"urlcatname=". UrlEncode($u->name),true);
 }
-
-
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields($u->gettype(),$u));
-
-# other modules
+// other modules
 $msg = addLine($msg,module_parseforms($current_user,$u,$gotourl));
 
 $msg = addLine($msg,$u->run_check_hook());
@@ -59,7 +59,7 @@
     $gotourl = $u->getUrl();
 }
 
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/user.pinc
===================================================================
--- trunk/php/user.pinc	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/user.pinc	2013-12-05 08:44:55 UTC (rev 1193)
@@ -324,6 +324,7 @@
         $r = $this->dbconn->Exec($q);
         $n = $r->numrows();
         $a = 0;
+
         while ( $a < $n ) {
             $p = $r->get($a, "perm");
             $obj_id = (integer)$r->get($a, "obj_id");
@@ -675,13 +676,13 @@
             return true;
         }
         // check users permissions
-        if ( ($this->p[$feature] & $level) ) {
+        if (isset($this->p[$feature]) && ($this->p[$feature] & $level) ) {
             return true;
         }
 
         // Check team permissions
         foreach($this->teams as $f) {
-            if ( ($f->p[$feature] & $level) ) {
+            if (isset($this->p[$feature]) && ($f->p[$feature] & $level) ) {
                 return true;
             }
         }

Modified: trunk/php/user_ins.php
===================================================================
--- trunk/php/user_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/user_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert
+ *  Copyright 1999 - 2013 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
@@ -10,6 +10,8 @@
  * @module user_ins
  * @package user
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 require_once 'webelements.p3';
 require_once 'permission.p3';
 require_once 'appointment.pinc';
@@ -19,7 +21,8 @@
 check_user();
 loadmodules('user','ins');
 
-$msg = '';
+$msg  = '';
+$info = '';
 $saveadr = false;
 $saveloc = false;
 $u = new tutos_user($dbconn);
@@ -102,8 +105,11 @@
         $msg = addLine($msg,$lang['Err0041']);
     }
 }
+if ( ! $u->mod_ok() ) {
+    $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$u->getType()]));
+}
 
-# Holidays
+// Holidays
 $u->holiday = array();
 if (isset($_POST['h']) ) {
     foreach (array_unique($_POST['h']) as $i => $f) {
@@ -111,7 +117,7 @@
         $u->holiday[$f] = 1;
     }
 }
-# Namedays
+// Namedays
 $u->nameday = array();
 if (isset($_POST['nd']) ) {
     foreach (array_unique($_POST['nd']) as $i => $f) {
@@ -119,7 +125,7 @@
         $u->nameday[$f] = 1;
     }
 }
-# workdays
+// workdays
 if (isset($_POST['wd']) ) {
     $u->workday = array();
     foreach (array_unique($_POST['wd']) as $i => $f) {
@@ -127,16 +133,12 @@
         $u->workday[] = $f;
     }
 }
-# Weekstart
+// Weekstart
 if (isset($_POST['ws']) ) {
     $u->weekstart = $_POST['ws'];
     $gotourl= addUrlParameter($gotourl,"ws=". UrlEncode($u->weekstart),true);
 }
-if ( ! $u->mod_ok() ) {
-    $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$u->getType()]));
-}
-
-# RowIcons
+// RowIcons
 $u->rowiconsbefore = array();
 if ( isset($_POST['rib']) ) {
     foreach (array_unique($_POST['rib']) as $i => $f) {
@@ -152,9 +154,9 @@
     }
 }
 
-# Check that there is one admin left
+// Check that there is one admin left
 if ( $u->admin == 1 && ($_POST['admin'] == 0) ) {
-    $q = "SELECT * FROM ". $dbconn->prefix ."people WHERE ". $dbconn->colname("admin") ." = 1";
+    $q = 'SELECT * FROM '.$dbconn->prefix .$table['people'][name].' WHERE '.$dbconn->colname("admin") .' = 1';
     $r = $dbconn->Exec($q);
     $n = $r->numrows();
     if ( $n == 1 ) {
@@ -162,14 +164,14 @@
     }
     $r->free();
 }
-# Disabled
+// Disabled
 if ( isset($_POST['disabled']) ) {
     $u->setDisabled($_POST['disabled']);
 } else {
     $u->setDisabled(0);
 }
 
-# will set user-default-acl from input
+// will set user-default-acl from input
 $u->acldefault = array();
 if ( isset($_POST['r']) ) {
     foreach($_POST['r'] as $i => $f) {
@@ -203,7 +205,7 @@
     $u->updatepw = 1;
 }
 
-# TEAM HANDLING
+// TEAM HANDLING
 $newteamlist = array();
 if (isset($_POST['teams'])) {
     foreach($_POST['teams'] as $i => $f) {
@@ -211,10 +213,9 @@
     }
 }
 
-
-#
-# Parse additional custom fields
-#
+//
+// Parse additional custom fields
+//
 $msg = addLine($msg,parse_custom_fields("people",$u));
 
 // Permissions
@@ -302,8 +303,8 @@
     $gotourl= addUrlParameter($gotourl,"id=". $u->id,true);
 }
 
-leave_insert($dbconn,$gotourl,$msg);
-/*
+leave_insert($dbconn,$gotourl,$msg,$info);
+/**
  *  SVN Info  $Id$
  *  $Author$
  */

Modified: trunk/php/watchlist/watchlist_ins.php
===================================================================
--- trunk/php/watchlist/watchlist_ins.php	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/watchlist/watchlist_ins.php	2013-12-05 08:44:55 UTC (rev 1193)
@@ -22,8 +22,9 @@
 loadmodule("watchlist");
 
 /* Check Input */
-$msg = "";
-$w = new Watchlist($dbconn);
+$msg  = '';
+$info = '';
+$w    = new Watchlist($dbconn);
 if ( empty($_REQUEST['gotourl']) && isset($_SERVER['HTTP_REFERER']) ) {
     Fatal_Error("Missing gotourl");
 }
@@ -64,8 +65,7 @@
     $msg = addLine($msg,$w->add($obj->id,$a->id));
     $dbconn->Commit("WORK");
 }
-
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
 /**
  *  SVN Info  $Id$
  *  $Author$

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2013-12-04 07:24:57 UTC (rev 1192)
+++ trunk/php/webelements.p3	2013-12-05 08:44:55 UTC (rev 1193)
@@ -2763,7 +2763,7 @@
     // handle default selection
     if (isset($_REQUEST['def_'.$fld]) && $_REQUEST['def_'.$fld] == 1) {
         // remove
-        $info = addLine($info,'default:'.$fld);
+        //$info = addLine($info,'default:'.$fld);
         $obj->def_tutos[$fld] = true;
         write_config_value($dbconn,$fld,$tutos['cfg'][$fld]['section'],$obj);
         return true;

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

Revision: 1192
          http://sourceforge.net/p/tutos/code/1192
Author:   gokohnert
Date:     2013-12-04 07:24:57 +0000 (Wed, 04 Dec 2013)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/product_contacts.php

Modified: trunk/php/product_contacts.php
===================================================================
--- trunk/php/product_contacts.php	2013-12-04 05:11:01 UTC (rev 1191)
+++ trunk/php/product_contacts.php	2013-12-04 07:24:57 UTC (rev 1192)
@@ -374,7 +374,7 @@
             $this->format = "html";
             return;
         } else if (!$this->obj->see_ok() ) {
-            $msg = aaddLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()]));
+            $msg = addLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()]));
             $this->stop = true;
             $this->format = "html";
             return;

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

Revision: 1191
          http://sourceforge.net/p/tutos/code/1191
Author:   gokohnert
Date:     2013-12-04 05:11:01 +0000 (Wed, 04 Dec 2013)
Log Message:
-----------
fix

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

Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3	2013-12-03 14:11:45 UTC (rev 1190)
+++ trunk/php/address_tools.p3	2013-12-04 05:11:01 UTC (rev 1191)
@@ -167,7 +167,7 @@
  *
  */
 Function address_overview (layout $layout,$res,$target = "") {
-    global $lang, $tutos, $current_user;
+    global $lang, $tutos, $current_user,$msg,$info;
 
     $r = '';
     $adr = array();
@@ -203,7 +203,7 @@
 
     $n = count($adr);
     if ( 0 == $n) {
-        $r .= $this->error($lang['Err0048']);
+        $r .= $lang['Err0048'];
         return $r;
     }
 

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

Revision: 1190
          http://sourceforge.net/p/tutos/code/1190
Author:   gokohnert
Date:     2013-12-03 14:11:45 +0000 (Tue, 03 Dec 2013)
Log Message:
-----------
visibility of custom fields for user teams

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

Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc	2013-12-02 20:50:30 UTC (rev 1189)
+++ trunk/php/custom.pinc	2013-12-03 14:11:45 UTC (rev 1190)
@@ -1612,12 +1612,17 @@
 }
 
 /**
- * check if a user is allowed to see a custom field
+ * check if a user or member of a team is allowed to see a custom field
  */
 function custom_see_ok(array $tx,tutos_user $user) {
     if (!isset($tx['perm_see'])) return true;    // default allows
     if (!is_array($tx['perm_see'])) return true; // default allows
     if (in_array($user->id,$tx['perm_see'])) return true;
+    // check teams
+    team::obj_read($user);
+    foreach ($user->teamlist as $i => $t) {
+        if (in_array($i,$tx['perm_see'])) return true;
+    }
     return false;
 }
 

Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc	2013-12-02 20:50:30 UTC (rev 1189)
+++ trunk/php/team.pinc	2013-12-03 14:11:45 UTC (rev 1190)
@@ -646,7 +646,7 @@
     /**
      * read teams via int id
      */
-    function obj_read_int(tutos_base $obj,$id,$level = 0) {
+    static function obj_read_int(tutos_base $obj,$id,$level = 0) {
         global $table;
 
         if ($obj->dbconn->prep) {

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

Revision: 1189
          http://sourceforge.net/p/tutos/code/1189
Author:   gokohnert
Date:     2013-12-02 20:50:30 +0000 (Mon, 02 Dec 2013)
Log Message:
-----------
fix

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

Modified: trunk/php/layout/new_base.pinc
===================================================================
--- trunk/php/layout/new_base.pinc	2013-12-02 19:39:11 UTC (rev 1188)
+++ trunk/php/layout/new_base.pinc	2013-12-02 20:50:30 UTC (rev 1189)
@@ -317,7 +317,7 @@
     Function show_info_field($text,tutos_base $obj,$class) {
         global $tutos;
 
-        $c = new $class();
+        $c = new $class($this->dbconn);
         $a = $c->getAddLink($this->user,$obj,'+');
         $b = $c->getOverviewLinkObj($this->user,$obj,'=');
         unset($c);

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

Revision: 1188
          http://sourceforge.net/p/tutos/code/1188
Author:   gokohnert
Date:     2013-12-02 19:39:11 +0000 (Mon, 02 Dec 2013)
Log Message:
-----------
downgrade to work with 5.1.6

Modified Paths:
--------------
    trunk/php/bugtracking/bug.pinc
    trunk/php/config_default.pinc
    trunk/php/custom.pinc
    trunk/php/db/table_custom_example.pinc
    trunk/php/expense/expense.pinc
    trunk/php/file/file.pinc
    trunk/php/installation/installation.pinc
    trunk/php/invoice/invoice.pinc
    trunk/php/layout/new_base.pinc
    trunk/php/module_base.pinc
    trunk/php/module_template/AAA.pinc
    trunk/php/note/note.pinc
    trunk/php/reminder/reminder.pinc
    trunk/php/scrum/scrum.pinc
    trunk/php/task_import_csv.php
    trunk/php/testmanager/testmanager.pinc
    trunk/php/ticker/rsslib.pinc
    trunk/php/url/url.pinc

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/bugtracking/bug.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -2228,7 +2228,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/config_default.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -732,7 +732,7 @@
 //
 // The TUTOS Version number
 //
-$tutos[version] = '1.9.20131120';
+$tutos[version] = '1.9.20131123';
 //
 ### Local Variables: ***
 ### mode:iso-accents ***

Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/custom.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -913,7 +913,7 @@
 
         $r = '';
         if ( isset($this->x['growonly']) && ($this->x['growonly'] == true) ) {
-            if ($this->rows == 1) {
+            if ($this->txrows == 1) {
                 // classical one line input
                 $r .= '   <input id="'.$this->get_parsename().'" name="'.$this->get_parsename().'" value="" size="'.$this->txcols.'" />'."\n";
             } else {
@@ -923,7 +923,7 @@
                 $r .= '<br />'.$this->get();
             }
         } else {
-            if ($this->rows == 1) {
+            if ($this->txrows == 1) {
                 // classical one line input
                 $r .= '   <input id="'.$this->get_parsename().'" name="'.$this->get_parsename().'" value="'. myentities($this->content) .'" size="'.$this->txcols.'" />'."\n";
             } else {
@@ -1612,6 +1612,16 @@
 }
 
 /**
+ * check if a user is allowed to see a custom field
+ */
+function custom_see_ok(array $tx,tutos_user $user) {
+    if (!isset($tx['perm_see'])) return true;    // default allows
+    if (!is_array($tx['perm_see'])) return true; // default allows
+    if (in_array($user->id,$tx['perm_see'])) return true;
+    return false;
+}
+
+/**
  * get header fields for overview
  */
 function get_custom_overview_fields(layout_base $layout,$section) {
@@ -1627,7 +1637,10 @@
                 $tx['overview'] = false;
             if (!isset($tx['handler']))
                 $tx['handler'] = '';
-
+            // check permission to see
+            if (!custom_see_ok($tx,$layout->user)) {
+                continue;
+            }
             if (isset($tx['overview']) && ($tx['overview'] == false) ) continue;
             if (!isset($tx['ftype'])) $tx['ftype'] = '';
             $tx[name] = $ti;
@@ -1694,7 +1707,7 @@
  * obj = the TUTOS object where the data is stored
  * cols = number of columns
  */
-function show_custom_fields(layout_base $layout,$section,&$obj,$cols) {
+function show_custom_fields(layout_base $layout,$section,tutos_base $obj,$cols) {
     global $table,$lang;
 
     $r = '';
@@ -1705,6 +1718,10 @@
         if (!isset($x['custom'])) continue;
         if (!$x['custom']) continue;
 
+        if (!custom_see_ok($x,$layout->user)) {
+            continue;
+        }
+
         $f = get_fld_obj($obj,$x,$section,$i);
 
         if (is_object($f)) {
@@ -1758,6 +1775,11 @@
         if (!isset($x['ftype'])) $x['ftype'] = "";
         if (!isset($x[size])) $x[size] = 4;
 
+        // check permission to see
+        if (!custom_see_ok($x,$layout->user)) {
+            continue;
+        }
+
         $r .= edit_custom_field_single($layout,$section,$x,$i,$obj,$cols);
     }
     return $r;

Modified: trunk/php/db/table_custom_example.pinc
===================================================================
--- trunk/php/db/table_custom_example.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/db/table_custom_example.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -130,7 +130,7 @@
                                    type        => "TS_TYPE",
                                    constraints => "",
                                    'default_today' => false,
-                                   'overview'   => true,                 #  show in overview
+                                   'overview'   => true,                 //  show in overview
                                    Desc        => "end date",
                                    'lang'      => "DATE3",
                                    'hlang'     => 'help for date3');
@@ -141,10 +141,11 @@
                                    type         => "float",
                                    constraints  => "",
                                    Desc         => "floater",
-                                   'sortable'   => true,                 # show in overview as sortable
+                                   'sortable'   => true,                 // show in overview as sortable
                                    'lang'       => "FLOAT3",
                                    'hlang'      => "help for FLOAT3",
-                                   'overview'   => true,                 # show in overview
+                                   'overview'   => true,                 // show in overview
+                                   'perm_see'   => array(10010),             // list of team/user ids
                                    'required'   => true);
 //
 // A boolean field

Modified: trunk/php/expense/expense.pinc
===================================================================
--- trunk/php/expense/expense.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/expense/expense.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -1060,7 +1060,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/file/file.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -1778,7 +1778,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/installation/installation.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -821,7 +821,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/invoice/invoice.pinc
===================================================================
--- trunk/php/invoice/invoice.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/invoice/invoice.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -1361,7 +1361,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/layout/new_base.pinc
===================================================================
--- trunk/php/layout/new_base.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/layout/new_base.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -317,21 +317,22 @@
     Function show_info_field($text,tutos_base $obj,$class) {
         global $tutos;
 
-        $a = $class::getAddLink($this->user,$obj,'+');
-        $b = $class::getOverviewLinkObj($this->user,$obj,'=');
-
+        $c = new $class();
+        $a = $c->getAddLink($this->user,$obj,'+');
+        $b = $c->getOverviewLinkObj($this->user,$obj,'=');
+        unset($c);
         $id = 'cl_'.$class.'_'.uniqid();
         $r  = '<td class="desc" valign="top" id="'.$id.'">'.$text;
         $r .= '<span style="position:absolute;" id="X'.$id.'">';
         if ( ($a != '') && isset($a[url])) {
-            $r  .= '<a id="P'.$id.'" href="'.$a[url].'">'.$a[info].'</a>';
+            $r  .= '<a id="P'.$id.'" href="'.$tutos['base'] .'/php/'.$a[url].'">'.$a[info].'</a>';
         } else if ( ($a != '') && isset($a[0][url])) {
-            $r  .= '<a id="P'.$id.'" href="'.$a[0][url].'">+</a>';
+            $r  .= '<a id="P'.$id.'" href="'.$tutos['base'] .'/php/'.$a[0][url].'">+</a>';
         }
         if ( ($b != '') && isset($b[url])) {
-            $r  .= '<a id="O'.$id.'" href="'.$b[url].'">'.$b[info].'</a>';
+            $r  .= '<a id="O'.$id.'" href="'.$tutos['base'] .'/php/'.$b[url].'">'.$b[info].'</a>';
         } else if ( ($b != '') && isset($b[0][url])) {
-            $r  .= '<a id="O'.$id.'" href="'.$b[0][url].'">=</a>';
+            $r  .= '<a id="O'.$id.'" href="'.$tutos['base'] .'/php/'.$b[0][url].'">=</a>';
         }
         $r .= '</span>';
         $r .='</span>';

Modified: trunk/php/module_base.pinc
===================================================================
--- trunk/php/module_base.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/module_base.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -517,8 +517,8 @@
     /**
      * create a link to a overview page filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user, tutos_base $obj = null, $text = "") {
-        return static::getOverviewLink($user,$text);
+    function getOverviewLinkObj (tutos_user $user, tutos_base $obj = null, $text = "") {
+        return $this->getOverviewLink($user,$text);
     }
 
     /**

Modified: trunk/php/module_template/AAA.pinc
===================================================================
--- trunk/php/module_template/AAA.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/module_template/AAA.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -359,7 +359,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/note/note.pinc
===================================================================
--- trunk/php/note/note.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/note/note.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -700,7 +700,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/reminder/reminder.pinc
===================================================================
--- trunk/php/reminder/reminder.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/reminder/reminder.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -716,7 +716,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/scrum/scrum.pinc
===================================================================
--- trunk/php/scrum/scrum.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/scrum/scrum.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -710,7 +710,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';
@@ -1546,7 +1546,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/task_import_csv.php
===================================================================
--- trunk/php/task_import_csv.php	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/task_import_csv.php	2013-12-02 19:39:11 UTC (rev 1188)
@@ -143,36 +143,36 @@
                         switch( $t_fields[$fnames[$j]] ) {
                         case "name": {
                             $name = $fields[$j];
-                                $t->setName($name);
-                                $val = $t->name;
-                                break;
+                            $t->setName($name);
+                            $val = $t->name;
+                            break;
                         }
                         case "s_start": {
                             $s_start = new TUTOS_Date_Time($this->reformat_date($fields[$j]));
-                                $t->setSStart($s_start);
-                                $val = $t->s_start->getYYYYMMDD();
-                                break;
+                            $t->setSStart($s_start);
+                            $val = $t->s_start->getYYYYMMDD();
+                            break;
                         }
                         case "s_end": {
                             $s_end = new TUTOS_Date_Time($this->reformat_date($fields[$j]));
-                                $t->setSEnd($s_end);
-                                $val = $t->s_end->getYYYYMMDD();
-                                break;
+                            $t->setSEnd($s_end);
+                            $val = $t->s_end->getYYYYMMDD();
+                            break;
                         }
                         case "volume": {
                             $vol = trim($fields[$j]);
-                                if( preg_match("#([0-9]+).*(jour|day)#", $vol, $regs) ) {
-                                    // FIXME: use a localized number of worked hours (8)
-                                    $t->setVolume(8*(int)$regs[1]);
-                                } elseif( preg_match("#([0-9]+).*(heure|hour)#", $vol, $regs) ) {
-                                    $t->setVolume((int)$regs[1]);
-                                } elseif( is_numeric($vol) ) {
-                                    $t->setVolume($vol);
-                                } else {
-                                    $t->setVolume(0);
-                                }
-                                $val = $t->volume." h";
-                                break;
+                            if( preg_match("#([0-9]+).*(jour|day)#", $vol, $regs) ) {
+                                // FIXME: use a localized number of worked hours (8)
+                                $t->setVolume(8*(int)$regs[1]);
+                            } elseif( preg_match("#([0-9]+).*(heure|hour)#", $vol, $regs) ) {
+                                $t->setVolume((int)$regs[1]);
+                            } elseif( is_numeric($vol) ) {
+                                $t->setVolume($vol);
+                            } else {
+                                $t->setVolume(0);
+                            }
+                            $val = $t->volume." h";
+                            break;
                         }
                             /* Here it's a special case :
                              * MS Project exports dependency field as WBS Index
@@ -184,29 +184,29 @@
                              */
                         case "index": {
                             $index = trim($fields[$j]);
-                                $indexes[$index] = $t;
+                            $indexes[$index] = $t;
 
-                                /* find the parent task with the index */
-                                if( preg_match("#^([0-9.]*)\.[0-9]*$#", $index, $regs) ) {
-                                    $p_task = $indexes[$regs[1]];
+                            /* find the parent task with the index */
+                            if( preg_match("#^([0-9.]*)\.[0-9]*$#", $index, $regs) ) {
+                                $p_task = $indexes[$regs[1]];
 
-                                    $t->p_id   = $p_task->id;
-                                    $t->parent = getObject($this->dbconn, $p_task->id);
+                                $t->p_id   = $p_task->id;
+                                $t->parent = getObject($this->dbconn, $p_task->id);
 
-                                    if( $p_task->id == -1 ) {
-                                        $val = "$index : id(".$regs[1].")";
-                                    } else {
-                                        $val = "$index : <tt>".$p_task->id."</tt>";
-                                    }
+                                if( $p_task->id == -1 ) {
+                                    $val = "$index : id(".$regs[1].")";
                                 } else {
-                                    $t->parent = getObject($this->dbconn, $t->p_id);
-                                    $val = "$index";
+                                    $val = "$index : <tt>".$p_task->id."</tt>";
                                 }
-                                break;
+                            } else {
+                                $t->parent = getObject($this->dbconn, $t->p_id);
+                                $val = "$index";
+                            }
+                            break;
                         }
                         default:{
                             $val = "<i>Not Used</i> [".$t_fields[$fnames[$j]]."] [".$fnames[$j].".]";
-                                break;
+                            break;
                         }
                         }
                         // And we print it
@@ -231,8 +231,8 @@
                         $msg .= $t->save();
                         $this->dbconn->Commit("WORK");
                         // We need to get the task id
-#FIXME:  should work with $t
-                        $t = $this->getTask(&$t, $name, $t->p_id);
+                        //FIXME:  should work with $t
+                        $t = $this->getTask($t, $name, $t->p_id);
 
                         // Let the $indexes table up-to-date
                         $indexes[$index] = $t;
@@ -313,17 +313,17 @@
         echo " </tr>\n";
 
         /*
-         echo " <tr>\n";
-         echo "  <td class=\"desc\">".$lang['TaskState']."</td>\n";
-         echo "  <td><input name=\"state\"></td>\n";
-         echo " </tr>\n";
+          echo " <tr>\n";
+          echo "  <td class=\"desc\">".$lang['TaskState']."</td>\n";
+          echo "  <td><input name=\"state\"></td>\n";
+          echo " </tr>\n";
         */
 
         /*
-         echo " <tr>\n";
-         echo "  <td class=\"desc\">".$lang['TaskDesc']."</td>\n";
-         echo "  <td><input name=\"desc\"></td>\n";
-         echo " </tr>\n";
+          echo " <tr>\n";
+          echo "  <td class=\"desc\">".$lang['TaskDesc']."</td>\n";
+          echo "  <td><input name=\"desc\"></td>\n";
+          echo " </tr>\n";
         */
 
         echo " <tr>\n";
@@ -332,10 +332,10 @@
         echo " <tr>\n";
 
         /*
-         echo " <tr>\n";
-         echo "  <td class=\"desc\">".$lang['TaskVolumeDone']."</td>\n";
-         echo "  <td><input name=\"volume_done\"></td>\n";
-         echo " <tr>\n";
+          echo " <tr>\n";
+          echo "  <td class=\"desc\">".$lang['TaskVolumeDone']."</td>\n";
+          echo "  <td><input name=\"volume_done\"></td>\n";
+          echo " <tr>\n";
         */
 
         echo " <tr>\n";

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/testmanager/testmanager.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -1069,6 +1069,26 @@
     }
 
     /**
+     * create a link for an overview filtered by $obj
+     */
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+        global $lang;
+
+        if (! is_object($obj) ) return '';
+        if ( $obj->id == -1 ) return '';
+        if (! $user->feature_ok(usetestcase,PERM_SEE) ) return '';
+        if (! $obj->obj_feature_ok($user,usetestcase,PERM_SEE) ) return '';
+        if (! $obj->see_ok() ) return '';
+
+        return array( url => 'testmanager/testcase_overview.php?refid='.$obj->id,
+                      confirm => false,
+                      text => ($text == '' ? $lang['TestcaseOverview']:$text),
+                      info => $lang['TestcaseOverview'],
+                      category => array('overview','module',usetestcase)
+            );
+    }
+
+    /**
      * create a link where a testcase for the given object could be added
      */
     static function getaddlink (tutos_user $user,tutos_base $obj,$text = "") {
@@ -2087,7 +2107,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';
@@ -3276,7 +3296,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

Modified: trunk/php/ticker/rsslib.pinc
===================================================================
--- trunk/php/ticker/rsslib.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/ticker/rsslib.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -22,42 +22,50 @@
     $errstr = "";
 
     $agelimit *= 60;
-    if (file_exists($cachefile)) {
+    if (file_exists($cachefile) && filesize($cachefile) != 0) {
         $timestamp = @filectime($cachefile);
         $age = time() - $timestamp;
     } else {
         $age = $agelimit+5;
     }
-    if($age > $agelimit) {
-        $url = parse_url($rdf);
-        if (!isset($tutos['proxy_host']) || empty($tutos['proxy_host']) ) {
-            $fp = fsockopen($url['host'], "80", $errno, $errstr, $timeout);
-        } else {
-            $fp = fsockopen($tutos['proxy_host'], $tutos['proxy_port'], $errno, $errstr, $timeout);
-        }
-        if (!$fp) return $errno." ".$errstr;  //just quit on error
+    if($age < $agelimit) {
+        return $r;
+    }
+    $local = fopen($cachefile, "w");
+    if (!$local) return $errno." ".$errstr; //just quit on error
+    stream_set_timeout($local, $timeout);
 
-        $local = @fopen($cachefile, "w");
-        if (!$local) return $errno." ".$errstr; //just quit on error
-        if (!isset($tutos['proxy_host']) || empty($tutos['proxy_host']) ) {
-            fputs($fp, "GET " . $url['path'] . " HTTP/1.1\r\nHost: " . $url['host'] . "\r\n\r\n");
-        } else {
-            fputs($fp, "GET " . $rdf . " HTTP/1.1\r\n".
-                  "User-Agent: TUTOS\r\n".
-                  "Connection: close\r\n".
-                  "Proxy-Connection: close\r\n".
-                  "Accept-Encoding: deflate\r\n".
-                  "Cache-Control: no-cache\r\n".
-                  "Pragma: no-cache\r\n".
-                  "Host: " . $url['host'] . "\r\n".
-                  "\r\n");
-        }
-        while(!feof($fp))
-            fwrite($local, fgets($fp, 128));
+    $url = parse_url($rdf);
+    if (!isset($tutos['proxy_host']) || empty($tutos['proxy_host']) ) {
+        $fp = fsockopen($url['host'], "80", $errno, $errstr, $timeout);
+    } else {
+        $fp = fsockopen($tutos['proxy_host'], $tutos['proxy_port'], $errno, $errstr, $timeout);
+    }
+    if (!$fp) return $errno." ".$errstr;  //just quit on error
+    stream_set_timeout($fp, $timeout);
+
+    if (!isset($tutos['proxy_host']) || empty($tutos['proxy_host']) ) {
+        fputs($fp, "GET " . $url['path'] . " HTTP/1.1\r\nHost: " . $url['host'] . "\r\n\r\n");
+    } else {
+        fputs($fp, "GET " . $rdf . " HTTP/1.1\r\n".
+              "User-Agent: TUTOS\r\n".
+              "Connection: close\r\n".
+              "Proxy-Connection: close\r\n".
+              "Accept-Encoding: deflate\r\n".
+              "Cache-Control: no-cache\r\n".
+              "Pragma: no-cache\r\n".
+              "Host: " . $url['host'] . "\r\n".
+              "\r\n");
+    }
+
+    $r .= "TET";
+    #    while(!feof($fp)) {
+        fwrite($local, fgets($fp,1024));
+        #    }
+
         fclose($fp);
         fclose($local);
         return $r;
-    }
 }
 
 /**

Modified: trunk/php/url/url.pinc
===================================================================
--- trunk/php/url/url.pinc	2013-11-25 05:25:45 UTC (rev 1187)
+++ trunk/php/url/url.pinc	2013-12-02 19:39:11 UTC (rev 1188)
@@ -673,7 +673,7 @@
     /**
      * create a link for an overview filtered by $obj
      */
-    static function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
+    function getOverviewLinkObj (tutos_user $user,tutos_base $obj,$text = "") {
         global $lang;
 
         if (! is_object($obj) ) return '';

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