tutos-commits Mailing List for TUTOS (Page 29)

Revision: 615
          http://tutos.svn.sourceforge.net/tutos/?rev=615&view=rev
Author:   gokohnert
Date:     2012-05-21 15:36:25 +0000 (Mon, 21 May 2012)
Log Message:
-----------
use user

Modified Paths:
--------------
    trunk/php/admin/backup.php

Modified: trunk/php/admin/backup.php
===================================================================
--- trunk/php/admin/backup.php	2012-05-19 06:31:11 UTC (rev 614)
+++ trunk/php/admin/backup.php	2012-05-21 15:36:25 UTC (rev 615)
@@ -18,8 +18,6 @@
 require_once 'permission.p3';
 
 loadlayout();
-$lang = array();
-ReadLang($lang);
 
 class Backup extends layout {
     Function info() {
@@ -28,9 +26,6 @@
     }
 }
 
-$l = new Backup($current_user);
-$l->PageHeader('BACKUP');
-
 if ( ! isset($_GET['dbnr']) ) {
     $dbnr = 0;
 } else {
@@ -43,6 +38,20 @@
     die ('No database with id '.$dbnr.' found');
 }
 
+$current_user = new tutos_user($dbconn);
+$current_user->f_name = 'TUTOS';
+$current_user->m_name = '';
+$current_user->l_name = '(remember service)';
+$current_user->admin = 1;
+
+$lang = array();
+ReadLang($lang);
+
+
+$l = new Backup($current_user);
+$l->PageHeader('BACKUP');
+
+
 /**
  * add a dir
  */

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

Revision: 614
          http://tutos.svn.sourceforge.net/tutos/?rev=614&view=rev
Author:   gokohnert
Date:     2012-05-19 06:31:11 +0000 (Sat, 19 May 2012)
Log Message:
-----------
fix for some strange links

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

Modified: trunk/php/permission.p3
===================================================================
--- trunk/php/permission.p3	2012-05-18 13:21:49 UTC (rev 613)
+++ trunk/php/permission.p3	2012-05-19 06:31:11 UTC (rev 614)
@@ -25,6 +25,14 @@
 require_once 'Date.pinc';
 require_once 'user.pinc';
 
+// clean
+if (isset($_SERVER["REQUEST_URI"]) && strpos($_SERVER["REQUEST_URI"],'//') === 0) {
+    Header("Content-Description: TUTOS Redirect" );
+    Header("Status: 301 Moved Permanently");
+    Header("Location: ". substr($_SERVER["REQUEST_URI"],1),true,301);
+    exit;
+}
+
 $tutos['memcache'] = null;
 if ( count($tutos[memcache_hosts]) && class_exists("memcache")) {
     $tutos['memcache'] = new memcache();

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

Revision: 613
          http://tutos.svn.sourceforge.net/tutos/?rev=613&view=rev
Author:   gokohnert
Date:     2012-05-18 13:21:49 +0000 (Fri, 18 May 2012)
Log Message:
-----------
fix

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

Modified: trunk/php/acl_overview.php
===================================================================
--- trunk/php/acl_overview.php	2012-05-18 13:17:59 UTC (rev 612)
+++ trunk/php/acl_overview.php	2012-05-18 13:21:49 UTC (rev 613)
@@ -304,7 +304,8 @@
         foreach($tutos[modules] as $x) {
             if ( isset($lang[$x['perm']]) ) {
                 $ref = new $x[name]($this->user->dbconn);
-                $r .= ' <li>'. menulink('acl_overview.php?xtype='. $ref->tablename.$pre,$lang[$x['perm']].'&nbsp;(M)',$lang[$x['perm']]) ."</li>\n";
+                if ($ref->tablename != 'UNKNOWN')
+                    $r .= ' <li>'. menulink('acl_overview.php?xtype='. $ref->tablename.$pre,$lang[$x['perm']].'&nbsp;(M)',$lang[$x['perm']]) ."</li>\n";
             }
         }
         $r .= "</ul></td></tr>\n";

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

Revision: 612
          http://tutos.svn.sourceforge.net/tutos/?rev=612&view=rev
Author:   gokohnert
Date:     2012-05-18 13:17:59 +0000 (Fri, 18 May 2012)
Log Message:
-----------
fix

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

Modified: trunk/php/timetrack/timetrack.pinc
===================================================================
--- trunk/php/timetrack/timetrack.pinc	2012-05-18 06:11:14 UTC (rev 611)
+++ trunk/php/timetrack/timetrack.pinc	2012-05-18 13:17:59 UTC (rev 612)
@@ -61,7 +61,7 @@
 /**
  * Read a summary of times for given object
  */
-function readTimetrackSum (&$obj) {
+function readTimetrackSum (tutos_base $obj) {
     global $table;
 
     $obj->timetracksum = 0;
@@ -869,7 +869,7 @@
             $d .= makelink('timetrack/timetrack_overview.php?link_id='. $obj->id ,hour_format($obj->timetracksum),$lang['TimetrackOverview']).'</div>';
             $d .= '&#160;'.$lang['hours'] ."\n";
             $timesum += $obj->timetracksum;
-            if (is_array($obj->tsum))
+            if (isset($obj->tsum) && is_array($obj->tsum))
                 foreach ($obj->tsum as $i => $f) {
                     if ( $obj->tsum[$i] > 0 ) {
                         $d .= '<br/><div align="right" style="width:10em;display:inline;float:left">';

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

Revision: 611
          http://tutos.svn.sourceforge.net/tutos/?rev=611&view=rev
Author:   gokohnert
Date:     2012-05-18 06:11:14 +0000 (Fri, 18 May 2012)
Log Message:
-----------
fix

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

Modified: trunk/php/mail.pinc
===================================================================
--- trunk/php/mail.pinc	2012-05-16 11:22:22 UTC (rev 610)
+++ trunk/php/mail.pinc	2012-05-18 06:11:14 UTC (rev 611)
@@ -711,15 +711,16 @@
     function mail(&$user) {
         parent::mail_body();
         $this->resetBodies();
-        $this->dbconn = $user->dbconn;
-        $this->user = $user;
-        $this->subject = "";
+        $this->dbconn  = $user->dbconn;
+        $this->user    = $user;
+        $this->subject = '';
         $this->resetTo();
-        $this->hdr = array();
-        $this->fd = false;
-        $this->prio = 0;
-        $this->date = "";
-        $this->from_adr = "";
+        $this->hdr         = array();
+        $this->fd          = false;
+        $this->prio        = 0;
+        $this->date        = '';
+        $this->from        = null;
+        $this->from_adr    = '';
         $this->show_header = false;
 
         $this->replyurl= "mail_new.php";
@@ -1010,7 +1011,7 @@
             $r .= sprintf('%-10s: ',$lang['MailFrom']);
             if ($this->from_adr != "") {
                 $r .= $this->adr_format($this->from_adr) ."\n";
-            } else if (is_object($this->from)) {
+            } else if (isset($this->from) && is_object($this->from)) {
                 $r .= $this->from->getLink() ."\n";
             }
             $r .= sprintf('%-10s: ',$lang['MailDate']). $this->date ."\n";

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

Revision: 610
          http://tutos.svn.sourceforge.net/tutos/?rev=610&view=rev
Author:   gokohnert
Date:     2012-05-16 11:22:22 +0000 (Wed, 16 May 2012)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/php/admin/update.php
    trunk/php/custom.pinc
    trunk/php/db/db_mysqli.pinc
    trunk/php/db/db_pg.pinc
    trunk/php/webelements.p3

Modified: trunk/php/admin/update.php
===================================================================
--- trunk/php/admin/update.php	2012-05-16 09:07:28 UTC (rev 609)
+++ trunk/php/admin/update.php	2012-05-16 11:22:22 UTC (rev 610)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2011 by Gero Kohnert
+ *  Copyright 2002 - 2012 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -19,7 +19,6 @@
 require_once 'webelements.p3';
 require_once 'permission.p3';
 
-loadmodules("admin","update");
 loadlayout();
 
 /**
@@ -33,19 +32,19 @@
         global $table, $tableidx, $sequence, $tutos, $current_user;
 
         $r = '';
-        echo "<h2>". $this->dbc->getFullName() ."</h2>\n";
-        echo $this->dbc->before_update_db();
+        echo "<h2>". $this->obj->getFullName() ."</h2>\n";
+        echo $this->obj->before_update_db();
         echo "<p />TABLES<p />\n";
 
         foreach ($table as $i => $f) {
             echo $f[Desc] ."<br />\n";
-            if (!is_object($this->dbc->createtable($f))) {
-                if ( $tutos[debug] != 0 ) {
-                    echo "Table ". $f[name] ." not created:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
-                }
+            echo "&nbsp;Table ". $f[name];
+            if (!is_object($this->obj->createtable($f))) {
+                echo  ' not created: <span class="warn">'. $this->obj->lasterror .'</span>';
             } else {
-                echo "<span class=\"found\">Table <b>". $f[name] ."</b> created</span><br />\n";
+                echo ' <span class="found">created</span>';
             }
+            echo "<br />\n";
             flush();
         }
 
@@ -58,81 +57,88 @@
                 }
                 if (isset($f2['ftype']) && ($f2['ftype'] == 'ObjectRel')) continue;
                 if (isset($f2['ftype']) && ($f2['ftype'] == 'ObjectRelBack')) continue;
-                if (!is_object($this->dbc->createcolumn($f[name],$i2,$f2))) {
+                echo '&nbsp;Column '.$f[name].' ('.$i2.') ';
+                if (!is_object($this->obj->createcolumn($f[name],$i2,$f2))) {
+                    echo 'not created: <span class="warn">'. $this->obj->lasterror .'</span>';
                     // nothing created (try an alter table to fix sizes)
                 } else {
-                    echo "Column <span class=\"found\">". $f[name] ." (". $i2 .")</span> updated<br />\n";
+                    echo ' <span class="found">updated</span>';
                 }
+                echo "<br />\n";
             }
             flush();
         }
 
         echo "<p />INDICES<p />\n";
         foreach ($tableidx as $i => $f) {
-            echo $f[Desc] ."<br />\n";
-            if (!is_object($this->dbc->createindex($f))) {
+            echo $f[Desc] .' Index '.$f[name];
+            if (!is_object($this->obj->createindex($f))) {
+                echo ' not created: <span class="warn">'. $this->obj->lasterror .'</span>';
             } else {
-                echo "<span class=\"found\">Index <b>". $f[name] ."</b> created</span><br />\n";
+                echo ' <span class="found">created</span>';
             }
+            echo "<br />\n";
             flush();
         }
         echo "<p />SEQUENCERS<p />\n";
         foreach ($sequence as $i => $f) {
-            echo $f[Desc] ."<br />\n";
-            if (!is_object($this->dbc->createsequence($f))) {
+            echo $f[Desc] .' Sequence '.$f[name];
+            if (!is_object($this->obj->createsequence($f))) {
+                echo ' not created: <span class="warn">'. $this->obj->lasterror .'</span>';
             } else {
-                echo "<span class=\"found\">Sequence <b>". $f[name] ."</b> created</span><br />\n";
+                echo ' <span class="found">created</span>';
             }
+            echo "<br />\n";
             flush();
         }
 
         // Update the DB entry
         // The current DB entry is always that with the ID 1
-        $this->dbc->db->read_update();
+        $this->obj->db->read_update();
 
-        echo "DB Version:". $this->dbc->db->version ."<br />";
+        echo "DB Version:". $this->obj->db->version ."<br />";
         echo "TUTOS Version:". $tutos[version] ."<br />";
-        $oldv =  preg_replace("#[a-z\.]#i","",$this->dbc->db->version);
+        $oldv =  preg_replace("#[a-z\.]#i","",$this->obj->db->version);
         $newv =  preg_replace("#[a-z\.]#i","",$tutos[version]);
 
         if ( $oldv < 1120021026 ) {
             // special update
             $updatefailed = false;
-            echo "<h3>Special update for ". $tutos[version] ." from ". $this->dbc->db->version ."</h3><br />";
+            echo "<h3>Special update for ". $tutos[version] ." from ". $this->obj->db->version ."</h3><br />";
             $tmpname = 'acl_temp';
             // drop temp table
-            if (!is_object($this->dbc->droptable($tmpname)) ) {
+            if (!is_object($this->obj->droptable($tmpname)) ) {
             }
-            if (!is_object($this->dbc->dropindex($tableidx['acl1'])) ) {
+            if (!is_object($this->obj->dropindex($tableidx['acl1'])) ) {
             }
-            if (!is_object($this->dbc->dropindex($tableidx['acl2'])) ) {
+            if (!is_object($this->obj->dropindex($tableidx['acl2'])) ) {
             }
             // rename acl
-            if (!is_object($this->dbc->renametable($table['acl'],$tmpname)) ) {
+            if (!is_object($this->obj->renametable($table['acl'],$tmpname)) ) {
                 $updatefailed = true;
-                echo "Table  not renamed:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
+                echo "Table  not renamed:<span class=\"warn\">". $this->obj->lasterror ."</span><br />\n";
             }
             // create acl
-            if (!is_object($this->dbc->createtable($table['acl'])) ) {
+            if (!is_object($this->obj->createtable($table['acl'])) ) {
                 $updatefailed = true;
-                echo "Table  not created:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
+                echo "Table  not created:<span class=\"warn\">". $this->obj->lasterror ."</span><br />\n";
             }
-            if (!is_object($this->dbc->createindex($tableidx['acl1'])) ) {
+            if (!is_object($this->obj->createindex($tableidx['acl1'])) ) {
                 $updatefailed = true;
-                echo "Index  not created:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
+                echo "Index  not created:<span class=\"warn\">". $this->obj->lasterror ."</span><br />\n";
             }
-            if (!is_object($this->dbc->createindex($tableidx['acl2'])) ) {
+            if (!is_object($this->obj->createindex($tableidx['acl2'])) ) {
                 $updatefailed = true;
-                echo "Index  not created:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
+                echo "Index  not created:<span class=\"warn\">". $this->obj->lasterror ."</span><br />\n";
             }
             // fill
-            $q = "insert into ". $this->dbc->prefix . $table['acl'][name] ." (obj_id,adr_id,perm)";
-            if ( $this->dbc->getType() == "Postgres" ) {
-                $q .= " select obj_id,adr_id,int4(perm) from ". $this->dbc->prefix . $tmpname;
+            $q = "insert into ". $this->obj->prefix . $table['acl'][name] ." (obj_id,adr_id,perm)";
+            if ( $this->obj->getType() == "Postgres" ) {
+                $q .= " select obj_id,adr_id,int4(perm) from ". $this->obj->prefix . $tmpname;
             } else {
-                $q .= " select obj_id,adr_id,perm from ". $this->dbc->prefix . $tmpname;
+                $q .= " select obj_id,adr_id,perm from ". $this->obj->prefix . $tmpname;
             }
-            $this->dbc->Exec($q,0);
+            $this->obj->Exec($q,0);
             if ( $updatefailed ) {
                 echo "Update failed<br />\n";
             }
@@ -140,33 +146,15 @@
         if ( $oldv < 1320050108 ) {
             // special update
             $updatefailed = false;
-            echo "<h3>Special update for ". $tutos[version] ." from ". $this->dbc->db->version ."</h3><br />";
+            echo "<h3>Special update for ". $tutos[version] ." from ". $this->obj->db->version ."</h3><br />";
 
-            /**
-             $tmpname = 's_start_temp';
-             if ($this->dbc->renamecolumn($table['task'],"s_start",$tmpname) == -2) {
-             $updatefailed = true;
-             echo "Column  not renamed:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
-             }
-             if ($this->dbc->createcolumn($table['task'][name],"s_start",$table['task']["s_start"]) == -2) {
-             $updatefailed = true;
-             echo "Column s_start not created:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
-             }
-             fill
-             $q = "update ". $this->dbc->prefix . $table['task'][name] ." set s_start = ". $tmpname;
-             $this->dbc->Exec($q,0);
-             if ($this->dbc->dropcolumn($table['task'],$tmpname) == -2) {
-             $updatefailed = true;
-             echo "Column s_start_temp not dropped:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
-             }
-            ***/
-            if (!is_object($this->dbc->dropnotnull($table['task'],"s_start"))) {
+            if (!is_object($this->obj->dropnotnull($table['task'],"s_start"))) {
                 $updatefailed = true;
-                echo "Column attribute NOT NULL not dropped:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
+                echo "Column attribute NOT NULL not dropped:<span class=\"warn\">". $this->obj->lasterror ."</span><br />\n";
             }
-            if (!is_object($this->dbc->dropnotnull($table['task'],"s_end"))) {
+            if (!is_object($this->obj->dropnotnull($table['task'],"s_end"))) {
                 $updatefailed = true;
-                echo "Column attribute NOT NULL not dropped:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
+                echo "Column attribute NOT NULL not dropped:<span class=\"warn\">". $this->obj->lasterror ."</span><br />\n";
             }
 
             if ( $updatefailed ) {
@@ -176,23 +164,23 @@
         // Prior to 1.3.20060701
         if ( $oldv < 1320060701 ) {
             $updatefailed = false;
-            echo "<h3>Special update for ". $tutos[version] ." from ". $this->dbc->db->version ."</h3><br />";
+            echo "<h3>Special update for ". $tutos[version] ." from ". $this->obj->db->version ."</h3><br />";
             $tmpname = 'repeat_type';
             echo "<h3>".$table['appointment1'][name]."</h3><br />";
-            if ($this->dbc->dropcolumn($table['appointment1'],$tmpname) == -2) {
+            if ($this->obj->dropcolumn($table['appointment1'],$tmpname) == -2) {
             }
-            if ($this->dbc->renamecolumn($table['appointment1'],"repeat",$tmpname) == -2) {
+            if ($this->obj->renamecolumn($table['appointment1'],"repeat",$tmpname) == -2) {
                 $updatefailed = true;
-                echo "Column  not renamed:<span class=\"warn\">". $this->dbc->lasterror ."</span><br />\n";
+                echo "Column  not renamed:<span class=\"warn\">". $this->obj->lasterror ."</span><br />\n";
             }
             if ( $updatefailed ) {
                 echo "Update failed<br />\n";
             }
         }
         if ( $oldv < 1720111008 ) {
-            echo "<h3>Special update for ". $tutos[version] ." from ". $this->dbc->db->version ."</h3><br />";
+            echo "<h3>Special update for ". $tutos[version] ." from ". $this->obj->db->version ."</h3><br />";
             echo "DROP Primary key for t_config<br />";
-            if (!is_object($this->dbc->dropprimary($table['tutos_config']))) {
+            if (!is_object($this->obj->dropprimary($table['tutos_config']))) {
                 //                echo $this->dbc->lastquery ."<br />";
                 //                echo $this->dbc->lasterror. "<br />";
             };
@@ -201,11 +189,11 @@
         if ($tutos[usedocmanagement]) {
         }
 
-        $this->dbc->db->SetVersion($tutos[version]);
-        $current_user->dbconn = &$this->dbc;
-        $this->dbc->db->save();
+        $this->obj->db->SetVersion($tutos[version]);
+        #        $current_user->dbconn = &$this->dbc;
+        $this->obj->db->save();
 
-        echo $this->dbc->after_update_db();
+        echo $this->obj->after_update_db();
         echo $this->error("If everything works disable this script");
         return $r;
     }
@@ -216,34 +204,14 @@
     Function prepare() {
         global $table,$sequence,$tableidx,$tutos,$msg,$lang;
 
-
-        $this->nomenu = true;
-
-        if ( ! minimum_version(minimumversion) ) {
-            $msg .= "<br />\nSorry TUTOS needs a PHP Version >=  ". minimumversion ."<br />\n";
-            $msg .= "you are using ". phpversion() ."<br />\n";
+        if ( $tutos[demo] != 0 ) {
+            $msg = addLine($msg,"will not work in demo");
             $this->stop = true;
-        }
-
-        if (  isset($_GET['id']) ) {
-            if ( $this->user->id == -1 ) {
-                ReadLang($lang);
-            }
-            if ( isset($tutos[dbname][$_GET['id']] ) ) {
-                $this->dbc = DB_Open($_GET['id'],false);
-            } else {
-                $msg .= "<br />The given database id ". $_GET['id'] ." is not defined in you configuration";
-                $this->stop = true;
-                return;
-            }
-        } else {
-            ReadLang($lang);
-            /* Check if user is allowed to use it */
-            $msg .= "<br />Please add a Database ID like ?id=0 to the URL<br />(see config.php for databae definitions)";
-            $this->stop = true;
             return;
         }
 
+        $this->nomenu = true;
+        $this->obj = $this->dbconn;
 
         // read the table definitions of modules
         foreach ($tutos[modules] as $r => $x) {
@@ -253,18 +221,34 @@
         }
         $this->name = $lang['DBUpdate'];
 
-        if ( $tutos[demo] != 0 ) {
-            $msg .= "will not work in demo";
-            $this->stop = true;
-        }
     }
 }
 
-$dbc = null;
-$x = new tutos_user($dbc);
-$current_user = &$x;
+// run this before everything else
+if ( ! minimum_version(minimumversion) ) {
+    echo "<br />\nSorry TUTOS needs a PHP Version >=  ". minimumversion ."<br />\n";
+    echo "you are using ". phpversion() ."<br />\n";
+    exit;
+}
 
-$l = new Admin_update($x);
+if (  isset($_GET['id']) ) {
+    if ( isset($tutos[dbname][$_GET['id']] ) ) {
+        $dbc = DB_Open($_GET['id'],false);
+    } else {
+        echo  "<br />The given database id ". $_GET['id'] ." is not defined in you configuration";
+        exit;
+    }
+} else {
+    /* Check if user is allowed to use it */
+    echo "<br />Please add a Database ID like ?id=0 to the URL<br />(see config.php for database definitions)";
+    exit;;
+}
+
+$current_user = new tutos_user($dbc);
+ReadLang($lang);
+loadmodules("admin","update");
+
+$l = new Admin_update($current_user);
 $l->display();
 ?>
 <!--

Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc	2012-05-16 09:07:28 UTC (rev 609)
+++ trunk/php/custom.pinc	2012-05-16 11:22:22 UTC (rev 610)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 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
@@ -386,7 +386,7 @@
         // get a list of canidates
         if (isset($this->x['method']) && method_exists($this->obj,$this->x['method'])) {
             $m = $this->x['method'];
-            $xx = $this->obj->$m['method']();
+            $xx = $this->obj->$m();
         } else if (isset($this->x['function']) && function_exists($this->x['function'])) {
             $xx = $this->x['function']($this->obj);
         } else {
@@ -946,7 +946,7 @@
 
         if (isset($this->x['method']) && method_exists($this->obj,$this->x['method'])) {
             $m = $this->x['method'];
-            $xp = $this->obj->$m['method']($fn);
+            $xp = $this->obj->$m($fn);
         } else if (isset($this->x['function']) && function_exists($this->x['function'])) {
             $xp = $this->x['function']($this->obj,$fn);
         } else {

Modified: trunk/php/db/db_mysqli.pinc
===================================================================
--- trunk/php/db/db_mysqli.pinc	2012-05-16 09:07:28 UTC (rev 609)
+++ trunk/php/db/db_mysqli.pinc	2012-05-16 11:22:22 UTC (rev 610)
@@ -263,6 +263,13 @@
     }
 
     /**
+     * return a representation of a string
+     */
+    function string($t) {
+        return "'". $this->conn->real_escape_string($t) ."'";
+    }
+
+    /**
      * get a next uniq id from a sequence
      */
     function nextid($name = "id") {

Modified: trunk/php/db/db_pg.pinc
===================================================================
--- trunk/php/db/db_pg.pinc	2012-05-16 09:07:28 UTC (rev 609)
+++ trunk/php/db/db_pg.pinc	2012-05-16 11:22:22 UTC (rev 610)
@@ -325,6 +325,9 @@
         $this->lastquery = $query;
         $r_error = pg_result_error($r->rs);
         if ($r_error != '') {
+            if ($tutos['sqldebug']) {
+                error_log('## '.$this->error()."\r\n",3,$tutos[errlog].'.sql');
+            }
             if ($showerror == 1) {
                 Fatal_Error("Exec ". $this->conn .'|'. $r_error.'|'.$this->error(),$query);
             } else {
@@ -535,13 +538,13 @@
         global $tutos;
 
         if ( $this->conn != -1 ) {
-            #$msg = pg_last_error($this->conn);
+            $msg = pg_last_error($this->conn);
             // DOES not work on ubuntu 10.10
-            $msg = ' error ';
+            #$msg = ' error ';
         } else {
             $msg = "no connection";
         }
-        return "DBerror: ". $this->getFullname() ." ". $msg;
+        return $msg;
     }
 
     /**
@@ -673,11 +676,11 @@
         }
         // Update the comment
         $q = 'COMMENT ON COLUMN '. $this->prefix . $tblname .".". $this->colname($colname) ." IS '". $col[Desc] ."'";
-        $r = $this->exec($q,0);
+        $r2 = $this->exec($q,0);
 
         // Reset constraints
         $q = 'ALTER TABLE '. $this->prefix . $tblname .' DROP CONSTRAINT c_'. $this->colname($colname);
-        $r = $this->exec($q,0);
+        $r3 = $this->exec($q,0);
 
         $q = 'ALTER TABLE '. $this->prefix . $tblname .' ADD CONSTRAINT c_'. $this->colname($colname) ." " ;
         $c = $col[constraints];
@@ -686,7 +689,7 @@
         $c = preg_replace('/NN/','CHECK ('. $this->colname($colname) .' is not null)',$c);
         if ( $c != "" ) {
             $q .=  $c;
-            $r = $this->exec($q,0);
+            $r4 = $this->exec($q,0);
         }
         return $r;
     }

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2012-05-16 09:07:28 UTC (rev 609)
+++ trunk/php/webelements.p3	2012-05-16 11:22:22 UTC (rev 610)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 Gero Kohnert
+ *  Copyright 1999 - 2012 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
@@ -2545,7 +2545,7 @@
  * HTTP Header for exporting files
  * do not allow caching
  */
-function export_headers($filename = '',$type = '') {
+function export_headers($filename = '',$type = '',$attach = true) {
     if(headers_sent()) {
         Fatal_Error('Some data has already been output to browser, can\'t send "'.$type.'" file');
     }
@@ -2572,7 +2572,10 @@
             $filename .= '_'.date('YmdHis').'.xml';
             Header("Content-Type: text/xml");
         }
-        Header('Content-Disposition: attachment; filename="'.$filename.'"');
+        if ($attach)
+            Header('Content-Disposition: attachment; filename="'.$filename.'"');
+        else
+            Header('Content-Disposition: inline; filename="'.$filename.'"');
     }
 }
 

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

Revision: 609
          http://tutos.svn.sourceforge.net/tutos/?rev=609&view=rev
Author:   gokohnert
Date:     2012-05-16 09:07:28 +0000 (Wed, 16 May 2012)
Log Message:
-----------
better positioning

Modified Paths:
--------------
    trunk/php/testmanager/testsuite_ins.php
    trunk/php/testmanager/testsuite_new.php

Modified: trunk/php/testmanager/testsuite_ins.php
===================================================================
--- trunk/php/testmanager/testsuite_ins.php	2012-05-15 07:01:59 UTC (rev 608)
+++ trunk/php/testmanager/testsuite_ins.php	2012-05-16 09:07:28 UTC (rev 609)
@@ -134,9 +134,12 @@
 
 $obj = new testsuite($dbconn);
 
+$newts = true;
+
 if ( isset($_POST['id']) ) {
     $obj = $obj->read($_POST['id'],$obj);
     $gotourl= addUrlParameter($gotourl,'id='. $obj->id,true);
+    $newts = false;
 }
 
 if ($obj->activ == 1) {
@@ -342,7 +345,20 @@
 }
 if ( isset($_POST['pos']) ) {
     $obj->setPosition($_POST['pos']);
+} else if ($newts) {
+    // a new ts will go to the end of the list
+    $q = 'select max(pos) as x , count(id) as y from '. $dbconn->prefix.$table['testsuite'][name] .' where ref_id = '.  $obj->ref_id;
+    $r = $dbconn->exec($q);
+    if ($r->numrows() == 1) {
+        $maxpos = $r->get(0,'x');
+        $count = $r->get(0,'y');
+    }
+    $maxpos = max($count,$maxpos);
+    $maxpos++;
+    $r->free();
+    $obj->setPosition($maxpos);
 }
+
 if ( isset($_POST['state']) ) {
     $statechange = $obj->setState($_POST['state']);
 }

Modified: trunk/php/testmanager/testsuite_new.php
===================================================================
--- trunk/php/testmanager/testsuite_new.php	2012-05-15 07:01:59 UTC (rev 608)
+++ trunk/php/testmanager/testsuite_new.php	2012-05-16 09:07:28 UTC (rev 609)
@@ -41,7 +41,7 @@
         if ( isset ($this->obj->id) && ( $this->obj->id != -1 ) ) {
             $this->addhidden("id",$this->obj->id);
         }
-        $this->addhidden("pos",$this->obj->pos);
+        //        $this->addhidden("pos",$this->obj->pos);
 
         $r .= "<tr>\n";
         $r .= $this->showfieldc($lang['TestsuiteName'],1,'name');

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

Revision: 608
          http://tutos.svn.sourceforge.net/tutos/?rev=608&view=rev
Author:   gokohnert
Date:     2012-05-15 07:01:59 +0000 (Tue, 15 May 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/testmanager/testsuite_ins.php

Modified: trunk/php/testmanager/testsuite_ins.php
===================================================================
--- trunk/php/testmanager/testsuite_ins.php	2012-05-12 09:04:37 UTC (rev 607)
+++ trunk/php/testmanager/testsuite_ins.php	2012-05-15 07:01:59 UTC (rev 608)
@@ -113,7 +113,7 @@
         //         foreach ($this->obj->list[usetestcase][0] as $i) {
         //           $r .= $i.'<br>';
         //         }
-        $r .= $x->printinputrow($this,$this->obj,6,null);
+        $r .= $x->printinputrow($this,$this->obj,$x,6,null);
         $r .= $this->DataTableEnd();
         //         $r .= $testout;
         return $r;

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

Revision: 607
          http://tutos.svn.sourceforge.net/tutos/?rev=607&view=rev
Author:   gokohnert
Date:     2012-05-12 09:04:37 +0000 (Sat, 12 May 2012)
Log Message:
-----------
custom footer

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

Modified: trunk/php/pdf.pinc
===================================================================
--- trunk/php/pdf.pinc	2012-05-11 14:34:12 UTC (rev 606)
+++ trunk/php/pdf.pinc	2012-05-12 09:04:37 UTC (rev 607)
@@ -87,6 +87,10 @@
 
 
         if (! $this->footer) return;
+        if (is_object($this->customfooter)) {
+            $this->customfooter->pdf_footer();
+            return;
+        }
 
         $d = new TUTOS_Date_Time();
         //Position at 1.5 cm from bottom

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

Revision: 606
          http://tutos.svn.sourceforge.net/tutos/?rev=606&view=rev
Author:   gokohnert
Date:     2012-05-11 14:34:12 +0000 (Fri, 11 May 2012)
Log Message:
-----------
layout fix

Modified Paths:
--------------
    trunk/php/testmanager/testcase_new.php

Modified: trunk/php/testmanager/testcase_new.php
===================================================================
--- trunk/php/testmanager/testcase_new.php	2012-05-11 13:23:30 UTC (rev 605)
+++ trunk/php/testmanager/testcase_new.php	2012-05-11 14:34:12 UTC (rev 606)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2000 - 2010 by Gero Kohnert
+ *  Copyright 2000 - 2012 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
@@ -39,11 +39,10 @@
 
         $r .= "<tr>\n";
         $r .= $this->showfieldc($lang['TestcaseRef'],0,'ref');
-        $r .= " <td>\n";
+        $r .= " <td colspan=\"5\">\n";
         $r .= $lang[$this->obj[1]->ref->gettype()].' '.$this->obj[1]->ref->getLink();
         $this->addhidden("ref_id",$this->obj[1]->ref_id);
         $r .= "</td>\n";
-        $r .= "<td colspan=4></td>\n";
         $r .= "</tr>\n";
         $r .= '<th colspan="2">#&nbsp;'.$lang['TestcaseName'].'</th>';
         $r .= '<th colspan="2">'.$lang['TestcaseSteps'].'</th>';

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

Revision: 605
          http://tutos.svn.sourceforge.net/tutos/?rev=605&view=rev
Author:   gokohnert
Date:     2012-05-11 13:23:30 +0000 (Fri, 11 May 2012)
Log Message:
-----------
new prev untested state to mark already failed testcases in a retest

Modified Paths:
--------------
    trunk/php/testmanager/de.p3
    trunk/php/testmanager/default.css
    trunk/php/testmanager/en.p3
    trunk/php/testmanager/testmanager.pinc
    trunk/php/testmanager/testrun_new.php
    trunk/php/testmanager/testsuite_show.php

Modified: trunk/php/testmanager/de.p3
===================================================================
--- trunk/php/testmanager/de.p3	2012-05-09 10:41:01 UTC (rev 604)
+++ trunk/php/testmanager/de.p3	2012-05-11 13:23:30 UTC (rev 605)
@@ -33,7 +33,7 @@
 $lang['TestcaseResults'][1]   = 'pass';
 $lang['TestcaseResults'][2]   = 'skip';
 $lang['TestcaseResults'][3]   = 'untested';
-//$lang['TestcaseResults'][4]   = 'pre failed';
+$lang['TestcaseResults'][4]   = 'prev failed';
 $lang['TestcaseSearch']       = 'Testfall Suche';
 $lang['TestcaseSearchI']      = 'Suche nach Testfällen';
 $lang['TestcaseSelInfo']      = '(leere Eingabe zeigt alles)';

Modified: trunk/php/testmanager/default.css
===================================================================
--- trunk/php/testmanager/default.css	2012-05-09 10:41:01 UTC (rev 604)
+++ trunk/php/testmanager/default.css	2012-05-11 13:23:30 UTC (rev 605)
@@ -54,7 +54,7 @@
     color: blue;
 }
 TD.tcresult_4 {
-    background: #F66;
+    background: #F48;
 }
 
 

Modified: trunk/php/testmanager/en.p3
===================================================================
--- trunk/php/testmanager/en.p3	2012-05-09 10:41:01 UTC (rev 604)
+++ trunk/php/testmanager/en.p3	2012-05-11 13:23:30 UTC (rev 605)
@@ -33,7 +33,7 @@
 $lang['TestcaseResults'][1]   = 'pass';
 $lang['TestcaseResults'][2]   = 'skip';
 $lang['TestcaseResults'][3]   = 'untested';
-//$lang['TestcaseResults'][4]   = 'pre failed';
+$lang['TestcaseResults'][4]   = 'prev failed';
 $lang['TestcaseSearch']       = 'Testcase Search';
 $lang['TestcaseSearchI']      = 'Search for testcases';
 $lang['TestcaseSelInfo']      = '(empty shows all)';

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-05-09 10:41:01 UTC (rev 604)
+++ trunk/php/testmanager/testmanager.pinc	2012-05-11 13:23:30 UTC (rev 605)
@@ -719,8 +719,10 @@
 
     /**
      * a inputrow to enter a tc
+     * tr      = the current testrun if possible else null
+     * baseobj = the project
      */
-    function printinputrow(layout_base $ly,$baseobj,$prefix,$cnt,$ss = '') {
+    function printinputrow(layout_base $ly,$baseobj,$tr,$prefix,$cnt,$ss = '') {
         global $lang,$tutos,$current_user;
 
         // Url for bugreferences
@@ -817,7 +819,7 @@
             #            $pre = '<br />';
         }
         $r .= '<br /><br />';
-        if ($this->activ == 1) {
+        if ($this->activ == 1 && (!is_object($tr) || $tr->state != TR_CLOSED) ) {
             $r .= '<input name="OK_'.$this->id .'" type="submit" value="'.$lang['Enter'].'" title="'.$lang['Enter'].'" />';
         }
         $r .= ' </td>';
@@ -825,8 +827,8 @@
         // Comment
         $txt =  $this->comment;
         $r .= ' <td class="xinputrow" width="150" valign="top">';
-        if ($this->activ == 1) {
-            $r .= ' <textarea rows="10" cols="25" name="comment_'.$this->id.'">';
+        if ($this->activ == 1 && (!is_object($tr) || $tr->state != TR_CLOSED) ) {
+            $r .= ' <textarea rows="10" cols="35" name="comment_'.$this->id.'">';
             $r .= myentities($txt);
             $r .= "</textarea>\n";
         } else {
@@ -834,6 +836,12 @@
             if (class_exists('Bug')) {
                 $txt = preg_replace('#('.Bug::get_bug_regex().')#m'  ,'<a href="'.normalize_url($url).'$1">$1</a>',$txt);
             }
+            // expand until 10 rows
+            $nl = count(explode("\n", $txt));
+            while ($nl < 10) {
+                $txt .= "\n";
+                $nl++;
+            }
             $r .= $txt;
             $r .= "</pre>\n";
         }
@@ -2359,9 +2367,10 @@
                 }
                 if ( $obj->result == TC_PASS || $obj->result == TC_SKIP ) {
                     $obj->result = TC_SKIP; // pass and skip will be skipped
-                    //  } else if ( $obj->result == TC_FAIL ) {
-                    //    $obj->result = TC_PREVFAIL; // all other will be untested
-                    // fail in last test is still fail in new one (changed 20120507)
+                } else if ( $obj->result == TC_FAIL ) {
+                    $obj->result = TC_PREVFAIL; // prevoisly failed
+                } else if ( $obj->result == TC_PREVFAIL ) {
+                    $obj->result = TC_PREVFAIL; // still previously failed
                 } else {
                     $obj->result = TC_UNTESTED; // all other will be untested
                 }
@@ -2401,7 +2410,7 @@
      *
      * ly = layout object
      */
-    function printinputrow(layout_base $ly,tutos_base $obj,$cols,$prefix,$ss = '') {
+    function printinputrow(layout_base $ly,tutos_base $obj,$tr,$cols,$prefix,$ss = '') {
         global $lang;
 
         $r = '';
@@ -2515,7 +2524,7 @@
         $cnt = 1;
         if ($obj->getTypeId() == usetestcase) {
             $c .= '<center>'.testcase::get_rrefs($obj->ref).'</center>';
-            $c .= $obj->printinputrow($ly,$baseobj,'',null,$ss);
+            $c .= $obj->printinputrow($ly,$baseobj,$tr,'',null,$ss);
             if (is_object($obj->lastuser) && !isset($this->worker[$obj->lastuser->id])) {
                 $this->worker[$obj->lastuser->id] = $obj->lastuser;
             }
@@ -2524,7 +2533,7 @@
                 if ($obj->mod_ok() && ($obj->activ != 1) && !isset($obj->test) && ($obj->state != TS_RELEASED) ) {
                     $c .= '<tr id="add_'.$i->id.'"><td colspan="6"><span >+ '.$lang['Testcase'].'</span></td></tr>'."\n";
                 }
-                $c .= $i->printinputrow($ly,$baseobj,$prefix,$cnt++,$ss);
+                $c .= $i->printinputrow($ly,$baseobj,$tr,$prefix,$cnt++,$ss);
                 if (is_object($i->lastuser) && !isset($this->worker[$i->lastuser->id])) {
                     $this->worker[$i->lastuser->id] = $i->lastuser;
                 }
@@ -2535,7 +2544,7 @@
         }
 
         foreach($obj->list[usetestsuite][0] as $i) {
-            $c .= $this->printinputrow($ly,$i,$cols,$prefix.$cnt,$ss);
+            $c .= $this->printinputrow($ly,$i,$tr,$cols,$prefix.$cnt,$ss);
             $cnt++;
         }
 

Modified: trunk/php/testmanager/testrun_new.php
===================================================================
--- trunk/php/testmanager/testrun_new.php	2012-05-09 10:41:01 UTC (rev 604)
+++ trunk/php/testmanager/testrun_new.php	2012-05-11 13:23:30 UTC (rev 605)
@@ -61,16 +61,17 @@
             $r .= '</th></tr>';
         }
 
-        $r .= $this->obj->printinputrow($this,$obj,6,$prefix);
+        $r .= $this->obj->printinputrow($this,$obj,$this->obj,6,$prefix);
 
-
-        $r .= "<tr>\n";
-        if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
-            $r .= submit_reset(0,1,2,1,2,0);
-        } else {
-            $r .= submit_reset(0,-1,2,1,2,0);
+        if ($this->obj->state != TR_CLOSED ) {
+            $r .= "<tr>\n";
+            if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
+                $r .= submit_reset(0,1,2,1,2,0);
+            } else {
+                $r .= submit_reset(0,-1,2,1,2,0);
+            }
+            $r .= "</tr>\n";
         }
-        $r .= "</tr>\n";
 
         $r .= $this->DataTableEnd();
         $r .= hiddenFormElements();

Modified: trunk/php/testmanager/testsuite_show.php
===================================================================
--- trunk/php/testmanager/testsuite_show.php	2012-05-09 10:41:01 UTC (rev 604)
+++ trunk/php/testmanager/testsuite_show.php	2012-05-11 13:23:30 UTC (rev 605)
@@ -225,7 +225,7 @@
         $r .= '<form action="testsuite_show.php?mode=simulate&amp;id='.$this->obj->id.'" method="post">';
         $this->nav['link'] = '';
         $r .= $this->DataTableStart();
-        $r .= $x->printinputrow($this,$this->obj,6,null,$ss);
+        $r .= $x->printinputrow($this,$this->obj,null,6,null,$ss);
         $r .= $this->DataTableEnd();
         $r .= '<input id="update" name="update" type="submit" value="UPDATE" title="update" />';
         $r .= '</form>';

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

Revision: 604
          http://tutos.svn.sourceforge.net/tutos/?rev=604&view=rev
Author:   gokohnert
Date:     2012-05-09 10:41:01 +0000 (Wed, 09 May 2012)
Log Message:
-----------
fix

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

Modified: trunk/php/task_gantt.php
===================================================================
--- trunk/php/task_gantt.php	2012-05-09 09:30:25 UTC (rev 603)
+++ trunk/php/task_gantt.php	2012-05-09 10:41:01 UTC (rev 604)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 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
@@ -11,11 +11,13 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'task.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('task','show');
 loadlayout();
 

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

Revision: 603
          http://tutos.svn.sourceforge.net/tutos/?rev=603&view=rev
Author:   gokohnert
Date:     2012-05-09 09:30:25 +0000 (Wed, 09 May 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/testmanager/testmanager.pinc
    trunk/php/testmanager/testrun_new.php
    trunk/php/testmanager/testsuite_new.php
    trunk/php/testmanager/testsuite_show.php

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-05-09 07:56:04 UTC (rev 602)
+++ trunk/php/testmanager/testmanager.pinc	2012-05-09 09:30:25 UTC (rev 603)
@@ -736,14 +736,14 @@
         $r .= ' <td rowspan="2" class="inputrow tcresult_'.$this->result.'" width="30" valign="top" align="right"><a id="id'.$this->id.'">'.($cnt != null ? $prefix.$cnt:'') .'</a>&nbsp;';
         if ($this->mod_ok() && ($this->activ != 1) && !isset($this->test) ) {
             $r .= '<br /><br /><br />';
-            $r .= "Pos:<input size=\"3\" id=\"P".$this->id."t\" value=\"".$this->pos."\" style=\"display:none;\" "enableTextEdit('P".$this->id."')\" "disableTextEdit('P".$this->id."');\">";
+            $r .= "Pos:<input size=\"3\" id=\"P".$this->id."t\" value=\"".$this->pos."\" style=\"display:none;\" "enableTextEdit('P".$this->id."')\" "disableTextEdit('P".$this->id."');\" />";
             $r .= "<span id=\"P".$this->id."p\" "enableTextEdit('P".$this->id."');\">".$this->pos."</span>&nbsp;";
         }
         $r .= " </td>\n";
         $r .= ' <td rowspan="2" class="inputrow" width="110" valign="top">&nbsp;';
 
         if ($this->mod_ok() && ($this->activ != 1) && !isset($this->test) ) {
-            $r .= "<input size=\"8\" id=\"N".$this->id."t\" value=\"".$this->name."\" style=\"display:none;\" "enableTextEdit('N".$this->id."')\" "disableTextEdit('N".$this->id."');\">";
+            $r .= "<input size=\"8\" id=\"N".$this->id."t\" value=\"".myentities($this->name)."\" style=\"display:none;\" "enableTextEdit('N".$this->id."')\" "disableTextEdit('N".$this->id."');\" />";
             $r .= "<span id=\"N".$this->id."p\" "enableTextEdit('N".$this->id."');\">".myentities($this->getFullName())."</span>";
         } else {
             $r .= myentities($this->getFullName());
@@ -762,7 +762,7 @@
         $txt = $this->getSteps();
         if ($this->mod_ok() && ($this->activ != 1) && !isset($this->test) ) {
             $r .= '<textarea cols="35" rows="'.count(explode("\n",$txt)).'" id="S'.$this->id."t\" style=\"display:none;\" "enableTextEdit('S".$this->id."');\" "disableTextEdit('S".$this->id."');\">";
-            $r .= $this->steps;
+            $r .= myentities($this->steps);
             $r .= '</textarea>';
             $r .= '<pre id="S'.$this->id."p\" "enableTextEdit('S".$this->id."');\">";
             $r .= $txt;
@@ -783,7 +783,7 @@
         $txt = $this->getExpected();
         if ($this->mod_ok() && ($this->activ != 1) && !isset($this->test) ) {
             $r .= '<textarea cols="25" rows="'.count(explode("\n",$txt)).'" id="E'.$this->id."t\" style=\"display:none;\" "enableTextEdit('E".$this->id."');\" "disableTextEdit('E".$this->id."');\">";
-            $r .= $this->expected;
+            $r .= myentities($this->expected);
             $r .= '</textarea>';
             $r .= '<pre id="E'.$this->id."p\" "enableTextEdit('E".$this->id."');\">";
             $r .= $txt;
@@ -816,7 +816,7 @@
             $r .= ' />'. $this->getResultColor($i2) .'</label>'."\n";
             #            $pre = '<br />';
         }
-        $r .= '<br/><br/>';
+        $r .= '<br /><br />';
         if ($this->activ == 1) {
             $r .= '<input name="OK_'.$this->id .'" type="submit" value="'.$lang['Enter'].'" title="'.$lang['Enter'].'" />';
         }
@@ -827,16 +827,14 @@
         $r .= ' <td class="xinputrow" width="150" valign="top">';
         if ($this->activ == 1) {
             $r .= ' <textarea rows="10" cols="25" name="comment_'.$this->id.'">';
+            $r .= myentities($txt);
+            $r .= "</textarea>\n";
         } else {
             $r .= ' <pre>';
             if (class_exists('Bug')) {
                 $txt = preg_replace('#('.Bug::get_bug_regex().')#m'  ,'<a href="'.normalize_url($url).'$1">$1</a>',$txt);
             }
-        }
-        $r .= $txt;
-        if ($this->activ == 1) {
-            $r .= "</textarea>\n";
-        } else {
+            $r .= $txt;
             $r .= "</pre>\n";
         }
         $pre = '<br />';
@@ -2447,7 +2445,7 @@
         }
 
         $r .= '<tr>'."\n";
-        $r .= ' <th width="115px" valign="middle" rowspan="2" align="center">'."\n";
+        $r .= ' <th style="width:115px;" valign="middle" rowspan="2" align="center">'."\n";
         $r .= '  <h2>'.$prefix.'</h2>'."\n";
         $r .= '  <b><span  style="color:blue;">'."\n";
         $r .= '  <span style="display:none" id="ts_'.$obj->id.'_add">'.$ly->theme->getImage(add,'do').'</span>'."\n";
@@ -2477,7 +2475,7 @@
         $r .= '<td colspan="'.($cols-1).'">';
         if ($obj->mod_ok() && ($obj->activ != 1) && !isset($obj->test) && ($obj->state != TS_RELEASED)  ) {
             $r .= '<textarea cols="80" rows="'.count(explode("\n",$txt)).'" id="D'.$obj->id."t\" style=\"display:none;\" "enableTextEdit('D".$obj->id."');\" "disableTextEdit('D".$obj->id."');\">";
-            $r .= $obj->desc;
+            $r .= myentities($obj->desc);
             $r .= '</textarea>';
             $r .= '<pre id="D'.$obj->id."p\" "enableTextEdit('D".$obj->id."');\">";
         } else {
@@ -2494,12 +2492,15 @@
         }
         $r .= ' </td>'."\n";
         $r .= '</tr>'."\n";
-        $r .= '<tr id="adds_'.$obj->id.'"></tr>'."\n";
 
+        if ($obj->mod_ok() && ($obj->activ != 1) && !isset($obj->test)  && ($obj->state != TS_RELEASED) ) {
+            $r .= '<tr id="adds_'.$obj->id.'"></tr>'."\n";
+        }
+
         $c = ''; // content
         if ($obj->getType() == 'testcase' || count($obj->list[usetestcase][0]) > 0) {
             $c .= '<tr>'."\n";
-            $c .= ' <th width="115px">&nbsp;</th>'."\n";
+            $c .= ' <th style="width:115px;">&nbsp;</th>'."\n";
             $c .= ' <th>'.$lang['TestcaseName'].'</th>'."\n";
             $c .= ' <th>'.$lang['TestcaseSteps'].'</th>'."\n";
             $c .= ' <th>'.$lang['TestcaseExpected'].'</th>'."\n";
@@ -2553,20 +2554,20 @@
 
             if (0 < count($this->worker)) {
                 $rpre1 = '<tr>';
-                $rpre1 .= ' <th width="115px">&nbsp;</th><th width="95%" colspan="'.($cols-1).'">Testers</th>';
+                $rpre1 .= ' <th style="width:115px;">&nbsp;</th><th width="95%" colspan="'.($cols-1).'">Testers</th>';
                 $rpre1 .= '</tr>';
                 $rpre1 .= '<tr>';
                 $rpre1 .= ' <th>&nbsp;</th>';
-                $rpre1 .= ' <th colspan="1">'.$lang['AdrName'].'</th>';
-                $rpre1 .= ' <th colspan="1">'.$lang['AdrEmail'].'</th>';
+                $rpre1 .= ' <th>'.$lang['AdrName'].'</th>';
+                $rpre1 .= ' <th>'.$lang['AdrEmail'].'</th>';
                 $rpre1 .= ' <th colspan="2">'.$lang['TestrunSignature'].'</th>';
-                $rpre1 .= ' <th colspan="1">'.$lang['Date'].'</th>';
+                $rpre1 .= ' <th>'.$lang['Date'].'</th>';
                 $rpre1 .= '</tr>'."\n";
                 foreach($this->worker as $i => $j ) {
                     if (is_object($j)) {
                         $r1 .= $rpre1;
                         $r1 .= '<tr>';
-                        $r1 .= ' <th width="115px">&nbsp;</th>';
+                        $r1 .= ' <th style="width:115px;">&nbsp;</th>';
                         $r1 .= ' <td align="center" colspan="1">'.$j->getLink().'</td>';
                         $r1 .= ' <td align="center" colspan="1">'.$j->default_email().'</td>';
                         $r1 .= ' <td align="center" colspan="2"><br />___________________________________</td>';
@@ -2576,7 +2577,7 @@
                     }
                 }
             }
-            $r1 .= '<tr><th width="115px">'.$lang['URL'].'</th><td colspan="'.($cols-1).'">'.dirname(getBaseUrl()).'/'.$this->getUrl().'</td></tr>'."\n";
+            $r1 .= '<tr><th style="width:115px;">'.$lang['URL'].'</th><td colspan="'.($cols-1).'">'.dirname(getBaseUrl()).'/'.$this->getUrl().'</td></tr>'."\n";
             $r1 .= '<tr><th>'.$lang['TestrunStats'].'</th><td colspan="'.($cols-1).'">'.$this->getStats().'</td></tr>'."\n";
             if ($this->state == TR_CLOSED) {
                 $r = $r1.$r;
@@ -2585,7 +2586,7 @@
             $r1 .= ' <th colspan="'.$cols.'">'.$path."</th>\n";
             $r1 .= "</tr>\n";
             $r1 .= "<tr>\n";
-            $r1 .= " <th width=\"115px\" >&nbsp;</th>\n";
+            $r1 .= ' <th style="width:115px;">&nbsp;</th>'."\n";
             $r1 .= ' <td width="95%" colspan="'.($cols-1).'" class="pre"><pre>'.$this->getDesc().'</pre></td>'."\n";
             $r1 .= "</tr>\n";
             $r = $r1.$r;

Modified: trunk/php/testmanager/testrun_new.php
===================================================================
--- trunk/php/testmanager/testrun_new.php	2012-05-09 07:56:04 UTC (rev 602)
+++ trunk/php/testmanager/testrun_new.php	2012-05-09 09:30:25 UTC (rev 603)
@@ -56,7 +56,9 @@
         }
         if ($prefix != null) {
             // add a backlink to testrun
-            $r .= $this->obj->getLink();
+            $r .= '<tr><th colspan="6">';
+            $r .= $lang[$this->obj->getType()].': '.$this->obj->getLink();
+            $r .= '</th></tr>';
         }
 
         $r .= $this->obj->printinputrow($this,$obj,6,$prefix);

Modified: trunk/php/testmanager/testsuite_new.php
===================================================================
--- trunk/php/testmanager/testsuite_new.php	2012-05-09 07:56:04 UTC (rev 602)
+++ trunk/php/testmanager/testsuite_new.php	2012-05-09 09:30:25 UTC (rev 603)
@@ -171,6 +171,10 @@
 
         $this->mode = 0;
         $this->obj = new testsuite($this->dbconn);
+        if ( isset($_GET['mode']) && ($_GET['mode'] == 'nv') ){
+            $this->mode = 1;
+        }
+
         if ( isset($_GET['id']) ){
             $this->name = $lang['TestsuiteMod'];
             $this->obj = $this->obj->read($_GET['id'],$this->obj);
@@ -178,7 +182,7 @@
                 $msg .= sprintf($lang['Err0040'],$lang['Testsuite']);
                 $this->stop = true ;
                 return;
-            } else if ( ! $this->obj->mod_ok() ) {
+            } else if ( $this->mode == 0 && ! $this->obj->mod_ok() ) {
                 $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
                 $this->stop = true;
                 return;
@@ -217,11 +221,6 @@
         $this->obj->read_reference();
         $this->obj->read_relations();
 
-        if ( ! $this->obj->mod_ok() ) {
-            $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
-            $this->stop = true;
-            return;
-        }
 
         if ( !is_object($this->obj->ref) ) {
             $msg .= sprintf($lang['Err0040'],$lang['Reference']);
@@ -232,7 +231,7 @@
         // preset additional custom fields
         preset_custom_fields($this->obj->gettype(),$this->obj);
 
-        if ( isset($_GET['mode']) && ($_GET['mode'] == 'nv') ){
+        if ( $this->mode == 1 && $this->obj->see_ok() ){
             $this->name = $lang['TestsuiteNewVersion'].':'.$this->obj->getFullName();
             testsuite::obj_read($this->obj);
             $this->obj->state = TS_WORK;
@@ -247,8 +246,15 @@
             $this->addhidden('version',$this->obj->version);
             $this->addhidden('prev_id',$this->obj->id);
             $this->obj->id = -1;
+        } else {
+            if ( ! $this->obj->mod_ok() ) {
+                $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
+                $this->stop = true;
+                return;
+            }
         }
 
+
         $x = testsuite::getSelectLink($this->user,$lang['Search']);
         $x[category][] = "obj";
         $this->addmenu($x);

Modified: trunk/php/testmanager/testsuite_show.php
===================================================================
--- trunk/php/testmanager/testsuite_show.php	2012-05-09 07:56:04 UTC (rev 602)
+++ trunk/php/testmanager/testsuite_show.php	2012-05-09 09:30:25 UTC (rev 603)
@@ -222,7 +222,7 @@
             unset($o->list[usetestsuite]);
             $r .= 'Update: '.$o->getLink().' '.$msg.'<br />';
         }
-        $r .= '<form action="testsuite_show.php?mode=simulate&id='.$this->obj->id.'" method="post">';
+        $r .= '<form action="testsuite_show.php?mode=simulate&amp;id='.$this->obj->id.'" method="post">';
         $this->nav['link'] = '';
         $r .= $this->DataTableStart();
         $r .= $x->printinputrow($this,$this->obj,6,null,$ss);
@@ -491,4 +491,4 @@
 $l = new Testsuite_show($current_user);
 $l->display();
 $dbconn->Close();
-?>
+?>
\ No newline at end of file

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

Revision: 602
          http://tutos.svn.sourceforge.net/tutos/?rev=602&view=rev
Author:   gokohnert
Date:     2012-05-09 07:56:04 +0000 (Wed, 09 May 2012)
Log Message:
-----------
better readable links in headlines

Modified Paths:
--------------
    trunk/html/blue.css

Modified: trunk/html/blue.css
===================================================================
--- trunk/html/blue.css	2012-05-09 07:55:13 UTC (rev 601)
+++ trunk/html/blue.css	2012-05-09 07:56:04 UTC (rev 602)
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999 - 2011 by Gero Kohnert
+ * Copyright 1999 - 2012 by Gero Kohnert
  *
  * example theme
  *
@@ -36,6 +36,11 @@
 	color: #1e3ca0;
 }
 
+TH A {
+	text-decoration: none;
+	color: #aeaca0;
+}
+
 .nodeco {
 	text-decoration: none;
 	color: #f8fcf8;

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

Revision: 601
          http://tutos.svn.sourceforge.net/tutos/?rev=601&view=rev
Author:   gokohnert
Date:     2012-05-09 07:55:13 +0000 (Wed, 09 May 2012)
Log Message:
-----------
add backlink to chapterwise testrun/ smaller footprint for large testruns / prepared prevfail state

Modified Paths:
--------------
    trunk/php/testmanager/de.p3
    trunk/php/testmanager/default.css
    trunk/php/testmanager/en.p3
    trunk/php/testmanager/testmanager.pinc
    trunk/php/testmanager/testrun_ins.php
    trunk/php/testmanager/testrun_new.php

Modified: trunk/php/testmanager/de.p3
===================================================================
--- trunk/php/testmanager/de.p3	2012-05-07 14:22:20 UTC (rev 600)
+++ trunk/php/testmanager/de.p3	2012-05-09 07:55:13 UTC (rev 601)
@@ -33,6 +33,7 @@
 $lang['TestcaseResults'][1]   = 'pass';
 $lang['TestcaseResults'][2]   = 'skip';
 $lang['TestcaseResults'][3]   = 'untested';
+//$lang['TestcaseResults'][4]   = 'pre failed';
 $lang['TestcaseSearch']       = 'Testfall Suche';
 $lang['TestcaseSearchI']      = 'Suche nach Testfällen';
 $lang['TestcaseSelInfo']      = '(leere Eingabe zeigt alles)';

Modified: trunk/php/testmanager/default.css
===================================================================
--- trunk/php/testmanager/default.css	2012-05-07 14:22:20 UTC (rev 600)
+++ trunk/php/testmanager/default.css	2012-05-09 07:55:13 UTC (rev 601)
@@ -1,5 +1,5 @@
 /**
- *  Copyright 1999- 2005 by Gero Kohnert
+ *  Copyright 1999- 2012 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -49,7 +49,15 @@
     color: blue;
 }
 
+/** prev failed **/
+SPAN.tcresult_4 {
+    color: blue;
+}
+TD.tcresult_4 {
+    background: #F66;
+}
 
+
 TD.inputrow {
     border-bottom: 1px solid black;
     border-top-width: 0px;

Modified: trunk/php/testmanager/en.p3
===================================================================
--- trunk/php/testmanager/en.p3	2012-05-07 14:22:20 UTC (rev 600)
+++ trunk/php/testmanager/en.p3	2012-05-09 07:55:13 UTC (rev 601)
@@ -33,6 +33,7 @@
 $lang['TestcaseResults'][1]   = 'pass';
 $lang['TestcaseResults'][2]   = 'skip';
 $lang['TestcaseResults'][3]   = 'untested';
+//$lang['TestcaseResults'][4]   = 'pre failed';
 $lang['TestcaseSearch']       = 'Testcase Search';
 $lang['TestcaseSearchI']      = 'Search for testcases';
 $lang['TestcaseSelInfo']      = '(empty shows all)';

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-05-07 14:22:20 UTC (rev 600)
+++ trunk/php/testmanager/testmanager.pinc	2012-05-09 07:55:13 UTC (rev 601)
@@ -14,6 +14,7 @@
 define('TC_PASS',1);
 define('TC_SKIP',2);
 define('TC_UNTESTED',3);
+define('TC_PREVFAIL',4); // previously failed in another test
 
 define('TR_UNDEF',0);
 define('TR_ACTIV',1);
@@ -864,7 +865,8 @@
             $or = $this->orig;
 
             while (is_object($or) && $or->activ == 1) {
-                $r .= $pre.$or->getLink($or->getResult());
+                $r .= $pre.makelink($or->getUrl(),$or->getResult());
+                #                $r .= $pre.$or->getLink($or->getResult());
                 $x = $or->get_testrun();
                 if (is_object($x)) {
                     $r .= '@'.$x->getLink();
@@ -2181,7 +2183,7 @@
         $msg = '';
         $r_nr = 1;
         $regs = array();
-        if (preg_match('#([[:alnum:]]*) RETEST ([0-9]+)#',$orig->name,$regs)) {
+        if (preg_match('#([\p{L}[:print:]\X]*) RETEST ([0-9]+)#miu',$orig->name,$regs)) {
             $r_nr = $regs[2];
             $r_nr++;
             $msg .= $this->setName($regs[1].' RETEST '.$r_nr);
@@ -2327,7 +2329,7 @@
             if ($this->run != null) {
                 return sprintf($lang['Testmanager_Err002'],$this->getFullName());
             } else {
-                $r .= sprintf($lang['Testmanager_Err003'],$this->suite->getFullName(),$this->getFullName());
+                $r .= sprintf($lang['Testmanager_Err003'],$this->suite->getLink(),$this->getLink());
             }
             $obj = $this->suite;
             $obj->name = $obj->name;
@@ -2359,7 +2361,8 @@
                 }
                 if ( $obj->result == TC_PASS || $obj->result == TC_SKIP ) {
                     $obj->result = TC_SKIP; // pass and skip will be skipped
-                    //                } else if ( $obj->result == TC_FAIL ) {
+                    //  } else if ( $obj->result == TC_FAIL ) {
+                    //    $obj->result = TC_PREVFAIL; // all other will be untested
                     // fail in last test is still fail in new one (changed 20120507)
                 } else {
                     $obj->result = TC_UNTESTED; // all other will be untested

Modified: trunk/php/testmanager/testrun_ins.php
===================================================================
--- trunk/php/testmanager/testrun_ins.php	2012-05-07 14:22:20 UTC (rev 600)
+++ trunk/php/testmanager/testrun_ins.php	2012-05-09 07:55:13 UTC (rev 601)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2010 by Gero Kohnert
+ *  Copyright 1999 - 2012 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
@@ -47,7 +47,7 @@
     $obj->read_reference();
 
     $dbconn->Begin("WORK");
-    $msg .= $obj->parse_input($obj->run);
+    $msg = addLine($msg,$obj->parse_input($obj->run));
     $dbconn->Commit("WORK");
 #   echo $msg."<br> ".$gotourl;
     leave_insert($dbconn,'../'.$gotourl,$msg);
@@ -72,7 +72,7 @@
     }
 } else {
     if ( empty($_POST['ref_id']) ) {
-        $msg .= "No Reference ID given !<br />";
+        $msg = addLine($msg,"No Reference ID given !");
     } else {
         $obj->setReference($_POST['ref_id']);
         $gotourl= addUrlParameter($gotourl,"ref_id=". $obj->ref_id,true);
@@ -80,7 +80,7 @@
     }
 
     if ( empty($_POST['name']) ) {
-        $msg .= sprintf($lang['Err0009'],$lang['TestrunName']) ."<br />";
+        $msg = addLine($msg,sprintf($lang['Err0009'],$lang['TestrunName']));
         $gotourl = addBadField($gotourl,'name',true);
     } else {
         $obj->setName($_POST['name']);
@@ -91,7 +91,7 @@
         $obj->setTestId($_POST['test_id']);
         $gotourl= addUrlParameter($gotourl,"test_id=". UrlEncode($obj->test_id),true);
     } else {
-        $msg .= sprintf($lang['Err0009'],$lang['TestrunSuiteB']) ."<br />";
+        $msg = addLine($msg,sprintf($lang['Err0009'],$lang['TestrunSuiteB']));
     }
 }
 
@@ -109,23 +109,23 @@
 #
 # Parse additional custom fields
 #
-$msg .= parse_custom_fields($obj->gettype(),$obj);
+$msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj));
 # other modules
-$msg .= module_parseforms($current_user,$obj,$gotourl);
+$msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl));
 
-$msg .= $obj->run_check_hook();
+$msg = addLine($msg,$obj->run_check_hook());
 if ( $msg == '' ) {
     $dbconn->Begin("WORK");
-    $msg .= $obj->save();
-    $msg .= $obj->createCopy();
+    $msg = addLine($msg,$obj->save());
+    $msg = addLine($msg,$obj->createCopy());
     $obj->modified = array();
     $obj->modified[] = array ( "field" => "TestSuiteCopy" ,
                                "old" => $obj->test_id ,
                                "new" => $obj->run_id
         );
-    $msg .= $obj->save();
+    $msg = addLine($msg,$obj->save());
     $dbconn->Commit("WORK");
-    $gotourl = $obj->ref->getURL();
+    $gotourl = $obj->getURL();
 }
 leave_insert($dbconn,'../'.$gotourl,$msg);
 /**

Modified: trunk/php/testmanager/testrun_new.php
===================================================================
--- trunk/php/testmanager/testrun_new.php	2012-05-07 14:22:20 UTC (rev 600)
+++ trunk/php/testmanager/testrun_new.php	2012-05-09 07:55:13 UTC (rev 601)
@@ -54,6 +54,10 @@
         if (!is_object($obj)) {
             $obj = $this->obj->run;
         }
+        if ($prefix != null) {
+            // add a backlink to testrun
+            $r .= $this->obj->getLink();
+        }
 
         $r .= $this->obj->printinputrow($this,$obj,6,$prefix);
 

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

Revision: 600
          http://tutos.svn.sourceforge.net/tutos/?rev=600&view=rev
Author:   gokohnert
Date:     2012-05-07 14:22:20 +0000 (Mon, 07 May 2012)
Log Message:
-----------
early check_user

Modified Paths:
--------------
    trunk/php/acl_overview.php
    trunk/php/address_del.php
    trunk/php/address_overview.php
    trunk/php/calendar.php
    trunk/php/calendar_day.php
    trunk/php/calendar_week.php
    trunk/php/history_show.php
    trunk/php/note/note_overview.php
    trunk/php/rate/rate_overview.php
    trunk/php/res_cal.php
    trunk/php/user_del.php

Modified: trunk/php/acl_overview.php
===================================================================
--- trunk/php/acl_overview.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/acl_overview.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,7 +1,7 @@
 <?php
 /**
  *  Copyright 2001 Boris Wesslowski
- *  Copyright 2001 - 2011 Gero Kohnert
+ *  Copyright 2001 - 2012 Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -13,6 +13,10 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+check_user();
+loadmodules("acl","overview");
+
 require_once 'acl.pinc';
 require_once 'Date.pinc';
 require_once 'location.pinc';
@@ -22,9 +26,6 @@
 require_once 'task.pinc';
 require_once 'appointment.pinc';
 
-
-check_user();
-loadmodules("acl","overview");
 loadlayout();
 
 class Dummy extends Tutos_base {

Modified: trunk/php/address_del.php
===================================================================
--- trunk/php/address_del.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/address_del.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2003 by Gero Kohnert
+ * Copyright 1999 - 2012 by Gero Kohnert
  *
  * @modulegroup address
  * @module address_select
@@ -8,12 +8,14 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+/* Check if user is allowed to use it */
+check_user();
+
 require_once 'product.pinc';
 require_once 'appointment.pinc';
 require_once 'task.pinc';
 
-/* Check if user is allowed to use it */
-check_user();
 loadmodules("address","del");
 
 $msg = "";
@@ -25,7 +27,7 @@
 } elseif ( isset($_GET['id']) ) {
     $a = $a->read($_GET['id'],$a);
     $gotourl = $a->getUrl();
-} else {
+  } else {
     $gotourl = "address_select.php";
     $msg .= "Missing ID";
 }

Modified: trunk/php/address_overview.php
===================================================================
--- trunk/php/address_overview.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/address_overview.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -13,13 +13,15 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use itx
+check_user();
+
 require_once 'address_tools.p3';
 require_once 'appointment.pinc';
 require_once 'task.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use itx
-check_user();
 loadmodules('address','overview');
 loadlayout();
 

Modified: trunk/php/calendar.php
===================================================================
--- trunk/php/calendar.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/calendar.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 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
@@ -11,11 +11,13 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'appointment.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('appointment','overview');
 loadlayout();
 

Modified: trunk/php/calendar_day.php
===================================================================
--- trunk/php/calendar_day.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/calendar_day.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2011 by Gero Kohnert
+ *  Copyright 2002 - 2012 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -13,12 +13,14 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'task.pinc';
 require_once 'appointment.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('appointment','overview');
 loadlayout();
 

Modified: trunk/php/calendar_week.php
===================================================================
--- trunk/php/calendar_week.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/calendar_week.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -13,12 +13,14 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'task.pinc';
 require_once 'appointment.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('appointment','overview');
 loadlayout();
 

Modified: trunk/php/history_show.php
===================================================================
--- trunk/php/history_show.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/history_show.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -12,13 +12,15 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 // Needs nearly everything
 require_once 'product.pinc';
 require_once 'task.pinc';
 require_once 'appointment.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules("history","show");
 loadlayout();
 

Modified: trunk/php/note/note_overview.php
===================================================================
--- trunk/php/note/note_overview.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/note/note_overview.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 by Gero Kohnert
  *  submitted by "Nonn" <nonn at resce.com>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -15,12 +15,14 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'appointment.pinc';
 require_once 'product.pinc';
 require_once 'task.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('note','overview');
 loadmodule('note');
 loadlayout();

Modified: trunk/php/rate/rate_overview.php
===================================================================
--- trunk/php/rate/rate_overview.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/rate/rate_overview.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert and ecosoft
+ *  Copyright 1999 - 2012 by Gero Kohnert and ecosoft
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -15,12 +15,14 @@
 
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'appointment.pinc';
 require_once 'product.pinc';
 require_once 'task.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('rate','overview');
 loadmodule('rate');
 loadlayout();

Modified: trunk/php/res_cal.php
===================================================================
--- trunk/php/res_cal.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/res_cal.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -9,12 +9,14 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'appointment.pinc';
 require_once 'product.pinc';
 require_once 'task.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('res_cal','overview');
 loadlayout();
 

Modified: trunk/php/user_del.php
===================================================================
--- trunk/php/user_del.php	2012-05-07 13:56:48 UTC (rev 599)
+++ trunk/php/user_del.php	2012-05-07 14:22:20 UTC (rev 600)
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2012 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -9,12 +9,14 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+/* Check if user is allowed to use it */
+check_user();
+
 require_once 'product.pinc';
 require_once 'appointment.pinc';
 require_once 'task.pinc';
 
-/* Check if user is allowed to use it */
-check_user();
 loadmodules("user","del");
 
 $msg = '';

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

Revision: 599
          http://tutos.svn.sourceforge.net/tutos/?rev=599&view=rev
Author:   gokohnert
Date:     2012-05-07 13:56:48 +0000 (Mon, 07 May 2012)
Log Message:
-----------
back to old

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

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-05-07 11:26:19 UTC (rev 598)
+++ trunk/php/testmanager/testmanager.pinc	2012-05-07 13:56:48 UTC (rev 599)
@@ -2359,7 +2359,7 @@
                 }
                 if ( $obj->result == TC_PASS || $obj->result == TC_SKIP ) {
                     $obj->result = TC_SKIP; // pass and skip will be skipped
-                } else if ( $obj->result == TC_FAIL ) {
+                    //                } else if ( $obj->result == TC_FAIL ) {
                     // fail in last test is still fail in new one (changed 20120507)
                 } else {
                     $obj->result = TC_UNTESTED; // all other will be untested

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

Revision: 598
          http://tutos.svn.sourceforge.net/tutos/?rev=598&view=rev
Author:   gokohnert
Date:     2012-05-07 11:26:19 +0000 (Mon, 07 May 2012)
Log Message:
-----------
failed old testruns are still initially failed in retest

Modified Paths:
--------------
    trunk/php/testmanager/testmanager.pinc
    trunk/php/testmanager/testrun_show.php

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-05-07 09:39:03 UTC (rev 597)
+++ trunk/php/testmanager/testmanager.pinc	2012-05-07 11:26:19 UTC (rev 598)
@@ -2357,9 +2357,11 @@
                         $obj->comment = $lang['TestrunOldComment']."\n".$obj->comment;
                     }
                 }
-                if ($obj->result == TC_PASS || $obj->result == TC_SKIP ) {
+                if ( $obj->result == TC_PASS || $obj->result == TC_SKIP ) {
                     $obj->result = TC_SKIP; // pass and skip will be skipped
-                }else {
+                } else if ( $obj->result == TC_FAIL ) {
+                    // fail in last test is still fail in new one (changed 20120507)
+                } else {
                     $obj->result = TC_UNTESTED; // all other will be untested
                 }
             } else {

Modified: trunk/php/testmanager/testrun_show.php
===================================================================
--- trunk/php/testmanager/testrun_show.php	2012-05-07 09:39:03 UTC (rev 597)
+++ trunk/php/testmanager/testrun_show.php	2012-05-07 11:26:19 UTC (rev 598)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2000 - 2011 by Gero Kohnert
+ *  Copyright 2000 - 2012 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
@@ -186,7 +186,7 @@
         $pdf->SetFont('times', '', 10);
         $pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
         $pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-        $pdf->SetHeaderData($tutos['base'].'/../'.$tutos['logo'],25,$lang[$this->obj->getType()],$this->obj->ref->getFullName().': '.$this->obj->getFullName());
+        $pdf->SetHeaderData($tutos['base'].'/../'.$tutos['logo'],15,$lang[$this->obj->getType()],$this->obj->ref->getFullName().': '.$this->obj->getFullName());
 
         #        $pdf->headtitle = $lang[$this->obj->getType()].' '.$this->obj->getFullName();
 
@@ -420,4 +420,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

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

Revision: 597
          http://tutos.svn.sourceforge.net/tutos/?rev=597&view=rev
Author:   gokohnert
Date:     2012-05-07 09:39:03 +0000 (Mon, 07 May 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/file/file_new.php

Modified: trunk/php/file/file_new.php
===================================================================
--- trunk/php/file/file_new.php	2012-05-07 08:55:19 UTC (rev 596)
+++ trunk/php/file/file_new.php	2012-05-07 09:39:03 UTC (rev 597)
@@ -14,10 +14,12 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
-require_once 'task.pinc';
 
 // Check if user is allowed to use it
 check_user();
+
+require_once 'task.pinc';
+
 loadmodules('file','new');
 loadmodule('file');
 loadlayout();
@@ -339,4 +341,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
\ No newline at end of file
+-->

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

Revision: 596
          http://tutos.svn.sourceforge.net/tutos/?rev=596&view=rev
Author:   gokohnert
Date:     2012-05-07 08:55:19 +0000 (Mon, 07 May 2012)
Log Message:
-----------
fix

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

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-05-07 08:36:55 UTC (rev 595)
+++ trunk/php/testmanager/testmanager.pinc	2012-05-07 08:55:19 UTC (rev 596)
@@ -2425,7 +2425,9 @@
             if (!is_object($x)) break;
         }
         $baseobj = $x;
-        bug::obj_read($baseobj);
+        if (is_object($baseobj)) {
+            bug::obj_read($baseobj);
+        }
         $base = addUrlParameter($this->getModUrl(),'mode=run');
         testsuite::obj_read($obj);
         testcase::obj_read($obj);

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

Revision: 595
          http://tutos.svn.sourceforge.net/tutos/?rev=595&view=rev
Author:   gokohnert
Date:     2012-05-07 08:36:55 +0000 (Mon, 07 May 2012)
Log Message:
-----------
fix overview of custom fields

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

Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php	2012-05-07 08:21:27 UTC (rev 594)
+++ trunk/php/product_overview.php	2012-05-07 08:36:55 UTC (rev 595)
@@ -341,7 +341,7 @@
                         }
                     }
                 } else if( preg_match('#p_c_#',$c) ) {
-                    $c = preg_replace('#^p_c_s#','',$c);
+                    $c = preg_replace('#^p_c_#','',$c);
                     $x = $table['product'][$c];
                     $f = '_fld_'.$c;
                     $r .= get_custom_field($x,$p->$f,$p);
@@ -962,4 +962,4 @@
 $l = new Product_overview($current_user);
 $l->display();
 $dbconn->Close();
-?>
\ No newline at end of file
+?>

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

Revision: 594
          http://tutos.svn.sourceforge.net/tutos/?rev=594&view=rev
Author:   gokohnert
Date:     2012-05-07 08:21:27 +0000 (Mon, 07 May 2012)
Log Message:
-----------
typo

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

Modified: trunk/php/resource/resource.pinc
===================================================================
--- trunk/php/resource/resource.pinc	2012-05-07 07:54:30 UTC (rev 593)
+++ trunk/php/resource/resource.pinc	2012-05-07 08:21:27 UTC (rev 594)
@@ -349,7 +349,7 @@
         case 'ResUsage':
         case 'Resource':
             $x = resolve_history_obj($f,$this->dbconn);
-            break;
+        break;
         }
         return $x;
     }
@@ -414,7 +414,7 @@
     /**
      * save the resource usage of an object
      */
-    static function obj_save(tutos_user $user,tutos_save $obj) {
+    static function obj_save(tutos_user $user,tutos_base $obj) {
         global $tutos;
 
         $msg = '';

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

Revision: 593
          http://tutos.svn.sourceforge.net/tutos/?rev=593&view=rev
Author:   gokohnert
Date:     2012-05-07 07:54:30 +0000 (Mon, 07 May 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/product_ins.php
    trunk/php/product_overview.php
    trunk/php/task_ins.php
    trunk/php/task_overview.php
    trunk/php/task_select.php

Modified: trunk/php/product_ins.php
===================================================================
--- trunk/php/product_ins.php	2012-05-07 06:49:45 UTC (rev 592)
+++ trunk/php/product_ins.php	2012-05-07 07:54:30 UTC (rev 593)
@@ -16,11 +16,13 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'product.pinc';
 require_once 'task.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('product','ins');
 
 $msg = '';

Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php	2012-05-07 06:49:45 UTC (rev 592)
+++ trunk/php/product_overview.php	2012-05-07 07:54:30 UTC (rev 593)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 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
@@ -15,13 +15,15 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+/* Check if user is allowed to use it */
+check_user();
+
 require_once 'appointment.pinc';
 require_once 'product.pinc';
 require_once 'task.pinc';
 require_once 'graphs.pinc';
 
-/* Check if user is allowed to use it */
-check_user();
 loadmodules('product','overview');
 loadlayout();
 

Modified: trunk/php/task_ins.php
===================================================================
--- trunk/php/task_ins.php	2012-05-07 06:49:45 UTC (rev 592)
+++ trunk/php/task_ins.php	2012-05-07 07:54:30 UTC (rev 593)
@@ -16,11 +16,13 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'task.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('task','ins');
 
 $msg = '';
@@ -176,19 +178,19 @@
                         case "user":
                         case "address": {
                             $hasrole = $f == $o->id;
-                                break;
+                            break;
                         }
                         case "company": {
                             $hasrole = $f == $o->id;
-                                break;
+                            break;
                         }
                         case "team": {
                             $hasrole = $f == $o->id;
-                                #               $o->read_member();
+                            #               $o->read_member();
 #               foreach($o->member as $xx) {
-                                #                 $hasrole = $f == $xx;
-                                #               }
-                                break;
+                            #                 $hasrole = $f == $xx;
+                            #               }
+                            break;
                         }
                         default:
                             break;

Modified: trunk/php/task_overview.php
===================================================================
--- trunk/php/task_overview.php	2012-05-07 06:49:45 UTC (rev 592)
+++ trunk/php/task_overview.php	2012-05-07 07:54:30 UTC (rev 593)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 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
@@ -15,11 +15,13 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'task.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('task','overview');
 loadlayout();
 
@@ -887,7 +889,7 @@
             case "user":
             case "team":
                 $x[url] = addUrlParameter($url,"fld=product");
-                break;
+            break;
             default:
                 $x[url] = addUrlParameter($url,"fld=worker");
                 break;

Modified: trunk/php/task_select.php
===================================================================
--- trunk/php/task_select.php	2012-05-07 06:49:45 UTC (rev 592)
+++ trunk/php/task_select.php	2012-05-07 07:54:30 UTC (rev 593)
@@ -12,10 +12,12 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
-require_once 'task.pinc';
 
 // Check if user is allowed to use it
 check_user();
+
+require_once 'task.pinc';
+
 loadmodules('task','select');
 loadlayout();
 

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

Revision: 592
          http://tutos.svn.sourceforge.net/tutos/?rev=592&view=rev
Author:   gokohnert
Date:     2012-05-07 06:49:45 +0000 (Mon, 07 May 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/bugtracking/bug_ins.php
    trunk/php/bugtracking/bug_new.php
    trunk/php/bugtracking/bug_overview.php
    trunk/php/bugtracking/bug_select.php
    trunk/php/bugtracking/bug_show.php

Modified: trunk/php/bugtracking/bug_ins.php
===================================================================
--- trunk/php/bugtracking/bug_ins.php	2012-05-07 06:46:25 UTC (rev 591)
+++ trunk/php/bugtracking/bug_ins.php	2012-05-07 06:49:45 UTC (rev 592)
@@ -17,6 +17,10 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'appointment.pinc';
 require_once 'location.pinc';
 require_once 'product.pinc';
@@ -24,8 +28,6 @@
 require_once 'mail.pinc';
 
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('bugtracking','new');
 loadmodule('bugtracking');
 

Modified: trunk/php/bugtracking/bug_new.php
===================================================================
--- trunk/php/bugtracking/bug_new.php	2012-05-07 06:46:25 UTC (rev 591)
+++ trunk/php/bugtracking/bug_new.php	2012-05-07 06:49:45 UTC (rev 592)
@@ -14,12 +14,14 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'bug.pinc';
 require_once 'product.pinc';
 require_once 'task.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('bugtracking','new');
 loadmodule('bugtracking');
 loadlayout();

Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php	2012-05-07 06:46:25 UTC (rev 591)
+++ trunk/php/bugtracking/bug_overview.php	2012-05-07 06:49:45 UTC (rev 592)
@@ -19,11 +19,13 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'product.pinc';
 require_once 'graphs.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('bugtracking','overview');
 loadmodule('bugtracking');
 loadlayout();

Modified: trunk/php/bugtracking/bug_select.php
===================================================================
--- trunk/php/bugtracking/bug_select.php	2012-05-07 06:46:25 UTC (rev 591)
+++ trunk/php/bugtracking/bug_select.php	2012-05-07 06:49:45 UTC (rev 592)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 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
@@ -14,10 +14,12 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
-require_once 'bug.pinc';
 
 // Check if user is allowed to use it
 check_user();
+
+require_once 'bug.pinc';
+
 loadmodules('bugtracking','select');
 loadmodule('bugtracking');
 loadlayout();

Modified: trunk/php/bugtracking/bug_show.php
===================================================================
--- trunk/php/bugtracking/bug_show.php	2012-05-07 06:46:25 UTC (rev 591)
+++ trunk/php/bugtracking/bug_show.php	2012-05-07 06:49:45 UTC (rev 592)
@@ -14,12 +14,14 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'product.pinc';
 require_once 'task.pinc';
 require_once 'bug.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('bugtracking','show');
 loadmodule('bugtracking');
 loadlayout();

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

Revision: 591
          http://tutos.svn.sourceforge.net/tutos/?rev=591&view=rev
Author:   gokohnert
Date:     2012-05-07 06:46:25 +0000 (Mon, 07 May 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/file/file_ins.php
    trunk/php/task_new.php
    trunk/php/task_show.php
    trunk/php/timetrack/timetrack_ins.php
    trunk/php/timetrack/timetrack_new.php
    trunk/php/timetrack/timetrack_overview.php
    trunk/php/timetrack/timetrack_select.php
    trunk/php/user.pinc

Modified: trunk/php/file/file_ins.php
===================================================================
--- trunk/php/file/file_ins.php	2012-05-07 06:29:32 UTC (rev 590)
+++ trunk/php/file/file_ins.php	2012-05-07 06:46:25 UTC (rev 591)
@@ -17,10 +17,12 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
-require_once 'task.pinc';
 
 /* Check if user is allowed to use it */
 check_user();
+
+require_once 'task.pinc';
+
 loadmodules('file','ins');
 loadmodule('file');
 

Modified: trunk/php/task_new.php
===================================================================
--- trunk/php/task_new.php	2012-05-07 06:29:32 UTC (rev 590)
+++ trunk/php/task_new.php	2012-05-07 06:46:25 UTC (rev 591)
@@ -12,11 +12,13 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'task.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('task','new');
 loadlayout();
 /**

Modified: trunk/php/task_show.php
===================================================================
--- trunk/php/task_show.php	2012-05-07 06:29:32 UTC (rev 590)
+++ trunk/php/task_show.php	2012-05-07 06:46:25 UTC (rev 591)
@@ -12,11 +12,13 @@
  */
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'task.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('task','show');
 loadlayout();
 

Modified: trunk/php/timetrack/timetrack_ins.php
===================================================================
--- trunk/php/timetrack/timetrack_ins.php	2012-05-07 06:29:32 UTC (rev 590)
+++ trunk/php/timetrack/timetrack_ins.php	2012-05-07 06:46:25 UTC (rev 591)
@@ -18,11 +18,13 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'product.pinc';
 require_once 'task.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('timetrack','ins');
 loadmodule('timetrack');
 

Modified: trunk/php/timetrack/timetrack_new.php
===================================================================
--- trunk/php/timetrack/timetrack_new.php	2012-05-07 06:29:32 UTC (rev 590)
+++ trunk/php/timetrack/timetrack_new.php	2012-05-07 06:46:25 UTC (rev 591)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2010 by Gero Kohnert
+ *  Copyright 1999 - 2012 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
@@ -14,11 +14,13 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
 require_once 'task.pinc';
 require_once 'product.pinc';
 
-// Check if user is allowed to use it
-check_user();
 loadmodules('timetrack','new');
 loadmodule('timetrack');
 loadlayout();

Modified: trunk/php/timetrack/timetrack_overview.php
===================================================================
--- trunk/php/timetrack/timetrack_overview.php	2012-05-07 06:29:32 UTC (rev 590)
+++ trunk/php/timetrack/timetrack_overview.php	2012-05-07 06:46:25 UTC (rev 591)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2011 by Gero Kohnert
+ *  Copyright 1999 - 2012 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -19,10 +19,12 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
-require_once 'graphs.pinc';
 
 // Check if user is allowed to use it
 check_user();
+
+require_once 'graphs.pinc';
+
 loadmodules('timetrack','overview');
 loadmodule('timetrack');
 loadlayout();

Modified: trunk/php/timetrack/timetrack_select.php
===================================================================
--- trunk/php/timetrack/timetrack_select.php	2012-05-07 06:29:32 UTC (rev 590)
+++ trunk/php/timetrack/timetrack_select.php	2012-05-07 06:46:25 UTC (rev 591)
@@ -17,6 +17,7 @@
 
 // Check if user is allowed to use it
 check_user();
+
 loadmodules('timetrack','select');
 loadmodule('timetrack');
 loadlayout();

Modified: trunk/php/user.pinc
===================================================================
--- trunk/php/user.pinc	2012-05-07 06:29:32 UTC (rev 590)
+++ trunk/php/user.pinc	2012-05-07 06:46:25 UTC (rev 591)
@@ -374,9 +374,10 @@
         }
         if ($sep != '') {
             $t1 .= ' OR t.team_id in ('.$tids.')';
-            $t2 .= $sep . $tids .')';
+            $t2 .= $sep . $tids;
         }
-        $t1 .= ")";
+        $t1 .= ')';
+        $t2 .= ')';
 
 
         //
@@ -527,7 +528,7 @@
          * this project. This will be used from task_new...
          */
         if( is_object($project) && method_exists($project,'readroles') ) {
-        $project->readroles();
+            $project->readroles();
             foreach($project->role as $role => $xf) {
                 if( isset($project->role[$role]) && is_array($project->role[$role]) ) {
                     foreach($project->role[$role] as $i => $o) {

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