tutos-commits Mailing List for TUTOS

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

Modified Files:
      Tag: BRANCH-2-0
	product.pinc product_ins.php product_new.php product_show.php 
	timetrack.pinc 
Log Message:
* DEBUG mini calendar layout
* DEBUG bug_new did not include timetrack (new dependancy)
* Project hierarchy : we want projects to have parent, just as tasks.
  Please use admin/update.php to add the new column to your TUTOS-2
  scheme.
* Some more fixes


Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.133.2.9
retrieving revision 1.133.2.10
diff -u -r1.133.2.9 -r1.133.2.10
--- product.pinc	23 Sep 2004 16:35:38 -0000	1.133.2.9
+++ product.pinc	31 Jan 2005 17:37:30 -0000	1.133.2.10
@@ -91,6 +91,7 @@
 
     $this->init($dbconn);
     $this->name = "";
+    $this->parent = -1;
     $this->version = "";
     $this->description = "";
     $this->desc1 = "";
@@ -132,6 +133,7 @@
    */
   function read_result (&$r, $pos ) {
     $this->name        = $r->get($pos, "name");
+    $this->parent      = getObject($this->dbconn, $r->get($pos, "p_id"));
     $this->version     = $r->get($pos, "version");
     $this->description = $r->get($pos, "description");
     $this->desc1       = $r->get($pos, "desc1");
@@ -263,6 +265,15 @@
     $r->free();
     return;
   }
+
+  /**
+   * Return the short name of a project, without its version number
+   * appended
+   */
+  function getShortName() {
+      return trim($this->name);
+  }
+
   /**
    * Return a fullname i.e name + version
    */
@@ -272,6 +283,7 @@
     else
       return trim($this->name);
   }
+
   /**
    * Return a url that displays this product
    */
@@ -417,6 +429,28 @@
   }
 
   /**
+   * Get sub projects of current project
+   */
+  function getSubProjects() {
+    if( isset($this->subprojects) && is_array($this->subprojects) )
+      return $this->subprojects;
+
+    $this->subprojects = array();
+
+    $q = "SELECT * FROM products WHERE p_id = ".$this->id;
+    $r = $this->dbconn->Exec($q);
+    $n = $r->numrows();
+
+    for( $a = 0; $a < $n; $a++ ) {
+      $sp_id = $r->get($a, "id");
+      $this->subprojects[$sp_id] = getObject($this->dbconn, $sp_id);
+    }
+    $r->free();
+
+    return $this->subprojects;
+  }
+
+  /**
    * Return true if project is running in some way
    */
   function isalive() {
@@ -608,6 +642,12 @@
       $q->addFV("cost","null","");
     }
 
+    error_log('product.pinc: parent id '.$this->parent->id);
+
+    if( $this->parent != -1 && is_object($this->parent) ) {
+      $q->addFV("p_id",$this->parent->id,"INT");
+    }
+
     if ( $this->id < 0 ) {
       $this->modified = array();
       if ( isset($this->newid) ) {
@@ -868,9 +908,11 @@
 	    continue;
 
 	  $list[] = array('id'      => $proj->id,
+			  'p_id'    => $proj->parent->id,
 			  'name'    => $proj->getFullName(),
 			  'title'   => $proj->getFullName(),
 			  'link'    => $proj->getUrl(),
+			  'parent'  => $proj->parent,
 			  'desc'    => $proj->description,
 			  'func'    => $lang['ProdRole'][$role],
 			  'created' => $proj->creation->getDateTime(),

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -u -r1.53.2.1 -r1.53.2.2
--- product_ins.php	12 May 2004 16:32:17 -0000	1.53.2.1
+++ product_ins.php	31 Jan 2005 17:37:30 -0000	1.53.2.2
@@ -68,6 +68,23 @@
  }
  $gotourl= addUrlParameter($gotourl,"role1=". $_POST['role1'],true);
  $gotourl= addUrlParameter($gotourl,"r1desc=". UrlEncode($_POST['r1desc']),true);
+
+ # Manage parent project
+ if ( isset($_POST['parent']) ) {
+   $m = check_field(StripSlashes($_POST['parent']),
+		    "parents","parents",$tutos[rolecheck][$_POST['role2']]);
+
+   if ( $m->id > 0 ) {
+     $p->parent = getObject($dbconn, $m->id);
+   }
+ }
+ if ( isset($_POST['parent_id']) ) {
+   $p->parent = getObject($dbconn,$_POST['parent_id']);
+ }
+
+ $gotourl= addUrlParameter($gotourl,"parent=". $_POST['parent'],true);
+
+
  # Add given Product Role
  if ( isset($_POST['r2fn']) ) {
    $m = check_field(StripSlashes($_POST['r2fn']),"r2fn","r2l",$tutos[rolecheck][$_POST['role2']]);

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.76.2.11
retrieving revision 1.76.2.12
diff -u -r1.76.2.11 -r1.76.2.12
--- product_new.php	19 Jan 2005 10:55:18 -0000	1.76.2.11
+++ product_new.php	31 Jan 2005 17:37:30 -0000	1.76.2.12
@@ -129,6 +129,9 @@
      }
      $this->assign("roles", $roles);
 
+     /**
+      * New role
+      */
      $proles = array();
      foreach ($lang['ProdRole'] as $role => $x) {
        # No Product Roles
@@ -138,6 +141,14 @@
        $proles[$role] = myentities($lang['ProdRole'][$role]);
      }
 
+     $r1desc_size = $table['product2']['description'][size];
+     $this->assign("r1desc",
+		   array('name'  => 'r1desc',
+			 'value' => myentities($this->r1desc),
+			 'size'  => min(30, $r1desc_size),
+			 'maxl'  => $r1desc_size));
+
+
      if( count($roles) == 0 && $this->obj->rsel1 == $tutos[default_role] )
        $default_role = $tutos[default_first_role];
      else
@@ -149,23 +160,23 @@
 			 'options'  => $proles,
 			 'selected' => $default_role));
 
-     $r1fn = "";
-
      if( isset($this->obj->xl['r1']) ) {
        $r1fns = array();
        foreach( $this->obj->xl['r1'] as $i => $f )
 	 $r1fns[$i] = myentities($f->getFullName());
 
-       $r1fn = $this->obj->xfn['r1'];
-
        $this->assign("r1l",
 		     array('id'      => "r1",
 			   'name'    => "r1id",
 			   'options' => $r1fns));
      }
 
-     if( $r1fn == "" && isset($this->obj->r1) )
-       $r1fn = myentities($this->obj->r1->getFullName());
+     $r1fn = "";
+     if( $this->obj->xfn['r1'] != "" )
+       $r1fn = $this->obj->xfn['r1'];
+     else
+       if( isset($this->obj->r1) )
+	 $r1fn = myentities($this->obj->r1->getFullName());
 
      $this->assign("r1fn",
 		   array('id'      => "r1",
@@ -173,19 +184,42 @@
 			 'value'   => $r1fn,
 			 'select'  => isset($this->obj->xl['r1'])));
 
-     $r1desc_size = $table['product2']['description'][size];
-     $this->assign("r1desc",
-		   array('name'  => 'r1desc',
-			 'value' => myentities($this->r1desc),
-			 'size'  => min(30, $r1desc_size),
-			 'maxl'  => $r1desc_size));
 
-     #
-     # Relations to other Products
-     #
+     /**
+      * Parent product
+      */
+     if( isset($this->obj->xl['parent']) ) {
+       // User tried a product input, and now must choose one of the
+       // pre-selected products as a parent.
+       $parents = array();
+       foreach( $this->obj->xl['parent'] as $i => $f )
+	 $parents[$i] = myentities($f->getFullName());
+
+       $this->assign("parent",
+		     array('id'      => "parent",
+			   'name'    => "parent_id",
+			   'label'  => $lang['ProdRole'][10],
+			   'options' => $parents));
+     }
+     else {
+       $parent = "";
+
+       if( isset($this->obj->parent) && is_object($this->obj->parent) ) {
+	 $parent = $this->obj->parent->getShortName();	 
+       }
+       $this->assign("parent",
+		     array('id'     => 'parent',
+			   'name'   => 'parent',
+			   'label'  => $lang['ProdRole'][10],
+			   'value'  => $parent));
+     }
+     
+     /**
+      * Relations to other Products
+      */
      $this->assign('ProdProd', $lang['ProdProd']);
 
-     # List all projectroles in this project
+     // List all projectroles in this project
      $prodroles = array();
      if ( $this->obj->id > 0 ) {
        $n = 0;
@@ -215,7 +249,9 @@
      }
      $this->assign('prodroles', $prodroles);
 
-     # New Relation
+     /**
+      * New Product Relation
+      */
      $this->assign('ProdProdNew', $lang['ProdProdNew']);
 
      $rels = array();
@@ -231,15 +267,31 @@
 			 'label'   => $lang['ProdProdNew'],
 			 'options' => $rels));
 
-     if( isset($this->obj->r2) )
-       $r2fn = $this->obj->r2->getFullName();
-     else
-       $r2fn = "";
+     $r2fn = "";
+
+     if( isset($this->obj->xl['r2']) ) {
+       $r2fns = array();
+       foreach( $this->obj->xl['r2'] as $i => $f )
+	 $r2fns[$i] = myentities($f->getFullName());
+
+       $r2fn = $this->obj->xfn['r2'];
+
+       $this->assign("r2l",
+		     array('id'      => "r2",
+			   'name'    => "r2id",
+			   'options' => $r2fns));
+     }
+
+     if( $r2fn == "" && isset($this->obj->r2) )
+       $r2fn = myentities($this->obj->r2->getFullName());
 
      $this->assign("r2fn",
-		   array('id'    => "r2",
-			 'name'  => "r2fn",
-			 'value' => $r2fn));
+		   array('id'      => "r2",
+			 'name'    => "r2fn",
+			 'value'   => $r2fn,
+			 'select'  => isset($this->obj->xl['r2'])));
+
+
 
      $r2desc_size = $table['product2']['description'][size];
      $this->assign("r2desc",
@@ -393,6 +445,14 @@
        $this->obj->r1 = $this->user;
      }
 
+     if ( isset($_GET['pid']) ) {
+       $this->parent = new product($this->dbconn);
+       $this->parent->read($_GET['pid']);
+
+       
+       $this->obj->parent = $this->parent;
+     }
+
      if ( isset($_GET['name']) ) {
        $this->obj->name = StripSlashes($_GET['name']);
      }
@@ -448,6 +508,13 @@
        }
      }
 
+     if( isset($_GET['parents']) ) {
+       foreach($_GET['parents'] as $x => $f) {
+         $a = getObject($this->dbconn,$f);
+         $this->obj->xl['parent'][$f] = $a;
+       }
+     }
+
      if ( isset($_GET['role1']) ) {
        $this->obj->rsel1 = $_GET['role1'];
      } else {

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.90.2.17
retrieving revision 1.90.2.18
diff -u -r1.90.2.17 -r1.90.2.18
--- product_show.php	15 Oct 2004 15:56:29 -0000	1.90.2.17
+++ product_show.php	31 Jan 2005 17:37:31 -0000	1.90.2.18
@@ -87,6 +87,35 @@
 		   array('label' => $lang['ProdState'],
 			 'value' => $lang['ProdStates'][$this->obj->state]));
 
+     /**
+      * Parent project
+      */
+     $parent = "";
+     if( $this->obj->parent != -1 )
+       $this->assign('ProdParent',
+		     array('label' => $lang['ProdRole'][10],
+			   'value' => $this->obj->parent->getFullName(),
+			   'title' => $this->obj->parent->getFullName(),
+			   'link'  => $this->obj->parent->getUrl()));
+     else
+       $this->assign('ProdParent',
+		     array('label' => $lang['ProdRole'][10],
+			   'value' => ""));
+
+     /**
+      * Sub Projects
+      */
+     $sps = array();
+     foreach( $this->obj->getSubProjects() as $sp ) {
+       $sps[] = array('name'  => $sp->getFullName(),
+		      'title' => $sp->getFullName(),
+		      'link'  => $sp->getUrl());
+     }
+
+     $this->assign("SubProjects",
+		   array('label' => $lang['SubProjects'],
+			 'value' => $sps));
+
      if( in_array($this->obj->state, array(0, 4, 5))
 	 && ( $this->obj->probability != "" ) )
        $this->assign('ProdProb',
@@ -317,6 +346,14 @@
 		  'category' => array("product","new","obj")
 		  );
        $this->addMenu($x);
+
+       $x = array('url'   => "product_new.php?pid=".$this->obj->id,
+                  'text'  => $lang['ProdSubNew'],
+		  'image' => 'new',
+		  'info'  => $lang['ProdCreateInfo'],
+		  'category' => array("product","new","obj")
+		  );
+       $this->addMenu($x);
      }
 
      if( ($this->obj->id > 0) && $this->obj->mod_ok() ) {

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.64.2.8
retrieving revision 1.64.2.9
diff -u -r1.64.2.8 -r1.64.2.9
--- timetrack.pinc	30 Nov 2004 18:26:32 -0000	1.64.2.8
+++ timetrack.pinc	31 Jan 2005 17:37:31 -0000	1.64.2.9
@@ -8,7 +8,6 @@
  * @modulegroup timetrack
  * @package timetrack
  */
-
 define ('TT_STATE_CHECKED',1);
 define ('TT_STATE_BILLED',2);
 define ('TT_STATE_PAYED',3);

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31417/php/localization

Modified Files:
      Tag: BRANCH-2-0
	en.p3 fr.p3 
Log Message:
* DEBUG mini calendar layout
* DEBUG bug_new did not include timetrack (new dependancy)
* Project hierarchy : we want projects to have parent, just as tasks.
  Please use admin/update.php to add the new column to your TUTOS-2
  scheme.
* Some more fixes


Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.47.2.6
retrieving revision 1.47.2.7
diff -u -r1.47.2.6 -r1.47.2.7
--- en.p3	2 Dec 2004 17:31:02 -0000	1.47.2.6
+++ en.p3	31 Jan 2005 17:37:32 -0000	1.47.2.7
@@ -345,6 +345,9 @@
 $lang['ProdStatsTitle']  = "Product/Project Statistics";
 $lang['ProdFields']      = "Fields";
 $lang['ProdRoleAddT']    = "Add a role in %s";
+$lang['SubProject']      = "Sub-project";
+$lang['SubProjects']     = "Sub-projects";
+$lang['ProdSubNew']      = "New subproject";
 
 # Mail
 $lang['MailboxEmail']    = "Email";

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.17
retrieving revision 1.40.2.18
diff -u -r1.40.2.17 -r1.40.2.18
--- fr.p3	2 Dec 2004 17:31:02 -0000	1.40.2.17
+++ fr.p3	31 Jan 2005 17:37:32 -0000	1.40.2.18
@@ -342,6 +342,9 @@
 $lang['ProdStatsTitle']  = "Statistiques Produit/Projet";
 $lang['ProdFields']      = "Champs";
 $lang['ProdRoleAddT']    = "Add a role in %s";
+$lang['SubProject']      = "Sous-projet";
+$lang['SubProjects']     = "Sous-projects";
+$lang['ProdSubNew']      = "Nouveau sous-projet";
 
 # Mailboxes
 $lang['MailboxEmail']    = "Email";

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

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc bug_new.php 
Log Message:
* DEBUG mini calendar layout
* DEBUG bug_new did not include timetrack (new dependancy)
* Project hierarchy : we want projects to have parent, just as tasks.
  Please use admin/update.php to add the new column to your TUTOS-2
  scheme.
* Some more fixes


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.18
retrieving revision 1.13.2.19
diff -u -r1.13.2.18 -r1.13.2.19
--- bug.pinc	19 Jan 2005 10:55:27 -0000	1.13.2.18
+++ bug.pinc	31 Jan 2005 17:37:31 -0000	1.13.2.19
@@ -5,7 +5,6 @@
  *  CVS Info:  $Id$
  *  $Author$
  */
-
 define ('BUG_STATE_OPEN',1);
 define ('BUG_STATE_WORK',2);
 define ('BUG_STATE_SOLVED',3);
@@ -1135,12 +1134,13 @@
        "   ORDER BY bugid, c.creation DESC) h".
        "  JOIN bugs b ON b.id = h.bugid ".
        " WHERE ".
-       " (creator = ". $user->id ." OR ".$user->id ." in ".
+       " (creator = ". $user->id ." OR solver = ". $user->id.
+       " OR ".$user->id ." in ".
        "(SELECT adr_id FROM timetrack tt, bugchanges c ".
        " WHERE tt.id = c.tt_id AND c.bugid = b.id))".
        " AND h.state not in (".BUG_STATE_CLOSED.", ".BUG_STATE_SOLVED.") ".
        "ORDER BY b.creation DESC";
-    
+
     $res = $user->dbconn->Exec($q);
     $n = $res->numrows();
     $a = 0;

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.5.2.11
retrieving revision 1.5.2.12
diff -u -r1.5.2.11 -r1.5.2.12
--- bug_new.php	13 Dec 2004 17:29:13 -0000	1.5.2.11
+++ bug_new.php	31 Jan 2005 17:37:31 -0000	1.5.2.12
@@ -13,6 +13,7 @@
  include_once 'bug.pinc';
  include_once 'product.pinc';
  include_once 'task.pinc';
+ include_once 'timetrack.pinc';
 
  require_once 'layout/layout.pinc';
 

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31417/php/db

Modified Files:
      Tag: BRANCH-2-0
	table.pinc 
Log Message:
* DEBUG mini calendar layout
* DEBUG bug_new did not include timetrack (new dependancy)
* Project hierarchy : we want projects to have parent, just as tasks.
  Please use admin/update.php to add the new column to your TUTOS-2
  scheme.
* Some more fixes


Index: table.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/table.pinc,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- table.pinc	15 Oct 2004 15:56:29 -0000	1.20.2.2
+++ table.pinc	31 Jan 2005 17:37:32 -0000	1.20.2.3
@@ -252,6 +252,7 @@
   name => "products",
   Desc => "TUTOS products",
   "id"          => array(type => "ID_TYPE",              constraints => "PK",  Desc => "Object ID"),
+  "p_id"        => array(type => "ID_TYPE",             constraints => "",  Desc => "parent project id"),
   "name"        => array(type => "VARCHAR", size => 40,  constraints => "",    Desc => "name"),
   "version"     => array(type => "VARCHAR", size => 20,  constraints => "",    Desc => "version"),
   "description" => array(type => "TX_TYPE",              constraints => "",    Desc => "description"),

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31417/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	minical.tpl product_new.tpl product_show.tpl 
Log Message:
* DEBUG mini calendar layout
* DEBUG bug_new did not include timetrack (new dependancy)
* Project hierarchy : we want projects to have parent, just as tasks.
  Please use admin/update.php to add the new column to your TUTOS-2
  scheme.
* Some more fixes


Index: minical.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/minical.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- minical.tpl	24 Jun 2004 16:20:42 -0000	1.1.2.1
+++ minical.tpl	31 Jan 2005 17:37:33 -0000	1.1.2.2
@@ -32,7 +32,8 @@
 {/literal}
 </script>
 
-<table class="single" border="0" cellpadding="2" cellspacing="0" width="100%">
+<table class="single" border="0" cellpadding="2" cellspacing="0"
+       style="position: fixed; width: 100%; left: 0px;">
 <tr>
 
 <th colspan="2" align="left">

Index: product_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_new.tpl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- product_new.tpl	19 Jan 2005 10:55:28 -0000	1.1.2.9
+++ product_new.tpl	31 Jan 2005 17:37:40 -0000	1.1.2.10
@@ -108,6 +108,21 @@
 
 <tr>
 <td class="desc" >{$ProdProdNew}</td>
+<td>{$parent.label}</td>
+
+<td colspan="3">
+{if is_array($parent.options)}
+ {html_options name=$parent.name options=$parent.options}
+{else}
+  <input id="{$parent.id}" size="20" maxlength="40" name="{$parent.name}"
+         value="{$parent.value}">
+{/if}
+</td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td class="desc" >{$ProdProdNew}</td>
 <td>
   <select name="{$role2.name}">
   {foreach from=$role2.options key=value item=option}
@@ -117,8 +132,12 @@
 </td>
 
 <td>
+{if $r2fn.select}
+  {html_options name=$r2l.name options=$r2l.options}
+{else}
   <input id="{$r2fn.id}" size="20" maxlength="40" name="{$r2fn.name}"
          value="{$r2fn.value}">
+{/if}
 </td>
 <td colspan="2">
   <input id="{$r2desc.name}" name="{$r2desc.name}" value="{$r2desc.value}"

Index: product_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_show.tpl,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- product_show.tpl	17 Dec 2004 15:00:32 -0000	1.1.2.10
+++ product_show.tpl	31 Jan 2005 17:37:40 -0000	1.1.2.11
@@ -29,15 +29,38 @@
 </tr>
 <tr>
 <td class="desc" valign="top">{$ProdName.label}</td>
-<td colspan="3" class="data">{$ProdName.value}</td>
+<td class="data">{$ProdName.value}</td>
+
+{if $ProdParent.value != ""}
+<td class="desc" valign="top">{$ProdParent.label}</td>
+<td class="data">
+  <a href="{$ProdParent.link}"
+    title="{$ProdParent.title}">{$ProdParent.value}</a>
+</td>
+{else}
+<td colspan="2">&nbsp;</td>
+{/if}
 </tr>
 
-{if $ProdVersion.value != ""}
 <tr>
+{if $ProdVersion.value == ""}
+<td colspan="2">&nbsp;</td>
+{else}
 <td class="desc" valign="top">{$ProdVersion.label}</td>
-<td colspan="3" class="data">{$ProdVersion.value}</td>
-</tr>
+<td class="data" valign="top">{$ProdVersion.value}</td>
+{/if}
+{if count($SubProjects.value) == 0}
+<td colspan="2">&nbsp;</td>
+{else}
+<td class="desc" valign="top">{$SubProjects.label}</td>
+<td class="data">
+{foreach from=$SubProjects.value item=s name=sp}
+<a href="{$s.link}" title="{$s.title}">{$s.name}</a>
+{if not $smarty.foreach.sp.last}<br>{/if}
+{/foreach}
+</td>
 {/if}
+</tr>
 
 <tr>
 <td class="desc" valign="top">{$ProdState.label}</td>

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

Modified Files:
      Tag: BRANCH-1-2
	links.html 
Log Message:
add interactors

Index: links.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/links.html,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- links.html	12 Apr 2004 17:11:19 -0000	1.15
+++ links.html	28 Jan 2005 18:23:41 -0000	1.15.2.1
@@ -26,7 +26,8 @@
   <li><b>commercial (i.e. not for free) <tt>TUTOS</tt> related</b></li>
   <ul>
     <li>TUTOS Extensions and Support at <a href="http://www.tutos.de"><img border="0" height="50" src="TUTOS.DE" rel="nofollow">http://www.tutos.de/tutos_support.png">TUTOS.DE</a>
-    <li>TUTOS Support from <a href="http://www.i2rs.nl"><img border="0" height="50" src="http://www.i2rs.nl/images/logo.gif" alt="i2rs"></a> (in dutch)
+    <li>TUTOS Support from <a href="http://www.i2rs.nl">i2rs</a> (in dutch)
+    <li>TUTOS Support from <a href="http://interactors.coop/"><img border="0" height="50" src="http://interactors.coop/themes/phptemplate/intro/images/logo-interactors-intro.png" alt="interactors"></a> (in spanish)
     <li>Ready2Run TUTOS boxes from <a href="http://www.tutos-france.com"><img
     border="0" height="20"
     src="http://www.tutos-france.com/images/logo_defisud.gif"

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

Modified Files:
	login.pinc 
Log Message:
fix

Index: login.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/login.pinc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- login.pinc	8 Jan 2005 18:33:36 -0000	1.37
+++ login.pinc	28 Jan 2005 13:41:51 -0000	1.38
@@ -121,12 +121,12 @@
      echo $this->setFocus("login.uname");
 
      # Display mesage of today
-	 $motd = "";
+     $motd = "";
      if ( is_readable(getcwd()."/".$tutos['base'] ."/html/motd.html") || (function_exists('is_executable') && is_executable(getcwd()."/".$tutos['base'] ."/html/motd.html"))) {
        $motd = $tutos['base'] ."/html/motd.html";
-	 } else if ( is_readable(getcwd()."/".$tutos['base'] ."/html/motd_default.html") || (function_exists('is_executable') && is_executable(getcwd()."/".$tutos['base'] ."/html/motd_default.html"))) {
+     } else if ( is_readable(getcwd()."/".$tutos['base'] ."/html/motd_default.html") || (function_exists('is_executable') && is_executable(getcwd()."/".$tutos['base'] ."/html/motd_default.html"))) {
        $motd = $tutos['base'] ."/html/motd_default.html";
-	 }
+     }
 
      if ($motd != "" && (0 < filesize(getcwd()."/".$motd)) ) {
        echo "<p>\n";

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

Modified Files:
	Makefile 
Log Message:
fix

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- Makefile	28 Jan 2005 09:43:56 -0000	1.72
+++ Makefile	28 Jan 2005 13:41:50 -0000	1.73
@@ -11,6 +11,9 @@
 #
 #
 # $Log$
+# Revision 1.73  2005/01/28 13:41:50  gokohnert
+# fix
+#
 # Revision 1.72  2005/01/28 09:43:56  gokohnert
 # fix
 #
@@ -602,6 +605,7 @@
 	$(THEMERED) \
 	$(HTMLPICS)\
 	html/motd_default.html \
+	html/overlib.js \
 	html/.htaccess
 
 #
@@ -690,6 +694,7 @@
 	tutos.lsm \
 	index.html \
 	index.htm \
+	favicon.ico \
 	$(OTHERH) \
 	$(OTHERHP)
 

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14900/localization

Modified Files:
      Tag: BRANCH-1-2
	ko.p3 
Log Message:
fix

Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ko.p3,v
retrieving revision 1.47.2.2
retrieving revision 1.47.2.3
diff -u -r1.47.2.2 -r1.47.2.3
--- ko.p3	26 Nov 2004 12:22:59 -0000	1.47.2.2
+++ ko.p3	28 Jan 2005 11:27:22 -0000	1.47.2.3
@@ -174,9 +174,9 @@
 $lang['NewAppointR']     = "»õ ÀÏÁ¤(ÁÖ±âÀû)";
 $lang['NewAppointInfo']  = "»õ ¾à¼Ó";
 $lang['NewAppointInfoR'] = "»õ ¾à¼Ó(ÁÖ±âÀû)";
-$lang['AppointDetail']   = "<font size=5>¼¼ºÎ ÀÏÁ¤</font>";
-$lang['AppointModify']   = "<font size=5>ÀÏÁ¤ º¯°æ</font>";
-$lang['AppointCreate']   = "<font size=5>ÀÏÁ¤ »ý¼º</font>";
+$lang['AppointDetail']   = "¼¼ºÎ ÀÏÁ¤";
+$lang['AppointModify']   = "ÀÏÁ¤ º¯°æ";
+$lang['AppointCreate']   = "ÀÏÁ¤ »ý¼º";
 $lang['AppointCommit']   = "¾à¼Ó½ÇÇà";
 $lang['AppointOverview'] = "ÀÏÁ¤ Àüü º¸±â";
 $lang['AppDelInfo']      = "ÇöÀç ÀÏÁ¤ »èÁ¦";

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14641/localization

Modified Files:
	ko.p3 
Log Message:
fix

Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ko.p3,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ko.p3	8 Nov 2004 20:29:08 -0000	1.50
+++ ko.p3	28 Jan 2005 11:26:05 -0000	1.51
@@ -174,9 +174,9 @@
 $lang['NewAppointR']     = "»õ ÀÏÁ¤(ÁÖ±âÀû)";
 $lang['NewAppointInfo']  = "»õ ¾à¼Ó";
 $lang['NewAppointInfoR'] = "»õ ¾à¼Ó(ÁÖ±âÀû)";
-$lang['AppointDetail']   = "<font size=5>¼¼ºÎ ÀÏÁ¤</font>";
-$lang['AppointModify']   = "<font size=5>ÀÏÁ¤ º¯°æ</font>";
-$lang['AppointCreate']   = "<font size=5>ÀÏÁ¤ »ý¼º</font>";
+$lang['AppointDetail']   = "¼¼ºÎ ÀÏÁ¤";
+$lang['AppointModify']   = "ÀÏÁ¤ º¯°æ";
+$lang['AppointCreate']   = "ÀÏÁ¤ »ý¼º";
 $lang['AppointCommit']   = "¾à¼Ó½ÇÇà";
 $lang['AppointOverview'] = "ÀÏÁ¤ Àüü º¸±â";
 $lang['AppDelInfo']      = "ÇöÀç ÀÏÁ¤ »èÁ¦";

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

Modified Files:
	Makefile 
Log Message:
fix

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Makefile	16 Apr 2004 19:25:22 -0000	1.71
+++ Makefile	28 Jan 2005 09:43:56 -0000	1.72
@@ -11,6 +11,9 @@
 #
 #
 # $Log$
+# Revision 1.72  2005/01/28 09:43:56  gokohnert
+# fix
+#
 # Revision 1.71  2004/04/16 19:25:22  gokohnert
 # changes and enhancements
 #
@@ -598,7 +601,7 @@
 	$(THEMEBLUE) \
 	$(THEMERED) \
 	$(HTMLPICS)\
-	html/motd.html \
+	html/motd_default.html \
 	html/.htaccess
 
 #

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

Modified Files:
      Tag: BRANCH-1-2
	Makefile 
Log Message:
fix

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.71.2.1
retrieving revision 1.71.2.2
diff -u -r1.71.2.1 -r1.71.2.2
--- Makefile	1 Sep 2004 16:37:16 -0000	1.71.2.1
+++ Makefile	28 Jan 2005 09:41:41 -0000	1.71.2.2
@@ -11,6 +11,9 @@
 #
 #
 # $Log$
+# Revision 1.71.2.2  2005/01/28 09:41:41  gokohnert
+# fix
+#
 # Revision 1.71.2.1  2004/09/01 16:37:16  gokohnert
 # Release prepare fixes
 #
@@ -611,7 +614,7 @@
 	${THEMENUKE} \
 	$(THEMERED) \
 	$(HTMLPICS)\
-	html/motd.html \
+	html/motd_default.html \
 	html/.htaccess
 
 #

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

Added Files:
      Tag: BRANCH-1-2
	favicon.ico 
Log Message:
initial

--- NEW FILE: favicon.ico ---

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

Added Files:
	overlib.js 
Log Message:

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

Added Files:
      Tag: BRANCH-1-2
	overlib.js 
Log Message:
This is overlib created by Erik Bosrup
Copyright Erik Bosrup 1998-2004. All rights reserved.
For license see http://www.bosrup.com/web/overlib/?License




--- NEW FILE: overlib.js ---
//\/////

//\  overLIB 4.00 - You may not remove or change this notice.

//\  Copyright Erik Bosrup 1998-2004. All rights reserved.

//\

//\  Contributors are listed on the homepage.

//\  This file might be old, always check for the latest version at:

//\  http://www.bosrup.com/web/overlib/

//\

//\  Please read the license agreement (available through the link above)

//\  before using overLIB. Direct any licensing questions to er...@bo....

//\

//\  Do not sell this as your own work or remove this copyright notice. 

//\  For full details on copying or changing this script please read the

//\  license agreement at the link above. Please give credit on sites that

//\  use overLIB and submit changes of the script so other people can use

//\  them as well.

//   $Revision: 1.1.2.1 $                $Date: 2005/01/27 18:50:26 $

//\/////

//\mini

[...1276 lines suppressed...]


	this.simpleversion = parseInt(this.version*100);

	this.major = parseInt(this.simpleversion / 100);

	this.minor = parseInt(this.simpleversion / 10) - this.major * 10;

	this.revision = parseInt(this.simpleversion) - this.major * 100 - this.minor * 10;

}







////////

// STANDARD REGISTRATIONS

////////

registerHook("ol_content_simple", ol_content_simple, FALTERNATE, CSSOFF);

registerHook("ol_content_caption", ol_content_caption, FALTERNATE, CSSOFF);

registerHook("ol_content_background", ol_content_background, FALTERNATE, CSSOFF);

registerHook("ol_content_simple", ol_content_simple, FALTERNATE, CSSCLASS);

registerHook("ol_content_caption", ol_content_caption, FALTERNATE, CSSCLASS);

registerHook("ol_content_background", ol_content_background, FALTERNATE, CSSCLASS);

registerHook("hideObject", nbspCleanup, FAFTER);

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

Added Files:
	.cvsignore 
Log Message:
new

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

Added Files:
      Tag: BRANCH-1-2
	.cvsignore 
Log Message:
new

--- NEW FILE: .cvsignore ---
# $Id: .cvsignore,v 1.1.2.1 2005/01/27 18:18:21 gokohnert Exp $
#
motd.html

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

Removed Files:
      Tag: BRANCH-1-2
	motd.html 
Log Message:
using motd_default.html if there is no motd.html

--- motd.html DELETED ---

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

Added Files:
      Tag: BRANCH-1-2
	motd_default.html 
Log Message:
using motd_default.html if there is no motd.html

--- NEW FILE: motd_default.html ---
<!-- $Id: motd_default.html,v 1.1.2.1 2005/01/27 18:05:08 gokohnert Exp $ -->
<!-- This will be read inside of <PRE> </PRE> -->
Congratulations you have managed to install <a href="http://www.tutos.org" target="home">TUTOS</a>.

This is the <u>default</u> message of today.

To change the message of today:

 Create a file [tutoshome]/html/motd.html

 A empty (0 Byte) motd.html will show nothing.

 A link to an executable will cause the output of the excutable to be shown.
    Try for example:
    <i>ln -fs /usr/bin/fortune [tutoshome]/html/motd.html</i>


Have fun.

See <a href="http://wiki.tutos.org" target="doku">TUTOS wiki</a> for uptodate documentation.
<!-- EOF -->

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

Modified Files:
      Tag: BRANCH-1-2
	login.pinc 
Log Message:
using motd_default.html if there is no motd.html

Index: login.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/login.pinc,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -r1.34.2.1 -r1.34.2.2
--- login.pinc	21 Nov 2004 09:15:40 -0000	1.34.2.1
+++ login.pinc	27 Jan 2005 18:05:09 -0000	1.34.2.2
@@ -121,17 +121,24 @@
      echo $this->setFocus("login.uname");
 
      # Display mesage of today
+     $motd = "";
      if ( is_readable(getcwd()."/".$tutos['base'] ."/html/motd.html") || (function_exists('is_executable') && is_executable(getcwd()."/".$tutos['base'] ."/html/motd.html"))) {
+       $motd = $tutos['base'] ."/html/motd.html";
+     } else if ( is_readable(getcwd()."/".$tutos['base'] ."/html/motd_default.html") || (function_exists('is_executable') && is_executable(getcwd()."/".$tutos['base'] ."/html/motd_default.html"))) {
+       $motd = $tutos['base'] ."/html/motd_default.html";
+     }
+
+     if ($motd != "" && (0 < filesize(getcwd()."/".$motd)) ) {
        echo "<p>\n";
        echo "<center>\n";
        DoubleTableStart();
        echo "<tr><th>". $lang['MOTD'] ."</th></tr>\n";
        echo "<tr><td><pre>\n";
-       if ( function_exists('is_executable') && is_executable(getcwd()."/".$tutos['base'] ."/html/motd.html") ) {
-         @system ($tutos['base'] ."/html/motd.html");
+       if ( function_exists('is_executable') && is_executable(getcwd()."/".$motd) ) {
+         @system ($motd);
        } else {
          #@readfile (getcwd()."/".$tutos['base'] ."/html/motd.html");
-         if ($fd = fopen (getcwd()."/".$tutos['base'] ."/html/motd.html", "rb")) {
+         if ($fd = fopen (getcwd()."/".$motd, "rb")) {
            fpassthru($fd);
          }
        }

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

Modified Files:
	bug_show.php 
Log Message:
beautyfied

Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bug_show.php	27 Jan 2005 16:14:09 -0000	1.12
+++ bug_show.php	27 Jan 2005 16:50:35 -0000	1.13
@@ -87,7 +87,6 @@
        echo $this->showdata($this->obj->reporter != -1 ? $this->obj->reporter->getLink():"",1);
        echo $this->showdata( " (". makelink("bugtracking/bug_overview.php?reporterid=". $this->obj->reporter->id,
                                $lang['BugReportedAll']) .")",2);
-     
        echo "</tr><tr>\n";
      }
      echo $this->showfield($lang['BugMedium']);
@@ -117,7 +116,7 @@
      #
      # Show additional custom fields
      #
-	 show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
      show_module_infolists($this->user,$this->obj,4,$this->format);
 

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

Modified Files:
	config_default.pinc 
Log Message:
changed version

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- config_default.pinc	27 Nov 2004 10:24:05 -0000	1.94
+++ config_default.pinc	27 Jan 2005 16:45:02 -0000	1.95
@@ -38,6 +38,7 @@
 # Port where the DB is listening
 # Postgres : 5432
 # MySQL    : 3306
+# Firebird : 3050
 $tutos[dbport][0]   = 5432;
 #
 # The Database user who runs TUTOS
@@ -744,6 +745,6 @@
 #
 # The TUTOS Version number
 #
-$tutos[version]="1.3dev.20040730";
+$tutos[version]="1.3dev.20050107";
 #
 ?>
\ No newline at end of file

Update of /cvsroot/tutos/tutos/php/drawboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22492/drawboard

Modified Files:
	drawboard_overview.php 
Log Message:
beautyfied

Index: drawboard_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/drawboard/drawboard_overview.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drawboard_overview.php	23 Sep 2004 18:12:12 -0000	1.1
+++ drawboard_overview.php	27 Jan 2005 16:42:46 -0000	1.2
@@ -71,18 +71,18 @@
      $this->dlist = array();
      for($i=0; $i < $tutos['drawboard']['count'] ; $i++) {
        $obj = new drawboard($this->dbconn);
-       $obj = $obj->read($i,$obj);
        $obj->init_by_name($i);
+       $obj = $obj->read($i,$obj);
        if ($obj == -1) {
          $obj = new drawboard($this->dbconn);
-		 $obj->save();
-	   }
+         $obj->save();
+       }
        $obj->read_info();
        $obj->read_reference();
-	   if (!$obj->is_running() && ($obj->ref != -1) ) {
+       if (!$obj->is_running() && ($obj->ref != -1) ) {
          $obj->ref = -1;
-		 $obj->save();
-	   }
+         $obj->save();
+       }
        $this->dlist[$i] = $obj;
      }
      if ( ! $this->user->feature_ok(usedrawboard,PERM_SEE) ) {
@@ -101,4 +101,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	Date.pinc 
Log Message:
added another Date format

Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- Date.pinc	25 Aug 2004 19:17:01 -0000	1.98
+++ Date.pinc	27 Jan 2005 16:36:52 -0000	1.99
@@ -631,7 +631,16 @@
       $this->min   = 0;
       $this->sec   = 0;
       $this->format = 8;
-    } else {
+    } else
+    if ( ereg( "^([0-9]{4})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])$", $str, $regs ) ) {
+      $this->year  = (integer)$regs[1];
+      $this->month = (integer)$regs[2];
+      $this->day   = (integer)$regs[3];
+      $this->hour  = (integer)$regs[4];
+      $this->min   = (integer)$regs[5];
+      $this->sec   = (integer)$regs[6];
+      $this->format = 15;
+	} else {
       echo "<br />DT: Unknown DateTimeFormat <span class=\"warn\">". $str ."</span> fix it in Date.pinc or register a DB specific format<br />";
       return;
     }

Update of /cvsroot/tutos/tutos/php/auth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20563/auth

Modified Files:
	auth_pam.pinc 
Log Message:
more informative messages

Index: auth_pam.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/auth/auth_pam.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- auth_pam.pinc	22 Jun 2004 14:31:16 -0000	1.4
+++ auth_pam.pinc	27 Jan 2005 16:35:44 -0000	1.5
@@ -80,17 +80,17 @@
       return $r;
     }
 
+	$error = "";
     ini_set("pam_auth.servicename",$tutos[pamservice]);
-    if ( ! pam_auth($this->getuname(), $this->getpw(), $error)) {
+    if ( ! pam_auth($this->getuname(), $this->getpw(), &$error)) {
       ReadLang($lang);
-      $r[0]  = $error ." : ". $this->getuname() ;
+      $r[0]  = "PAM(". $tutos[pamservice].") ". $error ." : ". $this->getuname() ;
       $r[1]  = $lang['Err0027'] ." : ". $r[0];
       return $r;
     }
-
     $current_user= new tutos_user($this->dbconn);
     $current_user->read_result($result,0);
     $result->free();
   }
 }
-?>
\ No newline at end of file
+?>