tutos-commits Mailing List for TUTOS (Page 4)

Revision: 1266
          http://sourceforge.net/p/tutos/code/1266
Author:   gokohnert
Date:     2014-05-09 20:01:17 +0000 (Fri, 09 May 2014)
Log Message:
-----------
fake missinig function 

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

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2014-05-09 20:00:36 UTC (rev 1265)
+++ trunk/php/webelements.p3	2014-05-09 20:01:17 UTC (rev 1266)
@@ -877,7 +877,7 @@
             $r = 'https://'.$r;
         } elseif(isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] == 80) ) {
             $r = 'http://'.$r;
-        } elseif(isset($tutos[baseurl][$_SESSION['dbnr']])) {
+        } elseif(isset($_SESSION['dbnr']) && isset($tutos[baseurl][$_SESSION['dbnr']])) {
             if (preg_match('#^https:#',$tutos[baseurl][$_SESSION['dbnr']])) {
                 $r = 'https://'.$r;
             } else {
@@ -2461,9 +2461,13 @@
     $graph->title->SetFont($font,FS_BOLD,12);
 
     $graph->legend->SetFont($font,FS_NORMAL,9);
-
     if( function_exists('imageantialias') ) {
         $graph->img->SetAntiAliasing();
+    } else {
+        // fake it
+        function imageantialias($a,$b) {
+            return false;
+        }
     }
     return $font;
 }

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

Revision: 1265
          http://sourceforge.net/p/tutos/code/1265
Author:   gokohnert
Date:     2014-05-09 20:00:36 +0000 (Fri, 09 May 2014)
Log Message:
-----------
keep seleted rows in massupdate

Modified Paths:
--------------
    trunk/html/js/tutos.js
    trunk/php/layout/layout_base.pinc

Modified: trunk/html/js/tutos.js
===================================================================
--- trunk/html/js/tutos.js	2014-05-09 20:00:08 UTC (rev 1264)
+++ trunk/html/js/tutos.js	2014-05-09 20:00:36 UTC (rev 1265)
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2005 - 2011 by Gero Kohnert
+ *  Copyright 2005 - 2014 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -25,6 +25,7 @@
   * code will add form elements when click into an area 
  */
 $(document).ready(function(){
+$('.m_field:checked').closest('tr').toggleClass("line_selected");
 $('.editable').click(function(event) {
   var t = $(this).html();
   var id = this.id;

Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc	2014-05-09 20:00:08 UTC (rev 1264)
+++ trunk/php/layout/layout_base.pinc	2014-05-09 20:00:36 UTC (rev 1265)
@@ -649,11 +649,15 @@
         if ( $tutos[massupdate] == 1 ) {
             $r .= ' <td class="upd_field" align="center"'.($rs > 1 ? ' rowspan="'.$rs.'"':'') .">\n";
             if ( method_exists($obj,"mod_ok") && $obj->mod_ok() ) {
+                $r .= '<input class="m_field" name="mark[]" type="checkbox"';
                 if ( $obj->getType() == "user" ) {
-                    $r .= '<input class="m_field" name="mark[]" type="checkbox" value="'. $obj->uid ."\" />\n";
+                    $r .= (in_array($obj->uid,$_GET['mark']) ? ' checked="checked"':'');
+                    $r .= ' value="'.$obj->uid.'"';
                 } else {
-                    $r .= '<input class="m_field" name="mark[]" type="checkbox" value="'. $obj->id ."\" />\n";
+                    $r .= (in_array($obj->id,$_GET['mark']) ? ' checked="checked"':'');
+                    $r .= ' value="'.$obj->id.'"';
                 }
+                $r .= " />\n";
             } else {
                 $r .= "-\n";
                 //$r .= makelink('acl_show.php?id='. $obj->id ,'-',$lang['ACLsee'],acl_popup($obj));

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

Revision: 1264
          http://sourceforge.net/p/tutos/code/1264
Author:   gokohnert
Date:     2014-05-09 20:00:08 +0000 (Fri, 09 May 2014)
Log Message:
-----------
massupdate of bug assignee

Modified Paths:
--------------
    trunk/php/bugtracking/bug_new.php
    trunk/php/bugtracking/bug_overview.php

Modified: trunk/php/bugtracking/bug_new.php
===================================================================
--- trunk/php/bugtracking/bug_new.php	2014-05-02 11:12:01 UTC (rev 1263)
+++ trunk/php/bugtracking/bug_new.php	2014-05-09 20:00:08 UTC (rev 1264)
@@ -113,7 +113,11 @@
             if (is_object($this->obj->solver))
                 $d .= select_from_array_or_input($this->obj,"s",$this->obj->solver,1,'atT');
             else {
-                $x = array($this->obj->solver,$lang['ProdRole'][-($this->obj->solver+10)]);
+                if (isset($lang['ProdRole'][-($this->obj->solver+10)])) {
+                    $x = array($this->obj->solver,$lang['ProdRole'][-($this->obj->solver+10)]);
+                } else {
+                    $x = $this->obj->solver;
+                }
                 $d .= select_from_array_or_input($this->obj,"s",$x,1,'atT');
             }
         } else {
@@ -401,4 +405,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php	2014-05-02 11:12:01 UTC (rev 1263)
+++ trunk/php/bugtracking/bug_overview.php	2014-05-09 20:00:08 UTC (rev 1264)
@@ -507,7 +507,7 @@
         if ( $tutos[massupdate] == 1 ) {
             $r .= $this->UpdateRowStart($this->flds-2);
             $r .= sprintf($lang['withmarked'],$lang['Bugs']);
-            $r .= "&#160;<select name=\"action\">\n";
+            $r .= "&#160;<select id=\"action\" name=\"action\">\n";
             $r .= " <option value=\"-1\" selected=\"selected\">". $lang['ActionNil'] ."</option>\n";
             if ( $tutos['bug_delete'] == 1 ) {
                 $r .= " <option value=\"-2\">". $lang['Delete'] ."</option>\n";
@@ -523,13 +523,26 @@
                 if ($f->stc_state == STC_NOT_EXISTANT) continue;
                 $r .= " <option value=\"S". $f->stc_state .'" style="background:'.$f->color.';">'. sprintf($lang['SetTo'],$lang['BugState'],$f->getFullName()) ."</option>\n";
             }
+            $r .= ' <option value="V">'. sprintf($lang['SetTo'],'"'.$lang['BugAssignedTo'].'"','...') ."</option>\n";
             $r .= get_custom_massupdate_options($this,'bugtracking');
             $r .= " <option value=\"-4\">". $lang['AclModify'] ."</option>\n";
             if (class_exists('watchlist')) {
                 $r .= watchlist::action_options();
             }
             $r .= "</select>\n";
+            $r .= select_from_array_or_input($this,"V",null,1,'atT');
             $r .= $this->UpdateRowEnd(2);
+
+            $tutos['pagescript'] .= "
+$('#V').hide();
+$('#action').change(function() {
+  if(this.value == 'V') {
+    $('#V').show();
+  } else {
+    $('#V').hide();
+  }
+});
+";
         }
         $r .= $this->OverviewFootEnd();
         $r .= $this->OverviewTableEnd();
@@ -908,7 +921,46 @@
             $this->stc = new stc(null);
             $this->stc->initByArray('BugStates',Bug::$c_state);
         }
-
+        if ($_GET['action'] == "V") {
+            if ( isset($_GET['Vid']) ) {
+                $vid = ltrim($_GET['Vid'],'T');
+                if ($vid > 0) {
+                    $solver = getObject($dbconn,$vid);
+                } else {
+                    $solver = $vid;
+                }
+            } else if ( !isset($_GET['Vfn']) || ($_GET['Vfn'] == '') ) {
+                $info = addLine($info,'No Solver');
+                return;
+            } else if ( isset($_GET['Vfn']) ) {
+                $solver = check_field($_GET['Vfn'],"Vfn","Vl",'atT');
+            }
+            if ($solver == 0) {
+                return;
+            }
+            $this->dbconn->Begin("WORK");
+            foreach ($_GET['mark'] as $val) {
+                $b = new bug($this->dbconn);
+                $b = $b->read($val,$b);
+                if (!is_object($b) || ($b->id != $val) ) {
+                    continue;
+                }
+                if ($b->mod_ok()) {
+                    $old = $b->getSolver();
+                    $b->setSolver($solver);
+                    if ($b->getSolver() != $old) {
+                        $info = addLine($info,$b->getFullName().': '.$lang['BugAssignedTo'].' -> '.$b->getSolver());
+                        $b->newdesc = $lang['BugAssignedTo'].' '.$old .' -> '.$b->getSolver();
+                        $b->save();
+                    }
+                } else {
+                    $msg = addLine($msg,$b->getLink() .': '. sprintf($lang['Err0024'],$lang[$b->getType()]));
+                }
+                unset($b);
+            }
+            $this->dbconn->Commit("WORK");
+            return;
+        }
         if ( $_GET['action'] == -2 ) {
             $this->dbconn->Begin("WORK");
             foreach ($_GET['mark'] as $val) {

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

Revision: 1263
          http://sourceforge.net/p/tutos/code/1263
Author:   gokohnert
Date:     2014-05-02 11:12:01 +0000 (Fri, 02 May 2014)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/bugtracking/mconfig.pinc
    trunk/php/mail.pinc
    trunk/php/product.pinc

Modified: trunk/php/bugtracking/mconfig.pinc
===================================================================
--- trunk/php/bugtracking/mconfig.pinc	2014-05-02 11:11:06 UTC (rev 1262)
+++ trunk/php/bugtracking/mconfig.pinc	2014-05-02 11:12:01 UTC (rev 1263)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2003 - 2013 by Gero Kohnert
+ * Copyright 2003 - 2014 by Gero Kohnert
  *
  * Module specific configuration
  *
@@ -8,10 +8,10 @@
  *  $Author$
  */
 $tutos['files'][__FILE__] = '$Rev$';
-#
-# Every module must have an individual ID ( < 0 > -100 ).
-# this is module 3
-#
+//
+// Every module must have an individual ID ( < 0 > -100 ).
+// this is module 3
+//
 define('usebugtracking',-3);
 $tutos[modules]['bugtracking'] = array(
     name => "Bug",
@@ -21,7 +21,7 @@
     'configurl' => "bugtracking/bug_config.php",
     'perm' => usebugtracking
     );
-# internal
+// internal
 define('usebughist',-3001);
 $tutos[modules]['bughist'] = array(
     name => "bugdata",
@@ -31,15 +31,15 @@
     'perm' => usebughist
     );
 $tutos[usebughist] = 1;
-#
-# globally enable this module
-#
+//
+// globally enable this module
+//
 if (!isset($tutos[usebugtracking]))
     $tutos[usebugtracking] = 1;
-#
-# List of objects/modules where we do something with this module
-# and need to include this module
-#
+//
+// List of objects/modules where we do something with this module
+// and need to include this module
+//
 $tutos[modulesinc]['bugtracking'][] = 'mytutos';
 $tutos[modulesinc]['bugtracking'][] = 'product';
 $tutos[modulesinc]['bugtracking'][] = 'installation';
@@ -50,7 +50,7 @@
 $tutos[modulesinc]['bugtracking'][] = 'stuff';
 
 
-# and those modules we want to use
+// and those modules we want to use
 $tutos[modulesinc]['timetrack'][] = 'bugtracking';
 $tutos[modulesinc]['note'][]      = 'bugtracking';
 $tutos[modulesinc]['file'][]      = 'bugtracking';
@@ -62,10 +62,10 @@
 
 $tutos['docowners'][] = 'Bug'; // classname
 
-#
-# modify those values using bug_config
-# here are only defaults
-#
+//
+// modify those values using bug_config
+// here are only defaults
+//
 $tutos['bug_long_pop']      = 0;
 $tutos['bug_remember']      = 0;
 $tutos['bug_delete']        = 1;
@@ -78,9 +78,9 @@
 $tutos['bug_closed_states'] = '3,4';
 $tutos['bug_finish_state']  = 4;
 $tutos['bug_warn_states']   = '1';
-# Mailling list for "new" bugs
+// Mailling list for "new" bugs
 $tutos['bugnew_prod_mail']  = '1,3';
 $tutos['bugmod_prod_mail']  = '';
 $tutos['bug_no_mail']       = 0;
 $tutos['bug_state_age']     = 0;
-?>
+?>
\ No newline at end of file

Modified: trunk/php/mail.pinc
===================================================================
--- trunk/php/mail.pinc	2014-05-02 11:11:06 UTC (rev 1262)
+++ trunk/php/mail.pinc	2014-05-02 11:12:01 UTC (rev 1263)
@@ -1546,7 +1546,7 @@
                 return $msg . $errno ." ". $errstr;
             }
 
-            stream_set_timeout($this->fd, 0,250000);
+            stream_set_timeout($this->fd, 0,500000);
             $this->readsmtp($msg,220); // Read the Greetings
 
             $this->error_log('smtp mode: '.$tutos['mailmode']);
@@ -1617,7 +1617,7 @@
             usleep(1000);  // helps in some cases see bug 2709852
             $this->writechannel($this->eoln.".");
             $this->readsmtp($msg,250);
-            usleep(1000);  // helps in some cases see bug 2709852
+            usleep(1500);  // helps in some cases see bug 2709852
             $this->writechannel("quit");
             $this->readsmtp($msg,221);
             fclose ($this->fd);
@@ -1671,7 +1671,7 @@
             } else if ( preg_match("#^250 #",$line ) ) {
                 if ($key == 250) return true;
                 continue;
-            } else if ( preg_match("#^250#",$line ) ) {
+            } else if ( preg_match("#^25#",$line ) ) {
                 // other 250 line
                 continue;
             } else if ( preg_match("#^354 #",$line ) ) {

Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc	2014-05-02 11:11:06 UTC (rev 1262)
+++ trunk/php/product.pinc	2014-05-02 11:12:01 UTC (rev 1263)
@@ -1110,8 +1110,9 @@
         loadmodules($this->getType(),'show');
 
         //        error_log('product->getTreeStructure:'.$key.' '.$this.print_r($tutos[activemodules],true)."\n",3,$tutos[errlog]);
+
         $this->readroles();
-        $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getHtmlIcon(),'link').'"}\' id="'.$this->id.'Ä'.$key.'Ä'.$this->gettype().'">'.$this->getFullName();
+        $r = '<li data-jstree=\'{"selected":true,"opened":true,"icon":"'.$ly->theme->getImage($this->getHtmlIcon(),'link').'"}\' id="'.$this->id.'Ä'.$key.'Ä'.$this->gettype().'">'.$this->getFullName();
 
         $rr = '';
         foreach (array(10,11,12,13) as $x) {

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

Revision: 1262
          http://sourceforge.net/p/tutos/code/1262
Author:   gokohnert
Date:     2014-05-02 11:11:06 +0000 (Fri, 02 May 2014)
Log Message:
-----------
allow syslog logging

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

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2014-05-02 11:09:40 UTC (rev 1261)
+++ trunk/php/config_default.pinc	2014-05-02 11:11:06 UTC (rev 1262)
@@ -139,8 +139,11 @@
 // TUTOS will create some files that are named like /tmp/debug.out and /tmp/debug.out.log
 // You have to remove old versions of these files by your own !
 //
-$tutos[errlog] =  'tutos_private/log/debug.out';
+$tutos[errlog]   =  'tutos_private/log/debug.out';
 //
+// use syslog (true) or not (false)
+$tutos['syslog'] = false;
+//
 // Logo for the headline
 // (Change this to your company logo or whatever you like)
 // Height will be resized to 40 pixels !
@@ -738,4 +741,4 @@
 ### mode:iso-accents ***
 ### coding:utf-8 ***
 ### End: ***
-?>
\ No newline at end of file
+?>

Modified: trunk/php/permission.p3
===================================================================
--- trunk/php/permission.p3	2014-05-02 11:09:40 UTC (rev 1261)
+++ trunk/php/permission.p3	2014-05-02 11:11:06 UTC (rev 1262)
@@ -561,6 +561,9 @@
             if ($r[1] != '') {
                 dterror_log($r[1]."\n", 3, $tutos[errlog]);
             }
+            if ($tutos['syslog']) {
+                syslog(LOG_WARNING, "TUTOS ".$r[0]." ".$r[1]." ".$_SERVER['REMOTE_ADDR']."  (".$_SERVER['HTTP_USER_AGENT'].")");
+            }
             $auth[0]->login_form($_SERVER['SCRIPT_NAME'],$auth,$r[1]);
         }
 
@@ -571,6 +574,9 @@
         $info = addline($info,sprintf($lang['Welcome_2'],$current_user->last_seen->getDateTime(),$current_user->last_host));
 
         logmessage("check_user: Logged in ". $current_user->id .":". $current_user->login .":". $current_user->getFullname().' ('.$a->loginMethod().')');
+        if ($tutos['syslog']) {
+            syslog(LOG_WARNING, "TUTOS login ".$current_user->login." ".$_SERVER['REMOTE_ADDR']."  (".$_SERVER['HTTP_USER_AGENT'].")");
+        }
         $initial_auth = true;
 
         // store session id

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

Revision: 1261
          http://sourceforge.net/p/tutos/code/1261
Author:   gokohnert
Date:     2014-05-02 11:09:40 +0000 (Fri, 02 May 2014)
Log Message:
-----------
lowercase method type

Modified Paths:
--------------
    trunk/php/acl_new.php
    trunk/php/address_select.php
    trunk/php/admin/crontab_maker.php

Modified: trunk/php/acl_new.php
===================================================================
--- trunk/php/acl_new.php	2014-05-02 11:07:57 UTC (rev 1260)
+++ trunk/php/acl_new.php	2014-05-02 11:09:40 UTC (rev 1261)
@@ -332,7 +332,7 @@
         // sort the stuff
         uksort ($this->user->parties,array('acl_new','acl_sort'));
 
-        $r .= '<form action="'.$l.'" method="GET">';
+        $r .= '<form action="'.$l.'" method="get">';
         $r .= $lang['Feature'].':<select name="feature">';
         uasort($tutos[activemodules],array('Acl_new','menusort'));
         $r .= '<option value="0"'.(0 == $this->feature ? ' selected="selected"':'').'>---</option>';

Modified: trunk/php/address_select.php
===================================================================
--- trunk/php/address_select.php	2014-05-02 11:07:57 UTC (rev 1260)
+++ trunk/php/address_select.php	2014-05-02 11:09:40 UTC (rev 1261)
@@ -32,7 +32,7 @@
 
         $this->width = 3;
         $r = '';
-        $r .= "<form id=\"adrsearch1\" name=\"adrsearch1\" method=\"GET\" action=\"address_overview.php\">\n";
+        $r .= '<form id="adrsearch1" name="adrsearch1" method="get" action="address_overview.php">'."\n";
         $r .= $this->SelectTableStart();
         $this->addHidden('ext',$this->ext);
         $r .= $this->headline($lang['SearchForAdr']);

Modified: trunk/php/admin/crontab_maker.php
===================================================================
--- trunk/php/admin/crontab_maker.php	2014-05-02 11:07:57 UTC (rev 1260)
+++ trunk/php/admin/crontab_maker.php	2014-05-02 11:09:40 UTC (rev 1261)
@@ -71,7 +71,7 @@
         }
         $cmd .= ' 2>&1';
 
-        $r .= '<form method="POST">';
+        $r .= '<form method="post">';
         $r .= $this->DataTableStart();
         $r .= "<tr>\n";
         $r .= " <th colspan=\"4\">Crontab</th>\n";

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

Revision: 1260
          http://sourceforge.net/p/tutos/code/1260
Author:   gokohnert
Date:     2014-05-02 11:07:57 +0000 (Fri, 02 May 2014)
Log Message:
-----------
keep original args

Modified Paths:
--------------
    trunk/php/file/file_ins.php
    trunk/php/file/file_new.php
    trunk/php/webelements.p3

Modified: trunk/php/file/file_ins.php
===================================================================
--- trunk/php/file/file_ins.php	2014-05-02 11:07:08 UTC (rev 1259)
+++ trunk/php/file/file_ins.php	2014-05-02 11:07:57 UTC (rev 1260)
@@ -101,6 +101,7 @@
     // Versioning System could only be set at first save
     if ( isset($_REQUEST['vsys']) ) {
         $f->vsys = $_REQUEST['vsys'];
+        $gotourl = addUrlParameter($gotourl,"vsys=". UrlEncode($_REQUEST['vsys']),true);
     }
 }
 

Modified: trunk/php/file/file_new.php
===================================================================
--- trunk/php/file/file_new.php	2014-05-02 11:07:08 UTC (rev 1259)
+++ trunk/php/file/file_new.php	2014-05-02 11:07:57 UTC (rev 1260)
@@ -269,6 +269,9 @@
                 $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()]));
                 $this->stop = true;
             }
+            if (isset($_GET['vsys']) && is_numeric($_GET['vsys']) ) {
+                $this->obj->vsys = $_GET['vsys'];
+            }
         }
 
         preset_from_array_or_input($this->obj,'file3','file3');
@@ -340,4 +343,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2014-05-02 11:07:08 UTC (rev 1259)
+++ trunk/php/webelements.p3	2014-05-02 11:07:57 UTC (rev 1260)
@@ -3204,7 +3204,7 @@
         $x = $_REQUEST[$arg];
         $q = ''; // the search part of the query
         $expanded = array();
-        $header = ' = ';
+        $header = '';
 
         // some modes require expand of args
         if (is_numeric($x) && ($mode != null) && is_array($mode) && in_array(usedepartment,$mode)) {
@@ -3226,14 +3226,14 @@
             }
         }
 
-        if (substr($x,0,1) == "T") {
+        if (is_string($x) && substr($x,0,1) == "T") {
             // subteam selection happend
             $q = ' = ';
             $header = ' = ';
             $q .= substr($x,1);
             $header .= $lang['ProdRole'][(-1* (substr($x,1)))-10];
             $show = false;
-        } elseif (substr($x,0,2) == "-T") {
+        } elseif (is_string($x) && substr($x,0,2) == "-T") {
             // negated subteam selection happend
             $q = ' != ';
             $header = ' &#8800; ';
@@ -3272,9 +3272,10 @@
                     }
                     if ($not) $header .= '</span>';
                     $hcnt++;
+                    $hpre = ' , ';
+                    $obj->link1 = addUrlParameter($obj->link1,$arg.'='.$i);
+                    $obj->addHidden($arg.'',$i);
                 }
-                $obj->link1 = addUrlParameter($obj->link1,$arg.'[]='.$i);
-                $obj->addHidden($arg.'[]',$i);
             }
             if ($q1 != '') {
                 $q = $q1.')';
@@ -3284,6 +3285,7 @@
             }
             if ($hcnt > 1)
                 $header = '('.$header.')';
+            $header = ' = '.$header;
             $show = true;
         } else {
             $show = false;

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

Revision: 1259
          http://sourceforge.net/p/tutos/code/1259
Author:   gokohnert
Date:     2014-05-02 11:07:08 +0000 (Fri, 02 May 2014)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/index.htm
    trunk/index.html

Modified: trunk/index.htm
===================================================================
--- trunk/index.htm	2014-04-04 18:41:42 UTC (rev 1258)
+++ trunk/index.htm	2014-05-02 11:07:08 UTC (rev 1259)
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "" rel="nofollow">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
-<!-- Copyright 1999 - 2011 by Gero Kohnert gok...@us... et al -->
+<!-- Copyright 1999 - 2014 by Gero Kohnert gok...@us... et al -->
 <!-- all rights reserved -->
 <!--$Id$ --> 
 <!-- Redirect to the tutos page -->
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>TUTOS -- Redirect</title>
-  <meta http-equiv="refresh" content="0;URL=php/mytutos.php">
+  <meta http-equiv="refresh" content="0;URL=php/mytutos.php" />
  </head>
 </html>

Modified: trunk/index.html
===================================================================
--- trunk/index.html	2014-04-04 18:41:42 UTC (rev 1258)
+++ trunk/index.html	2014-05-02 11:07:08 UTC (rev 1259)
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "" rel="nofollow">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
-<!-- Copyright 1999 - 2013 by Gero Kohnert gok...@us... et al -->
+<!-- Copyright 1999 - 2014 by Gero Kohnert gok...@us... et al -->
 <!-- all rights reserved -->
 <!--$Id: index.htm 6 2011-02-12 22:10:44Z gokohnert $ --> 
 <!-- Redirect to the tutos page -->
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>TUTOS -- Redirect</title>
-  <meta http-equiv="refresh" content="0;URL=php/mytutos.php">
+  <meta http-equiv="refresh" content="0;URL=php/mytutos.php" />
  </head>
 </html>

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

Want to lose any weight? go here  http://christopherdell.co.uk/tapofi/ 

 		 	   		  

Revision: 1258
          http://sourceforge.net/p/tutos/code/1258
Author:   gokohnert
Date:     2014-04-04 18:41:42 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
fix

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

Modified: trunk/php/mailbox/mailbox.pinc
===================================================================
--- trunk/php/mailbox/mailbox.pinc	2014-04-04 15:38:18 UTC (rev 1257)
+++ trunk/php/mailbox/mailbox.pinc	2014-04-04 18:41:42 UTC (rev 1258)
@@ -390,58 +390,29 @@
      * get the list of available folders
      */
     function getfolders () {
-        $this->folders = array();
         $this->allfolders = array();
 
+        // below of the orgiginal path
         $f = false;
-        $c = $this->getConnString();
-        #    $this->folders = imap_listmailbox ($x, $c, "%");
-        #    $this->folders = imap_listmailbox ($x, "", $c."/%");
-        if ($this->mbox != "") {
-            if ( $this->path != "" ) {
-                $f = imap_getmailboxes ($this->mbox, "", $c."/%");
-            } else {
-                $f = imap_getmailboxes ($this->mbox, $c, "%");
-            }
-        }
-        $this->errors("imap_getmailboxes");
-        if ($f == false) {
-            $this->errors();
+        $c = $this->getConnString2();
+        if ( $this->orgpath != "" ) {
+            $f = imap_getmailboxes ($this->mbox, $c, "*");
         } else {
-            reset($f);
-            while (list ($key, $val) = @each($f)) {
-                #     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";
-                #        $nx = eregi_replace("&ANY-","\xD6",$n);
-                #        $nx = eregi_replace("&APY-","\xF6",$nx);
-                #        $nx = eregi_replace("&AOQ-","\xE4",$nx);
-                #        $nx = eregi_replace("&-","&",$nx);
-                $this->folders[$n] = imap_utf7_decode($n) ;
-            }
+            $f = imap_getmailboxes ($this->mbox, $c, "*");
         }
-
-        $f = false;
-        $c = $this->getConnString2();
-        if ($this->mbox != "") {
-            if ( $this->orgpath != "" ) {
-                $f = imap_getmailboxes ($this->mbox, "", $c."/%");
-            } else {
-                $f = imap_getmailboxes ($this->mbox, $c, "%");
-            }
-        }
         $this->errors("imap_getmailboxes");
         if ($f == false) {
             $this->errors();
         } else {
-            reset($f);
-            while (list ($key, $val) = @each($f)) {
+            foreach($f as $val) {
                 $n = substr($val->name,strlen($c),strlen($val->name));
-                #        $nx = eregi_replace("&ANY-","\xD6",$n);
-                #        $nx = eregi_replace("&APY-","\xF6",$nx);
-                #        $nx = eregi_replace("&AOQ-","\xE4",$nx);
-                #        $nx = eregi_replace("&-","&",$nx);
-                $this->allfolders[$n] = imap_utf7_decode($n);
+                if ($val->attributes & LATT_NOSELECT) continue;
+                //                echo $val->name.'<br>';
+                $nn = imap_utf7_decode($n);
+                if ($nn === false) {
+                    $nn = $n;
+                }
+                $this->allfolders[$n] = $n;
             }
         }
     }

Modified: trunk/php/mailbox/mailbox_new.php
===================================================================
--- trunk/php/mailbox/mailbox_new.php	2014-04-04 15:38:18 UTC (rev 1257)
+++ trunk/php/mailbox/mailbox_new.php	2014-04-04 18:41:42 UTC (rev 1258)
@@ -84,24 +84,6 @@
 
         $r .= "</tr>\n";
 
-        if ($this->obj->id != -1) {
-            /**
-               $this->obj->open();
-               $this->obj->getfolders();
-               $this->obj->close();
-               $r .= "<tr><td>\n";
-               $r .= $lang['MailSentItems'];
-               $r .= "</td><td>\n";
-               $r .= "<select name=\"sentItems\">\n";
-               @ksort($this->obj->allfolders);
-               foreach($this->obj->allfolders as $key => $val) {
-               $r .= "<option value=\"". $key ."\"". ($this->obj->sentItems == $key ? ' selected="selected"':'') .">+". myentities($val) ."</option>\n";
-               }
-               $r .= "</select>\n";
-               $r .= "</td></tr>\n";
-            **/
-        }
-
         $r .= "<tr>\n";
         $r .= $this->showfieldc($lang['MailboxUser'],1,"user");
         $r .= " <td>\n";
@@ -205,4 +187,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

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

Revision: 1257
          http://sourceforge.net/p/tutos/code/1257
Author:   gokohnert
Date:     2014-04-04 15:38:18 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
less columns on big calendars

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

Modified: trunk/php/calendar_day.php
===================================================================
--- trunk/php/calendar_day.php	2014-04-04 15:36:49 UTC (rev 1256)
+++ trunk/php/calendar_day.php	2014-04-04 15:38:18 UTC (rev 1257)
@@ -203,14 +203,12 @@
         $r .= "</th></tr>\n";
         for ($i = -1 ; $i <24 ; $i++ ) {
             $r .= " <tr>\n";
-
             $r .= ' <th width="10%" align="right" valign="top"';
             if ( $i == -1 ) {
                 if (count($table[$i]) > $maxcol) {
                     $r .= ' rowspan="'.ceil(count($table[-1])/$maxcol).'"';
                 }
                 $r .=  '>'.menulink('app_new.php?t='.$this->t, "NOTIME",$lang['NewAppointInfo']);
-                $r .= ' '.$i.' '.$maxcol;
                 $r .= "&#160;</th>\n";
                 $cnt = 1;
                 for ($c = 0 ; $c < count($table[-1]) ; $c++ ) {

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

Revision: 1256
          http://sourceforge.net/p/tutos/code/1256
Author:   gokohnert
Date:     2014-04-04 15:36:49 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
less columns on big calendars

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

Modified: trunk/php/calendar_day.php
===================================================================
--- trunk/php/calendar_day.php	2014-04-04 15:32:04 UTC (rev 1255)
+++ trunk/php/calendar_day.php	2014-04-04 15:36:49 UTC (rev 1256)
@@ -216,9 +216,9 @@
                 for ($c = 0 ; $c < count($table[-1]) ; $c++ ) {
                     if ( is_object ( $table[$i][$c] ) ) {
                         $r .= " <td class=\"line". (1+($i % 2)) ."\" valign=\"top\" rowspan=\"". $rowspan[$i][$c]."\">";
-                        $r .= "&#160;<center><table class=\"line". (1+($i % 2)) ."\" width=\"90%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n";
+                        $r .= "<ul>\n";
                         $r .= $table[$i][$c]->formatted($this);
-                        $r .= " </table></center></td>\n";
+                        $r .= " </ul></td>\n";
                     }
                     if ($cnt == $maxcol) {
                         $r .= '</tr><tr>';

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

Revision: 1255
          http://sourceforge.net/p/tutos/code/1255
Author:   gokohnert
Date:     2014-04-04 15:32:04 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
less columns on big calendars

Modified Paths:
--------------
    trunk/html/default.css
    trunk/php/calendar_day.php

Modified: trunk/html/default.css
===================================================================
--- trunk/html/default.css	2014-04-01 18:01:11 UTC (rev 1254)
+++ trunk/html/default.css	2014-04-04 15:32:04 UTC (rev 1255)
@@ -15,6 +15,14 @@
  *
  */
 
+TD .topborder {
+    border-top: 1px solid grey;
+}
+TD .sideborder {
+    border-left: 1px solid grey;
+    border-right: 1px solid grey;
+}
+
 *, *:before, *:after {
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;

Modified: trunk/php/calendar_day.php
===================================================================
--- trunk/php/calendar_day.php	2014-04-01 18:01:11 UTC (rev 1254)
+++ trunk/php/calendar_day.php	2014-04-04 15:32:04 UTC (rev 1255)
@@ -164,9 +164,12 @@
             }
         }
         $maxcol = 1;
-        for ($i = -1 ; $i < 24 ; $i++ ) {
+        for ($i = 0 ; $i < 24 ; $i++ ) {
             $maxcol = max($maxcol,count($table[$i]));
         }
+        if ($maxcol < count($table[-1])) {
+            $maxcol = min(max(4,$maxcol),count($table[-1]));
+        }
 
         $navurl = 'calendar_day.php';
         $navurl2 = 'calendar_week.php';
@@ -201,29 +204,56 @@
         for ($i = -1 ; $i <24 ; $i++ ) {
             $r .= " <tr>\n";
 
-            $r .= " <th width=\"10%\" align=\"right\" valign=\"top\">\n";
+            $r .= ' <th width="10%" align="right" valign="top"';
             if ( $i == -1 ) {
-                $r .=  menulink('app_new.php?t='.$this->t, "NOTIME",$lang['NewAppointInfo']);
-            } else {
-                $r .=  menulink('app_new.php?start='. $this->t.sprintf("%02d",$i)."00&amp;end=".$this->t.sprintf("%02d",$i)."59" ,sprintf("%02d", $i).":00",$lang['NewAppointInfo']);
-            }
-            $r .= "&#160;</th>\n";
-
-            for ($c = 0 ; $c < $maxcol ; $c++ ) {
-                if ( isset ( $table[$i][$c] ) ) {
+                if (count($table[$i]) > $maxcol) {
+                    $r .= ' rowspan="'.ceil(count($table[-1])/$maxcol).'"';
+                }
+                $r .=  '>'.menulink('app_new.php?t='.$this->t, "NOTIME",$lang['NewAppointInfo']);
+                $r .= ' '.$i.' '.$maxcol;
+                $r .= "&#160;</th>\n";
+                $cnt = 1;
+                for ($c = 0 ; $c < count($table[-1]) ; $c++ ) {
                     if ( is_object ( $table[$i][$c] ) ) {
                         $r .= " <td class=\"line". (1+($i % 2)) ."\" valign=\"top\" rowspan=\"". $rowspan[$i][$c]."\">";
-                        $r .= "<img height=\"1\" width=\"100%\" src=\"". $tutos['base'] ."/html/black.png\" alt=\"--------\" /><br />";
                         $r .= "&#160;<center><table class=\"line". (1+($i % 2)) ."\" width=\"90%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n";
                         $r .= $table[$i][$c]->formatted($this);
                         $r .= " </table></center></td>\n";
-                    } else if ( $table[$i][$c] = -1 ) {
-                        // SKIP occupied by rowspan
                     }
-                } else {
-                    $r .= "<td class=\"line". (1+($i % 2)) ."\" valign=\"top\"><img height=\"1\" width=\"100%\" src=\"". $tutos['base'] ."/html/black.png\" alt=\"--------\" /></td>";
+                    if ($cnt == $maxcol) {
+                        $r .= '</tr><tr>';
+                        $cnt = 0;
+                    }
+                    $cnt++;
                 }
+                while ($cnt <= $maxcol) {
+                    // fill the line
+                    $r .= "<td class=\"line". (1+($i % 2)) ."\" valign=\"top\"></td>";
+                    $cnt++;
+                }
+            } else {
+                $r .=  '>'.menulink('app_new.php?start='. $this->t.sprintf("%02d",$i)."00&amp;end=".$this->t.sprintf("%02d",$i)."59" ,sprintf("%02d", $i).":00",$lang['NewAppointInfo']);
+                $r .= "&#160;</th>\n";
+                for ($c = 0 ; $c < $maxcol ; $c++ ) {
+                    if ( isset ( $table[$i][$c] ) ) {
+                        if ( is_object ( $table[$i][$c] ) ) {
+                            if ($rowspan[$i][$c] > 1) {
+                                $r .= ' <td class="sideborder topborder line'. (1+($i % 2)) .'" valign="top" rowspan="'. $rowspan[$i][$c].'">';
+                            } else {
+                                $r .= ' <td class="topborder line'. (1+($i % 2)) .'" valign="top">';
+                            }
+                            $r .= "<ol>\n";
+                            $r .= $table[$i][$c]->formatted($this);
+                            $r .= " </ul></td>\n";
+                        } else if ( $table[$i][$c] = -1 ) {
+                            // SKIP occupied by rowspan
+                        }
+                    } else {
+                        $r .= '<td class="topborder line'. (1+($i % 2)) .'" valign="top"></td>'."\n";
+                    }
+                }
             }
+
             $r .= " </tr>\n";
         }
         $r .= $this->DataTableEnd();

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

Revision: 1254
          http://sourceforge.net/p/tutos/code/1254
Author:   gokohnert
Date:     2014-04-01 18:01:11 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
fix

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

Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php	2014-03-06 20:28:12 UTC (rev 1253)
+++ trunk/php/product_overview.php	2014-04-01 18:01:11 UTC (rev 1254)
@@ -151,12 +151,12 @@
                 $this->flds++;
             }
             if ( ($c == 'price') && $this->pshow[$c] ) {
-                $r .= $this->orderHeader('currency,price',$lang['ProdPrice'],$this->link2);
+                $r .= $this->orderHeader('price',$lang['ProdPrice'],$this->link2);
                 $this->flds++;
                 $pf = $this->flds;
             }
             if ( ($c == 'cost') && $this->pshow[$c] ) {
-                $r .= $this->orderHeader('currency,cost',$lang['ProdCost'],$this->link2);
+                $r .= $this->orderHeader('cost',$lang['ProdCost'],$this->link2);
                 $this->flds++;
                 $cf = $this->flds;
             }

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

Revision: 1253
          http://sourceforge.net/p/tutos/code/1253
Author:   gokohnert
Date:     2014-03-06 20:28:12 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
better crontab 

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

Modified: trunk/php/admin/crontab_maker.php
===================================================================
--- trunk/php/admin/crontab_maker.php	2014-03-06 20:18:10 UTC (rev 1252)
+++ trunk/php/admin/crontab_maker.php	2014-03-06 20:28:12 UTC (rev 1253)
@@ -91,15 +91,6 @@
             $rt = '';
             $x = array();
             @exec('crontab -l',$x,$rt);
-            if ($rt != 0) {
-                $r .= '<div class="message">Sorry ! Unable to run crontab on your system.('.$rt.')<br />';
-                foreach ($x as $l) {
-                    $r .= $l."<br />";
-                }
-                $r .= '</div>';
-                //           $r .= $this->DataTableEnd();
-                //           return $r;
-            }
         } else {
             $r .= '<div class="message">Sorry ! Unable to find crontab on your system.<br />';
             $r .= $this->DataTableEnd();

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

Revision: 1252
          http://sourceforge.net/p/tutos/code/1252
Author:   gokohnert
Date:     2014-03-06 20:18:10 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
typo 

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

Modified: trunk/php/admin/crontab_maker.php
===================================================================
--- trunk/php/admin/crontab_maker.php	2014-03-06 20:15:35 UTC (rev 1251)
+++ trunk/php/admin/crontab_maker.php	2014-03-06 20:18:10 UTC (rev 1252)
@@ -86,7 +86,7 @@
         $r .= '</tr>';
 
 
-        $c = $this->check_cmd('Xcrontab');
+        $c = $this->check_cmd('crontab');
         if ($c != '') {
             $rt = '';
             $x = array();

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

Revision: 1251
          http://sourceforge.net/p/tutos/code/1251
Author:   gokohnert
Date:     2014-03-06 20:15:35 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
updated login layout

Modified Paths:
--------------
    trunk/html/default.css
    trunk/html/motd_default.html

Modified: trunk/html/default.css
===================================================================
--- trunk/html/default.css	2014-03-06 20:14:29 UTC (rev 1250)
+++ trunk/html/default.css	2014-03-06 20:15:35 UTC (rev 1251)
@@ -196,7 +196,7 @@
     background-repeat: no-repeat;
     background-position: center;
     font-family: monospace;
-    min-height: 280px;
+    height: 300px;
     min-width: 370px;
     white-space: pre;
 }

Modified: trunk/html/motd_default.html
===================================================================
--- trunk/html/motd_default.html	2014-03-06 20:14:29 UTC (rev 1250)
+++ trunk/html/motd_default.html	2014-03-06 20:15:35 UTC (rev 1251)
@@ -1,6 +1,4 @@
-<!-- $Id$ -->
-<!-- This will be read inside of <PRE> </PRE> -->
-<h1>Congratulations</h1>
+<!-- $Id$ --><!-- This will be read inside of <PRE> </PRE> --><h1>Congratulations</h1>
 you have managed to install <a href="http://www.tutos.org" target="home">TUTOS</a>.
 
 This is the <u>default</u> message of today.
@@ -19,5 +17,4 @@
 
 See <a href="http://wiki.tutos.org" target="doku">TUTOS wiki</a> for uptodate documentation.
 
-<a href="http://validator.w3.org/check?uri=referer"><img border="0" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-<!-- EOF -->
+<a href="http://validator.w3.org/check?uri=referer"><img border="0" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a><!-- EOF -->

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

Revision: 1250
          http://sourceforge.net/p/tutos/code/1250
Author:   gokohnert
Date:     2014-03-06 20:14:29 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
better crontab 

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

Modified: trunk/php/admin/crontab_maker.php
===================================================================
--- trunk/php/admin/crontab_maker.php	2014-02-24 08:04:18 UTC (rev 1249)
+++ trunk/php/admin/crontab_maker.php	2014-03-06 20:14:29 UTC (rev 1250)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2009 - 2013 by Gero Kohnert
+ *  Copyright 2009 - 2014 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -46,23 +46,29 @@
         global $tutos,$msg,$info;
 
         $r = '';
+        $url = normalize_url(getBaseUrl(true).'../check.php?dbnr='.$_SESSION['dbnr']);
 
-        if ($cmd = $this->check_cmd('php')) {
-            $c = $cmd;
-            $cmd = '*/5 * * * * cd '.dirname(dirname($_SERVER['SCRIPT_FILENAME']));
+        $cmd = "*/5 * * * * \t";
+        if ($c = $this->check_cmd('php')) {
+            $cmd .= 'cd '.dirname(dirname($_SERVER['SCRIPT_FILENAME']));
             $cmd .= '; '.$c .' check.php -dbnr '.$_SESSION['dbnr'];
-        } elseif($cmd = $this->check_cmd('lynx')) {
-            $cmd = '*/5 * * * * '.$cmd;
-            $cmd .= ' -accept_all_cookies -dump '.getBaseUrl(true).'check.php?dbnr='.$_SESSION['dbnr'];
-        } elseif($cmd = $this->check_cmd('wget')) {
-            $cmd = '*/5 * * * * '.$cmd;
-            $cmd .= ' -T 10 -O /dev/null --no-check-certificate '.getBaseUrl(true).'check.php?dbnr='.$_SESSION['dbnr'];
+        } elseif($c = $this->check_cmd('lynx')) {
+            $cmd .= $c;
+            $cmd .= ' -accept_all_cookies -dump '.$url;
+        } elseif($c = $this->check_cmd('wget')) {
+            $cmd .= $c;
+            $cmd .= ' -T 10 -O /dev/null --no-check-certificate '.$url;
         } else {
-            $r = '<div class="message">No suitable programm found (php/lynx/wget)</div>';
+            $r = '<div class="message">No suitable programm to trigger a tutos call was found (php/lynx/wget)</div>';
             return $r;
         }
 
-        $cmd .= ' >> '.normalize_url(dirname($_SERVER['SCRIPT_FILENAME']).'/'.$tutos[errlog]);
+        $cmd .= ' >> ';
+        if (preg_match('#^/#',$tutos[errlog])) {
+            $cmd .= normalize_url($tutos[errlog]);
+        } else {
+            $cmd .= normalize_url(dirname($_SERVER['SCRIPT_FILENAME']).'/'.$tutos[errlog]);
+        }
         $cmd .= ' 2>&1';
 
         $r .= '<form method="POST">';
@@ -73,26 +79,33 @@
 
         $r .= '<tr>';
         $r .= '<td colspan="4">';
-        $r .= 'In order to enable cyclic (every 5 minutes) checks you should add the following line to your crontab.<br />';
-        $r .= '<b>'.$cmd.'</b>';
+        $r .= '<p>Before you run the check script for the first time you should do this manually as the first run might take more than 5 minutes.<br/>Just call this url: <a href="'.$url.'" target="_blank">'.$url.'</a> (opens a new window; a relogin to TUTOS might be forced afterwards)<p />';
+        $r .= '<p>In order to enable cyclic (every 5 minutes) checks you should add the following line to your crontab.<br />';
+        $r .= '<b><pre>'.$cmd.'</pre></b></p>';
         $r .= '</td>';
         $r .= '</tr>';
 
 
-        $rt = '';
-        $x = array();
-        @exec('crontab -l',$x,$rt);
-        /**
-           if ($rt != 0) {
-           $r .= '<div class="message">Sorry ! Unable to find/run crontab on your system.('.$rt.')<br />';
-           foreach ($x as $l) {
-           $r .= $l."<br />";
-           }
-           $r .= '</div>';
-           $r .= $this->DataTableEnd();
-           return $r;
-           }
-        */
+        $c = $this->check_cmd('Xcrontab');
+        if ($c != '') {
+            $rt = '';
+            $x = array();
+            @exec('crontab -l',$x,$rt);
+            if ($rt != 0) {
+                $r .= '<div class="message">Sorry ! Unable to run crontab on your system.('.$rt.')<br />';
+                foreach ($x as $l) {
+                    $r .= $l."<br />";
+                }
+                $r .= '</div>';
+                //           $r .= $this->DataTableEnd();
+                //           return $r;
+            }
+        } else {
+            $r .= '<div class="message">Sorry ! Unable to find crontab on your system.<br />';
+            $r .= $this->DataTableEnd();
+            return $r;
+        }
+
         $orig = '';
         $found = false;
         foreach ($x as $l) {
@@ -108,10 +121,14 @@
             $orig .= "#\n";
             $orig .= "# Call TUTOS check script every 5 minutes \n";
             $orig .= "# (automatically added on ".Date("d.M.Y H:i:s T").")\n";
+            $orig .= "#\n";
+            $orig .= "# send possible mails to:\n";
+            $orig .= "MAILTO=".getenv('APACHE_RUN_USER'). "\n";
+            $orig .= "#\n";
             $orig .= $cmd."\n";
+            $orig .= "#\n";
         }
 
-
         $r .= "<tr><td colspan=\"4\">\n";
         $r .= '<textarea rows="20" cols="'.(10+strlen($cmd)).'" name="crontab">';
         $r .= $orig;
@@ -155,12 +172,12 @@
             $x = '';
             @exec('crontab '.$tmpname,$x,$rt);
             if ($rt != 0) {
-                $msg .= $this->error('could not run crontab with  '.$tmpname);
+                $msg = addLine($msg,'could not run crontab with '.$tmpname);
                 $this->stop = true;
                 return;
             }
             foreach ($x as $l) {
-                $info .= $l.'<br />';
+                $info = addLIne($info,$l);
             }
             unlink($tmpname);
         }

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

Revision: 1249
          http://sourceforge.net/p/tutos/code/1249
Author:   gokohnert
Date:     2014-02-24 08:04:18 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
tree display fix; appointment insertion remembers visitor/product on fail

Modified Paths:
--------------
    trunk/php/app_ins.php
    trunk/php/product.pinc
    trunk/php/task.pinc

Modified: trunk/php/app_ins.php
===================================================================
--- trunk/php/app_ins.php	2014-02-23 17:01:41 UTC (rev 1248)
+++ trunk/php/app_ins.php	2014-02-24 08:04:18 UTC (rev 1249)
@@ -198,6 +198,7 @@
         $gotourl = addBadField($gotourl,'v',true);
 } else {
     if ( isset($_POST['vid']) && !empty($_POST['vid']) ) {
+        $gotourl= addUrlParameter($gotourl,"vid=".$_POST['vid'],true);
         if ( $_POST['vid'] != -1 ) {
             $v = getObject($dbconn,$_POST['vid']);
         }
@@ -218,6 +219,7 @@
         $gotourl = addBadField($gotourl,'p',true);
 } else {
     if ( isset($_POST['pid']) && !empty($_POST['pid']) ) {
+        $gotourl= addUrlParameter($gotourl,"pid=".$_POST['pid'],true);
         if ( $_POST['pid'] != -1 ) {
             $p = getObject($dbconn,$_POST['pid']);
         }

Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc	2014-02-23 17:01:41 UTC (rev 1248)
+++ trunk/php/product.pinc	2014-02-24 08:04:18 UTC (rev 1249)
@@ -1008,7 +1008,7 @@
         $x = preg_split('#,#',$tutos['prod_activ_states']);
         if (!in_array($this->state,$x)) {
             $r .= $ly->showfield($lang['ProdProb']);
-            $r .= $ly->showdata($this->obj->probability ."%",1);
+            $r .= $ly->showdata($this->probability ."%",1);
         } else {
             $r .= $ly->showdata(' ',2);
         }
@@ -1116,7 +1116,7 @@
         $rr = '';
         foreach (array(10,11,12,13) as $x) {
             if ( isset($this->role[$x] ) && is_array($this->role[$x]) && count($this->role[$x]) ) {
-                $rr .= '  <li id="'.$this->id.'X'.$key.'XR'.$x.'">'.$lang['ProdRole'][$x]."\n";
+                $rr .= '  <li id="'.$this->id.'Ä'.$key.'Ä'.$this->gettype().'ÄR'.$x.'">'.$lang['ProdRole'][$x]."\n";
                 $rr .= '   <ul>'."\n";
                 foreach($this->role[$x] as $i => $o) {
                     $rr .= '   <li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getHtmlIcon(),'link').'"}\' class="jstree-closed" id="'.$i.'Ä'.uniqid().'Ä'.$o->gettype().'">'.$o->getFullName().'</li>'."\n";

Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc	2014-02-23 17:01:41 UTC (rev 1248)
+++ trunk/php/task.pinc	2014-02-24 08:04:18 UTC (rev 1249)
@@ -2311,7 +2311,7 @@
 
         if ($rr != '') {
             if ($obj->gettype() != 'task') {
-                $r .= ' <li id="'.$obj->id.'Ä'.self::getType().'Ä'.$obj->gettype().'">'.$lang[self::getType()]."\n";
+                $r .= ' <li id="'.$obj->id.'Ä'.self::getType().'Ä'.$obj->gettype().'ÄT">'.$lang[self::getType()]."\n";
                 $r .= '  <ul>'."\n";
             }
             $r .= $rr;

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

Revision: 1248
          http://sourceforge.net/p/tutos/code/1248
Author:   gokohnert
Date:     2014-02-23 17:01:41 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
preload modules for tree display

Modified Paths:
--------------
    trunk/php/product.pinc
    trunk/php/task.pinc
    trunk/php/tree.php
    trunk/php/treedata.php

Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc	2014-02-23 16:35:24 UTC (rev 1247)
+++ trunk/php/product.pinc	2014-02-23 17:01:41 UTC (rev 1248)
@@ -1111,7 +1111,7 @@
 
         //        error_log('product->getTreeStructure:'.$key.' '.$this.print_r($tutos[activemodules],true)."\n",3,$tutos[errlog]);
         $this->readroles();
-        $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getHtmlIcon(),'link').'"}\' id="'.$this->id.'X'.$key.'">'.$this->getFullName();
+        $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getHtmlIcon(),'link').'"}\' id="'.$this->id.'Ä'.$key.'Ä'.$this->gettype().'">'.$this->getFullName();
 
         $rr = '';
         foreach (array(10,11,12,13) as $x) {
@@ -1119,7 +1119,7 @@
                 $rr .= '  <li id="'.$this->id.'X'.$key.'XR'.$x.'">'.$lang['ProdRole'][$x]."\n";
                 $rr .= '   <ul>'."\n";
                 foreach($this->role[$x] as $i => $o) {
-                    $rr .= '   <li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getHtmlIcon(),'link').'"}\' class="jstree-closed" id="'.$i.'X'.uniqid().'">'.$o->getFullName().'</li>'."\n";
+                    $rr .= '   <li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getHtmlIcon(),'link').'"}\' class="jstree-closed" id="'.$i.'Ä'.uniqid().'Ä'.$o->gettype().'">'.$o->getFullName().'</li>'."\n";
                 }
                 $rr .= '   </ul>'."\n";
                 $rr .= '  </li>'."\n";

Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc	2014-02-23 16:35:24 UTC (rev 1247)
+++ trunk/php/task.pinc	2014-02-23 17:01:41 UTC (rev 1248)
@@ -1556,7 +1556,7 @@
                     $d .= $pre.$lang['HistoryDeleted'];
                 $pre = "<br />\n";
             }
-            $r .= $ly->showdata($d,$la->width -1);
+            $r .= $ly->showdata($d,$ly->width -1);
             $r .= $ly->ContentRowEnd();
         }
 
@@ -1639,7 +1639,7 @@
 
         // error_log('task->getTreeStructure:'.$key.' '.$this.print_r($tutos[activemodules],true)."\n",3,$tutos[errlog]);
 
-        $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getIcon(),'link').'"}\' id="'.$this->id.'X'.$key.'">';
+        $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getIcon(),'link').'"}\' id="'.$this->id.'Ä'.$key.'Ä'.$this->gettype().'">';
         $r .= $this->getFullName();
         $rr = '';
         // Tasks
@@ -2306,13 +2306,12 @@
 
 
         foreach($obj->tasklist as $o) {
-            dterror_log(print_r($ly->theme->getImage($o->getIcon(),'link'),true)."\n", 3, $tutos[errlog]);
-            $rr .= '   <li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getIcon(),'link').'"}\' class="jstree-closed" id="'.$o->id.'X'.uniqid().'">'.$o->getFullName().'</li>'."\n";
+            $rr .= '   <li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getIcon(),'link').'"}\' class="jstree-closed" id="'.$o->id.'Ä'.uniqid().'Ä'.$o->gettype().'">'.$o->getFullName().'</li>'."\n";
         }
 
         if ($rr != '') {
             if ($obj->gettype() != 'task') {
-                $r .= ' <li id="'.$obj->id.'X'.self::getType().'">'.$lang[self::getType()]."\n";
+                $r .= ' <li id="'.$obj->id.'Ä'.self::getType().'Ä'.$obj->gettype().'">'.$lang[self::getType()]."\n";
                 $r .= '  <ul>'."\n";
             }
             $r .= $rr;

Modified: trunk/php/tree.php
===================================================================
--- trunk/php/tree.php	2014-02-23 16:35:24 UTC (rev 1247)
+++ trunk/php/tree.php	2014-02-23 17:01:41 UTC (rev 1248)
@@ -68,7 +68,7 @@
         $r = '';
         $r .= '<tr><td><div id="jstree_demo_div">
 <ul>
-<li class="jstree-closed" id="'.$this->obj->id.'X0">'.$this->obj->getFullName().'</li>
+<li class="jstree-closed" id="'.$this->obj->id.'Ä0Ä'.$this->obj->gettype().'">'.$this->obj->getFullName().'</li>
 </ul>
 </div></td></tr>';
         return $r;

Modified: trunk/php/treedata.php
===================================================================
--- trunk/php/treedata.php	2014-02-23 16:35:24 UTC (rev 1247)
+++ trunk/php/treedata.php	2014-02-23 17:01:41 UTC (rev 1248)
@@ -36,18 +36,19 @@
 Header('Content-Type: text/html;charset='. $lang['content_encoding']);
 Header("Connection: close");
 
-$req = explode('X',$_REQUEST['id']);
+$req = explode('Ä',$_REQUEST['id']);
 $id  = $req[0];
 $key = 0;
 if ($id == '#') {
     $id = $_REQUEST['xid'];
 }
-
+if (isset($req[2])) {
+    loadmodules($req[2],'show');
+}
 $obj = getObject($dbconn,$id);
 if (!is_Object($obj)) {
     return;
 }
-loadmodules($obj->getType(),'show');
 $ly = new tree_show($current_user);
 $ly->obj = $obj;
 

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

Revision: 1247
          http://sourceforge.net/p/tutos/code/1247
Author:   gokohnert
Date:     2014-02-23 16:35:24 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
fix

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

Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc	2014-02-23 09:53:26 UTC (rev 1246)
+++ trunk/php/task.pinc	2014-02-23 16:35:24 UTC (rev 1247)
@@ -1514,7 +1514,7 @@
         if ($this->milestone > 0) {
             $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['TaskMilestone']);
-            $r .= $ly->showdata($lang['yes'],$this->width -1);
+            $r .= $ly->showdata($lang['yes'],$ly->width -1);
             $r .= $ly->ContentRowEnd();
         }
 
@@ -1522,7 +1522,7 @@
         if ($this->nogantt > 0) {
             $r .= $ly->ContentRowStart();
             $r .= $ly->showfield($lang['TaskNoGantt']);
-            $r .= $ly->showdata($lang['yes'],$this->width -1);
+            $r .= $ly->showdata($lang['yes'],$ly->width -1);
             $r .= $ly->ContentRowEnd();
         }
 

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

Revision: 1246
          http://sourceforge.net/p/tutos/code/1246
Author:   gokohnert
Date:     2014-02-23 09:53:26 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
mark milestone in tree

Modified Paths:
--------------
    trunk/php/acl.pinc
    trunk/php/layout/theme_base.pinc
    trunk/php/task.pinc
    trunk/php/team_ins.php

Added Paths:
-----------
    trunk/html/flag_yellow.png

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

Index: trunk/html/flag_yellow.png
===================================================================
--- trunk/html/flag_yellow.png	2014-02-23 08:48:35 UTC (rev 1245)
+++ trunk/html/flag_yellow.png	2014-02-23 09:53:26 UTC (rev 1246)

Property changes on: trunk/html/flag_yellow.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: trunk/php/acl.pinc
===================================================================
--- trunk/php/acl.pinc	2014-02-23 08:48:35 UTC (rev 1245)
+++ trunk/php/acl.pinc	2014-02-23 09:53:26 UTC (rev 1246)
@@ -588,7 +588,7 @@
 /**
  * parse the permissions form provided by the function permission_form
  */
-function parse_permission_form(tutos_base &$obj) {
+function parse_permission_form(tutos_base $obj) {
     global $tutos,$gotourl,$permskip,$current_user;
 
     $msg = '';

Modified: trunk/php/layout/theme_base.pinc
===================================================================
--- trunk/php/layout/theme_base.pinc	2014-02-23 08:48:35 UTC (rev 1245)
+++ trunk/php/layout/theme_base.pinc	2014-02-23 09:53:26 UTC (rev 1246)
@@ -158,7 +158,6 @@
         $this->i[find]            = $this->findImage('find');
         $this->i[edit]            = $this->findImage('pencil');
         $this->i[mail]            = $this->findImage('email');
-        //        $this->i[tree]            = $this->findImage('arrow_branch');
         $this->i[tree]            = $this->findImage('tree_icon');
 
         $this->a[up]           = "UP";

Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc	2014-02-23 08:48:35 UTC (rev 1245)
+++ trunk/php/task.pinc	2014-02-23 09:53:26 UTC (rev 1246)
@@ -1638,8 +1638,9 @@
         loadmodules($this->getType(),'show');
 
         // error_log('task->getTreeStructure:'.$key.' '.$this.print_r($tutos[activemodules],true)."\n",3,$tutos[errlog]);
-        $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getHtmlIcon(),'link').'"}\' id="'.$this->id.'X'.$key.'">'.$this->getFullName();
 
+        $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getIcon(),'link').'"}\' id="'.$this->id.'X'.$key.'">';
+        $r .= $this->getFullName();
         $rr = '';
         // Tasks
         $rr .= task::obj_getTree($ly,$this);
@@ -2208,6 +2209,16 @@
     }
 
     /**
+     * get name of icons dpendend on type and state
+     */
+    function getIcon () {
+        if ($this->milestone == 1) {
+            return 'flag_yellow';
+        }
+        return 'task';
+    }
+
+    /**
      * get name of icons
      */
     static function getHtmlIcon () {
@@ -2286,7 +2297,7 @@
      * the referenced obj asked for an tree
      */
     static function obj_getTree (layout_base $ly,tutos_base $obj) {
-        global $lang;
+        global $lang,$tutos;
 
         task::obj_read($obj);
 
@@ -2295,7 +2306,8 @@
 
 
         foreach($obj->tasklist as $o) {
-            $rr .= '   <li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getHtmlIcon(),'link').'"}\' class="jstree-closed" id="'.$o->id.'X'.uniqid().'">'.$o->getFullName().'</li>'."\n";
+            dterror_log(print_r($ly->theme->getImage($o->getIcon(),'link'),true)."\n", 3, $tutos[errlog]);
+            $rr .= '   <li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getIcon(),'link').'"}\' class="jstree-closed" id="'.$o->id.'X'.uniqid().'">'.$o->getFullName().'</li>'."\n";
         }
 
         if ($rr != '') {
@@ -2529,7 +2541,7 @@
                 break;
             }
             if (!$f->see_ok()) continue;
-            $d .= $user->layout->theme->getImage(task,'list') .' ';
+            $d .= $user->layout->theme->getImage($f->getIcon(),'list') .' ';
             if ($f->milestone == 1) {
                 $d .= $lang['TaskMilestone'].' ';
             }
@@ -2700,8 +2712,8 @@
             return $r;
         }
         #        echo $n.' '.$q.' '.count($tasklist);
-        # TODO !
-            $r .= info_table_start();
+        // TODO !
+        $r .= info_table_start();
         $r .= " <tr>\n";
         $m = task::getSelectLink($current_user,$lang['Tasks']);
         if ($m) {

Modified: trunk/php/team_ins.php
===================================================================
--- trunk/php/team_ins.php	2014-02-23 08:48:35 UTC (rev 1245)
+++ trunk/php/team_ins.php	2014-02-23 09:53:26 UTC (rev 1246)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2012 by Gero Kohnert
+ *  Copyright 1999 - 2014 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -66,7 +66,7 @@
 
 if ( $msg == "" ) {
     if ( ($t->id  == -1) || ($name != $t->name) ) {
-        $q = "SELECT * FROM ". $dbconn->prefix ."teams WHERE ". $dbconn->Like2 ("name",$name);
+        $q = "SELECT * FROM ". $dbconn->prefix .$table['team'][name].' WHERE '. $dbconn->Like2 ("name",$name);
         $r = $dbconn->Exec($q);
         $n = $r->numrows();
         if ( 0 != $n) {

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

Revision: 1245
          http://sourceforge.net/p/tutos/code/1245
Author:   gokohnert
Date:     2014-02-23 08:48:35 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
bugfix

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

Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc	2014-02-22 20:35:56 UTC (rev 1244)
+++ trunk/php/team.pinc	2014-02-23 08:48:35 UTC (rev 1245)
@@ -564,7 +564,7 @@
      * feature permissions have an ID < 0
      */
     function save_permissions() {
-        global $table;
+        global $table,$tutos;
 
         $msg = '';
         $q = 'DELETE FROM '. $this->dbconn->prefix.$table['acl'][name].' where obj_id < 0 AND adr_id = '. $this->id;
@@ -575,6 +575,7 @@
         $pre = '';
         foreach ($this->p as $i => $f) {
             $q .= $pre .'('. $i .','. $this->id .','. $f .')';
+            $pre = ',';
         }
         if ($pre !=  '') {
             $r = $this->dbconn->Exec($q);

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

Revision: 1244
          http://sourceforge.net/p/tutos/code/1244
Author:   gokohnert
Date:     2014-02-22 20:35:56 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
added icons to tree

Modified Paths:
--------------
    trunk/html/copyright.html
    trunk/php/address_show.php
    trunk/php/address_tools.p3
    trunk/php/appointment.pinc
    trunk/php/base.pinc
    trunk/php/layout/theme_base.pinc
    trunk/php/location.pinc
    trunk/php/mail.pinc
    trunk/php/module_base.pinc
    trunk/php/note/note.pinc
    trunk/php/product.pinc
    trunk/php/product_show.php
    trunk/php/rate/rate.pinc
    trunk/php/reminder/reminder.pinc
    trunk/php/scrum/scrum.pinc
    trunk/php/task.pinc
    trunk/php/task_show.php
    trunk/php/tree.php
    trunk/php/treedata.php
    trunk/php/url/url.pinc
    trunk/test.sh

Added Paths:
-----------
    trunk/html/tree_icon.png

Modified: trunk/html/copyright.html
===================================================================
--- trunk/html/copyright.html	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/html/copyright.html	2014-02-22 20:35:56 UTC (rev 1244)
@@ -40,6 +40,7 @@
 + excanvas.js<br />
 + <a href="jquery" rel="nofollow">http://jquerymobile.com/">jquery mobile</a><br />
 <li>Google PHP API from <a href="http://code.google.com/p/google-api-php-client/" rel="nofollow">http://code.google.com/p/google-api-php-client/">http://code.google.com/p/google-api-php-client/</a> using Apache 2.0 License  see libs/google-api-php/LICENSE</li>
+<li><a href="http://www.jstree.com">jstree</a> tree library for jquery using <a href="MIT" rel="nofollow">http://www.opensource.org/licenses/mit-license.php">MIT License </a>
 </ul>
 <p />
 <hr>

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

Index: trunk/html/tree_icon.png
===================================================================
--- trunk/html/tree_icon.png	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/html/tree_icon.png	2014-02-22 20:35:56 UTC (rev 1244)

Property changes on: trunk/html/tree_icon.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: trunk/php/address_show.php
===================================================================
--- trunk/php/address_show.php	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/address_show.php	2014-02-22 20:35:56 UTC (rev 1244)
@@ -297,7 +297,7 @@
         add_module_addlinks($this,$this->obj);
 
         // add tree link
-        $this->addMenu($this->obj->getTreeLink($this->user));
+        $this->addMenu($this->obj->getTreeLink($this));
 
         // add this page to the browsehistory of the users session
         $this->addtohistory();

Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/address_tools.p3	2014-02-22 20:35:56 UTC (rev 1244)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2013 by Gero Kohnert
+ *  Copyright 1999 - 2014 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -128,7 +128,7 @@
 /**
  * initialize for adress search and overview pages
  */
-Function adr_tool_init(layout $layout) {
+Function adr_tool_init(layout_base $layout) {
     $layout->head = array();
 
     $layout->head['f_name']   = false;
@@ -166,7 +166,7 @@
  * starting with layout->start
  *
  */
-Function address_overview (layout $layout,$res,$target = "",$key = 'ss') {
+Function address_overview (layout_base $layout,$res,$target = "",$key = 'ss') {
     global $lang, $tutos, $current_user,$msg,$info;
 
     $r = '';

Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/appointment.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2013 by Gero Kohnert
+ *  Copyright 1999 - 2014 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -163,7 +163,7 @@
 /**
  * set some defaults for calendar display
  */
-function cal_setDefault(layout $ly) {
+function cal_setDefault(layout_base $ly) {
     /* show apps for current user */
     $ly->uids[$ly->user->id] = 1;
     foreach ($ly->user->teamlist as $i => $f) {
@@ -174,7 +174,7 @@
  * set some defaults for calendar display
  * noteit   true = add to headline
  */
-function cal_addteam(layout $ly,Team $tt,$noteit = true) {
+function cal_addteam(layout_base $ly,Team $tt,$noteit = true) {
     global $msg;
 
     // Team
@@ -206,9 +206,9 @@
 /**
  * parse the calendar options
  * team[]
- * set in layout temname and team
+ * set in layout teamname and team
  */
-function cal_parse_options(layout $ly) {
+function cal_parse_options(layout_base $ly) {
     global $msg,$lang,$current_user,$tutos;
 
     $ly->tnpre = ': ';
@@ -1441,7 +1441,7 @@
     /**
      * put aout the formatted appointment
      */
-    function formatted (layout $ly) {
+    function formatted (layout_base $ly) {
         global $lang,$tutos,$current_user;
 
 

Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/base.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -971,7 +971,7 @@
     /**
      * get the detail info page (initial)
      */
-    function getAsHtmlPre(layout $ly) {
+    function getAsHtmlPre(layout_base $ly) {
         $r = '';
         $r .= $ly->DataTableStart();
         $r .= $ly->headline_gui();
@@ -982,7 +982,7 @@
     /**
      * get the detail info page (later)
      */
-    function getAsHtmlPost(layout $ly) {
+    function getAsHtmlPost(layout_base $ly) {
         $r = '';
         $r .= show_custom_fields($ly,$ly->obj->gettype(),$ly->obj,$ly->width);
         $r .= show_module_infolists($ly->user,$ly->obj,$ly->width);
@@ -996,7 +996,7 @@
     /**
      * get the detail info page
      */
-    function getAsHtml(layout $ly) {
+    function getAsHtml(layout_base $ly) {
         global $lang;
 
         $r = '';
@@ -1012,17 +1012,17 @@
     /**
      * get the tree related to this object
      */
-    function getTreeStructure($key) {
+    function getTreeStructure(layout_base $ly,$key) {
         return '';
     }
 
     /**
      * create a link to the tree page
      */
-    function getTreeLink (tutos_user $user,$text = '') {
+    function getTreeLink (layout_base $ly,$text = '') {
         global $lang,$tutos;
 
-        if ($this->getTreeStructure(0) == '') {
+        if ($this->getTreeStructure($ly,0) == '') {
             return null;
         }
         return array( url => 'tree.php?id='.$this->id,

Modified: trunk/php/layout/theme_base.pinc
===================================================================
--- trunk/php/layout/theme_base.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/layout/theme_base.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -158,7 +158,8 @@
         $this->i[find]            = $this->findImage('find');
         $this->i[edit]            = $this->findImage('pencil');
         $this->i[mail]            = $this->findImage('email');
-        $this->i[tree]            = $this->findImage('arrow_branch');
+        //        $this->i[tree]            = $this->findImage('arrow_branch');
+        $this->i[tree]            = $this->findImage('tree_icon');
 
         $this->a[up]           = "UP";
         $this->a[down]         = "DOWN";
@@ -184,7 +185,11 @@
         }
         if (isset($this->i[$type])) {
             if (!empty($this->i[$type])) {
-                return '<img class="'. $purpose .' icon icon_'. $type .'" src="'. $this->i[$type] .'" alt="'. (isset($this->a[$type]) ? $this->a[$type] : '') .'" />';
+                if ($purpose == 'link') {
+                    return $this->i[$type];
+                } else {
+                    return '<img class="'. $purpose .' icon icon_'. $type .'" src="'. $this->i[$type] .'" alt="'. (isset($this->a[$type]) ? $this->a[$type] : '') .'" />';
+                }
             } else {
                 return '';
             }
@@ -192,7 +197,11 @@
         $x = $this->findImage($type);
         $this->i[$type] = $x;
         if (! empty($x)) {
-            return '<img class="'. $purpose .' icon icon_'. $type .'" src="'. $x .'" alt="'. (isset($this->a[$type]) ? $this->a[$type] : '') .'" />';
+            if ($purpose == 'link') {
+                return $x;
+            } else {
+                return '<img class="'. $purpose .' icon icon_'. $type .'" src="'. $x .'" alt="'. (isset($this->a[$type]) ? $this->a[$type] : '') .'" />';
+            }
         }
         return '';
         #    return "@ $type @";

Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/location.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -659,7 +659,7 @@
     /**
      * a input form (used in comapny_new
      */
-    function inputform (layout $layout) {
+    function inputform (layout_base $layout) {
         global $lang,$table;
 
         $r = '';

Modified: trunk/php/mail.pinc
===================================================================
--- trunk/php/mail.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/mail.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -264,7 +264,7 @@
     /**
      * show one body
      */
-    function show_html(layout $ly,$mformat,$part) {
+    function show_html(layout_base $ly,$mformat,$part) {
         global $tutos,$lang;
 
         $skip = false;

Modified: trunk/php/module_base.pinc
===================================================================
--- trunk/php/module_base.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/module_base.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -197,7 +197,7 @@
 /**
  * add the addlinks of attached modules within the given object
  */
-Function add_module_addlinks(layout $layout,tutos_base $obj) {
+Function add_module_addlinks(layout_base $layout,tutos_base $obj) {
     global $tutos;
 
     foreach($tutos[activemodules] as $f) {
@@ -221,7 +221,7 @@
 /**
  * show the newlinks of attached modules within the given object
  */
-Function add_module_NewLinks(layout $layout,tutos_base $obj) {
+Function add_module_NewLinks(layout_base $layout,tutos_base $obj) {
     global $tutos;
 
     foreach($tutos[activemodules] as $f) {
@@ -245,7 +245,7 @@
 /**
  * show the overview data  of attached modules within the given object
  */
-Function get_module_overview_data(layout $layout,tutos_base $obj) {
+Function get_module_overview_data(layout_base $layout,tutos_base $obj) {
     global $tutos;
 
     $r = '';
@@ -271,7 +271,7 @@
 /**
  * show the overview data  of attached modules within the given object
  */
-Function get_module_overview_header(layout $layout,$objtype) {
+Function get_module_overview_header(layout_base $layout,$objtype) {
     global $tutos;
 
     $r = '';
@@ -346,7 +346,7 @@
 /**
  * add links to overview and select pages of the layout
  */
-Function build_module_links(layout $ly) {
+Function build_module_links(layout_base $ly) {
     global $tutos,$lang;
 
     if ( !isset($tutos[activemodules]) ) {
@@ -467,9 +467,9 @@
     /**
      * the referenced obj asked for an tree
      */
-    static function obj_getTree (tutos_base $obj) {
+    static function obj_getTree (layout_base $ly,tutos_base $obj) {
         $r = '';
-        //        $r .= '<li id="XXX'.$obj->id.'X">'.self::getType().'</li>';
+        //        $r .= '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getHtmlIcon(),'link').'"}\' id="XXX'.$obj->id.'X">'.self::getType().'</li>';
         return $r;
     }
 

Modified: trunk/php/note/note.pinc
===================================================================
--- trunk/php/note/note.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/note/note.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -176,7 +176,7 @@
     /**
      * added by J. Baten
      */
-    function formatted (layout $ly) {
+    function formatted (layout_base $ly) {
         global $lang;
         $r = '';
         $r .= '<li class="dragable"><div class="formatted note">';

Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/product.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -33,7 +33,7 @@
  * Build a query by analyzing given POSTS/GETS
  * shared use in sales forecast and product_overview
  */
-function prepare_product_overview(layout $obj) {
+function prepare_product_overview(layout_base $obj) {
     global $tutos,$lang,$table;
 
     // save for later
@@ -980,7 +980,7 @@
     /**
      * get the detail info page
      */
-    function getAsHtml(layout $ly) {
+    function getAsHtml(layout_base $ly) {
         global $table,$lang,$tutos;
 
         $this->readroles();
@@ -1104,14 +1104,14 @@
     /**
      * get the tree related to this object
      */
-    function getTreeStructure($key) {
+    function getTreeStructure(layout_base $ly,$key) {
         global $lang,$tutos;
 
         loadmodules($this->getType(),'show');
 
         //        error_log('product->getTreeStructure:'.$key.' '.$this.print_r($tutos[activemodules],true)."\n",3,$tutos[errlog]);
         $this->readroles();
-        $r = '<li id="'.$this->id.'X'.$key.'">'.$lang[$this->getType()].' '.$this->getFullName();
+        $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getHtmlIcon(),'link').'"}\' id="'.$this->id.'X'.$key.'">'.$this->getFullName();
 
         $rr = '';
         foreach (array(10,11,12,13) as $x) {
@@ -1119,21 +1119,21 @@
                 $rr .= '  <li id="'.$this->id.'X'.$key.'XR'.$x.'">'.$lang['ProdRole'][$x]."\n";
                 $rr .= '   <ul>'."\n";
                 foreach($this->role[$x] as $i => $o) {
-                    $rr .= '   <li class="jstree-closed" id="'.$i.'X'.uniqid().'">'.$lang[$o->getType()].' '.$o->getFullName().'</li>'."\n";
+                    $rr .= '   <li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getHtmlIcon(),'link').'"}\' class="jstree-closed" id="'.$i.'X'.uniqid().'">'.$o->getFullName().'</li>'."\n";
                 }
                 $rr .= '   </ul>'."\n";
                 $rr .= '  </li>'."\n";
             }
         }
         // Tasks
-        $rr .=  task::obj_getTree($this);
+        $rr .= task::obj_getTree($ly,$this);
 
         foreach($tutos[activemodules] as $f) {
             $x = new $tutos[modules][$f][name]($this->dbconn);
             if ( ! is_subclass_of($x,'tutos_module') ) {
                 continue;
             }
-            $rr .= $x->obj_getTree($this); // referencing us
+            $rr .= $x->obj_getTree($ly,$this); // referencing us
         }
         if ($rr != '') {
             $r .= "\n".' <ul>'."\n";

Modified: trunk/php/product_show.php
===================================================================
--- trunk/php/product_show.php	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/product_show.php	2014-02-22 20:35:56 UTC (rev 1244)
@@ -192,7 +192,7 @@
         add_module_addlinks($this,$this->obj);
 
         // add tree link
-        $this->addMenu($this->obj->getTreeLink($this->user));
+        $this->addMenu($this->obj->getTreeLink($this));
 
         // add this page to the browsehistory of the users session
         $this->addtohistory();

Modified: trunk/php/rate/rate.pinc
===================================================================
--- trunk/php/rate/rate.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/rate/rate.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2013 by Gero Kohnert and ecosoft
+ *  Copyright 1999 - 2014 by Gero Kohnert and ecosoft
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -154,7 +154,7 @@
     /**
      * added by J. Baten
      */
-    function formatted (layout $ly) {
+    function formatted (layout_base $ly) {
         return '<tr><td colspan="3" class="rate">'. $this->getLink() ."</td></tr>\n";
     }
 

Modified: trunk/php/reminder/reminder.pinc
===================================================================
--- trunk/php/reminder/reminder.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/reminder/reminder.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -334,7 +334,7 @@
     /**
      * output the formatted reminder for a calendar
      */
-    function formatted (layout $ly) {
+    function formatted (layout_base $ly) {
         global $lang,$tutos,$current_user;
         $this->read_reference();
 
@@ -989,4 +989,4 @@
         return $r;
     }
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/php/scrum/scrum.pinc
===================================================================
--- trunk/php/scrum/scrum.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/scrum/scrum.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -194,7 +194,7 @@
     /**
      * output the formatted activity for a calendar
      */
-    function formatted (layout $ly) {
+    function formatted (layout_base $ly) {
         global $lang,$tutos,$current_user;
 
         $ly->add_css('/php/scrum/default.css');
@@ -1823,4 +1823,4 @@
     }
 }
 
-?>
+?>
\ No newline at end of file

Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/task.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -1494,7 +1494,7 @@
     /**
      * get the detail info page
      */
-    function getAsHtml(layout $ly) {
+    function getAsHtml(layout_base $ly) {
         global $table,$lang,$tutos;
 
         $ly->width = 4;
@@ -1632,24 +1632,24 @@
     /**
      * get the tree related to this object
      */
-    function getTreeStructure($key) {
+    function getTreeStructure(layout_base $ly,$key) {
         global $lang,$tutos;
 
         loadmodules($this->getType(),'show');
 
-        error_log('task->getTreeStructure:'.$key.' '.$this.print_r($tutos[activemodules],true)."\n",3,$tutos[errlog]);
-        $r = '<li id="'.$this->id.'X'.$key.'">'.$lang[$this->getType()].' '.$this->getFullName();
+        // error_log('task->getTreeStructure:'.$key.' '.$this.print_r($tutos[activemodules],true)."\n",3,$tutos[errlog]);
+        $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getHtmlIcon(),'link').'"}\' id="'.$this->id.'X'.$key.'">'.$this->getFullName();
 
         $rr = '';
         // Tasks
-        $rr .=  task::obj_getTree($this);
+        $rr .= task::obj_getTree($ly,$this);
 
         foreach($tutos[activemodules] as $f) {
             $x = new $tutos[modules][$f][name]($this->dbconn);
             if ( ! is_subclass_of($x,'tutos_module') ) {
                 continue;
             }
-            $rr .= $x->obj_getTree($this); // referencing us
+            $rr .= $x->obj_getTree($ly,$this); // referencing us
         }
         if ($rr != '') {
             $r .= "\n".' <ul>'."\n";
@@ -2024,7 +2024,7 @@
     /**
      * output the formatted task in one table row
      */
-    function formatted (layout $ly) {
+    function formatted (layout_base $ly) {
         global $lang,$tutos,$current_user;
 
         $r = '';
@@ -2285,7 +2285,7 @@
     /**
      * the referenced obj asked for an tree
      */
-    static function obj_getTree (tutos_base $obj) {
+    static function obj_getTree (layout_base $ly,tutos_base $obj) {
         global $lang;
 
         task::obj_read($obj);
@@ -2295,15 +2295,19 @@
 
 
         foreach($obj->tasklist as $o) {
-            $rr .= '  <li class="jstree-closed" id="'.$o->id.'X'.uniqid().'">'.$o->getFullName().'</li>'."\n";
+            $rr .= '   <li data-jstree=\'{"icon":"'.$ly->theme->getImage($o->getHtmlIcon(),'link').'"}\' class="jstree-closed" id="'.$o->id.'X'.uniqid().'">'.$o->getFullName().'</li>'."\n";
         }
 
         if ($rr != '') {
-            $r .= '<li id="'.$obj->id.'X'.self::getType().'">'.$lang[self::getType()]."\n";
-            $r .= ' <ul>'."\n";
+            if ($obj->gettype() != 'task') {
+                $r .= ' <li id="'.$obj->id.'X'.self::getType().'">'.$lang[self::getType()]."\n";
+                $r .= '  <ul>'."\n";
+            }
             $r .= $rr;
-            $r .= ' </ul>'."\n";
-            $r .= '</li>'."\n";
+            if ($obj->gettype() != 'task') {
+                $r .= '  </ul>'."\n";
+                $r .= ' </li>'."\n";
+            }
         }
         return $r;
     }

Modified: trunk/php/task_show.php
===================================================================
--- trunk/php/task_show.php	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/task_show.php	2014-02-22 20:35:56 UTC (rev 1244)
@@ -157,7 +157,7 @@
         add_module_addlinks($this,$this->obj);
 
         // add tree link
-        $this->addMenu($this->obj->getTreeLink($this->user));
+        $this->addMenu($this->obj->getTreeLink($this));
 
         // add this page to the browsehistory of the users session
         $this->addtohistory();

Modified: trunk/php/tree.php
===================================================================
--- trunk/php/tree.php	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/tree.php	2014-02-22 20:35:56 UTC (rev 1244)
@@ -71,7 +71,6 @@
 <li class="jstree-closed" id="'.$this->obj->id.'X0">'.$this->obj->getFullName().'</li>
 </ul>
 </div></td></tr>';
-        $r .= '<tr><td>------------------------------------------------------</td></tr>';
         return $r;
     }
 

Modified: trunk/php/treedata.php
===================================================================
--- trunk/php/treedata.php	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/treedata.php	2014-02-22 20:35:56 UTC (rev 1244)
@@ -47,11 +47,11 @@
 if (!is_Object($obj)) {
     return;
 }
+loadmodules($obj->getType(),'show');
+$ly = new tree_show($current_user);
+$ly->obj = $obj;
 
 if ($_REQUEST['mode'] == "info") {
-    loadmodules($obj->getType(),'show');
-    $ly = new tree_show($current_user);
-    $ly->obj = $obj;
     $r = '';
     $r .= $obj->getAsHtml($ly);
     $r .= '  <script type="text/javascript" language="JavaScript">'."\n";
@@ -66,7 +66,7 @@
     if (isset($req[1])) {
         $key = $req[1];
     }
-    echo $obj->getTreeStructure($key);
+    echo $obj->getTreeStructure($ly,$key);
 } else {
 }
 ?>
\ No newline at end of file

Modified: trunk/php/url/url.pinc
===================================================================
--- trunk/php/url/url.pinc	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/php/url/url.pinc	2014-02-22 20:35:56 UTC (rev 1244)
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2013 by Gero Kohnert
+ *  Copyright 1999 - 2014 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -550,7 +550,7 @@
     /**
      * add a preset link
      */
-    static function getFastSelect(layout $obj) {
+    static function getFastSelect(layout_base $obj) {
         global $lang,$tutos;
 
         if (! is_object($obj) ) return '';

Modified: trunk/test.sh
===================================================================
--- trunk/test.sh	2014-02-22 18:35:04 UTC (rev 1243)
+++ trunk/test.sh	2014-02-22 20:35:56 UTC (rev 1244)
@@ -301,6 +301,8 @@
  team_new.php?id=$NOID&lg=$LG
  team_show.php?lg=$LG
  team_show.php?id=$NOID&lg=$LG
+ tree.php?id=$NOID&lg=$LG
+ tree.php?id=$P_ID&lg=$LG
  user_ins.php?lg=$LG
  user_del.php?lg=$LG
  user_new.php?lg=$LG

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

Revision: 1243
          http://sourceforge.net/p/tutos/code/1243
Author:   gokohnert
Date:     2014-02-22 18:35:04 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
fix typo

Modified Paths:
--------------
    trunk/php/expense/expense_ins.php

Modified: trunk/php/expense/expense_ins.php
===================================================================
--- trunk/php/expense/expense_ins.php	2014-02-22 18:27:42 UTC (rev 1242)
+++ trunk/php/expense/expense_ins.php	2014-02-22 18:35:04 UTC (rev 1243)
@@ -150,7 +150,7 @@
 $t_end->setDateTimeF("t_end");
 if ( ( !$t_end->checkDMY()) || (-1 == $t_end->getTimeStamp()) ) {
     #$msg .= sprintf($lang['Err0038'],$lang['ExpenseEndTime']) ."<br />";
-    $t->end->notime = 1;
+    $t_end->notime = 1;
     $u->setEndTime($t_end);
 } else {
     $u->setEndTime($t_end);

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