tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php/installation
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28382

Modified Files:
      Tag: BRANCH-1-6
	installation.pinc installation_ins.php 
Log Message:
merging fixes

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.64
retrieving revision 1.64.2.1
diff -u -d -r1.64 -r1.64.2.1
--- installation.pinc	23 Mar 2010 16:59:22 -0000	1.64
+++ installation.pinc	31 Mar 2010 17:34:40 -0000	1.64.2.1
@@ -356,36 +356,14 @@
      * set the Installer
      */
     function setInstaller($name) {
-        $i = new tutos_address($this->dbconn);
-        $i = $i->read($name,$i);
-        if ( $i->id < 1 ) {
-            $i = new team($this->dbconn);
-            $i = $i->read($name,$i);
-        }
-
-        if ( ($this->installer->id != $name) && ($i->id != -1) ) {
-            $this->modified[] = array ( "field" => "InstalledBy", "old" => $this->installer->id , "new" => $name );
-            $this->installer = $i;
-        }
-        return;
+        return $this->setObjectField('installer',$name,'InstalledBy');
     }
 
     /**
      * set the Seller
      */
     function setSeller($name) {
-        $i = new tutos_address($this->dbconn);
-        $i = $i->read($name,$i);
-        if ( $i->id < 1 ) {
-            $i = new team($this->dbconn);
-            $i = $i->read($name,$i);
-        }
-
-        if ( ($this->seller->id != $name) && ($i->id != -1) ) {
-            $this->modified[] = array ( "field" => "SoldBy", "old" => $this->seller->id , "new" => $name );
-            $this->seller = $i;
-        }
-        return;
+        return $this->setObjectField('seller',$name,'SoldBy');
     }
 
     /**

Index: installation_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_ins.php,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -d -r1.24 -r1.24.2.1
--- installation_ins.php	26 Mar 2010 08:46:54 -0000	1.24
+++ installation_ins.php	31 Mar 2010 17:34:40 -0000	1.24.2.1
@@ -51,7 +51,7 @@
 
 if ( isset($_POST['ifn']) ) {
     $x = check_field(StripSlashes($_POST['ifn']),"ifn","il");
-    $obj->setInstaller($x->id);
+    $obj->setInstaller($x);
 }
 if ( isset($_POST['desc']) ) {
     $obj->setDescription(trim(StripSlashes($_POST['desc'])));
@@ -76,7 +76,7 @@
 
 if ( isset($_POST['sfn']) ) {
     $x = check_field(StripSlashes($_POST['sfn']),"sfn","sl","at");
-    $obj->setSeller($x->id);
+    $obj->setSeller($x);
 }
 
 if ( !checkfloat($_POST['money']) ) {

Update of /cvsroot/tutos/tutos/php/installation
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28184

Modified Files:
	installation.pinc installation_ins.php 
Log Message:
fix

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- installation.pinc	23 Mar 2010 16:59:22 -0000	1.64
+++ installation.pinc	31 Mar 2010 17:34:10 -0000	1.65
@@ -356,36 +356,14 @@
      * set the Installer
      */
     function setInstaller($name) {
-        $i = new tutos_address($this->dbconn);
-        $i = $i->read($name,$i);
-        if ( $i->id < 1 ) {
-            $i = new team($this->dbconn);
-            $i = $i->read($name,$i);
-        }
-
-        if ( ($this->installer->id != $name) && ($i->id != -1) ) {
-            $this->modified[] = array ( "field" => "InstalledBy", "old" => $this->installer->id , "new" => $name );
-            $this->installer = $i;
-        }
-        return;
+        return $this->setObjectField('installer',$name,'InstalledBy');
     }
 
     /**
      * set the Seller
      */
     function setSeller($name) {
-        $i = new tutos_address($this->dbconn);
-        $i = $i->read($name,$i);
-        if ( $i->id < 1 ) {
-            $i = new team($this->dbconn);
-            $i = $i->read($name,$i);
-        }
-
-        if ( ($this->seller->id != $name) && ($i->id != -1) ) {
-            $this->modified[] = array ( "field" => "SoldBy", "old" => $this->seller->id , "new" => $name );
-            $this->seller = $i;
-        }
-        return;
+        return $this->setObjectField('seller',$name,'SoldBy');
     }
 
     /**

Index: installation_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_ins.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- installation_ins.php	26 Mar 2010 08:46:54 -0000	1.24
+++ installation_ins.php	31 Mar 2010 17:34:10 -0000	1.25
@@ -51,7 +51,7 @@
 
 if ( isset($_POST['ifn']) ) {
     $x = check_field(StripSlashes($_POST['ifn']),"ifn","il");
-    $obj->setInstaller($x->id);
+    $obj->setInstaller($x);
 }
 if ( isset($_POST['desc']) ) {
     $obj->setDescription(trim(StripSlashes($_POST['desc'])));
@@ -76,7 +76,7 @@
 
 if ( isset($_POST['sfn']) ) {
     $x = check_field(StripSlashes($_POST['sfn']),"sfn","sl","at");
-    $obj->setSeller($x->id);
+    $obj->setSeller($x);
 }
 
 if ( !checkfloat($_POST['money']) ) {

Update of /cvsroot/tutos/tutos/php/invoice
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27217/invoice

Modified Files:
      Tag: BRANCH-1-6
	invoice.pinc 
Log Message:
merging fixes

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -d -r1.90 -r1.90.2.1
--- invoice.pinc	24 Mar 2010 20:18:14 -0000	1.90
+++ invoice.pinc	31 Mar 2010 17:32:03 -0000	1.90.2.1
@@ -21,7 +21,7 @@
 
 /** ---------------------------------------------------------------------------
  */
-function InvoiceAskState ($default,$any) {
+function InvoiceAskState ($default,$any = 0) {
     global $lang,$tutos,$current_user;
 
     $stc = getObject($current_user->dbconn,$tutos['invoice_state_stc']);

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27217/bugtracking

Modified Files:
      Tag: BRANCH-1-6
	bug_overview.php 
Log Message:
merging fixes

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.76
retrieving revision 1.76.2.1
diff -u -d -r1.76 -r1.76.2.1
--- bug_overview.php	22 Mar 2010 19:26:24 -0000	1.76
+++ bug_overview.php	31 Mar 2010 17:32:03 -0000	1.76.2.1
@@ -632,7 +632,7 @@
             $link = $tutos['base'].'/php/'.$this->link1;
             #            $link = delUrlParameter($link,"format");
             $link = addUrlParameter($link,"format=burndown");
-
+            $link = addSessionKey($link);
             $r .= "<tr>\n";
             $r .= $this->showfield($lang['BugBurndown']);
             $r .= ' <td colspan="5" valign="top"><img src="'. $link .'" alt="'. $lang['Bug'] .'" /></td>';

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27217

Modified Files:
      Tag: BRANCH-1-6
	product_show.php 
Log Message:
merging fixes

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.135
retrieving revision 1.135.2.1
diff -u -d -r1.135 -r1.135.2.1
--- product_show.php	26 Mar 2010 13:27:12 -0000	1.135
+++ product_show.php	31 Mar 2010 17:32:01 -0000	1.135.2.1
@@ -258,7 +258,7 @@
                     $r .= makelink('timetrack_overview.php?link_id='. $this->obj->id ,my_number_format($this->obj->timetracksum,2),$lang['TimetrackOverview']);
                     $r .= " </td>\n";
                     $r .= " <td align=\"left\">". $lang['hours'] ."</td>\n";
-                    $r .= " <td>".($distancesum > 0 ? my_number_format($this->obj->distancesum,2)." ".$lang['DistanceUnit']:'')."</td>\n";
+                    $r .= " <td>".($this->obj->distancesum > 0 ? my_number_format($this->obj->distancesum,2)." ".$lang['DistanceUnit']:'')."</td>\n";
                     $r .= "</tr>\n";
                     $x = 1;
                     $timesum += $this->obj->timetracksum;

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1977

Modified Files:
	product_show.php 
Log Message:
fix


Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- product_show.php	26 Mar 2010 13:27:12 -0000	1.135
+++ product_show.php	31 Mar 2010 14:28:18 -0000	1.136
@@ -258,7 +258,7 @@
                     $r .= makelink('timetrack_overview.php?link_id='. $this->obj->id ,my_number_format($this->obj->timetracksum,2),$lang['TimetrackOverview']);
                     $r .= " </td>\n";
                     $r .= " <td align=\"left\">". $lang['hours'] ."</td>\n";
-                    $r .= " <td>".($distancesum > 0 ? my_number_format($this->obj->distancesum,2)." ".$lang['DistanceUnit']:'')."</td>\n";
+                    $r .= " <td>".($this->obj->distancesum > 0 ? my_number_format($this->obj->distancesum,2)." ".$lang['DistanceUnit']:'')."</td>\n";
                     $r .= "</tr>\n";
                     $x = 1;
                     $timesum += $this->obj->timetracksum;

Update of /cvsroot/tutos/tutos/php/invoice
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1698

Modified Files:
	invoice.pinc 
Log Message:
fix


Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- invoice.pinc	24 Mar 2010 20:18:14 -0000	1.90
+++ invoice.pinc	31 Mar 2010 14:27:23 -0000	1.91
@@ -21,7 +21,7 @@
 
 /** ---------------------------------------------------------------------------
  */
-function InvoiceAskState ($default,$any) {
+function InvoiceAskState ($default,$any = 0) {
     global $lang,$tutos,$current_user;
 
     $stc = getObject($current_user->dbconn,$tutos['invoice_state_stc']);

Update of /cvsroot/tutos/tutos/php/url
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv864

Modified Files:
      Tag: BRANCH-1-6
	url.pinc 
Log Message:
fix

Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url.pinc,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -d -r1.54 -r1.54.2.1
--- url.pinc	11 Mar 2010 07:21:59 -0000	1.54
+++ url.pinc	31 Mar 2010 06:58:41 -0000	1.54.2.1
@@ -590,7 +590,7 @@
         if ($obj->layout_id == -1 ) return '';
         if ($text == '') $text = $obj->name;
 
-        $x = array( url => 'url/url_new.php?link_id='. $obj->layout_id.'&urlname='.urlencode($obj->name).'&url='.urlencode($_SERVER["REQUEST_URI"]),
+        $x = array( url => 'url/url_new.php?link_id='. $obj->layout_id.'&urlname='.urlencode($obj->name).'&url='.urlencode($_SERVER["REQUEST_URI"]),
                     confirm => false,
                     text => $lang['URLStoreQuery'],
                     info => sprintf($lang['URLStoreQueryI'],$text),

Update of /cvsroot/tutos/tutos/homepage
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31516

Modified Files:
	head0.html.inc license.html 
Log Message:
update

Index: license.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/license.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- license.html	15 Aug 2008 13:09:17 -0000	1.5
+++ license.html	31 Mar 2010 06:50:16 -0000	1.6
@@ -8,9 +8,6 @@
 <p />
 It's simply <a href="../html/copyright.html">GPL</a> <b>G</b>NU General <b>P</b>ublic <b>L</b>icense
 
-<p />
-<a href="http://petition.eurolinux.org"><img src="http://aful.org/images/patent_button.png" border="0"></a>
-<p />
 <a href="index.html">Back to main page</a>
 
 <!--#include file="foot1.html.inc" --> 

Index: head0.html.inc
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/head0.html.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- head0.html.inc	10 May 2009 13:58:59 -0000	1.3
+++ head0.html.inc	31 Mar 2010 06:50:16 -0000	1.4
@@ -2,20 +2,20 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "" rel="nofollow">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
-<!-- Copyright 2003 - 2009 by Gero Kohnert -->
+<!-- Copyright 2003 - 2010 by Gero Kohnert -->
 <!-- all rights reserved -->
 
 <!-- Piwik -->
 <script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://apps.sourceforge.net/piwik/tutos/" : "http://apps.sourceforge.net/piwik/tutos/");
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://sourceforge.net/apps/piwik/tutos/" : "http://sourceforge.net/apps/piwik/tutos/");
 document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
 </script><script type="text/javascript">
-piwik_action_name = '';
-piwik_idsite = 1;
-piwik_url = pkBaseURL + "piwik.php";
-piwik_log(piwik_action_name, piwik_idsite, piwik_url);
-</script>
-<object><noscript><p><img src="http://apps.sourceforge.net/piwik/tutos/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://sourceforge.net/apps/piwik/tutos/piwik.php?idsite=1" style="border:0" alt=""/></p></noscript>
 <!-- End Piwik Tag -->
 
 <head>

Update of /cvsroot/tutos/tutos/php/url
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31134/php/url

Modified Files:
	url.pinc 
Log Message:
fix

Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url.pinc,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- url.pinc	11 Mar 2010 07:21:59 -0000	1.54
+++ url.pinc	31 Mar 2010 06:48:31 -0000	1.55
@@ -590,7 +590,7 @@
         if ($obj->layout_id == -1 ) return '';
         if ($text == '') $text = $obj->name;
 
-        $x = array( url => 'url/url_new.php?link_id='. $obj->layout_id.'&urlname='.urlencode($obj->name).'&url='.urlencode($_SERVER["REQUEST_URI"]),
+        $x = array( url => 'url/url_new.php?link_id='. $obj->layout_id.'&urlname='.urlencode($obj->name).'&url='.urlencode($_SERVER["REQUEST_URI"]),
                     confirm => false,
                     text => $lang['URLStoreQuery'],
                     info => sprintf($lang['URLStoreQueryI'],$text),

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20990

Modified Files:
	bug_overview.php 
Log Message:
fix


Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- bug_overview.php	22 Mar 2010 19:26:24 -0000	1.76
+++ bug_overview.php	31 Mar 2010 06:06:39 -0000	1.77
@@ -632,7 +632,7 @@
             $link = $tutos['base'].'/php/'.$this->link1;
             #            $link = delUrlParameter($link,"format");
             $link = addUrlParameter($link,"format=burndown");
-
+            $link = addSessionKey($link);
             $r .= "<tr>\n";
             $r .= $this->showfield($lang['BugBurndown']);
             $r .= ' <td colspan="5" valign="top"><img src="'. $link .'" alt="'. $lang['Bug'] .'" /></td>';

Update of /cvsroot/tutos/tutos/homepage
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24024

Modified Files:
	foot1.html.inc 
Log Message:
fix

Index: foot1.html.inc
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/foot1.html.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- foot1.html.inc	30 Mar 2010 18:48:23 -0000	1.2
+++ foot1.html.inc	30 Mar 2010 18:50:50 -0000	1.3
@@ -6,8 +6,6 @@
  <td class="navigate" colspan="1" valign="bottom"><center>
  <a href="http://www.sourceforge.net/projects/tutos"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=8047" width="88" height="31" border="0" alt="SourceForge Logo" /></a>
  <br />
- <a href="http://petition.eurolinux.org"><img src="http://petition.eurolinux.org/logos/patent_button.gif"  border="0" alt="No Software Patents" /></a>
- <br />
  <img src="../html/msfree.gif" border="0" alt="Proud to be Microsoft free" />
 <br />
 

Update of /cvsroot/tutos/tutos/homepage
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23356

Modified Files:
	status.html foot1.html.inc 
Log Message:
fix

Index: status.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/status.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- status.html	20 Aug 2008 12:59:06 -0000	1.22
+++ status.html	30 Mar 2010 18:48:23 -0000	1.23
@@ -7,7 +7,7 @@
 <!--$Id$ --> 
 <b>Status:</b>
 <p />
-Version 1.4.20080820 is released
+Version 1.6.20100330 is released
 <p />
 <b>CVS Tree:</b>
 <p />
@@ -18,7 +18,7 @@
 
 <b>Online Demo:</b>
 <p />
-An online demo (PHP with MySQL) of version 1.4 could be found <a href="HERE." rel="nofollow">http://demo.tutos.de/php/mytutos.php"><b>HERE</b></a>.
+An online demo (PHP with MySQL) of version 1.6 could be found <a href="HERE." rel="nofollow">http://demo.tutos.de/php/mytutos.php"><b>HERE</b></a>.
 <p />
 
 <table bgcolor="black" border="0" cellpadding="1" cellspacing="2"><tr><td>

Index: foot1.html.inc
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/foot1.html.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- foot1.html.inc	15 Aug 2008 13:09:17 -0000	1.1
+++ foot1.html.inc	30 Mar 2010 18:48:23 -0000	1.2
@@ -25,6 +25,9 @@
 <input type="image" src="https://www.paypal.com/images/x-click-butcc-donate.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!" />
 </form>
 
+<br />
+<script type="text/javascript" src="" rel="nofollow">http://www.ohloh.net/p/351/widgets/project_partner_badge.js"></script>
+
  </center></td>
  <td>
  </td>
@@ -45,4 +48,4 @@
 pageTracker._trackPageview();
 </script>
  </body>
-</html>
\ No newline at end of file
+</html>

Update of /cvsroot/tutos/tutos/php/reminder
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21376/php/reminder

Modified Files:
      Tag: BRANCH-1-6
	reminder.pinc 
Log Message:
fix

Index: reminder.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder.pinc,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -u -d -r1.42 -r1.42.2.1
--- reminder.pinc	19 Feb 2010 12:25:22 -0000	1.42
+++ reminder.pinc	30 Mar 2010 18:38:28 -0000	1.42.2.1
@@ -232,10 +232,11 @@
      */
     function replace_mail_tags($s,$lg) {
 
+        $this->read_reference();
         $s = parent::replace_mail_tags($s,$lg);
 
-        $s = preg_replace('/@REF@/',$this->ref->getFullName(),$s);
-        $s = preg_replace('/@REFTYPE@/',$lg[$this->ref->getType()],$s);
+        $s = preg_replace('/@REF@/',(is_object($this->ref) ? $this->ref->getFullName():''),$s);
+        $s = preg_replace('/@REFTYPE@/',(is_object($this->ref) ? $lg[$this->ref->getType()]:''),$s);
         $s = preg_replace('/@DESCRIPTION@/',$this->desc,$s);
         $s = preg_replace('/@INFO@/',$this->ref->getAsText($lg) ,$s);
         return $s;
@@ -1016,4 +1017,4 @@
         return $r;
     }
 }
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/reminder
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21138

Modified Files:
	reminder.pinc 
Log Message:
fix


Index: reminder.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder.pinc,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- reminder.pinc	19 Feb 2010 12:25:22 -0000	1.42
+++ reminder.pinc	30 Mar 2010 18:37:33 -0000	1.43
@@ -232,10 +232,11 @@
      */
     function replace_mail_tags($s,$lg) {
 
+        $this->read_reference();
         $s = parent::replace_mail_tags($s,$lg);
 
-        $s = preg_replace('/@REF@/',$this->ref->getFullName(),$s);
-        $s = preg_replace('/@REFTYPE@/',$lg[$this->ref->getType()],$s);
+        $s = preg_replace('/@REF@/',(is_object($this->ref) ? $this->ref->getFullName():''),$s);
+        $s = preg_replace('/@REFTYPE@/',(is_object($this->ref) ? $lg[$this->ref->getType()]:''),$s);
         $s = preg_replace('/@DESCRIPTION@/',$this->desc,$s);
         $s = preg_replace('/@INFO@/',$this->ref->getAsText($lg) ,$s);
         return $s;

Update of /cvsroot/tutos/tutos/php/note
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20199/php/note

Modified Files:
      Tag: BRANCH-1-6
	note.pinc 
Log Message:
fix

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.91
retrieving revision 1.91.2.1
diff -u -d -r1.91 -r1.91.2.1
--- note.pinc	7 Mar 2010 13:22:16 -0000	1.91
+++ note.pinc	30 Mar 2010 18:34:06 -0000	1.91.2.1
@@ -219,9 +219,9 @@
      */
     function replace_mail_tags($s,$lg) {
 
-
-        $s = preg_replace("/@REF@/",$this->ref->getFullName(),$s);
-        $s = preg_replace("/@REFTYPE@/",$lg[$this->ref->getType()],$s);
+        $this->read_reference();
+        $s = preg_replace("/@REF@/",(is_object ($this->ref) ? $this->ref->getFullName():''),$s);
+        $s = preg_replace("/@REFTYPE@/",(is_object ($this->ref) ? $lg[$this->ref->getType()]:''),$s);
         $s = preg_replace("/@NOTE@/",$this->note,$s);
         $s = preg_replace("/@REMEMBER@/",$this->remember->getDateTime(),$s);
 
@@ -828,4 +828,4 @@
         return $r;
     }
 }
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/note
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19906

Modified Files:
	note.pinc 
Log Message:
fix


Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- note.pinc	7 Mar 2010 13:22:16 -0000	1.91
+++ note.pinc	30 Mar 2010 18:32:26 -0000	1.92
@@ -219,9 +219,9 @@
      */
     function replace_mail_tags($s,$lg) {
 
-
-        $s = preg_replace("/@REF@/",$this->ref->getFullName(),$s);
-        $s = preg_replace("/@REFTYPE@/",$lg[$this->ref->getType()],$s);
+        $this->read_reference();
+        $s = preg_replace("/@REF@/",(is_object ($this->ref) ? $this->ref->getFullName():''),$s);
+        $s = preg_replace("/@REFTYPE@/",(is_object ($this->ref) ? $lg[$this->ref->getType()]:''),$s);
         $s = preg_replace("/@NOTE@/",$this->note,$s);
         $s = preg_replace("/@REMEMBER@/",$this->remember->getDateTime(),$s);
 

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18615/php/bugtracking

Modified Files:
      Tag: BRANCH-1-6
	bug.pinc 
Log Message:
fix

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.138
retrieving revision 1.138.2.1
diff -u -d -r1.138 -r1.138.2.1
--- bug.pinc	26 Mar 2010 13:27:12 -0000	1.138
+++ bug.pinc	30 Mar 2010 18:24:42 -0000	1.138.2.1
@@ -1126,7 +1126,7 @@
      * Delete Bug from DB
      */
     function delete() {
-        global $current_user;
+        global $current_user,$tutos;
 
         $msg = '';
 
@@ -1796,4 +1796,4 @@
         return $r;
     }
 }
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18043

Modified Files:
	bug.pinc 
Log Message:
fix


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- bug.pinc	26 Mar 2010 13:27:12 -0000	1.138
+++ bug.pinc	30 Mar 2010 18:20:29 -0000	1.139
@@ -1126,7 +1126,7 @@
      * Delete Bug from DB
      */
     function delete() {
-        global $current_user;
+        global $current_user,$tutos;
 
         $msg = '';
 

Update of /cvsroot/tutos/tutos/homepage
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14713/homepage

Modified Files:
	appliance.html download.html 
Log Message:
prepare release

Index: download.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/download.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- download.html	28 Mar 2010 11:29:09 -0000	1.46
+++ download.html	30 Mar 2010 18:00:02 -0000	1.47
@@ -10,9 +10,9 @@
 <p />
 <b>Versions:</b>
 <p />
-A <b>better overview</b> over released version is available at <a href="http://sourceforge.net/project/showfiles.php?group_id=8047http://sourceforge.net/project/showfiles.php?group_id=8047">http://sourceforge.net/project/showfiles.php?group_id=8047</a><br />
+A <b>better overview</b> over released version is available at <a href="http://sourceforge.net/project/showfiles.php?group_id=8047https://sourceforge.net/projects/tutos/files/">http://sourceforge.net/project/showfiles.php?group_id=8047</a><br />
 <ul>
- <li>1.5.20090629 on 29 June 2009: <a href="from" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=8047">from SOURCEFORGE</a></li>
+ <li>1.6.20100330 on 30 March 2010: <a href="from" rel="nofollow">https://sourceforge.net/projects/tutos/files/">from SOURCEFORGE</a></li>
 </ul>
 <p />
 You need the PHP package and optional some modules and languages. Themes are optional.<br />

Index: appliance.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/appliance.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- appliance.html	20 Aug 2008 12:31:07 -0000	1.2
+++ appliance.html	30 Mar 2010 18:00:01 -0000	1.3
@@ -7,7 +7,7 @@
 <!--$Id$ --> 
 <p />
 You will find a full featured TUTOS appliance here:
-<a href="at" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=8047&package_id=288411">at SOURCEFORGE</a>
+<a href="at" rel="nofollow">https://sourceforge.net/projects/tutos/files">at SOURCEFORGE</a>
 <p />
 This vmware appliance has all featured enabled and some demodata preloaded.
 <p />

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1755/php

Modified Files:
	config_default.pinc 
Log Message:
prepare release

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- config_default.pinc	30 Mar 2010 16:10:15 -0000	1.167
+++ config_default.pinc	30 Mar 2010 16:11:06 -0000	1.168
@@ -832,7 +832,7 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.6rc1.20100330';
+$tutos[version] = '1.6.20100330';
 #
 ### Local Variables: ***
 ### mode:iso-accents ***

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1606/php

Modified Files:
	config_default.pinc 
Log Message:
prepare release

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- config_default.pinc	28 Mar 2010 11:29:09 -0000	1.166
+++ config_default.pinc	30 Mar 2010 16:10:15 -0000	1.167
@@ -832,7 +832,7 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.6rc1.20100328';
+$tutos[version] = '1.6rc1.20100330';
 #
 ### Local Variables: ***
 ### mode:iso-accents ***

Update of /cvsroot/tutos/tutos
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1606

Modified Files:
	Makefile 
Log Message:
prepare release

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- Makefile	28 Mar 2010 11:29:08 -0000	1.119
+++ Makefile	30 Mar 2010 16:10:15 -0000	1.120
@@ -15,6 +15,9 @@
 #
 #
 # $Log$
+# Revision 1.120  2010/03/30 16:10:15  gokohnert
+# prepare release
+#
 # Revision 1.119  2010/03/28 11:29:08  gokohnert
 # prepare release
 #
@@ -405,7 +408,7 @@
 #
 
 # Primary Version
-VERSION = 1.6rc1
+VERSION = 1.6
 #
 # The full Version is VERSION.DATE
 #

Update of /cvsroot/tutos/tutos/php/scrum
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8042/php/scrum

Modified Files:
	scrum.pinc 
Log Message:
fix

Index: scrum.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/scrum/scrum.pinc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- scrum.pinc	28 Mar 2010 11:29:09 -0000	1.25
+++ scrum.pinc	30 Mar 2010 14:12:08 -0000	1.26
@@ -427,12 +427,18 @@
         if (! $obj->use_ok() ) return '';
 
         if ($obj->getTypeId() == useprojects ) {
-            $x = array( url => 'scrum/log_new.php?p_id='. $obj->id,
-                        confirm => false,
-                        text => ($text == '' ? $lang['ScrumLogNewP']:$text),
-                        'text2' => 'ScrumLogP',
-                        info => sprintf($lang['ScrumLogNewPI'], $obj->getFullName()),
-                        category => array(ScrumLog::gettypeid(),'new','module')
+            $x[] = array( url => 'scrum/log_new.php?p_id='. $obj->id,
+                          confirm => false,
+                          text => ($text == '' ? $lang['ScrumLogNewP']:$text),
+                          'text2' => 'ScrumLogP',
+                          info => sprintf($lang['ScrumLogNewPI'], $obj->getFullName()),
+                          category => array(ScrumLog::gettypeid(),'new','module')
+                );
+            $x[] = array( url => 'scrum/log_new.php?mode=manage_p&p_id='. $obj->id,
+                          confirm => false,
+                          text => ($text == '' ? $lang['ScrumLogManageP']:$text),
+                          info => $lang['ScrumLogManageP'],
+                          category => array(ScrumLog::gettypeid(),'support','module')
                 );
             return $x;
         }

Update of /cvsroot/tutos/tutos/php/testmanager
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17719/php/testmanager

Modified Files:
	testmanager.pinc testrun_new.php testsuite_ins.php 
	testsuite_new.php testsuite_overview.php 
Log Message:
fix

Index: testrun_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/testmanager/testrun_new.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- testrun_new.php	5 Mar 2010 13:03:04 -0000	1.19
+++ testrun_new.php	29 Mar 2010 17:56:13 -0000	1.20
@@ -127,17 +127,21 @@
             $r .= ' <td colspan="5"><select name="test_id" id="test_id">';
             testsuite::obj_read($this->obj->ref);
             foreach ($this->obj->ref->list[usetestsuite] as $i => $f) {
-                $r .= '  <option value="'.$i.'" '.($this->obj->test_id == $i ? 'selected="selected"':'').'>'.$f->getFullName()."</option>\n";
+                if ($f->state == TS_RELEASED)
+                    $r .= '  <option value="'.$i.'" '.($this->obj->test_id == $i ? 'selected="selected"':'').'>'.$f->getFullName()."</option>\n";
             }
             // also add testuites from neighbour projects
             $this->obj->ref->getNeighbours();
             foreach ($this->obj->ref->neighbours as $n) {
                 testsuite::obj_read($n);
                 foreach ($n->list[usetestsuite] as $i => $f) {
-                    $r .= '  <option value="'.$i.'" '.($this->obj->test_id == $i ? 'selected="selected"':'').'>'.$f->getFullName().' @'.$n->getFullName()."</option>\n";
+                    if ($f->state == TS_RELEASED)
+                        $r .= '  <option value="'.$i.'" '.($this->obj->test_id == $i ? 'selected="selected"':'').'>'.$f->getFullName().' @'.$n->getFullName()."</option>\n";
                 }
             }
-            $r .= " </select></td>\n";
+            $r .= " </select>\n";
+            $r .= '('.$lang['TestsuiteState'].' = '.$lang['TestsuiteStates'][2].')';
+            $r .= "</td>\n";
         }
         $r .= "</tr>\n";
 

Index: testsuite_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/testmanager/testsuite_overview.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- testsuite_overview.php	11 Mar 2010 13:39:11 -0000	1.13
+++ testsuite_overview.php	29 Mar 2010 17:56:13 -0000	1.14
@@ -58,7 +58,13 @@
             $r .= $this->orderHeader('ref_id',$lang['TestsuiteRef'],$this->link2);
             $this->flds++;
         }
+
         $r .= $this->orderHeader('name',$lang['TestsuiteName'],$this->link2);
+
+        if ($this->head['t_state']) {
+            $r .= $this->orderHeader('t_state',$lang['TestsuiteState'],$this->link2);
+            $this->flds++;
+        }
         $r .= show_custom_overview_headers($this,'testsuite',$this->link2);
         if ( $tutos[massupdate] == 1 ) {
             $r .= "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
@@ -88,8 +94,15 @@
             if ($this->head['refid']) {
                 $r .= ' <td>'. (is_object($b->ref) ? $b->ref->getLink():'?') .'</td>'."\n";
             }
+
+
             $x = $this->mark_filter(myentities($b->getFullName()),'name');
             $r .= ' <td>&nbsp;'.makeLink($b->getUrl(),$x).'</td>'."\n";
+
+            if ($this->head['t_state']) {
+                $r .= ' <td>'. $lang['TestsuiteStates'][$b->state] .'</td>'."\n";
+            }
+
             $r .= show_custom_overview_data($this,'testsuite',$b);
             if ( $tutos[massupdate] == 1 ) {
                 $r .= " <td align=\"center\">\n";
@@ -176,6 +189,7 @@
         $this->header = '';
         $hpre = '';
         $this->head['refid'] = true;
+        $this->head['t_state'] = true;
         $this->head['pos'] = false;
 
         $this->link1 = "testmanager/testsuite_overview.php";

Index: testsuite_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/testmanager/testsuite_new.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- testsuite_new.php	20 Nov 2009 20:26:08 -0000	1.10
+++ testsuite_new.php	29 Mar 2010 17:56:13 -0000	1.11
@@ -1,9 +1,9 @@
 <?php
 /**
- *  Copyright 2000 - 2009 by Gero Kohnert
+ *  Copyright 2000 - 2010 by Gero Kohnert
  *
- *  This program is free software; you can redistribute it and/or modify it 
- *  under the terms of the GNU General Public License as published by the   
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
  *  Free Software Foundation; version 2 of the License.
  *
  * @modulegroup testmanager
@@ -37,7 +37,7 @@
         $r .= $this->DataTableStart();
         $r .= $this->Headline();
         $r .= $this->acl_line(true);
-        
+
         if ( isset ($this->obj->id) && ( $this->obj->id != -1 ) ) {
             $this->addhidden("id",$this->obj->id);
         }
@@ -54,7 +54,8 @@
         if ($this->obj->id < 0) {
             $r .= $this->showdata($lang['TestsuiteStates'][$this->obj->state],3);
             $this->addhidden("state",$this->obj->state);
-        } else if ($this->obj->state != TS_RELEASED) {
+            #        } else if ($this->obj->state != TS_RELEASED) {
+        } else {
             $r .= "<td colspan=\"3\">\n";
             $r .= " <select id=\"state\" name=\"state\">\n";
             foreach($lang['TestsuiteStates'] as $i => $f) {
@@ -62,9 +63,9 @@
             }
             $r .= " </select>\n";
             $r .= "</td>\n";
-        } else {
-            $r .= $this->showdata($lang['TestsuiteStates'][$this->obj->state],3);
-            $this->addhidden("state",$this->obj->state);
+            #        } else {
+            #            $r .= $this->showdata($lang['TestsuiteStates'][$this->obj->state],3);
+            #            $this->addhidden("state",$this->obj->state);
         }
         $r .= "</tr>\n";
 
@@ -94,7 +95,7 @@
         $r .= edit_custom_fields($this,$this->obj->gettype(),$this->obj,6);
         // References to modules
         $r .= module_addforms($this->user,$this->obj,6);
-        
+
         $r .= "<tr>\n";
         if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
             $r .= submit_reset(0,1,2,1,2,0);
@@ -193,10 +194,10 @@
         $this->obj->setPosition($maxpos);
 
         if ( isset($_GET['desc']) ){
-          $this->obj->setDesc(StripSlashes($_GET['desc']));
+            $this->obj->setDesc(StripSlashes($_GET['desc']));
         }
         if ( isset($_GET['name']) ){
-          $this->obj->setName(StripSlashes($_GET['name']));
+            $this->obj->setName(StripSlashes($_GET['name']));
         }
 
         $this->obj->read_reference();
@@ -229,6 +230,6 @@
 $dbconn->Close();
 ?>
 <!--
-    CVS Info:  $Id$
-    $Author$
--->
+CVS Info:  $Id$
+     $Author$
+     -->
\ No newline at end of file

Index: testsuite_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/testmanager/testsuite_ins.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- testsuite_ins.php	2 Dec 2009 07:45:29 -0000	1.13
+++ testsuite_ins.php	29 Mar 2010 17:56:13 -0000	1.14
@@ -1,9 +1,9 @@
 <?php
 /**
- *  Copyright 1999 - 2009 by Gero Kohnert
+ *  Copyright 1999 - 2010 by Gero Kohnert
  *
- *  This program is free software; you can redistribute it and/or modify it 
- *  under the terms of the GNU General Public License as published by the   
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
  *  Free Software Foundation; version 2 of the License.
  *
  * this script parses all the inputs and stores the object into the database.
@@ -32,16 +32,16 @@
         $x = new testrun($this->obj->dbconn);
         $r = '';
         $r .= $this->DataTableStart();
-//         $r .= $this->obj;
-//         foreach ($this->obj->list[usetestsuite] as $i) {
-//           $r .= $i.'<br>';
-//         }
-//         foreach ($this->obj->list[usetestcase] as $i) {
-//           $r .= $i.'<br>';
-//         }
+        //         $r .= $this->obj;
+        //         foreach ($this->obj->list[usetestsuite] as $i) {
+        //           $r .= $i.'<br>';
+        //         }
+        //         foreach ($this->obj->list[usetestcase] as $i) {
+        //           $r .= $i.'<br>';
+        //         }
         $r .= $x->printinputrow($this->obj,6,1);
         $r .= $this->DataTableEnd();
-//         $r .= $testout;
+        //         $r .= $testout;
         return $r;
     }
     Function prepare() {
@@ -114,9 +114,9 @@
     $pos = array();
     $level = 0;
     $ref[0] = $obj->ref_id;
-#    $refo[$obj->ref_id] = $obj;
+    #    $refo[$obj->ref_id] = $obj;
     $pos[0] = 1;
-    
+
 
     setlocale(LC_CTYPE, 'en_US.UTF-8');
     $fd= fopen($_FILES['file1']['tmp_name'].'.conv','rb');
@@ -224,7 +224,7 @@
 #      echo $testout;
         $x = new TestSuiteTest($current_user);
         foreach ($ref as $i => $j) {
-#          $testout .= $i .' '. $j .' '. $refo[$j].' '.count ($refo[$j]->list[usetestsuite]). '<br>';
+            #          $testout .= $i .' '. $j .' '. $refo[$j].' '.count ($refo[$j]->list[usetestsuite]). '<br>';
         }
         $x->display();
         exit;
@@ -249,6 +249,9 @@
 if ( isset($_POST['pos']) ) {
     $obj->setPosition($_POST['pos']);
 }
+if ( isset($_POST['state']) ) {
+    $obj->setState($_POST['state']);
+}
 #
 # Parse additional custom fields
 #

Index: testmanager.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/testmanager/testmanager.pinc,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- testmanager.pinc	22 Mar 2010 19:26:24 -0000	1.62
+++ testmanager.pinc	29 Mar 2010 17:56:13 -0000	1.63
@@ -221,21 +221,21 @@
     }
 
     /**
-     * set the name
+     * set the name of TC
      */
     function setName($value) {
         return $this->setStrField('name',trim($value),'TestcaseName');
     }
 
     /**
-     * set the steps
+     * set the TC steps
      */
     function setSteps($value) {
         return $this->setStrField('steps',trim($value),'TestcaseSteps');
     }
 
     /**
-     * set the expected result
+     * set the TS expected result
      */
     function setExpected($value) {
         return $this->setStrField('expected',trim($value),'TestcaseExpected');
@@ -870,6 +870,8 @@
         if ($obj->getType() == "testcase" ) return '';
         if ($obj->getType() == "bug" ) return '';
 
+        if ( ($obj->getTypeId() == usetestsuite) && ($obj->state == TS_RELEASED) ) return '';
+
         $x = array( url => 'testmanager/testcase_new.php?ref_id='. $obj->id,
                     confirm => false,
                     text => ($text == "" ? $lang['TestcaseCreate']:$text),
@@ -1104,6 +1106,9 @@
         if ( $this->activ == 1 ) {
             return 0;
         }
+#        if ( $this->state == TS_RELEASED ) {
+#            return 0;
+        #        }
         return parent::mod_ok();
     }
 
@@ -1531,6 +1536,8 @@
         case 'TestsuiteRef':
             $x = resolve_history_obj($f,$this->dbconn);
             break;
+        case 'TestsuiteState':
+            $x = resolve_history_lgarr ($f,'TestsuiteStates');
         }
         return $x;
     }
@@ -1595,9 +1602,9 @@
         if ( $obj->id < 0 ) return '';
         if (! $user->feature_ok(usetestsuite,PERM_NEW) ) return '';
         if (! $obj->use_ok() ) return '';
-#        if ($obj->getType() == "testsuite" ) return '';
+        if ( ($obj->getTypeId() == usetestsuite) && ($obj->state == TS_RELEASED) ) return '';
 
-        $x = array( url => "testmanager/testsuite_new.php?ref_id=". $obj->id,
+        $x = array( url => 'testmanager/testsuite_new.php?ref_id='. $obj->id,
                     confirm => false,
                     text => ($text == "" ? $lang['TestsuiteCreate']:$text),
                     info => sprintf($lang['TestsuiteCreateInfo'], $obj->getFullName()),