tutos-commits Mailing List for TUTOS (Page 20)

Revision: 840
          http://tutos.svn.sourceforge.net/tutos/?rev=840&view=rev
Author:   gokohnert
Date:     2012-11-15 13:55:22 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
also work with testruns

Modified Paths:
--------------
    trunk/php/subversion/revision.pinc

Modified: trunk/php/subversion/revision.pinc
===================================================================
--- trunk/php/subversion/revision.pinc	2012-11-15 13:24:17 UTC (rev 839)
+++ trunk/php/subversion/revision.pinc	2012-11-15 13:55:22 UTC (rev 840)
@@ -36,23 +36,35 @@
         global $lang,$current_user;
 
         // search the svn object
-        if ($obj->getTypeId() != usebugtracking) return;
+        if ( ($obj->getTypeId() != usebugtracking) &&
+             ($obj->getTypeId() != usetestrun) )
+            return;
 
 
-        if (is_object($obj->target)) {
-            svn::obj_read($obj->target);
-            $s = $this->find_shortest($obj->target);
-            if ($s) {
-                return $s->getLink($arg,'rev='.$arg);
+        if ( $obj->getTypeId() == usetestrun ) {
+            if (is_object($obj->ref)) {
+                svn::obj_read($obj->ref);
+                $s = $this->find_shortest($obj->ref);
+                if ($s) {
+                    return $s->getLink($arg,'rev='.$arg);
+                }
             }
         }
-
-        if (is_object($obj->parent)) {
-            svn::obj_read($obj->parent);
-            $s = $this->find_shortest($obj->parent);
-            if ($s) {
-                return $s->getLink($arg,'rev='.$arg);
+        if ( $obj->getTypeId() == usebugtracking ) {
+            if (is_object($obj->target)) {
+                svn::obj_read($obj->target);
+                $s = $this->find_shortest($obj->target);
+                if ($s) {
+                    return $s->getLink($arg,'rev='.$arg);
+                }
             }
+            if (is_object($obj->parent)) {
+                svn::obj_read($obj->parent);
+                $s = $this->find_shortest($obj->parent);
+                if ($s) {
+                    return $s->getLink($arg,'rev='.$arg);
+                }
+            }
         }
         return 'X '. $obj->getType().' '.$arg.' '.$cnt;
     }
@@ -61,7 +73,7 @@
      * check if all is ok
      */
     function check(&$obj,$arg) {
-        return true;
+        if ($arg != '') return true;
     }
 }
-?>
\ 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: 839
          http://tutos.svn.sourceforge.net/tutos/?rev=839&view=rev
Author:   gokohnert
Date:     2012-11-15 13:24:17 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
added handler for revisions

Added Paths:
-----------
    trunk/php/subversion/revision.pinc

Added: trunk/php/subversion/revision.pinc
===================================================================
--- trunk/php/subversion/revision.pinc	                        (rev 0)
+++ trunk/php/subversion/revision.pinc	2012-11-15 13:24:17 UTC (rev 839)
@@ -0,0 +1,67 @@
+<?php
+/**
+ *  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
+ *  Free Software Foundation; version 2 of the License.
+ *
+ *  SVN Info  $Id: cia.pinc 444 2011-11-30 10:56:20Z gokohnert $
+ *  $Author: gokohnert $
+ */
+
+/**
+ * a handler for resolving svn revision numbers
+ */
+class svn_revision extends tutos_handler {
+
+    function find_shortest(tutos_base $obj) {
+        if (count($obj->list[usesvn]) == 0) return;
+        $x = null;
+        $l = null;
+        foreach($obj->list[usesvn] as $s) {
+            if (($l == null) || (strlen($s->uri) < $l) ) {
+                $x = $s;
+                $l = strlen($s->uri);
+            }
+            unset ($s);
+        }
+        return $x;
+    }
+
+    /**
+     * run the handler
+     */
+    function handle(tutos_base $obj,$arg,$cnt) {
+        global $lang,$current_user;
+
+        // search the svn object
+        if ($obj->getTypeId() != usebugtracking) return;
+
+
+        if (is_object($obj->target)) {
+            svn::obj_read($obj->target);
+            $s = $this->find_shortest($obj->target);
+            if ($s) {
+                return $s->getLink($arg,'rev='.$arg);
+            }
+        }
+
+        if (is_object($obj->parent)) {
+            svn::obj_read($obj->parent);
+            $s = $this->find_shortest($obj->parent);
+            if ($s) {
+                return $s->getLink($arg,'rev='.$arg);
+            }
+        }
+        return 'X '. $obj->getType().' '.$arg.' '.$cnt;
+    }
+
+    /**
+     * check if all is ok
+     */
+    function check(&$obj,$arg) {
+        return true;
+    }
+}
+?>
\ 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: 838
          http://tutos.svn.sourceforge.net/tutos/?rev=838&view=rev
Author:   gokohnert
Date:     2012-11-15 13:23:14 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
added handler for revisions

Modified Paths:
--------------
    trunk/php/bugtracking/bug.pinc
    trunk/php/subversion/README
    trunk/php/subversion/mconfig.pinc
    trunk/php/subversion/svn.pinc

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2012-11-14 07:37:34 UTC (rev 837)
+++ trunk/php/bugtracking/bug.pinc	2012-11-15 13:23:14 UTC (rev 838)
@@ -224,7 +224,10 @@
      */
     function getFullName() {
         $this->read_reference();
-        return $this->ref->getFullName();
+        if (is_object($this->ref))
+            return $this->ref->getFullName();
+        else
+            return '['.$this->bugid.']';
     }
 
     /**
@@ -557,7 +560,7 @@
                     $r .= '&#160;<i>'. $lang['HistoryDeleted'] ."</i>\n";
                 }
                 if ($this->parent->tutos['bug_use_revision'] == 1)
-                    $r .= '&#160;&#160;<span align="right"><b>- '. $i->revision ." -</b></span>\n";
+                    $r .= '&#160;&#160;<span align="right"><b>- '. handle('revision',$this,$i->revision) ." -</b></span>\n";
 
                 $r .= "<br />\n";
                 if ($desc != $olddesc) {

Modified: trunk/php/subversion/README
===================================================================
--- trunk/php/subversion/README	2012-11-14 07:37:34 UTC (rev 837)
+++ trunk/php/subversion/README	2012-11-15 13:23:14 UTC (rev 838)
@@ -74,6 +74,14 @@
   subversion report in the report engine.
   After defining a subversion path for a project you can select the report/workflow
   on the right side menu and trigger the creation and filling of the repository
+
+
+  Subversion module also includes a handler for resolving revision ids (as used in bugtracking)
+  see the line
+
+  $tutos[handler]['revision']['svn'] = 'subversion/revision.pinc';
+
+  in mconfig.pinc
   
   See tutos/php/report-engine/rep_subversion/README for an installation guide
 

Modified: trunk/php/subversion/mconfig.pinc
===================================================================
--- trunk/php/subversion/mconfig.pinc	2012-11-14 07:37:34 UTC (rev 837)
+++ trunk/php/subversion/mconfig.pinc	2012-11-15 13:23:14 UTC (rev 838)
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2009 - 2010 by Gero Kohnert
+ * Copyright 2009 - 2012 by Gero Kohnert
  *
  * Module specific configuration
  *
@@ -8,10 +8,10 @@
  *  $Author$
  */
 
-#
-# Every module must have an individual ID ( < 0 > -100 ).
-# this is module 42
-#
+//
+// Every module must have an individual ID ( < 0 > -100 ).
+// this is module 42
+//
 define('usesvn',-42);
 $tutos[modules]['svn'] = array(
     name => 'svn',
@@ -21,21 +21,26 @@
     'configurl' => 'subversion/svn_config.php',
     'perm' => usesvn
     );
-#
-# globally enable this module
-#
+//
+// globally enable this module
+//
 if (!isset($tutos[usesvn]))
     $tutos[usesvn] = 1;
-# but disable it use
+
+// but disable it use
 $tutos['defaultperm'][usesvn] = 0;
-#
-# List of objects/modules where we do something with this module
-# and need to include this module
-#
+//
+// List of objects/modules where we do something with this module
+// and need to include this module
+//
 $tutos[modulesinc]['svn'][] = 'scheme';
 $tutos[modulesinc]['svn'][] = 'product';
 
 $tutos[modulesinc]['report-engine'][] = 'svn';
 
 $permskip[usesvn][PERM_MYTUTOS]  = 1;
+
+// a handler for resolving revision numbers
+$tutos[handler]['revision']['svn_revision'] = 'subversion/revision.pinc';
+
 ?>
\ No newline at end of file

Modified: trunk/php/subversion/svn.pinc
===================================================================
--- trunk/php/subversion/svn.pinc	2012-11-14 07:37:34 UTC (rev 837)
+++ trunk/php/subversion/svn.pinc	2012-11-15 13:23:14 UTC (rev 838)
@@ -78,6 +78,15 @@
  */
 class svn extends tutos_module {
     /**
+     * URL to use for modify this object
+     */
+    protected $modurl  = 'subversion/svn_new.php';
+    /**
+     * URL to use for display this object
+     */
+    protected $showurl = 'subversion/svn_show.php';
+
+    /**
      * constructor
      */
     function svn(tutos_db $dbconn) {
@@ -205,20 +214,6 @@
     }
 
     /**
-     * Return a link to this svn
-     */
-    function getURL() {
-        return 'subversion/svn_show.php?id='.$this->id;
-    }
-
-    /**
-     * Return a link to modify this svn
-     */
-    function getModURL() {
-        return 'subversion/svn_new.php?id='.$this->id;
-    }
-
-    /**
      *  Return a fullname
      */
     function getFullname() {

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

Revision: 837
          http://tutos.svn.sourceforge.net/tutos/?rev=837&view=rev
Author:   gokohnert
Date:     2012-11-14 07:37:34 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
speedup

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

Modified: trunk/php/testmanager/testrun_overview.php
===================================================================
--- trunk/php/testmanager/testrun_overview.php	2012-11-08 09:18:26 UTC (rev 836)
+++ trunk/php/testmanager/testrun_overview.php	2012-11-14 07:37:34 UTC (rev 837)
@@ -58,8 +58,8 @@
                 $b->read_result($this->result,$a);
                 if (!$b->see_ok()) continue;
                 $b->read_reference();
-                $b->run->collectstats();
-                foreach($b->run->statarr[0] as $si => $sf) {
+                $b->collectstats();
+                foreach($b->statarr[0] as $si => $sf) {
                     if (!isset($this->statarr[$si]))
                         $this->statarr[$si] = 0;
                     $this->statarr[$si] += $sf;
@@ -380,4 +380,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: 836
          http://tutos.svn.sourceforge.net/tutos/?rev=836&view=rev
Author:   gokohnert
Date:     2012-11-08 09:18:26 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
virtual roles in bugpermissions also look on target project now

Modified Paths:
--------------
    trunk/php/bugtracking/bug.pinc
    trunk/php/bugtracking/bug_overview.php

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2012-11-06 18:16:56 UTC (rev 835)
+++ trunk/php/bugtracking/bug.pinc	2012-11-08 09:18:26 UTC (rev 836)
@@ -1642,10 +1642,10 @@
             $x[$this->getTypeId()][6] = $lang[$this->getType()].':'.$lang['Bug'].' '.$lang['BugReference'].' '.$lang['Installation'].' - '.$lang['SoldBy'];
             $x[$this->getTypeId()][7] = $lang[$this->getType()].':'.$lang['Bug'].' '.$lang['BugReference'].' '.$lang['Installation'].' - '.$lang['InstalledBy'];
         }
-        $x[$this->getTypeId()][8] = $lang[$this->getType()].':'.$lang['BugReference'].' '.$lang['ProdRoles'];
+        $x[$this->getTypeId()][8] = $lang[$this->getType()].':'.$lang['BugReference'].'/'.$lang['BugTarget'].' '.$lang['ProdRoles'];
         foreach ($lang['ProdRole'] as $role => $f) {
             if ( $tutos[rolecheck][$role] != "p") {
-                $x[$this->getTypeId()][10+$role] = $lang[$this->getType()].':'.$lang['BugReference'].' '.$f;
+                $x[$this->getTypeId()][10+$role] = $lang[$this->getType()].':'.$lang['BugReference'].'/'.$lang['BugTarget'].' '.$f;
             }
         }
         return $x;
@@ -1664,9 +1664,12 @@
         }
 
         $x = parent::getObjectGroupList($id);
+
         if (($id2 == 2) && is_object($this->solver)) {
+            // ASSIGNED
             $x[$this->solver->id] = $this->solver;
         } elseif (($id2 == 2) && is_numeric($this->solver)) {
+            // ASSIGNED
             // add all members of a projects subteam
             if (is_object($this->parent) && ($this->parent->getTypeId() == useprojects) ) {
                 $this->parent->readroles();
@@ -1676,15 +1679,27 @@
                         unset($f);
                     }
             }
+            // add all members of a target subteam
+            if (is_object($this->target) && ($this->target->getTypeId() == useprojects) ) {
+                $this->target->readroles();
+                if (isset($this->target->role[-(10+$this->solver)]))
+                    foreach ($this->target->role[-(10+$this->solver)] as $f) {
+                        $x[$f->id] = $f;
+                        unset($f);
+                    }
+            }
         } elseif (($id2 == 3) && is_object($this->reporter)) {
+            // reported from
             $x[$this->reporter->id] = $this->reporter;
         }
 
+        // 5 = Parent Creator
         if (is_object($this->parent) ) {
             if ($id2 == 5) {
                 $x[$this->parent->creator->id] = $this->parent->creator;
             }
         }
+        // 4 = Parent Task Worker
         if (is_object($this->parent) && ($this->parent->getTypeId() == usetaskmanagement) ) {
             if ($id2 == 4) {
                 $x = $this->parent->getObjectGroupList(2);
@@ -1701,8 +1716,10 @@
             }
         }
 
+        // parent project roles
         if (is_object($this->parent) && ($this->parent->getTypeId() == useprojects) ) {
             $this->parent->readroles();
+            // All Parent Project Roles
             if ($id2 == 8) {
                 $x = $this->parent->getObjectGroupList(8);
             }
@@ -1713,6 +1730,20 @@
                 }
             }
         }
+        // target project roles
+        if (is_object($this->target) && ($this->target->getTypeId() == useprojects) ) {
+            $this->target->readroles();
+            // All target Project Roles
+            if ($id2 == 8) {
+                $x += $this->target->getObjectGroupList(8);
+            }
+            foreach ($lang['ProdRole'] as $role => $f) {
+                if ( $tutos[rolecheck][$role] == "p") continue;
+                if ($role+10 == $id2) {
+                    $x += $this->target->getObjectGroupList($role+128);
+                }
+            }
+        }
         return $x;
     }
 

Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php	2012-11-06 18:16:56 UTC (rev 835)
+++ trunk/php/bugtracking/bug_overview.php	2012-11-08 09:18:26 UTC (rev 836)
@@ -851,7 +851,7 @@
                 }
                 $spie['data'] .=  ']';
                 $pre = ',';
-#                break;
+                #                break;
             }
 
             $r .= "<tr>\n";
@@ -1249,6 +1249,7 @@
 
         $n2 = $this->result2->numrows();
 
+
         // Make a big array of all visible bugs
         $this->blist = array();
         $h = array();
@@ -1268,9 +1269,13 @@
             // fake acl read
             acl_read($b);
             if ( ! $b->see_ok() ) {
-                $skip++;
-                unset($b);
-                continue;
+                // deeper check after reading complete
+                $b->read_result($this->result2,$x-1);
+                if ( ! $b->see_ok() ) {
+                    $skip++;
+                    unset($b);
+                    continue;
+                }
             }
             // only read if in range
             if ($this->format != "html" ||
@@ -1291,6 +1296,7 @@
 
         $n = count($this->blist);
         $this->result2->free();
+        //        $msg .= $n.' '.$n2.' '.$this->q;
 
         if ( 0 == $n) {
             $msg = addLine($msg,$lang['Err0048']);

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

Revision: 835
          http://tutos.svn.sourceforge.net/tutos/?rev=835&view=rev
Author:   gokohnert
Date:     2012-11-06 18:16:56 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
fixes

Modified Paths:
--------------
    trunk/php/admin/customize_show.php
    trunk/php/admin/restore.php
    trunk/php/admin/scheme.php

Modified: trunk/php/admin/customize_show.php
===================================================================
--- trunk/php/admin/customize_show.php	2012-11-06 18:15:01 UTC (rev 834)
+++ trunk/php/admin/customize_show.php	2012-11-06 18:16:56 UTC (rev 835)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2007 - 2010 by Gero Kohnert
+ *  Copyright 2007 - 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
@@ -101,7 +101,7 @@
                     }
                     $r .= $this->OverviewRowStart($line);
                     $r .= ' <td>&nbsp;&nbsp;&nbsp;&nbsp;$lang[\''. $i .'\'][\''. $i2.'\'] = </td>'."\n";
-                    $r .= ' <td>&quot;'. myentities($j) .'&quot;</td>'."\n";
+                    $r .= ' <td>&quot;'. myentities($j2) .'&quot;</td>'."\n";
                     $r .= ' <td>&quot;<input name="lg2_'.$i.'__'.$i2.'" value="'. $lang2[$i][$i2] .'" />&quot;</td>'."\n";
                     $r .= ' <td>&quot;<input name="lg3_'.$i.'__'.$i2.'" value="'. $lang3[$i][$i2] .'" />&quot;</td>'."\n";
                     $r .= $this->OverviewRowEnd($line);

Modified: trunk/php/admin/restore.php
===================================================================
--- trunk/php/admin/restore.php	2012-11-06 18:15:01 UTC (rev 834)
+++ trunk/php/admin/restore.php	2012-11-06 18:16:56 UTC (rev 835)
@@ -18,8 +18,6 @@
 require_once 'permission.p3';
 
 loadlayout();
-$lang = array();
-ReadLang($lang);
 
 class Restore extends layout {
     Function info() {
@@ -28,8 +26,6 @@
     }
 }
 
-$l = new Restore($current_user);
-$l->PageHeader('RESTORE');
 
 
 $zipname  = $tutos[sessionpath] .'/backup.zip';
@@ -43,6 +39,12 @@
 $_SESSION['dbnr'] = $dbnr;
 $dbconn = DB_Open($dbnr,false);
 
+$lang = array();
+ReadLang($lang);
+
+$l = new Restore($current_user);
+$l->PageHeader('RESTORE');
+
 if (!is_object($dbconn)) {
     die ('No database with id '.$dbnr.' found');
 }

Modified: trunk/php/admin/scheme.php
===================================================================
--- trunk/php/admin/scheme.php	2012-11-06 18:15:01 UTC (rev 834)
+++ trunk/php/admin/scheme.php	2012-11-06 18:16:56 UTC (rev 835)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001-2011 by Gero Kohnert
+ *  Copyright 2001-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
@@ -378,7 +378,8 @@
     }
 }
 
-$dbc = null;
+#$dbc = null;
+$dbc = DB_Open(-3,false);
 $x = new tutos_user($dbc);
 $l = new Admin_scheme($x);
 $l->display();

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

Revision: 834
          http://tutos.svn.sourceforge.net/tutos/?rev=834&view=rev
Author:   gokohnert
Date:     2012-11-06 18:15:01 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
formatting

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

Modified: trunk/php/timetrack/timetrack.pinc
===================================================================
--- trunk/php/timetrack/timetrack.pinc	2012-10-29 15:07:51 UTC (rev 833)
+++ trunk/php/timetrack/timetrack.pinc	2012-11-06 18:15:01 UTC (rev 834)
@@ -720,7 +720,7 @@
         $r .= txt2csv($w);
         $r .= txt2csv($ref);
         $r .= txt2csv($this->desc);
-        $r .= txt2csv($this->volume);
+        $r .= txt2csv(my_number_format($this->volume,2));
         $r .= txt2csv($this->cph);
         $r .= txt2csv($this->currency);
         $r .= txt2csv($this->state);

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

Revision: 833
          http://tutos.svn.sourceforge.net/tutos/?rev=833&view=rev
Author:   gokohnert
Date:     2012-10-29 15:07:51 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
set focus

Modified Paths:
--------------
    trunk/php/group/group2_new.php

Modified: trunk/php/group/group2_new.php
===================================================================
--- trunk/php/group/group2_new.php	2012-10-29 14:53:07 UTC (rev 832)
+++ trunk/php/group/group2_new.php	2012-10-29 15:07:51 UTC (rev 833)
@@ -70,7 +70,7 @@
         $r .= $this->getHidden();
         $r .= $this->markBadFields();
         $r .= "</form>\n";
-        $r .= $this->setfocus('group2add.name');
+        $r .= $this->setfocus('group2add.comment');
         $r .= $lang['FldsRequired'] ."\n";
         return $r;
     }
@@ -115,4 +115,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: 832
          http://tutos.svn.sourceforge.net/tutos/?rev=832&view=rev
Author:   gokohnert
Date:     2012-10-29 14:53:07 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
removed print_r

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

Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc	2012-10-26 10:24:19 UTC (rev 831)
+++ trunk/php/group/group.pinc	2012-10-29 14:53:07 UTC (rev 832)
@@ -459,7 +459,7 @@
             $crm = array();
         }
 
-        print_r($crm);
+        //print_r($crm);
 
         group::obj_read($obj);
 
@@ -641,4 +641,4 @@
         return $r;
     }
   }
-?>
\ 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: 831
          http://tutos.svn.sourceforge.net/tutos/?rev=831&view=rev
Author:   gokohnert
Date:     2012-10-26 10:24:19 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
fix text file popup

Modified Paths:
--------------
    trunk/html/default.css
    trunk/php/file/file.pinc

Modified: trunk/html/default.css
===================================================================
--- trunk/html/default.css	2012-10-26 10:23:27 UTC (rev 830)
+++ trunk/html/default.css	2012-10-26 10:24:19 UTC (rev 831)
@@ -48,12 +48,25 @@
 
 .file_preview {
     width:      250px;
-    margin:     5px;
+}
+
+.img_preview {
     text-align: left;
-    padding:    1px;
+    margin:     8px;
+    padding:    0px;
     border:     1px solid black;
-    font-size:  6pt;
 }
+
+.txt_preview {
+    overflow:   auto;
+    min-width:  40em;
+    max-width:  50em;
+    margin:     8px;
+    text-align: left;
+    padding:    2px;
+    border:     1px solid black;
+    font-size:  7pt;
+}
 .left {
     float: left;
 }

Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc	2012-10-26 10:23:27 UTC (rev 830)
+++ trunk/php/file/file.pinc	2012-10-26 10:24:19 UTC (rev 831)
@@ -695,7 +695,7 @@
             return '';
         }
         $url = $tutos['base'].'/php/'.addUrlParameter($this->getUrl(),'format=preview',true);
-        $info = "{ajaxPath: '".$url." div#file_content',
+        $info = "{shrinkToFit:true,ajaxPath: '".$url." div#file_content',
 trigger : ['hoverIntent mouseover','none']}";
         return array($info,'');
     }
@@ -784,16 +784,18 @@
         $info = '';
         $url = dirname(getBaseUrl()) .'/'. addSessionKey($this->getUrl().'&format=show');
 
+        $info .= '<div id="file_content">';
         if ( preg_match('#image#',$this->filetype) ) {
-            $info .= '<div id="file_content"><a href="'.$url.'"><img class="file_preview" src="'.$url.'"></a><br />'.$this->getFullName().'</div>';
+            $info .= '<div class="img_preview"><a href="'.$url.'"><img class="file_preview" src="'.$url.'"></a></div><br />';
         } else {
-            $info .= '<div id="file_content"><pre class="file_preview">';
-            $info .= file_get_contents($fname,false,null,-1,100);
+            $info .= '<div class="txt_preview pre">';
+            $info .= myentities(file_get_contents($fname,false,null,-1,100));
             if ($this->filesize > 100) {
                 $info .= '<br />......';
             }
-            $info .= '</pre>'.$this->getFullName().'</div>';
+            $info .= '</div>';
         }
+        $info.= makelink($url,$this->getFullName()).'</div>';
         return $info;
     }
 

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

Revision: 830
          http://tutos.svn.sourceforge.net/tutos/?rev=830&view=rev
Author:   gokohnert
Date:     2012-10-26 10:23:27 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
fix edit of quoted text

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

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-10-23 12:51:09 UTC (rev 829)
+++ trunk/php/testmanager/testmanager.pinc	2012-10-26 10:23:27 UTC (rev 830)
@@ -803,8 +803,8 @@
         $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=\"".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>";
+            $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());
         }
@@ -2687,7 +2687,7 @@
         $url = addUrlParameter($url,'prefix='.$prefix);
 
         if ($obj->mod_ok() && ($obj->activ != 1) && !isset($obj->test)  && ($obj->state != TS_RELEASED) ) {
-            $r .= '<input id="N'.$obj->id."t\" style=\"display:none;\" "enableTextEdit('N".$obj->id."');\" "disableTextEdit('N".$obj->id."');\" value=\"" . $obj->name. '" />';
+            $r .= '<input id="N'.$obj->id."t\" style=\"display:none;\" "enableTextEdit('N".$obj->id."');\" "disableTextEdit('N".$obj->id."');\" value=\"" . myentities($obj->name). '" />';
             $r .= '<div id="N'.$obj->id."p\" "enableTextEdit('N".$obj->id."');\">".$obj->name."</div>";
         } else {
             $r .= makelink($url,myentities($obj->name));

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

Revision: 829
          http://tutos.svn.sourceforge.net/tutos/?rev=829&view=rev
Author:   gokohnert
Date:     2012-10-23 12:51:09 +0000 (Tue, 23 Oct 2012)
Log Message:
-----------
extended lang files

Modified Paths:
--------------
    trunk/php/admin/de.p3
    trunk/php/admin/en.p3
    trunk/php/admin/hu.p3

Modified: trunk/php/admin/de.p3
===================================================================
--- trunk/php/admin/de.p3	2012-10-22 07:44:19 UTC (rev 828)
+++ trunk/php/admin/de.p3	2012-10-23 12:51:09 UTC (rev 829)
@@ -81,6 +81,7 @@
 $lang['ConfigHelpPassMaxAge']      = 'maximal age (in days) of an password before user is required to choose a new one. ( -1 = never )';
 $lang['ConfigHelpPassMinLength']   = 'minimal number of characters for an password';
 $lang['ConfigHelpPassNeedSpecial'] = 'minimal number of special characters in an password (i.e. characters other than a-z)';
+$lang['ConfigHelpPrefMail']        = 'bevorzugtes Format für eingehende Emails';
 
 $lang['ConfigMailModes'][0]        = '0: No outgoing mails';
 $lang['ConfigMailModes'][1]        = '1: use sendmail program';
@@ -92,4 +93,4 @@
 ### mode:iso-accents ***
 ### coding:utf-8 ***
 ### End: ***
-?>
\ No newline at end of file
+?>

Modified: trunk/php/admin/en.p3
===================================================================
--- trunk/php/admin/en.p3	2012-10-22 07:44:19 UTC (rev 828)
+++ trunk/php/admin/en.p3	2012-10-23 12:51:09 UTC (rev 829)
@@ -83,6 +83,7 @@
 $lang['ConfigHelpPassMaxAge']      = 'maximal age (in days) of an password before user is required to choose a new one. ( -1 = never )';
 $lang['ConfigHelpPassMinLength']   = 'minimal number of characters for an password';
 $lang['ConfigHelpPassNeedSpecial'] = 'minimal number of special characters in an password (i.e. characters other than a-z)';
+$lang['ConfigHelpPrefMail']        = 'preffered format for receiving mails';
 
 $lang['ConfigMailModes'][0]        = '0: No outgoing mails';
 $lang['ConfigMailModes'][1]        = '1: use sendmail program';
@@ -93,4 +94,4 @@
 ### Local Variables: ***
 ### coding:utf-8 ***
 ### End: ***
-?>
\ No newline at end of file
+?>

Modified: trunk/php/admin/hu.p3
===================================================================
--- trunk/php/admin/hu.p3	2012-10-22 07:44:19 UTC (rev 828)
+++ trunk/php/admin/hu.p3	2012-10-23 12:51:09 UTC (rev 829)
@@ -81,6 +81,7 @@
 $lang['ConfigHelpPassMaxAge']      = 'maximal age (in days) of an password before user is required to choose a new one. ( -1 = never )';
 $lang['ConfigHelpPassMinLength']   = 'minimal number of characters for an password';
 $lang['ConfigHelpPassNeedSpecial'] = 'minimal number of special characters in an password (i.e. characters other than a-z)';
+$lang['ConfigHelpPrefMail']        = 'preffered format for receiving mails';
 
 $lang['ConfigMailModes'][0]        = '0: No outgoing mails';
 $lang['ConfigMailModes'][1]        = '1: use sendmail program';
@@ -92,4 +93,4 @@
 ### mode:iso-accents ***
 ### coding:utf-8 ***
 ### End: ***
-?>
\ 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: 828
          http://tutos.svn.sourceforge.net/tutos/?rev=828&view=rev
Author:   gokohnert
Date:     2012-10-22 07:44:19 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
made search_by_name static

Modified Paths:
--------------
    trunk/php/address.pinc
    trunk/php/appointment.pinc
    trunk/php/base.pinc
    trunk/php/bugtracking/bug.pinc
    trunk/php/company.pinc
    trunk/php/department.pinc
    trunk/php/expense/expense.pinc
    trunk/php/file/file.pinc
    trunk/php/installation/installation.pinc
    trunk/php/module_template/AAA.pinc
    trunk/php/product.pinc
    trunk/php/scrum/scrum.pinc
    trunk/php/stuff/stuff.pinc
    trunk/php/task.pinc
    trunk/php/team.pinc
    trunk/php/testmanager/testmanager.pinc

Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/address.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -130,7 +130,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/appointment.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -518,7 +518,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/base.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -1290,7 +1290,7 @@
             } else {
                 $q->addFV($i,$this->$fld,'');
             }
-            #       echo $x[type] ." ". $fld ." ". $this->$fld ."<br />";
+            // echo $x[type] ." ". $fld ." ". $this->$fld ."<br />";
         }
     }
 
@@ -1772,7 +1772,7 @@
     /**
      * search objects of this class by name
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         return 0;
     }
 
@@ -1806,4 +1806,4 @@
         return array($r,$o);
     }
 }
-?>
\ No newline at end of file
+?>

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/bugtracking/bug.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -662,7 +662,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table,$tutos;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/company.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -153,7 +153,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;
@@ -498,4 +498,4 @@
     }
 }
 $tutos['classes'][usecompany] = 'company';
-?>
+?>
\ No newline at end of file

Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/department.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -128,7 +128,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;
@@ -527,6 +527,6 @@
         $r .= "</ul>\n";
         return $r;
     }
-}
+  }
 $tutos['classes'][usedepartment] = 'department';
 ?>
\ No newline at end of file

Modified: trunk/php/expense/expense.pinc
===================================================================
--- trunk/php/expense/expense.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/expense/expense.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -253,7 +253,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/file/file.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -295,7 +295,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/installation/installation.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -272,7 +272,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/module_template/AAA.pinc
===================================================================
--- trunk/php/module_template/AAA.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/module_template/AAA.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -83,7 +83,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table,$tutos;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/product.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -708,7 +708,7 @@
      *
      * the result will first show active projects and than inactive ones
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table,$tutos;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/scrum/scrum.pinc
===================================================================
--- trunk/php/scrum/scrum.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/scrum/scrum.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -924,7 +924,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/stuff/stuff.pinc
===================================================================
--- trunk/php/stuff/stuff.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/stuff/stuff.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -97,7 +97,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table,$tutos;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/task.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -794,7 +794,7 @@
      *
      * result is sorted (fisr not finished then finished tasks)
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table,$tutos;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/team.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -192,7 +192,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/testmanager/testmanager.pinc	2012-10-22 07:44:19 UTC (rev 828)
@@ -177,7 +177,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;
@@ -1303,7 +1303,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;
@@ -2233,7 +2233,7 @@
      * mode 1 fill objects
      * mode 0 do not fill objects
      */
-    function search_by_name(&$arr,&$user,$name,$mode = 1) {
+    static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
         global $table;
 
         if ( trim($name) == "" ) return 0;

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

Revision: 827
          http://tutos.svn.sourceforge.net/tutos/?rev=827&view=rev
Author:   gokohnert
Date:     2012-10-22 07:36:36 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/localization/ca.p3
    trunk/php/localization/cs.p3
    trunk/php/localization/el.p3
    trunk/php/localization/en.p3
    trunk/php/localization/es-mx.p3
    trunk/php/localization/es-ni.p3
    trunk/php/localization/es-ve.p3
    trunk/php/localization/es.p3
    trunk/php/localization/fr.p3
    trunk/php/localization/hu.p3
    trunk/php/localization/it.p3
    trunk/php/localization/ja.p3
    trunk/php/localization/ko.p3
    trunk/php/localization/nl.p3
    trunk/php/localization/pl.p3
    trunk/php/localization/pt-br.p3
    trunk/php/localization/pt.p3
    trunk/php/localization/ru.p3
    trunk/php/localization/sv.p3
    trunk/php/localization/tw.p3
    trunk/php/localization/vi.p3
    trunk/php/localization/zh.p3

Modified: trunk/php/localization/ca.p3
===================================================================
--- trunk/php/localization/ca.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/ca.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -63,7 +63,7 @@
 $lang['seeapp']          = "veure els detalls de la cita (%s - %s)";
 $lang['AllEntries']      = "veure totes les %s entrades";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/cs.p3
===================================================================
--- trunk/php/localization/cs.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/cs.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
 $lang['seeapp']          = "Prohlížet detaily (%s - %s)";
 $lang['AllEntries']      = "Prohlížet všechny %s položky";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/el.p3
===================================================================
--- trunk/php/localization/el.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/el.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -59,7 +59,7 @@
 $lang['seeapp']          = "δες λεπτομέρειες συνάντησης (%s - %s)";
 $lang['AllEntries']      = "δες %s καταχωρίσεις";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/en.p3
===================================================================
--- trunk/php/localization/en.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/en.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
 $lang['seeapp']          = 'see this appointment details (%s - %s)';
 $lang['AllEntries']      = 'see all %s entries';
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/es-mx.p3
===================================================================
--- trunk/php/localization/es-mx.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/es-mx.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver las entradas %s";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/es-ni.p3
===================================================================
--- trunk/php/localization/es-ni.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/es-ni.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver las entradas %s";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/es-ve.p3
===================================================================
--- trunk/php/localization/es-ve.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/es-ve.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver las entradas %s";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/es.p3
===================================================================
--- trunk/php/localization/es.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/es.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver todas las %s entradas";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/fr.p3
===================================================================
--- trunk/php/localization/fr.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/fr.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
 $lang['seeapp']          = 'Voir les détails de ce rendez-vous (%s - %s)';
 $lang['AllEntries']      = 'Voir toutes les %s entrées';
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/hu.p3
===================================================================
--- trunk/php/localization/hu.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/hu.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -62,7 +62,7 @@
 $lang['seeapp']          = "ezen időpont részleteinek vizsgálata (%s - %s)";
 $lang['AllEntries']      = "az összes %s bejegyzés vizsgálata";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/it.p3
===================================================================
--- trunk/php/localization/it.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/it.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -55,7 +55,7 @@
 $lang['seeapp']          = "visualizza questa dettaglio di appuntamento (%s - %s)";
 $lang['AllEntries']      = "visualizza tutti gli elementi di %s";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/ja.p3
===================================================================
--- trunk/php/localization/ja.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/ja.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
 $lang['seeapp']          = "この予約の詳細を見る (%s - %s)";
 $lang['AllEntries']      = "%s のすべてのエントリを見る";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/ko.p3
===================================================================
--- trunk/php/localization/ko.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/ko.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -63,7 +63,7 @@
 $lang['seeapp']          = "일정의 자세한 내용을 본다 (%s - %s)";
 $lang['AllEntries']      = "%s의 모든 등록사항을 봅니다.";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/nl.p3
===================================================================
--- trunk/php/localization/nl.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/nl.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -66,7 +66,7 @@
 $lang['seeapp']          = "deze afspraakinfo zien (%s - %s)";
 $lang['AllEntries']      = "Toon alle %s ingevoerde gegevens";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/pl.p3
===================================================================
--- trunk/php/localization/pl.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/pl.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -62,7 +62,7 @@
 $lang['seeapp']          = "sprawdź szczegóły spotkania (%s - %s)";
 $lang['AllEntries']      = "przejrzyj wszystkie %s wpisów";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/pt-br.p3
===================================================================
--- trunk/php/localization/pt-br.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/pt-br.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
 $lang['seeapp']          = "visualiza os detalhes desse compromisso (%s - %s)";
 $lang['AllEntries']      = "visualizar todas %s entradas";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/pt.p3
===================================================================
--- trunk/php/localization/pt.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/pt.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -62,7 +62,7 @@
 $lang['seeapp']          = "consulta detalhes do compromisso (%s - %s)";
 $lang['AllEntries']      = "consulta todas %s entradas";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/ru.p3
===================================================================
--- trunk/php/localization/ru.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/ru.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
 $lang['seeapp']          = "Просмотр подробностей(%s - %s)";
 $lang['AllEntries']      = "Смотреть все %s записи";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/sv.p3
===================================================================
--- trunk/php/localization/sv.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/sv.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -58,7 +58,7 @@
 $lang['seeapp']          = "Visa bokningsdetaljer (%s - %s)";
 $lang['AllEntries']      = "Visa alla %s inmatningar";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/tw.p3
===================================================================
--- trunk/php/localization/tw.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/tw.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
 $lang['seeapp']          = "查看會議細節(%s - %s)";
 $lang['AllEntries']      = "查看所有 %s 輸入";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/vi.p3
===================================================================
--- trunk/php/localization/vi.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/vi.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
 $lang['seeapp']          = "Xem chi tiết các cuộc hẹn (%s - %s)";
 $lang['AllEntries']      = "Xem tất cả %s nội dung";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

Modified: trunk/php/localization/zh.p3
===================================================================
--- trunk/php/localization/zh.p3	2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/zh.p3	2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
 $lang['seeapp']          = "查看会议细节(%s - %s)";
 $lang['AllEntries']      = "查看所有 %s 输入";
 $lang['Comment']         = 'comment';
-$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp1']     = 'seperate alternates by |.';
 $lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
 $lang['SearchHelp3']     = 'A empty input will show everything.';
 $lang['SearchHelp4']     = 'A # will select empty data.';

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

Revision: 826
          http://tutos.svn.sourceforge.net/tutos/?rev=826&view=rev
Author:   gokohnert
Date:     2012-10-19 16:14:19 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
introduce help popups on smart search fields

Modified Paths:
--------------
    trunk/php/bugtracking/bug.pinc
    trunk/php/bugtracking/bug_select.php
    trunk/php/custom.pinc
    trunk/php/layout/layout_base.pinc
    trunk/php/localization/ca.p3
    trunk/php/localization/cs.p3
    trunk/php/localization/de.p3
    trunk/php/localization/el.p3
    trunk/php/localization/en.p3
    trunk/php/localization/es-mx.p3
    trunk/php/localization/es-ni.p3
    trunk/php/localization/es-ve.p3
    trunk/php/localization/es.p3
    trunk/php/localization/fr.p3
    trunk/php/localization/hu.p3
    trunk/php/localization/it.p3
    trunk/php/localization/ja.p3
    trunk/php/localization/ko.p3
    trunk/php/localization/nl.p3
    trunk/php/localization/pl.p3
    trunk/php/localization/pt-br.p3
    trunk/php/localization/pt.p3
    trunk/php/localization/ru.p3
    trunk/php/localization/sv.p3
    trunk/php/localization/tw.p3
    trunk/php/localization/vi.p3
    trunk/php/localization/zh.p3
    trunk/php/stuff/de.p3
    trunk/php/stuff/stuff_select.php
    trunk/php/testmanager/testmanager.pinc

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/bugtracking/bug.pinc	2012-10-19 16:14:19 UTC (rev 826)
@@ -702,7 +702,6 @@
                     $arr[-$id] = $id;
                 else
                     $arr[$id] = $id;
-
             }
             $a++;
         }

Modified: trunk/php/bugtracking/bug_select.php
===================================================================
--- trunk/php/bugtracking/bug_select.php	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/bugtracking/bug_select.php	2012-10-19 16:14:19 UTC (rev 826)
@@ -54,7 +54,7 @@
 
         $tutos['pagescript'] .= "
 $( \"#toggler\" ).click(function() {
-            $(\".ext\").toggle();
+            $(\".ext\").slideToggle();
             if ( $(\"#h_ext\").val() == 0 ) {
               $(\"#h_ext\").val(1);
             } else {
@@ -73,11 +73,13 @@
         $r .= $this->showfieldc(sprintf($lang['BugReference'],''),0,"p");
         $r .= $this->showdata(select_from_array_or_input($this,"p",null,1,get_parent_classes('bugtracking')),2);
         $r .= $this->ContentRowEnd();
+        $this->help_popup('p',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['BugTarget'],''),0,"t");
         $r .= $this->showdata(select_from_array_or_input($this,"t",null,1,get_parent_classes('bugtracking')),2);
         $r .= $this->ContentRowEnd();
+        $this->help_popup('t',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['BugState'],0,"state");
@@ -108,6 +110,7 @@
         $r .= $this->showfieldc(sprintf($lang['BugReportedFrom'],''),0,"reporterid");
         $r .= $this->showdata(select_from_array_or_input($this,"reporter",null,1,'at'),2);
         $r .= $this->ContentRowEnd();
+        $this->help_popup('reporter',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
 
         // add custom selectors
         $x = get_custom_selectors('bugtracking');

Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/custom.pinc	2012-10-19 16:14:19 UTC (rev 826)
@@ -1326,6 +1326,7 @@
                 if ($_REQUEST[$parsename.'fn'] == '*') {
                     // ANY NOT NULL
                     $x .= ' '.$pre.$ti .' > 0';
+                    $l .= ' = '. $_REQUEST[$parsename.'fn'];
                 } else {
                     if ($tx['otype'] == 'H') {
                         $arr = search_by_name($_GET[$parsename.'fn'],$tx['olist']);
@@ -1333,26 +1334,73 @@
                         $arr = search_by_name($_GET[$parsename.'fn'],$tx['otype']);
                     }
                     if (0 == count($arr)) continue;
-                    $x .= ' '.$pre.$ti .' in (';
+                    $ll = '';
+                    $nl = '';
                     $sep = '';
-                    foreach($arr as $a) {
-                        if (isset($tx['expand_id']) && function_exists($tx['expand_id'])) {
-                            $x .= $sep.$a->id;
-                            $sep = ',';
-                            // expand id if neccessary
-                            $idl = $tx['expand_id']($a);
-                            if (count($idl))
-                                foreach($idl as $id) {
-                                    $x .= $sep.$id;
+                    $nsep = '';
+                    foreach($arr as $idx => $a) {
+                        if (is_numeric($idx)) {
+                            if ($idx > 0) {
+                                if (is_object($a))
+                                    $ll .= $sep.$a->id;
+                                else if (is_array($a))
+                                    $ll .= $sep.$a[0];
+                                $sep = ',';
+                                if (isset($tx['expand_id']) && function_exists($tx['expand_id'])) {
+                                    // expand id if neccessary
+                                    $idl = $tx['expand_id']($a);
+                                    if (count($idl))
+                                        foreach($idl as $id) {
+                                            $ll .= $sep.$id;
+                                        }
                                 }
-                        } else {
-                            $x .= $sep.$a->id;
-                            $sep = ',';
+                            } else {
+                                if (is_object($a))
+                                    $nl .= $nsep.$a->id;
+                                else if (is_array($a))
+                                    $nl .= $nsep.$a[0];
+                                $nsep = ',';
+                                if (isset($tx['expand_id']) && function_exists($tx['expand_id'])) {
+                                    // expand id if neccessary
+                                    $idl = $tx['expand_id']($a);
+                                    if (count($idl))
+                                        foreach($idl as $id) {
+                                            $nl .= $nsep.$id;
+                                        }
+                                }
+                            }
+                        } else
+                            if (preg_match('/[A-Z]/',$idx)) {
+                                $ll .= $sep.$a[0];
+                                $sep = ',';
+                            } else {
+                                $nl .= $nsep.$a[0];
+                                $nsep = ',';
+                            }
+                    }
+                    if ($ll != '') {
+                        $x .= ' '.$pre.$ti .' in ('.$ll.')';
+                        $l .= ' = ';
+                    }
+                    if ($nl != '') {
+                        $x .= ' '.$pre.$ti .' not in ('.$nl.')';
+                        $l .= '  &#8800 ';
+                    }
+                    $s = explode('|',$_REQUEST[$parsename.'fn']);
+                    if (count($s)) {
+                        $lpre = '';
+                        foreach ($s as $sn) {
+                            if (constant('EMPTY') == $sn) {
+                                $sn = '<i>'.$lang['empty'].'</i>';
+                            }
+                            $l .= $lpre.$sn;
+                            $lpre = ',';
                         }
+                    } else {
+                        $l .= $_REQUEST[$parsename.'fn'];
                     }
-                    $x .= ')';
                 }
-                $r[] = array($x,$l .' = '. $_REQUEST[$parsename.'fn']);
+                $r[] = array($x,$l );
                 $layout->filter['_fld_'.$ti] = $_REQUEST[$parsename.'fn'];
                 $link = addUrlParameter($link,$parsename.'fn='.$_REQUEST[$parsename.'fn']);
             }

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/layout/layout_base.pinc	2012-10-19 16:14:19 UTC (rev 826)
@@ -1228,8 +1228,8 @@
   trigger: ['hoverIntent keypress', 'blur'],
   positions: ['right'],
   padding: 10,
-  width:   300,
-  fill:   'rgba(200,200,200,0.8)',
+  width:   350,
+  fill:   'rgba(200,200,200,0.7)',
   killTitle:  false,
   hoverIntentOpts: { interval: 1000, timeout: 2000 }
 });\n";

Modified: trunk/php/localization/ca.p3
===================================================================
--- trunk/php/localization/ca.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/ca.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -63,6 +63,12 @@
 $lang['seeapp']          = "veure els detalls de la cita (%s - %s)";
 $lang['AllEntries']      = "veure totes les %s entrades";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d.m.Y H:i T";
 $lang['DateTimeStr']     = "%d.%m.%Y %H:%M %Z";

Modified: trunk/php/localization/cs.p3
===================================================================
--- trunk/php/localization/cs.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/cs.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
 $lang['seeapp']          = "Prohlížet detaily (%s - %s)";
 $lang['AllEntries']      = "Prohlížet všechny %s položky";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d/m/Y H:i T";
 $lang['DateTimeStr']     = "%d/%m/%Y %H:%M %Z";

Modified: trunk/php/localization/de.p3
===================================================================
--- trunk/php/localization/de.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/de.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
 $lang['seeapp']          = 'Diesen Termin ansehen (%s - %s)';
 $lang['AllEntries']      = 'Alle %s Einträge ansehen';
 $lang['Comment']         = 'Kommentar';
+$lang['SearchHelp1']     = 'Alternative Suchbegriffe können mit | separiert werden.';
+$lang['SearchHelp2']     = 'Ein ! an erster Stelle kehrt die Selektion um.';
+$lang['SearchHelp3']     = 'Eine leere Eingabe selektiert alle Daten.';
+$lang['SearchHelp4']     = 'Ein # selektiert leere Daten.';
+$lang['SearchHelp5']     = 'Gesucht wird in:';
+$lang['SearchHelp6']     = 'Die nicht erweiterte Suche sucht in:';
 #
 $lang['DateTimePHP']     = 'd.m.Y H:i T';
 $lang['DateTimeStr']     = '%d.%m.%Y %H:%M %Z';

Modified: trunk/php/localization/el.p3
===================================================================
--- trunk/php/localization/el.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/el.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -59,6 +59,12 @@
 $lang['seeapp']          = "δες λεπτομέρειες συνάντησης (%s - %s)";
 $lang['AllEntries']      = "δες %s καταχωρίσεις";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d/m/Y H:i T";
 $lang['DateTimeStr']     = "%d/%m/%Y %H:%M %Z";

Modified: trunk/php/localization/en.p3
===================================================================
--- trunk/php/localization/en.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/en.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -54,12 +54,18 @@
 $lang['plus4weeks']      = '4 weeks plus';
 $lang['minus4weeks']     = '4 weeks back';
 $lang['only']            = 'only';
-$lang['reload']          = 'RRR';
+$lang['reload']          = 'reload';
 $lang['empty']           = 'empty';
 $lang['changeapp']       = 'see or change this appointment (%s - %s)';
 $lang['seeapp']          = 'see this appointment details (%s - %s)';
 $lang['AllEntries']      = 'see all %s entries';
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = 'd/m/Y H:i T';
 $lang['DateTimeStr']     = '%d/%m/%Y %H:%M %Z';

Modified: trunk/php/localization/es-mx.p3
===================================================================
--- trunk/php/localization/es-mx.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/es-mx.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver las entradas %s";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d.m.Y H:i T";
 $lang['DateTimeStr']     = "%d.%m.%Y %H:%M %Z";

Modified: trunk/php/localization/es-ni.p3
===================================================================
--- trunk/php/localization/es-ni.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/es-ni.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver las entradas %s";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d.m.Y H:i T";
 $lang['DateTimeStr']     = "%d.%m.%Y %H:%M %Z";

Modified: trunk/php/localization/es-ve.p3
===================================================================
--- trunk/php/localization/es-ve.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/es-ve.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver las entradas %s";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d.m.Y H:i T";
 $lang['DateTimeStr']     = "%d.%m.%Y %H:%M %Z";

Modified: trunk/php/localization/es.p3
===================================================================
--- trunk/php/localization/es.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/es.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver todas las %s entradas";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d.m.Y H:i T";
 $lang['DateTimeStr']     = "%d.%m.%Y %H:%M %Z";

Modified: trunk/php/localization/fr.p3
===================================================================
--- trunk/php/localization/fr.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/fr.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
 $lang['seeapp']          = 'Voir les détails de ce rendez-vous (%s - %s)';
 $lang['AllEntries']      = 'Voir toutes les %s entrées';
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = 'd.m.Y H:i T';
 $lang['DateTimeStr']     = '%d.%m.%Y %H:%M %Z';

Modified: trunk/php/localization/hu.p3
===================================================================
--- trunk/php/localization/hu.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/hu.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -62,6 +62,12 @@
 $lang['seeapp']          = "ezen időpont részleteinek vizsgálata (%s - %s)";
 $lang['AllEntries']      = "az összes %s bejegyzés vizsgálata";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "Y.m.d. H:i T";
 $lang['DateTimeStr']     = "%Y.%m.%d. %H:%M %Z";

Modified: trunk/php/localization/it.p3
===================================================================
--- trunk/php/localization/it.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/it.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -55,6 +55,12 @@
 $lang['seeapp']          = "visualizza questa dettaglio di appuntamento (%s - %s)";
 $lang['AllEntries']      = "visualizza tutti gli elementi di %s";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d.m.Y H:i T";
 $lang['DateTimeStr']     = "%d.%m.%Y %H:%M %Z";

Modified: trunk/php/localization/ja.p3
===================================================================
--- trunk/php/localization/ja.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/ja.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
 $lang['seeapp']          = "この予約の詳細を見る (%s - %s)";
 $lang['AllEntries']      = "%s のすべてのエントリを見る";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "Y/m/d H:i T";
 $lang['DateTimeStr']     = "%Y/%m/%d %H:%M %Z";

Modified: trunk/php/localization/ko.p3
===================================================================
--- trunk/php/localization/ko.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/ko.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -63,6 +63,12 @@
 $lang['seeapp']          = "일정의 자세한 내용을 본다 (%s - %s)";
 $lang['AllEntries']      = "%s의 모든 등록사항을 봅니다.";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "Y-m-d H:i T";
 $lang['DateTimeStr']     = "%Y-%m-%d %H:%M %Z";

Modified: trunk/php/localization/nl.p3
===================================================================
--- trunk/php/localization/nl.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/nl.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -66,6 +66,12 @@
 $lang['seeapp']          = "deze afspraakinfo zien (%s - %s)";
 $lang['AllEntries']      = "Toon alle %s ingevoerde gegevens";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d/m/Y H:i T";
 $lang['DateTimeStr']     = "%d/%m/%Y %H:%M %Z";

Modified: trunk/php/localization/pl.p3
===================================================================
--- trunk/php/localization/pl.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/pl.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -62,6 +62,12 @@
 $lang['seeapp']          = "sprawdź szczegóły spotkania (%s - %s)";
 $lang['AllEntries']      = "przejrzyj wszystkie %s wpisów";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 
 #
 $lang['DateTimePHP']     = "d/m/Y H:i T";

Modified: trunk/php/localization/pt-br.p3
===================================================================
--- trunk/php/localization/pt-br.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/pt-br.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
 $lang['seeapp']          = "visualiza os detalhes desse compromisso (%s - %s)";
 $lang['AllEntries']      = "visualizar todas %s entradas";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d/m/Y H:i T";
 $lang['DateTimeStr']     = "%d/%m/%Y %H:%M %Z";

Modified: trunk/php/localization/pt.p3
===================================================================
--- trunk/php/localization/pt.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/pt.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -62,6 +62,12 @@
 $lang['seeapp']          = "consulta detalhes do compromisso (%s - %s)";
 $lang['AllEntries']      = "consulta todas %s entradas";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d/m/Y H:i T";
 $lang['DateTimeStr']     = "%d/%m/%Y %H:%M %Z";

Modified: trunk/php/localization/ru.p3
===================================================================
--- trunk/php/localization/ru.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/ru.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
 $lang['seeapp']          = "Просмотр подробностей(%s - %s)";
 $lang['AllEntries']      = "Смотреть все %s записи";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d/m/Y H:i T";
 $lang['DateTimeStr']     = "%d/%m/%Y %H:%M %Z";

Modified: trunk/php/localization/sv.p3
===================================================================
--- trunk/php/localization/sv.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/sv.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -58,6 +58,13 @@
 $lang['seeapp']          = "Visa bokningsdetaljer (%s - %s)";
 $lang['AllEntries']      = "Visa alla %s inmatningar";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
+#
 $lang['DateTimePHP']     = "Y/m/d H:i T";
 $lang['DateTimeStr']     = "%Y/%m/%d %H:%M %Z";
 $lang['DateTimeFormat']  = "%s/%s/%s %02s:%02s %s";

Modified: trunk/php/localization/tw.p3
===================================================================
--- trunk/php/localization/tw.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/tw.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
 $lang['seeapp']          = "查看會議細節(%s - %s)";
 $lang['AllEntries']      = "查看所有 %s 輸入";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "Y年m月d日 H:i T";
 $lang['DateTimeStr']     = "%Y/%m/%d %H:%M %Z";

Modified: trunk/php/localization/vi.p3
===================================================================
--- trunk/php/localization/vi.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/vi.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
 $lang['seeapp']          = "Xem chi tiết các cuộc hẹn (%s - %s)";
 $lang['AllEntries']      = "Xem tất cả %s nội dung";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "d/m/Y H:i T";
 $lang['DateTimeStr']     = "%d/%m/%Y %H:%M %Z";

Modified: trunk/php/localization/zh.p3
===================================================================
--- trunk/php/localization/zh.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/zh.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
 $lang['seeapp']          = "查看会议细节(%s - %s)";
 $lang['AllEntries']      = "查看所有 %s 输入";
 $lang['Comment']         = 'comment';
+$lang['SearchHelp1']     = 'seperate alternates by |.;
+$lang['SearchHelp2']     = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3']     = 'A empty input will show everything.';
+$lang['SearchHelp4']     = 'A # will select empty data.';
+$lang['SearchHelp5']     = 'Search will look into:';
+$lang['SearchHelp6']     = 'unextended search will look into:';
 #
 $lang['DateTimePHP']     = "Y年m月d日 H:i T";
 $lang['DateTimeStr']     = "%Y/%m/%d %H:%M %Z";

Modified: trunk/php/stuff/de.p3
===================================================================
--- trunk/php/stuff/de.p3	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/stuff/de.p3	2012-10-19 16:14:19 UTC (rev 826)
@@ -63,4 +63,4 @@
 ### mode:iso-accents ***
 ### coding:utf-8 ***
 ### End: ***
-?>
\ No newline at end of file
+?>

Modified: trunk/php/stuff/stuff_select.php
===================================================================
--- trunk/php/stuff/stuff_select.php	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/stuff/stuff_select.php	2012-10-19 16:14:19 UTC (rev 826)
@@ -43,6 +43,8 @@
         $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" />');
         $r .= $this->ContentRowEnd();
 
+        $this->help_popup('name',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp6'],$lang['StuffName'],$lang['StuffDesc'],$lang['StuffSerial'],$lang['StuffId']);
+
         $r .= $this->ContentRowStart();
         $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
         $r .= $this->ContentRowEnd();
@@ -88,16 +90,19 @@
         $r .= $this->showfieldc($lang['StuffSource'],0,"source");
         $r .= $this->showdata(select_from_array_or_input($this->obj,"source",null,1,'cdat'),2);
         $r .= $this->ContentRowEnd();
+        $this->help_popup('source',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['StuffOwner'],0,"owner");
         $r .= $this->showdata(select_from_array_or_input($this->obj,"owner",null,1,'cdat'),2);
         $r .= $this->ContentRowEnd();
+        $this->help_popup('owner',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['StuffUser'],0,"user");
         $r .= $this->showdata(select_from_array_or_input($this->obj,"user",null,1,'cdat'),2);
         $r .= $this->ContentRowEnd();
+        $this->help_popup('user',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
 
         // add custom selectors
         $x = get_custom_selectors('stuff');

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/testmanager/testmanager.pinc	2012-10-19 16:14:19 UTC (rev 826)
@@ -181,6 +181,12 @@
         global $table;
 
         if ( trim($name) == "" ) return 0;
+        if (substr($name,0,1) == "!") {
+            $name = substr($name,1);
+            $negate = true;
+        } else {
+            $negate = false;
+        }
 
         // search for a given object ID
         $qx = '';
@@ -202,11 +208,17 @@
             if ($mode == 1) {
                 $x = new Testcase($user->dbconn);
                 $x->read_result($r,$a);
-                $arr[$x->id] = &$x;
+                if ($negate)
+                    $arr[-$x->id] = &$x;
+                else
+                    $arr[$x->id] = &$x;
                 unset($x);
             } else {
                 $id = $r->get($a,'id');
-                $arr[$id] = $id;
+                if ($negate)
+                    $arr[-$id] = $id;
+                else
+                    $arr[$id] = $id;
             }
             $a++;
         }
@@ -1295,6 +1307,12 @@
         global $table;
 
         if ( trim($name) == "" ) return 0;
+        if (substr($name,0,1) == "!") {
+            $name = substr($name,1);
+            $negate = true;
+        } else {
+            $negate = false;
+        }
 
         // search for a given object ID
         $qx = '';
@@ -1316,11 +1334,17 @@
             if ($mode == 1) {
                 $x = new Testsuite($user->dbconn);
                 $x->read_result($r,$a);
-                $arr[$x->id] = &$x;
+                if ($negate)
+                    $arr[-$x->id] = &$x;
+                else
+                    $arr[$x->id] = &$x;
                 unset($x);
             } else {
                 $id = $r->get($a,'id');
-                $arr[$id] = $id;
+                if ($negate)
+                    $arr[-$id] = $id;
+                else
+                    $arr[$id] = $id;
             }
             $a++;
         }
@@ -2213,6 +2237,12 @@
         global $table;
 
         if ( trim($name) == "" ) return 0;
+        if (substr($name,0,1) == "!") {
+            $name = substr($name,1);
+            $negate = true;
+        } else {
+            $negate = false;
+        }
 
         // search for a given object ID
         $qx = '';
@@ -2234,11 +2264,17 @@
             if ($mode == 1) {
                 $x = new Testrun($user->dbconn);
                 $x->read_result($r,$a);
-                $arr[$x->id] = &$x;
+                if ($negate)
+                    $arr[-$x->id] = &$x;
+                else
+                    $arr[$x->id] = &$x;
                 unset($x);
             } else {
                 $id = $r->get($a,'id');
-                $arr[$id] = $id;
+                if ($negate)
+                    $arr[-$id] = $id;
+                else
+                    $arr[$id] = $id;
             }
             $a++;
         }

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

Revision: 825
          http://tutos.svn.sourceforge.net/tutos/?rev=825&view=rev
Author:   gokohnert
Date:     2012-10-19 13:36:42 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
better support for "empty" refernece searches using \#

Modified Paths:
--------------
    trunk/php/address.pinc
    trunk/php/bugtracking/bug_overview.php
    trunk/php/expense/expense_overview.php
    trunk/php/expense/expense_select.php
    trunk/php/installation/installation.pinc
    trunk/php/installation/installation_overview.php
    trunk/php/installation/installation_select.php
    trunk/php/invoice/invoice_overview.php
    trunk/php/invoice/invoice_select.php
    trunk/php/layout/layout_base.pinc
    trunk/php/reminder/reminder_overview.php
    trunk/php/resource/resource_select.php
    trunk/php/scrum/sprint_overview.php
    trunk/php/testmanager/testcase_overview.php
    trunk/php/testmanager/testrun_overview.php
    trunk/php/testmanager/testsuite_overview.php
    trunk/php/timetrack/timetrack_overview.php
    trunk/php/url/url_overview.php
    trunk/php/url/url_select.php
    trunk/php/webelements.p3

Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/address.pinc	2012-10-19 13:36:42 UTC (rev 825)
@@ -287,10 +287,10 @@
             $cpre = '';
             $dpre = '';
             foreach($this->location as $i => $f) {
-                if (is_object($f->department)) {
+                if (is_object($f->department) && $f->department->id >0) {
                     $dep .= $dpre.$f->department->getFullName();
                     $dpre = "<br />";
-                } else if (is_object($f->company)) {
+                } else if (is_object($f->company) && $f->company->id > 0) {
                     $cmp .= $cpre.$f->company->getFullName();
                     $dpre = "<br />";
                 }
@@ -765,4 +765,4 @@
 }
 
 $tutos['classes'][useaddressbook] = 'tutos_address';
-?>
+?>
\ No newline at end of file

Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/bugtracking/bug_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -426,7 +426,6 @@
             $this->flds++;
         }
         $r .= show_custom_overview_headers($this,bug::getType(),$this->link2);
-
         $r .= $this->MassUpdateHeader();
         $r .= $this->OverviewHeadLineEnd();
         $r .= $this->OverviewHeadEnd();

Modified: trunk/php/expense/expense_overview.php
===================================================================
--- trunk/php/expense/expense_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/expense/expense_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -130,8 +130,8 @@
         $r .= $this->actionformStart("expense_overview.php");
         $r .= $this->header;
         $r .= $this->OverviewTableStart();
-        $r .= "<thead>\n";
-        $r .= "<tr>\n";
+        $r .= $this->OverviewHeadStart();
+        $r .= $this->OverviewHeadLineStart();
         $r .= $this->orderHeader('name',$lang['ExpenseName'],$this->link2);
         if ($this->head['link_id']) {
             $r .= $this->orderHeader('',$lang['ExpenseReference'],$this->link2);
@@ -167,8 +167,8 @@
             $r .= get_module_overview_header($this,'expense');
         }
         $r .= $this->MassUpdateHeader();
-        $r .= "</tr>\n";
-        $r .= "</thead>\n";
+        $r .= $this->OverviewHeadLineEnd();
+        $r .= $this->OverviewHeadEnd();
 
         if ( $this->start == -1 ) {
             // Show the last pasrt
@@ -193,7 +193,7 @@
             if ($this->head['link_id']) {
                 $x = '';
                 if ( is_object($b->ref) ) {
-                    $x = $this->mark_filter(myentities($b->ref->getFullName()),'nsrn');
+                    $x = $this->mark_filter(myentities($b->ref->getFullName()),'link_id');
                 }
                 $r .= ' <td class="over_l">'. $b->getRefLink($x) ."</td>\n";
             }
@@ -375,29 +375,10 @@
 
         $reftype = '';
         $name    = '';
-        $nsrn    = '';
-        $nscr    = '';
 
         if ( isset($_GET['name']) ) {
             $name = $_GET['name'];
         }
-        if ($this->ext != 0) {
-            if ( isset($_GET['reftype']) ) {
-                $reftype = $_GET['reftype'];
-                $this->link1 = addUrlParameter($this->link1,"reftype=". $reftype);
-                $this->filter['reftype'] = $reftype;
-            }
-            if ( isset($_GET['nsrn']) ) {
-                $nsrn = $_GET['nsrn'];
-                $this->link1 = addUrlParameter($this->link1,"nsrn=". $nsrn);
-                $this->filter['nsrn'] = $nsrn;
-            }
-            if ( isset($_GET['nscr']) ) {
-                $nscr = $_GET['nscr'];
-                $this->link1 = addUrlParameter($this->link1,"nscr=".UrlEncode($nscr));
-                $this->filter['nscr'] = $nscr;
-            }
-        }
 
         $j = "SELECT DISTINCT e.* FROM ". $this->dbconn->prefix .$table['expense'][name].' e ';   // select + join
         $q = "";
@@ -430,80 +411,6 @@
         }
 
         // References to display
-        if ( ($reftype > 0) || ($reftype > 0 && ($nsrn != "*") && ($nsrn != "")) )  {
-            if ( ! isset($nsrn) || ($nsrn == "*") ) {
-                $nsrn = "";
-            }
-            if ( ($reftype == 1) || ($reftype == -1) ) {
-                $j .= ", ". $this->dbconn->prefix .$table['company'][name].' c ';
-                $q .= " ". $pre . "(e.link_id=c.id ";
-                if ( $nsrn != "" ) {
-                    $q .= " AND ". $this->dbconn->Like("c.name",$nsrn);
-                }
-                $q .= ")";
-                $pre = " OR ";
-            }
-            if ( ($reftype == 2) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix .$table['department'][name].' d ';
-                $q .= " ". $pre . "(e.link_id=d.id ";
-                if ( $nsrn != "" ) {
-                    $q .= " AND ". $this->dbconn->Like("d.name",$nsrn);
-                }
-                $q .= ")";
-                $pre = " OR ";
-            }
-            if ( ($reftype == 3) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix .$table['address'][name].' a ';
-                $q .= $pre ."( (";
-                $q .= $this->dbconn->Like("a.f_name",$nsrn) ." OR ";
-                $q .= $this->dbconn->Like("a.m_name",$nsrn) ." OR ";
-                $q .= $this->dbconn->Like("a.l_name",$nsrn) .")";
-                $q .= " AND e.link_id=a.id )";
-                $pre = " OR ";
-            }
-            if ( ($reftype == 4) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix .$table['bugtracking'][name].' b';
-                $q .= " ". $pre . "(e.link_id=b.id ";
-                if ( $nsrn != "" ) {
-                    $q .= " AND ". $this->dbconn->Like("b.short",$nsrn);
-                }
-                $q .= ")";
-                $pre = " OR ";
-            }
-            if ( ($reftype == 5) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix .$table['product'][name].' p';
-                $q .= $pre ."( e.link_id=p.id ";
-                if ( $nsrn != "" ) {
-                    $q .= " AND (";
-                    $q .= $this->dbconn->Like("p.name",$nsrn) ." OR ";
-                    $q .= $this->dbconn->Like("p.version",$nsrn) .")";
-                }
-                $q .= ")";
-                $pre = " OR ";
-            }
-            if ( ($reftype == 6) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix .$table['team'][name].' t';
-                $q .= $pre . "(e.link_id=t.id AND ". $this->dbconn->Like("t.name",$nsrn) .")";
-                $pre = " OR ";
-            }
-            if ( ($reftype == 7) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix .$table['task'][name].' k';
-                $q .= $pre . "(e.link_id=k.id AND ". $this->dbconn->Like("k.name",$nsrn) .")";
-                $pre = " OR ";
-            }
-            if ( ($reftype == 8) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix.$table['installation'][name].' i';
-                if ( ! stristr($j, $table['product'][name]) ) {
-                    $j .= ",".$this->dbconn->prefix.$table['product'][name].' p';
-                }
-                $q .= $pre ."( e.link_id=i.id AND i.product_id=p.id AND (";
-                $q .= $this->dbconn->Like("p.name",$nsrn) ." OR ";
-                $q .= $this->dbconn->Like("p.version",$nsrn) .") )";
-                $pre = " OR ";
-            }
-            $pre = "AND ";
-
-        }
         // remember this
         $_SESSION['expensesearchreftype'] = $reftype;
 
@@ -516,6 +423,7 @@
         overview_arg($this,'t',OVERVIEW_ARG_D_TO,'expense',array('creation','t_start'),'created','e.');
 
         // reference
+        overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'expense',array('link_id'),'ExpenseReference','e.',get_parent_classes('expense'));
         overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'expense',array('link_id'),'ExpenseReference','e.');
 
         // supplier

Modified: trunk/php/expense/expense_select.php
===================================================================
--- trunk/php/expense/expense_select.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/expense/expense_select.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -68,16 +68,11 @@
         }
 
         $r .= $this->ContentRowStart('ext');
-        $r .= $this->showfieldc($lang['ExpenseRefType'],0,'reftype');
-        $r .= $this->showdata($this->ExpenseAskRefType($this->nsrt,1),2);
+        $r .= $this->showfieldc($lang['ExpenseRefName'],0,'link_');
+        $r .= $this->showdata(select_from_array_or_input($this,"link_",null,1,get_parent_classes('expense')),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
-        $r .= $this->showfieldc($lang['ExpenseRefName'],0,'nsrn');
-        $r .= $this->showdata('<input type="text" value="" id="nsrn" name="nsrn" />',2);
-        $r .= $this->ContentRowEnd();
-
-        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ExpenseSupplier'],0,'sup');
         $r .= $this->showdata(select_from_array_or_input($this->obj,"sup",null,1,'cd'),2);
         $r .= $this->ContentRowEnd();

Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/installation/installation.pinc	2012-10-19 13:36:42 UTC (rev 825)
@@ -80,7 +80,7 @@
         $n++;
     }
     return $r;
-}
+  }
 /**
  * a installation of a product/project
  * @package installation
@@ -440,16 +440,8 @@
         } else {
             $q->addFV("money","null","");
         }
-        if ( is_object($this->installer) && $this->installer->id > 0 ) {
-            $q->addFV("installer_id",$this->installer,"OBJ");
-        } else {
-            $q->addFV("installer_id","null","");
-        }
-        if ( is_object($this->seller) && $this->seller->id > 0 ) {
-            $q->addFV("seller_id",$this->seller,"OBJ");
-        } else {
-            $q->addFV("seller_id","null","");
-        }
+        $q->addFV("installer_id",$this->installer,"OBJ");
+        $q->addFV("seller_id",$this->seller,"OBJ");
 
         $q->addFV("creator",$this->creator,"OBJ");
 

Modified: trunk/php/installation/installation_overview.php
===================================================================
--- trunk/php/installation/installation_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/installation/installation_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -68,8 +68,8 @@
         $r .= $this->actionformStart('installation_overview.php');
         $r .= $this->header;
         $r .= $this->OverviewTableStart();
-        $r .= "<thead>\n";
-        $r .= "<tr>\n";
+        $r .= $this->OverviewHeadStart();
+        $r .= $this->OverviewHeadLineStart();
         $r .= $this->orderHeader('',"#",$this->link1);
         if ($this->head['product_id']) {
             $r .= $this->orderHeader('',$lang['Product'],$this->link1);
@@ -104,10 +104,9 @@
         $r .= get_module_overview_header($this,'installation');
         $r .= show_custom_overview_headers($this,'installation',$this->link1);
         $r .= $this->MassUpdateHeader();
+        $r .= $this->OverviewHeadLineEnd();
+        $r .= $this->OverviewHeadEnd();
 
-        $r .= "</tr>\n";
-        $r .= "</thead>\n";
-
         if ( $this->start == -1 ) {
             $a = $n - $tutos['maxshow'];
             $end = $n;
@@ -139,7 +138,7 @@
                 if ( is_object($i->customer) && $i->customer->id == -1 ) {
                     $r .= '<i>'. $lang['HistoryDeleted'] .'</i>';
                 } else if (is_object($i->customer) && $i->customer->id != -1 ) {
-                    $x = $this->mark_filter(myentities($i->customer->getFullName()),'cfn');
+                    $x = $this->mark_filter(myentities($i->customer->getFullName()),'customer_id');
                     $r .= $i->customer->getLink($x);
                 } else {
                     $r .= '&nbsp;';
@@ -148,17 +147,17 @@
             }
             if ($this->head['version']) {
                 $x = $this->mark_filter(myentities($i->version),'name');
-                $r .= ' <td class="over_l">'. $x ."&nbsp;</td>\n";
+                $r .= $this->OverviewRowBlock($x,'over_l');
             }
             $x = $this->mark_filter(myentities($i->description),'name');
-            $r .= ' <td class="over_ml">'. $x ."&nbsp;</td>\n";
+            $r .= $this->OverviewRowBlock($x,'over_ml');
 
             if ($this->head['installer_id']) {
                 $r .= ' <td class="over_r">';
                 if ( is_object($i->installer) && $i->installer->id == -1 ) {
                     $r .= '<i>'. $lang['HistoryDeleted'] .'</i>';
                 } else if ( is_object($i->installer) && $i->installer->id != -1 ) {
-                    $x = $this->mark_filter(myentities($i->installer->getFullName()),'ifn');
+                    $x = $this->mark_filter(myentities($i->installer->getFullName()),'installer_id');
                     $r .= $i->installer->getLink($x);
                 } else {
                     $r .= '&nbsp;';
@@ -166,14 +165,14 @@
                 $r .= '</td>'."\n";
             }
             if ($this->head['instdate']) {
-                $r .= ' <td class="over_l">'. $i->instdate->getLinkDate() ."</td>\n";
+                $r .= $this->OverviewRowBlock($i->instdate->getLinkDate(),'over_l');
             }
             if ($this->head['seller_id']) {
                 $r .= ' <td class="over_r">';
                 if ( is_object($i->seller) && $i->seller->id == -1 ) {
                     $r .= '<i>'. $lang['HistoryDeleted'] .'</i>';
                 } else if ( is_object($i->seller) && $i->seller->id != -1 ) {
-                    $x = $this->mark_filter(myentities($i->seller->getFullName()),'sfn');
+                    $x = $this->mark_filter(myentities($i->seller->getFullName()),'seller_id');
                     $r .= $i->seller->getLink($x);
                 } else {
                     $r .= '&nbsp;';
@@ -181,7 +180,7 @@
                 $r .= '</td>'."\n";
             }
             if ($this->head['salesdate']) {
-                $r .= ' <td class="over_l">'. $i->salesdate->getLinkDate() ."</td>\n";
+                $r .= $this->OverviewRowBlock($i->salesdate->getLinkDate(),'over_l');
             }
 
             $r .= get_module_overview_data($this,$i);
@@ -390,4 +389,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/installation/installation_select.php
===================================================================
--- trunk/php/installation/installation_select.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/installation/installation_select.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -70,6 +70,11 @@
         }
 
         $r .= $this->ContentRowStart('ext');
+        $r .= $this->showfieldc(sprintf($lang['Product'],''),0,"p");
+        $r .= $this->showdata(select_from_array_or_input($this,"p",null,1,get_parent_classes('installation')),2);
+        $r .= $this->ContentRowEnd();
+
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['Customer'],''),0,"c");
         $r .= $this->showdata(select_from_array_or_input($this->obj,"c",null,1,'cdat'),2);
         $r .= $this->ContentRowEnd();

Modified: trunk/php/invoice/invoice_overview.php
===================================================================
--- trunk/php/invoice/invoice_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/invoice/invoice_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -123,23 +123,25 @@
             $r .= ' <td class="over_l">'. $c->getLink('','ss='.$ss) ."</td>";
 
             if ($this->head['customer']) {
-                $r .= ' <td class="over_l">';
+                $xx = '';
                 if ( is_object($c->customer) ) {
-                    $r .= $c->customer->getLink();
+                    $x = $this->mark_filter(myentities($c->customer->getFullName()),'customer');
+                    $xx .= $c->customer->getLink($x);
                 } else {
-                    $r .= '<i>'.$lang['HistoryDeleted'].'</i>';
+                    $xx .= '<i>'.$lang['HistoryDeleted'].'</i>';
                 }
-                $r .= "</td>\n";
+                $r .= $this->OverviewRowBlock($xx,'over_l');
             }
 
             if ($this->head['link_id']) {
-                $r .= ' <td class="over_l">';
+                $xx = '';
                 if ( is_object($c->ref) ) {
-                    $r .= $c->ref->getLink();
+                    $x = $this->mark_filter(myentities($c->ref->getFullName()),'link_id');
+                    $xx .= $c->ref->getLink($x);
                 } else {
-                    $r .= '<i>'. $lang['HistoryDeleted'] .'</i>';
+                    $xx .= '<i>'. $lang['HistoryDeleted'] .'</i>';
                 }
-                $r .= "</td>\n";
+                $r .= $this->OverviewRowBlock($xx,'over_l');
             }
 
             if ($this->head['state']) {
@@ -309,7 +311,8 @@
 
 
         if ($this->ext != 0) {
-            overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('customer','link_id'),array('InvoiceCustomer','InvoiceReference'));
+            overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice'));
+            overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference');
         }
 
         // Start Date for search
@@ -369,4 +372,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/invoice/invoice_select.php
===================================================================
--- trunk/php/invoice/invoice_select.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/invoice/invoice_select.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -69,6 +69,11 @@
         }
 
         $r .= $this->ContentRowStart('ext');
+        $r .= $this->showfieldc($lang['InvoiceReference'],0,'link_');
+        $r .= $this->showdata(select_from_array_or_input($this,"link_",null,1,get_parent_classes('invoice')),2);
+        $r .= $this->ContentRowEnd();
+
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['InvoiceState'],0,'state');
         $r .= $this->showdata(InvoiceAskState($this->isst,2),2);
         $r .= $this->ContentRowEnd();

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/layout/layout_base.pinc	2012-10-19 13:36:42 UTC (rev 825)
@@ -642,11 +642,10 @@
         $rx = '';
         $rxpre = '';
         foreach ($xx as $x) {
-            $rx .= $rxpre. preg_quote(htmlentities($x),'/');
+            $rx .= $rxpre. preg_quote(htmlspecialchars(trim($x)),'/');
             $rxpre = '|';
         }
         $str = preg_replace('/('.$rx.')/i','<span class="found">$1</span>',$str);
-
         return $str;
     }
 

Modified: trunk/php/reminder/reminder_overview.php
===================================================================
--- trunk/php/reminder/reminder_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/reminder/reminder_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -104,8 +104,8 @@
             }
 
             if ($this->head['link_id']) {
-                $x = $this->mark_filter(myentities($c->ref->getFullName()),'reffn');
-                $xx = $lang[$c->ref->getType()] ." ". $c->ref->getLink($x);
+                $x = $this->mark_filter(myentities($c->ref->getFullName()),'link_id');
+                $xx = $lang[$c->ref->getType()] .'&#160;'. $c->ref->getLink($x);
                 if ($c->type != REMINDER_SIMPLE) {
                     $xx .= "<br />\n". $c->getEventName();
                 }

Modified: trunk/php/resource/resource_select.php
===================================================================
--- trunk/php/resource/resource_select.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/resource/resource_select.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -33,6 +33,8 @@
     Function info() {
         global $lang,$tutos;
 
+        $cs = get_custom_selectors('resource');
+
         $this->width = 3;
         $r = '';
         $r .= "<form id=\"ressearch\" name=\"ressearch\" method=\"get\" action=\"resource_overview.php\">\n";
@@ -40,15 +42,18 @@
         $this->addHidden('ext',$this->ext);
         $r .= $this->headline($lang['SearchForRes']);
 
-        $r .= "<tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= $this->showfieldc($lang['AdrName'],0,'name');
         $r .= " <td><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
         $r .= ' <td><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForRes'] ."\" /></td>\n";
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr>\n";
-        $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
+        if (count($cs)) {
+            $r .= $this->ContentRowStart();
+            $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
+            $r .= $this->ContentRowEnd();
 
-        $tutos['pagescript'] .= "
+            $tutos['pagescript'] .= "
 $( \"#toggler\" ).click(function() {
             $(\".ext\").toggle();
             if ( $(\"#h_ext\").val() == 0 ) {
@@ -59,24 +64,20 @@
             return;
         });
 \n";
-        if ( $this->ext == 0 ) {
-            $tutos['pagescript'] .= "
+            if ( $this->ext == 0 ) {
+                $tutos['pagescript'] .= "
             $(\".ext\").hide();
 \n";
-        }
+            }
 
-        // add custom selectors
-        $x = get_custom_selectors('product');
-        foreach ($x as $s) {
-            $r .= "</tr><tr class=\"ext\">\n";
-            $r .= $this->showfieldc($s[0]);
-            $r .= " <td colspan=\"2\">\n";
-            $r .= $s[1];
-            $r .= " </td>\n";
+            // add custom selectors
+            foreach ($cs as $s) {
+                $r .= $this->ContentRowStart('ext');
+                $r .= $this->showfieldc($s[0]);
+                $r .= $this->showdata($s[1],2);
+                $r .= $this->ContentRowEnd();
+            }
         }
-
-
-        $r .= "</tr>\n";
         $r .= $this->SelectTableEnd();
         $r .= hiddenFormElements();
         $r .= $this->getHidden();

Modified: trunk/php/scrum/sprint_overview.php
===================================================================
--- trunk/php/scrum/sprint_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/scrum/sprint_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -94,7 +94,7 @@
             // Project Ref
             if ($this->head['p_id']) {
                 if (is_object($obj->pref))
-                    $x = $this->mark_filter(myentities($obj->pref->getFullName()),'p_fn');
+                    $x = $this->mark_filter(myentities($obj->pref->getFullName()),'p_id');
                 $r .= $this->OverviewRowBlock((is_object($obj->pref) ? $obj->pref->getLink($x):'&nbsp;'),'over_l');
             }
 

Modified: trunk/php/testmanager/testcase_overview.php
===================================================================
--- trunk/php/testmanager/testcase_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/testmanager/testcase_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -56,8 +56,8 @@
         $r .= $this->header;
         $r .= $this->actionformStart('testcase_overview.php');
         $r .= $this->OverviewTableStart();
-        $r .= "<thead>\n";
-        $r .= "<tr>\n";
+        $r .= $this->OverviewHeadStart();
+        $r .= $this->OverviewHeadLineStart();
         if ($this->head['pos']) {
             $r .= $this->orderHeader('pos',$lang['TestcasePosition'],$this->link2);
             $this->flds++;
@@ -73,8 +73,8 @@
         $r .= $this->orderHeader('t_result',$lang['TestcaseResult'],$this->link2);
         $r .= show_custom_overview_headers($this,'testcase',$this->link2);
         $r .= $this->MassUpdateHeader();
-        $r .= "</tr>\n";
-        $r .= "</thead>\n";
+        $r .= $this->OverviewHeadLineEnd();
+        $r .= $this->OverviewHeadEnd();
 
         $line = 1;
         while ( ($a < $n) && ($a < $end) ) {
@@ -96,19 +96,20 @@
                 $r .= '</td>'."\n";
             }
             $x = $this->mark_filter(myentities($b->getFullName()),'name');
-            $r .= ' <td class="over_l">&nbsp;'.($b->activ == 1 ? '':'<i>').$b->getLink($x,'ss='.$ss).($b->activ == 1 ? '':'</i>').'</td>'."\n";
-            $r .= ' <td class="over_l">&nbsp;'.($b->activ == 1 ? '':'<i>').$b->getLink($b->version,'ss='.$ss).($b->activ == 1 ? '':'</i>').'</td>'."\n";
+            $r .= $this->OverviewRowBlock(($b->activ == 1 ? '':'<i>').$b->getLink($x,'ss='.$ss).($b->activ == 1 ? '':'</i>'),'over_l');
+            $r .= $this->OverviewRowBlock(($b->activ == 1 ? '':'<i>').$b->getLink($b->version,'ss='.$ss).($b->activ == 1 ? '':'</i>'),'over_l');
+
             if ($this->head['ref_id']) {
-                $r .= ' <td class="over_l">';
+                $xx = '';
                 if (is_object($b->ref)) {
-                    $x = $this->mark_filter(myentities($b->ref->getFullName()),'reffn');
-                    $r .=  $b->ref->getLink($x);
+                    $x = $this->mark_filter(myentities($b->ref->getFullName()),'ref_id');
+                    $xx .=  $b->ref->getLink($x);
                 } else {
-                    $r .= '-';
+                    $xx .= '-';
                 }
-                $r .= '</td>'."\n";
+                $r .= $this->OverviewRowBlock($xx,'over_l');
             }
-            $r .= ' <td class="over_l">&nbsp;'.($b->activ != 1 ? '':$b->getResult()) .'</td>'."\n";
+            $r .= $this->OverviewRowBlock(($b->activ != 1 ? '':$b->getResult()),'over_l');
             $r .= show_custom_overview_data($this,'testcase',$b);
             $r .= $this->MassUpdateField($b);
             $r .= $this->OverviewRowEnd($line++);
@@ -247,7 +248,6 @@
         order_parse($this->q,$this->link1,$xxx,$this,$defsort);
 
         $this->result = $this->dbconn->Exec($this->q);
-
         $this->link2 = $this->link1;
 
         // menu

Modified: trunk/php/testmanager/testrun_overview.php
===================================================================
--- trunk/php/testmanager/testrun_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/testmanager/testrun_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -85,8 +85,8 @@
         $r .= $this->header;
         $r .= $this->actionformStart('testrun_overview.php');
         $r .= $this->OverviewTableStart();
-        $r .= "<thead>\n";
-        $r .= "<tr>\n";
+        $r .= $this->OverviewHeadStart();
+        $r .= $this->OverviewHeadLineStart();
         $this->flds = 1;
         $r .= $this->orderHeader('name',$lang['TestrunName'],$this->link2);
         if ($this->head['ref_id']) {
@@ -110,8 +110,8 @@
         }
         $r .= show_custom_overview_headers($this,'testrun',$this->link2);
         $r .= $this->MassUpdateHeader();
-        $r .= "</tr>\n";
-        $r .= "</thead>\n";
+        $r .= $this->OverviewHeadLineEnd();
+        $r .= $this->OverviewHeadEnd();
 
         $poststat = $this->flds -1 -$tutos[massupdate] -$prestat;
 
@@ -131,7 +131,7 @@
             $r .= ' <td class="over_l">'.$b->getLink($x,'ss='.$ss).'</td>'."\n";
 
             if ($this->head['ref_id']) {
-                $x = $this->mark_filter(myentities($b->ref->getFullName()),'refidfn');
+                $x = $this->mark_filter(myentities($b->ref->getFullName()),'ref_id');
                 $r .= ' <td class="over_l">'. $b->ref->getLink($x) .'</td>'."\n";
             }
             if ($this->head['test_id']) {
@@ -285,6 +285,7 @@
 
 
         if ( isset($_GET['name']) && $_GET['name'] != '' ) {
+            $hpre = '';
             $name = $_GET['name'];
             $this->addHidden("name",$name);
             $this->q .= $this->qpre .'(';
@@ -294,7 +295,10 @@
 
             // on non extended search look also for references
             if ($this->ext == 0 && $name != '') {
-                $arr = search_by_name($name,"p",0);
+                $this->header .= $hpre.$lang['TestrunRef'];
+                $this->filter['ref_id'] = $name;
+                $hpre = ' / ';
+                $arr = search_by_name($name,'p',0);
                 $l = '';
                 $lpre = '';
                 if (count($arr) > 0) {
@@ -310,6 +314,8 @@
                 }
                 $this->q .= get_custom_wild_search($this,'testrun',$arr,$name,'or','or');
             }
+            $this->header .= $hpre.$lang['TestrunName'];
+            $this->header .= ' = '.myentities($name);
 
             $this->q .= ')';
             $this->qpre = ' AND ';
@@ -374,4 +380,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/testmanager/testsuite_overview.php
===================================================================
--- trunk/php/testmanager/testsuite_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/testmanager/testsuite_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -58,8 +58,8 @@
         $r .= $this->header;
         $r .= $this->actionformStart('testsuite_overview.php');
         $r .= $this->OverviewTableStart();
-        $r .= "<thead>\n";
-        $r .= "<tr>\n";
+        $r .= $this->OverviewHeadStart();
+        $r .= $this->OverviewHeadLineStart();
         $this->flds = 3;
         if ($this->head['pos']) {
             $r .= $this->orderHeader('pos',$lang['TestsuitePosition'],$this->link2);
@@ -84,8 +84,8 @@
         }
         $r .= show_custom_overview_headers($this,'testsuite',$this->link2);
         $r .= $this->MassUpdateHeader();
-        $r .= "</tr>\n";
-        $r .= "</thead>\n";
+        $r .= $this->OverviewHeadLineEnd();
+        $r .= $this->OverviewHeadEnd();
 
         $line = 1;
         while ( ($a < $n) && ($a < $end) ) {
@@ -94,42 +94,42 @@
             $b->read_reference();
             $r .= $this->OverviewRowStart($line);
             if ($this->head['pos']) {
+                $xx = '';
                 $linkup = addUrlParameter($this->link2,'up='.$b->id);
                 $linkdown = addUrlParameter($this->link2,'down='.$b->id);
-                $r .= ' <td class="over_l">';
                 if($b->mod_ok() && $_GET['xf'] == 'pos') {
-                    $r .= makelink($linkup,$this->theme->getImage(up,'list'));
+                    $xx .= makelink($linkup,$this->theme->getImage(up,'list'));
                 }
-                $r .= $b->pos;
+                $xx .= $b->pos;
                 if($b->mod_ok() && $_GET['xf'] == 'pos') {
-                    $r .= makelink($linkdown,$this->theme->getImage(down,'list'));
+                    $xx .= makelink($linkdown,$this->theme->getImage(down,'list'));
                 }
-                $r .= '</td>'."\n";
+                $r .= $this->OverviewRowBlock($xx,'over_l');
             }
 
             $x = $this->mark_filter(myentities($b->getFullName()),'name');
-            $r .= ' <td class="over_l">'.$b->getLink($x,'ss='.$ss).'</td>'."\n";
-            $r .= ' <td class="over_l">'.makeLink($b->getUrl(),$b->version).'</td>'."\n";
+            $r .= $this->OverviewRowBlock($b->getLink($x,'ss='.$ss),'over_l');
+            $r .= $this->OverviewRowBlock(makeLink($b->getUrl(),$b->version),'over_l');
 
             if ($this->head['ref_id']) {
-                $r .= ' <td class="over_l">';
+                $xx = '';
                 if (is_object($b->ref)) {
                     if ($b->ref->getTypeId() != usetestsuite ) {
-                        $r .= $lang[$b->ref->getType()].' ';
+                        $xx .= $lang[$b->ref->getType()].' ';
                     }
-                    $x = $this->mark_filter(myentities($b->ref->getFullName()),'reffn');
-                    $r .= $b->ref->getLink($x);
+                    $x = $this->mark_filter(myentities($b->ref->getFullName()),'ref_id');
+                    $xx .= $b->ref->getLink($x);
                 } else {
-                    $r .= myentities($lang['HistoryDeleted']);
+                    $xx .= myentities($lang['HistoryDeleted']);
                 }
-                $r .= '</td>'."\n";
+                $r .= $this->OverviewRowBlock($xx,'over_l');
             }
 
             if ($this->head['t_state']) {
-                $r .= ' <td class="over_l">'. $lang['TestsuiteStates'][$b->state] .'</td>'."\n";
+                $r .= $this->OverviewRowBlock($lang['TestsuiteStates'][$b->state],'over_l');
             }
             if ($this->head['count']) {
-                $r .= ' <td class="over_r">'. $b->countTestCases() .'</td>'."\n";
+                $r .= $this->OverviewRowBlock($b->countTestCases(),'over_r');
             }
 
             $r .= show_custom_overview_data($this,'testsuite',$b);
@@ -231,6 +231,7 @@
         if (isset($this->filter['ref_id']) && is_object($this->filter['ref_id']) && $this->filter['ref_id']->getType() == 'testsuite') {
             $this->head['pos'] = true;
             if (!isset($_GET['xf'])) {
+                $_GET['xf'] = 'pos';
                 $defsort = array('pos',1);
             }
         }
@@ -320,4 +321,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/timetrack/timetrack_overview.php
===================================================================
--- trunk/php/timetrack/timetrack_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/timetrack/timetrack_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -255,7 +255,7 @@
                     $xx = '<i>'. makelink('history_show.php?id='. $tt->link_id ,$lang['HistoryDeleted']) .'</i>';
                 } else {
                     // Marks
-                    $x = $this->mark_filter(myentities($tt->ref->getFullName()),'reffn');
+                    $x = $this->mark_filter(myentities($tt->ref->getFullName()),'link_id');
                     $xx = $tt->ref->getLink($x);
                 }
                 $r .= $this->OverviewRowBlock($xx,'over_l');

Modified: trunk/php/url/url_overview.php
===================================================================
--- trunk/php/url/url_overview.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/url/url_overview.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -107,7 +107,8 @@
                 $c->ref = getObject($this->dbconn,$c->link_id);
                 $x = '';
                 if (is_object($c->ref)) {
-                    $x .= $c->ref->getLink();
+                    $xx = $this->mark_filter(myentities($c->ref->getFullName()),'link_id');
+                    $x .= $c->ref->getLink($xx);
                 } else if ($c->link_id < 0 ) {
                     $x .= 'TUTOS '.$lang[$c->link_id];
                 } else {
@@ -205,16 +206,16 @@
             return;
         }
 
-        $this->link1 = "url/url_overview.php";
+        $this->link1 = 'url/url_overview.php';
         $this->filter = array();
 
-        $this->q = "SELECT * FROM ". $this->dbconn->prefix .$table['url'][name];
-        $this->qpre = " WHERE ";
+        $this->q = 'SELECT * FROM '. $this->dbconn->prefix .$table['url'][name];
+        $this->qpre = ' WHERE ';
 
         if ( isset($_GET['name']) && ($_GET['name'] != "*") && ($_GET['name'] != "") ) {
             $this->q .= $this->qpre ."(". $this->dbconn->Like("name",$_GET['name']);
-            $this->q .= " or ". $this->dbconn->Like("url",$_GET['name']) .")";
-            $this->qpre = " AND ";
+            $this->q .= ' or '. $this->dbconn->Like("url",$_GET['name']) .")";
+            $this->qpre = ' AND ';
             $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
             $this->filter['name'] = $_GET['name'];
             $this->addHidden("name",$_GET['name']);
@@ -223,6 +224,7 @@
         }
 
         overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,url::getType(),array('link_id'),'Reference');
+        overview_arg($this,'link_fn',OVERVIEW_ARG_FN,url::getType(),array('link_id'),'Reference','','all');
         overview_arg($this,'category',OVERVIEW_ARG_OBJID,url::getType(),array('category'),'URLCat');
 
         if ( isset($_GET['short_id']) && is_numeric($_GET['short_id']) ) {

Modified: trunk/php/url/url_select.php
===================================================================
--- trunk/php/url/url_select.php	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/url/url_select.php	2012-10-19 13:36:42 UTC (rev 825)
@@ -47,6 +47,41 @@
         $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" title="'.$lang['Search'].'"/>',1);
         $r .= $this->ContentRowEnd();
 
+        $r .= $this->ContentRowStart();
+        $r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+        $r .= $this->ContentRowEnd();
+
+        $tutos['pagescript'] .= "
+$( \"#toggler\" ).click(function() {
+            $(\".ext\").toggle();
+            if ( $(\"#h_ext\").val() == 0 ) {
+              $(\"#h_ext\").val(1);
+            } else {
+              $(\"#h_ext\").val(0);
+            }
+            return;
+        });
+\n";
+        if ( $this->ext == 0 ) {
+            $tutos['pagescript'] .= "
+            $(\".ext\").hide();
+\n";
+        }
+
+        $r .= $this->ContentRowStart('ext');
+        $r .= $this->showfieldc($lang['Reference'],0,"link");
+        $r .= $this->showdata(select_from_array_or_input($this->obj,"link_",null,1,'all'),2);
+        $r .= $this->ContentRowEnd();
+
+        // add custom selectors
+        $x = get_custom_selectors('url');
+        foreach ($x as $s) {
+            $r .= $this->ContentRowStart('ext');
+            $r .= $this->showfieldc($s[0]);
+            $r .= $this->showdata($s[1],2);
+            $r .= $this->ContentRowEnd();
+        }
+
         $r .= $this->SelectTableEnd();
         $r .= hiddenFormElements();
         $r .= $this->getHidden();

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/webelements.p3	2012-10-19 13:36:42 UTC (rev 825)
@@ -821,8 +821,8 @@
 /**
  * format a value for use with csv files  from
  * "http://de2.php.net/manual/en/function.fputcsv.php#87120"
- * output is always converted to target_enc encoding
- */
+* output is always converted to target_enc encoding
+*/
 function txt2csv ($val,$delimiter = '',$enclosure = '') {
     global $tutos;
 
@@ -922,7 +922,7 @@
     $text = preg_replace('#&lt;/([BIU])&gt;#im' ,'</$1>',$text);
     //    $text = preg_replace('#&quot;#m' ,'"',$text);
     if ($ureplace)
-        $text = urlReplace($text,0);
+    $text = urlReplace($text,0);
     if ($ireplace)
         $text = ImgReplace($text,$obj);
 
@@ -2896,7 +2896,7 @@
  * cname = array column names in $table
  * lgid  = id in lang (array if multiple cnames)
  * prefix= columnprefix (defaults to no prefix)
- * mode  = array of name sarch modes
+ * mode  = array of name search modes
  * resolver = a method in obj that resolves unknown keys
  *
  * this function populates $obj->head $obj->filter $obj->header $obj->link1
@@ -3018,13 +3018,13 @@
             if (substr($sn,0,1) == "!") {
                 $sn = substr($sn,1);
                 if ($not)
-                    $obj->header .= $pre.htmlentities($sn);
+                    $obj->header .= $pre.htmlspecialchars($sn);
                 else {
                     if ($pre != '') $pre = ' , ';
-                    $obj->header .= $pre.'<span class="missing"> '.htmlentities($sn).' </span>';
+                    $obj->header .= $pre.'<span class="missing"> '.htmlspecialchars($sn).' </span>';
                 }
             } else {
-                $obj->header .= $pre.htmlentities($sn);
+                $obj->header .= $pre.htmlspecialchars($sn);
             }
             $pre = ' | ';
         }
@@ -3305,16 +3305,16 @@
                 $myarg = substr($myarg,1);
                 if (constant('EMPTY') == $myarg) {
                     $myarg = $lang['empty'];
-                    $obj->header .= ' &#8800 <i>'. htmlentities($myarg).'</i>';
+                    $obj->header .= ' &#8800 <i>'. htmlspecialchars($myarg).'</i>';
                 } else
-                    $obj->header .= ' &#8800 '. htmlentities($myarg);
+                    $obj->header .= ' &#8800 '. htmlspecialchars($myarg);
                 $not = true;
             } else {
                 if (constant('EMPTY') == $myarg) {
                     $myarg = $lang['empty'];
-                    $obj->header .= ' = <i>'. htmlentities($myarg).'</i>';
+                    $obj->header .= ' = <i>'. htmlspecialchars($myarg).'</i>';
                 } else
-                    $obj->header .= ' = '. htmlentities($myarg);
+                    $obj->header .= ' = '. htmlspecialchars($myarg);
             }
         } else {
             // multisearch
@@ -3344,12 +3344,12 @@
                     if (is_object($snobj)) {
                         $sn = $snobj->getLink();
                     } else {
-                        $sn = htmlentities($sn);
+                        $sn = htmlspecialchars($sn);
                     }
                 } else {
-                    $sn = htmlentities($sn);
+                    $sn = htmlspecialchars($sn);
                     if ($empty)
-                        $sn = '<i>'.htmlentities($sn).'</i>';
+                        $sn = '<i>'.htmlspecialchars($sn).'</i>';
                 }
                 if ( $negate ) {
                     $obj->header .= $pre.'<span class="missing">'. $sn.'</span>';

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

Revision: 824
          http://tutos.svn.sourceforge.net/tutos/?rev=824&view=rev
Author:   gokohnert
Date:     2012-10-18 15:04:05 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
support search for empty references by using a \#

Modified Paths:
--------------
    trunk/php/bugtracking/bug.pinc
    trunk/php/installation/installation.pinc
    trunk/php/localization/ca.p3
    trunk/php/localization/cs.p3
    trunk/php/localization/de.p3
    trunk/php/localization/el.p3
    trunk/php/localization/en.p3
    trunk/php/localization/es-mx.p3
    trunk/php/localization/es-ni.p3
    trunk/php/localization/es-ve.p3
    trunk/php/localization/es.p3
    trunk/php/localization/fr.p3
    trunk/php/localization/hu.p3
    trunk/php/localization/it.p3
    trunk/php/localization/ja.p3
    trunk/php/localization/ko.p3
    trunk/php/localization/nl.p3
    trunk/php/localization/pl.p3
    trunk/php/localization/pt-br.p3
    trunk/php/localization/pt.p3
    trunk/php/localization/ru.p3
    trunk/php/localization/sv.p3
    trunk/php/localization/tw.p3
    trunk/php/localization/vi.p3
    trunk/php/localization/zh.p3
    trunk/php/product.pinc
    trunk/php/webelements.p3

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/bugtracking/bug.pinc	2012-10-18 15:04:05 UTC (rev 824)
@@ -674,9 +674,8 @@
         }
 
         // search for a given object ID
-        $qx = '';
         if (preg_match('/#([0-9]*)/',trim($name),$regs) && is_numeric($regs[1])) {
-            $qx = ' id = '.$regs[1];
+            $qx = 'id = '.$regs[1];
         } else {
             $qx = '('.$user->dbconn->Like('name',$name).' or '.$user->dbconn->Like('short',$name).')';
         }

Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/installation/installation.pinc	2012-10-18 15:04:05 UTC (rev 824)
@@ -80,7 +80,7 @@
         $n++;
     }
     return $r;
-  }
+}
 /**
  * a installation of a product/project
  * @package installation
@@ -275,7 +275,6 @@
     function search_by_name(&$arr,&$user,$name,$mode = 1) {
         global $table;
 
-        $qid = '';
         if ( trim($name) == "" ) return 0;
         if (substr($name,0,1) == "!") {
             $name = substr($name,1);
@@ -285,11 +284,14 @@
         }
 
         if (preg_match('/#([0-9]*)/',trim($name),$regs) && is_numeric($regs[1])) {
-            $qid = ' or id = '.$regs[1];
+            $qx = 'id = '.$regs[1];
+        } else {
+            $qx = $user->dbconn->Like('description',$name);
         }
 
-        $q = 'SELECT '.($mode == 1 ? '*':'id').' from '. $user->dbconn->prefix .$table['installation'][name].' WHERE'. $user->dbconn->Like('description',$name);
-        $q .= $qid;
+        $q = 'SELECT '.($mode == 1 ? '*':'id').' from '. $user->dbconn->prefix .$table['installation'][name].' WHERE ';
+        $q .= $qx;
+        $q .= ' order by creation';
 
         check_dbacl($user->dbconn, $q, $user->id);
         $r = $user->dbconn->Exec($q);

Modified: trunk/php/localization/ca.p3
===================================================================
--- trunk/php/localization/ca.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/ca.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -58,6 +58,7 @@
 $lang['minus4weeks']     = "4 setmanes anteriors";
 $lang['only']            = "només";
 $lang['reload']          = "recarregar";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "veure o modificar aquesta cita (%s - %s)";
 $lang['seeapp']          = "veure els detalls de la cita (%s - %s)";
 $lang['AllEntries']      = "veure totes les %s entrades";

Modified: trunk/php/localization/cs.p3
===================================================================
--- trunk/php/localization/cs.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/cs.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
 $lang['minus4weeks']     = "4 týdny nazpět";
 $lang['only']            = "Pouze";
 $lang['reload']          = "Obnovit";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "Prohlížet a měnit (%s - %s)";
 $lang['seeapp']          = "Prohlížet detaily (%s - %s)";
 $lang['AllEntries']      = "Prohlížet všechny %s položky";

Modified: trunk/php/localization/de.p3
===================================================================
--- trunk/php/localization/de.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/de.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
 $lang['minus4weeks']     = '4 Wochen zurück';
 $lang['only']            = 'Nur';
 $lang['reload']          = 'Neu laden';
+$lang['empty']           = 'leer';
 $lang['changeapp']       = 'Diesen Termin ansehen oder ändern (%s - %s)';
 $lang['seeapp']          = 'Diesen Termin ansehen (%s - %s)';
 $lang['AllEntries']      = 'Alle %s Einträge ansehen';

Modified: trunk/php/localization/el.p3
===================================================================
--- trunk/php/localization/el.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/el.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -54,6 +54,7 @@
 $lang['minus4weeks']     = "4 εβοδομάδες πριν";
 $lang['only']            = "μόνο";
 $lang['reload']          = "Επαναφόρτωση";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "δες ή άλλαξε αυτή τη συνάντηση (%s - %s)";
 $lang['seeapp']          = "δες λεπτομέρειες συνάντησης (%s - %s)";
 $lang['AllEntries']      = "δες %s καταχωρίσεις";

Modified: trunk/php/localization/en.p3
===================================================================
--- trunk/php/localization/en.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/en.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -54,7 +54,8 @@
 $lang['plus4weeks']      = '4 weeks plus';
 $lang['minus4weeks']     = '4 weeks back';
 $lang['only']            = 'only';
-$lang['reload']          = 'reload';
+$lang['reload']          = 'RRR';
+$lang['empty']           = 'empty';
 $lang['changeapp']       = 'see or change this appointment (%s - %s)';
 $lang['seeapp']          = 'see this appointment details (%s - %s)';
 $lang['AllEntries']      = 'see all %s entries';

Modified: trunk/php/localization/es-mx.p3
===================================================================
--- trunk/php/localization/es-mx.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/es-mx.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
 $lang['minus4weeks']     = "4 semanas anteriores";
 $lang['only']            = "solamente";
 $lang['reload']          = "recargar";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "ver o modificar esta cita (%s - %s)";
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver las entradas %s";

Modified: trunk/php/localization/es-ni.p3
===================================================================
--- trunk/php/localization/es-ni.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/es-ni.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
 $lang['minus4weeks']     = "4 semanas anteriores";
 $lang['only']            = "solamente";
 $lang['reload']          = "recargar";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "ver o modificar esta cita (%s - %s)";
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver las entradas %s";

Modified: trunk/php/localization/es-ve.p3
===================================================================
--- trunk/php/localization/es-ve.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/es-ve.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
 $lang['minus4weeks']     = "4 semanas anteriores";
 $lang['only']            = "solamente";
 $lang['reload']          = "recargar";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "ver o modificar esta cita (%s - %s)";
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver las entradas %s";

Modified: trunk/php/localization/es.p3
===================================================================
--- trunk/php/localization/es.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/es.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
 $lang['minus4weeks']     = "4 semanas anteriores";
 $lang['only']            = "solamente";
 $lang['reload']          = "recargar";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "ver o modificar esta cita (%s - %s)";
 $lang['seeapp']          = "ver los detalles de la cita (%s - %s)";
 $lang['AllEntries']      = "ver todas las %s entradas";

Modified: trunk/php/localization/fr.p3
===================================================================
--- trunk/php/localization/fr.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/fr.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
 $lang['minus4weeks']     = '4 semaines précedentes';
 $lang['only']            = 'Seulement';
 $lang['reload']          = 'Rafraîchir';
+$lang['empty']           = 'empty';
 $lang['changeapp']       = 'Voir ou changer ce rendez-vous (%s - %s)';
 $lang['seeapp']          = 'Voir les détails de ce rendez-vous (%s - %s)';
 $lang['AllEntries']      = 'Voir toutes les %s entrées';

Modified: trunk/php/localization/hu.p3
===================================================================
--- trunk/php/localization/hu.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/hu.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -57,6 +57,7 @@
 $lang['minus4weeks']     = "4 héttel vissza";
 $lang['only']            = "csak";
 $lang['reload']          = "újratöltés";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "időpont vizsgálata vagy változtatása (%s - %s)";
 $lang['seeapp']          = "ezen időpont részleteinek vizsgálata (%s - %s)";
 $lang['AllEntries']      = "az összes %s bejegyzés vizsgálata";

Modified: trunk/php/localization/it.p3
===================================================================
--- trunk/php/localization/it.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/it.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -50,6 +50,7 @@
 $lang['minus4weeks']     = "4 settimane prima";
 $lang['only']            = "solo";
 $lang['reload']          = "reload";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "visualizza o modifica questa appuntamento (%s - %s)";
 $lang['seeapp']          = "visualizza questa dettaglio di appuntamento (%s - %s)";
 $lang['AllEntries']      = "visualizza tutti gli elementi di %s";

Modified: trunk/php/localization/ja.p3
===================================================================
--- trunk/php/localization/ja.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/ja.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
 $lang['minus4weeks']     = "4週戻る";
 $lang['only']            = "特定者のみ";
 $lang['reload']          = "再ロード";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "この予約を見るか変更 (%s - %s)";
 $lang['seeapp']          = "この予約の詳細を見る (%s - %s)";
 $lang['AllEntries']      = "%s のすべてのエントリを見る";

Modified: trunk/php/localization/ko.p3
===================================================================
--- trunk/php/localization/ko.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/ko.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -58,6 +58,7 @@
 $lang['minus4weeks']     = "4주전";
 $lang['only']            = "only";
 $lang['reload']          = "다시로드";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "일정을 보거나 바꾼다. (%s - %s)";
 $lang['seeapp']          = "일정의 자세한 내용을 본다 (%s - %s)";
 $lang['AllEntries']      = "%s의 모든 등록사항을 봅니다.";

Modified: trunk/php/localization/nl.p3
===================================================================
--- trunk/php/localization/nl.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/nl.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -61,6 +61,7 @@
 $lang['minus4weeks']     = "4 weken terug";
 $lang['only']            = "alleen";
 $lang['reload']          = "herladen";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "deze afspraak zien of wijzigen (%s - %s)";
 $lang['seeapp']          = "deze afspraakinfo zien (%s - %s)";
 $lang['AllEntries']      = "Toon alle %s ingevoerde gegevens";

Modified: trunk/php/localization/pl.p3
===================================================================
--- trunk/php/localization/pl.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/pl.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -57,6 +57,7 @@
 $lang['minus4weeks']     = "cztery tygodnie w tył";
 $lang['only']            = "tylko";
 $lang['reload']          = "odśwież";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "sprawdź lub zmień niniejsze spotkanie (%s - %s)";
 $lang['seeapp']          = "sprawdź szczegóły spotkania (%s - %s)";
 $lang['AllEntries']      = "przejrzyj wszystkie %s wpisów";

Modified: trunk/php/localization/pt-br.p3
===================================================================
--- trunk/php/localization/pt-br.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/pt-br.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
 $lang['minus4weeks']     = "4 semanas atrás";
 $lang['only']            = "somente";
 $lang['reload']          = "recarregar";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "visualiza ou muda esse compromisso (%s - %s)";
 $lang['seeapp']          = "visualiza os detalhes desse compromisso (%s - %s)";
 $lang['AllEntries']      = "visualizar todas %s entradas";

Modified: trunk/php/localization/pt.p3
===================================================================
--- trunk/php/localization/pt.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/pt.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -57,6 +57,7 @@
 $lang['minus4weeks']     = "4 Semanas Anteriores";
 $lang['only']            = "somente";
 $lang['reload']          = "REFRESCAR";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "consulta ou modifica compromisso (%s - %s)";
 $lang['seeapp']          = "consulta detalhes do compromisso (%s - %s)";
 $lang['AllEntries']      = "consulta todas %s entradas";

Modified: trunk/php/localization/ru.p3
===================================================================
--- trunk/php/localization/ru.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/ru.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
 $lang['minus4weeks']     = "- 4 недели";
 $lang['only']            = "только";
 $lang['reload']          = "перегрузить";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "Просмотр или изменение этой встречи(%s - %s)";
 $lang['seeapp']          = "Просмотр подробностей(%s - %s)";
 $lang['AllEntries']      = "Смотреть все %s записи";

Modified: trunk/php/localization/sv.p3
===================================================================
--- trunk/php/localization/sv.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/sv.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -53,6 +53,7 @@
 $lang['minus4weeks']     = " 4 veckor";
 $lang['only']            = "endast";
 $lang['reload']          = "Ladda om";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "Visa/Ändra denna \"bokning\" (%s - %s)";
 $lang['seeapp']          = "Visa bokningsdetaljer (%s - %s)";
 $lang['AllEntries']      = "Visa alla %s inmatningar";

Modified: trunk/php/localization/tw.p3
===================================================================
--- trunk/php/localization/tw.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/tw.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
 $lang['minus4weeks']     = "四週前";
 $lang['only']            = "僅";
 $lang['reload']          = "更新";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "查看或更改會議(%s - %s)";
 $lang['seeapp']          = "查看會議細節(%s - %s)";
 $lang['AllEntries']      = "查看所有 %s 輸入";

Modified: trunk/php/localization/vi.p3
===================================================================
--- trunk/php/localization/vi.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/vi.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
 $lang['minus4weeks']     = "Lui 4 tuần";
 $lang['only']            = "chỉ";
 $lang['reload']          = "nạp lại";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "Xem hoặc thay đổi cuộc hẹn n\xC3 y (%s - %s)";
 $lang['seeapp']          = "Xem chi tiết các cuộc hẹn (%s - %s)";
 $lang['AllEntries']      = "Xem tất cả %s nội dung";

Modified: trunk/php/localization/zh.p3
===================================================================
--- trunk/php/localization/zh.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/zh.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
 $lang['minus4weeks']     = "之前四星期";
 $lang['only']            = "只";
 $lang['reload']          = "更新";
+$lang['empty']           = 'empty';
 $lang['changeapp']       = "查看或更改会议(%s - %s)";
 $lang['seeapp']          = "查看会议细节(%s - %s)";
 $lang['AllEntries']      = "查看所有 %s 输入";

Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/product.pinc	2012-10-18 15:04:05 UTC (rev 824)
@@ -187,7 +187,7 @@
     if ( isset($_GET['role']) ) {
         $role = $_GET['role'];
     } else {
-        $role = "";
+        $role = '';
     }
     $rid = array();
     if ( isset($_GET['rid']) ) {
@@ -199,7 +199,16 @@
         // run a search by name and fill rid
         $r = search_by_name($_GET['rfn'],array(useaddressbook,useteams));
         foreach ($r as $i => $o) {
-            $rid[] = $i;
+            if (is_numeric($i)) {
+                if (is_object($o))
+                    $rid[$o->id] = $o->id;
+                else if (is_array($o))
+                    $rid[$o[0]] = $o[0];
+                else
+                    $rid[$o] = $o;
+            } else {
+                $rid[$i] = $o[0];
+            }
         }
     }
 
@@ -224,22 +233,25 @@
             if ( is_object($x) ) {
                 $h .= $hpre.$x->getLink();
                 $hpre = ',';
+            } else {
+                $h .= $hpre.$f1;
+                $hpre = ',';
             }
         }
         if (count($rid) > 1) {
             $h = '('.$h.')';
         }
+        $q1 = 'SELECT distinct pro_id FROM '. $obj->dbconn->prefix .$table['product2'][name].' WHERE ';
         if ( !empty($role) ) {
-            $q1 = "SELECT pro_id FROM ". $obj->dbconn->prefix ."projectroles WHERE role_id in (". $role .") AND adr_id in (". $ml .")";
+            $q1 .= 'role_id in ('. $role .') AND adr_id in ('. $ml .')';
             $obj->link1 = addUrlParameter($obj->link1,"role=".$role);
             $obj->addHidden("role",$role);
             $obj->header .= $obj->hpre.$lang['ProdRole'][$role].' = '.$h;
-            $obj->hpre = '<br />';
         } else {
-            $q1 = "SELECT pro_id FROM ". $obj->dbconn->prefix ."projectroles WHERE adr_id in (". $ml .")";
+            $q1 .= 'adr_id in ('. $ml .')';
             $obj->header .= $obj->hpre.$lang['ProdRoles'].' = '.$h;
-            $obj->hpre = '<br />';
         }
+        $obj->hpre = '<br />';
         $r = $obj->dbconn->Exec($q1);
         $n = $r->numrows();
         $a = 0;

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/webelements.p3	2012-10-18 15:04:05 UTC (rev 824)
@@ -27,6 +27,8 @@
 @require_once 'webelements_special.p3';
 @require_once 'custom.pinc';
 
+define('EMPTY','#');
+
 /**
  * get a paramater from commandline
  */
@@ -819,8 +821,8 @@
 /**
  * format a value for use with csv files  from
  * "http://de2.php.net/manual/en/function.fputcsv.php#87120"
-* output is always converted to target_enc encoding
-*/
+ * output is always converted to target_enc encoding
+ */
 function txt2csv ($val,$delimiter = '',$enclosure = '') {
     global $tutos;
 
@@ -920,7 +922,7 @@
     $text = preg_replace('#&lt;/([BIU])&gt;#im' ,'</$1>',$text);
     //    $text = preg_replace('#&quot;#m' ,'"',$text);
     if ($ureplace)
-    $text = urlReplace($text,0);
+        $text = urlReplace($text,0);
     if ($ireplace)
         $text = ImgReplace($text,$obj);
 
@@ -1381,6 +1383,20 @@
         // walk over pipe seperated search parts
         foreach ($narr as $sn) {
             $sn = trim($sn);
+            if ( constant('EMPTY') == $sn) {
+                // empty
+                $arr['A'] = array(-1);
+                $arr['B'] = array('null');
+                $arr['C'] = array(0);
+                continue;
+            }
+            if ( '!'.constant('EMPTY') == $sn) {
+                // not empty
+                $arr['a'] = array(-1);
+                //$arr['b'] = array('null');
+                $arr['c'] = array(0);
+                continue;
+            }
             // Search departments by company (i.e. type company name to get all deps)
             if ( $c == "D") {
                 $pos = strpos($sn," / ");
@@ -3286,21 +3302,40 @@
         $s = explode('|',$myarg);
         if (count($s) == 1) {
             if ( (substr($myarg,0,1) == "!") ) {
-                $obj->header .= ' &#8800 '. htmlentities(substr($myarg,1));
+                $myarg = substr($myarg,1);
+                if (constant('EMPTY') == $myarg) {
+                    $myarg = $lang['empty'];
+                    $obj->header .= ' &#8800 <i>'. htmlentities($myarg).'</i>';
+                } else
+                    $obj->header .= ' &#8800 '. htmlentities($myarg);
                 $not = true;
             } else {
-                $obj->header .= ' = '. htmlentities($myarg);
+                if (constant('EMPTY') == $myarg) {
+                    $myarg = $lang['empty'];
+                    $obj->header .= ' = <i>'. htmlentities($myarg).'</i>';
+                } else
+                    $obj->header .= ' = '. htmlentities($myarg);
             }
         } else {
             // multisearch
             $obj->header .= ' = ';
             $pre = '';
             foreach ($s as $sn) {
+                $empty = false;
                 $sn = trim($sn);
                 if ( (substr($sn,0,1) == "!") ) {
                     $negate = true;
+                    $sn = substr($sn,1);
+                    if ('!'.constant('EMPTY') == $sn) {
+                        $sn = $lang['empty'];
+                        $empty = true;
+                    }
                 } else {
                     $negate = false;
+                    if (constant('EMPTY') == $sn) {
+                        $sn = $lang['empty'];
+                        $empty = true;
+                    }
                 }
                 // check ID search
                 $snid = array();
@@ -3313,6 +3348,8 @@
                     }
                 } else {
                     $sn = htmlentities($sn);
+                    if ($empty)
+                        $sn = '<i>'.htmlentities($sn).'</i>';
                 }
                 if ( $negate ) {
                     $obj->header .= $pre.'<span class="missing">'. $sn.'</span>';
@@ -3349,18 +3386,28 @@
                 $l .= "0";
             } else {
                 foreach($arr as $idx => $a) {
-                    if ($idx > 0) {
-                        if (is_object($a))
-                            $l .= $sep.$a->id;
-                        else if (is_array($a))
+                    if (is_numeric($idx)) {
+                        if ($idx > 0) {
+                            if (is_object($a))
+                                $l .= $sep.$a->id;
+                            else if (is_array($a))
+                                $l .= $sep.$a[0];
+                            $sep = ',';
+                        } else {
+                            if (is_object($a))
+                                $nl .= $nsep.$a->id;
+                            else if (is_array($a))
+                                $nl .= $nsep.$a[0];
+                            $nsep = ',';
+                        }
+                    } else {
+                        if (preg_match('/[A-Z]/',$idx)) {
                             $l .= $sep.$a[0];
-                        $sep = ',';
-                    } else {
-                        if (is_object($a))
-                            $nl .= $nsep.$a->id;
-                        else if (is_array($a))
+                            $sep = ',';
+                        } else {
                             $nl .= $nsep.$a[0];
-                        $nsep = ',';
+                            $nsep = ',';
+                        }
                     }
                 }
             }
@@ -3376,7 +3423,6 @@
             $obj->q .= ') ';
         }
 
-
         $obj->qpre = " AND ";
         $obj->head[$cnames[0]] = true;
         return true;

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

Revision: 823
          http://tutos.svn.sourceforge.net/tutos/?rev=823&view=rev
Author:   gokohnert
Date:     2012-10-17 09:17:50 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
fix

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

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2012-10-17 08:07:53 UTC (rev 822)
+++ trunk/php/config_default.pinc	2012-10-17 09:17:50 UTC (rev 823)
@@ -517,6 +517,8 @@
     $tutos[timezones][] = 'Asia/Hong_Kong';
     $tutos[timezones][] = 'Asia/Tehran';
     $tutos[timezones][] = 'Asia/Tokyo';
+    $tutos[timezones][] = 'Asia/Calcutta';
+    $tutos[timezones][] = 'Asia/Kolkata';
     $tutos[timezones][] = 'Australia/Sydney';
     $tutos[timezones][] = 'Australia/Perth';
 } else {
@@ -749,10 +751,10 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.8.20120718';
+$tutos[version] = '1.8.20121017';
 #
 ### Local Variables: ***
 ### mode:iso-accents ***
 ### coding:utf-8 ***
 ### End: ***
-?>
\ 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: 822
          http://tutos.svn.sourceforge.net/tutos/?rev=822&view=rev
Author:   gokohnert
Date:     2012-10-17 08:07:53 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/subversion/en.p3
    trunk/php/subversion/svn.pinc

Modified: trunk/php/subversion/en.p3
===================================================================
--- trunk/php/subversion/en.p3	2012-10-16 15:25:13 UTC (rev 821)
+++ trunk/php/subversion/en.p3	2012-10-17 08:07:53 UTC (rev 822)
@@ -1,14 +1,15 @@
 <?php
-# $Id$
-#
-# ========================= NOTE ========================
-# Please put site specific extensions and changes
-# to TUTOS language files in a file called "en_custom.p3"
-# or "lang_custom.p3" (for all languages)
-# using the same format like here
-# =======================================================
-
-# Subversion
+/**
+ * $Id$
+ *
+ * ========================= NOTE ========================
+ * Please put site specific extensions and changes
+ * to TUTOS language files in a file called "en_custom.p3"
+ * or "lang_custom.p3" (for all languages)
+ * using the same format like here
+ * =======================================================
+ * Subversion
+ */
 $lang['SVN']                   = 'Subversion Path';
 $lang['SVNName']               = 'Short Name';
 $lang['SVNDesc']               = 'Description';
@@ -37,8 +38,8 @@
 $lang['SVNConfig']             = 'Configure Subversion';
 
 $lang['SvnConfigHelpLongPop']  = 'Relations between uri and an localpath
-each line has a svnuri like https://server/svn and a local path like /home/svn/repos
-multiple lines are seperated by ,';
+ each line has a svnuri like https://server/svn and a local path like /home/svn/repos
+ multiple lines are seperated by ,';
 
 $lang['perm'][usesvn]          = "use subversion";
 $lang['svn']                   = &$lang['SVN'];

Modified: trunk/php/subversion/svn.pinc
===================================================================
--- trunk/php/subversion/svn.pinc	2012-10-16 15:25:13 UTC (rev 821)
+++ trunk/php/subversion/svn.pinc	2012-10-17 08:07:53 UTC (rev 822)
@@ -27,7 +27,6 @@
         $d->sec   = (integer)$regs[6];
         $OFF   = $regs[7];
         $d->format = 17;
-        #    echo '|'.$str.'|'.$OFF.'|'.$current_user->offset;
         return;
     }
 }
@@ -92,6 +91,7 @@
         $this->uri         = '';
         $this->repo        = '';   // name of repository
         $this->rev         = null; // currently handeld revision
+        $this->maxrev      = null; // latest handeld revision
         $this->rpath       = '';   // path in repo
         $this->lpath       = '';   // local path to repo
         $this->log         = '';   // log to rev
@@ -274,6 +274,7 @@
     function retrieve_file($path) {
         if ($this->rev == null) {
             $this->retrieve_rev();
+            $this->rev = $this->maxrev;
         }
 
         $r = '';
@@ -294,6 +295,7 @@
     function retrieve_diff($path) {
         if ($this->rev == null) {
             $this->retrieve_rev();
+            $this->rev = $this->maxrev;
         }
 
         $r = '';
@@ -316,6 +318,7 @@
     function retrieve_dir($path) {
         if ($this->rev == null) {
             $this->retrieve_rev();
+            $this->rev = $this->maxrev;
         }
 
         $r = '';
@@ -386,8 +389,7 @@
         pclose($p);
 
         if (count($this->history) == 0) {
-            $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 10 -r'.$this->rev;
-            $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 10';
+            $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 20 -r '.(min ($this->rev +10,$this->maxrev));
             $p = popen ($cmd,'r');
             if (!is_resource($p)) die ('Problems with: svnlook');
             while(!feof($p)) {
@@ -405,18 +407,17 @@
 
         $rpath = $this->lpath.'/'.$this->repo;
 
-        $this->rev = null;
-        $this->history = array();
+        $this->maxrev = null;
 
-        $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 10';
+        $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 1';
         $p = popen ($cmd,'r');
-        if (!is_resource($p)) die ('Problems with: svnlook history');
+        if (!is_resource($p)) die ('Problems with: svnlook history (search maxrev)');
         while(!feof($p)) {
             $t = fgets($p,1024);
-            $this->history[] = trim($t);
             $x = explode(' ',trim($t));
-            if (is_numeric($x[0]) && $this->rev == null) {
-                $this->rev = trim($x[0]);
+            if (is_numeric($x[0]) && $this->maxrev == null) {
+                $this->maxrev = trim($x[0]);
+                break;
             }
         }
         pclose($p);
@@ -458,55 +459,57 @@
             }
         }
 
+        $this->retrieve_rev();
         if ($this->rev == null) {
-            $this->retrieve_rev();
+            $this->rev = $this->maxrev;
         }
         $this->retrieve_data();
 
         if ($cols > 1) {
-            $r .= "<tr>\n";
+            $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['SVNRepository']);
             $r .= $ly->showdata($this->repo,$cols-1);
-            $r .= "</tr>\n";
-            $r .= "<tr>\n";
+            $r .= $ly->ContentRowEnd();
+
+            $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['SVNPath']);
             $r .= $ly->showdata($this->rpath,$cols-1);
-            $r .= "</tr>\n";
+            $r .= $ly->ContentRowEnd();
 
-            $r .= "<tr>\n";
+            $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['SVNRevision']);
             $url = $this->getUrl();
             $url = addUrlParameter($url,'format=diff');
             $url = addUrlParameter($url,'rev='.$this->rev);
             $r .= $ly->showdata($this->rev.' ('.makelink($url,'diff').')',$cols-1);
-            $r .= "</tr>\n";
+            $r .= $ly->ContentRowEnd();
 
-            $r .= "<tr>\n";
+            $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['SVNLog']);
             $r .= '<td class="pre" style="white-space: pre;" colspan="'.($cols-1).'">'.$this->urlreplace(urlreplace($this->log)).'</td>';
-            $r .= "</tr>\n";
+            $r .= $ly->ContentRowEnd();
 
-            $r .= "<tr>\n";
+            $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['SVNDate']);
             if (is_object($this->revdate_obj)) {
                 $r .= $ly->showdata($this->revdate_obj->getDateTime(),$cols-1);
             } else {
                 $r .= $ly->showdata($this->revdate,$cols-1);
             }
-            $r .= "</tr>\n";
+            $r .= $ly->ContentRowEnd();
 
-            $r .= "<tr>\n";
+            $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['SVNAuthor']);
             if (is_object($this->author_obj)) {
                 $r .= $ly->showdata($this->author_obj->getLink(),$cols-1);
             } else {
                 $r .= $ly->showdata($this->author,$cols-1);
             }
-            $r .= "</tr>\n";
+            $r .= $ly->ContentRowEnd();
 
-            $r .= "<tr>\n";
+            $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['SVNChanged']);
-            $r .= '<td colspan="'.($cols-1).'">';
+            $x = '';
             foreach ($this->changed as $c) {
                 $pos = strpos($c,' ');
                 $path = ltrim(substr($c,$pos));
@@ -515,27 +518,34 @@
                 $url = addUrlParameter($url,'format=show');
                 $url = addUrlParameter($url,'path='.Base64_Encode($path));
                 $url = addUrlParameter($url,'rev='.$this->rev);
-                $r .= substr($c,0,$pos).' '.$icon.' '.makelink($url,$path)."<br />";
+                $x .= substr($c,0,$pos).' '.$icon.' '.makelink($url,$path)."<br />";
             }
-            $r .= "</td>\n";
-            $r .= "</tr>\n";
+            $r .= $ly->showdata($x,$cols-1);
+            $r .= $ly->ContentRowEnd();
 
-            $r .= "<tr>\n";
+            $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['SVNHistory']);
-            $r .= '<td colspan="'.($cols-1).'">';
+            $x = '';
+            $cnt = 1;
             foreach ($this->history as $c) {
                 $rev = trim(substr($c,0,strpos($c,' ')));
                 if (is_numeric($rev)) {
                     $url = $this->getUrl();
                     $url= addUrlParameter($url,'rev='.$rev);
-                    $r .= makelink($url,$rev).'<br />';
-                } else {
-                    #                    $r .= $rev.'<br />';
+                    if ($rev == $this->rev)
+                        $x .= '<b>'.makelink($url,$rev).'</b>';
+                    else
+                        $x .= makelink($url,$rev);
+                    if ($cnt % 3 == 0)
+                        $x .='<br />';
+                    else
+                        $x .='&#160;&#160;&#160;&#160;';
+                    $x .= "\n";
+                    $cnt++;
                 }
             }
-            $r .= "</td>\n";
-            $r .= "</tr>\n";
-
+            $r .= $ly->showdata($x,$cols-1);
+            $r .= $ly->ContentRowEnd();
         } else {
             $r .= $lang['SVNRepository'].":\t\t".$this->repo."\n";
             $r .= $lang['SVNPath'].":\t/".$this->rpath."\n";
@@ -777,4 +787,4 @@
     }
 
 }
-?>
+?>
\ 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: 821
          http://tutos.svn.sourceforge.net/tutos/?rev=821&view=rev
Author:   gokohnert
Date:     2012-10-16 15:25:13 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
more mobile layout support

Modified Paths:
--------------
    trunk/html/mobile_layout.css
    trunk/php/bugtracking/bug_overview.php
    trunk/php/bugtracking/bug_select.php
    trunk/php/db/table.pinc
    trunk/php/product_select.php
    trunk/php/reminder/reminder_overview.php
    trunk/php/testmanager/testmanager.pinc
    trunk/php/webelements.p3

Modified: trunk/html/mobile_layout.css
===================================================================
--- trunk/html/mobile_layout.css	2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/html/mobile_layout.css	2012-10-16 15:25:13 UTC (rev 821)
@@ -25,19 +25,59 @@
     color:           red;
     text-align:      center;
     border:          1px solid black;
-    margin-top:      2px;
+    margin-top:      -5px;
+    margin-bottom:   5px;
     margin-left:     3%;
     margin-right:    3%;
-    padding-top:     0.5em;
-    padding-bottom:  0.5em;
+    padding-top:     0.2em;
+    padding-bottom:  0.2em;
 }
 .info {
     color:           blue;
     text-align:      center;
     border:          1px solid #888;
-    margin-top:      2px;
+    margin-top:      -5px;
+    margin-bottom:   5px;
     margin-left:     3%;
     margin-right:    3%;
-    padding-top:     0.5em;
-    padding-bottom:  0.5em;
+    padding-top:     0.2em;
+    padding-bottom:  0.2em;
 }
+
+.over_c {
+    text-align: center;
+    vertical-align: top;
+    white-space: nowrap;
+    padding-right: 0.2em;
+    padding-left: 0.2em;
+    padding-bottom: 0.2em;
+}
+.over_r {
+    text-align: right;
+    vertical-align: top;
+    white-space: nowrap;
+    padding-right: 0em;
+    padding-left: 0.2em;
+    padding-bottom: 0.2em;
+}
+.over_l {
+    text-align: left;
+    vertical-align: top;
+    white-space: nowrap;
+    padding-left: 0em;
+    padding-right: 0.2em;
+    padding-bottom: 0.2em;
+}
+/* multiline */
+.over_ml {
+    text-align: left;
+    vertical-align: top;
+    white-space: normal;
+    padding-left: 0.5em;
+    padding-right: 0.2em;
+    padding-bottom: 0.2em;
+}
+
+UL.ui-listview LI {
+    border-bottom: 1px solid silver;
+}
\ No newline at end of file

Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php	2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/bugtracking/bug_overview.php	2012-10-16 15:25:13 UTC (rev 821)
@@ -23,6 +23,7 @@
 // Check if user is allowed to use it
 check_user();
 
+$tutos['mobileok'] = 1;
 require_once 'product.pinc';
 require_once 'graphs.pinc';
 

Modified: trunk/php/bugtracking/bug_select.php
===================================================================
--- trunk/php/bugtracking/bug_select.php	2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/bugtracking/bug_select.php	2012-10-16 15:25:13 UTC (rev 821)
@@ -71,12 +71,12 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['BugReference'],''),0,"p");
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"p",null,1,get_parent_classes('bugtracking')),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"p",null,1,get_parent_classes('bugtracking')),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['BugTarget'],''),0,"t");
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"t",null,1,get_parent_classes('bugtracking')),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"t",null,1,get_parent_classes('bugtracking')),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
@@ -101,12 +101,12 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['UserBugSearch'],''),0,"solverid");
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"solver",null,1,'atT'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"solver",null,1,'atT'),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['BugReportedFrom'],''),0,"reporterid");
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"reporter",null,1,'at'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"reporter",null,1,'at'),2);
         $r .= $this->ContentRowEnd();
 
         // add custom selectors

Modified: trunk/php/db/table.pinc
===================================================================
--- trunk/php/db/table.pinc	2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/db/table.pinc	2012-10-16 15:25:13 UTC (rev 821)
@@ -688,6 +688,12 @@
     'ts'      => array(type => 'TS_TYPE',              constraints => '',  Desc => 'date'),
     'message' => array(type => 'VARCHAR', size => 200, constraints => '',  Desc => 'Info'),
     );
+$tableidx['messages1'] = array(
+    name  => 'messages_idx1',
+    table => 'messages',
+    column => array('ts'),
+    Desc  => 'messages by time',
+    );
 
 $table['database'] = array(
     name => 'tutos_dbs',

Modified: trunk/php/product_select.php
===================================================================
--- trunk/php/product_select.php	2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/product_select.php	2012-10-16 15:25:13 UTC (rev 821)
@@ -101,7 +101,7 @@
         // Roles
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ProdRoles'],0,"r");
-        $r .= $this->showdata(select_from_array_or_input($this->obj,"r",null,1,array(useaddressbook,useteams)),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"r",null,1,array(useaddressbook,useteams)),2);
         $r .= $this->ContentRowEnd();
 
         // add custom selectors

Modified: trunk/php/reminder/reminder_overview.php
===================================================================
--- trunk/php/reminder/reminder_overview.php	2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/reminder/reminder_overview.php	2012-10-16 15:25:13 UTC (rev 821)
@@ -20,6 +20,8 @@
 
 // Check if user is allowed to use it
 check_user();
+
+$tutos['mobileok'] = 1;
 loadmodules('reminder','overview');
 loadmodule('reminder');
 loadlayout();
@@ -44,6 +46,7 @@
 
         $n = $this->result->numrows();
         $r .= $this->header;
+
         $r .= $this->actionformStart("reminder_overview.php");
         $r .= $this->OverviewTableStart();
         $r .= $this->OverviewHeadStart();

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/testmanager/testmanager.pinc	2012-10-16 15:25:13 UTC (rev 821)
@@ -625,7 +625,7 @@
                 // Prepare the history
                 if (!isset($this->quite) || $this->quite != true) {
                     $this->modified[] = array ( "field" => "TestcaseCreate" ,
-                                                "old" => "-1" ,
+                                                "old" => '' ,
                                                 "new" => $this->id,
                                                 "obj_id" => $this->ref_id
                         );
@@ -1549,7 +1549,7 @@
                 // Prepare the history
                 if (!isset($this->quite) || $this->quite != true) {
                     $this->modified[] = array ( "field" => "TestsuiteCreate" ,
-                                                "old" => "-1" ,
+                                                "old" => '' ,
                                                 "new" => $this->id,
                                                 "obj_id" => $this->ref_id
                         );
@@ -2465,7 +2465,7 @@
                 }
                 // Prepare the history
                 $this->modified[] = array ( "field" => "TestrunCreate" ,
-                                            "old" => "-1" ,
+                                            "old" => '' ,
                                             "new" => $this->id,
                                             "obj_id" => $this->ref_id
                     );

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/webelements.p3	2012-10-16 15:25:13 UTC (rev 821)
@@ -819,8 +819,8 @@
 /**
  * format a value for use with csv files  from
  * "http://de2.php.net/manual/en/function.fputcsv.php#87120"
- * output is always converted to target_enc encoding
- */
+* output is always converted to target_enc encoding
+*/
 function txt2csv ($val,$delimiter = '',$enclosure = '') {
     global $tutos;
 
@@ -920,7 +920,7 @@
     $text = preg_replace('#&lt;/([BIU])&gt;#im' ,'</$1>',$text);
     //    $text = preg_replace('#&quot;#m' ,'"',$text);
     if ($ureplace)
-        $text = urlReplace($text,0);
+    $text = urlReplace($text,0);
     if ($ireplace)
         $text = ImgReplace($text,$obj);
 
@@ -1247,7 +1247,7 @@
         } else {
             $id = '';
         }
-        return sprintf ('<a class="smallinfo'.$id.'" href="%s"'.$target." title=\"%s\">%s</a>",$href,myentities($info),$text);
+        return sprintf ('<a class="smallinfo'.$id.'" href="%s"'.$target.' title="%s">%s</a>',$href,myentities($info),$text);
     }
 }
 

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

Revision: 820
          http://tutos.svn.sourceforge.net/tutos/?rev=820&view=rev
Author:   gokohnert
Date:     2012-10-16 15:24:09 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
mobile layout support

Modified Paths:
--------------
    trunk/php/layout/layout_base.pinc
    trunk/php/layout/mobile_layout.pinc
    trunk/php/scrum/log_select.php
    trunk/php/scrum/sprint_overview.php
    trunk/php/scrum/sprint_select.php
    trunk/php/url/url_overview.php
    trunk/php/url/url_select.php

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/layout/layout_base.pinc	2012-10-16 15:24:09 UTC (rev 820)
@@ -170,6 +170,7 @@
 
         $this->width = 4;     // width of infotable
         $this->obj   = $this; // some useful default
+        $this->obj = null; // some useful default
         if ( !isset($tutos['pagescript']) ) {
             $tutos['pagescript'] = ''; // collect scripts in the page
         }

Modified: trunk/php/layout/mobile_layout.pinc
===================================================================
--- trunk/php/layout/mobile_layout.pinc	2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/layout/mobile_layout.pinc	2012-10-16 15:24:09 UTC (rev 820)
@@ -117,7 +117,7 @@
      * start a overview table
      */
     function OverviewHeadStart() {
-        return '';
+        return '<p />';
     }
 
     /**
@@ -131,14 +131,14 @@
      * start a overview headline
      */
     function OverviewHeadLineStart() {
-        return '';
+        return '<li>';
     }
 
     /**
      * end a overview headline
      */
     function OverviewHeadLineEnd() {
-        return '';
+        return '</li>';
     }
 
     /**
@@ -146,7 +146,8 @@
      */
     function OverviewRowStart($line,$title = '',$class = '') {
         $this->blk_cnt = 0;
-        return '<li>'."\n";
+        return '<li class="tlv">'."\n";
+        //        return '<li><div data-role="controlgroup" data-type="horizontal">'."\n";
     }
 
     /**
@@ -162,10 +163,11 @@
     function OverviewRowBlock($content,$class = '',$rows=1) {
         $this->blk_cnt++;
 
+        $class .= " tlve";
         if ($this->blk_cnt > 3) {
             $class .= " ui-li-aside";
         }
-        $r = ' <span'.($class!='' ? ' class="'.$class.'"':'').'>'.$content.'</span>&#160;'."\n";
+        $r = ' <span'.($class!='' ? ' class="'.$class.'"':'').'>'.$content.'</span>'."\n";
         if ($this->blk_cnt >3) {
             $this->blk_cnt = 0;
             $r .= ' <p>'."\n";
@@ -764,6 +766,11 @@
         $x = htmlentities(delUrlParameter($x,"lg"));
         $r .= '  <script type="text/javascript" src="'.$tutos['base'].'/html/js/jquery.min.js"></script>'."\n";
         $r .= '  <script type="text/javascript" src="'.$tutos['base'].'/html/js/tutos.js"></script>'."\n";
+        $r .= "<script type=\"text/javascript\" >
+$(document).bind('mobileinit',function(){
+   $.mobile.selectmenu.prototype.options.nativeMenu = false;
+});
+</script>";
         $r .= '  <script type="text/javascript" src="'.$tutos['base']. '/html/js/jquery.mobile.min.js"></script>'."\n";
         //        $r .= '  <script type="text/javascript" src="'.$tutos['base']. '/html/js/jquery.mobile.subpage.js"></script>'."\n";
 
@@ -782,6 +789,7 @@
         $r = '';
         //        $r .= $this->add_css_links_end();
         //        $r .= $this->add_js_links_end();
+        $r .= '  <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/mobile_layout.js"></script>'."\n";
         $r .= '  <script type="text/javascript">'."\n";
         $r .= "//<![CDATA[\n";
         $r .= $tutos['pagescript'];
@@ -835,7 +843,7 @@
     /**
      * take the menu entries and put into subpages
      */
-    function makemenu($section) {
+    function makemenu($section,$headline = '') {
         global $tutos;
 
         $r = '';
@@ -873,7 +881,10 @@
             unset($this->menu[$i]);
         }
         if ( $first == null ) {
-            $first = $section;
+            if ($headline != '')
+                $first = $headline;
+            else
+                $first = $section;
         }
         if ($c == '') return '';
 
@@ -931,10 +942,10 @@
         $r .= $this->makemenu('main4');
 
         // Edit/Context Menu
-        $r .= $this->makemenu('view');
+        $r .= $this->makemenu('obj',( ($this->obj != null) ? $this->obj->getFullName():$this->name));
 
         // VIEW Menu
-        $r .= $this->makemenu('obj');
+        $r .= $this->makemenu('view');
 
         // Search Menu
         $r .= $this->makemenu('search');

Modified: trunk/php/scrum/log_select.php
===================================================================
--- trunk/php/scrum/log_select.php	2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/scrum/log_select.php	2012-10-16 15:24:09 UTC (rev 820)
@@ -17,6 +17,8 @@
 
 // Check if user is allowed to use it
 check_user();
+
+$tutos['mobileok'] = 1;
 loadmodules('scrumlog','select');
 loadmodule('scrumlog');
 loadmodule('scrumsprint');
@@ -39,15 +41,16 @@
         $this->addHidden('ext',$this->ext);
         $r .= $this->headline($lang['SearchForLog']);
 
-        $r .= "<tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= $this->showfieldc($lang['LogSearchField']);
         $r .= " <td ><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
         $r .= " <td align=\"center\">\n";
         $r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
-        $r .= "</tr>\n";
+        $r .= $this->ContentRowEnd();
 
-        $r .= "<tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+        $r .= $this->ContentRowEnd();
         $tutos['pagescript'] .= "
 $( \"#toggler\" ).click(function() {
             $(\".ext\").toggle();
@@ -65,56 +68,51 @@
 \n";
         }
 
-        $r .= "</tr><tr class=\"ext\">\n";
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ScrumLogSprint'],0,"s_id");
-        $r .= ' <td>';
-        $r .= select_from_array_or_input($this->obj,"s_",null,1,array(USESCRUMSPRINT));
-        $r .= '</td><td>';
-        $r .= '<input type="checkbox" name="nos" id="nos" value="1"><strike>'.$lang['Sprint'].'</strike></input>';
-        $r .= "</td>\n";
+        $x = select_from_array_or_input($this->obj,"s_",null,1,array(USESCRUMSPRINT));
+        $x .= '<input type="checkbox" name="nos" id="nos" value="1"><strike>'.$lang['Sprint'].'</strike></input>';
+        $r .= $this->showdata($x,2);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr class=\"ext\">\n";
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ScrumLogPref'],0,"p_id");
-        $r .= ' <td colspan="2">';
-        $r .= select_from_array_or_input($this->obj,"p_",null,1,array(useprojects));
-        $r .= "</td>\n";
+        $r .= $this->showdata(select_from_array_or_input($this->obj,"p_",null,1,array(useprojects)),2);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr class=\"ext\">\n";
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ScrumLogWorker'],0,"w_id");
-        $r .= ' <td colspan="2">';
-        $r .= select_from_array_or_input($this->obj,"w_",null,1,array(useaddressbook));
-        $r .= "</td>\n";
+        $r .= $this->showdata(select_from_array_or_input($this->obj,"w_",null,1,array(useaddressbook)),2);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr class=\"ext\">\n";
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ScrumLogState'],0,"state");
-        $r .= ' <td colspan="2">';
-        $r .= '<select size="4" id="state" name="state[]" multiple="multiple">'."\n";
+        $x = '<select size="4" id="state" name="state[]" multiple="multiple">'."\n";
         foreach($lang['ScrumLogStates'] as $i => $j) {
-            $r .= '<option value="'.$i.'">'.$lang['ScrumLogStates'][$i]."</option>\n";
+            $x .= '<option value="'.$i.'">'.$lang['ScrumLogStates'][$i]."</option>\n";
         }
-        $r .= "</select></td>\n";
+        $x .= "</select>\n";
+        $r .= $this->showdata($x,2);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr class=\"ext\">\n";
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ScrumLogPrio'],0,"prio");
-        $r .= ' <td colspan="2">';
-        $r .= '<select size="6" id="prio" name="prio[]" multiple="multiple">'."\n";
+        $x = '<select size="6" id="prio" name="prio[]" multiple="multiple">'."\n";
         for ($i = 0; $i<SCRUMLOG_MAXPRIO; $i++) {
-            $r .= '  <option value="'.$i.'" style="'.ScrumLog::getPrioColor($i).'">';
-            $r .= $i;
-            $r .= '</option>'."\n";
+            $x .= '  <option value="'.$i.'" style="'.ScrumLog::getPrioColor($i).'">' .$i.'</option>'."\n";
         }
-        $r .= "</select></td>\n";
+        $x .= "</select>\n";
+        $r .= $this->showdata($x,2);
+        $r .= $this->ContentRowEnd();
 
         // add custom selectors
         $x = get_custom_selectors(ScrumLog::getType());
         foreach ($x as $s) {
-            $r .= "</tr><tr class=\"ext\">\n";
+            $r .= $this->ContentRowStart('ext');
             $r .= $this->showfieldc($s[0]);
-            $r .= " <td colspan=\"2\">\n";
-            $r .= $s[1];
-            $r .= " </td>\n";
+            $r .= $this->showdata($s[1],2);
+            $r .= $this->ContentRowEnd();
         }
-        $r .= "</tr>\n";
 
         $r .= $this->SelectTableEnd();
         $r .= hiddenFormElements();

Modified: trunk/php/scrum/sprint_overview.php
===================================================================
--- trunk/php/scrum/sprint_overview.php	2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/scrum/sprint_overview.php	2012-10-16 15:24:09 UTC (rev 820)
@@ -17,6 +17,8 @@
 
 /* Check if user is allowed to use it */
 check_user();
+
+$tutos['mobileok'] = 1;
 loadmodules('scrumsprint','overview');
 loadmodule('scrumsprint');
 loadlayout();
@@ -49,8 +51,8 @@
         $r .= $this->header;
         $r .= $this->actionformStart('sprint_overview.php');
         $r .= $this->OverviewTableStart();
-        $r .= "<thead>\n";
-        $r .= "<tr>\n";
+        $r .= $this->OverviewHeadStart();
+        $r .= $this->OverviewHeadLineStart();
 
         if ($this->head['name']) {
             $r .= $this->orderHeader('',$lang['SprintName'],$this->link2);
@@ -71,8 +73,8 @@
 
         $r .= show_custom_overview_headers($this,'scrumsprint',$this->link2);
         $r .= $this->MassUpdateHeader();
-        $r .= "</tr>\n";
-        $r .= "</thead>\n";
+        $r .= $this->OverviewHeadLineEnd();
+        $r .= $this->OverviewHeadEnd();
 
         $line = 1;
         while ( ($a < $n) && ($a < $end) ) {
@@ -86,22 +88,22 @@
             // NAME
             if ($this->head['name']) {
                 $x = $this->mark_filter(myentities($obj->name),'name');
-                $r .= ' <td class="over_l">'. $obj->getLink($x) .'</td>'."\n";
+                $r .= $this->OverviewRowBlock($obj->getLink($x),'over_l');
             }
 
             // Project Ref
             if ($this->head['p_id']) {
                 if (is_object($obj->pref))
                     $x = $this->mark_filter(myentities($obj->pref->getFullName()),'p_fn');
-                $r .= ' <td class="over_l">'. (is_object($obj->pref) ? $obj->pref->getLink($x):'&nbsp;') .'</td>'."\n";
+                $r .= $this->OverviewRowBlock((is_object($obj->pref) ? $obj->pref->getLink($x):'&nbsp;'),'over_l');
             }
 
             if ($this->head['state']) {
-                $r .= ' <td class="over_l">'. $lang['SprintStates'][$obj->state] .'</td>'."\n";
+                $r .= $this->OverviewRowBlock($lang['SprintStates'][$obj->state],'over_l');
 
             }
             if ($this->head['start']) {
-                $r .= ' <td class="over_l">'. $obj->start_dt .'</td>'."\n";
+                $r .= $this->OverviewRowBlock($obj->start_dt,'over_l');
             }
 
             $r .= show_custom_overview_data($this,'scrumsprint',$obj);

Modified: trunk/php/scrum/sprint_select.php
===================================================================
--- trunk/php/scrum/sprint_select.php	2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/scrum/sprint_select.php	2012-10-16 15:24:09 UTC (rev 820)
@@ -17,6 +17,8 @@
 
 // Check if user is allowed to use it
 check_user();
+
+$tutos['mobileok'] = 1;
 loadmodules('scrumsprint','select');
 loadmodule('scrumsprint');
 loadlayout();
@@ -39,15 +41,16 @@
         $this->addHidden('ext',$this->ext);
         $r .= $this->headline($lang['SearchForSprint']);
 
-        $r .= "<tr>\n";
+        $r .= $this->ContentRowStart();
         $r .= $this->showfieldc($lang['SprintSearchField']);
-        $r .= " <td ><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
-        $r .= " <td align=\"center\">\n";
-        $r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
+        $r .= $this->showdata('<input id="name" type="text" value="" name="name" />',1);
+        $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" title="'.$lang['SearchForSprint'].'" />',1);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr>\n";
+        $r .= $this->ContentRowStart();
+        $r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+        $r .= $this->ContentRowEnd();
 
-        $r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
         $tutos['pagescript'] .= "
 $( \"#toggler\" ).click(function() {
             $(\".ext\").toggle();
@@ -65,32 +68,31 @@
 \n";
         }
 
-        $r .= "</tr><tr class=\"ext\">\n";
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['SprintRef'],0,"p_id");
-        $r .= ' <td colspan="2">';
-        $r .= select_from_array_or_input($this->obj,"p_",null,1,array(useprojects));
-        $r .= "</td>\n";
+        $r .= $this->showdata(select_from_array_or_input($this->obj,"p_",null,1,array(useprojects)),2);
+        $r .= $this->ContentRowEnd();
 
-        $r .= "</tr><tr class=\"ext\">\n";
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['SprintState'],0,"state");
-        $r .= ' <td colspan="2">';
-        $r .= '<select size="4" id="state" name="state[]" multiple="multiple">'."\n";
+        $x = '<select size="4" id="state" name="state[]" multiple="multiple">'."\n";
         foreach($lang['SprintStates'] as $i => $j) {
-            $r .= '<option value="'.$i.'">'.$lang['SprintStates'][$i]."</option>\n";
+            $x .= '<option value="'.$i.'">'.$lang['SprintStates'][$i]."</option>\n";
         }
-        $r .= "</select></td></tr>\n";
+        $x .= "</select>\n";
+        $r .= $this->showdata($x,2);
+        $r .= $this->ContentRowEnd();
 
         // add custom selectors
         $x = get_custom_selectors(ScrumSprint::getType());
         foreach ($x as $s) {
-            $r .= "</tr><tr class=\"ext\">\n";
+            $r .= $this->ContentRowStart('ext');
             $r .= $this->showfieldc($s[0]);
-            $r .= " <td colspan=\"2\">\n";
-            $r .= $s[1];
-            $r .= " </td>\n";
+            $r .= $this->showdata($s[1],2);
+            $r .= $this->ContentRowEnd();
         }
-        $r .= "</tr>\n";
 
+
         $r .= $this->SelectTableEnd();
         $r .= hiddenFormElements();
         $r .= $this->getHidden();

Modified: trunk/php/url/url_overview.php
===================================================================
--- trunk/php/url/url_overview.php	2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/url/url_overview.php	2012-10-16 15:24:09 UTC (rev 820)
@@ -19,6 +19,8 @@
 
 // Check if user is allowed to use it
 check_user();
+
+$tutos['mobileok'] = 1;
 loadmodules('url','overview');
 loadmodule('url');
 loadlayout();
@@ -68,7 +70,8 @@
         $r .= $this->actionformStart("url_overview.php");
         $r .= $this->OverviewTableStart();
 
-        $r .= "<tr>\n";
+        $r .= $this->OverviewHeadStart();
+        $r .= $this->OverviewHeadLineStart();
         $this->flds = 2;
         if ($this->head['link_id']) {
             $r .= $this->orderHeader("",$lang['Reference'],$this->link2);
@@ -82,7 +85,8 @@
         $r .= $this->orderHeader("url",$lang['URL'],$this->link2);
         $r .= show_custom_overview_headers($this,'url',$this->link2);
         $r .= $this->MassUpdateHeader();
-        $r .= "</tr>\n";
+        $r .= $this->OverviewHeadLineEnd();
+        $r .= $this->OverviewHeadEnd();
 
         if ( $this->start == -1 ) {
             $a = $n - $tutos['maxshow'];
@@ -101,21 +105,22 @@
 
             if ($this->head['link_id']) {
                 $c->ref = getObject($this->dbconn,$c->link_id);
-                $r .= ' <td class="over_l">';
+                $x = '';
                 if (is_object($c->ref)) {
-                    $r .= $c->ref->getLink();
+                    $x .= $c->ref->getLink();
                 } else if ($c->link_id < 0 ) {
-                    $r .= 'TUTOS '.$lang[$c->link_id];
+                    $x .= 'TUTOS '.$lang[$c->link_id];
                 } else {
-                    $r .= "&#160;";
+                    $x .= "&#160;";
                 }
-                $r .= "</td>\n";
+                $r .= $this->OverviewRowBlock($x,'over_l');
             }
+
             $x = $this->mark_filter(myentities($c->name),'name');
-            $r .= ' <td class="over_l">'. $c->getLink($x) .'</td>';
+            $r .= $this->OverviewRowBlock($c->getLink($x),'over_l');
 
             if ($this->head['category']) {
-                $r .= ' <td class="over_l">'. $c->getCategory() .'</td>';
+                $r .= $this->OverviewRowBlock($c->getCategory(),'over_l');
             }
             $x = $c->url;
             if (mb_strlen($x) > 50) {
@@ -123,11 +128,10 @@
             }
             $x = $this->mark_filter(myentities($x),'name');
             $x = preg_replace('#\.\.\.\.\.#','<span class="warn">.....</span>',$x);
-            $r .= ' <td class="over_l">'.$x ;
             if ( $c->mod_ok() ) {
-                $r .= '&#160;&#160;('. makelink('url/url_new.php?id='. $c->id.'&ss='.$ss,$lang['Modify'],$lang['Modify']) .')';
+                $x .= '&#160;&#160;('. makelink('url/url_new.php?id='. $c->id.'&ss='.$ss,$lang['Modify'],$lang['Modify']) .')';
             }
-            $r .= "</td>";
+            $r .= $this->OverviewRowBlock($x,'over_l');
 
             $r .= show_custom_overview_data($this,'url',$c);
             $r .= $this->MassUpdateField($c);

Modified: trunk/php/url/url_select.php
===================================================================
--- trunk/php/url/url_select.php	2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/url/url_select.php	2012-10-16 15:24:09 UTC (rev 820)
@@ -19,6 +19,8 @@
 
 // Check if user is allowed to use it
 check_user();
+
+$tutos['mobileok'] = 1;
 loadmodules('url','select');
 loadmodule('url');
 loadlayout();
@@ -39,12 +41,11 @@
         $r .= $this->SelectTableStart();
         $r .= $this->headline($lang['SearchForURL']);
 
-        $r .= "<tr>\n";
-        $r .= $this->showfieldc($lang['URLName']);
-        $r .= " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\"></td>\n";
-        $r .= " <td align=\"center\">\n";
-        $r .= ' <input type="submit" value="'. $lang['Search'] ."\"></td>\n";
-        $r .= "</tr>\n";
+        $r .= $this->ContentRowStart();
+        $r .= $this->showfieldc($lang['URLName'],0,'name');
+        $r .= $this->showdata('<input type="text" value="" name="name" />',1);
+        $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" title="'.$lang['Search'].'"/>',1);
+        $r .= $this->ContentRowEnd();
 
         $r .= $this->SelectTableEnd();
         $r .= hiddenFormElements();

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

Revision: 819
          http://tutos.svn.sourceforge.net/tutos/?rev=819&view=rev
Author:   gokohnert
Date:     2012-10-16 15:22:40 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
fix formatting

Modified Paths:
--------------
    trunk/php/appointment.pinc
    trunk/php/calendar.php

Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc	2012-10-09 14:50:44 UTC (rev 818)
+++ trunk/php/appointment.pinc	2012-10-16 15:22:40 UTC (rev 819)
@@ -348,16 +348,16 @@
         }
         $r .= $pre.$icon.' '.$f->getLink();
         if ( ($ext == 1) && is_object($f->product) ) {
-            $r .= " → ". $f->product->getLink();
+            $r .= " → ". $f->product->getLink();
         }
         if ( ($ext == 2) && is_object($f->visitor) ) {
-            $r .= " ";
+            $r .= ' ';
             if ( $f->outside ) {
-                $r .= $lang['VisitAt'] .": ";
+                $r .= $lang['VisitAt'];
             } else {
-                $r .= $lang['VisitFrom'] .": ";
+                $r .= $lang['VisitFrom'];
             }
-            $r .= $f->visitor->getLink();
+            $r .= ': '.$f->visitor->getLink();
         }
         $pre = "<br />\n";
         if ( $cols > 0 ) {
@@ -1074,9 +1074,9 @@
         }
         if ( $this->see_ok() ) {
             if ( $this->repeat == APP_NOREP ) {
-                return makelink($url , $this->start->GetDate() ,$info) . "&nbsp;" .myentities($this->descr);
+                return makelink($url , $this->start->GetDate() ,$info) . '&#160;' .myentities($this->descr);
             } else {
-                return makelink($url , "®". $this->start->GetDate() ,$info) . "&nbsp;" . myentities($this->descr);
+                return makelink($url , "®". $this->start->GetDate() ,$info) . '&#160;' . myentities($this->descr);
             }
         } else {
             if ( $this->repeat == APP_NOREP ) {
@@ -1423,7 +1423,7 @@
         # $g = '&#8811;';
         # $l = '&#8810;';
 
-        $r .= '<li class="'.$class2.'"><div class="formatted '.$class.'" xid="'.$this->id.'">';
+        $r .= '  <li class="'.$class2.'"><div class="formatted '.$class.'" xid="'.$this->id.'">';
 
         $start = $this->start->getTime();
         $end = $this->end->getTime();
@@ -1456,7 +1456,7 @@
 
         $r .= '<span class="left"><b>'. $this->getLink($duration) .'</b></span>';
         $r .= '<span class="right"><b>'. $this->getLocation() .'</b></span>';
-        $r .= '<div style="clear: both;" />';
+        $r .= '<div style="clear: both;"></div>';
 
         $myself = false;
         foreach ( $this->participant as $i => $fp) {
@@ -1496,7 +1496,7 @@
             ) {
             $descr = preg_replace('#\n#m','<br />',$this->descr);
             if ($descr != '' ) {
-                $r .= '<span class="left">'.urlReplace($descr).'</span>';
+                $r .= '<span class="left">'.urlReplace($descr,0).'</span>';
             }
             if ( !(is_numeric($this->visitor) && $this->visitor == -1) ) {
                 $r .= '<br /><span class="left">';
@@ -1516,7 +1516,7 @@
                 $r .= $x->small_infolist($current_user,$this);
             }
         }
-        $r .= '</div></li>';
+        $r .= '</div></li>'."\n";
         return $r;
     }
 
@@ -2115,4 +2115,4 @@
     }
 }
 $tutos['classes'][usecalendar] = 'Appointment';
-?>
+?>
\ No newline at end of file

Modified: trunk/php/calendar.php
===================================================================
--- trunk/php/calendar.php	2012-10-09 14:50:44 UTC (rev 818)
+++ trunk/php/calendar.php	2012-10-16 15:22:40 UTC (rev 819)
@@ -93,7 +93,7 @@
 
             $r .= '<td class="'. $dinfo[color] .'" width="10%"'.">\n";
             $r .= ' <ul class="dropable">'."\n";
-            $r .= '<li date="'.$dd->getYYYY_MM_DD().'">';
+            $r .= '  <li date="'.$dd->getYYYY_MM_DD().'">';
             if ( isset($dinfo[Desc]) ) {
                 if ( $this->user->feature_ok(usecalendar,PERM_NEW) ) {
                     $r .= makelink('app_new.php?t='. $tref,$d,$lang['NewAppointInfo'],$dinfo[popinfo]) ."\n";
@@ -108,7 +108,7 @@
                     $r .= $d."\n";
                 }
             }
-            $r .= '</li>';
+            $r .= '  </li>'."\n";
             $a = 0;
 
             foreach ($this->user->callist as $idx => $x) {

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

Revision: 818
          http://tutos.svn.sourceforge.net/tutos/?rev=818&view=rev
Author:   gokohnert
Date:     2012-10-09 14:50:44 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
fix empty department

Modified Paths:
--------------
    trunk/php/address_tools.p3
    trunk/php/base.pinc
    trunk/php/department.pinc
    trunk/php/watchlist/watchlist_overview.php

Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3	2012-10-09 14:37:56 UTC (rev 817)
+++ trunk/php/address_tools.p3	2012-10-09 14:50:44 UTC (rev 818)
@@ -48,10 +48,10 @@
                 } elseif ( $name == "fax_1" ) {
                     $r .= handle('fax',$l->$name,myentities($l->$name));
                 } elseif ( $name == "c_id" ) {
-                    if (is_object($l->company))
+                    if (is_object($l->company) && $l->company->id > 0)
                         $r .= $l->company->getLink();
                 } elseif ( $name == "d_id" ) {
-                    if (is_object($l->department))
+                    if (is_object($l->department) && $l->department->id > 0)
                         $r .= $l->department->getLink($l->department->name);
                 } elseif ( $name == "country" ) {
                     if ( isset($lang['countrycde'][$l->$name]) )  {
@@ -124,7 +124,7 @@
     }
     $r .= "</tr>\n";
     return $r;
-  }
+}
 /**
  * initialize for adress search and overview pages
  */
@@ -322,7 +322,7 @@
         $r .= $layout->OverviewRowStart($line);
 
         if ( $layout->head['icon_before'] ) {
-# myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
+            // myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
             $r .= $layout->showGuiIcons(' <td rowspan="'. $c .'" class="over_l">',"</td>\n",$address,$address,$current_user->get_preficons(1),false);
         }
         if ( $layout->head['f_name'] ) {
@@ -515,4 +515,4 @@
     }
     return $r;
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc	2012-10-09 14:37:56 UTC (rev 817)
+++ trunk/php/base.pinc	2012-10-09 14:50:44 UTC (rev 818)
@@ -996,6 +996,9 @@
         if ( $text == '' ) {
             $text = myentities($this->getFullName());
         }
+        if ( $text == '' ) {
+            return '';
+        }
         if ( !$this->see_ok() ) {
             return $text;
         }

Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc	2012-10-09 14:37:56 UTC (rev 817)
+++ trunk/php/department.pinc	2012-10-09 14:50:44 UTC (rev 818)
@@ -390,6 +390,8 @@
      * get the Full Name
      */
     function getFullName () {
+        if ($this->company->id < 0)
+            return $this->name;
         return $this->company->getFullname() .' / '. $this->name ;
     }
 
@@ -525,6 +527,6 @@
         $r .= "</ul>\n";
         return $r;
     }
-  }
+}
 $tutos['classes'][usedepartment] = 'department';
-?>
+?>
\ No newline at end of file

Modified: trunk/php/watchlist/watchlist_overview.php
===================================================================
--- trunk/php/watchlist/watchlist_overview.php	2012-10-09 14:37:56 UTC (rev 817)
+++ trunk/php/watchlist/watchlist_overview.php	2012-10-09 14:50:44 UTC (rev 818)
@@ -238,6 +238,10 @@
 
         if (isset($_REQUEST['id'])) {
             $o = getObject($this->dbconn,$_REQUEST['id']);
+            if (!is_object($o)) {
+                $this->stop = true;
+                return;
+            }
             $this->addMenu(watchlist::getAddLink($this->user,$o));
             $this->name .= ': '. $o->getFullName();
         }

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

Revision: 817
          http://tutos.svn.sourceforge.net/tutos/?rev=817&view=rev
Author:   gokohnert
Date:     2012-10-09 14:37:56 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
popups with compny/dep info

Modified Paths:
--------------
    trunk/php/address.pinc
    trunk/php/address_tools.p3
    trunk/php/company.pinc

Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc	2012-10-09 12:02:22 UTC (rev 816)
+++ trunk/php/address.pinc	2012-10-09 14:37:56 UTC (rev 817)
@@ -278,22 +278,39 @@
         $info = '';
         $info .= '<table class="popupinfo">';
         $info .= '<tr><th colspan="2">'. $fn ."</th></tr>";
-        $info .= '<tr><td valign="top">'. $lang['Phone'] .':</td><td nowrap="nowrap">';
 
-        if ( isset($this->location) ) {
+        if ( isset($this->location) && count($this->location) ) {
+            $phone = '';
+            $cmp = '';
+            $dep = '';
             $pre = '';
+            $cpre = '';
+            $dpre = '';
             foreach($this->location as $i => $f) {
+                if (is_object($f->department)) {
+                    $dep .= $dpre.$f->department->getFullName();
+                    $dpre = "<br />";
+                } else if (is_object($f->company)) {
+                    $cmp .= $cpre.$f->company->getFullName();
+                    $dpre = "<br />";
+                }
                 if ( $f->phone_1 != "" ) {
-                    $info .= $pre . myentities($f->phone_1);
+                    $phone .= $pre . myentities($f->phone_1);
                     $pre = "<br />";
                 }
                 if ( $f->phone_2 != "" ) {
-                    $info .= $pre . myentities($f->phone_2);
+                    $phone .= $pre . myentities($f->phone_2);
                     $pre = "<br />";
                 }
             }
+            if ($cmp != '')
+                $info .= '<tr><td colspan="2" valign="top">'. $cmp .'</td></tr>';
+            if ($dep != '')
+                $info .= '<tr><td nowrap="nowrap" colspan="2" valign="top">'. $dep .'</td></tr>';
+            $info .= '<tr><td valign="top">'. $lang['Phone'] .':</td><td nowrap="nowrap">';
+            $info .= $phone;
+            $info .= '&nbsp;</td></tr>';
         }
-        $info .= '&nbsp;</td></tr>';
         $info .= $this->custom_popup_content();
         $info .= '</table>';
         return $info;
@@ -748,4 +765,4 @@
 }
 
 $tutos['classes'][useaddressbook] = 'tutos_address';
-?>
\ No newline at end of file
+?>

Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3	2012-10-09 12:02:22 UTC (rev 816)
+++ trunk/php/address_tools.p3	2012-10-09 14:37:56 UTC (rev 817)
@@ -223,8 +223,8 @@
     if (isset($layout->header))
         $r .= $layout->header;
     $r .= $layout->OverviewTableStart();
-    $r .= "<thead>\n";
-    $r .= "<tr>\n";
+    $r .= $layout->OverviewHeadStart();
+    $r .= $layout->OverviewHeadLineStart();
 
     $needloc = 0;
     $layout->flds = 0;
@@ -305,8 +305,8 @@
         $r .= "  <th nowrap=\"nowrap\"><input id=\"checkit\" type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
         $layout->flds++;
     }
-    $r .= "</tr>\n";
-    $r .= "</thead>\n";
+    $r .= $layout->OverviewHeadLineEnd();
+    $r .= $layout->OverviewHeadEnd();
 
     $line = 0;
     while ( ($a < $n) && ($a < $end) ) {
@@ -350,51 +350,51 @@
                 #         $location = new location($dbconn);
                 #         $location = $location->read($i,$location);
                 if ( $layout->head['location'] ) {
-                    $r .= ' <td class="over_l">'. makelink($location->getUrl(),myentities($address->loc[$i])) ."</td>\n";
+                    $r .= $layout->OverviewRowBlock(makelink($location->getUrl(),myentities($address->loc[$i])),'over_l');
                 }
                 if ( $layout->head['desc1'] ) {
                     $b = $layout->mark_filter(myentities($location->desc1),'desc1');
-                    $r .= ' <td class="over_l">'. $b ."</td>\n";
+                    $r .= $layout->OverviewRowBlock($b,'over_l');
                 }
                 if ( $layout->head['email'] ) {
-                    $r .= ' <td class="over_l">';
+                    $xx = '';
                     if ( $location->email_1 == $location->email_2  ) {
                         if ( $location->email_2 != "" ) {
                             $b = $layout->mark_filter(myentities($location->email_1),'email');
-                            $r .= handle('email',$b,myentities($location->email_1));
+                            $xx .= handle('email',$b,myentities($location->email_1));
                         }
                     } else {
                         $pre = "";
                         if ( $location->email_1 != "" ) {
                             $b = $layout->mark_filter(myentities($location->email_1),'email');
-                            $r .= handle('email',$b,myentities($location->email_1));
+                            $xx .= handle('email',$b,myentities($location->email_1));
                             $pre = "<br />";
                         }
                         if ( $location->email_2 != "" ) {
                             $b = $layout->mark_filter(myentities($location->email_2),'email');
-                            $r .= $pre . handle('email',$b,myentities($location->email_2));
+                            $xx .= $pre . handle('email',$b,myentities($location->email_2));
                         }
                     }
-                    $r .= ' </td>';
+                    $r .= $layout->OverviewRowBlock($xx,'over_l');
                 }
                 if ( $layout->head['phone'] ) {
-                    $r .= ' <td class="over_l">';
+                    $xx = '';
                     if ( $location->phone_1 == $location->phone_2  ) {
                         $b = $layout->mark_filter(myentities($location->phone_1),'phone');
-                        $r .= handle('phone',$location->phone_1,$b) ."\n";
+                        $xx .= handle('phone',$location->phone_1,$b) ."\n";
                     } else {
                         $pre = "";
                         if ( $location->phone_1 != "" ) {
                             $b = $layout->mark_filter(myentities($location->phone_1),'phone');
-                            $r .= handle('phone',$location->phone_1,$b) ."\n";
+                            $xx .= handle('phone',$location->phone_1,$b) ."\n";
                             $pre = "<br />";
                         }
                         if ( $location->phone_2 != "" ) {
                             $b = myentities($location->phone_2);
-                            $r .= $pre . handle('phone',$location->phone_2,$b) ."\n";
+                            $xx .= $pre . handle('phone',$location->phone_2,$b) ."\n";
                         }
                     }
-                    $r .= " </td>";
+                    $r .= $layout->OverviewRowBlock($xx,'over_l');
                 }
                 if ( $layout->head['fax'] ) {
                     $b = $layout->mark_filter(myentities($location->fax_1),'fax');
@@ -412,16 +412,20 @@
                 }
                 if ( $layout->head['city'] ) {
                     $b = $layout->mark_filter(myentities($location->city),'city');
-                    $r .= ' <td class="over_l">'. $b ."</td>\n";
+                    $r .= $layout->OverviewRowBlock($b,'over_l');
                 }
                 if ( $layout->head['c_id'] ) {
-                    $r .= ' <td class="over_l">'.(is_object($location->company) ? $location->company->getLink():'&nbsp;') ."</td>\n";
+                    $r .= $layout->OverviewRowBlock((is_object($location->company) ? $location->company->getLink():'&nbsp;'),'over_l');
                 }
                 if ( $layout->head['d_id'] ) {
-                    $r .= ' <td class="over_l">'.(is_object($location->department) ? $location->department->getLink():'&nbsp;') ."</td>\n";
+                    if ( $layout->head['c_id'] ) {
+                        $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink($location->department->name):'&nbsp;'),'over_l');
+                    } else {
+                        $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink():'&nbsp;'),'over_l');
+                    }
                 }
                 if ( ($row == 0) && ($layout->head['icon_after']) ) {
-# myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
+                    // myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
                     $r .= $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">","&nbsp;</td>\n",$address,$address,$current_user->get_preficons(2),false);
                 }
                 $r .= show_custom_overview_data($layout,'address',$address);
@@ -511,4 +515,4 @@
     }
     return $r;
 }
-?>
\ No newline at end of file
+?>

Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc	2012-10-09 12:02:22 UTC (rev 816)
+++ trunk/php/company.pinc	2012-10-09 14:37:56 UTC (rev 817)
@@ -265,9 +265,9 @@
         $info = '';
         $info .= '<table class="popupinfo">';
         $info .= '<tr><th colspan="2">'. $fn ."</th></tr>";
-        $info .= '<tr><td valign="top">'. $lang['Phone'] .':</td><td>';
 
-        if ( isset($this->location) ) {
+        if ( isset($this->location) && count($this->location) ) {
+            $info .= '<tr><td valign="top">'. $lang['Phone'] .':</td><td>';
             $pre = '';
             foreach($this->location as $i => $f) {
                 if ( $f->phone_1 != "" ) {
@@ -279,8 +279,8 @@
                     $pre = "<br />";
                 }
             }
+            $info .= '&nbsp;</td></tr>';
         }
-        $info .= '&nbsp;</td></tr>';
         $info .= $this->custom_popup_content();
         $info .= '</table>';
         return $info;
@@ -498,4 +498,4 @@
     }
 }
 $tutos['classes'][usecompany] = 'company';
-?>
\ 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: 816
          http://tutos.svn.sourceforge.net/tutos/?rev=816&view=rev
Author:   gokohnert
Date:     2012-10-09 12:02:22 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/url/url_overview.php

Modified: trunk/php/url/url_overview.php
===================================================================
--- trunk/php/url/url_overview.php	2012-10-09 11:43:30 UTC (rev 815)
+++ trunk/php/url/url_overview.php	2012-10-09 12:02:22 UTC (rev 816)
@@ -39,6 +39,7 @@
         $blist = array();
         // Make a big array of all visible urls
         $np = array();
+        $x = 0;
         while ( $x < $n ) {
             $b = new url($this->dbconn);
             $b->read_result($this->result,$x);

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