tutos-commits Mailing List for TUTOS (Page 18)

Revision: 893
          http://sourceforge.net/p/tutos/code/893
Author:   gokohnert
Date:     2013-01-12 19:04:14 +0000 (Sat, 12 Jan 2013)
Log Message:
-----------
allow expenses/bugs to lately connect to an document / new icons

Modified Paths:
--------------
    trunk/html/tutos.xcf
    trunk/html/tutos_small.png
    trunk/php/bugtracking/mconfig.pinc
    trunk/php/config_default.pinc
    trunk/php/expense/mconfig.pinc
    trunk/php/file/file_new.php
    trunk/php/file/mconfig.pinc
    trunk/php/layout/layout_base.pinc
    trunk/php/layout/new2_layout.pinc
    trunk/php/module_base.pinc

Added Paths:
-----------
    trunk/html/tutos_114.png
    trunk/html/tutos_144.png
    trunk/html/tutos_72.png

Removed Paths:
-------------
    trunk/html/tutos_small.gif

Modified: trunk/html/tutos.xcf
===================================================================
(Binary files differ)

Added: trunk/html/tutos_114.png
===================================================================
(Binary files differ)

Index: trunk/html/tutos_114.png
===================================================================
--- trunk/html/tutos_114.png	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/html/tutos_114.png	2013-01-12 19:04:14 UTC (rev 893)

Property changes on: trunk/html/tutos_114.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/tutos_144.png
===================================================================
(Binary files differ)

Index: trunk/html/tutos_144.png
===================================================================
--- trunk/html/tutos_144.png	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/html/tutos_144.png	2013-01-12 19:04:14 UTC (rev 893)

Property changes on: trunk/html/tutos_144.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/tutos_72.png
===================================================================
(Binary files differ)

Index: trunk/html/tutos_72.png
===================================================================
--- trunk/html/tutos_72.png	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/html/tutos_72.png	2013-01-12 19:04:14 UTC (rev 893)

Property changes on: trunk/html/tutos_72.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Deleted: trunk/html/tutos_small.gif
===================================================================
(Binary files differ)

Modified: trunk/html/tutos_small.png
===================================================================
(Binary files differ)

Modified: trunk/php/bugtracking/mconfig.pinc
===================================================================
--- trunk/php/bugtracking/mconfig.pinc	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/php/bugtracking/mconfig.pinc	2013-01-12 19:04:14 UTC (rev 893)
@@ -60,6 +60,8 @@
 $tutos[modulesinc]['testsuite'][] = 'bugtracking';
 $tutos[modulesinc]['testrun'][]   = 'bugtracking';
 
+$tutos['docowners'][] = 'Bug'; // classname
+
 #
 # modify those values using bug_config
 # here are only defaults

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/php/config_default.pinc	2013-01-12 19:04:14 UTC (rev 893)
@@ -155,7 +155,8 @@
 # NOTE: a value in the database entry will override these settings !!
 #        call adminpage -> Konfig
 #
-$tutos['logo']     = "http://sflogo.sourceforge.net/sflogo.php?group_id=8047&type=13";
+#$tutos['logo']     = "http://sflogo.sourceforge.net/sflogo.php?group_id=8048&type=13";
+$tutos['logo']     = "html/tutos_small.png";
 $tutos['logolink'] = "http://www.tutos.org";
 #
 # The default timezone

Modified: trunk/php/expense/mconfig.pinc
===================================================================
--- trunk/php/expense/mconfig.pinc	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/php/expense/mconfig.pinc	2013-01-12 19:04:14 UTC (rev 893)
@@ -36,6 +36,7 @@
 # Files (like invoices etc) could be added
 #
 $tutos[modulesinc]['file'][] = "expense";
+$tutos['docowners'][] = 'expense';
 
 $permskip[useexpenses][PERM_MYTUTOS] = 1;
 ?>
\ No newline at end of file

Modified: trunk/php/file/file_new.php
===================================================================
--- trunk/php/file/file_new.php	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/php/file/file_new.php	2013-01-12 19:04:14 UTC (rev 893)
@@ -103,8 +103,15 @@
             $r .= " <td colspan=\"3\">";
             $r .= "  <select name=\"reftype\">\n";
             $r .= "   <option value=\"0\">--</option>\n";
+
             foreach ($tutos['docowners'] as $f) {
-                if (! class_exists($f)) continue;
+                if (! class_exists($f)) {
+                    loadmodule($f);
+                    if (! class_exists($f)) {
+                        Fatal_Error ($f);
+                        continue;
+                    }
+                }
                 $x = new $f($this->dbconn);
                 if (method_exists($x,"search_by_name")) {
                     $r .= "   <option value=\"". $f ."\"". ($this->reftype == $f ? " selected":"") .">". $lang[$x->getType()] ."</option>\n";

Modified: trunk/php/file/mconfig.pinc
===================================================================
--- trunk/php/file/mconfig.pinc	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/php/file/mconfig.pinc	2013-01-12 19:04:14 UTC (rev 893)
@@ -46,7 +46,12 @@
 #
 # List of modules/packages that can act as parent for documents
 #
-$tutos['docowners'] = array('product','team','company','department','tutos_address','task');
+$tutos['docowners'][] = 'product';
+$tutos['docowners'][] = 'team';
+$tutos['docowners'][] = 'company';
+$tutos['docowners'][] = 'department';
+$tutos['docowners'][] = 'tutos_address';
+$tutos['docowners'][] = 'task';
 
 if ( ($tutos[usedocmanagement] != 0) &&  (("Off" == ini_get("file_uploads")) || ("1" != ini_get("file_uploads"))) ) {
     $confmsg .= "<br />\nDisabled docmanagement (file_upload = '". ini_get("file_uploads") ."' in php.ini)<br />\n";

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/php/layout/layout_base.pinc	2013-01-12 19:04:14 UTC (rev 893)
@@ -203,6 +203,11 @@
             $r .= '  <meta name="content-language" content="'. $tutos[lang] .'"'.$c;
         }
         $r .= '  <meta http-equiv="Expires" content="-1"'.$c;
+
+        $r .= '  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="'.$tutos['base'].'/html/tutos_144.png"'.$c;
+        $r .= '  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="'.$tutos['base'].'/html/tutos_114.png"'.$c;
+        $r .= '  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="'.$tutos['base'].'/html/tutos_72.png"'.$c;
+
         return $r;
     }
 

Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/php/layout/new2_layout.pinc	2013-01-12 19:04:14 UTC (rev 893)
@@ -490,7 +490,6 @@
         $r .= "</title>\n";
         $r .= $this->HTML_Start_1();
 
-
         $r .= $this->add_css_links();
         $r .= '  <link rel="stylesheet" media="screen" href="'.$tutos['base'].'/html/css/superfish.css" type="text/css" />'."\n";
         $r .= '  <link rel="stylesheet" media="screen" href="'.$tutos['base'].'/html/css/superfish-vertical.css" type="text/css" />'."\n";
@@ -514,6 +513,8 @@
 
         $r .= '  <link rel="Help" href="'.  make_helplink() .'" title="'. $lang['Help'].'"'.$c;
         $r .= '  <link rev="Made" href="https://sourceforge.net/project/memberlist.php?group_id=8047" hreflang="en" target="url" title="TUTOS Team"'.$c;
+
+
         $x = $_SERVER['REQUEST_URI'];
         $x = htmlentities(delUrlParameter($x,"lg"));
         // Skip this as some browsers will call all alternatives

Modified: trunk/php/module_base.pinc
===================================================================
--- trunk/php/module_base.pinc	2013-01-12 14:38:06 UTC (rev 892)
+++ trunk/php/module_base.pinc	2013-01-12 19:04:14 UTC (rev 893)
@@ -42,8 +42,20 @@
         return true;
     }
 
+    // Wrong Name Classinstead of module
     if (! isset($tutos[modules][$key]) ) {
-        return false;
+        // try to find a module with a class named $key
+        // lookup string for numeric key
+        $found = false;
+        foreach ($tutos[modules] as $n => $m) {
+            if (isset($m['name']) && ($m['name'] == $key) ) {
+                $key = $n;
+                $found = true;
+                break;
+            }
+        }
+        if (!$found)
+            return false;
     }
     if (! isset($tutos[modules][$key][file]) ) {
         // "Internal SubModule";
@@ -176,7 +188,7 @@
 /**
  * show the newlinks of attached modules within the given object
  */
-Function add_module_NewLinks(layout $layout,&$obj) {
+Function add_module_NewLinks(layout $layout,tutos_base $obj) {
     global $tutos;
 
     foreach($tutos[activemodules] as $f) {
@@ -195,7 +207,7 @@
 /**
  * show the overview data  of attached modules within the given object
  */
-Function get_module_overview_data(layout $layout,&$obj) {
+Function get_module_overview_data(layout $layout,tutos_base $obj) {
     global $tutos;
 
     $r = '';

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

Revision: 892
          http://sourceforge.net/p/tutos/code/892
Author:   gokohnert
Date:     2013-01-12 14:38:06 +0000 (Sat, 12 Jan 2013)
Log Message:
-----------
fix 

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

Modified: trunk/php/mailbox/mailbox.pinc
===================================================================
--- trunk/php/mailbox/mailbox.pinc	2013-01-12 14:31:30 UTC (rev 891)
+++ trunk/php/mailbox/mailbox.pinc	2013-01-12 14:38:06 UTC (rev 892)
@@ -30,7 +30,7 @@
     /**
      */
     function mailbox(tutos_db $dbconn) {
-        global $tutos,$current_user;
+        global $tutos,$current_user,$table;
 
         $this->init($dbconn);
 
@@ -50,7 +50,7 @@
         $this->mbox  = '';
         $this->orgpath = $this->path ;
         $this->addpath = '' ;
-        $this->tablename = $this->dbconn->prefix ."mailboxes";
+        $this->tablename = $this->dbconn->prefix .$table['mailbox'][name];
         acl_raise($this,$current_user->id,$tutos[modok]);
     }
 
@@ -135,6 +135,7 @@
             return sprintf("%s@%s %s",$this->path,$this->host, $this->email);
         }
     }
+
     /**
      * Return a link to this mailbox (for an overview)
      */
@@ -158,10 +159,12 @@
      * method to call from check service
      */
     static function checkservice (tutos_user $user) {
+        global $table;
+
         loadmodule('file');
 
         $msg = '';
-        $q = "SELECT * from ". $user->dbconn->prefix ."mailboxes where autoimport = '1'";
+        $q = 'SELECT * from '. $user->dbconn->prefix .$table['mailbox'][name]." where autoimport = '1'";
         $r = $user->dbconn->Exec($q);
         $n = $r->numrows();
         $a = 0;
@@ -198,7 +201,7 @@
                 }
                 $email_adr = array_unique($email_adr);
 
-                $f = new Tutos_file($this->dbconn);
+                $f = new Tutos_file($user->dbconn);
                 $f->id = -1;
                 $f->name = "";
                 $x = imap_mime_header_decode($hdr->subject);
@@ -214,16 +217,16 @@
                 $f->content   = $b;
 
                 $pre = " and (";
-                $q = "SELECT distinct adr_id ID from ".$this->dbconn->prefix."location, ".$this->dbconn->prefix."adrloc where adrloc.loc_id = location.id";
+                $q = 'SELECT distinct adr_id ID from '.$user->dbconn->prefix.$table['location'][name].', '.$user->dbconn->prefix.$table['address1'][name].' where adrloc.loc_id = location.id';
                 foreach ($email_adr as $id => $object) {
-                    $q .= " ". $pre . $this->dbconn->Like("email_1",$object);
+                    $q .= " ". $pre . $user->dbconn->Like("email_1",$object);
                     $pre = " or ";
-                    $q .= " ". $pre . $this->dbconn->Like("email_2",$object);
+                    $q .= " ". $pre . $user->dbconn->Like("email_2",$object);
                 }
                 $q .= ')';
-                $res = $this->dbconn->Exec($q);
+                $res = $user->dbconn->Exec($q);
                 for ($i = 0; $i < $res->numrows(); $i++) {
-                    $adr = new Tutos_address($this->dbconn);
+                    $adr = new Tutos_address($user->dbconn);
                     $adr->read_result($res, $i);
                     $f->addReference($adr);
                 }
@@ -353,9 +356,9 @@
         } else {
             reset($f);
             while (list ($key, $val) = @each($f)) {
-                #     echo imap_utf7_decode($val->name)."  '".$val->delimiter."'  ".$val->attributes ."<br />\n";
+#     echo imap_utf7_decode($val->name)."  '".$val->delimiter."'  ".$val->attributes ."<br />\n";
                 $n = substr($val->name,strlen($c),strlen($val->name));
-                #   echo $key ."|". var_dump($val) ."|".imap_utf7_decode($n) ."<br />\n";
+#   echo $key ."|". var_dump($val) ."|".imap_utf7_decode($n) ."<br />\n";
                 #        $nx = eregi_replace("&ANY-","\xD6",$n);
                 #        $nx = eregi_replace("&APY-","\xF6",$nx);
                 #        $nx = eregi_replace("&AOQ-","\xE4",$nx);
@@ -419,7 +422,7 @@
         $c = $this->getConnString();
         #    $this->mbox = @imap_open($c, $this->user, $this->pw,OP_READONLY);
         $this->mbox = @imap_open($c, $this->user, $this->pw);
-        #   echo $c ." U:". $this->user ." P:". $this->pw ."<br />";
+#   echo $c ." U:". $this->user ." P:". $this->pw ."<br />";
         return $this->errors("open");
     }
 
@@ -640,6 +643,7 @@
      * Return Info about connected mailboxes to an object
      */
     static function obj_read(tutos_base $obj) {
+        global $table;
 
         if (! is_object($obj) ) return;
         if ( $obj->id < 0 )  return;
@@ -648,7 +652,7 @@
             return;
         }
         $obj->list[usemailboxes] = array();
-        $q = "SELECT * from ". $obj->dbconn->prefix ."mailboxes where link_id = ". $obj->id;
+        $q = 'SELECT * from '. $obj->dbconn->prefix .$table['mailbox'][name].' where link_id = '. $obj->id;
         $r = $obj->dbconn->Exec($q);
         $n = $r->numrows();
         $a = 0;
@@ -743,5 +747,5 @@
         $r .= "</ul>\n";
         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: 891
          http://sourceforge.net/p/tutos/code/891
Author:   gokohnert
Date:     2013-01-12 14:31:30 +0000 (Sat, 12 Jan 2013)
Log Message:
-----------
fix 

Modified Paths:
--------------
    branches/1.9/php/mailbox/mailbox.pinc

Modified: branches/1.9/php/mailbox/mailbox.pinc
===================================================================
--- branches/1.9/php/mailbox/mailbox.pinc	2013-01-11 18:02:42 UTC (rev 890)
+++ branches/1.9/php/mailbox/mailbox.pinc	2013-01-12 14:31:30 UTC (rev 891)
@@ -157,7 +157,7 @@
     /**
      * method to call from check service
      */
-    static function checkservice (&$user) {
+    static function checkservice (tutos_user $user) {
         loadmodule('file');
 
         $msg = '';
@@ -166,7 +166,7 @@
         $n = $r->numrows();
         $a = 0;
         while ($a < $n) {
-            $m = new Mailbox($this->dbconn);
+            $m = new Mailbox($user->dbconn);
             $m->read_result($r,$a);
             $msg = addLine($msg,$m->open());
             if ($m->mbox == "") {
@@ -198,7 +198,7 @@
                 }
                 $email_adr = array_unique($email_adr);
 
-                $f = new Tutos_file($this->dbconn);
+                $f = new Tutos_file($user->dbconn);
                 $f->id = -1;
                 $f->name = "";
                 $x = imap_mime_header_decode($hdr->subject);
@@ -214,16 +214,16 @@
                 $f->content   = $b;
 
                 $pre = " and (";
-                $q = "SELECT distinct adr_id ID from ".$this->dbconn->prefix."location, ".$this->dbconn->prefix."adrloc where adrloc.loc_id = location.id";
+                $q = "SELECT distinct adr_id ID from ".$user->dbconn->prefix."location, ".$user->dbconn->prefix."adrloc where adrloc.loc_id = location.id";
                 foreach ($email_adr as $id => $object) {
-                    $q .= " ". $pre . $this->dbconn->Like("email_1",$object);
+                    $q .= " ". $pre . $user->dbconn->Like("email_1",$object);
                     $pre = " or ";
-                    $q .= " ". $pre . $this->dbconn->Like("email_2",$object);
+                    $q .= " ". $pre . $user->dbconn->Like("email_2",$object);
                 }
                 $q .= ')';
-                $res = $this->dbconn->Exec($q);
+                $res = $user->dbconn->Exec($q);
                 for ($i = 0; $i < $res->numrows(); $i++) {
-                    $adr = new Tutos_address($this->dbconn);
+                    $adr = new Tutos_address($user->dbconn);
                     $adr->read_result($res, $i);
                     $f->addReference($adr);
                 }
@@ -744,4 +744,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: 890
          http://sourceforge.net/p/tutos/code/890
Author:   gokohnert
Date:     2013-01-11 18:02:42 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
allow cmpny/dep as author of files

Modified Paths:
--------------
    trunk/php/file/file_ins.php
    trunk/php/file/file_new.php
    trunk/php/file/file_overview.php
    trunk/php/file/file_select.php

Modified: trunk/php/file/file_ins.php
===================================================================
--- trunk/php/file/file_ins.php	2013-01-11 18:02:07 UTC (rev 889)
+++ trunk/php/file/file_ins.php	2013-01-11 18:02:42 UTC (rev 890)
@@ -255,7 +255,7 @@
 
 if ( isset($_POST['afn']) ) {
     // Check the author full name
-    $author = check_field($_REQUEST['afn'],"afn","al","at");
+    $author = check_field($_REQUEST['afn'],"afn","al",array(useaddressbook,useteams,usecompany,usedepartment));
 }
 
 if ( $file != "none" ) {

Modified: trunk/php/file/file_new.php
===================================================================
--- trunk/php/file/file_new.php	2013-01-11 18:02:07 UTC (rev 889)
+++ trunk/php/file/file_new.php	2013-01-11 18:02:42 UTC (rev 890)
@@ -55,7 +55,7 @@
         $r .= "<tr>\n";
         $r .= $this->showfieldc($lang['FileAuthor'],0,"a");
         $r .= " <td colspan=\"3\">\n";
-        $r .= select_from_array_or_input($this->obj,"a",$this->obj->author,0,'at');
+        $r .= select_from_array_or_input($this->obj,"a",$this->obj->author,0,array(useaddressbook,useteams,usecompany,usedepartment));
         $r .= " </td>\n";
         $r .= "</tr>\n";
 

Modified: trunk/php/file/file_overview.php
===================================================================
--- trunk/php/file/file_overview.php	2013-01-11 18:02:07 UTC (rev 889)
+++ trunk/php/file/file_overview.php	2013-01-11 18:02:42 UTC (rev 890)
@@ -260,7 +260,7 @@
         overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'file',array('f.link_id','l.link_id'),array('FileReference'),'',get_parent_classes('file'));
         // Search Author
         overview_arg($this,'authorid',OVERVIEW_ARG_OBJID,'file',array('author'),'FileAuthor','f.');
-        overview_arg($this,'authorfn',OVERVIEW_ARG_FN,'file',array('author'),'FileAuthor','f.','a');
+        overview_arg($this,'authorfn',OVERVIEW_ARG_FN,'file',array('author'),'FileAuthor','f.',array(useaddressbook,useteams,usecompany,usedepartment));
 
         // Textual search
         overview_arg($this,'type',OVERVIEW_ARG_STRING,'file',array('type'),array('FileType'),'f.');

Modified: trunk/php/file/file_select.php
===================================================================
--- trunk/php/file/file_select.php	2013-01-11 18:02:07 UTC (rev 889)
+++ trunk/php/file/file_select.php	2013-01-11 18:02:42 UTC (rev 890)
@@ -76,7 +76,7 @@
 
         $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc(sprintf($lang['FileAuthor'],''),0,"author");
-        $r .= $this->showdata(select_from_array_or_input($this,"author",null,1,'a'),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"author",null,1,array(useaddressbook,useteams,usecompany,usedepartment)),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');

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

Revision: 889
          http://sourceforge.net/p/tutos/code/889
Author:   gokohnert
Date:     2013-01-11 18:02:07 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
product role search extended for projects/dpe/cmpy

Modified Paths:
--------------
    trunk/php/product.pinc
    trunk/php/product_overview.php
    trunk/php/product_select.php

Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc	2013-01-11 13:10:02 UTC (rev 888)
+++ trunk/php/product.pinc	2013-01-11 18:02:07 UTC (rev 889)
@@ -195,9 +195,12 @@
             $rid = $_GET['rid'];
         else
             $rid[] = $_GET['rid']; // via select form
-    } else if (isset($_GET['rfn'])) {
+    } else if (isset($_GET['rfn']) && $_GET['rfn'] != '' ) {
         // run a search by name and fill rid
-        $r = search_by_name($_GET['rfn'],array(useaddressbook,useteams));
+        $r = search_by_name($_GET['rfn'],array(useaddressbook,usecompany,usedepartment,useteams,useprojects));
+        if (count($r) == 0) {
+            $rid[-1] = -1;
+        }
         foreach ($r as $i => $o) {
             if (is_numeric($i)) {
                 if (is_object($o))
@@ -255,8 +258,8 @@
         $r = $obj->dbconn->Exec($q1);
         $n = $r->numrows();
         $a = 0;
-        $pre1 = "";
-        $x = "";
+        $pre1 = ",";
+        $x = "-1";
         while ($a < $n) {
             $x .= $pre1 . $r->get($a, "pro_id");
             $pre1 = ",";

Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php	2013-01-11 13:10:02 UTC (rev 888)
+++ trunk/php/product_overview.php	2013-01-11 18:02:07 UTC (rev 889)
@@ -882,7 +882,7 @@
                 $this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
             }
         }
-        // $msg .= $this->q;
+        //        $msg = addLine($msg,$this->q);
         check_dbacl($this->dbconn, $this->q, $this->user->id);
 
         // Order of output

Modified: trunk/php/product_select.php
===================================================================
--- trunk/php/product_select.php	2013-01-11 13:10:02 UTC (rev 888)
+++ trunk/php/product_select.php	2013-01-11 18:02:07 UTC (rev 889)
@@ -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,"r",null,1,array(useaddressbook,useteams)),2);
+        $r .= $this->showdata(select_from_array_or_input($this,"r",null,1,array(useaddressbook,useteams,useprojects,usedepartment,usecompany)),2);
         $r .= $this->ContentRowEnd();
 
         // add custom selectors

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

Revision: 888
          http://sourceforge.net/p/tutos/code/888
Author:   gokohnert
Date:     2013-01-11 13:10:02 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
allow less than 4 testcases to insert

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

Modified: trunk/php/testmanager/testcase_ins.php
===================================================================
--- trunk/php/testmanager/testcase_ins.php	2013-01-11 13:08:27 UTC (rev 887)
+++ trunk/php/testmanager/testcase_ins.php	2013-01-11 13:10:02 UTC (rev 888)
@@ -53,7 +53,7 @@
     }
 
 
-    if ( isset($_POST['expected_'.$i]) ) {
+    if ( isset($_POST['expected_'.$i]) && !empty($_POST['expected_'.$i]) ) {
         $obj[$i]->setExpected($_POST['expected_'.$i]);
         $gotourl= addUrlParameter($gotourl,'expected_'.$i.'='. UrlEncode($obj[$i]->expected),true);
         $use = true;

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

Revision: 887
          http://sourceforge.net/p/tutos/code/887
Author:   gokohnert
Date:     2013-01-11 13:08:27 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
testruns on tasks allowed

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

Modified: trunk/php/testmanager/mconfig.pinc
===================================================================
--- trunk/php/testmanager/mconfig.pinc	2013-01-11 13:08:12 UTC (rev 886)
+++ trunk/php/testmanager/mconfig.pinc	2013-01-11 13:08:27 UTC (rev 887)
@@ -60,6 +60,7 @@
 
 $tutos[modulesinc]['testrun'][]   = 'scheme';
 $tutos[modulesinc]['testrun'][]   = 'product';
+$tutos[modulesinc]['testrun'][]   = 'task';
 $tutos[modulesinc]['testrun'][]   = 'installation';
 
 

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

Revision: 886
          http://sourceforge.net/p/tutos/code/886
Author:   gokohnert
Date:     2013-01-11 13:08:12 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
do not allow adding bugs if feature off

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

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2013-01-10 10:05:08 UTC (rev 885)
+++ trunk/php/bugtracking/bug.pinc	2013-01-11 13:08:12 UTC (rev 886)
@@ -619,7 +619,7 @@
      * get a list of possible new parents
      */
     function read_relations ( ) {
-        global $lang,$tutos,$table;
+        global $lang,$tutos,$table,$current_user;
 
         $this->plist = array();
         if ( ! is_object($this->parent)  ) {
@@ -646,6 +646,14 @@
                 $p = new product($this->dbconn);
                 $p->read_result($result,$a);
                 $a++;
+                if (! $current_user->feature_ok(usebugtracking,PERM_NEW) ) {
+                    unset($p);
+                    continue;
+                }
+                if (! $p->obj_feature_ok($current_user,usebugtracking,PERM_NEW) ) {
+                    unset($p);
+                    continue;
+                }
                 if ( $p->see_ok()) {
                     $this->plist[$p->id] = &$p;
                 }

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

Revision: 884
          http://sourceforge.net/p/tutos/code/884
Author:   gokohnert
Date:     2013-01-08 10:46:40 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
handle multi invoice per expense

Modified Paths:
--------------
    trunk/php/expense/expense.pinc
    trunk/php/expense/expense_ins.php
    trunk/php/expense/expense_show.php
    trunk/php/invoice/invoice.pinc
    trunk/php/invoice/invoice_overview.php
    trunk/php/layout/layout_base.pinc

Modified: trunk/php/expense/expense.pinc
===================================================================
--- trunk/php/expense/expense.pinc	2013-01-08 10:39:46 UTC (rev 883)
+++ trunk/php/expense/expense.pinc	2013-01-08 10:46:40 UTC (rev 884)
@@ -148,7 +148,7 @@
         $this->people      = '';
         $this->mop         = 1;
         $this->ccentre     = '';
-        $this->invoice     = -1;
+        //        $this->invoice     = -1; // deprecated
         $this->city        = '';
         $this->country     = $tutos[defaultcntry];
         $this->t_start     = new TUTOS_Date_Time();
@@ -179,7 +179,7 @@
         $this->people      = $r->get($pos, 'people');
         $this->mop         = $r->get($pos, 'mop');
         $this->ccentre     = $r->get($pos, 'ccentre');
-        $this->invoice     = $r->get($pos, 'invoice');
+        //        $this->invoice     = $r->get($pos, 'invoice');
         $this->city        = $r->get($pos, 'city');
         $this->country     = $r->get($pos, 'country');
         $this->t_start     = $r->getDateTime($pos, "t_start");
@@ -687,7 +687,7 @@
         $q->addFV("people",$this->people,"TEXT");
         $q->addFV("link_id",$this->link_id,"INT");
         $q->addFV("adr_id",$this->adr_id,"INT");
-        $q->addFV("invoice",$this->invoice,"INT");
+        //        $q->addFV("invoice",$this->invoice,"INT");
         $q->addFV("quantity",$this->quantity,"FLOAT");
         $q->addFV("gamount",$this->gamount,"FLOAT");
         $q->addFV("deduction",$this->deduction,"FLOAT");
@@ -773,9 +773,6 @@
         $r .= " <itax>". htmlspecialchars($this->itax) ."</itax>\n";
         $r .= " <mop>". htmlspecialchars($this->mop) ."</mop>\n";
         $r .= " <ccentre>". htmlspecialchars($this->ccentre) ."</ccentre>\n";
-        if (is_object($this->invoice)) {
-            $r .= " <invoice>". htmlspecialchars($this->invoice->id) ."</invoice>\n";
-        }
         $r .= " <t_start>". $this->t_start->exportXML_body() ."</t_start>\n";
         $r .= " <t_end>". $this->t_end->exportXML_body() ."</t_end>\n";
         #$r .=  $this->exportXML_end();

Modified: trunk/php/expense/expense_ins.php
===================================================================
--- trunk/php/expense/expense_ins.php	2013-01-08 10:39:46 UTC (rev 883)
+++ trunk/php/expense/expense_ins.php	2013-01-08 10:46:40 UTC (rev 884)
@@ -108,12 +108,6 @@
     $u->read_reference();
 }
 
-if ( isset($_POST['invoice']) ) {
-    $u->setInvoice(trim($_POST['invoice']));
-    $gotourl= addUrlParameter($gotourl,"invoice=". UrlEncode($u->invoice),true);
-}
-
-
 if ( empty($_POST['quantity']) ) {
     $msg = addLine($msg,sprintf($lang['Err0009'],$lang['ExpenseQuantity']));
     $gotourl = addBadField($gotourl,'quantity',true);

Modified: trunk/php/expense/expense_show.php
===================================================================
--- trunk/php/expense/expense_show.php	2013-01-08 10:39:46 UTC (rev 883)
+++ trunk/php/expense/expense_show.php	2013-01-08 10:46:40 UTC (rev 884)
@@ -111,14 +111,6 @@
         $r .= $this->showfield_data_row($this->obj,$table['expense']['ccentre'],3,1);
         $r .= $this->showfield_data_row($this->obj,$table['expense']['description'],3,1);
 
-        if ( $this->obj->invoice != -1 ) {
-            $r .= $this->ContentRowStart();
-            $r .= $this->showfield($lang['Invoice']);
-            $i = getObject($this->dbconn,$this->obj->invoice);
-            $r .= $this->showdata(is_object($i) ? $i->getLink():'');
-            $r .= $this->ContentRowEnd();
-        }
-
         // Show additional custom fields
         $r .= show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 

Modified: trunk/php/invoice/invoice.pinc
===================================================================
--- trunk/php/invoice/invoice.pinc	2013-01-08 10:39:46 UTC (rev 883)
+++ trunk/php/invoice/invoice.pinc	2013-01-08 10:46:40 UTC (rev 884)
@@ -61,13 +61,15 @@
  * List all invoices
  * cols > 0  make sperate rows with cols columns for each note
  */
-function showInvoice(&$user,&$obj,$cols,$rows = 0) {
+function showInvoice(tutos_user $user,tutos_base $obj,$rows = 0) {
     global $tutos,$lang;
 
-    $r = '';
+    $r   = '';
+    $pre = '';
+
     $n = 1;
-    $x = count($obj->list[useinvoice]);
-    $tutos['maxshort'] = 15;
+    $x = count($obj->list[useinvoice][1]);
+
     if (($obj->getType() == 'company') ||
         ($obj->getType() == 'department') ||
         ($obj->getType() == 'address')
@@ -82,13 +84,8 @@
     if ( $rows == -1 ) {
         $rows = $x;
     }
-
-    $pre = "";
     if ($x > 0) {
-        foreach ( $obj->list[useinvoice] as $i => $f) {
-            if ( $cols > 0 ) {
-                $r .= "<tr><td valign=\"top\" colspan=\"". $cols ."\">\n";
-            }
+        foreach ( $obj->list[useinvoice][1] as $i => $f) {
             if ( ($n >= $rows) && ( $x != $rows ) ) {
                 $r .=  $pre . $user->layout->theme->getImage(folder,'list') ." ". makelink($link,sprintf($lang['AllEntries'], $x));
                 if ( $cols > 0 ) {
@@ -96,11 +93,8 @@
                 }
                 break;
             }
-            $r .= $pre . $user->layout->theme->getImage(paper,'list') ." ". $f->creation->getDate() ." : ". $f->getLink() ." : ".$f->creator->getLink($f->creator->getShortname())." : ". $f->getState() ;
+            $r .= $pre . $user->layout->theme->getImage(paper,'list') .' '. $f->creation->getDate() .' : '. $f->getLink() .' : '.$f->creator->getLink($f->creator->getShortname())." : ". $f->getState() ;
             $pre = "<br />\n";
-            if ( $cols > 0 ) {
-                $r .= "</td></tr>\n";
-            }
             $n++;
         }
         if (($n < $rows) || ($x == $rows)) {
@@ -108,8 +102,31 @@
             $r .= $pre.$user->layout->theme->getImage(folder,'list') ." ". makelink($link,$linktitle);
         }
     }
+
+
+    $n = 1;
+    $x = count($obj->list[useinvoice][2]);
+    $link = 'invoice/invoice_overview.php?pos_id='.$obj->id;
+    if ( $rows == 0 ) {
+        $rows = $tutos['maxshort'];
+    }
+    if ( $rows == -1 ) {
+        $rows = $x;
+    }
+    if ($x > 0) {
+        foreach ( $obj->list[useinvoice][2] as $i => $f) {
+            $r .= $pre .$user->layout->theme->getImage(paper,'list') .' '.$lang['InvPosPos'].' '. $f->creation->getDate() .' : '. $f->getLink() .' : '.$f->creator->getLink($f->creator->getShortname()).' : '. $f->getState() ;
+            $pre = "<br />\n";
+            $n++;
+        }
+        if ( $x > 1 ) {
+            $linktitle = $lang['InvOverview'];
+            $r .= $pre.$user->layout->theme->getImage(folder,'list') ." ". makelink($link,$linktitle);
+        }
+    }
     return $r;
 }
+
 /**
  * A invoice position
  *
@@ -312,7 +329,7 @@
         $r->free();
 
         if ( is_object($this->ref) && ($this->ref->getType() == "expense") ) {
-            $this->ref->SetInvoice($this->inv_id);
+            //$this->ref->SetInvoice($this->inv_id);
             $msg = addLine($msg,$this->ref->save());
         }
         if ( is_object($this->ref) && ($this->ref->getType() == "timetrack") ) {
@@ -373,7 +390,7 @@
                 $this->ref->SetInvoice(-1);
                 $msg = addLine($msg,$this->ref->save());
             } else if ( $this->ref->getType() == "expense" ) {
-                $this->ref->SetInvoice(-1);
+                //$this->ref->SetInvoice(-1);
                 $msg = addLine($msg,$this->ref->save());
             }
         }
@@ -1160,9 +1177,10 @@
         if (! is_object($obj) ) return;
         if ( $obj->id == -1 ) return;
 
-        $q2 = "";
-        $obj->list[useinvoice] = array();
-        if ( ($obj->getType() == "product") || ($obj->getType() == "installation")  ) {
+        $q2 = '';
+        $obj->list[useinvoice][1] = array(); // direct ref
+        $obj->list[useinvoice][2] = array(); // postion
+        if ( ($obj->getType() == "product") || ($obj->getType() == "installation") || ($obj->getType() == "expense")  ) {
             $q = "SELECT * from ". $obj->dbconn->prefix.$table['invoice'][name] ." where link_id = ". $obj->id ." order by creation desc";
             // the given object is referenced somewhere
             $q2 = "SELECT inv_id from ". $obj->dbconn->prefix.$table['invpos'][name]." where ref_id = ". $obj->id;
@@ -1171,15 +1189,15 @@
         } else {
             $q = "SELECT * from ". $obj->dbconn->prefix.$table['invoice'][name]." where (creator = ". $obj->id .") OR ( link_id = ". $obj->id .") OR ( customer = ". $obj->id .") order by creation desc";
         }
+
         $r = $obj->dbconn->Exec($q);
         $n = $r->numrows();
-
         $a = 0;
         while ($a < $n) {
             $i = new invoice($obj->dbconn);
             $i->read_result($r,$a);
             if ( $i->see_ok() ) {
-                $obj->list[useinvoice][$i->id] = &$i;
+                $obj->list[useinvoice][1][$i->id] = &$i;
             }
             $a++;
             unset($i);
@@ -1187,6 +1205,7 @@
         $r->free();
 
         if ( $q2 != "" ) {
+            // Position in invoice
             $r = $obj->dbconn->Exec($q2);
             $n = $r->numrows();
             $a = 0;
@@ -1194,7 +1213,7 @@
                 $i = new invoice($obj->dbconn);
                 $i = $i->read($r->get($a,"inv_id"),$i);
                 if ( $i->see_ok() ) {
-                    $obj->list[useinvoice][$i->id] = &$i;
+                    $obj->list[useinvoice][2][$i->id] = &$i;
                 }
                 $a++;
                 unset($i);
@@ -1216,15 +1235,15 @@
         if ( ! $obj->obj_feature_ok($user,useinvoice,PERM_SEE) ) return $r;
 
         invoice::obj_read($obj);
-        if ( !isset($obj->list[useinvoice]) || count($obj->list[useinvoice]) == 0 ) {
+        if ( !isset($obj->list[useinvoice][1]) || count($obj->list[useinvoice][1])+count($obj->list[useinvoice][2]) == 0 ) {
             return $r;
         }
         $r .= $user->layout->ContentRowStart();
         $r .= $user->layout->showfield($lang['Invoices']);
         if ( $format == "paper" ) {
-            $d = showInvoice($user,$obj,0,-1);
+            $d = showInvoice($user,$obj,-1);
         } else {
-            $d = showInvoice($user,$obj,0);
+            $d = showInvoice($user,$obj);
         }
         $r .= $user->layout->showdata($d,$cols-1);
         $r .= $user->layout->ContentRowEnd();
@@ -1298,23 +1317,21 @@
                 }
             }
             $r .= $layout->OverviewRowBlock(($xx != '' ? $xx:'&#160;'),'over_l');
-        } else if ( ($obj->gettype() == "installation") ) {
+        } else if ( ($obj->gettype() == "installation") || ($obj->gettype() == "expense") ) {
             $xx = '';
             invoice::obj_read($obj);
-            if ( count($obj->list[useinvoice]) > 0 ) {
-                $pre = "";
-                foreach ($obj->list[useinvoice] as $i => $f) {
+            $pre = '';
+            if ( count($obj->list[useinvoice][1]) > 0 ) {
+                foreach ($obj->list[useinvoice][1] as $i => $f) {
                     $xx .= $pre . $f->getLink() ." : ". $f->getState() ;
                     $pre = "\n<br />";
                 }
             }
-            $r .= $layout->OverviewRowBlock(($xx != '' ? $xx:'&#160;'),'over_l');
-        } else if ( ($obj->gettype() == "expense") ) {
-            $xx = '';
-            $obj->inv = new invoice($obj->dbconn);
-            $obj->inv = $obj->inv->read($obj->invoice,$obj->inv);
-            if (is_object($obj->inv) && ($obj->invoice == $obj->inv->id) ) {
-                $xx .= $obj->inv->getLink()." : ". $obj->inv->getState() ;;
+            if ( count($obj->list[useinvoice][2]) > 0 ) {
+                foreach ($obj->list[useinvoice][2] as $i => $f) {
+                    $xx .= $pre .'+'.$f->getLink() ." : ". $f->getState() ;
+                    $pre = "\n<br />";
+                }
             }
             $r .= $layout->OverviewRowBlock(($xx != '' ? $xx:'&#160;'),'over_l');
         }
@@ -1354,7 +1371,7 @@
     }
 
     /**
-     * show the mytutos info about bugs
+     * show the mytutos info about invoices
      */
     static function mytutos (tutos_user $user) {
         global $tutos,$lang,$current_user;
@@ -1367,7 +1384,7 @@
         }
 
         invoice::obj_read($user);
-        if ( count($user->list[useinvoice]) == 0 ) {
+        if ( count($user->list[useinvoice][1]) == 0 ) {
             return '';
         }
         $r = info_table_start();
@@ -1386,7 +1403,7 @@
         $r .= '  <th>'. $lang['InvoiceState'] ."</th>\n";
         $r .= " </tr>\n";
         $a = 0;
-        foreach ($user->list[useinvoice] as $f) {
+        foreach ($user->list[useinvoice][1] as $f) {
             if (!($a++ < 2 * $tutos['maxshort'])) break;
             $r .= " <tr>\n";
             $r .= '  <td>' . $f->getLink() ."</td>\n";

Modified: trunk/php/invoice/invoice_overview.php
===================================================================
--- trunk/php/invoice/invoice_overview.php	2013-01-08 10:39:46 UTC (rev 883)
+++ trunk/php/invoice/invoice_overview.php	2013-01-08 10:46:40 UTC (rev 884)
@@ -273,7 +273,7 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang,$tutos;
+        global $msg,$info,$lang,$tutos,$table;
 
         $this->layout_id = useinvoice;
         $this->name = $lang['InvOverview'];
@@ -335,6 +335,25 @@
             overview_arg($this,'customerid',OVERVIEW_ARG_OBJID,'invoice',array('customer'),'InvoiceCustomer','','atcdD');
         }
 
+        // Position (join)
+        if (isset($_REQUEST['pos_id']) && is_numeric($_REQUEST['pos_id']) ) {
+            $q = 'select inv_id from '.$table['invpos'][name].' where ref_id = '.$_REQUEST['pos_id'];
+            $xo = getObject($this->dbconn,$_REQUEST['pos_id']);
+            $this->q .= $this->qpre .'id in (-1';
+            $res = $this->dbconn->Exec($q);
+            $n = $res->numrows();
+            $x = 0;
+            while ( $x < $n ) {
+                $this->q .= ','.$res->get($x,0);
+                $x++;
+            }
+            $this->q .= ')';
+            $res->free();
+            $this->qpre = ' AND ';
+            $this->header .= $this->hpre .$lang['InvPosPos'].' = '.$xo->getLink();
+            $this->hpre = '<br />';
+        }
+        $info .= $this->q;
         check_dbacl($this->dbconn, $this->q, $this->user->id);
 
         // sorting

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2013-01-08 10:39:46 UTC (rev 883)
+++ trunk/php/layout/layout_base.pinc	2013-01-08 10:46:40 UTC (rev 884)
@@ -752,6 +752,8 @@
             } else {
                 $r .= $this->showdata('## unsupported TS type/field ## '.$tarr[type].'/'.$tarr['field'] .'/'.$tarr['ftype'],$colsd);
             }
+        } else if ($tarr[type] == 'float' && is_numeric($obj->$tarr['field']) ) {
+            $r .= $this->showdata(my_number_format($obj->$tarr['field'],2));
         } else if ($tarr['ftype'] == 'Boolean' ) {
             $r .= $this->showdata(($obj->$tarr['field'] ? $lang['yes']:$lang['no']),$colsd);
         } else if ($tarr[type] == 'ID_TYPE' && is_numeric($obj->$tarr['field']) ) {
@@ -769,8 +771,6 @@
             } else {
                 $r .= $this->showdata(myentities($obj->$tarr['field']) ,$colsd);
             }
-        } else if ($tarr[type] == 'float' && is_numeric($obj->$tarr['field']) ) {
-            $r .= $this->showdata(my_number_format($obj->$tarr['field'],2));
         } else {
             $r .= $this->showdata('## unsupported type/field ## '.$tarr[type].'/'.$tarr['field'] ,$colsd);
         }
@@ -803,7 +803,7 @@
         $r = '';
 
         if ( isset($tarr['hide']) && ($tarr['hide'] == true) ) return $r;
-        #        if ( isset($tarr['hideempty']) && ($tarr['hideempty'] == true) && ($obj->$tarr['field'] == '') ) return $r;
+#        if ( isset($tarr['hideempty']) && ($tarr['hideempty'] == true) && ($obj->$tarr['field'] == '') ) return $r;
 
 
         $r .= edit_custom_field_single($this,$tarr['field'],$tarr,0,$obj,$colsd+$colsf);

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

Revision: 883
          http://sourceforge.net/p/tutos/code/883
Author:   gokohnert
Date:     2013-01-08 10:39:46 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
correct stc info

Modified Paths:
--------------
    trunk/php/stc/stc.pinc
    trunk/php/stc/stc_new.php
    trunk/php/stc/stc_overview.php
    trunk/php/stc/stc_show.php

Modified: trunk/php/stc/stc.pinc
===================================================================
--- trunk/php/stc/stc.pinc	2013-01-08 05:18:34 UTC (rev 882)
+++ trunk/php/stc/stc.pinc	2013-01-08 10:39:46 UTC (rev 883)
@@ -504,7 +504,7 @@
      * init
      */
     function stc($dbconn) {
-        global $current_user,$table;
+        global $current_user,$table,$tutos;
 
         $this->init($dbconn);
         $this->name = '';

Modified: trunk/php/stc/stc_new.php
===================================================================
--- trunk/php/stc/stc_new.php	2013-01-08 05:18:34 UTC (rev 882)
+++ trunk/php/stc/stc_new.php	2013-01-08 10:39:46 UTC (rev 883)
@@ -14,7 +14,6 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
-require_once 'stc.pinc';
 
 /* Check if user is allowed to use it */
 check_user();

Modified: trunk/php/stc/stc_overview.php
===================================================================
--- trunk/php/stc/stc_overview.php	2013-01-08 05:18:34 UTC (rev 882)
+++ trunk/php/stc/stc_overview.php	2013-01-08 10:39:46 UTC (rev 883)
@@ -14,7 +14,6 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
-require_once 'stc.pinc';
 
 /* Check if user is allowed to use it */
 check_user();
@@ -165,4 +164,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/stc/stc_show.php
===================================================================
--- trunk/php/stc/stc_show.php	2013-01-08 05:18:34 UTC (rev 882)
+++ trunk/php/stc/stc_show.php	2013-01-08 10:39:46 UTC (rev 883)
@@ -14,7 +14,6 @@
 ini_set("include_path","..");
 require_once 'webelements.p3';
 require_once 'permission.p3';
-require_once 'stc.pinc';
 
 /* Check if user is allowed to use it */
 check_user();

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

Revision: 882
          http://sourceforge.net/p/tutos/code/882
Author:   gokohnert
Date:     2013-01-08 05:18:34 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
bugfix rss and modules

Modified Paths:
--------------
    trunk/php/module_base.pinc
    trunk/php/rss/mconfig.pinc
    trunk/php/rss/news.php
    trunk/php/rss/rss.pinc
    trunk/php/webelements.p3

Modified: trunk/php/module_base.pinc
===================================================================
--- trunk/php/module_base.pinc	2013-01-08 05:15:34 UTC (rev 881)
+++ trunk/php/module_base.pinc	2013-01-08 05:18:34 UTC (rev 882)
@@ -14,8 +14,10 @@
  * check if  module is loaded
  */
 Function moduleloaded($key) {
+    global $tutos;
+
     return isset($tutos[activemodules][$key]);
-}
+  }
 
 /**
  * load modules that want to work here
@@ -52,7 +54,7 @@
         return false;
     }
 
-    //error_log('  loadmodule:'.$key."\n",3,$tutos[errlog]);
+    //    error_log('->loadmodule:'.$key."\n",3,$tutos[errlog]);
 
     require_once  $tutos['base'] .'/'. $tutos[modules][$key][file];
     if (! class_exists($tutos[modules][$key][name]) ) {
@@ -92,7 +94,7 @@
 Function loadmodules($key,$subkey) {
     global $tutos,$lang;
 
-    //    error_log('loadmodules:'.$key."\tsubkey:".$subkey."\n",3,$tutos[errlog]);
+    //error_log('->loadmodules:'.$key."\tsubkey:".$subkey."\n",3,$tutos[errlog]);
     $tutos['pageclass'] = $key;
     $tutos['pagetype']  = $subkey;
     foreach  ($tutos[modulesinc] as $r => $x ) {
@@ -103,14 +105,16 @@
             if (isset($tutos[activemodules][$r])) {
                 continue;
             }
-            //            error_log('R:'.$r."\tX2:".$x2."\n",3,$tutos[errlog]);
             if ( $x2 == $key ) {
+                //error_log('R1:'.$r."\tX2:".$x2."\n",3,$tutos[errlog]);
                 if( loadmodule($r) )
                     $tutos[activemodules][$r] = $r;
             } else if ($x2 == "all") {
+                //error_log('R2:'.$r."\tX2:".$x2."\n",3,$tutos[errlog]);
                 if ( loadmodule($r) )
                     $tutos[activemodules][$r] = $r;
             } else if ($x2 == "menu") {
+                //error_log('R3:'.$r."\tX2:".$x2."\n",3,$tutos[errlog]);
                 if ( loadmodule($r) )
                     $tutos[activemodules][$r] = $r;
             }

Modified: trunk/php/rss/mconfig.pinc
===================================================================
--- trunk/php/rss/mconfig.pinc	2013-01-08 05:15:34 UTC (rev 881)
+++ trunk/php/rss/mconfig.pinc	2013-01-08 05:18:34 UTC (rev 882)
@@ -13,22 +13,23 @@
 # rssfeeds management is module 86
 #
 define('userss',-86);
-$tutos[modules]['rss'] = array( 
-    name => 'rss', 
-    Desc => 'rss feeds', 
+$tutos[modules]['rss'] = array(
+    name => 'rss',
+    Desc => 'rss feeds',
     file => 'php/rss/rss.pinc',
     'overview' => 'rss/rss_overview.php',
     'perm' => userss
-);
+    );
 #
 # globally enable this module
 #
-$tutos[userss] = 1; 
+$tutos[userss] = 1;
 #
 # List of objects/modules where we do something with this module
 # and need to include this module
 #
 $tutos[modulesinc]['rss'][] = 'all'; // has to be included in all headers
+$tutos[modulesinc]['rss'][] = 'stc';
 #
 # skip
 #

Modified: trunk/php/rss/news.php
===================================================================
--- trunk/php/rss/news.php	2013-01-08 05:15:34 UTC (rev 881)
+++ trunk/php/rss/news.php	2013-01-08 05:18:34 UTC (rev 882)
@@ -55,6 +55,7 @@
 
 #check_user();
 loadmodules('rss','show');
+loadmodule('rss');
 session_write_close();
 
 

Modified: trunk/php/rss/rss.pinc
===================================================================
--- trunk/php/rss/rss.pinc	2013-01-08 05:15:34 UTC (rev 881)
+++ trunk/php/rss/rss.pinc	2013-01-08 05:18:34 UTC (rev 882)
@@ -283,7 +283,7 @@
     /**
      * create a item info
      */
-    function create_item($c,$moduser) {
+    function create_item(tutos_base $c,$moduser) {
         global $lang;
 
         $b = dirname(getBaseUrl()).'/';

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2013-01-08 05:15:34 UTC (rev 881)
+++ trunk/php/webelements.p3	2013-01-08 05:18:34 UTC (rev 882)
@@ -770,7 +770,8 @@
 Function getBaseURL($useconfig = false) {
     global $tutos;
 
-    if (!isset($_SERVER['SERVER_NAME'])) {
+    //    if (!isset($_SERVER['SERVER_NAME']) || !isset($_SERVER['HTTP_HOST']) ) {
+    if (!isset($_SERVER['SERVER_NAME'])  ) {
         // if run on CLI we use always config
         $useconfig = true;
     }

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

Revision: 881
          http://sourceforge.net/p/tutos/code/881
Author:   gokohnert
Date:     2013-01-08 05:15:34 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
fix a bug with treminders for invoice events

Modified Paths:
--------------
    trunk/php/base.pinc
    trunk/php/invoice/invoice.pinc
    trunk/php/reminder/reminder.pinc

Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc	2012-12-30 19:16:31 UTC (rev 880)
+++ trunk/php/base.pinc	2013-01-08 05:15:34 UTC (rev 881)
@@ -789,7 +789,7 @@
      * @param Object $value     the new value for $fld
      * @param String $histfield the label of the field in the history table
      */
-    function setDateTimeField ($fld,$value,$histfield) {
+    function setDateTimeField ($fld,TUTOS_Date_Time $value,$histfield) {
         if ( isset($this->$fld) ) {
             $a = $this->$fld->getYYYYMMDDHHMM();
         } else {
@@ -1806,4 +1806,4 @@
         return array($r,$o);
     }
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/php/invoice/invoice.pinc
===================================================================
--- trunk/php/invoice/invoice.pinc	2012-12-30 19:16:31 UTC (rev 880)
+++ trunk/php/invoice/invoice.pinc	2013-01-08 05:15:34 UTC (rev 881)
@@ -444,6 +444,13 @@
         $this->datesent[2] = new TUTOS_Date_Time(0);
         $this->datedue[2]  = new TUTOS_Date_Time(0);
 
+        $this->d_sent0 = &$this->datesent[0];
+        $this->d_sent1 = &$this->datesent[1];
+        $this->d_sent2 = &$this->datesent[2];
+        $this->d_due0 = &$this->datedue[0];
+        $this->d_due1 = &$this->datedue[1];
+        $this->d_due2 = &$this->datedue[2];
+
         $this->datefinish  = new TUTOS_Date_Time(0);
 
         $this->tablename   = $this->dbconn->prefix ."invoice";

Modified: trunk/php/reminder/reminder.pinc
===================================================================
--- trunk/php/reminder/reminder.pinc	2012-12-30 19:16:31 UTC (rev 880)
+++ trunk/php/reminder/reminder.pinc	2013-01-08 05:15:34 UTC (rev 881)
@@ -427,7 +427,7 @@
     /**
      * set the remember date
      */
-    function setRemindDate(&$value) {
+    function setRemindDate(TUTOS_Date_Time $value) {
         $x = $this->setDateTimeField("remind_date",$value,"ReminderAt");
         if ($x == true) {
             // reset the fired flag
@@ -764,6 +764,7 @@
         case "bug":
         case "product":
         case "address":
+        case "invoice":
             break;
         default:
             // for other objects types simply return

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

Revision: 880
          http://sourceforge.net/p/tutos/code/880
Author:   gokohnert
Date:     2012-12-30 19:16:31 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
fix

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

Modified: trunk/php/permission.p3
===================================================================
--- trunk/php/permission.p3	2012-12-28 13:06:22 UTC (rev 879)
+++ trunk/php/permission.p3	2012-12-30 19:16:31 UTC (rev 880)
@@ -42,7 +42,7 @@
  * autoload function for TUTOS
  */
 function tutos_autoloader($class) {
-    global $tutos;
+    global $tutos,$table,$tableidx,$sequence;
 
     if ($class == 'Tutos_base') {
         include_once('base.pinc');

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

Revision: 879
          http://sourceforge.net/p/tutos/code/879
Author:   gokohnert
Date:     2012-12-28 13:06:22 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
RELEASE 1.9.20121228

Added Paths:
-----------
    branches/1.9/

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

Revision: 878
          http://sourceforge.net/p/tutos/code/878
Author:   gokohnert
Date:     2012-12-28 13:05:47 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
RELEASE 1.9.20121228

Added Paths:
-----------
    tags/RELEASE-1-9-20121228/

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

Revision: 877
          http://sourceforge.net/p/tutos/code/877
Author:   gokohnert
Date:     2012-12-28 12:53:46 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
release 1.9.20121228

Modified Paths:
--------------
    trunk/.htaccess
    trunk/ChangeLog
    trunk/php/.htaccess
    trunk/php/config_default.pinc
    trunk/test.sh

Modified: trunk/.htaccess
===================================================================
--- trunk/.htaccess	2012-12-28 09:02:22 UTC (rev 876)
+++ trunk/.htaccess	2012-12-28 12:53:46 UTC (rev 877)
@@ -9,7 +9,7 @@
 # the default page
 #
 DirectoryIndex  index.html
-ErrorDocument 404 php/notfound.php
+ErrorDocument 404 "Document not found"
 # Hide .svn
 <IfModule mod_rewrite.c>  
   # Block access to .svn files

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-12-28 09:02:22 UTC (rev 876)
+++ trunk/ChangeLog	2012-12-28 12:53:46 UTC (rev 877)
@@ -1,6 +1,8 @@
 #$Id$
-xx xxx 2012
-	* Release 1.9.2012xxxx
+28 December 2012
+	* Release 1.9.20121228
+	* reworked most search pages to show search arguments
+	* check input on required fields before submit
 	* start using mobile layout support using jquery mobile
 	  allows to automatically jump to a mobile layout when called in a mobile browser (see user config)
 	* more usage of jquery in layout

Modified: trunk/php/.htaccess
===================================================================
--- trunk/php/.htaccess	2012-12-28 09:02:22 UTC (rev 876)
+++ trunk/php/.htaccess	2012-12-28 12:53:46 UTC (rev 877)
@@ -9,7 +9,6 @@
 # the default page
 #
 DirectoryIndex  mytutos.php
-ErrorDocument 404 notfound.php
 #
 #
 # Dont allow access to config files

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2012-12-28 09:02:22 UTC (rev 876)
+++ trunk/php/config_default.pinc	2012-12-28 12:53:46 UTC (rev 877)
@@ -751,7 +751,7 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.9.20121227';
+$tutos[version] = '1.9.20121228';
 #
 ### Local Variables: ***
 ### mode:iso-accents ***

Modified: trunk/test.sh
===================================================================
--- trunk/test.sh	2012-12-28 09:02:22 UTC (rev 876)
+++ trunk/test.sh	2012-12-28 12:53:46 UTC (rev 877)
@@ -109,7 +109,7 @@
 
 
 
-rm -f $OUT $COOKIES test_dump.*
+rm -f $OUT $COOKIES test_dump.* tmp/test.dump.*.html
 touch $OUT
 
 cp tmp/debug.out test.out
@@ -124,6 +124,7 @@
  acl_show.php?id=$ADR
  acl_show.php?id=$NOID
  address_ins.php
+ address_del.php
  address_select.php
  address_select.php?ext=1
  address_overview.php?name=
@@ -159,6 +160,7 @@
  company_show.php?id=$ADR
  company_show.php?id=$NOID
  database_ins.php
+ database_del.php
  database_show.php?id=0
  database_show.php?id=$NOID
  database_new.php?id=0
@@ -172,7 +174,9 @@
  help.php?p=glossary
  history_show.php?id=$ADR
  history_show.php?id=$NOID
+ history_select.php
  message_overview.php
+ message_del.php
  minical.php
  minitimer.php
  module_overview.php
@@ -212,6 +216,7 @@
  team_show.php
  team_show.php?id=$NOID
  user_ins.php
+ user_del.php
  user_new.php
  user_new.php?id=$NOID
  user_new.php?id=$ADR
@@ -225,10 +230,6 @@
  admin/table_custom_show.php
  admin/main_config.php
  admin/phpinfo.php
- admin/restore.php?dbnr=$NOID
- admin/restore.php?dbnr=$DBNR
- admin/scheme.php
- admin/update.php
  admin/update.php?id=$NOID
  bugtracking/bug_ins.php
  bugtracking/bug_select.php
@@ -278,6 +279,7 @@
  fax/fax_new.php?a=$NOID;
  file/file_config.php
  file/file_ins.php
+ file/file_del.php
  file/file_select.php
  file/file_select.php?ext=1
  file/file_show.php
@@ -409,8 +411,6 @@
  subversion/svn_ins.php
  subversion/svn_show.php
  subversion/svn_overview.php
- subversion/svn_check.php
- subversion/svn_access.php
  testmanager/testcase_new.php
  testmanager/testcase_ins.php
  testmanager/testcase_show.php
@@ -453,6 +453,12 @@
  url/urlcat_new.php
  url/urlcat_new.php?id=NOID
  watchlist/watchlist_overview.php?id=$ADR
+ admin/restore.php?dbnr=$NOID
+ admin/restore.php?dbnr=$DBNR
+ admin/scheme.php
+ admin/update.php
+ subversion/svn_check.php
+ subversion/svn_access.php
  "
 URLS2="
 admin/backup.php
@@ -548,7 +554,7 @@
 
 # Create a timetrack entry
 wget --load-cookies=$COOKIES --save-cookies=$COOKIES -a $OUT -O $OUT2 \
-    --post-data "mode=0&lid=$P_ID&wfn=Super+User&volume=1&distance=1&jsc_wd=2006-02-02&state=1&desc=http://www.tutos.org" $URL/timetrack_ins.php
+    --post-data "mode=0&lid=$P_ID&wfn=Super+User&volume=1&distance=1&jsc_wd=2006-02-02&state=1&desc=http://www.tutos.org" $URL/timetrack/timetrack_ins.php
 check_output timetrack_ins.php $OUT2
 
 # Create a rate
@@ -592,8 +598,8 @@
 check_output logout.php $OUT2
 
 
-diff tmp/debug.out test.out
-diff tmp/debug.out.log test.out.log
+diff tmp/debug.out test.out   > test_diff.txt
+diff tmp/debug.out.log test.out.log >> test_diff.txt
 
 rm -f test.out test.out.log
 

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

Revision: 876
          http://sourceforge.net/p/tutos/code/876
Author:   gokohnert
Date:     2012-12-28 09:02:22 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
updated utf

Modified Paths:
--------------
    trunk/php/localization/namedays_cs.p3
    trunk/php/localization/namedays_de.p3
    trunk/php/localization/namedays_es.p3
    trunk/php/localization/namedays_hu.p3
    trunk/php/localization/namedays_nl.p3
    trunk/php/localization/namedays_pl.p3
    trunk/php/localization/namedays_template.p3
    trunk/php/localization/namedays_vi.p3

Modified: trunk/php/localization/namedays_cs.p3
===================================================================
--- trunk/php/localization/namedays_cs.p3	2012-12-27 12:03:21 UTC (rev 875)
+++ trunk/php/localization/namedays_cs.p3	2012-12-28 09:02:22 UTC (rev 876)
@@ -5,394 +5,394 @@
 # Ing. Daniel Pavelka, NOEL-PLUS, s.r.o. 2002, gpl rel. 2 license
 #
 $tutos['nd'][] = array ( "1"  => array ("2"  => "Karina"
-				  , "3"  => "Radmila"
-				  , "4"  => "Diana"
-				  , "5"  => "Dalimil"
-				  , "6"  => "T\xF8i kr\xE1lov\xE9"
-				  , "7"  => "Vilma"
-				  , "8"  => "\xC8estm\xEDr"
-				  , "9"  => "Vladan"
-				  , "10" => "B\xF8etislav"
-				  , "11" => "Bohdana"
-				  , "12" => "Pravoslav"
-				  , "13" => "Edita"
-				  , "14" => "Radovan"
-				  , "15" => "Alice"
-				  , "16" => "Ctirad"
-				  , "17" => "Drahoslav"
-				  , "18" => "Vladislav"
-				  , "19" => "Doubravka"
-				  , "20" => "Ilona"
-				  , "21" => "B\xECla"
-				  , "22" => "Slavom\xEDr"
-				  , "23" => "Zden\xECk"
-				  , "24" => "Milena"
-				  , "25" => "Milo\xB9"
-				  , "26" => "Zora"
-				  , "27" => "Ingrid"
-				  , "28" => "Ot\xFDlie"
-				  , "29" => "Zdislava"
-				  , "30" => "Robin"
-				  , "31" => "Marika"
-			          )
+                                        , "3"  => "Radmila"
+                                        , "4"  => "Diana"
+                                        , "5"  => "Dalimil"
+                                        , "6"  => "Tři králové"
+                                        , "7"  => "Vilma"
+                                        , "8"  => "Čestmír"
+                                        , "9"  => "Vladan"
+                                        , "10" => "Břetislav"
+                                        , "11" => "Bohdana"
+                                        , "12" => "Pravoslav"
+                                        , "13" => "Edita"
+                                        , "14" => "Radovan"
+                                        , "15" => "Alice"
+                                        , "16" => "Ctirad"
+                                        , "17" => "Drahoslav"
+                                        , "18" => "Vladislav"
+                                        , "19" => "Doubravka"
+                                        , "20" => "Ilona"
+                                        , "21" => "Běla"
+                                        , "22" => "Slavomír"
+                                        , "23" => "Zdeněk"
+                                        , "24" => "Milena"
+                                        , "25" => "Miloš"
+                                        , "26" => "Zora"
+                                        , "27" => "Ingrid"
+                                        , "28" => "Otýlie"
+                                        , "29" => "Zdislava"
+                                        , "30" => "Robin"
+                                        , "31" => "Marika"
+                             )
 
 
-		 ,  "2"  => array ( "1"  => "Hynek"
-		   	          , "2"  => "Nela"
-			          , "3"  => "Bla\xBEej"
-				  , "4"  => "Jarmila"
-				  , "5"  => "Dobromila"
-				  , "6"  => "Vanda"
-				  , "7"  => "Veronika"
-				  , "8"  => "Milada"
-				  , "9"  => "Apolena"
-				  , "10" => "Mojm\xEDr"
-				  , "11" => "Bo\xBEena"
-				  , "12" => "Slav\xECna"
-				  , "13" => "V\xECnceslav"
-				  , "14" => "Valent\xFDn"
-				  , "15" => "Ji\xF8ina"
-				  , "16" => "Ljuba"
-				  , "17" => "Miloslava"
-				  , "18" => "Gizela"
-				  , "19" => "Patrik"
-				  , "20" => "Old\xF8ich"
-				  , "21" => "Lenka"
-				  , "22" => "Petr"
-				  , "23" => "Svatopluk"
-				  , "24" => "Mat\xECj"
-				  , "25" => "Liliana"
-				  , "26" => "Dorota"
-				  , "27" => "Alexandr"
-				  , "28" => "Lum\xEDr"
-			 	  )
+                         ,  "2"  => array ( "1"  => "Hynek"
+                                            , "2"  => "Nela"
+                                            , "3"  => "Blažej"
+                                            , "4"  => "Jarmila"
+                                            , "5"  => "Dobromila"
+                                            , "6"  => "Vanda"
+                                            , "7"  => "Veronika"
+                                            , "8"  => "Milada"
+                                            , "9"  => "Apolena"
+                                            , "10" => "Mojmír"
+                                            , "11" => "Božena"
+                                            , "12" => "Slavěna"
+                                            , "13" => "Věnceslav"
+                                            , "14" => "Valentýn"
+                                            , "15" => "Jiřina"
+                                            , "16" => "Ljuba"
+                                            , "17" => "Miloslava"
+                                            , "18" => "Gizela"
+                                            , "19" => "Patrik"
+                                            , "20" => "Oldřich"
+                                            , "21" => "Lenka"
+                                            , "22" => "Petr"
+                                            , "23" => "Svatopluk"
+                                            , "24" => "Matěj"
+                                            , "25" => "Liliana"
+                                            , "26" => "Dorota"
+                                            , "27" => "Alexandr"
+                                            , "28" => "Lumír"
+                             )
 
 
-		 ,  "3"  => array ( "1"  => "Bed\xF8ich"
-		   	          , "2"  => "Ane\xBEka"
-			          , "3"  => "Kamil"
-				  , "4"  => "Stela"
-				  , "5"  => "Kazim\xEDr"
-				  , "6"  => "Miroslav"
-				  , "7"  => "Tom\xE1\xB9"
-				  , "8"  => "Gabriela"
-				  , "9"  => "Franti\xB9ka"
-				  , "10" => "Viktorie"
-				  , "11" => "And\xECla"
-				  , "12" => "\xD8eho\xF8"
-				  , "13" => "R\xF9\xBEena"
-				  , "14" => "R\xFAt/Matylda"
-				  , "15" => "Ida"
-				  , "16" => "Elena/Herbert"
-				  , "17" => "Vlastimil"
-				  , "18" => "Eduard"
-				  , "19" => "Josef"
-				  , "20" => "Sv\xECtlana"
-				  , "21" => "Radek"
-				  , "22" => "Leona"
-				  , "23" => "Ivona"
-				  , "24" => "Gabriel"
-				  , "25" => "Mari\xE1n"
-				  , "26" => "Emanuel"
-				  , "27" => "Dita"
-				  , "28" => "So\xF2a"
-				  , "29" => "Ta\xBB\xE1na"
-				  , "30" => "Arno\xB9t"
-				  , "31" => "Kv\xEDdo"
-			 	  )
+                         ,  "3"  => array ( "1"  => "Bedřich"
+                                            , "2"  => "Anežka"
+                                            , "3"  => "Kamil"
+                                            , "4"  => "Stela"
+                                            , "5"  => "Kazimír"
+                                            , "6"  => "Miroslav"
+                                            , "7"  => "Tomáš"
+                                            , "8"  => "Gabriela"
+                                            , "9"  => "Františka"
+                                            , "10" => "Viktorie"
+                                            , "11" => "Anděla"
+                                            , "12" => "Řehoř"
+                                            , "13" => "Růžena"
+                                            , "14" => "Rút/Matylda"
+                                            , "15" => "Ida"
+                                            , "16" => "Elena/Herbert"
+                                            , "17" => "Vlastimil"
+                                            , "18" => "Eduard"
+                                            , "19" => "Josef"
+                                            , "20" => "Světlana"
+                                            , "21" => "Radek"
+                                            , "22" => "Leona"
+                                            , "23" => "Ivona"
+                                            , "24" => "Gabriel"
+                                            , "25" => "Marián"
+                                            , "26" => "Emanuel"
+                                            , "27" => "Dita"
+                                            , "28" => "Soňa"
+                                            , "29" => "Taťána"
+                                            , "30" => "Arnošt"
+                                            , "31" => "Kvído"
+                             )
 
 
-		 ,  "4"  => array ( "1"  => "Hugo"
-		   	          , "2"  => "Erika"
-			          , "3"  => "Richard"
-				  , "4"  => "Ivana"
-				  , "5"  => "Miroslava"
-				  , "6"  => "Vendula"
-				  , "7"  => "He\xF8man/Herm\xEDna"
-				  , "8"  => "Ema"
-				  , "9"  => "Du\xB9an"
-				  , "10" => "Darja"
-				  , "11" => "Izabela"
-				  , "12" => "Julius"
-				  , "13" => "Ale\xB9"
-				  , "14" => "Vincent/Vincenc"
-				  , "15" => "Anast\xE1zie"
-				  , "16" => "Irena"
-				  , "17" => "Rudolf"
-				  , "18" => "Val\xE9rie"
-				  , "19" => "Rostislav"
-				  , "20" => "Marcela"
-				  , "21" => "Alexander"
-				  , "22" => "Ev\xBEenie"
-				  , "23" => "Vojt\xECch"
-				  , "24" => "Ji\xF8\xED"
-				  , "25" => "Marek"
-				  , "26" => "Oto"
-				  , "27" => "Jaroslav"
-				  , "28" => "Vlastislav"
-				  , "29" => "Robert"
-				  , "30" => "Blahoslav"
-			 	  )
+                         ,  "4"  => array ( "1"  => "Hugo"
+                                            , "2"  => "Erika"
+                                            , "3"  => "Richard"
+                                            , "4"  => "Ivana"
+                                            , "5"  => "Miroslava"
+                                            , "6"  => "Vendula"
+                                            , "7"  => "Heřman/Hermína"
+                                            , "8"  => "Ema"
+                                            , "9"  => "Dušan"
+                                            , "10" => "Darja"
+                                            , "11" => "Izabela"
+                                            , "12" => "Julius"
+                                            , "13" => "Aleš"
+                                            , "14" => "Vincent/Vincenc"
+                                            , "15" => "Anastázie"
+                                            , "16" => "Irena"
+                                            , "17" => "Rudolf"
+                                            , "18" => "Valérie"
+                                            , "19" => "Rostislav"
+                                            , "20" => "Marcela"
+                                            , "21" => "Alexander"
+                                            , "22" => "Evženie"
+                                            , "23" => "Vojtěch"
+                                            , "24" => "Jiří"
+                                            , "25" => "Marek"
+                                            , "26" => "Oto"
+                                            , "27" => "Jaroslav"
+                                            , "28" => "Vlastislav"
+                                            , "29" => "Robert"
+                                            , "30" => "Blahoslav"
+                             )
 
 
-		 ,  "5"  => array ("2"  => "Zikmund"
-			          , "3"  => "Alexej"
-				  , "4"  => "Kv\xECtoslav"
-				  , "5"  => "Klaudie"
-				  , "6"  => "Radoslav"
-				  , "7"  => "Stanislav"
-				  , "9"  => "Ctibor"
-				  , "10" => "Bla\xBEena"
-				  , "11" => "Svatava"
-				  , "12" => "Pankr\xE1c"
-				  , "13" => "Serv\xE1c"
-				  , "14" => "Bonif\xE1c"
-				  , "15" => "\xAEofie"
-				  , "16" => "P\xF8emysl"
-				  , "17" => "Aneta"
-				  , "18" => "Nata\xB9a"
-				  , "19" => "Ivo"
-				  , "20" => "Zby\xB9ek"
-				  , "21" => "Monika"
-				  , "22" => "Emil"
-				  , "23" => "Vladim\xEDr"
-				  , "24" => "Jana"
-				  , "25" => "Viola"
-				  , "26" => "Filip"
-				  , "27" => "Valdemar"
-				  , "28" => "Vil\xE9m"
-				  , "29" => "Maxmili\xE1n"
-				  , "30" => "Ferdinand"
-				  , "31" => "Kamila"
-			 	  )
+                         ,  "5"  => array ("2"  => "Zikmund"
+                                           , "3"  => "Alexej"
+                                           , "4"  => "Květoslav"
+                                           , "5"  => "Klaudie"
+                                           , "6"  => "Radoslav"
+                                           , "7"  => "Stanislav"
+                                           , "9"  => "Ctibor"
+                                           , "10" => "Blažena"
+                                           , "11" => "Svatava"
+                                           , "12" => "Pankrác"
+                                           , "13" => "Servác"
+                                           , "14" => "Bonifác"
+                                           , "15" => "Žofie"
+                                           , "16" => "Přemysl"
+                                           , "17" => "Aneta"
+                                           , "18" => "Nataša"
+                                           , "19" => "Ivo"
+                                           , "20" => "Zbyšek"
+                                           , "21" => "Monika"
+                                           , "22" => "Emil"
+                                           , "23" => "Vladimír"
+                                           , "24" => "Jana"
+                                           , "25" => "Viola"
+                                           , "26" => "Filip"
+                                           , "27" => "Valdemar"
+                                           , "28" => "Vilém"
+                                           , "29" => "Maxmilián"
+                                           , "30" => "Ferdinand"
+                                           , "31" => "Kamila"
+                             )
 
 
-		 ,  "6"  => array ( "1"  => "Laura"
-		   	          , "2"  => "Jarmil"
-			          , "3"  => "Tamara"
-				  , "4"  => "Dalibor"
-				  , "5"  => "Dobroslav"
-				  , "6"  => "Norbert"
-				  , "7"  => "Iveta/Slavoj"
-				  , "8"  => "Medard"
-				  , "9"  => "Stanislava"
-				  , "10" => "Gita"
-				  , "11" => "Bruno"
-				  , "12" => "Antonie"
-				  , "13" => "Anton\xEDn"
-				  , "14" => "Roland"
-				  , "15" => "V\xEDt"
-				  , "16" => "Zbyn\xECk"
-				  , "17" => "Adolf"
-				  , "18" => "Milan"
-				  , "19" => "Leo\xB9"
-				  , "20" => "Kv\xECta"
-				  , "21" => "Alois"
-				  , "22" => "Pavla"
-				  , "23" => "Zde\xF2ka"
-				  , "24" => "Jan"
-				  , "25" => "Ivan"
-				  , "26" => "Adriana"
-				  , "27" => "Ladislav"
-				  , "28" => "Lubom\xEDr"
-				  , "29" => "Petr a Pavel"
-				  , "30" => "\xA9\xE1rka"
-			 	  )
+                         ,  "6"  => array ( "1"  => "Laura"
+                                            , "2"  => "Jarmil"
+                                            , "3"  => "Tamara"
+                                            , "4"  => "Dalibor"
+                                            , "5"  => "Dobroslav"
+                                            , "6"  => "Norbert"
+                                            , "7"  => "Iveta/Slavoj"
+                                            , "8"  => "Medard"
+                                            , "9"  => "Stanislava"
+                                            , "10" => "Gita"
+                                            , "11" => "Bruno"
+                                            , "12" => "Antonie"
+                                            , "13" => "Antonín"
+                                            , "14" => "Roland"
+                                            , "15" => "Vít"
+                                            , "16" => "Zbyněk"
+                                            , "17" => "Adolf"
+                                            , "18" => "Milan"
+                                            , "19" => "Leoš"
+                                            , "20" => "Květa"
+                                            , "21" => "Alois"
+                                            , "22" => "Pavla"
+                                            , "23" => "Zdeňka"
+                                            , "24" => "Jan"
+                                            , "25" => "Ivan"
+                                            , "26" => "Adriana"
+                                            , "27" => "Ladislav"
+                                            , "28" => "Lubomír"
+                                            , "29" => "Petr a Pavel"
+                                            , "30" => "Šárka"
+                             )
 
 
-		 ,  "7"  => array ( "1"  => "Jaroslava"
-		   	          , "2"  => "Patricie"
-			          , "3"  => "Radom\xEDr"
-				  , "4"  => "Prokop"
-				  , "7"  => "Bohuslava"
-				  , "8"  => "Nora"
-				  , "9"  => "Drahoslava"
-				  , "10" => "Libu\xB9e/Am\xE1lie"
-				  , "11" => "Olga"
-				  , "12" => "Bo\xF8ek"
-				  , "13" => "Mark\xE9ta"
-				  , "14" => "Karol\xEDna"
-				  , "15" => "Jind\xF8ich"
-				  , "16" => "Lubo\xB9"
-				  , "17" => "Martina"
-				  , "18" => "Drahom\xEDra"
-				  , "19" => "\xC8en\xECk"
-				  , "20" => "Ilja"
-				  , "21" => "V\xEDt\xECslav"
-				  , "22" => "Magdal\xE9na"
-				  , "23" => "Libor"
-				  , "24" => "Krist\xFDna"
-				  , "25" => "Jakub"
-				  , "26" => "Anna"
-				  , "27" => "V\xECroslav"
-				  , "28" => "Viktor"
-				  , "29" => "Marta"
-				  , "30" => "Bo\xF8ivoj"
-				  , "31" => "Ign\xE1c"
-			 	  )
+                         ,  "7"  => array ( "1"  => "Jaroslava"
+                                            , "2"  => "Patricie"
+                                            , "3"  => "Radomír"
+                                            , "4"  => "Prokop"
+                                            , "7"  => "Bohuslava"
+                                            , "8"  => "Nora"
+                                            , "9"  => "Drahoslava"
+                                            , "10" => "Libuše/Amálie"
+                                            , "11" => "Olga"
+                                            , "12" => "Bořek"
+                                            , "13" => "Markéta"
+                                            , "14" => "Karolína"
+                                            , "15" => "Jindřich"
+                                            , "16" => "Luboš"
+                                            , "17" => "Martina"
+                                            , "18" => "Drahomíra"
+                                            , "19" => "Čeněk"
+                                            , "20" => "Ilja"
+                                            , "21" => "Vítěslav"
+                                            , "22" => "Magdaléna"
+                                            , "23" => "Libor"
+                                            , "24" => "Kristýna"
+                                            , "25" => "Jakub"
+                                            , "26" => "Anna"
+                                            , "27" => "Věroslav"
+                                            , "28" => "Viktor"
+                                            , "29" => "Marta"
+                                            , "30" => "Bořivoj"
+                                            , "31" => "Ignác"
+                             )
 
 
-		 ,  "8"  => array ( "1"  => "Oskar"
-		   	          , "2"  => "Gustav"
-			          , "3"  => "Milu\xB9e"
-				  , "4"  => "Dominik"
-				  , "5"  => "Kristi\xE1n"
-				  , "6"  => "Old\xF8i\xB9ka"
-				  , "7"  => "Lada"
-				  , "8"  => "Sob\xECslav"
-				  , "9"  => "Roman"
-				  , "10" => "Vav\xF8inec"
-				  , "11" => "Zuzana"
-				  , "12" => "Kl\xE1ra"
-				  , "13" => "Alena"
-				  , "14" => "Alan"
-				  , "15" => "Hana"
-				  , "16" => "J\xE1chym"
-				  , "17" => "Petra"
-				  , "18" => "Helena"
-				  , "19" => "Ludv\xEDk"
-				  , "20" => "Bernard"
-				  , "21" => "Johana"
-				  , "22" => "Bohuslav"
-				  , "23" => "Sanra"
-				  , "24" => "Bartolom\xECj"
-				  , "25" => "Radim"
-				  , "26" => "Lud\xECk"
-				  , "27" => "Otakar"
-				  , "28" => "August\xFDn"
-				  , "29" => "Evel\xEDna"
-				  , "30" => "Vlad\xECna"
-				  , "31" => "Pavl\xEDna"
-			 	  )
+                         ,  "8"  => array ( "1"  => "Oskar"
+                                            , "2"  => "Gustav"
+                                            , "3"  => "Miluše"
+                                            , "4"  => "Dominik"
+                                            , "5"  => "Kristián"
+                                            , "6"  => "Oldřiška"
+                                            , "7"  => "Lada"
+                                            , "8"  => "Soběslav"
+                                            , "9"  => "Roman"
+                                            , "10" => "Vavřinec"
+                                            , "11" => "Zuzana"
+                                            , "12" => "Klára"
+                                            , "13" => "Alena"
+                                            , "14" => "Alan"
+                                            , "15" => "Hana"
+                                            , "16" => "Jáchym"
+                                            , "17" => "Petra"
+                                            , "18" => "Helena"
+                                            , "19" => "Ludvík"
+                                            , "20" => "Bernard"
+                                            , "21" => "Johana"
+                                            , "22" => "Bohuslav"
+                                            , "23" => "Sanra"
+                                            , "24" => "Bartoloměj"
+                                            , "25" => "Radim"
+                                            , "26" => "Luděk"
+                                            , "27" => "Otakar"
+                                            , "28" => "Augustýn"
+                                            , "29" => "Evelína"
+                                            , "30" => "Vladěna"
+                                            , "31" => "Pavlína"
+                             )
 
 
-		 ,  "9"  => array ( "1"  => "Linda/Samuel"
-		   	          , "2"  => "Ad\xE9la"
-			          , "3"  => "Bronislav"
-				  , "4"  => "Jind\xF8i\xB9ka"
-				  , "5"  => "Boris"
-				  , "6"  => "Boleslav"
-				  , "7"  => "Reg\xEDna"
-				  , "8"  => "Mariana"
-				  , "9"  => "Daniela"
-				  , "10" => "Irma"
-				  , "11" => "Denisa"
-				  , "12" => "Marie"
-				  , "13" => "Lubor"
-				  , "14" => "Radka"
-				  , "15" => "Jolana"
-				  , "16" => "Ludmila"
-				  , "17" => "Nad\xEC\xBEda"
-				  , "18" => "Kry\xB9tof"
-				  , "19" => "Zita"
-				  , "20" => "Oleg"
-				  , "21" => "Matou\xB9"
-				  , "22" => "Darina"
-				  , "23" => "Berta"
-				  , "24" => "Jarom\xEDr"
-				  , "25" => "Zlata"
-				  , "26" => "Andrea"
-				  , "27" => "Jon\xE1\xB9"
-				  , "28" => "V\xE1clav"
-				  , "29" => "Michal"
-				  , "30" => "Jeron\xFDm"
-			 	  )
+                         ,  "9"  => array ( "1"  => "Linda/Samuel"
+                                            , "2"  => "Adéla"
+                                            , "3"  => "Bronislav"
+                                            , "4"  => "Jindřiška"
+                                            , "5"  => "Boris"
+                                            , "6"  => "Boleslav"
+                                            , "7"  => "Regína"
+                                            , "8"  => "Mariana"
+                                            , "9"  => "Daniela"
+                                            , "10" => "Irma"
+                                            , "11" => "Denisa"
+                                            , "12" => "Marie"
+                                            , "13" => "Lubor"
+                                            , "14" => "Radka"
+                                            , "15" => "Jolana"
+                                            , "16" => "Ludmila"
+                                            , "17" => "Naděžda"
+                                            , "18" => "Kryštof"
+                                            , "19" => "Zita"
+                                            , "20" => "Oleg"
+                                            , "21" => "Matouš"
+                                            , "22" => "Darina"
+                                            , "23" => "Berta"
+                                            , "24" => "Jaromír"
+                                            , "25" => "Zlata"
+                                            , "26" => "Andrea"
+                                            , "27" => "Jonáš"
+                                            , "28" => "Václav"
+                                            , "29" => "Michal"
+                                            , "30" => "Jeroným"
+                             )
 
 
-		 ,  "10" => array ( "1"  => "Igor"
-		   	          , "2"  => "Ol\xEDvie/Oliver"
-			          , "3"  => "Bohumil"
-				  , "4"  => "Franti\xB9ek"
-				  , "5"  => "Eli\xB9ka"
-				  , "6"  => "Hanu\xB9"
-				  , "7"  => "Just\xFDna"
-				  , "8"  => "V\xECra"
-				  , "9"  => "\xA9tefan/S\xE1ra"
-				  , "10" => "Marina"
-				  , "11" => "Andrej"
-				  , "12" => "Marcel"
-				  , "13" => "Ren\xE1ta"
-				  , "14" => "Ag\xE1ta"
-				  , "15" => "Tereza"
-				  , "16" => "Havel"
-				  , "17" => "Hedvika"
-				  , "18" => "Luk\xE1\xB9"
-				  , "19" => "Michaela"
-				  , "20" => "Vendel\xEDn"
-				  , "21" => "Brigita"
-				  , "22" => "Sabina"
-				  , "23" => "Teodor"
-				  , "24" => "Nina"
-				  , "25" => "Be\xE1ta"
-				  , "26" => "Erik"
-				  , "27" => "\xA9arlota/Zoe"
-				  , "29" => "Silvie"
-				  , "30" => "Tade\xE1\xB9"
-				  , "31" => "\xA9t\xECp\xE1nka"
-			 	  )
+                         ,  "10" => array ( "1"  => "Igor"
+                                            , "2"  => "Olívie/Oliver"
+                                            , "3"  => "Bohumil"
+                                            , "4"  => "František"
+                                            , "5"  => "Eliška"
+                                            , "6"  => "Hanuš"
+                                            , "7"  => "Justýna"
+                                            , "8"  => "Věra"
+                                            , "9"  => "Štefan/Sára"
+                                            , "10" => "Marina"
+                                            , "11" => "Andrej"
+                                            , "12" => "Marcel"
+                                            , "13" => "Renáta"
+                                            , "14" => "Agáta"
+                                            , "15" => "Tereza"
+                                            , "16" => "Havel"
+                                            , "17" => "Hedvika"
+                                            , "18" => "Lukáš"
+                                            , "19" => "Michaela"
+                                            , "20" => "Vendelín"
+                                            , "21" => "Brigita"
+                                            , "22" => "Sabina"
+                                            , "23" => "Teodor"
+                                            , "24" => "Nina"
+                                            , "25" => "Beáta"
+                                            , "26" => "Erik"
+                                            , "27" => "Šarlota/Zoe"
+                                            , "29" => "Silvie"
+                                            , "30" => "Tadeáš"
+                                            , "31" => "Štěpánka"
+                             )
 
 
-		 ,  "11" => array ( "1"  => "Felix"
-			          , "3"  => "Hubert"
-				  , "4"  => "Karel"
-				  , "5"  => "Miriam"
-				  , "6"  => "Lib\xECna"
-				  , "7"  => "Saskie"
-				  , "8"  => "Bohum\xEDr"
-				  , "9"  => "Bohdan"
-				  , "10" => "Ev\xBEen"
-				  , "11" => "Martin"
-				  , "12" => "Benedikt"
-				  , "13" => "Tibor"
-				  , "14" => "S\xE1va"
-				  , "15" => "Leopold"
-				  , "16" => "Otmar"
-				  , "17" => "Mahulena"
-				  , "18" => "Romana"
-				  , "19" => "Al\xBEb\xECta"
-				  , "20" => "Nikola"
-				  , "21" => "Albert"
-				  , "22" => "Cec\xEDlie"
-				  , "23" => "Klement"
-				  , "24" => "Em\xEDlie"
-				  , "25" => "Kate\xF8ina"
-				  , "26" => "Artur"
-				  , "27" => "X\xE9nie"
-				  , "28" => "Ren\xE9"
-				  , "29" => "Zina"
-				  , "30" => "Ond\xF8ej"
-			 	  )
+                         ,  "11" => array ( "1"  => "Felix"
+                                            , "3"  => "Hubert"
+                                            , "4"  => "Karel"
+                                            , "5"  => "Miriam"
+                                            , "6"  => "Liběna"
+                                            , "7"  => "Saskie"
+                                            , "8"  => "Bohumír"
+                                            , "9"  => "Bohdan"
+                                            , "10" => "Evžen"
+                                            , "11" => "Martin"
+                                            , "12" => "Benedikt"
+                                            , "13" => "Tibor"
+                                            , "14" => "Sáva"
+                                            , "15" => "Leopold"
+                                            , "16" => "Otmar"
+                                            , "17" => "Mahulena"
+                                            , "18" => "Romana"
+                                            , "19" => "Alžběta"
+                                            , "20" => "Nikola"
+                                            , "21" => "Albert"
+                                            , "22" => "Cecílie"
+                                            , "23" => "Klement"
+                                            , "24" => "Emílie"
+                                            , "25" => "Kateřina"
+                                            , "26" => "Artur"
+                                            , "27" => "Xénie"
+                                            , "28" => "René"
+                                            , "29" => "Zina"
+                                            , "30" => "Ondřej"
+                             )
 
 
-		 ,  "12" => array ( "1"  => "Iva"
-		   	          , "2"  => "Blanka"
-			          , "3"  => "Svatoslav"
-				  , "4"  => "Barbara"
-				  , "5"  => "Jitka"
-				  , "6"  => "Mikul\xE1\xB9"
-				  , "7"  => "Ambro\xBE/Benjam\xEDn"
-				  , "8"  => "Kv\xECtoslava"
-				  , "9"  => "Vratislav"
-				  , "10" => "Julie"
-				  , "11" => "Dana"
-				  , "12" => "Simona"
-				  , "13" => "Lucie"
-				  , "14" => "L\xFDdie"
-				  , "15" => "Radana"
-				  , "16" => "Alb\xEDna"
-				  , "17" => "Daniel"
-				  , "18" => "Miloslav"
-				  , "19" => "Ester"
-				  , "20" => "Dagmar"
-				  , "21" => "Nat\xE1lie"
-				  , "22" => "\xA9imon"
-				  , "23" => "Vlasta"
-				  , "27" => "\xAEaneta"
-				  , "28" => "Bohumila"
-				  , "29" => "Judita"
-				  , "30" => "David"
-				  , "30" => "Silvestr"
-			 	  )
+                         ,  "12" => array ( "1"  => "Iva"
+                                            , "2"  => "Blanka"
+                                            , "3"  => "Svatoslav"
+                                            , "4"  => "Barbara"
+                                            , "5"  => "Jitka"
+                                            , "6"  => "Mikuláš"
+                                            , "7"  => "Ambrož/Benjamín"
+                                            , "8"  => "Květoslava"
+                                            , "9"  => "Vratislav"
+                                            , "10" => "Julie"
+                                            , "11" => "Dana"
+                                            , "12" => "Simona"
+                                            , "13" => "Lucie"
+                                            , "14" => "Lýdie"
+                                            , "15" => "Radana"
+                                            , "16" => "Albína"
+                                            , "17" => "Daniel"
+                                            , "18" => "Miloslav"
+                                            , "19" => "Ester"
+                                            , "20" => "Dagmar"
+                                            , "21" => "Natálie"
+                                            , "22" => "Šimon"
+                                            , "23" => "Vlasta"
+                                            , "27" => "Žaneta"
+                                            , "28" => "Bohumila"
+                                            , "29" => "Judita"
+                                            , "30" => "David"
+                                            , "30" => "Silvestr"
+                             )
 
-		 );
+    );
 ?>
\ No newline at end of file

Modified: trunk/php/localization/namedays_de.p3
===================================================================
--- trunk/php/localization/namedays_de.p3	2012-12-27 12:03:21 UTC (rev 875)
+++ trunk/php/localization/namedays_de.p3	2012-12-28 09:02:22 UTC (rev 876)
@@ -321,4 +321,4 @@
               '31' => 'Silvester'
               )
           );
-?>
+?>
\ No newline at end of file

Modified: trunk/php/localization/namedays_es.p3
===================================================================
--- trunk/php/localization/namedays_es.p3	2012-12-27 12:03:21 UTC (rev 875)
+++ trunk/php/localization/namedays_es.p3	2012-12-28 09:02:22 UTC (rev 876)
@@ -5,394 +5,394 @@
 #
 # template file for localized name days, (c) sergiusz pawlowicz, gpl rel. 2 license
 #
-$tutos['nd'][] = array	( "1"  => array 
-				( "1" => "Jes\xFAs, Manuel"
-				, "2" => "Basilio"
-				, "3" => "Genoveva"
-				, "4" => "Aquilino"
-				, "5" => "Telesforo"
-				, "6" => "Reyes"
-				, "7" => "Raimundo"
-				, "8" => "Luciano"
-				, "9" => "Eulogio"
-				, "10" => "Agat\xF3n"
-				, "11" => "Higinio"
-				, "12" => "Nazario"
-				, "13" => "Hilario"
-				, "14" => "Benita"
-				, "15" => "Macario"
-				, "16" => "Fulgencio, Marcelo"
-				, "17" => "Antonio"
-				, "18" => "Beatriz"
-				, "19" => "Mario"
-				, "20" => "Sebasti\xE1n"
-				, "21" => "In\xE9s"
-				, "22" => "Anastasio"
-				, "23" => "Ildefonso"
-				, "24" => "Francisco"
-				, "25" => "Elvira"
-				, "26" => "Paula"
-				, "27" => "\xC1ngela"
-				, "28" => "Tom\xE1s, Juli\xE1n"
-				, "29" => "Valero"
-				, "30" => "Martina"
-				, "31" => "Marcela"
-				)
-			, "2"  => array
-				( "1" => "Cecilio"
-				, "2" => "Candelaria"
-				, "3" => "Blas, Oscar"
-				, "4" => "Donato"
-				, "5" => "\xC1gueda"
-				, "6" => "Dorotea"
-				, "7" => "Mois\xE9s"
-				, "8" => "Teodoro"
-				, "9" => "Apolonia"
-				, "10" => "Sotera"
-				, "11" => "Lurdes"
-				, "12" => "Eulalia"
-				, "13" => "Gilberto"
-				, "14" => "Valent\xEDn"
-				, "15" => "Severo"
-				, "16" => "On\xE9simo"
-				, "17" => "Alejo"
-				, "18" => "Sime\xF3n"
-				, "19" => "Gabino"
-				, "20" => "Eleuterio"
-				, "21" => "Dami\xE1n, Irene"
-				, "22" => "Leonor"
-				, "23" => "Marta"
-				, "24" => "Sergio"
-				, "25" => "Ces\xE1reo"
-				, "26" => "N\xE9stor"
-				, "27" => "Honorio"
-				, "28" => "Rufino"
-				)
-			, "3"  => array
-				( "1" => "Le\xF3n"
-				, "2" => "Heraclio"
-				, "3" => "Marino"
-				, "4" => "Cirilo"
-				, "5" => "Adri\xE1n, Te\xF3filo"
-				, "6" => "Olegario"
-				, "7" => "Felicidad"
-				, "8" => "Juan de Dios"
-				, "9" => "Francisca"
-				, "10" => "Cayo"
-				, "11" => "Eutimio"
-				, "12" => "Maximiliano"
-				, "13" => "Rodrigo"
-				, "14" => "Matilde"
-				, "15" => "Luisa, C\xE9sar"
-				, "16" => "Agapito"
-				, "17" => "Patricio"
-				, "18" => "Salvador"
-				, "19" => "Jos\xE9"
-				, "20" => "Eufemia"
-				, "21" => "Filem\xF3n"
-				, "22" => "Deogracias"
-				, "23" => "Toribio, Oriol"
-				, "24" => "Berta"
-				, "25" => "Gracia, Dimas, Gloria"
-				, "26" => "Dolores"
-				, "27" => "L\xE1zaro"
-				, "28" => "Doroteo"
-				, "29" => "Jon\xE1s"
-				, "30" => "Quirino"
-				, "31" => "Amadeo"
-				)
-			, "4"  => array
-				( "1" => "Celso"
-				, "2" => "Francisco"
-				, "3" => "Pancrasio, Ricardo"
-				, "4" => "Plat\xF3n"
-				, "5" => "Vicente"
-				, "6" => "Timoteo"
-				, "7" => "Epifanio"
-				, "8" => "Jenaro"
-				, "9" => "Demetrio"
-				, "10" => "Ezequiel"
-				, "11" => "N\xE9stor, Roc\xEDo"
-				, "12" => "Julio, V\xEDctor"
-				, "13" => "Hermene, gildo"
-				, "14" => "Tiburcio"
-				, "15" => "Anastasia"
-				, "16" => "Calixto"
-				, "17" => "Isidoro"
-				, "18" => "Apolonio"
-				, "19" => "Tim\xF3n"
-				, "20" => "Antonino"
-				, "21" => "Anselmo, Silvio"
-				, "22" => "Lucio"
-				, "23" => "Jorge"
-				, "24" => "Fidel"
-				, "25" => "Marcos"
-				, "26" => "Basilio, Engracia"
-				, "27" => "Monserrat"
-				, "28" => "Prudencio"
-				, "29" => "Catalina"
-				, "30" => "P\xEDo"
-				)
-			, "5"  => array
-				( "1" => "Amador"
-				, "2" => "Araceli"
-				, "3" => "Alejandro"
-				, "4" => "Paulino"
-				, "5" => "Agust\xEDn"
-				, "6" => "Heliodoro"
-				, "7" => "Flavio"
-				, "8" => "Benedicto"
-				, "9" => "Pacomio"
-				, "10" => "F\xE9lix"
-				, "11" => "Florencio"
-				, "12" => "Nereo"
-				, "13" => "F\xE1tima"
-				, "14" => "Mat\xEDas, J\xE9sica"
-				, "15" => "Isidro"
-				, "16" => "Ascenci\xF3n, Peregrino"
-				, "17" => "Pascual"
-				, "18" => "Gema, Sandra"
-				, "19" => "Ivo"
-				, "20" => "Bernardino"
-				, "21" => "Secundino"
-				, "22" => "Julia, Rita"
-				, "23" => "Desiderio"
-				, "24" => "Susana, Ester"
-				, "25" => "Maximiliano"
-				, "26" => "Felipe"
-				, "27" => "Julio"
-				, "28" => "Germ\xE1n"
-				, "29" => "Eleuterio, Justo"
-				, "30" => "Fernando, Juana"
-				, "31" => "Visitaci\xF3n"
-				)
-			, "6"  => array
-				( "1" => "Laura"
-				, "2" => "Amelia"
-				, "3" => "Claudio"
-				, "4" => "Ruth, Noem\xED, Nicanor"
-				, "5" => "Bonifacio"
-				, "6" => "Norberto"
-				, "7" => "Roberto"
-				, "8" => "Guillermo, Kilian"
-				, "9" => "Efr\xE9n"
-				, "10" => "Rosa, Felix"
-				, "11" => "Bernab\xE9"
-				, "12" => "Mag\xEDn"
-				, "13" => "Antonio"
-				, "14" => "Eliseo"
-				, "15" => "Bernardo, \xD3scar"
-				, "16" => "Iv\xE1n, Peregrino"
-				, "17" => "Ismael, Serena"
-				, "18" => "Paula"
-				, "19" => "Nazario"
-				, "20" => "Macario"
-				, "21" => "Luis"
-				, "22" => "\xC1ngel"
-				, "23" => "Feli"
-				, "24" => "Juan"
-				, "25" => "Eva"
-				, "26" => "Virgilio"
-				, "27" => "Socorro"
-				, "28" => "Alicia, Marcela"
-				, "29" => "Pedro, Pablo"
-				, "30" => "Le\xF3n"
-				)
-			, "7"  => array
-				( "1" => "Sime\xF3n, Mar\xEDa, Oliverio"
-				, "2" => "Humberto"
-				, "3" => "Carlota"
-				, "4" => "Anabel"
-				, "5" => "Aroa, Bego\xF1a"
-				, "6" => "Isaias"
-				, "7" => "Fermin"
-				, "8" => "Rosa, Edgar"
-				, "9" => "Gerardo"
-				, "10" => "Ver\xF3nica, Cristobal"
-				, "11" => "Olga, Nuria"
-				, "12" => "Sof\xEDa"
-				, "13" => "Sara"
-				, "14" => "Camilo"
-				, "15" => "Buena, ventura"
-				, "16" => "Carmen"
-				, "17" => "Raquel"
-				, "18" => "Federico"
-				, "19" => "Ambrosio"
-				, "20" => "Irene"
-				, "21" => "Lara"
-				, "22" => "Oliverio"
-				, "23" => "Apolonio"
-				, "24" => "Cristina, Alba"
-				, "25" => "Santiago"
-				, "26" => "Ana"
-				, "27" => "Alberto, Natalia"
-				, "28" => "Maite"
-				, "29" => "Desir\xE9"
-				, "30" => "Alvaro"
-				, "31" => "Ignacio"
-				)
-			, "8"  => array
-				( "1" => "Esperanza, Alfonso"
-				, "2" => "\xC1ngeles, Angel"
-				, "3" => "Dalmacio"
-				, "4" => "Eleuterio, Rub\xE9n"
-				, "5" => "Nieves"
-				, "6" => "Justo"
-				, "7" => "Donato"
-				, "8" => "Marino"
-				, "9" => "Benedicta"
-				, "10" => "Lorenzo, Mar"
-				, "11" => "Clara"
-				, "12" => "Maximiliano"
-				, "13" => "V\xEDctor"
-				, "14" => "Marcelo, Virginia"
-				, "15" => "Mireya, Alba, Asunci\xF3n, Lorena, Paloma"
-				, "16" => "Serena, Roque, Esteban"
-				, "17" => "Jacinto, Isaac"
-				, "18" => "Elena"
-				, "19" => "Magin, Mariano"
-				, "20" => "Bernardo, Samuel"
-				, "21" => "Axel, P\xEDo"
-				, "22" => "Timoteo"
-				, "23" => "Rosa"
-				, "24" => "Patricio"
-				, "25" => "Patricia"
-				, "26" => "Victor"
-				, "27" => "M\xF3nica"
-				, "28" => "Agust\xEDn"
-				, "29" => "Juan, Bautista"
-				, "30" => "Amadeo"
-				, "31" => "Vicente"
-				)
-			, "9"  => array
-				( "1" => "Arturo"
-				, "2" => "Antol\xEDn, Raquel"
-				, "3" => "Gregorio"
-				, "4" => "Consolaci\xF3n"
-				, "5" => "Lorenzo"
-				, "6" => "Eva"
-				, "7" => "Angeles"
-				, "8" => "Adrian, Adela, Coral, Nuria"
-				, "9" => "Arancha"
-				, "10" => "Rosalia"
-				, "11" => "Eugenia"
-				, "12" => "Mar\xEDa"
-				, "13" => "Juan, Cris\xF3tomo"
-				, "14" => "Cruz"
-				, "15" => "Dolores, Melissa"
-				, "16" => "Cecilio"
-				, "17" => "Roberto"
-				, "18" => "Sof\xEDa"
-				, "19" => "Jenaro"
-				, "20" => "Amelia"
-				, "21" => "Mateo"
-				, "22" => "Jon\xE1s"
-				, "23" => "Victoria"
-				, "24" => "Mercedes"
-				, "25" => "Eugenio, Raguel"
-				, "26" => "Delfina, Dami\xE1n"
-				, "27" => "Vicente"
-				, "28" => "Atenea"
-				, "29" => "Gabriel, Miguel, Rafael"
-				, "30" => "Hector"
-				)
-			, "10"  => array
-				( "1" => "Remigio"
-				, "2" => "\xC1ngel"
-				, "3" => "Gerardo"
-				, "4" => "Francisco, de, As\xEDs"
-				, "5" => "Flor, Flora"
-				, "6" => "Bruno, Brunilda"
-				, "7" => "Rosario"
-				, "8" => "Br\xEDgida, Ambrosio"
-				, "9" => "Dionisio"
-				, "10" => "Tom\xE1s"
-				, "11" => "Soledad, Begonia"
-				, "12" => "Pilar"
-				, "13" => "Eduardo"
-				, "14" => "Calixto"
-				, "15" => "Teresa"
-				, "16" => "Florentino"
-				, "17" => "Ignacio"
-				, "18" => "Lucas"
-				, "19" => "Diego, Od\xEDn"
-				, "20" => "Irene"
-				, "21" => "Samara"
-				, "22" => "Salom\xE9"
-				, "23" => "Germ\xE1n"
-				, "24" => "Antonio M. Claret"
-				, "25" => "Lucio, Frutos"
-				, "26" => "Dar\xEDo"
-				, "27" => "Minerva, Vicente"
-				, "28" => "Cirilo, Leticia"
-				, "29" => "Venus, Maximiliano"
-				, "30" => "Irene"
-				, "31" => "Alonso"
-				)
-			, "11"  => array
-				( "1" => "Marcelo, Santos"
-				, "2" => "Tob\xEDas"
-				, "3" => "Silvia"
-				, "4" => "Carlos"
-				, "5" => "Isabel"
-				, "6" => "Beatriz, Leonardo"
-				, "7" => "Ernesto"
-				, "8" => "Severiano, Deodato"
-				, "9" => "Teodoro"
-				, "10" => "Modesto"
-				, "11" => "Mart\xEDn"
-				, "12" => "Aurelio"
-				, "13" => "Leandro"
-				, "14" => "Serapi\xF3n"
-				, "15" => "Eugenio"
-				, "16" => "Margarita"
-				, "17" => "Dionisio"
-				, "18" => "Rom\xE1n"
-				, "19" => "Crisp\xEDn"
-				, "20" => "Gregorio"
-				, "21" => "Celso"
-				, "22" => "Cecilia"
-				, "23" => "Clemente"
-				, "24" => "Flora"
-				, "25" => "Erasmo"
-				, "26" => "Milagros"
-				, "27" => "Virgilio"
-				, "28" => "Honesto, Julio"
-				, "29" => "Saturnino"
-				, "30" => "Andr\xE9s"
-				)
-			, "12"  => array
-				( "1" => "Eloy"
-				, "2" => "Eusebio"
-				, "3" => "Javier"
-				, "4" => "Bernardo, B\xE1rbara"
-				, "5" => "Dalmacio"
-				, "6" => "Emiliano, Nicol\xE1s"
-				, "7" => "Ambrosio"
-				, "8" => "Inmaculada"
-				, "9" => "Leocadia"
-				, "10" => "Loreto"
-				, "11" => "Daniel"
-				, "12" => "Guadalupe"
-				, "13" => "Luc\xEDa"
-				, "14" => "Nicasio"
-				, "15" => "Fortunato"
-				, "16" => "Adelaida"
-				, "17" => "Yolanda"
-				, "18" => "Esperanza, Irma"
-				, "19" => "Dar\xEDo, Eva"
-				, "20" => "Domingo"
-				, "21" => "Tom\xE1s"
-				, "22" => "Honorato"
-				, "23" => "Victoria"
-				, "24" => "Bel\xE9n"
-				, "25" => "Natividad, Noelia"
-				, "26" => "Esteban"
-				, "27" => "Fabiola"
-				, "28" => "C\xE1stor"
-				, "29" => "David"
-				, "30" => "Paz, Ra\xFAl"
-				, "31" => "Silvestre"
-				)
-			);
-?>
+$tutos['nd'][] = array  ( "1"  => array
+                          ( "1" => "Jesús, Manuel"
+                            , "2" => "Basilio"
+                            , "3" => "Genoveva"
+                            , "4" => "Aquilino"
+                            , "5" => "Telesforo"
+                            , "6" => "Reyes"
+                            , "7" => "Raimundo"
+                            , "8" => "Luciano"
+                            , "9" => "Eulogio"
+                            , "10" => "Agatón"
+                            , "11" => "Higinio"
+                            , "12" => "Nazario"
+                            , "13" => "Hilario"
+                            , "14" => "Benita"
+                            , "15" => "Macario"
+                            , "16" => "Fulgencio, Marcelo"
+                            , "17" => "Antonio"
+                            , "18" => "Beatriz"
+                            , "19" => "Mario"
+                            , "20" => "Sebastián"
+                            , "21" => "Inés"
+                            , "22" => "Anastasio"
+                            , "23" => "Ildefonso"
+                            , "24" => "Francisco"
+                            , "25" => "Elvira"
+                            , "26" => "Paula"
+                            , "27" => "Ángela"
+                            , "28" => "Tomás, Julián"
+                            , "29" => "Valero"
+                            , "30" => "Martina"
+                            , "31" => "Marcela"
+                              )
+                          , "2"  => array
+                          ( "1" => "Cecilio"
+                            , "2" => "Candelaria"
+                            , "3" => "Blas, Oscar"
+                            , "4" => "Donato"
+                            , "5" => "Águeda"
+                            , "6" => "Dorotea"
+                            , "7" => "Moisés"
+                            , "8" => "Teodoro"
+                            , "9" => "Apolonia"
+                            , "10" => "Sotera"
+                            , "11" => "Lurdes"
+                            , "12" => "Eulalia"
+                            , "13" => "Gilberto"
+                            , "14" => "Valentín"
+                            , "15" => "Severo"
+                            , "16" => "Onésimo"
+                            , "17" => "Alejo"
+                            , "18" => "Simeón"
+                            , "19" => "Gabino"
+                            , "20" => "Eleuterio"
+                            , "21" => "Damián, Irene"
+                            , "22" => "Leonor"
+                            , "23" => "Marta"
+                            , "24" => "Sergio"
+                            , "25" => "Cesáreo"
+                            , "26" => "Néstor"
+                            , "27" => "Honorio"
+                            , "28" => "Rufino"
+                              )
+                          , "3"  => array
+                          ( "1" => "León"
+                            , "2" => "Heraclio"
+                            , "3" => "Marino"
+                            , "4" => "Cirilo"
+                            , "5" => "Adrián, Teófilo"
+                            , "6" => "Olegario"
+                            , "7" => "Felicidad"
+                            , "8" => "Juan de Dios"
+                            , "9" => "Francisca"
+                            , "10" => "Cayo"
+                            , "11" => "Eutimio"
+                            , "12" => "Maximiliano"
+                            , "13" => "Rodrigo"
+                            , "14" => "Matilde"
+                            , "15" => "Luisa, César"
+                            , "16" => "Agapito"
+                            , "17" => "Patricio"
+                            , "18" => "Salvador"
+                            , "19" => "José"
+                            , "20" => "Eufemia"
+                            , "21" => "Filemón"
+                            , "22" => "Deogracias"
+                            , "23" => "Toribio, Oriol"
+                            , "24" => "Berta"
+                            , "25" => "Gracia, Dimas, Gloria"
+                            , "26" => "Dolores"
+                            , "27" => "Lázaro"
+                            , "28" => "Doroteo"
+                            , "29" => "Jonás"
+                            , "30" => "Quirino"
+                            , "31" => "Amadeo"
+                              )
+                          , "4"  => array
+                          ( "1" => "Celso"
+                            , "2" => "Francisco"
+                            , "3" => "Pancrasio, Ricardo"
+                            , "4" => "Platón"
+                            , "5" => "Vicente"
+                            , "6" => "Timoteo"
+                            , "7" => "Epifanio"
+                            , "8" => "Jenaro"
+                            , "9" => "Demetrio"
+                            , "10" => "Ezequiel"
+                            , "11" => "Néstor, Rocío"
+                            , "12" => "Julio, Víctor"
+                            , "13" => "Hermene, gildo"
+                            , "14" => "Tiburcio"
+                            , "15" => "Anastasia"
+                            , "16" => "Calixto"
+                            , "17" => "Isidoro"
+                            , "18" => "Apolonio"
+                            , "19" => "Timón"
+                            , "20" => "Antonino"
+                            , "21" => "Anselmo, Silvio"
+                            , "22" => "Lucio"
+                            , "23" => "Jorge"
+                            , "24" => "Fidel"
+                            , "25" => "Marcos"
+                            , "26" => "Basilio, Engracia"
+                            , "27" => "Monserrat"
+                            , "28" => "Prudencio"
+                            , "29" => "Catalina"
+                            , "30" => "Pío"
+                              )
+                          , "5"  => array
+                          ( "1" => "Amador"
+                            , "2" => "Araceli"
+                            , "3" => "Alejandro"
+                            , "4" => "Paulino"
+                            , "5" => "Agustín"
+                            , "6" => "Heliodoro"
+                            , "7" => "Flavio"
+                            , "8" => "Benedicto"
+                            , "9" => "Pacomio"
+                            , "10" => "Félix"
+                            , "11" => "Florencio"
+                            , "12" => "Nereo"
+                            , "13" => "Fátima"
+                            , "14" => "Matías, Jésica"
+                            , "15" => "Isidro"
+                            , "16" => "Ascención, Peregrino"
+                            , "17" => "Pascual"
+                            , "18" => "Gema, Sandra"
+                            , "19" => "Ivo"
+                            , "20" => "Bernardino"
+                            , "21" => "Secundino"
+                            , "22" => "Julia, Rita"
+                            , "23" => "Desiderio"
+                            , "24" => "Susana, Ester"
+                            , "25" => "Maximiliano"
+                            , "26" => "Felipe"
+                            , "27" => "Julio"
+                            , "28" => "Germán"
+                            , "29" => "Eleuterio, Justo"
+                            , "30" => "Fernando, Juana"
+                            , "31" => "Visitación"
+                              )
+                          , "6"  => array
+                          ( "1" => "Laura"
+                            , "2" => "Amelia"
+                            , "3" => "Claudio"
+                            , "4" => "Ruth, Noemí, Nicanor"
+                            , "5" => "Bonifacio"
+                            , "6" => "Norberto"
+                            , "7" => "Roberto"
+                            , "8" => "Guillermo, Kilian"
+                            , "9" => "Efrén"
+                            , "10" => "Rosa, Felix"
+                            , "11" => "Bernabé"
+                            , "12" => "Magín"
+                            , "13" => "Antonio"
+                            , "14" => "Eliseo"
+                            , "15" => "Bernardo, Óscar"
+                            , "16" => "Iván, Peregrino"
+                            , "17" => "Ismael, Serena"
+                            , "18" => "Paula"
+                            , "19" => "Nazario"
+                            , "20" => "Macario"
+                            , "21" => "Luis"
+                            , "22" => "Ángel"
+                            , "23" => "Feli"
+                            , "24" => "Juan"
+                            , "25" => "Eva"
+                            , "26" => "Virgilio"
+                            , "27" => "Socorro"
+                            , "28" => "Alicia, Marcela"
+                            , "29" => "Pedro, Pablo"
+                            , "30" => "León"
+                              )
+                          , "7"  => array
+                          ( "1" => "Simeón, María, Oliverio"
+                            , "2" => "Humberto"
+                            , "3" => "Carlota"
+                            , "4" => "Anabel"
+                            , "5" => "Aroa, Begoña"
+                            , "6" => "Isaias"
+                            , "7" => "Fermin"
+                            , "8" => "Rosa, Edgar"
+                            , "9" => "Gerardo"
+                            , "10" => "Verónica, Cristobal"
+                            , "11" => "Olga, Nuria"
+                            , "12" => "Sofía"
+                            , "13" => "Sara"
+                            , "14" => "Camilo"
+                            , "15" => "Buena, ventura"
+                            , "16" => "Carmen"
+                            , "17" => "Raquel"
+                            , "18" => "Federico"
+                            , "19" => "Ambrosio"
+                            , "20" => "Irene"
+                            , "21" => "Lara"
+                            , "22" => "Oliverio"
+                            , "23" => "Apolonio"
+                            , "24" => "Cristina, Alba"
+                            , "25" => "Santiago"
+                            , "26" => "Ana"
+                            , "27" => "Alberto, Natalia"
+                            , "28" => "Maite"
+                            , "29" => "Desiré"
+                            , "30" => "Alvaro"
+                            , "31" => "Ignacio"
+                              )
+                          , "8"  => array
+                          ( "1" => "Esperanza, Alfonso"
+                            , "2" => "Ángeles, Angel"
+                            , "3" => "Dalmacio"
+                            , "4" => "Eleuterio, Rubén"
+                            , "5" => "Nieves"
+                            , "6" => "Justo"
+                            , "7" => "Donato"
+                            , "8" => "Marino"
+                            , "9" => "Benedicta"
+                            , "10" => "Lorenzo, Mar"
+                            , "11" => "Clara"
+                            , "12" => "Maximiliano"
+                            , "13" => "Víctor"
+                            , "14" => "Marcelo, Virginia"
+                            , "15" => "Mireya, Alba, Asunción, Lorena, Paloma"
+                            , "16" => "Serena, Roque, Esteban"
+                            , "17" => "Jacinto, Isaac"
+                            , "18" => "Elena"
+                            , "19" => "Magin, Mariano"
+                            , "20" => "Bernardo, Samuel"
+                            , "21" => "Axel, Pío"
+                            , "22" => "Timoteo"
+                            , "23" => "Rosa"
+                            , "24" => "Patricio"
+                            , "25" => "Patricia"
+                            , "26" => "Victor"
+                            , "27" => "Mónica"
+                            , "28" => "Agustín"
+                            , "29" => "Juan, Bautista"
+                            , "30" => "Amadeo"
+                            , "31" => "Vicente"
+                              )
+                          , "9"  => array
+                          ( "1" => "Arturo"
+                            , "2" => "Antolín, Raquel"
+                            , "3" => "Gregorio"
+                            , "4" => "Consolación"
+                            , "5" => "Lorenzo"
+                            , "6" => "Eva"
+                            , "7" => "Angeles"
+                            , "8" => "Adrian, Adela, Coral, Nuria"
+                            , "9" => "Arancha"
+                            , "10" => "Rosalia"
+                            , "11" => "Eugenia"
+                            , "12" => "María"
+                            , "13" => "Juan, Crisótomo"
+                            , "14" => "Cruz"
+                            , "15" => "Dolores, Melissa"
+                            , "16" => "Cecilio"
+                            , "17" => "Roberto"
+                            , "18" => "Sofía"
+                            , "19" => "Jenaro"
+                            , "20" => "Amelia"
+                            , "21" => "Mateo"
+                            , "22" => "Jonás"
+                            , "23" => "Victoria"
+                            , "24" => "Mercedes"
+                            , "25" => "Eugenio, Raguel"
+                            , "26" => "Delfina, Damián"
+                            , "27" => "Vicente"
+                            , "28" => "Atenea"
+                            , "29" => "Gabriel, Miguel, Rafael"
+                            , "30" => "Hector"
+                              )
+                          , "10"  => array
+                          ( "1" => "Remigio"
+                            , "2" => "Ángel"
+                            , "3" => "Gerardo"
+                            , "4" => "Francisco, de, Asís"
+                            , "5" => "Flor, Flora"
+                            , "6" => "Bruno, Brunilda"
+                            , "7" => "Rosario"
+                            , "8" => "Brígida, Ambrosio"
+                            , "9" => "Dionisio"
+                            , "10" => "Tomás"
+                            , "11" => "Soledad, Begonia"
+                            , "12" => "Pilar"
+                            , "13" => "Eduardo"
+                            , "14" => "Calixto"
+                            , "15" => "Teresa"
+                            , "16" => "Florentino"
+                            , "17" => "Ignacio"
+                            , "18" => "Lucas"
+          ...
 
[truncated message content]

Revision: 875
          http://sourceforge.net/p/tutos/code/875
Author:   gokohnert
Date:     2012-12-27 12:03:21 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
prepare release

Modified Paths:
--------------
    trunk/Makefile
    trunk/php/bugtracking/bug_overview.php
    trunk/php/config_default.pinc

Added Paths:
-----------
    trunk/html/default_mail.css
    trunk/html/js/mobile_layout.js

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2012-12-23 19:34:53 UTC (rev 874)
+++ trunk/Makefile	2012-12-27 12:03:21 UTC (rev 875)
@@ -372,9 +372,14 @@
 	html/css/smoothness/jquery-ui.custom.css \
 	html/css/ui-lightness/jquery-ui.custom.css \
 	html/css/jquery.jqplot.min.css \
+	html/css/jquery.mobile.min.css \
 	html/css/superfish-vertical.css \
 	html/css/superfish.css \
+	html/css/images/ajax-loader.gif \
+	html/css/images/ajax-loader.png \
+	html/css/images/icons-18-white.png \
 	html/default.css \
+	html/default_mail.css \
 	html/new_layout.css \
 	html/new2_layout.css \
 	html/classic_layout.css \
@@ -428,6 +433,7 @@
 	html/LICENSE_bgiframe.txt \
 	html/motd_default.html \
 	html/js/jquery.min.js \
+	html/js/jquery.mobile.min.js \
 	html/js/jquery.bt.min.js \
 	html/js/jquery.bgiframe.min.js \
 	html/js/jquery.hoverIntent.minified.js \
@@ -439,16 +445,20 @@
 	html/js/jquery.jqplot.min.js \
 	html/js/tutos.js \
 	html/js/new2_layout.js \
+	html/js/mobile_layout.js \
 	html/js/new_layout.js \
 	html/js/plugins/jqplot.barRenderer.min.js \
+	html/js/plugins/jqplot.canvasAxisLabelRenderer.min.js \
 	html/js/plugins/jqplot.canvasAxisTickRenderer.min.js \
+	html/js/plugins/jqplot.canvasTextRenderer.min.js \
 	html/js/plugins/jqplot.categoryAxisRenderer.min.js  \
+	html/js/plugins/jqplot.cursor.min.js \
+	html/js/plugins/jqplot.dateAxisRenderer.min.js \
+	html/js/plugins/jqplot.donutRenderer.min.js \
+	html/js/plugins/jqplot.enhancedLegendRenderer.min.js \
 	html/js/plugins/jqplot.highlighter.min.js \
+	html/js/plugins/jqplot.pieRenderer.min.js \
 	html/js/plugins/jqplot.pointLabels.min.js \
-	html/js/plugins/jqplot.canvasAxisLabelRenderer.min.js \
-	html/js/plugins/jqplot.canvasTextRenderer.min.js \
-	html/js/plugins/jqplot.enhancedLegendRenderer.min.js \
-	html/js/plugins/jqplot.pieRenderer.min.js \
 
 OTHERH= $(TEMPLATES) \
 	$(THEMEBLUE) \
@@ -637,7 +647,7 @@
 	@$(foreach d,${PHP} ${LANGFILES} ${OTHER} ${HELP}, \
 		echo $(d) >> tmp.$@; \
 	)
-	@cat tmp.$@ | grep -v "custom.p3" | grep -v "ja.p3" | grep -v "pt.p3" | grep -v "hu.p3" | grep -v "ca.p3"| grep -v "es-ve.p3" | grep -v "php/config.pinc" | grep -v "php/config.php" | grep -v "table_custom.pinc" | grep -v "php/hooks.php" | sort -u > $@
+	@cat tmp.$@ | grep -v "custom.p3" | grep -v "ja.p3" | grep -v "pt.p3" | grep -v "hu.p3" | grep -v "ca.p3"| grep -v "es-ve.p3" | grep -v "php/config.pinc" | grep -v "php/config.php" | grep -v "table_custom.pinc" | grep -v "php/hooks.php" | grep -v "php/test.*.php" | sort -u > $@
 
 download-php: php.list additional
 	@tar -T php.list -cjf TUTOS-php-${FULLVERSION}.tar.bz2

Added: trunk/html/default_mail.css
===================================================================
--- trunk/html/default_mail.css	                        (rev 0)
+++ trunk/html/default_mail.css	2012-12-27 12:03:21 UTC (rev 875)
@@ -0,0 +1,74 @@
+<!--
+BODY {
+        background: #efefef;
+        color: black;
+        padding: 0px;
+        margin-left: 0px;
+        margin-top: 0px;
+        margin-right: 0px;
+        margin-bottom: 0px;
+        font-family:verdana,arial,helvetica,geneva,sans-serif;
+        font-weight: normal;
+        font-size: 8pt;
+}
+
+td {
+        padding-left: 1em;
+        padding-top: 0.8em;
+}
+
+pre, .pre {
+        font-family: monospace;
+        font-size: 7pt;
+        background: #F5F5F5;
+}
+
+.mailtable {
+        border-width: 0px;
+        border-spacing: 0px;
+        padding: 0px;
+        margin: 0px;
+}
+
+.heading {
+        background: #cfcfbb; 
+        width:480pt;
+}
+
+.title {
+        padding-top: 1em; 
+        padding-bottom:1em; 
+        padding-left:4em;
+        font-size: 14pt;
+        font-weight: bold;
+}
+
+.title_dt {
+        padding-top: 0em; 
+        padding-bottom:0.8em; 
+        padding-right:1em;
+        text-align:right;
+}
+
+.first {
+        padding-left: 0.5em;
+        padding-bottom:0.3em;
+        padding-top: 2em;
+}
+
+.last {
+        padding-bottom: 2em;
+}
+
+.sig {
+        font-style: italic;
+        padding-left: 1.5em;
+}
+
+.closing {
+        font-style: italic;
+        padding-left: 1.5em;
+        font-size: 6pt;
+}
+
+-->
\ No newline at end of file


Property changes on: trunk/html/default_mail.css
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/css
\ No newline at end of property
Added: trunk/html/js/mobile_layout.js
===================================================================
(Binary files differ)

Index: trunk/html/js/mobile_layout.js
===================================================================
--- trunk/html/js/mobile_layout.js	2012-12-23 19:34:53 UTC (rev 874)
+++ trunk/html/js/mobile_layout.js	2012-12-27 12:03:21 UTC (rev 875)

Property changes on: trunk/html/js/mobile_layout.js
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/javascript
\ No newline at end of property
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php	2012-12-23 19:34:53 UTC (rev 874)
+++ trunk/php/bugtracking/bug_overview.php	2012-12-27 12:03:21 UTC (rev 875)
@@ -60,7 +60,9 @@
 
         $closed = preg_split('#,#',$tutos['bug_closed_states']);
 
-        load_jpgraph( array('jpgraph_line.php','jpgraph_date.php'),'../' );
+        if (!load_jpgraph( array('jpgraph_line.php','jpgraph_date.php'),'../' )) {
+            return;
+        }
 
         $min = new TUTOS_Date_Time();
         $max = new TUTOS_Date_Time(0);

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2012-12-23 19:34:53 UTC (rev 874)
+++ trunk/php/config_default.pinc	2012-12-27 12:03:21 UTC (rev 875)
@@ -751,7 +751,7 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.8.20121017';
+$tutos[version] = '1.9.20121227';
 #
 ### Local Variables: ***
 ### mode:iso-accents ***

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

Revision: 874
          http://sourceforge.net/p/tutos/code/874
Author:   gokohnert
Date:     2012-12-23 19:34:53 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
help updates

Modified Paths:
--------------
    trunk/Makefile
    trunk/php/group/group.pinc
    trunk/php/invoice/invoice.pinc
    trunk/php/stuff/stuff.pinc
    trunk/php/testmanager/testmanager.pinc
    trunk/php/timetrack/timetrack.pinc

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2012-12-23 19:16:23 UTC (rev 873)
+++ trunk/Makefile	2012-12-23 19:34:53 UTC (rev 874)
@@ -16,7 +16,7 @@
 #
 
 # Primary Version
-VERSION = 1.8
+VERSION = 1.9
 #
 # The full Version is VERSION.DATE
 #
@@ -731,8 +731,11 @@
 # check
 #
 lint: ${PHP}
+	rm -f LINT.out
+	touch LINT.out
 	@$(foreach d,$(wildcard php/*.php php/*.pinc php/*.p3 php/*/*.php php/*/*.pinc php/*/*.p3), \
-		php -l $(d) 2> /dev/null  | grep -v "No syntax errors"; \
+		echo "----  " $(d) >> LINT.out; \
+		php -l $(d) | grep -v "No syntax errors" >> LINT.out; \
 	)
 	@${ECHO} "DONE"
 

Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc	2012-12-23 19:16:23 UTC (rev 873)
+++ trunk/php/group/group.pinc	2012-12-23 19:34:53 UTC (rev 874)
@@ -641,8 +641,11 @@
 
         $r = '';
         $r .= '<h3>'. makelink("help.php?p=glossary#group",$lang['Groups'],$lang['Groups']) ."</h3><ul>\n";
+        $r .= ' <li>'. makelink('help.php?p=group_new',$lang['NewEntry'].'/'. $lang['Modify'],$lang['NewEntry'].'/'. $lang["Modify"]) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=group_show',$lang['show'],$lang['show']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=group_overview',$lang['GroupOverview'],$lang['GroupOverview'])."</li>\n";
         $r .= "</ul>\n";
         return $r;
     }
-}
+  }
 ?>
\ No newline at end of file

Modified: trunk/php/invoice/invoice.pinc
===================================================================
--- trunk/php/invoice/invoice.pinc	2012-12-23 19:16:23 UTC (rev 873)
+++ trunk/php/invoice/invoice.pinc	2012-12-23 19:34:53 UTC (rev 874)
@@ -1406,6 +1406,9 @@
 
         $r = '';
         $r .= '<h3>'. makelink("help.php?p=glossary#invoice",$lang['Invoices'],$lang['Invoices']) ."</h3><ul>\n";
+        $r .= ' <li>'. makelink('help.php?p=invoice_new',$lang['NewEntry'].'/'. $lang['Modify'],$lang['NewEntry'].'/'. $lang["Modify"]) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=invoice_show',$lang['show'],$lang['show']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=invoice_overview',$lang['InvOverview'],$lang['InvOverview'])."</li>\n";
         $r .= "</ul>\n";
         return $r;
     }

Modified: trunk/php/stuff/stuff.pinc
===================================================================
--- trunk/php/stuff/stuff.pinc	2012-12-23 19:16:23 UTC (rev 873)
+++ trunk/php/stuff/stuff.pinc	2012-12-23 19:34:53 UTC (rev 874)
@@ -570,6 +570,9 @@
 
         $r = '';
         $r .= '<h3>'. makelink('help.php?p=glossary#stuff',$lang['Stuffs'],$lang['Stuffs']) ."</h3><ul>\n";
+        $r .= ' <li>'. makelink('help.php?p=stuff_new',$lang['NewEntry'].'/'. $lang['Modify'],$lang['NewEntry'].'/'. $lang['Modify']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=stuff_show',$lang['show'],$lang['show']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=stuff_overview',$lang['StuffOverview'],$lang['StuffOverview'])."</li>\n";
         $r .= "</ul>\n";
         return $r;
     }

Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc	2012-12-23 19:16:23 UTC (rev 873)
+++ trunk/php/testmanager/testmanager.pinc	2012-12-23 19:34:53 UTC (rev 874)
@@ -1127,6 +1127,21 @@
 
         return;
     }
+
+    /**
+     * get the help index
+     */
+    static function getHelpIndex () {
+        global $lang;
+
+        $r = '';
+        $r .= '<h3>'. makelink('help.php?p=glossary#testcase',$lang['Testcase'],$lang['Testcase']) ."</h3><ul>\n";
+        $r .= ' <li>'. makelink('help.php?p=testcase_new',$lang['NewEntry'].'/'. $lang['Modify'],$lang['NewEntry'].'/'. $lang['Modify']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=testcase_show',$lang['show'],$lang['show']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=testcase_overview',$lang['TestcaseOverview'],$lang['TestcaseOverview'])."</li>\n";
+        $r .= "</ul>\n";
+        return $r;
+    }
 }
 
 /**
@@ -2066,6 +2081,21 @@
         $r->free();
         return;
     }
+
+    /**
+     * get the help index
+     */
+    static function getHelpIndex () {
+        global $lang;
+
+        $r = '';
+        $r .= '<h3>'. makelink('help.php?p=glossary#testsuite',$lang['Testsuite'],$lang['Testsuite']) ."</h3><ul>\n";
+        $r .= ' <li>'. makelink('help.php?p=testsuite_new',$lang['NewEntry'].'/'. $lang['Modify'],$lang['NewEntry'].'/'. $lang['Modify']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=testsuite_show',$lang['show'],$lang['show']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=testsuite_overview',$lang['TestsuiteOverview'],$lang['TestsuiteOverview'])."</li>\n";
+        $r .= "</ul>\n";
+        return $r;
+    }
 }
 
 /* ---------------------------------------------------------------------------
@@ -3307,6 +3337,20 @@
         return '<table border="0" cellpadding="0" cellspacing="0">'. $ret ."</table>\n";
     }
 
+    /**
+     * get the help index
+     */
+    static function getHelpIndex () {
+        global $lang;
+
+        $r = '';
+        $r .= '<h3>'. makelink('help.php?p=glossary#testrun',$lang['Testrun'],$lang['Testrun']) ."</h3><ul>\n";
+        $r .= ' <li>'. makelink('help.php?p=testrun_new',$lang['NewEntry'].'/'. $lang['Modify'],$lang['NewEntry'].'/'. $lang["Modify"]) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=testrun_show',$lang['show'],$lang['show']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=testrun_overview',$lang['TestrunOverview'],$lang['TestrunOverview'])."</li>\n";
+        $r .= "</ul>\n";
+        return $r;
+    }
 }
 
 /**

Modified: trunk/php/timetrack/timetrack.pinc
===================================================================
--- trunk/php/timetrack/timetrack.pinc	2012-12-23 19:16:23 UTC (rev 873)
+++ trunk/php/timetrack/timetrack.pinc	2012-12-23 19:34:53 UTC (rev 874)
@@ -1069,6 +1069,20 @@
         $res->free();
         return $r;
     }
+
+    /**
+     * get the help index
+     */
+    static function getHelpIndex () {
+        global $lang;
+
+        $r = '';
+        $r .= '<h3>'. makelink('help.php?p=glossary#timetrack',$lang['Timetrack'],$lang['Timetrack']) ."</h3><ul>\n";
+        $r .= ' <li>'. makelink('help.php?p=timetrack_new',$lang['NewEntry'].'/'. $lang['Modify'],$lang['NewEntry'].'/'. $lang['Modify']) ."</li>\n";
+        $r .= ' <li>'. makelink('help.php?p=timetrack_overview',$lang['TimetrackOverview'],$lang['TimetrackOverview'])."</li>\n";
+        $r .= "</ul>\n";
+        return $r;
+    }
 }
 $tutos['classes'][usetimetrack] = 'Timetrack';
 ?>
\ 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: 873
          http://sourceforge.net/p/tutos/code/873
Author:   gokohnert
Date:     2012-12-23 19:16:23 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
default help pages

Added Paths:
-----------
    trunk/php/expense/help/expense_new.html
    trunk/php/expense/help/expense_oerview.html
    trunk/php/expense/help/expense_select.html
    trunk/php/expense/help/expense_show.html
    trunk/php/scrum/help/log_new.html
    trunk/php/scrum/help/log_overview.html
    trunk/php/scrum/help/log_select.html
    trunk/php/scrum/help/log_show.html
    trunk/php/scrum/help/sprint_new.html
    trunk/php/scrum/help/sprint_overview.html
    trunk/php/scrum/help/sprint_select.html
    trunk/php/scrum/help/sprint_show.html
    trunk/php/timetrack/help/timetrack_new.html
    trunk/php/timetrack/help/timetrack_overview.html

Added: trunk/php/expense/help/expense_new.html
===================================================================
--- trunk/php/expense/help/expense_new.html	                        (rev 0)
+++ trunk/php/expense/help/expense_new.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/expense/help/expense_new.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/expense/help/expense_oerview.html
===================================================================
--- trunk/php/expense/help/expense_oerview.html	                        (rev 0)
+++ trunk/php/expense/help/expense_oerview.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/expense/help/expense_oerview.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/expense/help/expense_select.html
===================================================================
--- trunk/php/expense/help/expense_select.html	                        (rev 0)
+++ trunk/php/expense/help/expense_select.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/expense/help/expense_select.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/expense/help/expense_show.html
===================================================================
--- trunk/php/expense/help/expense_show.html	                        (rev 0)
+++ trunk/php/expense/help/expense_show.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/expense/help/expense_show.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/scrum/help/log_new.html
===================================================================
--- trunk/php/scrum/help/log_new.html	                        (rev 0)
+++ trunk/php/scrum/help/log_new.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/scrum/help/log_new.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/scrum/help/log_overview.html
===================================================================
--- trunk/php/scrum/help/log_overview.html	                        (rev 0)
+++ trunk/php/scrum/help/log_overview.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/scrum/help/log_overview.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/scrum/help/log_select.html
===================================================================
--- trunk/php/scrum/help/log_select.html	                        (rev 0)
+++ trunk/php/scrum/help/log_select.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/scrum/help/log_select.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/scrum/help/log_show.html
===================================================================
--- trunk/php/scrum/help/log_show.html	                        (rev 0)
+++ trunk/php/scrum/help/log_show.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/scrum/help/log_show.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/scrum/help/sprint_new.html
===================================================================
--- trunk/php/scrum/help/sprint_new.html	                        (rev 0)
+++ trunk/php/scrum/help/sprint_new.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/scrum/help/sprint_new.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/scrum/help/sprint_overview.html
===================================================================
--- trunk/php/scrum/help/sprint_overview.html	                        (rev 0)
+++ trunk/php/scrum/help/sprint_overview.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/scrum/help/sprint_overview.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/scrum/help/sprint_select.html
===================================================================
--- trunk/php/scrum/help/sprint_select.html	                        (rev 0)
+++ trunk/php/scrum/help/sprint_select.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/scrum/help/sprint_select.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/scrum/help/sprint_show.html
===================================================================
--- trunk/php/scrum/help/sprint_show.html	                        (rev 0)
+++ trunk/php/scrum/help/sprint_show.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/scrum/help/sprint_show.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/timetrack/help/timetrack_new.html
===================================================================
--- trunk/php/timetrack/help/timetrack_new.html	                        (rev 0)
+++ trunk/php/timetrack/help/timetrack_new.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/timetrack/help/timetrack_new.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: trunk/php/timetrack/help/timetrack_overview.html
===================================================================
--- trunk/php/timetrack/help/timetrack_overview.html	                        (rev 0)
+++ trunk/php/timetrack/help/timetrack_overview.html	2012-12-23 19:16:23 UTC (rev 873)
@@ -0,0 +1,35 @@
+<!--$Id: testcase_new.html 6 2011-02-12 22:10:44Z gokohnert $ --> 
+
+<h1><?php echo $lang["Err0048"] ?></h1>
+
+<p />
+Sorry this help page is still empty.
+<br />
+<a target="map" href="http://www.tutos.org">TUTOS</a> is a OpenSource Project. So we hope that someone will find the time to
+contribute some help files.
+
+<p />
+You may change the file here <b><?php echo $this->filename ?></b>.
+<p />
+If you like to contribute a help file please contact the developers at <a
+href="http://sourceforge.net/projects/tutos" rel="nofollow">http://sourceforge.net/projects/tutos">http://sourceforge.net/projects/tutos</a>
+
+
+<!--
+
+some hints for writing help files !
+
++ You may use PHP code in your helppage
++ You have access to the $lang array which will contain all text pieces 
+  used in TUTOS
++ all modules are loaded 
++ do not forget to link back to the glossary
++ the help engine is first looking for localized help files like this
+  some_help_en.html       (first try)
+  some_help_de-de.html
+  some_help_en-us.html
+  some_help.html          (last try)
+
+thanks for your interest.
+
+-->


Property changes on: trunk/php/timetrack/help/timetrack_overview.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 871
          http://sourceforge.net/p/tutos/code/871
Author:   gokohnert
Date:     2012-12-20 16:54:36 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
fix

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

Modified: trunk/php/address_overview.php
===================================================================
--- trunk/php/address_overview.php	2012-12-20 16:53:20 UTC (rev 870)
+++ trunk/php/address_overview.php	2012-12-20 16:54:36 UTC (rev 871)
@@ -27,7 +27,7 @@
 loadlayout();
 
 /**
- * show a overview of addresses
+ * show a overview of addrs$exesses
  */
 class Address_overview extends layout {
     /**
@@ -381,15 +381,15 @@
         } else {
             $name = "";
         }
-        if (isset($_GET['ext'])) {
-            $this->ext = $_GET['ext'];
+        if (isset($_REQUEST['ext'])) {
+            $this->ext = $_REQUEST['ext'];
             $this->link1 = addUrlParameter($this->link1,"ext=".$this->ext);
         } else {
             $this->ext = 2; // call from somewhere else
         }
-        if ($this->ext == 1 && isset($_GET['ext_f']) ) {
-            $ext_f = $_GET['ext_f'];
-            $this->addHidden("ext_f",$ext_f);
+        if ($this->ext == 1 && isset($_REQUEST['ext_f']) ) {
+            $ext_f = $_REQUEST['ext_f'];
+            $this->addHidden('ext_f',$ext_f);
         }
 
         $e['name'] = 0;
@@ -402,7 +402,7 @@
             $pre = " AND (";
             $aids = "0";
 
-            $_SESSION['adrsearch'] = $ext;
+            $_SESSION['adrsearch'] = $this->ext;
             $h1 = '';
             $h1pre = '';
             foreach ($s as $sn) {
@@ -530,7 +530,7 @@
             if ( 0 == $this->result->numrows()) {
                 $msg = '<br />'.$lang['Err0048'];
                 $this->redirect = 'address_select.php';
-                if (isset($_REQUEST['ext']) && ($_REQUEST['ext'] == 1) ) {
+                if ($this->ext > 0 ) {
                     $this->redirect = addUrlParameter($this->redirect,'ext=1',true);
                 }
                 $this->result->free();

Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc	2012-12-20 16:53:20 UTC (rev 870)
+++ trunk/php/bugtracking/bug.pinc	2012-12-20 16:54:36 UTC (rev 871)
@@ -369,6 +369,7 @@
         $this->followup   = -1; // duplicate
         $this->plist      = array();
         $this->short      = '';
+        $this->newrev     = '';
         $this->medium     = 1;
         $this->plandate   = new TUTOS_Date_Time(0);  // planned solve date
         $this->solvedate  = new TUTOS_Date_Time(0);  // real solvedate
@@ -996,7 +997,7 @@
         if (is_object($this->solver)) {
             $r = $this->solver->getShortName();
         } else if ($this->solver == -1)
-            $r = '<i>'.$lang['HistoryDeleted'].'</i>';
+            $r = $lang['HistoryDeleted'];
         else if (is_numeric($this->solver) && $this->solver < -10)
             $r = $lang['ProdRole'][-($this->solver+10)];
 

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

Revision: 870
          http://sourceforge.net/p/tutos/code/870
Author:   gokohnert
Date:     2012-12-20 16:53:20 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
fix wrong search

Modified Paths:
--------------
    trunk/php/note/note_overview.php
    trunk/php/note/note_select.php

Modified: trunk/php/note/note_overview.php
===================================================================
--- trunk/php/note/note_overview.php	2012-12-15 09:42:30 UTC (rev 869)
+++ trunk/php/note/note_overview.php	2012-12-20 16:53:20 UTC (rev 870)
@@ -100,9 +100,13 @@
 
             $r .= $this->OverviewRowStart($line,$b->getFullName());
             $r .= $this->OverviewRowBlock($b->creation->getDateTime(),'over_l');
+
             $x = $this->mark_filter(myentities($b->getFullName()),'name');
             $r .= $this->OverviewRowBlock(makelink($b->getUrl('ss='.$ss),$x),'over_l');
-            $r .= $this->OverviewRowBlock($b->ref->getLink(),'over_l');
+
+            $x = $this->mark_filter(myentities($b->ref->getFullName()),'link_id');
+            $r .= $this->OverviewRowBlock($b->ref->getLink($x),'over_l');
+
             $r .= $this->OverviewRowBlock($b->remember->getDateTime(),'over_l');
             $r .= $this->OverviewRowBlock(((!(is_numeric($b->creator) && $b->creator == -1)) ? $b->creator->getLink($b->creator->getShortname()):$lang['HistoryDeleted']),'over_l');
             $r .= show_custom_overview_data($this,'note',$b);
@@ -169,26 +173,35 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang,$table;
+        global $msg,$info,$lang,$table;
 
         $this->layout_id = usenotes;
-        $this->name = $lang['NotesOverview'];
+        $this->name      = $lang['NotesOverview'];
         $this->css_class = 'overviewbox';
+        $this->link1     = 'note/note_overview.php';
 
         if ( ! $this->user->feature_ok(usenotes,PERM_SEE) ) {
             $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'"));
             $this->stop = true;
         }
 
-        $this->link1 = 'note/note_overview.php';
+        if (isset($_GET['ext'])) {
+            $this->ext = $_GET['ext'];
+            $this->link1 = addUrlParameter($this->link1,"ext=".$this->ext);
+        } else {
+            $this->ext = 2; // call from somewhere else
+        }
+
         $this->filter = array();
+        $this->filter['name'] = '';
+        $this->filter['link_id'] = '';
         $this->header = '';
-        $this->hpre = '';
+        $this->hpre   = '';
 
-        $reftype = "";
-        $name = "";
-        $nsrn = "";
-        $nscr = "";
+        $reftype = '';
+        $name    = '';
+        $nsrn    = '';
+        $nscr    = '';
 
         if ( isset($_GET['reftype']) ) {
             $reftype = $_GET['reftype'];
@@ -202,19 +215,22 @@
         if ( isset($_GET['nscr']) ) {
             $nscr = $_GET['nscr'];
         }
+        if ($this->ext != 1) {
+            // no extended search
+            $reftype = 0;
+        }
 
-
         $j = 'SELECT DISTINCT n.* FROM '. $this->dbconn->prefix.$table['note'][name].' n';   // select + join
-        $q = "";
-        $pre = " WHERE ";
+        $q = '';
+        $pre = ' WHERE ';
 
         if ( ($name != "*") && ($name != "") ) {
-            $q .= " " . $pre ."(". $this->dbconn->Like("n.note",$name) ." OR ". $this->dbconn->Like("n.name",$name) .")";
-            $pre = " AND ";
+            $q .= $pre .'('. $this->dbconn->Like("n.note",$name) .' OR '. $this->dbconn->Like("n.name",$name) .')';
+            $pre = ' AND ';
             $this->link1 = addUrlParameter($this->link1,"name=".UrlEncode($name));
             $this->filter['name'] = $name;
-        } else {
-            $this->filter['name'] = "";
+            $this->header .= $this->hpre.$lang['Note'].'/'.$lang['NoteName'] .' = '.$name;
+            $this->hpre = '<br />';
         }
 
         if ( isset($_GET['id'])  ) {
@@ -222,74 +238,105 @@
                 $msg = addLine($msg,sprintf($lang['Err0012'],"id",$_GET['id']));
                 $this->stop = true;
             }
-            $q .= " ". $pre ." n.id = ".$_GET['id'];
-            $pre = " AND ";
+            $q .= $pre .'n.id = '.$_GET['id'];
+            $pre = ' AND ';
             $this->link1 = addUrlParameter($this->link1,"id=". $_GET['id']);
         }
 
         // References to display
-        if ( ($reftype > 0) || ($reftype > 0 && ($nsrn != "*") && ($nsrn != "")) )  {
-            if ( ! isset($nsrn) || ($nsrn == "*") ) {
-                $nsrn = "";
+        if ( $reftype > 0 ) {
+            $this->hpre = '<br />';
+
+            if ( ! isset($nsrn) || ($nsrn == '*') || ($nsrn == '') ) {
+                $nsrn = '';
+                $this->header .= $this->hpre.$lang['Reference'] .' = ';
+            } else {
+                $this->header .= $this->hpre.$lang['Reference'] .' ';
+                $this->filter['link_id'] = $nsrn;
             }
             if ( ($reftype == 1) || ($reftype == -1) ) {
-                $j .= ", ". $this->dbconn->prefix ."companies c ";
-                $q .= " ". $pre . "(n.link_id=c.id ";
-                if ( $nsrn != "" ) {
-                    $q .= " AND ". $this->dbconn->Like("c.name",$nsrn);
+                $this->header .= $lang['Company'];
+                $j .= ','. $this->dbconn->prefix .$table['company'][name].' c ';
+                $q .= $pre . '(n.link_id=c.id ';
+                if ( $nsrn != '' ) {
+                    $this->header .= ' = '. myentities($nsrn);
+                    $q .= ' AND '. $this->dbconn->Like('c.name',$nsrn);
                 }
-                $q .= ")";
-                $pre = " OR ";
+                $q .= ')';
+                $pre = ' OR ';
             }
             if ( ($reftype == 2) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."departments d ";
-                $q .= " ". $pre . "(n.link_id=d.id ";
-                if ( $nsrn != "" ) {
-                    $q .= " AND ". $this->dbconn->Like("d.name",$nsrn);
+                $this->header .= $lang['Department'];
+                $j .= ','. $this->dbconn->prefix .$table['department'][name].' d ';
+                $q .= $pre . '(n.link_id=d.id';
+                if ( $nsrn != '' ) {
+                    $this->header .= ' = '. myentities($nsrn);
+                    $q .= ' AND '. $this->dbconn->Like('d.name',$nsrn);
                 }
-                $q .= ")";
-                $pre = " OR ";
+                $q .= ')';
+                $pre = ' OR ';
             }
             if ( ($reftype == 3) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."addresses 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 n.link_id=a.id )";
-                $pre = " OR ";
+                $this->header .= $lang['Address'];
+                $j .= ','. $this->dbconn->prefix .$table['address'][name].' a ';
+                $q .= $pre .'(n.link_id=a.id';
+                if ( $nsrn != '' ) {
+                    $this->header .= ' = '. myentities($nsrn);
+                    $q .= ' AND (';
+                    $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) .')';
+                }
+                $pre = ' OR ';
             }
             if ( ($reftype == 4) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."bugs b";
-                $q .= " ". $pre . "(n.link_id=b.id ";
-                if ( $nsrn != "" ) {
-                    $q .= " AND ". $this->dbconn->Like("b.short",$nsrn);
+                $this->header .= $lang['Bug'];
+                $j .= ','. $this->dbconn->prefix .$table['bugtracking'][name].' b ';
+                $q .= $pre . '(n.link_id=b.id';
+                if ( $nsrn != '' ) {
+                    $this->header .= ' = '. myentities($nsrn);
+                    $q .= ' AND ('. $this->dbconn->Like('b.short',$nsrn);
+                    $q .= 'OR'.$this->dbconn->Like('b.name',$nsrn) .')';
                 }
-                $q .= ")";
-                $pre = " OR ";
+                $q .= ')';
+                $pre = ' OR ';
             }
             if ( ($reftype == 5) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."products p";
-                $q .= $pre ."( n.link_id=p.id ";
-                if ( $nsrn != "" ) {
-                    $q .= " AND (";
-                    $q .= $this->dbconn->Like("p.name",$nsrn) ." OR ";
-                    $q .= $this->dbconn->Like("p.version",$nsrn) .")";
+                $this->header .= $lang['ProductP'];
+                $j .= ','. $this->dbconn->prefix .$table['product'][name].' p ';
+                $q .= $pre .'(n.link_id=p.id';
+                if ( $nsrn != '' ) {
+                    $this->header .= ' = '. myentities($nsrn);
+                    $q .= ' AND ('.$this->dbconn->Like('p.name',$nsrn) .' OR ';
+                    $q .= $this->dbconn->Like('p.version',$nsrn) .')';
                 }
-                $q .= ")";
-                $pre = " OR ";
+                $q .= ')';
+                $pre = ' OR ';
             }
             if ( ($reftype == 6) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."teams t";
-                $q .= $pre . "(n.link_id=t.id AND ". $this->dbconn->Like("t.name",$nsrn) .")";
-                $pre = " OR ";
+                $this->header .= $lang['Team'];
+                $j .= ','.$this->dbconn->prefix .$table['team'][name].' t ';
+                $q .= $pre . '(n.link_id=t.id';
+                if ( $nsrn != '' ) {
+                    $this->header .= ' = '. myentities($nsrn);
+                    $q .= ' AND '. $this->dbconn->Like('t.name',$nsrn);
+                }
+                $q .= ')';
+                $pre = ' OR ';
             }
             if ( ($reftype == 7) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."tasks k";
-                $q .= $pre . "(n.link_id=k.id AND ". $this->dbconn->Like("k.name",$nsrn) .")";
-                $pre = " OR ";
+                $this->header .= $lang['Task'];
+                $j .= ','. $this->dbconn->prefix .'tasks k';
+                $q .= $pre . '(n.link_id=k.id';
+                if ( $nsrn != '' ) {
+                    $this->header .= ' = '. myentities($nsrn);
+                    $q .= ' AND '. $this->dbconn->Like("k.name",$nsrn);
+                }
+                $q .= ')';
+                $pre = ' OR ';
             }
             if ( ($reftype == 8) || ($reftype == -1) ) {
+                $this->header .= $lang['Installation'];
                 $j .= ",". $this->dbconn->prefix ."installations i";
                 if ( ! stristr($j, "products") ) {
                     $j .= ",". $this->dbconn->prefix ."products p";
@@ -331,14 +378,15 @@
             return;
         }
         $this->result = $this->dbconn->Exec($this->q);
+        //        $msg = addLine($msg,$this->q);
         if ( 0 == $this->result->numrows()) {
-            $this->redirect = "note_select.php?msg=". UrlEncode($lang['Err0048']);
+            $msg = addLine($msg,$lang['Err0048']);
+            $this->redirect = 'note_select.php';
             if (isset($_REQUEST['ext']) && ($_REQUEST['ext'] == 1) ) {
                 $this->redirect = addUrlParameter($this->redirect,'ext=1',true);
             }
             $this->result->free();
         }
-
         // menu
         $x = note::getSelectLink($this->user,$lang['Search']);
         $x[category][] = 'obj';

Modified: trunk/php/note/note_select.php
===================================================================
--- trunk/php/note/note_select.php	2012-12-15 09:42:30 UTC (rev 869)
+++ trunk/php/note/note_select.php	2012-12-20 16:53:20 UTC (rev 870)
@@ -34,9 +34,6 @@
         $this->width = 3;
         $r = '';
         $r .= "<form id=\"notesearch\" name=\"notesearch\" method=\"get\" action=\"note_overview.php\">\n";
-        if ( $this->ext == false ) {
-            $this->addHidden("reftype",0);
-        }
         $r .= $this->SelectTableStart();
         $this->addHidden('ext',$this->ext);
         $r .= $this->headline($lang['SearchForNote']);
@@ -56,8 +53,10 @@
             $(\".ext\").toggle();
             if ( $(\"#h_ext\").val() == 0 ) {
               $(\"#h_ext\").val(1);
+              $(\"#h_reftype\").val(1);
             } else {
               $(\"#h_ext\").val(0);
+              $(\"#h_reftype\").val(0);
             }
             return;
         });

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

Revision: 869
          http://sourceforge.net/p/tutos/code/869
Author:   gokohnert
Date:     2012-12-15 09:42:30 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
fix wrong result on specific search

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

Modified: trunk/php/address_overview.php
===================================================================
--- trunk/php/address_overview.php	2012-12-14 15:25:17 UTC (rev 868)
+++ trunk/php/address_overview.php	2012-12-15 09:42:30 UTC (rev 869)
@@ -470,8 +470,11 @@
                 // $msg .= $q.'<br>';
                 $n = $result->numrows();
                 $a = 0;
+                $aids = '-1';
+                $apre = ',';
                 while ( $a < $n ) {
-                    $aids .= ' ,' . $result->get($a,"adr_id");
+                    $aids .= $apre . $result->get($a,"adr_id");
+                    $apre = ',';
                     $a++;
                 }
             }
@@ -519,10 +522,10 @@
             return;
         }
 
-# TODO      $q = $this->dbconn->getRange($q,30,10);
+        // TODO      $q = $this->dbconn->getRange($q,30,10);
 
         $this->result = $this->dbconn->Exec($q);
-        #        $msg .= $q.'<br>';
+        //        $msg .= $q.'<br>';
         if ( ($this->format != 'xml') && ($this->format != 'csv') ) {
             if ( 0 == $this->result->numrows()) {
                 $msg = '<br />'.$lang['Err0048'];

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

Revision: 868
          http://sourceforge.net/p/tutos/code/868
Author:   gokohnert
Date:     2012-12-14 15:25:17 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
work correct on cli

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

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2012-12-14 15:14:11 UTC (rev 867)
+++ trunk/php/webelements.p3	2012-12-14 15:25:17 UTC (rev 868)
@@ -770,6 +770,10 @@
 Function getBaseURL($useconfig = false) {
     global $tutos;
 
+    if (!isset($_SERVER['SERVER_NAME'])) {
+        // if run on CLI we use always config
+        $useconfig = true;
+    }
     if ($useconfig && isset($tutos[baseurl][$_SESSION['dbnr']])) {
         // the given variable must include the tutos part of the url
         $d = explode('/',dirname($_SERVER['SCRIPT_NAME']));
@@ -834,8 +838,7 @@
 }
 
 /**
- * format a value for use with csv files  from
- * "http://de2.php.net/manual/en/function.fputcsv.php#87120"
+ * format a value for use with csv files
  * output is always converted to target_enc encoding
  */
 function txt2csv ($val,$delimiter = '',$enclosure = '') {
@@ -935,7 +938,7 @@
     $text = myentities($text);
     $text = preg_replace('#&lt;([BIU])&gt;#im'  ,'<$1>',$text);
     $text = preg_replace('#&lt;/([BIU])&gt;#im' ,'</$1>',$text);
-    //    $text = preg_replace('#&quot;#m' ,'"',$text);
+
     if ($ureplace)
         $text = urlReplace($text,0);
     if ($ireplace)

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

Revision: 867
          http://sourceforge.net/p/tutos/code/867
Author:   gokohnert
Date:     2012-12-14 15:14:11 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
fix

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

Modified: trunk/html/new2_layout.css
===================================================================
--- trunk/html/new2_layout.css	2012-12-13 17:13:40 UTC (rev 866)
+++ trunk/html/new2_layout.css	2012-12-14 15:14:11 UTC (rev 867)
@@ -81,9 +81,12 @@
     border-collapse: collapse;
 }
 
+#maintable {
+   height: 100%;
+}
+
 #maintable,#headtable {
    width: 100%;
-   height: 100%;
    border: 0px solid;
    padding: 0px;
    margin: 0px;

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