tutos-commits Mailing List for TUTOS

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

Modified Files:
      Tag: BRANCH-2-0
	task_overview_legend.tpl timetrack_overview_legend.tpl 
Log Message:
* commit before hollidays ;)


Index: task_overview_legend.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_overview_legend.tpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- task_overview_legend.tpl	27 May 2005 15:34:30 -0000	1.1.2.3
+++ task_overview_legend.tpl	29 Jul 2005 13:13:58 -0000	1.1.2.4
@@ -14,7 +14,7 @@
             label_src_ko="$base/html/classic/no-right.png"
 	    label_alt="filter" search=$filter}
   {/strip}
-  </td>
+  </th>
 </tr>
 </thead>
 

Index: timetrack_overview_legend.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/timetrack_overview_legend.tpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- timetrack_overview_legend.tpl	2 Dec 2004 17:31:02 -0000	1.1.2.2
+++ timetrack_overview_legend.tpl	29 Jul 2005 13:13:58 -0000	1.1.2.3
@@ -1,10 +1,10 @@
 {* Timetrack Overview Legend *}
 {* $Id$ *}
 
-<table width="100%" cellspacing="0" cellpadding="0" bgcolor="#CFCFBB">
+<table class="legend" cellspacing="0">
 <thead>
 <tr>
-  <th colspan="3">{$legend}</th>
+  <th colspan="3"><b>{$legend}</b></th>
 </tr>
 </tr>
 </thead>

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

Modified Files:
      Tag: BRANCH-2-0
	task_show.php 
Log Message:
* Adding task_overview icons to task_show for direct access


Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.66.2.18
retrieving revision 1.66.2.19
diff -u -r1.66.2.18 -r1.66.2.19
--- task_show.php	20 May 2005 15:17:44 -0000	1.66.2.18
+++ task_show.php	26 Jul 2005 15:10:54 -0000	1.66.2.19
@@ -69,10 +69,19 @@
        $x = $this->obj->parent;
        while ( isset ( $x ) ) {
          // echo $pre . $lang[$x->gettype()] . " " . $x->getLink();
-	 $parents[] = array('label' => $x->getFullName(),
-			    'title' => $x->getFullName(),
-			    'link'  => $x->getUrl(),
-			    'type'  => $lang[$x->gettype()]);
+	 $ancestor = array('id'    => $x->id,
+			   'label' => $x->getFullName(),
+			   'title' => $x->getFullName(),
+			   'link'  => $x->getUrl(),
+			   'type'  => $lang[$x->gettype()]);
+
+	 if( $x->getType() == "product" ) {
+	   $ancestor['overview'] = 'task_overview.php?id='.$x->id;
+	   $ancestor['ow_title'] = sprintf($lang['TaskOverviewInfo'],
+					   $x->getFullName());
+	 }
+
+	 $parents[] = $ancestor;
 
          if( isset($x->parent) && $x->parent != -1 )
            $x = $x->parent;

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

Modified Files:
      Tag: BRANCH-2-0
	task_show.tpl 
Log Message:
* Adding task_overview icons to task_show for direct access


Index: task_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_show.tpl,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- task_show.tpl	20 May 2005 15:17:46 -0000	1.1.2.18
+++ task_show.tpl	26 Jul 2005 15:10:55 -0000	1.1.2.19
@@ -58,6 +58,13 @@
 <td colspan="3">
 {foreach name=parents from=$parents.parents item=p}
  {$p.type} <a href="{$p.link}" title="{$p.title}">{$p.label}</a>
+ {if $p.overview != ""}
+ {strip}
+   <a href="{$base}/php/{$p.overview}" title="{$p.ow_title}">
+     <img src="{$base}/html/classic/task_overview.png" alt="{$p.ow_title}">
+   </a>
+  {/strip}
+ {/if}
  {if not $smarty.foreach.parents.last} -> {/if}
 {/foreach}
 </td>

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

Modified Files:
      Tag: BRANCH-1-2
	installation_ins.php 
Log Message:
bugfix 1245011

Index: installation_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_ins.php,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- installation_ins.php	26 Jul 2004 19:55:03 -0000	1.11.2.1
+++ installation_ins.php	26 Jul 2005 09:14:47 -0000	1.11.2.2
@@ -38,13 +38,13 @@
    if ( empty($_POST['cfn']) ) {
      $msg .= sprintf($lang['Err0009'],$lang['Customer']) ."<br>";
    } else {
-     $x = check_field($_POST['cfn'],"cfn","cl","acd");
+     $x = check_field(StripSlashes($_POST['cfn']),"cfn","cl","acd");
      $obj->setCustomer($x->id);
    }
  }
 
  if ( isset($_POST['ifn']) ) {
-   $x = check_field($_POST['ifn'],"ifn","il");
+   $x = check_field(StripSlashes($_POST['ifn']),"ifn","il");
    $obj->setInstaller($x->id);
  }
  if ( isset($_POST['desc']) ) {
@@ -69,7 +69,7 @@
  }
 
  if ( isset($_POST['sfn']) ) {
-   $x = check_field($_POST['sfn'],"sfn","sl","at");
+   $x = check_field(StripSlashes($_POST['sfn']),"sfn","sl","at");
    $obj->setSeller($x->id);
  }
 
@@ -128,4 +128,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-serv7981

Modified Files:
      Tag: BRANCH-1-2
	address_ins.php 
Log Message:
bugfix #1242316


Index: address_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_ins.php,v
retrieving revision 1.49.2.4
retrieving revision 1.49.2.5
diff -u -r1.49.2.4 -r1.49.2.5
--- address_ins.php	28 Oct 2004 06:46:58 -0000	1.49.2.4
+++ address_ins.php	23 Jul 2005 08:23:08 -0000	1.49.2.5
@@ -160,7 +160,7 @@
      $gotourl= addUrlParameter($gotourl,"loc_id=". $l->id,true);
    }
    if ( $savefile == 1 ) {
-     $a->pic_file->link_id = $a->id;
+     $a->pic_file->addReference($a);
      $msg .= $a->pic_file->save();
      $a->pic_id = $a->pic_file->id;
      $msg = $a->save();

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

Modified Files:
	product_contacts.php 
Log Message:
bugfix


Index: product_contacts.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_contacts.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- product_contacts.php	22 May 2005 14:23:41 -0000	1.11
+++ product_contacts.php	23 Jul 2005 08:04:12 -0000	1.12
@@ -114,8 +114,7 @@
                if ($l->phone_2)
                  $p[] = $l->phone_2 .$loc;
              }
-           }
-           if ($x == "company") {
+           } else if ($x == "company") {
              $r->read_locs_data();
              foreach($r->location as $l) {
                if (count($r->location) == 1) {
@@ -134,15 +133,13 @@
                if ($l->phone_2)
                  $p[] = $l->phone_2 .$loc;
              }
-           }
-           if ($x == "team") {
+           } else if ($x == "team") {
              $name = array();
              $name[] = $lang[$x];
              $name[] = $r->getFullName();
-           }
-           if ($x == "department") {
+           } else if ($x == "department") {
              $r->read_locs_data();
-             $name[] = " / ".$r->company->getFullName();
+#             $name[] = " / ".$r->company->getFullName();
              foreach($r->location as $l) {
                if (count($r->location) == 1) {
                  $loc = "";
@@ -279,8 +276,7 @@
                $p[$l->lname."(1)"] = $l->phone_1;
                $p[$l->lname."(2)"] = $l->phone_2;
              }
-           }
-           if ($x == "company") {
+           } else if ($x == "company") {
              $r->read_locs_data();
              foreach($r->location as $l) {
                $e[$l->lname."(1)"] = $l->email_1;
@@ -289,14 +285,12 @@
                $p[$l->lname."(1)"] = $l->phone_1;
                $p[$l->lname."(2)"] = $l->phone_2;
              }
-           }
-           if ($x == "team") {
+           } else if ($x == "team") {
              $n[1] = $n[0];
              $n[0] = $lang[$x];
-           }
-           if ($x == "department") {
+           } else if ($x == "department") {
              $r->read_locs_data();
-             $n = $r->getLink( $r->getFullName() ." / ". $r->company->getFullName() );
+             $n[0] = $r->getLink( $r->getFullName() );
              foreach($r->location as $l) {
                $e[$l->lname."(1)"] = $l->email_1;
                $e[$l->lname."(2)"] = $l->email_2;
@@ -304,7 +298,10 @@
                $p[$l->lname."(1)"] = $l->phone_1;
                $p[$l->lname."(2)"] = $l->phone_2;
              }
-           }
+           } else {
+             $n[1] = $n[0];
+             $n[0] = $lang[$x];
+		   }
 
            echo "<tr>\n";
            echo " <td valign=\"top\">";

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

Modified Files:
	holiday_hk.pinc 
Log Message:
bugfix #1243459


Index: holiday_hk.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/holiday_hk.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- holiday_hk.pinc	27 Jan 2005 14:29:36 -0000	1.3
+++ holiday_hk.pinc	23 Jul 2005 07:37:03 -0000	1.4
@@ -31,7 +31,7 @@
         array( Date => "01-10",          type => 1,    Desc => "National Day (HK)"),
         array( Date => "11-10",          type => 1,    Desc => "Chung Yeung Festival (HK)"),
         array( Date => "22-12",          type => 0,    Desc => "Winter Festival (HK)"),
-        array( Date => "26-12",          type => 1,    Desc => "Boxing Day (HK)")
+        array( Date => "26-12",          type => 1,    Desc => "Boxing Day (HK)"),
         array( Date => "27-12",          type => 1,    Desc => "Additional general holiday for Christmas Day (HK)")
         );
 ?>

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

Modified Files:
      Tag: BRANCH-1-2
	holiday_hk.pinc 
Log Message:
bugfix


Index: holiday_hk.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/holiday_hk.pinc,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- holiday_hk.pinc	14 Jan 2005 20:23:37 -0000	1.2.6.1
+++ holiday_hk.pinc	23 Jul 2005 07:34:31 -0000	1.2.6.2
@@ -31,7 +31,7 @@
         array( Date => "01-10",          type => 1,    Desc => "National Day (HK)"),
         array( Date => "11-10",          type => 1,    Desc => "Chung Yeung Festival (HK)"),
         array( Date => "22-12",          type => 0,    Desc => "Winter Festival (HK)"),
-        array( Date => "26-12",          type => 1,    Desc => "Boxing Day (HK)")
+        array( Date => "26-12",          type => 1,    Desc => "Boxing Day (HK)"),
         array( Date => "27-12",          type => 1,    Desc => "Additional general holiday for Christmas Day (HK)")
         );
 ?>

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

Modified Files:
	file.pinc 
Log Message:
update

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- file.pinc	1 Jul 2005 07:45:27 -0000	1.56
+++ file.pinc	19 Jul 2005 14:07:17 -0000	1.57
@@ -401,6 +401,7 @@
       if ( ($this->filetype == "application/vnd.ms-excel")
         || ($this->filetype == "application/msword" )
         || ($this->filetype == "application/vnd.ms-project" )
+        || ($this->filetype == "application/x-unknown-content-type-Visio" )
         || ($this->filetype == "application/doc" ) ) {
         @passthru($tutos[wvSummary] ." \"". $fname ."\" | grep -v \"^no\"");
       }
@@ -1195,4 +1196,4 @@
     return $r;
   }
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
      Tag: BRANCH-1-2
	installation_overview.php 
Log Message:
bugfix

Index: installation_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_overview.php,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- installation_overview.php	25 Mar 2005 19:22:58 -0000	1.18.2.2
+++ installation_overview.php	19 Jul 2005 07:22:09 -0000	1.18.2.3
@@ -174,7 +174,7 @@
        return;
      }
      if ( $_GET['action'] == -4 ) {
-       $this->redirect = acl_action();
+       $this->redirect = '../'.acl_action();
        return;
      }
      if (class_exists('watchlist')) {

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

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

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.271.2.11
retrieving revision 1.271.2.12
diff -u -r1.271.2.11 -r1.271.2.12
--- webelements.p3	6 Jun 2005 10:15:58 -0000	1.271.2.11
+++ webelements.p3	19 Jul 2005 06:59:25 -0000	1.271.2.12
@@ -649,8 +649,8 @@
   $b = eregi_replace("&lt;/([BIU])&gt;","</\\1>",$b);
   $b = eregi_replace("(ftp://[a-z,0-9:/?&=_.+-]*)","<a href=\"\\1\" target=\"_blank\">\\1</a>",$b);
   $b = eregi_replace("(file:/[a-z,0-9:/?&=_.+-]*)","<a href=\"\\1\" target=\"_blank\">\\1</a>",$b);
-  $b = eregi_replace("(http://[a-z,0-9:/?&%=_.+-]*)","<a href=\"\\1\" target=\"_blank\">\\1</a>",$b);
-  $b = eregi_replace("(https://[a-z,0-9:/?&%=_.+-]*)","<a href=\"\\1\" target=\"_blank\">\\1</a>",$b);
+  $b = eregi_replace("(http://([.]?[a-zA-Z0-9_/-?&%=:])*)","<a href=\\1\ target=\_blank\>\1</a>",$b);
+  $b = eregi_replace("(https://([.]?[a-zA-Z0-9_/-?&%=:])*)","<a href=\\1\ target=\_blank\>\1</a>",$b);
   $b = eregi_replace("(mailto:[a-z,0-9:/?&=_.@-]*)","<a href=\"\\1\">\\1</a>",$b);
   return $b;
 }

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

Modified Files:
	webelements.p3 
Log Message:
fix

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- webelements.p3	6 Jun 2005 10:17:32 -0000	1.294
+++ webelements.p3	19 Jul 2005 06:58:35 -0000	1.295
@@ -687,8 +687,8 @@
   $b = eregi_replace("&lt;/([BIU])&gt;","</\\1>",$b);
   $b = eregi_replace("(ftp://[a-z,0-9:/?&=_.+-]*)","<a href=\"\\1\" target=\"_blank\">\\1</a>",$b);
   $b = eregi_replace("(file:/[a-z,0-9:/?&=_.+-]*)","<a href=\"\\1\" target=\"_blank\">\\1</a>",$b);
-  $b = eregi_replace("(http://[a-z,0-9:/?&%=_.+-]*)","<a href=\"\\1\" target=\"_blank\">\\1</a>",$b);
-  $b = eregi_replace("(https://[a-z,0-9:/?%&=_.+-]*)","<a href=\"\\1\" target=\"_blank\">\\1</a>",$b);
+  $b = eregi_replace("(http://([.]?[a-zA-Z0-9_/-?&%=:])*)","<a href=\\1\ target=\_blank\>\1</a>",$b);
+  $b = eregi_replace("(https://([.]?[a-zA-Z0-9_/-?&%=:])*)","<a href=\\1\ target=\_blank\>\1</a>",$b);
   $b = eregi_replace("(mailto:[a-z,0-9:/?&=_.@-]*)","<a href=\"\\1\">\\1</a>",$b);
   return $b;
 }

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

Modified Files:
      Tag: BRANCH-2-0
	app_new_r.tpl product_new.tpl task_new.tpl 
Log Message:
* Now you can input two roles on project creation


Index: app_new_r.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/app_new_r.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- app_new_r.tpl	6 Jul 2005 16:09:01 -0000	1.1.2.1
+++ app_new_r.tpl	18 Jul 2005 14:55:43 -0000	1.1.2.2
@@ -9,7 +9,7 @@
 <input type="hidden" name="creator" value="{$creator.id}">
 {if $id > 0}<input type="hidden" name="id" value="{$id}">{/if}
 
-<table class="summary" border="0" style="margin-left: 0px;">
+<table class="summary" style="margin-left: 0px;">
 <thead>
 <tr>
  <th colspan="4">{$title}</th>
@@ -103,11 +103,11 @@
 </tr>
 
 <tr>
- <td rowspan="2" valign="top" class="desc">{$location.label}</td>
- <td rowspan="2" valign="top">
-  {html_options name=$location.name
-             options=$location.options
-            selected=$location.selected}
+ <td colspan="2" class="desc" style="text-align: right;">
+  {$r_ignore.label}
+  <input type="checkbox" 
+         name="{$r_ignore.name}" value="{$r_ignore.value}"
+         {if $r_ignore.checked}checked="checked"{/if}>
  </td>
 
  <td class="desc" style="text-align: right;" valign="top">
@@ -121,9 +121,16 @@
 </tr>
 
 <tr>
-  <td colspan="2" style="text-align: right; font-style: italic;">
-    {$t_ignore.info}
-  </td>  
+ <td valign="top" class="desc">{$location.label}</td>
+ <td valign="top">
+  {html_options name=$location.name
+             options=$location.options
+            selected=$location.selected}
+ </td>
+
+ <td colspan="2" style="text-align: right; font-style: italic;">
+  {$t_ignore.info}
+ </td>  
 </tr>
 
 <tr>

Index: product_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_new.tpl,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- product_new.tpl	7 Apr 2005 16:43:25 -0000	1.1.2.12
+++ product_new.tpl	18 Jul 2005 14:55:43 -0000	1.1.2.13
@@ -6,50 +6,42 @@
 {if $tplid != ""}<input type="hidden" name="tplid" value="{$tplid}">{/if}
 {if $id != ""}<input type="hidden" name="id" value="{$id}">{/if}
 
-<table class="single" border="0" cellpadding="2" cellspacing="0">
-{if $id > 0 and $tplid == ""}
+<table class="summary">
+<thead>
  <tr>
-  <td colspan="5">{$ProdCreation}</td>
+  <th colspan="5">{$title}</th>
  </tr>
-{/if}
+</thead>
 
+<tbody>
+{if $id > 0 and $tplid == ""}
  <tr>
-  <th colspan="5">{$title}</th>
+  <td align="center" colspan="5">{$ProdCreation}</th>
  </tr>
+{/if}
+
 <tr>
 <td class="desc" >
   <label for="{$name.name}">{$name.label}</label>
   <font color="red">(*)</font>
 </td>
-<td colspan="4">
+<td>
   <input id="{$name.name}" size="{$name.size}" maxlength="{$name.maxl}" name="{$name.name}" value="{$name.value}">
 </td>
-</tr>
-<tr>
-<td class="desc" >
+
+<td class="desc" align="right">
   <label for="{$version.name}">{$version.label}</label>
 </td>
-
-<td>
+<td colspan="2">
   <input id="{$version.name}" size="{$version.size}"
          maxlength="{$version.maxl}" name="{$version.name}"
          value="{$version.value}">
 </td>
-<td colspan="2">
-<span class="desc">{$state.label} </span>
-{html_options name=$state.name options=$state.options selected=$state.selected}
-</td>
-
-<td class="desc">
-{$prob.label}
-<input id="{$prob.name}" size="3" maxlength="3" name="{$prob.name}" value="{$prob.value}">&nbsp;%
-</td>
 </tr>
 
 <tr>
 <td class="desc">{$parent.label}</td>
-
-<td colspan="3">
+<td>
 {if is_array($parent.options)}
  {html_options name=$parent.name options=$parent.options}
 {else}
@@ -58,12 +50,80 @@
          value="{$parent.value}">
 {/if}
 </td>
-<td>&nbsp;</td>
+
+<td class="desc" align="right">{$state.label}</td>
+<td colspan="2">
+{html_options name=$state.name options=$state.options selected=$state.selected}
+</td>
 </tr>
 
 <tr>
-<td class="desc" >{$role.label}</td>
- <th>{$ProdFunc}</th><th>{$AdrName}</th><th>{$ProdRoleDesc}</th>
+<td class="desc" >
+  <label for="{$p_start_d.name}">{$p_start_d.label}</label>
+</td>
+<td style="white-space: nowrap;">
+{html_options name=$p_start_d.name
+      values=$p_start_d.options output=$p_start_d.options
+      selected=$p_start_d.selected}
+
+<b>.</b>&nbsp;
+{html_options name=$p_start_m.name
+      values=$p_start_m.options output=$p_start_m.options
+      selected=$p_start_m.selected}
+
+<b>.</b>&nbsp;
+{html_options name=$p_start_y.name
+      values=$p_start_y.options output=$p_start_y.options
+      selected=$p_start_y.selected}
+
+<a href="JavaScript:
+var d = document.forms[0];
+mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100');
+mywindow.location.href = '{$base}/php/minical.php?f={$p_start_d.f}&amp;n=0&amp;d={$p_start_d.selected}&amp;m={$p_start_m.selected}&amp;y={$p_start_y.selected}&amp;SID';
+mywindow.focus();" title="MiniCal">MiniCal</a>
+
+ </td>
+
+<td class="desc" align="right">{$prob.label}</td>
+<td colspan="2">
+<input id="{$prob.name}" size="3" maxlength="3"
+     name="{$prob.name}" value="{$prob.value}">&nbsp;%
+</td>
+</tr>
+
+<tr>
+<td class="desc" >
+  <label for="{$p_end_d.name}">{$p_end_d.label}</label>
+</td>
+<td colspan="4" style="white-space: nowrap;">
+{html_options name=$p_end_d.name
+      values=$p_end_d.options output=$p_end_d.options
+      selected=$p_end_d.selected}
+
+<b>.</b>&nbsp;
+{html_options name=$p_end_m.name
+      values=$p_end_m.options output=$p_end_m.options
+      selected=$p_end_m.selected}
+
+<b>.</b>&nbsp;
+{html_options name=$p_end_y.name
+      values=$p_end_y.options output=$p_end_y.options
+      selected=$p_end_y.selected}
+
+<a href="JavaScript:
+var d = document.forms[0];
+mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100');
+mywindow.location.href = '{$base}/php/minical.php?f={$p_end_d.f}&amp;n=0&amp;d={$p_end_d.selected}&amp;m={$p_end_m.selected}&amp;y={$p_end_y.selected}&amp;SID';
+mywindow.focus();" title="MiniCal">MiniCal</a>
+
+ </td>
+</tr>
+
+<tr class="em">
+ <td class="desc" >{$role.label}</td>
+ <th>{$ProdFunc}</th>
+ <th>{$AdrName}</th>
+ <th>{$ProdRoleDesc}</th>
  <th>&nbsp;</th>
 </tr>
 
@@ -82,7 +142,7 @@
 
 <tr>
 <td class="desc" >{$ProdRolesNew}</td>
-<td>
+<td align="right">
  {html_options name=$role1.name
                options=$role1.options selected=$role1.selected}
 </td>
@@ -102,6 +162,27 @@
 </tr>
 
 <tr>
+<td class="desc" >{$ProdRolesNew}</td>
+<td align="right">
+ {html_options name=$role1a.name
+               options=$role1a.options selected=$role1a.selected}
+</td>
+
+<td>
+{if $r1afn.select}
+  {html_options name=$r1al.name options=$r1al.options}
+{else}
+  <input id="{$r1afn.id}" size="20" maxlength="40" name="{$r1afn.name}"
+         value="{$r1afn.value}">
+{/if}
+</td>
+<td colspan="2">
+  <input id="{$r1adesc.name}" name="{$r1adesc.name}" value="{$r1adesc.value}"
+         size="{r1adesc.size}" maxlength="{$r1adesc.maxl}">
+</td>
+</tr>
+
+<tr class="em">
 <td class="desc" >{$ProdProd}</td>
  <th>{$ProdFunc}</th><th>{$AdrName}</th><th>{$ProdRoleDesc}</th>
  <th>&nbsp;</th>
@@ -143,10 +224,9 @@
   <input id="{$r2desc.name}" name="{$r2desc.name}" value="{$r2desc.value}"
          size="{$r2desc.size}" maxlength="{$r2desc.maxl}">
 </td>
-<td>&nbsp;</td>
 </tr>
 
-<tr>
+<tr class="spaced">
 <td class="desc" >
   <label for="{$desc0.name}">{$desc0.label}</label>
 </td>
@@ -191,6 +271,7 @@
 </tr>
 {/section}
 
+{*
 <tr>
 <td class="desc" >
   <label for="{$price.name}">{$price.label}</label>
@@ -205,68 +286,12 @@
 
 {html_options name=$currency.name
               options=$currency.options selected=$currency.selected}
-{*
+
 <select id="{$currency.name}" name="{$currency.name}">
   {foreach from=$currency.options key=value item=option}
     <option value="{$value}">{$option}</option>
   {/foreach}
 </select>
-*}
- </td>
-</tr>
-
-<tr>
-<td class="desc" >
-  <label for="{$p_start_d.name}">{$p_start_d.label}</label>
-</td>
-<td colspan="4">
-{html_options name=$p_start_d.name
-      values=$p_start_d.options output=$p_start_d.options
-      selected=$p_start_d.selected}
-
-<b>.</b>&nbsp;
-{html_options name=$p_start_m.name
-      values=$p_start_m.options output=$p_start_m.options
-      selected=$p_start_m.selected}
-
-<b>.</b>&nbsp;
-{html_options name=$p_start_y.name
-      values=$p_start_y.options output=$p_start_y.options
-      selected=$p_start_y.selected}
-
-<a href="JavaScript:
-var d = document.forms[0];
-mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100');
-mywindow.location.href = '{$base}/php/minical.php?f={$p_start_d.f}&amp;n=0&amp;d={$p_start_d.selected}&amp;m={$p_start_m.selected}&amp;y={$p_start_y.selected}&amp;SID';
-mywindow.focus();" title="MiniCal">MiniCal</a>
-
- </td>
-</tr>
-
-<tr>
-<td class="desc" >
-  <label for="{$p_end_d.name}">{$p_end_d.label}</label>
-</td>
-<td colspan="4">
-{html_options name=$p_end_d.name
-      values=$p_end_d.options output=$p_end_d.options
-      selected=$p_end_d.selected}
-
-<b>.</b>&nbsp;
-{html_options name=$p_end_m.name
-      values=$p_end_m.options output=$p_end_m.options
-      selected=$p_end_m.selected}
-
-<b>.</b>&nbsp;
-{html_options name=$p_end_y.name
-      values=$p_end_y.options output=$p_end_y.options
-      selected=$p_end_y.selected}
-
-<a href="JavaScript:
-var d = document.forms[0];
-mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100');
-mywindow.location.href = '{$base}/php/minical.php?f={$p_end_d.f}&amp;n=0&amp;d={$p_end_d.selected}&amp;m={$p_end_m.selected}&amp;y={$p_end_y.selected}&amp;SID';
-mywindow.focus();" title="MiniCal">MiniCal</a>
 
  </td>
 </tr>
@@ -276,29 +301,37 @@
   <label for="{$path.name}">{$path.label}</label>
 </td>
 <td colspan="4">
-  <input {* type="file" *}
-         id="{$path.name}" size="{$path.size}" maxlength="{$path.maxl}"
+  <input   id="{$path.name}" size="{$path.size}" maxlength="{$path.maxl}"
          name="{$path.name}" value="{$path.value}">
 </td>
 </tr>
+*}
+</tbody>
+</table>
 
+<table class="summary" style="margin: 0 auto;">
+<thead>
+ <tr><th colspan="4">{$FldsRequired}</th></tr>
+</thead>
+
+<tbody>
 <tr>
- <td class="desc" colspan="1">
+ <td class="desc">
    <label for="OK">{$InputOk}</label>
  </td>
- <td colspan="1">
+ <td>
    <input id="OK" name="OK" type="submit" value="{$Enter}" title="{$Enter}">
  </td>
 
- <td class="desc" colspan="1" align="right">
+ <td class="desc" align="right">
    <label for="RESET">{$Reset}</label>
  </td>
- <td colspan="1">
+ <td>
    <input id="RESET" name="RESET" type="reset"
           value="{$Reset}" title="{$Reset}">
  </td>
- <td colspan="1">&nbsp;</td>
 </tr>
+</tbody>
 </table>
 </form>
 
@@ -306,5 +339,3 @@
    document.{$focus}.focus();
 </script>
 
-{$FldsRequired}
-

Index: task_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_new.tpl,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- task_new.tpl	13 Apr 2005 15:36:09 -0000	1.1.2.18
+++ task_new.tpl	18 Jul 2005 14:55:43 -0000	1.1.2.19
@@ -269,7 +269,7 @@
 </tbody>
 </table>
 
-<table class="summary">
+<table class="summary" style="margin: 0 auto;">
 <thead>
  <tr><th colspan="4">{$FldsRequired}</th></tr>
 </thead>

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

Modified Files:
      Tag: BRANCH-2-0
	app_new_r.php app_show.php product_ins.php product_new.php 
Log Message:
* Now you can input two roles on project creation


Index: app_new_r.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new_r.php,v
retrieving revision 1.48.2.3
retrieving revision 1.48.2.4
diff -u -r1.48.2.3 -r1.48.2.4
--- app_new_r.php	8 Jul 2005 13:56:44 -0000	1.48.2.3
+++ app_new_r.php	18 Jul 2005 14:55:43 -0000	1.48.2.4
@@ -57,7 +57,8 @@
 			   $this->obj->creation->getDateTime()));
      }
      else {
-       $this->assign('title', $lang['CreateAppoint']);
+       // $this->assign('title', $lang['CreateAppoint']);
+       $this->assign('title', $lang['NewAppointR']);
      }
 
      $this->assign('creator',
@@ -67,11 +68,11 @@
 			 'title' => $this->obj->creator->getFullName(),
 			 'link'  => $this->obj->creator->getUrl()));
 
-     /*
-
-     echo "<br>". $lang['AppNoLastDate'];
-     echo "<input type=\"checkbox\" name=\"r_ignore\" value=\"1\"". ($this->obj->r_ignore == 1 ? " CHECKED":"") .">";
-     */
+     $this->assign('r_ignore',
+		   array('label'   => $lang['AppNoLastDate'],
+			 'name'    => 'r_ignore',
+			 'value'   => "1",
+			 'checked' => $this->obj->r_ignore));
 
      // Enter start and end dates
      $today = new DateTime();
@@ -157,84 +158,6 @@
 			 'label'   => $lang['Participants'],
 			 'options' => $parts));
 
-
-     /*
-     if ( $this->obj->allowed == 0 ) {
-        echo "<b>". $lang['ReadOnlyAppoint'] ."</b><br>\n";
-     }
-     echo "<form name=\"appnew\" action=\"app_ins.php\" method=\"post\">\n";
-     $this->addHidden("gotourl","app_new_r.php");
-     if ( $this->obj->id > 0 ) {
-       $this->addHidden("id",$this->obj->id);
-     }
-
-     echo $this->DataTableStart();
-
-     echo "<tr>\n";
-     echo "<th colspan=\"6\">";
-     if ( $this->obj->id > 0 ) {
-       echo $lang['ModOldAppoint'] ."(repeat)";
-       echo "</th>\n";
-       echo "</tr><tr>\n";
-       echo "<td colspan=\"5\"><b>". $lang['AppCreatedBy'] ."</b>&nbsp;". $this->obj->creator->getLink();
-       echo "&nbsp;<b>". $lang['atDateTime'] ."</b>&nbsp;". $this->obj->creation->getDateTime()."</td>";
-       echo "<td align=\"right\">" .acl_link($this->obj) ."</td>\n";
-       echo "</tr>\n";
-     } else {
-       echo $lang['CreateAppoint'] ." (repeat)";
-       echo "</th>\n";
-     }
-     $this->addHidden("creator",$this->obj->creator->id);
-
-     // START
-     echo "<tr>";
-     echo $this->showfield($lang['AppFirstDate'],0,"start_d");
-     echo " <td colspan=\"2\">";
-     $this->obj->start->EnterDate("start");
-     echo "</td>";
-     echo "<td valign=\"top\">&nbsp;<b>";
-     if ( !isset($_SERVER['HTTP_USER_AGENT']) || ereg("Lynx",$_SERVER['HTTP_USER_AGENT']) || ereg("w3m",$_SERVER['HTTP_USER_AGENT']) ) {
-       echo $lang['StartTime'];
-     } else {
-       echo "<a href=\"JavaScript: var d = document.forms[0];
-mywindow = window.open('', 'timer', 'width=120,height=420,top=100,left=450');
-mywindow.location.href = '". $tutos['base'] ."/php/minitimer.php?f=start&amp;". SID ."'; mywindow.focus();\"
-"self.status='minitimer' ;return true\">";
-       echo $lang['StartTime'];
-       echo "</a>";
-     }
-     echo "</b>&nbsp;<br>&nbsp;<font size=\"-1\">(HH:MM)</font></td>\n";
-     echo " <td colspan=\"2\">";
-     $this->obj->start->EnterTime("start");
-     echo " </td>\n";
-
-     // END
-     echo "</tr><tr>\n";
-     echo $this->showfield($lang['AppLastDate'],0,"end_d");
-     echo "<td colspan=\"2\">";
-     $this->obj->end->EnterDate("end");
-     echo "<br>". $lang['AppNoLastDate'];
-     echo "<input type=\"checkbox\" name=\"r_ignore\" value=\"1\"". ($this->obj->r_ignore == 1 ? " CHECKED":"") .">";
-     echo "</td>\n";
-     echo "<td valign=\"top\">&nbsp;<b>";
-     if ( !isset($_SERVER['HTTP_USER_AGENT']) || ereg("Lynx",$_SERVER['HTTP_USER_AGENT']) || ereg("w3m",$_SERVER['HTTP_USER_AGENT']) ) {
-       echo $lang['EndTime'];
-     } else {
-       echo "<a href=\"JavaScript: var d = document.forms[0];
-mywindow = window.open('', 'timer', 'width=120,height=420,top=100,left=450');
-mywindow.location.href = '". $tutos['base'] ."/php/minitimer.php?f=end&amp;". SID ."'; mywindow.focus();\"
-"self.status='minitimer' ;return true\">";
-       echo $lang['EndTime'];
-       echo "</a>";
-     }
-     echo "</b>&nbsp;<br>&nbsp;<font size=\"-1\">(HH:MM)</font></td>\n";
-     echo "<td colspan=\"2\">";
-     $this->obj->end->EnterTime("end");
-     echo "</td>\n";
-
-     echo "</tr><tr>\n";
-     */
-
      // REPEAT TYPE
      $r_types = array(APP_REP_DAY   => $lang['AppRepeatDay'],
 		      APP_REP_WEEK  => $lang['AppRepeatWeek'],

Index: app_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_show.php,v
retrieving revision 1.42.2.4
retrieving revision 1.42.2.5
diff -u -r1.42.2.4 -r1.42.2.5
--- app_show.php	9 Jun 2005 17:38:39 -0000	1.42.2.4
+++ app_show.php	18 Jul 2005 14:55:43 -0000	1.42.2.5
@@ -115,6 +115,14 @@
 			 'info'  => $infos,
 			 'value' => $end));
 
+
+     $this->assign('repeat',
+		   array('label' => ($this->obj->repeat == 0 ?
+				     $lang['EndDate'] : $lang['AppLastDate']),
+			 'infos' => GetDaysInfo($this->obj->end->getTimeStamp(),
+						
+			 
+
      /*
      echo "<tr>\n";
      if ( $this->obj->repeat == 0 ) {

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.53.2.2
retrieving revision 1.53.2.3
diff -u -r1.53.2.2 -r1.53.2.3
--- product_ins.php	31 Jan 2005 17:37:30 -0000	1.53.2.2
+++ product_ins.php	18 Jul 2005 14:55:43 -0000	1.53.2.3
@@ -69,6 +69,21 @@
  $gotourl= addUrlParameter($gotourl,"role1=". $_POST['role1'],true);
  $gotourl= addUrlParameter($gotourl,"r1desc=". UrlEncode($_POST['r1desc']),true);
 
+ # Add Second given People Role
+ if ( isset($_POST['r1afn']) ) {
+   $m = check_field(StripSlashes($_POST['r1afn']),"r1afn","r1al",$tutos[rolecheck][$_POST['role1a']]);
+   error_log("product_ins: ".$_POST['role1a']." ".$tutos[rolecheck][$_POST['role1a']]." ".$m);
+   if ( $m->id > 0 ) {
+     $p->setRole($m,$_POST['role1a'],StripSlashes($_POST['r1adesc']));
+   }
+ }
+ if ( isset($_POST['r1aid']) ) {
+   $m = getObject($dbconn,$_POST['r1aid']);
+   $p->setRole($m,$_POST['role1a'],StripSlashes($_POST['r1adesc']));
+ }
+ $gotourl= addUrlParameter($gotourl,"role1a=". $_POST['role1a'],true);
+ $gotourl= addUrlParameter($gotourl,"r1adesc=". UrlEncode($_POST['r1adesc']),true);
+
  # Manage parent project
  if ( isset($_POST['parent']) ) {
    $m = check_field(StripSlashes($_POST['parent']),

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.76.2.14
retrieving revision 1.76.2.15
diff -u -r1.76.2.14 -r1.76.2.15
--- product_new.php	20 May 2005 15:17:44 -0000	1.76.2.14
+++ product_new.php	18 Jul 2005 14:55:43 -0000	1.76.2.15
@@ -221,6 +221,52 @@
 			 'value'   => $r1fn,
 			 'select'  => isset($this->obj->xl['r1'])));
 
+     /**
+      * Second new role
+      */
+     $this->assign("r1adesc",
+		   array('name'  => 'r1adesc',
+			 'value' => myentities($this->r1adesc),
+			 'size'  => min(30, $r1adesc_size),
+			 'maxl'  => $r1adesc_size));
+
+
+     if( count($roles) == 0 && $this->obj->rsel1a == $tutos[default_role] )
+       $default_role = $tutos[default_first_role];
+     else
+       $default_role = $this->obj->rsel1a;
+
+     $this->assign("role1a",
+		   array('name'     => 'role1a',
+			 'label'    => $lang['ProdRolesNew'],
+			 'options'  => $proles,
+			 'selected' => $default_role));
+
+     if( isset($this->obj->xl['r1a']) ) {
+       $r1afns = array();
+       foreach( $this->obj->xl['r1a'] as $i => $f )
+	 $r1afns[$i] = myentities($f->getFullName());
+
+       $this->assign("r1al",
+		     array('id'      => "r1a",
+			   'name'    => "r1aid",
+			   'options' => $r1afns));
+     }
+
+     $r1afn = "";
+     if( $this->obj->xfn['r1a'] != "" )
+       $r1fn = $this->obj->xfn['r1a'];
+     else
+       if( isset($this->obj->r1a) )
+	 $r1fn = myentities($this->obj->r1a->getFullName());
+
+     $this->assign("r1afn",
+		   array('id'      => "r1a",
+			 'name'    => "r1afn",
+			 'value'   => $r1afn,
+			 'select'  => isset($this->obj->xl['r1a'])));
+
+
      
      /**
       * Relations to other Products
@@ -431,8 +477,9 @@
 
      $this->name = $lang['Product'];
      $this->obj = new product($this->dbconn);
-     $this->r1desc = "";
-     $this->r2desc = "";
+     $this->r1desc  = "";
+     $this->r1adesc = "";
+     $this->r2desc  = "";
 
      $this->template = false;
      
@@ -521,6 +568,18 @@
        }
      }
 
+     // Second new person role
+     if ( isset($_GET['r1fn']) ) {
+       $this->obj->xfn['r1a'] = StripSlashes($_GET['r1afn']);
+       unset($this->obj->r1a);
+     }
+     if ( isset($_GET['r1al']) ) {
+       foreach($_GET['r1al'] as $x => $f) {
+         $a = getObject($this->dbconn,$f);
+         $this->obj->xl['r1a'][$f] = $a;
+       }
+     }
+
      if( isset($_GET['parents']) ) {
        foreach($_GET['parents'] as $x => $f) {
          $a = getObject($this->dbconn,$f);
@@ -533,6 +592,13 @@
      } else {
        $this->obj->rsel1 = $tutos[default_role];
      }
+
+     if ( isset($_GET['role1a']) ) {
+       $this->obj->rsel1a = $_GET['role1a'];
+     } else {
+       $this->obj->rsel1a = $tutos[default_role];
+     }
+
      # Product Relations
      if ( isset($_GET['r2id']) ) {
        $this->obj->role[1]->id = $_GET['r2id'];

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

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
* Now you can input two roles on project creation


Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.36
retrieving revision 1.1.2.37
diff -u -r1.1.2.36 -r1.1.2.37
--- style.css	27 May 2005 15:34:29 -0000	1.1.2.36
+++ style.css	18 Jul 2005 14:55:43 -0000	1.1.2.37
@@ -745,6 +745,15 @@
   padding: 5px;
 }
 
+table.summary tr.spaced td, table.summary tr.spaced th  {
+  padding-top: 1.5em;
+}
+
+table.summary tr.em td, table.summary tr.em th  {
+  border-bottom: 1px dashed black;
+  padding-top: 1.5em;
+}
+
 table.summary thead th {
   font-weight:   bold;
   border-bottom: 1px black dashed;
@@ -846,6 +855,7 @@
   list-style-type: none;
 }
 
+
 /** Summary and legend placement */
 table.summary#summary {
 }

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

Modified Files:
      Tag: BRANCH-2-0
	watchlist.pinc 
Log Message:
* DEBUG: watchlist module had disapeared from menus


Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.40.2.7
retrieving revision 1.40.2.8
diff -u -r1.40.2.7 -r1.40.2.8
--- watchlist.pinc	13 May 2005 16:08:41 -0000	1.40.2.7
+++ watchlist.pinc	11 Jul 2005 15:52:26 -0000	1.40.2.8
@@ -223,7 +223,7 @@
 		 'image' => 'watchlist',
                  'text'  => ($text == "" ? $lang['WatchDel'] : $text),
                  'info'  => sprintf($lang['WatchDelI'],$obj->getFullName()),
-                 'category' => array("watchlist","del","module")
+                 'category' => array("watchlist","del","module","obj")
                 );
       return $x;
     }
@@ -237,7 +237,7 @@
                  'text'  => ($text == "" ? $lang['WatchAdd'] : $text),
                  'info'  => sprintf($lang['WatchAddI'],
 				    $obj->getFullName()),
-                 'category' => array("watchlist","ins","module")
+                 'category' => array("watchlist","ins","module","obj")
                 );
       return $x;
     }
@@ -258,7 +258,7 @@
     $x[] = array('url'  => "watchlist/watchlist_overview.php?id=". $obj->id,
 		 'text' => $lang['Watcher'],
 		 'info' => $lang['Watcher'],
-		 'category' => array("watchlist","show","module")
+		 'category' => array("watchlist","show","module","obj")
 		 );
 
     if ( $user->feature_ok(usemail,PERM_NEW) && ($tutos[mailmode] != 0) ) {
@@ -266,7 +266,7 @@
 		   $obj->id ."&subject=". $obj->getFullName(),
 		   'text' => $lang['WatchMail'],
 		   'info' => $lang['WatchMail'],
-		   'category' => array("watchlist","show","module")
+		   'category' => array("watchlist","show","module","obj")
 		   );
     }
     return $x;

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

Modified Files:
	address.pinc company.pinc department.pinc address_show.php 
	department_show.php 
Log Message:
jump to a location edit when there is a location

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- address.pinc	10 Jun 2005 11:18:09 -0000	1.116
+++ address.pinc	8 Jul 2005 17:42:35 -0000	1.117
@@ -351,7 +351,14 @@
    * Return a URL to modify this address
    */
   function getModURL() {
-    return "address_new.php?id=". $this->id;
+    if ( count($this->location) > 0 ) {
+      @reset($this->location);
+      list ($j,$l) = @each ($this->location);
+      $url = "address_new.php?id=". $this->id ."&loc_id=". $l->id;
+    } else {
+      $url = "address_new.php?id=". $this->id;
+    }
+    return $url;
   }
   /**
    * Return a URL to delete this address

Index: company.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company.pinc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- company.pinc	3 Apr 2005 18:31:52 -0000	1.64
+++ company.pinc	8 Jul 2005 17:42:36 -0000	1.65
@@ -231,7 +231,14 @@
    * Return a url to modify this company
    */
   function getModURL() {
-    return "company_new.php?id=". $this->id;
+    if ( count($this->location) > 0 ) {
+      @reset($this->location);
+      list ($j,$l) = @each ($this->location);
+      $url = "company_new.php?id=". $this->id ."&loc_id=". $l->id;
+    } else {
+      $url = "company_new.php?id=". $this->id;
+    }
+    return $url;
   }
   /**
    * Return a url to delete this company

Index: department.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department.pinc,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- department.pinc	6 Jun 2005 10:17:32 -0000	1.63
+++ department.pinc	8 Jul 2005 17:42:36 -0000	1.64
@@ -226,10 +226,17 @@
     return "department_show.php?id=". $this->id;
   }
   /**
-   * Return a url to modify this department
+   * Return a url to modify this company
    */
   function getModURL() {
-    return "department_new.php?id=". $this->id;
+    if ( count($this->location) > 0 ) {
+      @reset($this->location);
+      list ($j,$l) = @each ($this->location);
+      $url = "department_new.php?id=". $this->id ."&loc_id=". $l->id;
+    } else {
+      $url = "department_new.php?id=". $this->id;
+    }
+    return $url;
   }
   /**
    * Return a url to delete this department

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- address_show.php	10 Jun 2005 11:18:09 -0000	1.99
+++ address_show.php	8 Jul 2005 17:42:36 -0000	1.100
@@ -225,14 +225,7 @@
      }
      if ( $this->obj != -1 ) {
        if ( $this->obj->mod_ok() ) {
-         if ( count($this->obj->location) > 0 ) {
-           @reset($this->obj->location);
-           list ($j,$l) = @each ($this->obj->location);
-           $url = "address_new.php?id=". $this->obj->id ."&loc_id=". $l->id;
-         } else {
-           $url = "address_new.php?id=". $this->obj->id;
-         }
-         $x = array( url => $url,
+         $x = array( url => $this->obj->getModURL(),
                      text => $lang['Modify'],
                      info => $lang['Modify'],
                      category => array("address","new","obj")

Index: department_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_show.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- department_show.php	22 May 2005 14:23:41 -0000	1.59
+++ department_show.php	8 Jul 2005 17:42:36 -0000	1.60
@@ -207,7 +207,7 @@
        $this->addMenu($x);
      }
      if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) {
-       $x = array( url => "department_new.php?id=".$this->obj->id,
+       $x = array( url => $this->obj->getModURL(),
                    text => $lang['Modify'],
                    info => sprintf($lang['DepChgInfo'],$this->obj->getFullName()),
                    category => array("company","mod","obj")

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

Modified Files:
      Tag: BRANCH-2-0
	address_show.tpl mytutos.tpl 
Log Message:
* Some interface improvements (direct access to product task overview)


Index: address_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/address_show.tpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- address_show.tpl	20 May 2005 15:17:46 -0000	1.1.2.7
+++ address_show.tpl	8 Jul 2005 16:10:46 -0000	1.1.2.8
@@ -90,6 +90,12 @@
 <tr>
   <td class="data" style="white-space: nowrap;">
   {strip}
+    <a href="{$base}/php/task_overview.php?id={$p.id}"
+      title="{$p.overview}">
+    <img src="{$base}/html/classic/task_overview.png">
+    </a>
+  {/strip}
+  {strip}
     {""|indent:$p.depth:"&mdash;"}&nbsp;
     <a href="{$p.link}">{$p.name}</a>
   {/strip}

Index: mytutos.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/mytutos.tpl,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- mytutos.tpl	27 May 2005 13:48:51 -0000	1.1.2.19
+++ mytutos.tpl	8 Jul 2005 16:10:46 -0000	1.1.2.20
@@ -41,6 +41,12 @@
      <tr>
        <td style="white-space: nowrap;">
        {strip}
+         <a href="{$base}/php/task_overview.php?id={$p.id}"
+            title="{$p.overview}">
+	   <img src="{$base}/html/classic/task_overview.png">
+	 </a>
+       {/strip}
+       {strip}
          {""|indent:$p.depth:"&mdash;"}&nbsp;
          <a href="product_show.php?id={$p.id}">{$p.name}</a>
        {/strip}

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

Modified Files:
      Tag: BRANCH-2-0
	product.pinc 
Log Message:
* Some interface improvements (direct access to product task overview)


Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.133.2.12
retrieving revision 1.133.2.13
diff -u -r1.133.2.12 -r1.133.2.13
--- product.pinc	3 Mar 2005 15:32:28 -0000	1.133.2.12
+++ product.pinc	8 Jul 2005 16:10:45 -0000	1.133.2.13
@@ -982,17 +982,19 @@
     $id    = $proj->id;
     $state = $lang['ProdStates'][$proj->state];
 
-    $list[$id] = array('id'      => $id,
-		       'p_id'    => $proj->parent->id,
-		       'name'    => $proj->getFullName(),
-		       'title'   => $proj->getFullName(),
-		       'link'    => $proj->getUrl(),
+    $list[$id] = array('id'       => $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(),
-		       'state'   => $state,
-		       'depth'   => 0);
+		       'desc'     => $proj->description,
+		       'func'     => $lang['ProdRole'][$role],
+		       'created'  => $proj->creation->getDateTime(),
+		       'state'    => $state,
+		       'depth'    => 0,
+		       'overview' => sprintf($lang['TaskOverviewInfo'],
+					     $proj->getFullName()));
     return $list;
   }
 

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

Modified Files:
      Tag: BRANCH-2-0
	task_overview.php 
Log Message:
DEBUG: wishlist bug : add a create task entry menu in task overview


Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.62.2.24
retrieving revision 1.62.2.25
diff -u -r1.62.2.24 -r1.62.2.25
--- task_overview.php	1 Jul 2005 15:21:17 -0000	1.62.2.24
+++ task_overview.php	8 Jul 2005 15:22:19 -0000	1.62.2.25
@@ -438,6 +438,13 @@
        array('label' => $lang['Task'],
 	     'icon'  => 'task');
 
+     // menu
+     $x = task::getaddlink($this->user,
+			   $this->parent, $lang['NewEntry']);
+     $x['image'] = 'new';
+     $x['category'] = array("obj", 'task');
+     $this->addMenu($x);
+
      if( $tutos[usejpgraph] ) {
        $x = array('url'   =>
 		  "task_gantt.php?". $this->get_task_filter('url'),

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

Modified Files:
	config_default.pinc 
Log Message:
added more window timezones

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- config_default.pinc	1 Jul 2005 07:45:26 -0000	1.103
+++ config_default.pinc	8 Jul 2005 09:25:49 -0000	1.104
@@ -557,33 +557,59 @@
 # (On linux you may find timezone names in /usr/share/zoneinfo/)
 # Windows Users please look some lines below
 #
-$tutos[timezones][] = "Europe/London";
-$tutos[timezones][] = "Europe/Berlin";
-$tutos[timezones][] = "Europe/Warsaw";
-$tutos[timezones][] = "Europe/Prague";
-$tutos[timezones][] = "Europe/Rome";
-$tutos[timezones][] = "Europe/Paris";
-$tutos[timezones][] = "Europe/Moscow";
-$tutos[timezones][] = "Europe/Helsinki";
-$tutos[timezones][] = "GMT";
-$tutos[timezones][] = "US/Pacific";
-$tutos[timezones][] = "US/Central";
-$tutos[timezones][] = "US/Eastern";
-$tutos[timezones][] = "US/Mountain";
-$tutos[timezones][] = "US/Hawaii";
-$tutos[timezones][] = "Asia/Singapore";
-$tutos[timezones][] = "Asia/Hong_Kong";
-$tutos[timezones][] = "Asia/Tehran";
-$tutos[timezones][] = "Asia/Tokyo";
-$tutos[timezones][] = "Australia/Sydney";
-$tutos[timezones][] = "Australia/Perth";
-#
-# Running the server on Windows you should use this !
-#
-# $tutos[timezones][] = "EST5EDT";
-# $tutos[timezones][] = "CST6CDT";
-# $tutos[timezones][] = "MST7MDT";
-# $tutos[timezones][] = "PST8PDT";
+if (strtoupper(substr(PHP_OS, 0, 3) != 'WIN')) {
+  $tutos[timezones][] = "Europe/London";
+  $tutos[timezones][] = "Europe/Berlin";
+  $tutos[timezones][] = "Europe/Warsaw";
+  $tutos[timezones][] = "Europe/Prague";
+  $tutos[timezones][] = "Europe/Rome";
+  $tutos[timezones][] = "Europe/Paris";
+  $tutos[timezones][] = "Europe/Moscow";
+  $tutos[timezones][] = "Europe/Helsinki";
+  $tutos[timezones][] = "GMT";
+  $tutos[timezones][] = "US/Pacific";
+  $tutos[timezones][] = "US/Central";
+  $tutos[timezones][] = "US/Eastern";
+  $tutos[timezones][] = "US/Mountain";
+  $tutos[timezones][] = "US/Hawaii";
+  $tutos[timezones][] = "Asia/Singapore";
+  $tutos[timezones][] = "Asia/Hong_Kong";
+  $tutos[timezones][] = "Asia/Tehran";
+  $tutos[timezones][] = "Asia/Tokyo";
+  $tutos[timezones][] = "Australia/Sydney";
+  $tutos[timezones][] = "Australia/Perth";
+} else {
+  #
+  # Running the server on Windows you should use this !
+  #
+  $tutos[timezones][] = "HST10";      //Hawaiian Standard Time/ Hawaiian Daylight Time
+  $tutos[timezones][] = "AST10ADT";   //Aleutian Standard Time/ Aleutian Daylight Time
+  $tutos[timezones][] = "YST9YDT";    //Yukon Standard Time/ Yukon Daylight Time
+  $tutos[timezones][] = "PST8PDT";    //Pacific Standard Time/ Pacific Daylight Time
+  $tutos[timezones][] = "PST8PDT";    //Pacific Standard Time/ Pacific Daylight Time
+  $tutos[timezones][] = "MST7MDT";    //Mountain Standard Time/ Mountain Daylight Time
+  $tutos[timezones][] = "MST7MDT";    //Mountain Standard Time/ Mountain Daylight Time
+  $tutos[timezones][] = "MST7";       //Mountain Standard Time
+  $tutos[timezones][] = "CST6CDT";    //Central Standard Time/ Central Daylight Time
+  $tutos[timezones][] = "CST6CDT";    //Central Standard Time/ Central Daylight Time
+  $tutos[timezones][] = "EST5EDT";    //Eastern Standard Time/ Eastern Daylight Time
+  $tutos[timezones][] = "EST6CDT";    //Eastern Standard Time/ Central Daylight Time
+  $tutos[timezones][] = "EST5EDT";    //Eastern Standard Time/ Eastern Daylight Time
+  $tutos[timezones][] = "AST4ADT";    //Atlantic Standard Time/ Atlantic Daylight Time
+  $tutos[timezones][] = "NST3:30NDT"; //Newfoundland Standard Time/Newfoundland Daylight Time
+  $tutos[timezones][] = "WET0WETDST"; //Western European Time/ Western European Time Daylight Savings Time
+  $tutos[timezones][] = "PWT0PST";    //Portuguese Winter Time/ Portuguese Summer Time
+  $tutos[timezones][] = "MEZ-1MESZ";  //Mitteleuropaeische Zeit/ Mitteleuropaeische Sommerzeit
+  $tutos[timezones][] = "MET-2METDST";//Middle European Time/ Middle European Time Daylight Savings Time
+  $tutos[timezones][] = "SAST-2SADT"; //South Africa Standard Time/ South Africa Daylight Time
+  $tutos[timezones][] = "JST-9";      //Japan Standard Time
+  $tutos[timezones][] = "WST-8:00";   //Australian Western Standard Time
+  $tutos[timezones][] = "CST-9:30";   //Australian Central Standard Time
+  $tutos[timezones][] = "CST-9:30CDT";//Australian Central Standard Time/Australian Central Daylight Time
+  $tutos[timezones][] = "EST-10";     //Australian Eastern Standard Time
+  $tutos[timezones][] = "EST-10EDT";  //Australian Eastern Standard Time/Australian Eastern Daylight Time
+  $tutos[timezones][] = "NZST-12NZDT";//New Zealand Standard Time/ New Zealand Daylight Time
+}
 #
 # Default start of week
 # 0 = Sunday
@@ -765,6 +791,6 @@
 #
 # The TUTOS Version number
 #
-$tutos[version]='1.3dev.20050701';
+$tutos[version]='1.3dev.20050708';
 #
 ?>

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

Modified Files:
	address_new.php 
Log Message:
fix

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- address_new.php	6 Jul 2005 08:06:48 -0000	1.74
+++ address_new.php	8 Jul 2005 08:45:58 -0000	1.75
@@ -406,21 +406,25 @@
      if ( isset($_GET['cl']) ) {
        $cl = $_GET['cl'];
        foreach ($cl as $f) {
-         $c = new company($this->dbconn);
-         $c = $c->read($f,$c);
-         $c->read_locs_data();
-         $this->loc->cl[$f] = &$c;
-         unset($c);
+		 if ($f != -1) {
+           $c = new company($this->dbconn);
+           $c = $c->read($f,$c);
+           $c->read_locs_data();
+           $this->loc->cl[$f] = &$c;
+           unset($c);
+		 }
        }
      }
      if ( isset($_GET['dl']) ) {
        $dl = $_GET['dl'];
        foreach ($dl as $f)  {
-         $d = new department($this->dbconn);
-         $d = $d->read($f,$d);
-         $d->read_locs_data();
-         $this->loc->dl[$f] = &$d;
-         unset($d);
+		 if ($f != -1) {
+           $d = new department($this->dbconn);
+           $d = $d->read($f,$d);
+           $d->read_locs_data();
+           $this->loc->dl[$f] = &$d;
+           unset($d);
+		 }
        }
      }
      foreach($this->loc->larray as $i => $f) {

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

Modified Files:
	timetrack_overview.php 
Added Files:
	excel.pinc 
Log Message:
use a own excel class to set some defaults

--- NEW FILE: excel.pinc ---
<?php
/**
 *  Copyright 2004 - 2005 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   
 *  Free Software Foundation; version 2 of the License.                     
 *
 * base format for TUTOS excel output
 *
 *  CVS Info:  $Id: excel.pinc,v 1.1 2005/07/07 11:45:04 gokohnert Exp $
 *  $Author: gokohnert $
 */

 include_once '../libs/excel/Worksheet.php';
 include_once '../libs/excel/Workbook.php';

 class tutos_excel {
   function tutos_excel()
   {
     $this->wb = -1;
     $this->ws = array();
   }

   function open()
   {
     global $tutos;

     $this->tmpname = tempnam ($tutos[sessionpath], "excel");
     $this->wb = new Workbook($this->tmpname);
   }

   function send($name)
   {
     $this->wb->close();
     $fh = fopen($this->tmpname, "rb");
     if ($fh == false) {
       die("Can't read temporary file.");
     }

#die ($this->tmpname);
     header("Content-type: application/vnd.ms-excel");
     header("Content-Disposition: attachment; filename=". $name .".xls");
     header("Expires: 0");
     header("Cache-Control: must-revalidate, post-check=0,pre-check=0");
     header("Pragma: public");

     fpassthru($fh);
     fclose($fh);
     @unlink($this->tmpname);
     return;
   }

   function add_sheet($name)
   {
     global $lang;

     $id = count($this->ws);
     $this->ws[$id] =& $this->wb->add_worksheet($name);
     $this->ws[$id]->set_landscape();
     $this->ws[$id]->set_header('TUTOS');
     $this->ws[$id]->set_footer("generated by TUTOS");

     return $id;
   }

   function add_formats()
   {
     $this->format_default =& $this->wb->add_format();
     $this->format_default->set_size(10);

     $this->format_header =& $this->wb->add_format();
     $this->format_header->set_bold(1);
     $this->format_header->set_align('center');
     $this->format_header->set_fg_color(43);
     $this->format_header->set_color(8);
     $this->format_header->set_size(12);
     $this->format_header->set_pattern();

   }
 }
?>

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- timetrack_overview.php	5 Jul 2005 14:48:07 -0000	1.92
+++ timetrack_overview.php	7 Jul 2005 11:45:04 -0000	1.93
@@ -54,52 +54,43 @@
        }
        return;      
      } else if ($this->format == "excel") {
-       include_once '../libs/excel/Worksheet.php';
-       include_once '../libs/excel/Workbook.php';
+       include_once 'excel.pinc';
 
-       header("Content-type: application/vnd.ms-excel");
-       header("Content-Disposition: attachment; filename=TimetrackExport.xls");
-       header("Expires: 0");
-       header("Cache-Control: must-revalidate, post-check=0,pre-check=0");
-       header("Pragma: public");
+       $this->excel = new tutos_excel();
+       $this->excel->open();
+       $this->excel->add_formats();
 
-       $tmpname = tempnam ($tutos[sessionpath], "timetrackexport");
-       $workbook = new Workbook($tmpname);
+       $ws = $this->excel->add_sheet($lang['TimetrackOverview']);
 
        $x = 0;
+       $c = 0;
 
-       $format1 =& $workbook->add_format();
-       $format1->set_bold(1);
-       $format1->set_align('center');
-       $format1->set_fg_color(43);
-       $format1->set_color(8);
-       $format1->set_size(12);
-       $format1->set_pattern();
-
-       $format2 =& $workbook->add_format();
-       $format2->set_size(10);
-
-       $worksheet1 =& $workbook->add_worksheet('TUTOS');
-       $worksheet1->set_column(0,0,5); # ID
-       $worksheet1->set_column(1,1,25);# Name
-       $worksheet1->set_column(2,2,20);# Volume
-       $worksheet1->set_column(3,3,20);# CPH
-       $worksheet1->set_column(4,4,25);# Sum
-       $worksheet1->set_column(5,5,15);# Currency
-       $worksheet1->set_column(6,6,15);# Distance
-       $worksheet1->set_column(7,7,50);# DESC
-       $worksheet1->set_column(7,7,25);# Day
+       $this->excel->ws[$ws]->set_column($c,$c,5); # ID
+       $this->excel->ws[$ws]->write_string($x,$c++, "#",$this->excel->format_header);
 
-       $c = 0;
-       $worksheet1->write_string($x,$c++, "#",$format1);
-       $worksheet1->write_string($x,$c++, "Worker",$format1);
-       $worksheet1->write_string($x,$c++, $lang['TimetrackBooked'],$format1);
-       $worksheet1->write_string($x,$c++, $lang['TTcph'],$format1);
-       $worksheet1->write_string($x,$c++, "Sum",$format1);
-       $worksheet1->write_string($x,$c++, $lang['Currency'],$format1);
-       $worksheet1->write_string($x,$c++, $lang['Distance'],$format1);
-       $worksheet1->write_string($x,$c++, $lang['Description'],$format1);
-       $worksheet1->write_string($x,$c++, $lang['atDateTime'],$format1);
+       $this->excel->ws[$ws]->set_column($c,$c,25);# Name
+       $this->excel->ws[$ws]->write_string($x,$c++, $lang['TimetrackWorker'],$this->excel->format_header);
+
+       $this->excel->ws[$ws]->set_column($c,$c,20);# Volume
+       $this->excel->ws[$ws]->write_string($x,$c++, $lang['TimetrackBooked'],$this->excel->format_header);
+
+       $this->excel->ws[$ws]->set_column($c,$c,20);# CPH
+       $this->excel->ws[$ws]->write_string($x,$c++, $lang['TTcph'],$this->excel->format_header);
+
+       $this->excel->ws[$ws]->set_column($c,$c,25);# Sum
+       $this->excel->ws[$ws]->write_string($x,$c++, "Sum",$this->excel->format_header);
+
+       $this->excel->ws[$ws]->set_column($c,$c,15);# Currency
+       $this->excel->ws[$ws]->write_string($x,$c++, $lang['Currency'],$this->excel->format_header);
+
+       $this->excel->ws[$ws]->set_column($c,$c,15);# Distance
+       $this->excel->ws[$ws]->write_string($x,$c++, $lang['Distance'],$this->excel->format_header);
+
+       $this->excel->ws[$ws]->set_column($c,$c,50);# DESC
+       $this->excel->ws[$ws]->write_string($x,$c++, $lang['Description'],$this->excel->format_header);
+
+       $this->excel->ws[$ws]->set_column($c,$c,25);# Day
+       $this->excel->ws[$ws]->write_string($x,$c++, $lang['atDateTime'],$this->excel->format_header);
 
        $x++;
        $cnt = 0;
@@ -108,27 +99,20 @@
          $a->read_result($this->result,$cnt);
 
          $c = 0;
-         $worksheet1->write_number($x,$c++, $a->id);
-         $worksheet1->write_string($x,$c++, $a->worker->getFullName(),$format2);
-         $worksheet1->write_number($x,$c++, $a->volume,$format2);
-         $worksheet1->write_number($x,$c++, $a->cph,$format2);
-         $worksheet1->write_number($x,$c++, $a->cph * $a->volume,$format2);
-         $worksheet1->write_string($x,$c++, $a->currency,$format2);
-         $worksheet1->write_number($x,$c++, $a->distance,$format2);
-         $worksheet1->write_string($x,$c++, $a->desc,$format2);
-         $worksheet1->write_string($x,$c++, $a->wday->getDate(),$format2);
+         $this->excel->ws[$ws]->write_number($x,$c++, $a->id,$this->excel->format_default);
+         $this->excel->ws[$ws]->write_string($x,$c++, $a->worker->getFullName(),$this->excel->format_default);
+         $this->excel->ws[$ws]->write_number($x,$c++, $a->volume,$this->excel->format_default);
+         $this->excel->ws[$ws]->write_number($x,$c++, $a->cph,$this->excel->format_default);
+         $this->excel->ws[$ws]->write_number($x,$c++, $a->cph * $a->volume,$this->excel->format_default);
+         $this->excel->ws[$ws]->write_string($x,$c++, $a->currency,$this->excel->format_default);
+         $this->excel->ws[$ws]->write_number($x,$c++, $a->distance,$this->excel->format_default);
+         $this->excel->ws[$ws]->write_string($x,$c++, $a->desc,$this->excel->format_default);
+         $this->excel->ws[$ws]->write_string($x,$c++, $a->wday->getDate(),$this->excel->format_default);
          $x++;
          $cnt++;
        }
 
-       $workbook->close();
-       $fh = fopen($tmpname, "rb");
-       if ($fh == false) {
-         die("Can't read temporary file.");
-       }
-       fpassthru($fh);
-       fclose($fh);
-       @unlink($tmpname);
+       $this->excel->send('TimetrackExport');
        return;      
      } else if ($this->format == "stat") {
        $this->statinfo();

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

Added Files:
      Tag: BRANCH-2-0
	app_new_r.tpl 
Log Message:
* Some DEBUG
* Some more appointments in TUTOS 2


--- NEW FILE: app_new_r.tpl ---
{* New Appointement TUTOS template *}
{* $Id: app_new_r.tpl,v 1.1.2.1 2005/07/06 16:09:01 tapoueh Exp $ *}

<!-- app_new start -->

<form name="appnew" method="POST" action="{$action}">
<input type="hidden" name="repeat" value="{$repeat}">
<input type="hidden" name="r_ignore" value="{$r_ignore}">
<input type="hidden" name="creator" value="{$creator.id}">
{if $id > 0}<input type="hidden" name="id" value="{$id}">{/if}

<table class="summary" border="0" style="margin-left: 0px;">
<thead>
<tr>
 <th colspan="4">{$title}</th>
</tr>
{if $id > 0 }
<tr>
 <th>{$creator.label}</th>
 <th>
  <a href="{$creator.link}" title="{$creator.title}">{$creator.value}</a>
 </th>
 <th>{$creation.label}</th>
 <th>{$creation.value}</th>
</tr>
{/if}
</thead>

<tbody>
<tr>
<td class="desc">
  <label for="{$start_d.name}">{$start_d.label}</label>
  <font color="red">(*)</font>
</td>
<td style="white-space: nowrap;">
{html_options name=$start_d.name
      values=$start_d.options output=$start_d.options
      selected=$start_d.selected}
<b>.</b>&nbsp;
{html_options name=$start_m.name
      values=$start_m.options output=$start_m.options
      selected=$start_m.selected}
<b>.</b>&nbsp;
{html_options name=$start_y.name
      values=$start_y.options output=$start_y.options
      selected=$start_y.selected}
&nbsp;
<a href="JavaScript:
var d = document.forms[0];
mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100');
mywindow.location.href = '{$base}/php/minical.php?f={$start_d.f}&amp;n=0&amp;d={$start_d.selected}&amp;m={$start_m.selected}&amp;y={$start_y.selected}&amp;SID';
mywindow.focus();" title="MiniCal">MiniCal</a>
 </td>
<td class="desc" style="text-align: right;">
  {$start_time.label}
  <font color="red">(*)</font>
</td>
<td style="white-space: nowrap;">
{strip}
 <input name="{$start_time.h.name}" value="{$start_time.h.value}" size="2">
 &nbsp;:&nbsp;
 <input name="{$start_time.m.name}" value="{$start_time.m.value}" size="2">
{/strip}
</td>
</tr>

<tr>
<td class="desc">
  <label for="{$end_d.name}">{$end_d.label}</label>
  <font color="red">(*)</font>
</td>
<td>
{html_options name=$end_d.name
      values=$end_d.options output=$end_d.options
      selected=$end_d.selected}
<b>.</b>&nbsp;
{html_options name=$end_m.name
      values=$end_m.options output=$end_m.options
      selected=$end_m.selected}
<b>.</b>&nbsp;
{html_options name=$end_y.name
      values=$end_y.options output=$end_y.options
      selected=$end_y.selected}
&nbsp;
<a href="JavaScript:
var d = document.forms[0];
mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100');
mywindow.location.href = '{$base}/php/minical.php?f={$end_d.f}&amp;n=0&amp;d={$end_d.selected}&amp;m={$end_m.selected}&amp;y={$end_y.selected}&amp;SID';
mywindow.focus();" title="MiniCal">MiniCal</a>
 </td>

<td class="desc" style="text-align: right;">
  {$end_time.label}
  <font color="red">(*)</font>
</td>
<td style="white-space: nowrap;">
{strip}
 <input name="{$end_time.h.name}" value="{$end_time.h.value}" size="2">
 &nbsp;:&nbsp;
 <input name="{$end_time.m.name}" value="{$end_time.m.value}" size="2">
{/strip}
</td>
</tr>

<tr>
 <td rowspan="2" valign="top" class="desc">{$location.label}</td>
 <td rowspan="2" valign="top">
  {html_options name=$location.name
             options=$location.options
            selected=$location.selected}
 </td>

 <td class="desc" style="text-align: right;" valign="top">
   {$t_ignore.label}
 </td>
 <td>
  <input type="checkbox" 
         name="{$t_ignore.name}" value="{$t_ignore.value}"
         {if $t_ignore.checked}checked="checked"{/if}>
 </td>
</tr>

<tr>
  <td colspan="2" style="text-align: right; font-style: italic;">
    {$t_ignore.info}
  </td>  
</tr>

<tr>
 <td class="desc" valign="top">{$desc.label}</td>
 <td colspan="3">
  <textarea name="{$desc.name}" rows="5" cols="80" size="{$desc.size}">
{$desc.value}
  </textarea>
 </td>
</tr>

<tr>
 <td class="desc">
  {$visitor.label.at}
  <br />
  {$visitor.label.from}
 </td>
 <td>
  <input name="{$visitor.name}" value="{$visitor.value}">
 </td>

 <td colspan="2" valign="bottom" class="desc">{$mod_allow.label}</td>
 </td>
</tr>

<tr>
{if $useprojects}
 <td class="desc" valign="top">{$product.label}</td>
 <td valign="top">
   <input name="{$product.name}" value="{$product.value}">
 </td>
{else}
 <td colspan="2">&nbsp;</td>
{/if}

 <td colspan="2" valign="top">
  {html_radios name=$mod_allow.name
            options=$mod_allow.options
           selected=$mod_allow.selected
          separator="<br />"}
 </td
</tr>

<tr>
<td valign="top" class="desc" rowspan="5">
  {$people.label}
  <font color="red">(*)</font>
</td>
<td valign="top" rowspan="5">
<select name="{$people.name}" id="{$people.id}" multiple size="8">
<optgroup label="{$people.options.roles.label}">
{html_options options=$people.options.roles.list
             selected=$people.options.roles.selected}
</optgroup>
<optgroup label="{$people.options.people.label}">
{html_options options=$people.options.people.list
             selected=$people.options.people.selected}
</optgroup>
<optgroup label="{$people.options.teams.label}">
{html_options options=$people.options.teams.list 
             selected=$people.options.teams.selected}
</optgroup>
</select>
</td>

 <td class="desc">{$repeat.label}</td>
</tr>
<tr>
 <td>
  {html_radios  name=$repeat.name
             options=$repeat.options
            selected=$repeat.selected
           separator="</td></tr><tr><td>"}
 </td>
</tr>

</tbody>
</table>

<table class="summary">
<thead>
 <tr><th colspan="4">{$FldsRequired}</th></tr>
</thead>

<tbody>
<tr>
 <td class="desc">
   <label for="OK">{$InputOk}</label>
 </td>
 <td>
   <input id="OK" name="OK" type="submit" value="{$Enter}" title="{$Enter}">
 </td>

 <td class="desc" align="right">
   <label for="RESET">{$Reset}</label>
 </td>
 <td>
   <input id="RESET" name="RESET" type="reset"
          value="{$Reset}" title="{$Reset}">
 </td>
</tr>
</tbody>
</table>

</form>

<!-- app_new end -->

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

Modified Files:
      Tag: BRANCH-2-0
	app_new_r.php calendar_week.php mytutos.php 
Log Message:
* Some DEBUG
* Some more appointments in TUTOS 2


Index: app_new_r.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new_r.php,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -u -r1.48.2.1 -r1.48.2.2
--- app_new_r.php	14 Apr 2004 17:39:08 -0000	1.48.2.1
+++ app_new_r.php	6 Jul 2005 16:08:59 -0000	1.48.2.2
@@ -11,12 +11,11 @@
  include_once 'webelements.p3';
  include_once 'permission.p3';
  include_once 'appointment.pinc';
-
+ include_once 'layout/layout.pinc';
 
  /* Check if user is allowed to use it */
  check_user();
  loadmodules("appointment","new");
- loadlayout();
 
  /**
   * display a appointment for changing
@@ -42,6 +41,119 @@
 
 
      if ( $this->obj->allowed == 0 ) {
+       $this->error($lang['ReadOnlyAppoint']);
+     }
+
+     $this->assign('action', 'app_ins.php');
+     $this->assign('repeat', "1");
+     $this->assign('r_ignore', "0");
+     $this->assign('id', $this->obj->id);
+
+     if( $this->obj->id > 0 ) {
+       $this->assign('title', $lang['ModOldAppoint']);
+       $this->assign('creation',
+		     array('label' => $lang['atDateTime'],
+			   'value' =>
+			   $this->obj->creation->getDateTime()));
+     }
+     else {
+       $this->assign('title', $lang['CreateAppoint']);
+     }
+
+     $this->assign('creator',
+		   array('id'    => $this->obj->creator->id,
+			 'label' => $lang['AppCreatedBy'],
+			 'value' => $this->obj->creator->getFullName(),
+			 'title' => $this->obj->creator->getFullName(),
+			 'link'  => $this->obj->creator->getUrl()));
+
+     // Enter start and end dates
+     $today = new DateTime();
+     $this->assign_date($lang['StartDate'], "start", $today);
+     $this->assign_date($lang['EndDate'], "end", $today);
+
+     // and start and end times
+     $this->assign('start_time',
+		   array('label' => $lang['StartTime'],
+			 'h'     => array('name'  => 'start_H',
+					  'value' => "08"),
+			 'm'     => array('name'  => 'start_M',
+					  'value' => "00")));
+
+     $this->assign('end_time',
+		   array('label' => $lang['EndTime'],
+			 'h'     => array('name'  => 'end_H',
+					  'value' => "08"),
+			 'm'     => array('name'  => 'end_M',
+					  'value' => "00")));
+
+     // Ignore times
+     $this->assign('t_ignore',
+		   array('label'   => $lang['IgnoreTime'],
+			 'info'    => $lang['IgnoreTime2'],
+			 'name'    => 't_ignore',
+			 'value'   => "1",
+			 'checked' => $this->obj->t_ignore));
+     
+     // LOCATION
+     $locs = array();
+     foreach ($lang['AppLoc'] as $i => $f) {
+       if( $this->obj->outside == $i )
+	 $selected = $i;
+
+       $locs[$i] = $lang['AppLoc'][$i];
+     }
+     $this->assign('location',
+		   array('label'    => $lang['Location2'],
+			 'name'     => 'outside',
+			 'options'  => $locs,
+			 'selected' => $selected));
+
+     // Description
+     $this->assign('desc',
+		   array('label' => $lang['Description'],
+			 'name'  => 'descr',
+			 'value' => $this->obj->descr,
+			 'size'  => 
+			 $table['appointment1']['description'][size]));
+
+     // Customer/Visitor name
+     if( is_object($this->obj->visitor) )
+       $visitor = $this->obj->visitor->getFullName();
+     else
+       $visitor = "";
+
+     $this->assign('visitor',
+		   array('label' => array('at'   => $lang['VisitAt'],
+					  'from' => $lang['VisitFrom']),
+			 'value' => $visitor));
+
+     // Product
+     $this->assign('useprojects', 
+		   $this->user->feature_ok(useprojects,PERM_SEE));
+     if( $this->user->feature_ok(useprojects,PERM_SEE) ) {
+       $product = "";
+       if( is_object($this->obj->product) )
+	 $product = $this->obj->product->getFullName();
+
+       $this->assign('product',
+		     array('label' => $lang['Product'],
+			   'name'  => 'p',
+			   'value' => $product));
+     }
+
+     $parts = $this->user->askPeople($this->obj->people);
+     // $this->debug($parts);
+
+     $this->assign('people',
+		   array('id'      => 'people',
+			 'name'    => 'people[]',
+			 'label'   => $lang['Participants'],
+			 'options' => $parts));
+
+
+     /*
+     if ( $this->obj->allowed == 0 ) {
         echo "<b>". $lang['ReadOnlyAppoint'] ."</b><br>\n";
      }
      echo "<form name=\"appnew\" action=\"app_ins.php\" method=\"post\">\n";
@@ -68,7 +180,7 @@
      }
      $this->addHidden("creator",$this->obj->creator->id);
 
-     # START
+     // START
      echo "<tr>";
      echo $this->showfield($lang['AppFirstDate'],0,"start_d");
      echo " <td colspan=\"2\">";
@@ -90,7 +202,7 @@
      $this->obj->start->EnterTime("start");
      echo " </td>\n";
 
-     # END
+     // END
      echo "</tr><tr>\n";
      echo $this->showfield($lang['AppLastDate'],0,"end_d");
      echo "<td colspan=\"2\">";
@@ -115,91 +227,99 @@
      echo "</td>\n";
 
      echo "</tr><tr>\n";
+     */
 
-     # REPEAT TYPE
-     echo $this->showfield($lang['AppRepeatType'],0,"repeat");
-     echo " <td colspan=\"2\">\n";
-     echo "  <input type=\"radio\" id=\"repeat\" name=\"repeat\" value=\"". APP_REP_DAY ."\"". $r_checked[APP_REP_DAY] .">&nbsp;". $lang['AppRepeatDay'] ."<br>";
-     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_WEEK ."\"". $r_checked[APP_REP_WEEK] .">&nbsp;". $lang['AppRepeatWeek'] ."<br>";
-     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_MONTH ."\"". $r_checked[APP_REP_MONTH] .">&nbsp;". $lang['AppRepeatMonth'] ."<br>";
-     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_YEAR ."\"". $r_checked[APP_REP_YEAR] .">&nbsp;". $lang['AppRepeatYear'] ."<br>";
-     echo " </td>\n";
-
-     # Ignore times
-     echo " <td colspan=\"3\" valign=\"top\">\n";
-     echo $lang['IgnoreTime'];
-     echo "&nbsp;<input type=\"checkbox\" name=\"t_ignore\" value=\"1\" ". ($this->obj->t_ignore == 1 ? "checked":"") ."><br>\n";
-     echo "<font size=\"-1\">". $lang['IgnoreTime2'] ."</font>";
-     echo " </td>\n";
-
-     echo "</tr><tr>\n";
-
-     # LOCATION
-     echo $this->showfield($lang['Location2'],0,"outside");
-     echo " <td colspan=\"5\">\n";
-     echo "  <select id=\"outside\" name=\"outside\">\n";
-     @reset($lang['AppLoc']);
-     while ( list($i,$f) = each($lang['AppLoc']) ) {
-       echo "   <option value=\"". $i ."\" ". ($this->obj->outside == $i ? "selected":"") .">". $lang['AppLoc'][$i] ."</option>\n";
-     }
-     echo "  </select>\n";
-     echo " </td>\n";
+     // REPEAT TYPE
+     $r_types = array(APP_REP_DAY   => $lang['AppRepeatDay'],
+		      APP_REP_WEEK  => $lang['AppRepeatWeek'],
+		      APP_REP_MONTH => $lang['AppRepeatMonth'],
+		      APP_REP_YEAR  => $lang['AppRepeatYear']);
+
+     if( $r_checked[APP_REP_YEAR] )
+       $selected = APP_REP_YEAR;
+     else if( $r_checked[APP_REP_WEEK] )
+       $selected = APP_REP_WEEK;
+     else if( $r_checked[APP_REP_MONTH] )
+       $selected = APP_REP_MONTH;
+     else if( $r_checked[APP_REP_YEAR] )
+       $selected = APP_REP_YEAR;
+
+     $this->assign('repeat',
+		   array('label'    => $lang['AppRepeatType'],
+			 'name'     => 'repeat',
+			 'options'  => $r_types,
+			 'selected' => $selected));
+
+     // Permissions
+     $perms =
+       array(
+	     2 => $lang['only']." ".$this->obj->creator->getFullName(),
+	     1 => $lang['Participants'],
+	     0 => $lang['everybody'],
+	     3 => $lang['AppPrivate']);
+
+     $this->assign('mod_allow',
+		   array('label'    => $lang['AppChangeOrDel'],
+			 'name'     => 'mod_allow',
+			 'options'  => $perms,
+			 'selected' => $this->obj->mod_allow));
+
+     $this->assign('InputOk',   $lang['InputOk']);
+     $this->assign('ChangesOk', $lang['ChangesOk']);
+     $this->assign('Enter', $lang['Enter']);
+     $this->assign('Reset', $lang['Reset']);
+     $this->assign('FldsRequired', $lang['FldsRequired']);
 
-     echo "</tr><tr>\n";
-     echo $this->showfield($lang['Description'],0,"descr");
-     echo $this->textarea("descr",5,$table['appointment1']['description'][size],$this->obj->descr);
-
-     echo "</tr><tr>\n";
-     # Customer/Visitor name
-     echo $this->showfieldc($lang['VisitAt'] ."<br>". $lang['VisitFrom'],0,"v");
-     echo " <td colspan=\"5\">";
-     select_from_array_or_input($this->obj,"v",$this->obj->visitor,1);
-     echo " </td>\n";
-
-     if ( $this->user->feature_ok(useprojects,PERM_SEE) ) {
-       echo "</tr><tr>\n";
-       echo $this->showfieldc($lang['Product'],0,"p");
-       echo " <td colspan=\"5\">\n";
-       select_from_array_or_input($this->obj,"p",$this->obj->product,1);
-       echo " </td>\n";
-     }
-
-     echo "</tr><tr>\n";
+     $this->template('app_new_r');
+   }
 
-     echo $this->showfield($lang['Participants'],1,"people");
-     echo " <td valign=\"top\">\n";
-     echo "". $this->user->askPeople("people[]",$this->obj->people,1) ."\n";
-     echo " </td>\n";
+   /**
+    * navigate
+    */
+   Function navigate() {
+     global $lang;
 
-     echo " <td colspan=\"4\">&nbsp;<b>". $lang['AppChangeOrDel'] ."</b>&nbsp;<br>\n";
-     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"2\"". $a_checked[2] .">&nbsp;". $lang['only'] ." ". $this->obj->creator->getLink() ."<br>\n";
-     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"1\"". $a_checked[1] .">&nbsp;". $lang['Participants'] ."<br>\n";
-     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"0\"". $a_checked[0] .">&nbsp;". $lang['everybody'] ."<br>\n";
-     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"3\"". $a_checked[3] .">&nbsp;". $lang['AppPrivate'] ."<br>\n";
+     $this->menu_categories['obj'] =
+       array('label' => $lang['Calendar'],
+	     'icon'  => 'appointments');
 
-     echo " </td>\n";
+     // menu
+     $m = appointment::getSelectLink($this->user);
+     $m['category'][] = "obj";
 
-     if ( $this->obj->mod_ok() ) {
-       echo "</tr><tr>\n";
-       if ( $this->obj->id > 0 ) {
-         submit_reset(0,1,2,1,2,0);
-       } else {
-         submit_reset(0,-1,2,1,2,0);
+     $this->addmenu($m);
+     $m = appointment::getAddLink($this->user,$this->obj);
+     $this->addmenu($m);
+     if ( $this->obj->id > 0 ) {
+       if ( $this->obj->del_ok() ) {
+         $m = array('url'   => $this->obj->getDelURL(),
+                    'text'  => $lang['Delete'],
+		    'image' => 'delete',
+                    'info'  => $lang['AppDelInfo'],
+                    'confirm' => true,
+                    'category' => array("app","del","obj")
+                   );
+         $this->addMenu($m);
        }
+       $m = array('url'  => $this->obj->getURL(),
+                  'text' => $lang['AppSeeEntry'],
+                  'info' => $lang['AppSeeEntryI'],
+                  'category' => array("app","show","obj")
+                 );
+       $this->addMenu($m);
      }
-     echo "</tr>\n";
-     echo $this->DataTableEnd();
-     hiddenFormElements();
-     echo $this->getHidden();
-     echo "</form>\n";
-     echo $lang['FldsRequired'] ."\n";
-     echo $this->setfocus("appnew.descr");
-   }
-   /**
-    * navigate
-    */
-   Function navigate() {
+     if ( $this->obj->see_ok() && ($this->obj->id > 0) ) {
+       $m = array('url'  => "app_show.php?format=ical&id=". $this->obj->id,
+                  'text' => $lang['AppGetIcal'],
+                  'info' => $lang['AppGetIcal'],
+                  'category' => array("app","show","obj")
+                 );
+       $this->addMenu($m);
+     }
+     $this->menuprint('app');
    }
+
+
    /**
     * prepare
     */
@@ -282,44 +402,15 @@
      }
 
      $this->obj->allowed = $this->obj->mod_ok();
-     if ( ($this->obj->id < 0) && !$this->user->feature_ok(usecalendar,PERM_NEW) ) {
+     if ( ($this->obj->id < 0)
+	  && !$this->user->feature_ok(usecalendar,PERM_NEW) ) {
        $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
        $this->stop = true;
-     } else if (  ! $this->obj->mod_ok() ) {
+     }
+     else if (  ! $this->obj->mod_ok() ) {
        $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
        $this->stop = true;
      }
-     # menu
-     $m = appointment::getSelectLink($this->user);
-     $m[category][] = "obj";
-     $this->addmenu($m);
-     $m = appointment::getAddLink($this->user,$this->obj);
-     $this->addmenu($m);
-     if ( $this->obj->id > 0 ) {
-       if ( $this->obj->del_ok() ) {
-         $m = array( url => $this->obj->getDelURL(),
-                     text => $lang['Delete'],
-                     info => $lang['AppDelInfo'],
-                     confirm => true,
-                     category => array("app","del","obj")
-                   );
-         $this->addMenu($m);
-       }
-       $m = array( url => $this->obj->getURL(),
-                   text => $lang['AppSeeEntry'],
-                   info => $lang['AppSeeEntryI'],
-                   category => array("app","show","obj")
-                 );
-       $this->addMenu($m);
-     }
-     if ( $this->obj->see_ok() && ($this->obj->id > 0) ) {
-       $m = array( url => "app_show.php?format=ical&id=". $this->obj->id,
-                   text => $lang['AppGetIcal'],
-                   info => $lang['AppGetIcal'],
-                   category => array("app","show","obj")
-                 );
-       $this->addMenu($m);
-     }
      add_module_addlinks($this,$this->obj);
    }
  }

Index: calendar_week.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_week.php,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -u -r1.41.2.3 -r1.41.2.4
--- calendar_week.php	11 Jan 2005 14:44:29 -0000	1.41.2.3
+++ calendar_week.php	6 Jul 2005 16:08:59 -0000	1.41.2.4
@@ -32,7 +32,7 @@
    Function info() {
      global $lang,$tutos;
 
-     $weeks = array_reverse(cal_week($this->user, $this->t));
+     $weeks = cal_week($this->user, $this->t, $this->uids);
      $wdays = $weeks[0]['wdays'];
      // $this->debug($weeks);
      

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.84.2.24
retrieving revision 1.84.2.25
diff -u -r1.84.2.24 -r1.84.2.25
--- mytutos.php	27 May 2005 13:48:51 -0000	1.84.2.24
+++ mytutos.php	6 Jul 2005 16:09:00 -0000	1.84.2.25
@@ -43,7 +43,7 @@
 	* Prepare the display of the current week calendar
 	* This assign vars to our $layout->smarty object.
 	*/
-       $weeks = cal_week($this->adr, $this->t);
+       $weeks = cal_week($this->adr, $this->t, $this->uids);
        // $this->debug($weeks);
        $this->assign('weeks', $weeks);
 
@@ -172,6 +172,10 @@
        $this->adr = &$this->user;
      }
 
+     $this->team = $this->user->get_prefteam();
+     $this->teamname = "";
+     $this->uids = cal_parse_options($this->user,$this->teamname);
+
      $x = task::getaddlink($this->user,$this->adr);
      $this->addMenu($x);