tutos-commits Mailing List for TUTOS

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

Modified Files:
	reminder_overview.php 
Log Message:
bugfix

Index: reminder_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_overview.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- reminder_overview.php	28 Oct 2007 18:34:07 -0000	1.17
+++ reminder_overview.php	31 Mar 2008 11:27:10 -0000	1.18
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2007 by Gero Kohnert
+ *  Copyright 2004 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -72,7 +72,7 @@
        }
        echo $this->OverviewRowStart($line);
        echo "<td valign=\"top\">". $c->getLink($c->remind_date->getDateTime()) ."</td>\n";
-       echo "<td valign=\"top\">". ($c->to >0 ? $c->to->getLink(): $lang['HistoryDeleted']) ."</td>\n";
+       echo "<td valign=\"top\">". (is_object($c->to) ? $c->to->getLink(): $lang['HistoryDeleted']) ."</td>\n";
        echo "<td valign=\"top\">". myentities($c->desc) ."&nbsp;</td>\n";
        echo "<td valign=\"top\">". $lang[$c->ref->getType()] ." ". $c->ref->getLink();
        if ($c->type != REMINDER_SIMPLE) {
@@ -217,4 +217,4 @@
  $l = new reminder_overview($current_user);
  $l->display();
  $dbconn->Close();
-?>
\ No newline at end of file
+?>

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

Modified Files:
	file_new.php 
Log Message:
use ajax to update filelist

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- file_new.php	13 Mar 2008 11:02:24 -0000	1.25
+++ file_new.php	27 Mar 2008 13:10:32 -0000	1.26
@@ -131,8 +131,12 @@
        echo "<tr>\n";
        echo " <td></td>\n";
        echo " <td id=\"file\" colspan=\"3\">\n";
-       echo "  <select id=\"file2\" name=\"file2\">";
-       echo "    <option> </option>\n";
+
+       # javascript & ajax
+       $js = '  ';
+
+       echo "  <select id=\"file2\" name=\"file2\" ". $js .">";
+       echo "    <option> </option>\n"; # Empty entry if working via upload
        # read the directory
        if ($dh = opendir($tutos['file_local_searchpath'])) {
          while (($file = readdir($dh)) !== false) {

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

Modified Files:
	ajax.php webelements.p3 
Log Message:
use ajax to update filelist

Index: ajax.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ajax.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ajax.php	2 Mar 2008 18:07:25 -0000	1.5
+++ ajax.php	27 Mar 2008 13:10:29 -0000	1.6
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2005 - 2007 by Gero Kohnert
+ *  Copyright 2005 - 2008 by Gero Kohnert
  *
  *  CVS Info:  $Id$
  *  $Author$
@@ -38,6 +38,19 @@
    return $r;
  }
 
+ function add_filename ($fname,$fsize) {
+   global $lang;
+
+   $r = '';
+   $txt1 = base64_encode($fname);
+   $r .= ' <result>'."\n";
+   $r .= '  <name>'. $txt1 .'</name>'."\n";
+   $r .= '  <size>'. $fsize .'</size>'."\n";
+   $r .= "  <!-- |". base64_decode ($txt1).':'. $fsize ."| -->\n";
+   $r .= ' </result>'."\n";
+   return $r;
+ }
+
  echo '<?xml version="1.0" encoding="'. $lang['content_encoding'] .'" ?>'."\n";
  echo '<tutos generated="'.time().'">'."\n";
 
@@ -47,14 +60,14 @@
    $r = array();
    tutos_address::search_by_name($r,$current_user,$item);
    foreach ($r as $a => $b) {
-	 echo add_item ($b);
+     echo add_item ($b);
    }
  }
  if (strstr($grp,'t')) {
    $r = array();
    team::search_by_name($r,$current_user,$item);
    foreach ($r as $a => $b) {
-	 echo add_item ($b);
+     echo add_item ($b);
    }
  }
  if (strstr($grp,'p')) {
@@ -62,23 +75,38 @@
    $r = array();
    product::search_by_name($r,$current_user,$item);
    foreach ($r as $a => $b) {
-	 echo add_item ($b);
+     echo add_item ($b);
    }
  }
  if (strstr($grp,'c')) {
    $r = array();
    company::search_by_name($r,$current_user,$item);
    foreach ($r as $a => $b) {
-	 echo add_item ($b);
+     echo add_item ($b);
    }
  }
  if (strstr($grp,'d')) {
    $r = array();
    department::search_by_name($r,$current_user,$item);
    foreach ($r as $a => $b) {
-	 echo add_item ($b);
+     echo add_item ($b);
    }
  }
 
+ # Search Filenames in Upload Dir
+ if ($tutos['file_local_allow']) {
+   if (strstr($grp,'f')) {
+     $r = array();
+     if ($dh = opendir($tutos['file_local_searchpath'])) {
+       while (($file = readdir($dh)) !== false) {
+         $fullname = $tutos['file_local_searchpath'].'/'.$file;
+         if (filetype($fullname) == 'dir') continue;
+         if (filesize($fullname) == 0) continue;
+         echo add_filename ($file,filesize($fullname));
+       }
+       closedir($dh);
+     }
+   }
+ }
  echo '</tutos>'."\n";
 ?>

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- webelements.p3	17 Mar 2008 10:04:13 -0000	1.322
+++ webelements.p3	27 Mar 2008 13:10:30 -0000	1.323
@@ -1783,7 +1783,8 @@
 function load_jpgraph($arr) {
   global $tutos,$msg;
 
-  $r = 1.11;
+  # Required Verison
+  $r = 1.7;
 
   if ($tutos[usejpgraph] == 0) {
     return false;

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

Modified Files:
	tutos.js 
Log Message:
use ajax to update filelist

Index: tutos.js
===================================================================
RCS file: /cvsroot/tutos/tutos/html/tutos.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tutos.js	21 Mar 2008 09:08:42 -0000	1.8
+++ tutos.js	27 Mar 2008 13:10:32 -0000	1.9
@@ -197,6 +197,30 @@
 /**
  * some AJAX stuff
  */
+ function load_TUTOS_dir_list(base,name) {
+  // Obtain an XMLHttpRequest instance
+  var req = newXMLHttpRequest();
+
+  // Set the handler function to receive callback notifications
+  // from the request object
+  var handlerFunction = getReadyStateHandler(name,req, updateDirInput);
+  req.
+  
+  // Open an HTTP POST connection to the TUTOS server.
+  // Third parameter specifies request is asynchronous.
+  req.open("POST", base + "/php/ajax.php", true);
+
+  // Specify that the body of the request contains form data
+  req.setRequestHeader("Content-Type", 
+                     "application/x-www-form-urlencoded");
+
+  // Send form encoded data stating that I want to add the 
+  // specified item to the cart.
+  req.send("action=search&grp=f");
+ }
+/**
+ * some AJAX stuff
+ */
  function load_TUTOS_List(base,name,fld,grp) {
    if (fld != "") {
     // Obtain an XMLHttpRequest instance
@@ -223,7 +247,43 @@
 
 
 /**
- *
+ * use the ajax results for a file selection list
+ */
+ function updateDirInput(name,TUTOSxml) {
+   var all = TUTOSxml.getElementsByTagName("tutos")[0];
+
+
+   // Check that a more recent document hasn't been processed
+   // already
+   var generated = all.getAttribute("generated");
+   if (true) {
+     lastUpdate = generated;
+
+     // Clear the HTML list used to display the cart contents
+     var contents = document.getElementById(name);
+     contents.innerHTML = "";
+
+     // Loop over the result items in the xml
+     var items = all.getElementsByTagName("result");
+     for (var I = 0 ; I < items.length ; I++) {
+       var item = items[I];
+
+       // Extract the text nodes from the name and quantity elements
+       var s = item.getElementsByTagName("size")[0].firstChild.nodeValue;
+       var n = item.getElementsByTagName("name")[0].firstChild.nodeValue;
+                                               
+       // Create and add a list item HTML element for this cart item
+       var op = document.createElement("option");
+       op.setAttribute("value",Base64.decode(n));
+       var kb = s/(1024);
+       fn = document.createTextNode(Base64.decode(n) + " ("+ kb.toFixed(2) +" MB) " );
+       op.appendChild(fn);
+       contents.appendChild(op);
+     }
+   }
+ }
+/**
+ * use the ajax results for selection lists
  */
  function updateInput(name,TUTOSxml) {
 

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

Modified Files:
	expense_overview.php 
Log Message:
bugfix

Index: expense_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense_overview.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- expense_overview.php	28 Oct 2007 16:16:35 -0000	1.11
+++ expense_overview.php	27 Mar 2008 10:47:00 -0000	1.12
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert and ECOsoft.net
+ *  Copyright 1999 - 2008 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   
@@ -47,7 +47,21 @@
          $x++;
        }
        echo "</expense_set>\n";
-     } else {
+       $this->result->free();
+	   return;
+     }
+     if ( 0 == $n) {
+       echo $this->error($lang['Err0048']);
+       $this->result->free();
+       return;
+     }
+
+     # Reset the sum
+     $sum[''] = 0.0;
+     foreach($tutos[currencies] as $ia => $c) {
+       $sum[$c] = 0.0;
+     }
+
 
      $blist = array();
      # Make a big array of all visible expenses
@@ -59,15 +73,14 @@
        if ( ! $b->see_ok() ) {
          continue;
        }
+       $sum[$b->currency] += $b->gamount;
        $blist[] = &$b;
        unset($b);
      }
-     $this->result->free();
      $n = count($blist);
-     if ( 0 == $n) {
-       echo $this->error($lang['Err0048']);
-       return;
-     }
+
+
+     $this->result->free();
 
      echo $this->actionformStart("expense_overview.php");
      echo $this->OverviewTableStart();
@@ -87,13 +100,6 @@
      echo "</tr>\n";
      echo "</thead>\n";
 
-     # Fill the sum
-     $sum[''] = 0.0;
-     @reset($tutos[currencies]);
-     while( list ($ia,$c) = @each ($tutos[currencies])) {
-       $sum[$c] = 0.0;
-     }
-
      if ( $this->start == -1 ) {
        # Show the last pasrt
        $a = $n - $tutos[maxshow];
@@ -104,12 +110,6 @@
        $end = $this->start + $tutos[maxshow];
      }
 
-     # Fill the sum
-     $x = 0;
-     while ( $x < $a ) {
-       $sum[$this->result->get($x, "currency")] += $this->result->get($x, "gamount");
-       $x++;
-     }
 
      $this->filter['name'] = prepare_regpattern($this->filter['name']);
      echo "<tbody>\n";
@@ -129,7 +129,6 @@
        echo " <td>&nbsp;". $b->adr_ref->getLink($b->adr_ref->getShortname()) ."</td>\n";
        echo " <td>&nbsp;". number_format($b->gamount,2,$lang['DecPoint'],$lang['ThousandPoint']) 
             ." ". myentities($b->currency) ."</td>\n";
-       $sum[$b->currency] += $b->gamount;
        echo " <td>&nbsp;". $b->getCategory() ."</td>\n";
        echo get_module_overview_data($this,$b);
        if ( $tutos[massupdate] == 1 ) {
@@ -149,16 +148,10 @@
 
      echo $this->list_navigation($this->link1,$this->flds,$this->start,$a,$n);
      
-     # Fill the sum
-     while ( $a < $n ) {
-       $sum[$this->result->get($a, "currency")] += ( $this->result->get($a, "cph") * $this->result->get($a, "volume") );
-       $a++;
-     }
      echo "<tr>\n";
      echo " <td colspan=\"3\">&nbsp;</td>\n";
      echo " <td align=\"right\"><b>\n";
-     @reset($sum);
-     while ( list ($s,$x) = @each ($sum) ) {
+     foreach ($sum as $s => $x) {
        #if ( ($s != 'v') && ($x != 0.0) ) {
        if ( $x != 0.0 ) {
          $z= array($x,$s);
@@ -191,7 +184,6 @@
      }
      echo $this->OverviewTableEnd();
      echo $this->actionformEnd("expense_overview.php");
-     }
    }
    /**
     * naviagte

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

Modified Files:
	tutos.js 
Log Message:
fixed some problems with UTF8 Characters in AJAX Results


Index: tutos.js
===================================================================
RCS file: /cvsroot/tutos/tutos/html/tutos.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tutos.js	16 Nov 2007 20:02:35 -0000	1.7
+++ tutos.js	21 Mar 2008 09:08:42 -0000	1.8
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2005 - 2006 by Gero Kohnert
+ *  Copyright 2005 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -49,80 +49,148 @@
  }
 
 
- //
- // base64 stuff from http://ostermiller.org/
- //
+/**
+*
+*  Base64 encode / decode
+*  http://www.webtoolkit.info/
+*
+**/
 
- var END_OF_INPUT = -1;
+var Base64 = {
 
- var base64Chars = new Array(
-    'A','B','C','D','E','F','G','H',
-    'I','J','K','L','M','N','O','P',
-    'Q','R','S','T','U','V','W','X',
-    'Y','Z','a','b','c','d','e','f',
-    'g','h','i','j','k','l','m','n',
-    'o','p','q','r','s','t','u','v',
-    'w','x','y','z','0','1','2','3',
-    '4','5','6','7','8','9','+','/'
- );
+	// private property
+	_keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
 
- var reverseBase64Chars = new Array();
- for (var i=0; i < base64Chars.length; i++){
-    reverseBase64Chars[base64Chars[i]] = i;
- }
+	// public method for encoding
+	encode : function (input) {
+		var output = "";
+		var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+		var i = 0;
 
- var base64Str;
- var base64Count;
+		input = Base64._utf8_encode(input);
 
- function setBase64Str(str){
-    base64Str = str;
-    base64Count = 0;
- }
+		while (i < input.length) {
 
- function readReverseBase64(){   
-    if (!base64Str) return END_OF_INPUT;
-    while (true){      
-        if (base64Count >= base64Str.length) return END_OF_INPUT;
-        var nextCharacter = base64Str.charAt(base64Count);
-        base64Count++;
-        if (reverseBase64Chars[nextCharacter]){
-            return reverseBase64Chars[nextCharacter];
-        }
-        if (nextCharacter == 'A') return 0;
-    }
-    return END_OF_INPUT;
- }
+			chr1 = input.charCodeAt(i++);
+			chr2 = input.charCodeAt(i++);
+			chr3 = input.charCodeAt(i++);
 
- function ntos(n){
-    n=n.toString(16);
-    if (n.length == 1) n="0"+n;
-    n="%"+n;
-    return unescape(n);
- }
+			enc1 = chr1 >> 2;
+			enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+			enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+			enc4 = chr3 & 63;
 
- function decodeBase64(str){
-    setBase64Str(str);
-    var result = "";
-    var inBuffer = new Array(4);
-    var done = false;
-    while (!done && (inBuffer[0] = readReverseBase64()) != END_OF_INPUT
-        && (inBuffer[1] = readReverseBase64()) != END_OF_INPUT){
-        inBuffer[2] = readReverseBase64();
-        inBuffer[3] = readReverseBase64();
-        result += ntos((((inBuffer[0] << 2) & 0xff)| inBuffer[1] >> 4));
-        if (inBuffer[2] != END_OF_INPUT){
-            result +=  ntos((((inBuffer[1] << 4) & 0xff)| inBuffer[2] >> 2));
-            if (inBuffer[3] != END_OF_INPUT){
-                result +=  ntos((((inBuffer[2] << 6)  & 0xff) | inBuffer[3]));
-            } else {
-                done = true;
-            }
-        } else {
-            done = true;
-        }
-    }
-    return result;
- } 
+			if (isNaN(chr2)) {
+				enc3 = enc4 = 64;
+			} else if (isNaN(chr3)) {
+				enc4 = 64;
+			}
+
+			output = output +
+			this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
+			this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+
+		}
+
+		return output;
+	},
+
+	// public method for decoding
+	decode : function (input) {
+		var output = "";
+		var chr1, chr2, chr3;
+		var enc1, enc2, enc3, enc4;
+		var i = 0;
+
+		input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+		while (i < input.length) {
+
+			enc1 = this._keyStr.indexOf(input.charAt(i++));
+			enc2 = this._keyStr.indexOf(input.charAt(i++));
+			enc3 = this._keyStr.indexOf(input.charAt(i++));
+			enc4 = this._keyStr.indexOf(input.charAt(i++));
+
+			chr1 = (enc1 << 2) | (enc2 >> 4);
+			chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+			chr3 = ((enc3 & 3) << 6) | enc4;
+
+			output = output + String.fromCharCode(chr1);
+
+			if (enc3 != 64) {
+				output = output + String.fromCharCode(chr2);
+			}
+			if (enc4 != 64) {
+				output = output + String.fromCharCode(chr3);
+			}
+
+		}
+
+		output = Base64._utf8_decode(output);
+
+		return output;
+
+	},
+
+	// private method for UTF-8 encoding
+	_utf8_encode : function (string) {
+		string = string.replace(/\r\n/g,"\n");
+		var utftext = "";
+
+		for (var n = 0; n < string.length; n++) {
+
+			var c = string.charCodeAt(n);
+
+			if (c < 128) {
+				utftext += String.fromCharCode(c);
+			}
+			else if((c > 127) && (c < 2048)) {
+				utftext += String.fromCharCode((c >> 6) | 192);
+				utftext += String.fromCharCode((c & 63) | 128);
+			}
+			else {
+				utftext += String.fromCharCode((c >> 12) | 224);
+				utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+				utftext += String.fromCharCode((c & 63) | 128);
+			}
+
+		}
+
+		return utftext;
+	},
+
+	// private method for UTF-8 decoding
+	_utf8_decode : function (utftext) {
+		var string = "";
+		var i = 0;
+		var c = c1 = c2 = 0;
+
+		while ( i < utftext.length ) {
+
+			c = utftext.charCodeAt(i);
+
+			if (c < 128) {
+				string += String.fromCharCode(c);
+				i++;
+			}
+			else if((c > 191) && (c < 224)) {
+				c2 = utftext.charCodeAt(i+1);
+				string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+				i += 2;
+			}
+			else {
+				c2 = utftext.charCodeAt(i+1);
+				c3 = utftext.charCodeAt(i+2);
+				string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+				i += 3;
+			}
+
+		}
+
+		return string;
+	}
+
+}
 
 
 
@@ -186,12 +254,13 @@
        // Create and add a list item HTML element for this cart item
        var li = document.createElement("li");
        // li.appendChild(document.createTextNode(b1.decode()));
-       li = document.createTextNode(decodeBase64(t) + " ");
+       li = document.createTextNode(Base64.decode(t) + " ");
        contents.appendChild(li);
 
        li = document.createElement("a");
-       li.setAttribute("onclick", "document.getElementById('"+ name +"').value = '" + decodeBase64(n) +"';");
-       li.appendChild(document.createTextNode( decodeBase64(n) ));
+       td = Base64.decode(n);
+       li.setAttribute("onclick", "document.getElementById('"+ name +"').value = '" + td +"';");
+       li.appendChild(document.createTextNode( td ));
        contents.appendChild(li);
 
        li = document.createElement("br");

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

Modified Files:
	group_show.php 
Log Message:
bugfix


Index: group_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_show.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- group_show.php	18 Jan 2007 11:51:31 -0000	1.42
+++ group_show.php	18 Mar 2008 19:01:55 -0000	1.43
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2007 by Gero Kohnert
+ *  Copyright 2001 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -268,7 +268,7 @@
              $cnt2++;
            }
          } else {
-           echo '<td colspan="6">'. $this->obj->member[$i]->getLink() ."</td>\n";
+           echo '<td colspan="7">'. $this->obj->member[$i]->getLink() ."</td>\n";
          }
          echo $this->OverviewRowEnd($line++);
        }

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

Modified Files:
	webelements.p3 
Log Message:
fix

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- webelements.p3	6 Feb 2008 15:57:35 -0000	1.321
+++ webelements.p3	17 Mar 2008 10:04:13 -0000	1.322
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -1296,6 +1296,7 @@
    $t[tables]['tutos_dbs'] = usedbs;
    foreach ($tutos[modules] as $r => $x) {
      loadmodule($r);
+     if (!isset($table[$r])) continue;
      if (!is_array($table[$r]['id'])) continue;
      $t[tables][$table[$r][name]] = $x['perm'];
    }

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

Modified Files:
	address_tools.p3 
Log Message:
bugfix


Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- address_tools.p3	2 Jan 2007 19:59:56 -0000	1.89
+++ address_tools.p3	16 Mar 2008 19:29:51 -0000	1.90
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -418,7 +418,7 @@
            echo " <td>&nbsp;". $b ."</td>\n";
          }
          if ( $ashow['c_id'] ) {
-           if ( isset($location->company) ) {
+           if ( is_object($location->company) ) {
              echo " <td>&nbsp;". $location->company->getLink() ."</td>\n";
            } else {
              echo " <td>&nbsp;</td>\n";

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

Modified Files:
	file.pinc 
Log Message:
fix

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- file.pinc	2 Mar 2008 18:07:26 -0000	1.70
+++ file.pinc	13 Mar 2008 13:40:08 -0000	1.71
@@ -25,7 +25,7 @@
 {
     $f = fopen($file,'rb');
     if(!$f)
-        return false;
+      return false;
 
     //Read the last 16KB
     fseek($f, -16384, SEEK_END);
@@ -33,13 +33,13 @@
 
     //Extract cross-reference table and trailer
     if(!preg_match("/xref[\r\n](.*)trailer(.*)startxref/s", $s, $a))
-        return false;
+      return false;
     $xref = $a[1];
     $trailer = $a[2];
 
     //Extract Info object number
     if(!preg_match('/Info ([0-9]+) /', $trailer, $a))
-        return false;
+      return false;
     $object_no = $a[1];
 
     //Extract Info object offset
@@ -58,7 +58,7 @@
     $n = preg_match_all('|/([a-z]+) ?\((.*)\)|Ui', $a[1], $a);
     $prop = array();
     for($i=0; $i<$n; $i++)
-        $prop[$a[1][$i]] = $a[2][$i];
+      $prop[$a[1][$i]] = $a[2][$i];
     return $prop;
 }
 
@@ -441,14 +441,14 @@
         echo "</pre>\n";
       } else {
         $x = get_pdf_prop($fname);
-	    if (sizeof($x)) {
+	if (is_array($x)) {
           echo "PDF Info \n";
           foreach($x as $i => $j) {
-           echo $i ." ". $j ."\n";
+            echo $i ." ". $j ."\n";
           }
-	    }
+        }
       }
-	}
+    }
   }
   /**
    * download this file

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

Modified Files:
	product_overview.php 
Log Message:
new default column feature


Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- product_overview.php	2 Mar 2008 18:07:25 -0000	1.121
+++ product_overview.php	13 Mar 2008 12:33:39 -0000	1.122
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -878,10 +878,9 @@
      }
      if ( $pscnt == 0 ) {
        # Default
-      $this->pshow['name'] = 1;
-      $this->pshow['version'] = 1;
-      $this->pshow['role_1'] = 1;
-      $this->pshow['state'] = 1;
+       foreach ($tutos['proddefaultcolumns'] as $i => $f) {
+         $this->pshow[$f] = 1;
+       }
      }
      if ( $tutos[massupdate] == 1 ) {
        $this->pshow['checkbox'] = 1;

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

Modified Files:
	config_default.pinc 
Log Message:
new default column feature for product overview


Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- config_default.pinc	2 Mar 2008 18:07:25 -0000	1.126
+++ config_default.pinc	13 Mar 2008 12:33:08 -0000	1.127
@@ -558,6 +558,10 @@
 $tutos[prodfields][] = 'pfile';
 $tutos[prodfields][] = 'ptask';
 #
+# Defaults for product overview columns
+#
+$tutos['proddefaultcolumns'] = array('name','version','role_1','state');
+#
 # Boolean, true if you want users to always fill in projects/products
 # classification fields.
 #
@@ -833,6 +837,6 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.3beta.20080206';
+$tutos[version] = '1.3beta.20080313';
 #
 ?>
\ No newline at end of file

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

Modified Files:
	ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 
	file_new.php fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 
	pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 
Log Message:
updates

Index: tw.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/tw.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tw.p3	24 Jan 2008 15:24:00 -0000	1.5
+++ tw.p3	13 Mar 2008 11:02:34 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "使用文件管理";

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/pl.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pl.p3	24 Jan 2008 09:31:29 -0000	1.6
+++ pl.p3	13 Mar 2008 11:02:32 -0000	1.7
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "używanie zarządcy dokumentów";

Index: pt-br.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/pt-br.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pt-br.p3	24 Jan 2008 10:28:32 -0000	1.5
+++ pt-br.p3	13 Mar 2008 11:02:32 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "use docmanagement";

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/en.p3,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- en.p3	22 Apr 2004 10:38:41 -0000	1.7
+++ en.p3	13 Mar 2008 11:02:21 -0000	1.8
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "use docmanagement";

Index: pt.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/pt.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pt.p3	24 Jan 2008 10:28:32 -0000	1.6
+++ pt.p3	13 Mar 2008 11:02:32 -0000	1.7
@@ -53,6 +53,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "usar GESTÃO DE DOCUMENTOS";

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/fr.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fr.p3	5 Apr 2007 16:14:56 -0000	1.5
+++ fr.p3	13 Mar 2008 11:02:25 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "Gérer des documents";

Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/ru.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ru.p3	24 Jan 2008 08:46:00 -0000	1.5
+++ ru.p3	13 Mar 2008 11:02:33 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "менеджера документов";

Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/nl.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nl.p3	5 Apr 2007 16:14:56 -0000	1.5
+++ nl.p3	13 Mar 2008 11:02:25 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "gebruik docmanagement";

Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/it.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- it.p3	5 Apr 2007 16:14:56 -0000	1.6
+++ it.p3	13 Mar 2008 11:02:25 -0000	1.7
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "Usa Gestione documenti";

Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/ko.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ko.p3	24 Jan 2008 15:41:36 -0000	1.5
+++ ko.p3	13 Mar 2008 11:02:25 -0000	1.6
@@ -52,6 +52,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "use docmanagement";

Index: es-ve.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/es-ve.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- es-ve.p3	21 Mar 2004 21:44:24 -0000	1.5
+++ es-ve.p3	13 Mar 2008 11:02:23 -0000	1.6
@@ -53,6 +53,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "usar admin. documentos";

Index: es-mx.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/es-mx.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- es-mx.p3	21 Mar 2004 21:44:24 -0000	1.4
+++ es-mx.p3	13 Mar 2008 11:02:21 -0000	1.5
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "usar admin. documentos";

Index: ca.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/ca.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ca.p3	24 Jan 2008 14:58:35 -0000	1.5
+++ ca.p3	13 Mar 2008 11:02:19 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "Utilitzar gestió documents";

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- file_new.php	2 Mar 2008 18:07:26 -0000	1.24
+++ file_new.php	13 Mar 2008 11:02:24 -0000	1.25
@@ -126,6 +126,10 @@
      if ($tutos['file_local_allow']) {
        echo "<tr>\n";
        echo $this->showfield($lang['FileName'],0,"file2");
+       echo ' <td colspan="4"><i>'. sprintf($lang['FileLocalInfo'],$tutos['file_local_searchpath'])."</i></td>\n";
+       echo "</tr>\n";
+       echo "<tr>\n";
+       echo " <td></td>\n";
        echo " <td id=\"file\" colspan=\"3\">\n";
        echo "  <select id=\"file2\" name=\"file2\">";
        echo "    <option> </option>\n";
@@ -146,7 +150,7 @@
        echo "<tr>\n";
        echo $this->showfield($lang['FileVersioning'],0,"save");
        echo " <td id=\"save\" colspan=\"3\">\n";
-       echo " <font size=\"-1\">". $lang['FileVersioningI'] ."</font><br />\n";
+       echo " <font size=\"-1\"><i>". $lang['FileVersioningI'] ."</i></font><br />\n";
        echo '  <input type="radio" name="save" value="0" />&nbsp;'. sprintf($lang['FileOverwrite'],$this->obj->getFullname()) ."<br />\n";
        echo '  <input type="radio" name="save" value="1" checked="checked" />&nbsp;'. sprintf($lang['FileSave'],$this->obj->name,$this->obj->version) ."\n";
        echo " </td>\n";
@@ -156,7 +160,7 @@
        echo "<tr>\n";
        echo $this->showfield($lang['FileVersionType'],0,"vsys");
        echo " <td id=\"vsys\" colspan=\"3\">&nbsp;\n";
-       echo ' <font size="-1">'. $lang['FileVersionTypeI'] ."</font><br />\n";
+       echo ' <font size="-1"><i>'. $lang['FileVersionTypeI'] ."</i></font><br />\n";
        echo '  <input type="radio" name="vsys" value="0"'. ( $this->obj->vsys == 0 ? ' checked="checked"':'') ." />&nbsp;none \n";
        echo '  <input type="radio" name="vsys" value="1"'. ( $this->obj->vsys == 1 ? ' checked="checked"':'') ." />&nbsp;TUTOS \n";
        if ( file_exists($tutos[file_ci]) && is_executable($tutos[file_ci]) ) {

Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/cs.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cs.p3	24 Jan 2008 09:08:28 -0000	1.5
+++ cs.p3	13 Mar 2008 11:02:19 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "použít správu dokumentu";

Index: ja.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/ja.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ja.p3	24 Jan 2008 15:49:53 -0000	1.5
+++ ja.p3	13 Mar 2008 11:02:25 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "ドキュメント";

Index: es-ni.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/es-ni.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- es-ni.p3	21 Mar 2004 21:44:24 -0000	1.4
+++ es-ni.p3	13 Mar 2008 11:02:23 -0000	1.5
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "use administración de documentos";

Index: vi.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/vi.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vi.p3	22 Apr 2004 10:38:41 -0000	1.5
+++ vi.p3	13 Mar 2008 11:02:34 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "QuŽáŽºŽ£n lŽÃŽ½ tŽÃŽ i liŽáŽ»‡u";

Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/es.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- es.p3	5 Apr 2007 16:14:56 -0000	1.6
+++ es.p3	13 Mar 2008 11:02:23 -0000	1.7
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Documento desbloqueado por %s";
 $lang['FileChanged']     = "Cambiado %s de %s a %s";
 $lang['FileDelSuccess']  = "Archivo \"%s\" eliminado";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Archivo temporal %s no encontrado. Es posible que sea demasiado grande";
 
 $lang['perm'][usedocmanagement]  = "Usar gestión documentos";

Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/hu.p3,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hu.p3	16 Apr 2007 15:30:37 -0000	1.10
+++ hu.p3	13 Mar 2008 11:02:25 -0000	1.11
@@ -50,6 +50,7 @@
 $lang['FileUnlockedByI'] = "A dokumentum zárolását %s feloldotta";
 $lang['FileChanged']     = "%s megváltozott %s-ról %s-ra";
 $lang['FileDelSuccess']  = "\"%s\" fájl törölve";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "A(z) %s átmeneti fájl hiányzik. Talán túl nagy";
 
 $lang['perm'][usedocmanagement]  = "dokumentumkezelés használata";

Index: el.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/el.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- el.p3	24 Jan 2008 09:45:06 -0000	1.5
+++ el.p3	13 Mar 2008 11:02:21 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "χρήση διαχείρισης κειμένων";

Index: zh.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/zh.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- zh.p3	24 Jan 2008 15:34:00 -0000	1.5
+++ zh.p3	13 Mar 2008 11:02:34 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "use docmanagement";

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/de.p3,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- de.p3	5 Apr 2007 16:14:56 -0000	1.8
+++ de.p3	13 Mar 2008 11:02:19 -0000	1.9
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Dokument entsperrt von %s";
 $lang['FileChanged']     = "%s verändert von %s zu %s";
 $lang['FileDelSuccess']  = "Dokument \"%s\" gelöscht";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporäre Datei %s fehlt. Vielleicht zu groß";
 
 $lang['perm'][usedocmanagement]  = "Dokumentmanagement";

Index: sv.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/sv.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sv.p3	5 Apr 2007 16:14:56 -0000	1.5
+++ sv.p3	13 Mar 2008 11:02:34 -0000	1.6
@@ -51,6 +51,7 @@
 $lang['FileUnlockedByI'] = "Document unlocked by %s";
 $lang['FileChanged']     = "Changed %s from %s to %s";
 $lang['FileDelSuccess']  = "File \"%s\" deleted";
+$lang['FileLocalInfo']   = "Local files in<br>%s";
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "använd dokumenthantering";

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

Modified Files:
	product_show.php task.pinc 
Log Message:
updates

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- task.pinc	2 Mar 2008 18:07:25 -0000	1.195
+++ task.pinc	12 Mar 2008 08:37:11 -0000	1.196
@@ -1418,7 +1418,7 @@
       return;
     }
     return array( url => "task_select.php",
-                  image => timetrack::getHtmlIcon(),
+                  image => task::getHtmlIcon(),
                   text => ($text == "" ?  $lang['Search']: $text),
                   info => $lang['SearchForTask'],
                   category => array("search","task","obj")

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- product_show.php	2 Mar 2008 18:07:25 -0000	1.116
+++ product_show.php	12 Mar 2008 08:37:11 -0000	1.117
@@ -198,26 +198,26 @@
              echo  $this->theme->getImage(folder,'list') .' '. makelink("task_overview.php?id=". $this->obj->id,sprintf($lang['AllEntries'], count($this->obj->tasklist)));
              break;
            }
-           echo $this->theme->getImage(paper,'list') .' '. $f->getLink();
+           echo $this->theme->getImage(task,'list') .' '. $f->getLink();
 
            # Additional conntected stuff
-		   $r = '';
-	       if ($tutos[task_show_fileinfo] == 1) {
-			 tutos_file::obj_read($f);
-			 if (count($f->list[usedocmanagement]) > 0) {
-			   $r .= count($f->list[usedocmanagement]).' '.$lang['Files'];
-			 }
-	       }
-	       if ($tutos[task_show_buginfo] == 1) {
-			 bug::obj_read($f);
-			 if (count($f->list[usebugtracking]) > 0) {
-			   if ($r != '') $r .= ' ';
-			   $r .= count($f->list[usebugtracking]).' '.$lang['Bugs'];
-			 }
-	       }
-		   if ($r != '') {
-			 echo ' ('.$r.')';
-		   }
+           $r = '';
+           if ($tutos[task_show_fileinfo] == 1) {
+	     tutos_file::obj_read($f);
+             if (count($f->list[usedocmanagement]) > 0) {
+  	       $r .= count($f->list[usedocmanagement]).' '.$lang['Files'];
+	     }
+	   }
+	   if ($tutos[task_show_buginfo] == 1) {
+	     bug::obj_read($f);
+	     if (count($f->list[usebugtracking]) > 0) {
+	       if ($r != '') $r .= ' ';
+	       $r .= count($f->list[usebugtracking]).' '.$lang['Bugs'];
+             }
+	   }
+	   if ($r != '') {
+	     echo ' ('.$r.')';
+	   }
            echo "<br />\n";
            $n++;
          }

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

Modified Files:
	theme_base.pinc 
Log Message:
updates

Index: theme_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/theme_base.pinc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- theme_base.pinc	5 Apr 2007 10:48:30 -0000	1.10
+++ theme_base.pinc	12 Mar 2008 08:37:11 -0000	1.11
@@ -27,6 +27,7 @@
 define ('delete',17);
 define ('view',18);
 define ('perm',19);
+define ('task',20);
 
 /**
  *
@@ -70,8 +71,12 @@
       $fn = $tutos['base'] ."/html/". $this->name ."/". $fn .".gif";
     } else if ( file_exists(getcwd()."/".$tutos['base'] ."/html/". $this->name ."/". $fn .".jpg")  ) {
       $fn = $tutos['base'] ."/html/". $this->name ."/". $fn .".jpg";
+    } else if ( file_exists(getcwd()."/".$tutos['base'] ."/html/". $fn .".png")  ) {
+      $fn = $tutos['base'] ."/html/". $fn .".png";
     } else if ( file_exists(getcwd()."/".$tutos['base'] ."/html/". $fn .".gif")  ) {
       $fn = $tutos['base'] ."/html/". $fn .".gif";
+    } else if ( file_exists(getcwd()."/".$tutos['base'] ."/html/". $fn .".jpg")  ) {
+      $fn = $tutos['base'] ."/html/". $fn .".jpg";
     } else {
       return "";
     }
@@ -96,6 +101,7 @@
     $this->i[delete]       = $this->findImage('delete');
     $this->i[view]         = $this->findImage('view');
     $this->i[perm]         = $this->findImage('perm');
+    $this->i[task]         = $this->findImage('task');
 
     $this->a[up]           = "UP";
     $this->a[down]         = "DOWN";
@@ -132,4 +138,4 @@
 #    return "@ $type @";
   }
 }
-?>
\ No newline at end of file
+?>

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

Added Files:
	task.png 
Log Message:
initial

--- NEW FILE: task.png ---
(This appears to be a binary file; contents omitted.)

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

Modified Files:
	task_overview.php 
Log Message:
fix

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- task_overview.php	2 Mar 2008 18:07:25 -0000	1.92
+++ task_overview.php	4 Mar 2008 07:25:08 -0000	1.93
@@ -197,6 +197,12 @@
        $cols = 7;
        $add = 0;
      }
+     if ($tutos[task_show_fileinfo] == 1) {
+       $cols ++;
+     }
+     if ($tutos[task_show_buginfo] == 1) {
+       $cols ++;
+     }
      $cols += $add;
 
      echo $this->OverviewTableStart();
@@ -607,4 +613,4 @@
  $l = new task_overview($current_user);
  $l->display();
  $dbconn->Close();
-?>
\ No newline at end of file
+?>

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

Added Files:
	.htaccess 
Log Message:
added more bug and file info. some bugfixes

--- NEW FILE: .htaccess ---
#
# This file is part of TUTOS
#
#
# $Id: .htaccess,v 1.1 2008/03/02 18:07:26 gokohnert Exp $
#
# Change DirectoryIndex to whatever you want to be
# the default page
#
#
# Dont allow access to config files
#
<Files ~ "\.p3">
    Order allow,deny
    Deny from all
</Files>
<Files ~ "\.pinc">
    Order allow,deny
    Deny from all
</Files>
# Disable display of config files
AddType application/x-httpd-php .pinc

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

Added Files:
	.htaccess 
Log Message:
added more bug and file info. some bugfixes

--- NEW FILE: .htaccess ---
#
# This file is part of TUTOS
#
#
# $Id: .htaccess,v 1.1 2008/03/02 18:07:25 gokohnert Exp $
#
# Dont allow access to files
#
Order allow,deny
Deny from all

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

Modified Files:
	ajax.php config_default.pinc db.p3 modules.pinc product.pinc 
	product_overview.php product_show.php res_cal.php task.pinc 
	task_overview.php task_show.php 
Log Message:
added more bug and file info. some bugfixes

Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- db.p3	5 Feb 2008 20:49:52 -0000	1.172
+++ db.p3	2 Mar 2008 18:07:25 -0000	1.173
@@ -157,6 +157,9 @@
 define ('fiscalstartmonth',136);
 define ('timetrackdefaultstate',137);
 define ('overlibargs',138);
+define ('task_show_fileinfo',139);
+define ('task_show_buginfo',140);
+
 # Permissions and Object IDS (see also user.pinc) NO CHANGES HERE !
 # These are distinct IDS for the different Objcts in TUTOS
 # never ! change or reuse a ID

Index: modules.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/modules.pinc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- modules.pinc	4 Apr 2007 19:14:34 -0000	1.37
+++ modules.pinc	2 Mar 2008 18:07:25 -0000	1.38
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -19,6 +19,12 @@
 # http://sourceforge.net/project/showfiles.php?group_id=8047
 
 #
+# If you like to modify some module specific settings in config.php
+# you should add a include line explicitly in config.php
+# modules.pinc is read AFTER config.php but uses include_once statements
+#
+
+#
 # The document management module
 # allows you to attach documents to objects
 # Author: Gero Kohnert

Index: ajax.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ajax.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ajax.php	16 Nov 2007 20:02:34 -0000	1.4
+++ ajax.php	2 Mar 2008 18:07:25 -0000	1.5
@@ -19,7 +19,8 @@
 
  check_user();
 
- Header("Content-Type: text/xml");
+ # Header("Content-Type: text/xml");
+ Header('Content-Type: text/xml;charset='. $lang['content_encoding']);
  Header("Connection: close");
 
  function add_item ($obj) {
@@ -37,7 +38,7 @@
    return $r;
  }
 
- echo '<?xml version="1.0" ?>'."\n";
+ echo '<?xml version="1.0" encoding="'. $lang['content_encoding'] .'" ?>'."\n";
  echo '<tutos generated="'.time().'">'."\n";
 
  $grp = $_REQUEST["grp"];

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- product_show.php	2 Jan 2007 19:59:56 -0000	1.115
+++ product_show.php	2 Mar 2008 18:07:25 -0000	1.116
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -72,11 +72,11 @@
        return;
      }
 
-	 $this->width = 4;
+     $this->width = 4;
 
      echo $this->DataTableStart();
      echo $this->headline_gui();
-	 echo $this->CreatorInfoLine($this->obj,4);
+     echo $this->CreatorInfoLine($this->obj,4);
 
      echo "<tr>\n";
      echo $this->showfield($lang['ProdName']);
@@ -166,7 +166,7 @@
      #
      # Show additional custom fields
      #
-	 echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
      echo appointment::infolist($this->user,$this->obj,4,$this->format);
 
@@ -195,10 +195,30 @@
 
          foreach ($this->obj->tasklist as $i => $f ) {
            if ( ($n >= $rows) && ( $x != $rows ) ) {
-             echo  $this->theme->getImage(folder,'list') ." ". makelink("task_overview.php?id=". $this->obj->id,sprintf($lang['AllEntries'], count($this->obj->tasklist)));
+             echo  $this->theme->getImage(folder,'list') .' '. makelink("task_overview.php?id=". $this->obj->id,sprintf($lang['AllEntries'], count($this->obj->tasklist)));
              break;
            }
-           echo $this->theme->getImage(paper,'list') ." ". $f->getLink() ."<br />\n";
+           echo $this->theme->getImage(paper,'list') .' '. $f->getLink();
+
+           # Additional conntected stuff
+		   $r = '';
+	       if ($tutos[task_show_fileinfo] == 1) {
+			 tutos_file::obj_read($f);
+			 if (count($f->list[usedocmanagement]) > 0) {
+			   $r .= count($f->list[usedocmanagement]).' '.$lang['Files'];
+			 }
+	       }
+	       if ($tutos[task_show_buginfo] == 1) {
+			 bug::obj_read($f);
+			 if (count($f->list[usebugtracking]) > 0) {
+			   if ($r != '') $r .= '&nbsp;';
+			   $r .= count($f->list[usebugtracking]).' '.$lang['Bugs'];
+			 }
+	       }
+		   if ($r != '') {
+			 echo '&nbsp;('.$r.')';
+		   }
+           echo "<br />\n";
            $n++;
          }
          echo " </td>\n";
@@ -337,12 +357,12 @@
      } else {
        $this->name .= ": ".$this->obj->getFullName();
      }
-	 if ($this->obj->getTypeID() != useprojects) {
+     if ($this->obj->getTypeID() != useprojects) {
        $msg .= sprintf($lang['Err0040'],$lang['Product']);
        $this->stop = true;
        $this->format = "html";
        return;
-	 }
+     }
 
      # Menu      
      $x = product::getSelectLink($this->user,$lang['Search']);

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- task_show.php	28 Oct 2007 16:16:35 -0000	1.85
+++ task_show.php	2 Mar 2008 18:07:25 -0000	1.86
@@ -154,8 +154,28 @@
        echo "<br />\n";
        $n = 0;
 	   foreach ($this->obj->tasklist as $i => $f) {
-         echo "  ". $f->getLink() ."<br />\n";
-        $n++;
+         echo '  '. $f->getLink();
+
+         # Additional conntected stuff
+	     $r = '';
+	     if ($tutos[task_show_fileinfo] == 1) {
+		   tutos_file::obj_read($f);
+		   if (count($f->list[usedocmanagement]) > 0) {
+		     $r .= count($f->list[usedocmanagement]).' '.$lang['Files'];
+		   }
+	     }
+	     if ($tutos[task_show_buginfo] == 1) {
+	       bug::obj_read($f);
+		   if (count($f->list[usebugtracking]) > 0) {
+		     if ($r != '') $r .= '&nbsp;';
+		     $r .= count($f->list[usebugtracking]).' '.$lang['Bugs'];
+		   }
+	     }
+		 if ($r != '') {
+		   echo '&nbsp;('.$r.')';
+		 }
+         echo "<br />\n";
+         $n++;
        }
        echo " </td>\n";
        echo "</tr>\n";

Index: res_cal.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- res_cal.php	1 Nov 2007 13:00:31 -0000	1.45
+++ res_cal.php	2 Mar 2008 18:07:25 -0000	1.46
@@ -154,7 +154,7 @@
            $d2 = $cols;
          }
          for ($d = $d1; $d <= $d2; $d++) {
-           $r = find_a_row(&$task,&$xarr,$d1,$d2);
+           $r = find_a_row($task,$xarr,$d1,$d2);
            $xarr[$d][$r] = $task->id;
            $obj[$task->id] = &$task;
            $maxr = Max($maxr,$r);
@@ -198,7 +198,7 @@
          }
 #        echo "<br />X". $m1." ". $d1 ." ". $m2 ." ". $d2 ." ". $prod->getFullName() ."<br />";
          for ($d = $d1; $d <= $d2; $d++) {
-           $r = find_a_row(&$prod,&$xarr,$d1,$d2);
+           $r = find_a_row($prod,$xarr,$d1,$d2);
            $xarr[$d][$r] = $prod->id;
            $obj[$prod->id] = &$prod;
            $maxr = Max($maxr,$r);
@@ -247,7 +247,7 @@
          if ($app->repeat == APP_NOREP) {
            # non repeating
            for ($d = $d1; $d <= $d2; $d++) {
-             $r = find_a_row(&$app,&$xarr,$d1,$d2);
+             $r = find_a_row($app,$xarr,$d1,$d2);
              $obj[$app->id] = &$this->callist[$i];
              $xarr[$d][$r] = $app->id;
              $maxr = Max($maxr,$r);
@@ -259,7 +259,7 @@
              $day = new TUTOS_Date_Time(0);
              $day->setDateTimeTS($t);
              if($app->inside($day)) {
-               $r = find_a_row(&$app,&$xarr,$d,$d);
+               $r = find_a_row($app,$xarr,$d,$d);
                $obj[$app->id] = &$this->callist[$i];
                $xarr[$d][$r] = $app->id;
                $maxr = Max($maxr,$r);
@@ -507,4 +507,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- product_overview.php	28 Oct 2007 16:16:35 -0000	1.120
+++ product_overview.php	2 Mar 2008 18:07:25 -0000	1.121
@@ -188,6 +188,18 @@
            $flds++;
          }
        }
+       if ( $this->user->feature_ok(usedocmanagement,PERM_SEE) ) {
+         if ( ($c == "pfile") && $this->pshow[$c] ) {
+           echo $this->orderHeader("",$lang['Files'],$this->link2);
+           $flds++;
+         }
+	   }
+       if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
+         if ( ($c == "ptask") && $this->pshow[$c] ) {
+           echo $this->orderHeader("",$lang['Tasks'],$this->link2);
+           $flds++;
+         }
+       }
        # Custom fields
        foreach($table['product'] as $ti => $tx) {
          if (!is_array($tx)) continue;
@@ -301,7 +313,17 @@
          } else if ( $c == 'pbugs' ) {
            if ( $this->user->feature_ok(usebugtracking,PERM_SEE) ) {
              bug::obj_read($p);
-             echo $p->bugSum();
+             echo bug::summary($p);
+           }
+         } else if ( $c == 'pfile' ) {
+           if ( $this->user->feature_ok(usedocmanagement,PERM_SEE) ) {
+             tutos_file::obj_read($p);
+             echo tutos_file::summary($p);
+           }
+         } else if ( $c == 'ptask' ) {
+           if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
+             task::obj_read($p);
+             echo task::summary($p);
            }
          } else if ( $c == 'checkbox' ) {
            echo '<div align="center">';
@@ -789,6 +811,12 @@
      if ( $this->user->feature_ok(usebugtracking,PERM_SEE) && class_exists('bug') ) {
        $this->flds['pbugs']        = 'Bugs';
      }
+     if ( $this->user->feature_ok(usedocmanagement,PERM_SEE) && class_exists('tutos_file') ) {
+       $this->flds['pfile']        = 'Files';
+     }
+     if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) && class_exists('task') ) {
+       $this->flds['ptask']        = 'Tasks';
+     }
      $p = new product($this->dbconn);
      for ( $cl = 1;$cl <= $p->classes; $cl++) {
        $x = sprintf("cl%d",$cl);

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- product.pinc	23 Nov 2007 05:32:14 -0000	1.162
+++ product.pinc	2 Mar 2008 18:07:25 -0000	1.163
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -495,14 +495,6 @@
     }
   }
   /**
-   * Return Info about bugs in this product
-   */
-  function bugSum() {
-    global $lang;
-
-    return bugSummary($this);
-  }
-  /**
    * set the name
    */
   function setName($value) {

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- task_overview.php	8 Feb 2008 17:21:08 -0000	1.91
+++ task_overview.php	2 Mar 2008 18:07:25 -0000	1.92
@@ -228,6 +228,14 @@
      }
      echo '  <td colspan="2" rowspan="3" align="right" class="desc">&nbsp;'. ($this->small == 0 ? $lang['Completed'].':&nbsp;':'') .'<font size="+2">'. sprintf("%3.2f %%",$c) ."</font></td>\n";
 
+     # Info about connected docs and bugs
+	 if ($tutos[task_show_fileinfo] == 1) {
+  	   echo '<th rowspan="3">'.$lang['Files'].'</th>';
+	 }
+	 if ($tutos[task_show_buginfo] == 1) {
+  	   echo '<th rowspan="3">'.$lang['Bugs'].'</th>';
+	 }
+
      # additional custom fields
      if ( $this->small == 0 ) {
        foreach ($custom as $ti => $tx) {
@@ -235,6 +243,7 @@
        }
      }
 
+
      if ( $tutos[massupdate] == 1 ) {
        # Checkbox column for massupdate
        echo "  <th rowspan=\"3\" nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- task.pinc	8 Feb 2008 17:16:56 -0000	1.194
+++ task.pinc	2 Mar 2008 18:07:25 -0000	1.195
@@ -1014,14 +1014,6 @@
     return $r;
   }
   /**
-   * Return Info about bugs in this task
-   */
-  function bugSum() {
-    return bugSummary($this);
-  }
-
-
-  /**
    * Add in the given array entries $task_id => $project_id
    * Returns the project
    */
@@ -1266,6 +1258,16 @@
        }
        echo "  </td>\n";
 
+       # Info about connected docs and bugs
+	   if ($tutos[task_show_fileinfo] == 1) {
+         tutos_file::obj_read($this);
+  	     echo '<td>'.tutos_file::summary($this).'</td>';
+  	   }
+	   if ($tutos[task_show_buginfo] == 1) {
+         bug::obj_read($this);
+  	     echo '<td>'.bug::summary($this).'</td>';
+	   }
+
        # Custom fields
        if ($small == 0) {
          echo show_custom_overview_data($this,'task',$this);
@@ -1543,6 +1545,22 @@
     return $msg;
   }
   /**
+   * reads the list of dociment and get a summary
+   */
+  function summary(&$obj) {
+    global $lang;
+
+    if (! is_object($obj) ) return;
+
+	$r = '';
+	if ( count($obj->tasklist) == 0 ) return $r;
+
+    $r .= count($obj->tasklist).' '.$lang['Tasks'].'<br />&nbsp;';
+    $r .= count($obj->fulltasklist).' '.$lang['Tasks'];
+    $x = makelink("task_overview.php?id=". $obj->id,$r,sprintf($lang['TaskOverviewInfo'],$obj->getFullName()));
+	return $x;
+  }
+  /**
    * Read a list of tasks for a timerange and make it a array in the
    * given object (compare readAppsCal in appointment.pinc)
    * start    is a  TUTOS DateTime object

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- config_default.pinc	6 Feb 2008 19:08:12 -0000	1.125
+++ config_default.pinc	2 Mar 2008 18:07:25 -0000	1.126
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -256,6 +256,11 @@
 #
 $tutos[tasksincalendar]  = 0;
 #
+# Show short infos about associated files and bugs in  the taskoverview
+#
+$tutos[task_show_fileinfo]  = 1;
+$tutos[task_show_buginfo]  = 1;
+#
 # Default State for newly booked time
 # -1 = undefined
 # (others see top of timetrack.pinc)
@@ -550,6 +555,8 @@
 $tutos[prodfields][] = 'p_start';
 $tutos[prodfields][] = 'p_end';
 $tutos[prodfields][] = 'pbugs';
+$tutos[prodfields][] = 'pfile';
+$tutos[prodfields][] = 'ptask';
 #
 # Boolean, true if you want users to always fill in projects/products
 # classification fields.

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

Modified Files:
	rep_bug_state_duration.pinc 
Log Message:
added more bug and file info. some bugfixes

Index: rep_bug_state_duration.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_bug_state_duration/rep_bug_state_duration.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rep_bug_state_duration.pinc	16 Dec 2006 13:08:28 -0000	1.4
+++ rep_bug_state_duration.pinc	2 Mar 2008 18:07:26 -0000	1.5
@@ -89,7 +89,7 @@
     }
     $stat['count'] = 0;
 
-    if ($this->obj == -1) {
+    if (!is_object($this->obj)) {
       $q = "SELECT * from ".$this->dbconn->prefix."bugs";
       $pre = " WHERE ";
       if (count($this->bugclass)) {
@@ -227,4 +227,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>

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

Modified Files:
	.htaccess 
Log Message:
added more bug and file info. some bugfixes

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

Modified Files:
	installation.pinc 
Log Message:
added more bug and file info. some bugfixes

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- installation.pinc	17 Aug 2007 18:11:48 -0000	1.46
+++ installation.pinc	2 Mar 2008 18:07:26 -0000	1.47
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -178,12 +178,6 @@
     }
   }
   /**
-   * Return Info about bugs in this installation
-   */
-  function bugSum() {
-    return bugSummary($this);
-  }
-  /**
    * Return a txt describing this installation
    */
   function getFullName() {

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

Modified Files:
	bug.pinc 
Log Message:
added more bug and file info. some bugfixes

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- bug.pinc	23 Jan 2008 15:02:27 -0000	1.50
+++ bug.pinc	2 Mar 2008 18:07:25 -0000	1.51
@@ -21,54 +21,6 @@
 
 
 /**
- * Return Info about connected bugs to a object including timetrack
- */
-function bugSummary(&$obj) {
-  global $lang;
-
-  $ret = '';
-
-  foreach ($lang['BugStates'] as $i => $f) {
-    $b[$i] = 0;
-    $t[$i] = 0;
-    $s[$i] = '';
-  }
-
-  foreach ($obj->list[usebugtracking] as $i => $bug) {
-    $b[$bug->state]++;
-    $t[$bug->state] += $bug->timetracksum;
-    $s[$bug->state] = $bug->short;
-  }
-
-  $bug = new bug($obj->dbconn);
-
-  $url = "bugtracking/bug_overview.php";
-  $url = addUrlParameter($url,"pid=". $obj->id);
-
-  $ret = '';
-
-  foreach($b as $i => $f) {
-    if ( $f > 0 ) {
-      $vurl = addUrlParameter($url,"state=". $i);
-      $ret .= "<tr>\n";
-      $ret .= '<td nowrap="nowrap" align="left">'. makelink($vurl,$bug->getState($i) ) ."</td>\n";
-      $ret .= '<td nowrap="nowrap" align="center">&nbsp;'. $b[$i] ."&nbsp;</td>\n";
-      $ret .= '<td nowrap="nowrap" align="right">'. number_format($t[$i],2) ." ". $lang['hours'] ."</td>\n";
-      if ( $f == 1 ) {
-        $ret .= "<td nowrap=\"nowrap\" align=\"left\">(". $s[$i].") </td>\n";
-      } else {
-        $ret .= "<td nowrap=\"nowrap\" align=\"left\">&nbsp;</td>\n";
-      }
-      $ret .= "</tr>\n";
-    }
-  }
-  if ($ret == "") {
-    return "";
-  }
-
-  return "<table>\n". $ret ."</table>\n";
-}
-/**
  * ask a bug state
  */
 function BugAskState ($default,$any) {
@@ -1015,6 +967,57 @@
     return;
   }
   /**
+   * Return Info about connected bugs to a object including timetrack
+   */
+  function summary(&$obj) {
+    global $lang;
+
+    if (! is_object($obj) ) return;
+
+	if(!isset($obj->list[usebugtracking])) {
+      bug::obj_read($obj);
+	}
+
+    $ret = '';
+
+    foreach ($lang['BugStates'] as $i => $f) {
+      $b[$i] = 0;
+      $t[$i] = 0;
+      $s[$i] = '';
+    }
+
+    foreach ($obj->list[usebugtracking] as $i => $bug) {
+      $b[$bug->state]++;
+      $t[$bug->state] += $bug->timetracksum;
+      $s[$bug->state] = $bug->short;
+    }
+
+    $bug = new bug($obj->dbconn);
+
+    $url = "bugtracking/bug_overview.php";
+    $url = addUrlParameter($url,"pid=". $obj->id);
+
+    foreach($b as $i => $f) {
+      if ( $f > 0 ) {
+        $vurl = addUrlParameter($url,"state=". $i);
+        $ret .= "<tr>\n";
+        $ret .= '<td nowrap="nowrap" align="left">'. makelink($vurl,$bug->getState($i) ) ."</td>\n";
+        $ret .= '<td nowrap="nowrap" align="center">&nbsp;'. $b[$i] ."&nbsp;</td>\n";
+        $ret .= '<td nowrap="nowrap" align="right">'. number_format($t[$i],2) ." ". $lang['hours'] ."</td>\n";
+        if ( $f == 1 ) {
+          $ret .= "<td nowrap=\"nowrap\" align=\"left\">(". $s[$i].") </td>\n";
+        } else {
+          $ret .= "<td nowrap=\"nowrap\" align=\"left\">&nbsp;</td>\n";
+        }
+        $ret .= "</tr>\n";
+      }
+    }
+    if ($ret == "") {
+      return $ret;
+    }
+    return "<table>\n". $ret ."</table>\n";
+  }
+  /**
    * a object that may hold bugs is deleted
    */
   Function obj_delete(&$user,&$obj) {
@@ -1043,7 +1046,7 @@
       $r .= "<tr>\n";
       $r .= $user->layout->showfield($lang['Bugs']);
       $r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
-      $r .= bugSummary($obj);
+      $r .= bug::summary($obj);
       $r .= $user->layout->theme->getImage(folder,'list') ." ". makelink("bugtracking/bug_overview.php?show=all&amp;pid=".$obj->id,$lang['BugsOverview'] );
       $r .= " </td>\n";
       $r .= "</tr>\n";

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

Modified Files:
	file.pinc file_ins.php file_new.php mconfig.pinc 
Log Message:
added more bug and file info. some bugfixes

Index: file_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_ins.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- file_ins.php	5 Nov 2007 18:47:44 -0000	1.24
+++ file_ins.php	2 Mar 2008 18:07:26 -0000	1.25
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -118,44 +118,48 @@
 
  $file = 'none';
  # Hack for Konquerer
- if ( isset($_POST['file']) ) {
-   $file = $_POST['file'];
+ if ( isset($_POST['file1']) ) {
+   $file = $_POST['file1'];
    if ( $file != "none" ) {
-     $farr = $_FILES["file"];
+     $farr = $_FILES["file1"];
      if ( $farr['name'] == "" ) {
        $file = "none";
      }
    }
-   $farr = $_FILES['file'];
- } else if ( isset($_FILES['file']) ) {
-   $file = $_FILES['file']['name'];
-   $farr = $_FILES['file'];
+   $farr = $_FILES['file1'];
+ } else if ( isset($_FILES['file1']) ) {
+   $file = $_FILES['file1']['name'];
+   $farr = $_FILES['file1'];
  }
  if ( $file == "" ) {
    $file = 'none';
  }
 
  # via filesystem import
- if (isset($_GET['file'])) {
-   $file = $_GET['file'];
+ $import = false;
+ if ($tutos['file_local_allow'] && isset($_REQUEST['file2']) && $_REQUEST['file2'] != '' ) {
+   $file = basename($_REQUEST['file2']); # Strip possible dirnames for security
    $import = true;
    $farr = array();
    $farr['name'] = $file;
-   $farr['tmp_name'] = $tutos[sessionpath]."/". $file;
+   $farr['tmp_name'] = $tutos['file_local_searchpath']."/". $file;
    $farr['size'] =  filesize($farr['tmp_name']);
-   $farr['type'] = $_GET['ct'];
+   if (isset($_REQUEST['ct'])) {
+     $farr['type'] = $_REQUEST['ct'];
+   } else {
+     $farr['type'] = 'any';
+   }
    $f->nocheck = true;
- } else {
-   $import = false;
  }
  $farr['md5']  =  md5_file($farr['tmp_name']);
  # New files need a path !
  if ( ($file == "none") && ($f->id == -1)  ) {
    $msg .= sprintf($lang['Err0009'],$lang['FileName']) ."<br />";
- }
-
+   $gotourl = addBadField($gotourl,'file1',true);
+ } else
  if ( ( !isset($_POST['name']) || trim($_POST['name']) == "") && ($file == "none") ) {
    $msg .= sprintf($lang['Err0009'],$lang['FileName']) ."<br />";
+   $gotourl = addBadField($gotourl,'file1',true);
    $name = "";
  } else {
    $name = trim(StripSlashes($_REQUEST['name']));
@@ -268,7 +272,7 @@
  $gotourl = addMessage($gotourl,$msg,true);
  $gotourl = addSessionKey($gotourl,true);
 
- if (!$import) {
+ if (!$import || !isset($_GET['file2'])) {
    Header("Status: 302 Moved Temporarily");
    Header("Location: ". dirname(getBaseUrl()) ."/". $gotourl);
  } else {

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- file_new.php	2 Jan 2007 19:59:57 -0000	1.23
+++ file_new.php	2 Mar 2008 18:07:26 -0000	1.24
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2000 - 2007 by Gero Kohnert
+ *  Copyright 2000 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -115,7 +115,7 @@
 
      echo "<tr>\n";
      echo $this->showfield($lang['FileName'],0,"file");
-     echo ' <td colspan="3"><input id="file" size="40" name="file" type="file" value="'. $this->obj->filename ."\" />\n";
+     echo ' <td colspan="3"><input id="file1" size="40" name="file1" type="file" value="'. $this->obj->filename ."\" />\n";
      if ( $this->obj->id != -1 ) {
        echo "<br /><font size=\"-1\">". $this->obj->filename ."</font>";
      }
@@ -123,6 +123,25 @@
      echo " </td>\n";
      echo "</tr>\n";
 
+     if ($tutos['file_local_allow']) {
+       echo "<tr>\n";
+       echo $this->showfield($lang['FileName'],0,"file2");
+       echo " <td id=\"file\" colspan=\"3\">\n";
+       echo "  <select id=\"file2\" name=\"file2\">";
+       echo "    <option> </option>\n";
+       # read the directory
+       if ($dh = opendir($tutos['file_local_searchpath'])) {
+         while (($file = readdir($dh)) !== false) {
+           if (filetype($tutos['file_local_searchpath'].'/'.$file) == 'dir') continue;
+           echo "    <option>". $file."</option>\n";
+         }
+         closedir($dh);
+       }
+       echo "  </select>";
+       echo " </td>\n";
+       echo "</tr>\n";
+     }
+
      if ( ($this->obj->id != -1) && ($this->obj->vsys != 0) ) {
        echo "<tr>\n";
        echo $this->showfield($lang['FileVersioning'],0,"save");

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- file.pinc	26 Feb 2008 13:34:54 -0000	1.69
+++ file.pinc	2 Mar 2008 18:07:26 -0000	1.70
@@ -1091,6 +1091,24 @@
     return;
   }
   /**
+   * reads the list of dociment and get a summary
+   */
+  function summary(&$obj) {
+    global $lang;
+
+    if (! is_object($obj) ) return;
+
+	$r = '';
+	if(!isset($obj->list[usedocmanagement])) {
+      tutos_file::obj_read($obj);
+	}
+	if ( count($obj->list[usedocmanagement]) == 0 ) return $r;
+
+    $r .= count($obj->list[usedocmanagement]).' '.$lang['Files'];
+	$x = makelink("file/file_overview.php?link_id=".$obj->id,$r);
+	return $x;
+  }
+  /**
    * create a smalllist of products related to the given object
    */
   function small_infolist (&$user,&$obj,$cols,$class) {

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/mconfig.pinc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mconfig.pinc	3 Apr 2005 18:32:13 -0000	1.9
+++ mconfig.pinc	2 Mar 2008 18:07:26 -0000	1.10
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright 2002 - 2005 by Gero Kohnert
+ *  Copyright 2002 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -53,4 +53,11 @@
   $confmsg .= "\$tutos[". usedocmanagement ."] = 0;<br />\n";
   $tutos[usedocmanagement] = 0;
 }
+
+#
+# possible Options
+#
+# allow import from local path
+$tutos['file_local_allow'] = true;
+$tutos['file_local_searchpath'] = '/var/www/ubr_uploads';
 ?>
\ No newline at end of file