tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(214) |
Sep
(144) |
Oct
(22) |
Nov
(22) |
Dec
(93) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(25) |
Feb
(31) |
Mar
(92) |
Apr
(70) |
May
(103) |
Jun
(130) |
Jul
(265) |
Aug
(325) |
Sep
(233) |
Oct
(244) |
Nov
(261) |
Dec
(157) |
2003 |
Jan
(101) |
Feb
(135) |
Mar
(148) |
Apr
(164) |
May
(53) |
Jun
(116) |
Jul
(149) |
Aug
(126) |
Sep
(45) |
Oct
(109) |
Nov
(36) |
Dec
(61) |
2004 |
Jan
(131) |
Feb
(236) |
Mar
(278) |
Apr
(259) |
May
(92) |
Jun
(110) |
Jul
(150) |
Aug
(64) |
Sep
(141) |
Oct
(141) |
Nov
(146) |
Dec
(65) |
2005 |
Jan
(70) |
Feb
(77) |
Mar
(129) |
Apr
(153) |
May
(161) |
Jun
(63) |
Jul
(42) |
Aug
(16) |
Sep
(30) |
Oct
(3) |
Nov
(8) |
Dec
(40) |
2006 |
Jan
(114) |
Feb
(16) |
Mar
(12) |
Apr
(15) |
May
(4) |
Jun
(9) |
Jul
(69) |
Aug
(27) |
Sep
(12) |
Oct
(80) |
Nov
(62) |
Dec
(41) |
2007 |
Jan
(34) |
Feb
(2) |
Mar
(38) |
Apr
(82) |
May
(61) |
Jun
(37) |
Jul
(16) |
Aug
(64) |
Sep
(7) |
Oct
(52) |
Nov
(18) |
Dec
(28) |
2008 |
Jan
(168) |
Feb
(26) |
Mar
(27) |
Apr
(19) |
May
(10) |
Jun
(58) |
Jul
(58) |
Aug
(91) |
Sep
(14) |
Oct
(23) |
Nov
(56) |
Dec
(38) |
2009 |
Jan
(58) |
Feb
(90) |
Mar
(204) |
Apr
(90) |
May
(27) |
Jun
(177) |
Jul
(116) |
Aug
(53) |
Sep
(42) |
Oct
(120) |
Nov
(51) |
Dec
(58) |
2010 |
Jan
(117) |
Feb
(231) |
Mar
(163) |
Apr
(90) |
May
(40) |
Jun
(139) |
Jul
(49) |
Aug
(118) |
Sep
(25) |
Oct
(80) |
Nov
(102) |
Dec
(99) |
2011 |
Jan
(176) |
Feb
(42) |
Mar
(60) |
Apr
(52) |
May
(30) |
Jun
(29) |
Jul
(27) |
Aug
(16) |
Sep
(51) |
Oct
(70) |
Nov
(63) |
Dec
(58) |
2012 |
Jan
(28) |
Feb
(26) |
Mar
(7) |
Apr
(12) |
May
(41) |
Jun
(61) |
Jul
(59) |
Aug
(38) |
Sep
(30) |
Oct
(28) |
Nov
(14) |
Dec
(31) |
2013 |
Jan
(24) |
Feb
(54) |
Mar
(45) |
Apr
(22) |
May
(35) |
Jun
(8) |
Jul
(18) |
Aug
(38) |
Sep
(11) |
Oct
(8) |
Nov
(19) |
Dec
(20) |
2014 |
Jan
(20) |
Feb
(22) |
Mar
(4) |
Apr
(6) |
May
(13) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
2015 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
2016 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(8) |
Aug
(13) |
Sep
(12) |
Oct
|
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <gok...@us...> - 2021-03-12 14:02:31
|
Revision: 1341 http://sourceforge.net/p/tutos/code/1341 Author: gokohnert Date: 2021-03-12 14:02:29 +0000 (Fri, 12 Mar 2021) Log Message: ----------- fix stc problem Modified Paths: -------------- trunk/php/stc/mtable.pinc trunk/php/stc/stc.pinc Modified: trunk/php/stc/mtable.pinc =================================================================== --- trunk/php/stc/mtable.pinc 2021-02-02 15:56:41 UTC (rev 1340) +++ trunk/php/stc/mtable.pinc 2021-03-12 14:02:29 UTC (rev 1341) @@ -33,15 +33,15 @@ ); -$table['stc_states'][name] = 'stc_state'; -$table['stc_states'][Desc] = 'TUTOS STC State'; -$table['stc_states']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'stc state ID'); -$table['stc_states']['stc_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'parent ID'); -$table['stc_states']['stc_state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'state ID'); -$table['stc_states']['color'] = array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'color for visualization'); -$table['stc_states']['lang_array'] = array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'arrayname with translation'); -$table['stc_states']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'); -$table['stc_states']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'); +$table['stcstate'][name] = 'stc_state'; +$table['stcstate'][Desc] = 'TUTOS STC State'; +$table['stcstate']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'stc state ID'); +$table['stcstate']['stc_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'parent ID'); +$table['stcstate']['stc_state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'state ID'); +$table['stcstate']['color'] = array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'color for visualization'); +$table['stcstate']['lang_array'] = array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'arrayname with translation'); +$table['stcstate']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'); +$table['stcstate']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'); $tableidx['stc2'] = array( name => "stc_idx2", @@ -51,14 +51,14 @@ ); -$table['stc_trans'][name] = 'stc_trans'; -$table['stc_trans'][Desc] = 'TUTOS STC Transition'; -$table['stc_trans']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'stc trans ID'); -$table['stc_trans']['stc_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'stc ID'); -$table['stc_trans']['stc_state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'state ID'); -$table['stc_trans']['next_state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'target state ID'); -$table['stc_trans']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'); -$table['stc_trans']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'); +$table['stctrans'][name] = 'stc_trans'; +$table['stctrans'][Desc] = 'TUTOS STC Transition'; +$table['stctrans']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'stc trans ID'); +$table['stctrans']['stc_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'stc ID'); +$table['stctrans']['stc_state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'state ID'); +$table['stctrans']['next_state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'target state ID'); +$table['stctrans']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'); +$table['stctrans']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'); $tableidx['stc3'] = array( name => "stc_idx3", Modified: trunk/php/stc/stc.pinc =================================================================== --- trunk/php/stc/stc.pinc 2021-02-02 15:56:41 UTC (rev 1340) +++ trunk/php/stc/stc.pinc 2021-03-12 14:02:29 UTC (rev 1341) @@ -29,8 +29,8 @@ if($dbconn == null) return; - $this->tablename = $this->dbconn->prefix.$table['stc_states'][name]; - $this->tablename3 = $this->dbconn->prefix.$table['stc_trans'][name]; + $this->tablename = $this->dbconn->prefix.$table['stcstate'][name]; + $this->tablename3 = $this->dbconn->prefix.$table['stctrans'][name]; $this->run_postinit_hook(); } @@ -74,7 +74,7 @@ */ function getColorBlock () { return '<span style="font-size:0.8em;background:'.$this->getColor().';">  </span> '; - } + } /** * save the stc state data to the database @@ -88,8 +88,8 @@ $q->setTable($this->tablename); $q->addFV('stc_state',$this->stc_state,'INT'); $q->addFV('stc_id',$this->stc_id,'INT'); - $q->addFV('color',$this->color,'STRING',$table['stc_states']['color'][size]); - $q->addFV('lang_array',$this->lang_array,'STRING',$table['stc_states']['lang_array'][size]); + $q->addFV('color',$this->color,'STRING',$table['stcstate']['color'][size]); + $q->addFV('lang_array',$this->lang_array,'STRING',$table['stcstate']['lang_array'][size]); $this->save_custom_fields($q); if ( $this->id < 0 ) { @@ -168,7 +168,7 @@ $obj->states = array(); - $q = 'SELECT * from '.$obj->dbconn->prefix.$table['stc_states'][name].' where stc_id = '. $obj->id .' order by stc_state'; + $q = 'SELECT * from '.$obj->dbconn->prefix.$table['stcstate'][name].' where stc_id = '. $obj->id .' order by stc_state'; $r = $obj->dbconn->Exec($q); $n = $r->numrows(); $a = 0; @@ -198,7 +198,7 @@ $this->stc = null; $this->stc_state = null; $this->next_state = null; - $this->tablename = $this->dbconn->prefix .$table['stc_trans'][name]; + $this->tablename = $this->dbconn->prefix .$table['stctrans'][name]; $this->run_postinit_hook(); } @@ -467,7 +467,7 @@ $obj->trans = array(); - $q = 'SELECT * from '. $obj->dbconn->prefix.$table['stc_trans'][name].' where stc_id = '. $obj->id .' order by stc_state'; + $q = 'SELECT * from '. $obj->dbconn->prefix.$table['stctrans'][name].' where stc_id = '. $obj->id .' order by stc_state'; $r = $obj->dbconn->Exec($q); $n = $r->numrows(); $a = 0; @@ -518,8 +518,8 @@ $this->stateowner = null; // the class that uses this stc if($dbconn == null) return; $this->tablename = $this->dbconn->prefix .$table['stc'][name]; - $this->tablename2 = $this->dbconn->prefix .$table['stc_states'][name]; - $this->tablename3 = $this->dbconn->prefix .$table['stc_trans'][name]; + $this->tablename2 = $this->dbconn->prefix .$table['stcstate'][name]; + $this->tablename3 = $this->dbconn->prefix .$table['stctrans'][name]; $this->run_postinit_hook(); } @@ -833,7 +833,7 @@ global $table; $tablename = $obj->dbconn->prefix .$table['stc'][name]; - $tablename2 = $obj->dbconn->prefix .$table['stc_states'][name]; + $tablename2 = $obj->dbconn->prefix .$table['stcstate'][name]; $q = 'SELECT distinct a.* FROM '. $tablename .' a,'.$tablename2 .' b WHERE b.lang_array = \''. $la .'\' AND a.id = b.stc_id'; $r = $obj->dbconn->Exec($q); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2021-02-02 15:56:42
|
Revision: 1340 http://sourceforge.net/p/tutos/code/1340 Author: gokohnert Date: 2021-02-02 15:56:41 +0000 (Tue, 02 Feb 2021) Log Message: ----------- fix missing from on sendmail mode Modified Paths: -------------- trunk/php/mail.pinc Modified: trunk/php/mail.pinc =================================================================== --- trunk/php/mail.pinc 2020-12-31 14:32:52 UTC (rev 1339) +++ trunk/php/mail.pinc 2021-02-02 15:56:41 UTC (rev 1340) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2020 by Gero Kohnert + * Copyright 1999 - 2021 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 @@ -35,7 +35,7 @@ $this->contentclass = ''; $this->charset = $lang['content_encoding']; // default $this->eoln = "\r\n"; - $this->boundary = '-----------END_OF_TUTOS_MAIL_PART_'. Date("Ymd").uniqid() .'------'; + $this->boundary = "-----------END_OF_TUTOS_MAIL_PART_". Date("Ymd").uniqid() .'------'; $this->url = "http://\r\n"; $this->part = 1; $this->bodies = array(); @@ -70,7 +70,7 @@ if (preg_match("#^multipart#",$this->contenttype) ) { $writer->writechannel("Content-Type: ".$this->contenttype.";". $this->eoln ."\tboundary=\"". $this->boundary ."\""); } else { - $writer->writechannel("Content-Type: ". $this->contenttype .'; charset="'.$this->charset.'"'); + $writer->writechannel("Content-Type: ". $this->contenttype ."; charset=\"".$this->charset."\""); } if ($this->contentdesc != '') { $writer->writechannel("Content-Description: ". $this->contentdesc); @@ -381,20 +381,20 @@ } if ($this->contentencoding == "quoted-printable") { $r .= wordwrap(urlreplace(iconv($this->charset,$lang['content_encoding'].'//IGNORE',quoted_printable_decode($this->body))),80); - } else if ($this->contentencoding == "base64") { + } else if ($this->contentencoding == "base64") { $r .= wordwrap(urlreplace(iconv($this->charset,$lang['content_encoding'],base64_decode($this->body))),80); } else if (($this->contentencoding == "8bit") || ($this->contentencoding == "7bit")) { if ($mformat == 'reply') { $r .= wordwrap(iconv($this->charset,$lang['content_encoding'].'//IGNORE',$this->body),80); - } else { + } else { $r .= wordwrap(urlreplace(myentities(iconv($this->charset,$lang['content_encoding'].'//IGNORE',$this->body)),80)); - } + } } else if ($this->contentencoding == "binary") { if ($mformat == 'reply') { $r .= wordwrap(iconv($this->charset,$lang['content_encoding'].'//IGNORE',$this->body),80); - } else { + } else { $r .= wordwrap(urlreplace(myentities(iconv($this->charset,$lang['content_encoding'].'//IGNORE',$this->body)),80)); - } + } } else { $r .= $this->body; } @@ -1308,7 +1308,7 @@ } else { $x = $obj->getFullName(); } - $cc .= $pre .'"'. $x .'" <'. $t .">"; + $cc .= $pre .'"'. $x .'" <'. $t .'>'; $pre = ","; $this->sent[$obj->id] = 1; } @@ -1504,7 +1504,7 @@ $msg = ''; if ($tutos['mailmode'] == MAILMODE_NOMAIL) return; if ( $tutos['mailmode'] == MAILMODE_SENDMAIL ) { - $this->fd = popen($tutos['sendmail']." -t -i","w"); + $this->fd = popen($tutos['sendmail']." -t -i -f ".$from,"w"); if ( $this->fd == false ) { $msg = addLine($msg,"could not connect to sendmail server\n"); return $msg; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2020-12-31 14:32:56
|
Revision: 1339 http://sourceforge.net/p/tutos/code/1339 Author: gokohnert Date: 2020-12-31 14:32:52 +0000 (Thu, 31 Dec 2020) Log Message: ----------- somemore changes to eleminate deprecated stuff Modified Paths: -------------- trunk/php/Date.pinc trunk/php/address.pinc trunk/php/app_overview.php trunk/php/base.pinc trunk/php/company.pinc trunk/php/config_default.pinc trunk/php/handler.pinc trunk/php/history.pinc trunk/php/mail.pinc trunk/php/map24/map24.pinc trunk/php/mapquest/mapquest.pinc trunk/php/pdf.pinc trunk/php/permission.p3 trunk/php/phpweather/pw.pinc trunk/php/product.pinc trunk/php/product_ins.php trunk/php/product_overview.php trunk/php/product_role_ins.php trunk/php/reminder/reminder_overview.php trunk/php/report-engine/rep_index/rep_index.pinc trunk/php/report-engine/rep_spine/rep_spine.pinc trunk/php/res_cal.php trunk/php/scrum/log_overview.php trunk/php/scrum/scrum.pinc trunk/php/sipgate/sipgate.pinc trunk/php/subversion/revision.pinc trunk/php/user.pinc trunk/php/webelements.p3 Modified: trunk/php/Date.pinc =================================================================== --- trunk/php/Date.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/Date.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2017 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -123,7 +123,7 @@ $tutos['nd'] = array(); @reset($tutos[nameday]); - while( list ($i,$f) = @each ($tutos[nameday])) { + foreach($tutos[nameday] as $i => $f) { $i = strtolower($i); if ( ($f == 1) && ($current_user->nameday[$i] == 1) ) { include "localization/namedays_". $i .".p3"; @@ -1387,4 +1387,4 @@ return $this->getDateTime(); } } -?> \ No newline at end of file +?> Modified: trunk/php/address.pinc =================================================================== --- trunk/php/address.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/address.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2017 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -490,8 +490,7 @@ function getModURL($arg = '') { $url = parent::getModURL($arg); if ( isset($this->location) && count($this->location) > 0 ) { - @reset($this->location); - list ($j,$l) = @each ($this->location); + $l = @reset($this->location); $url = addUrlParameter($url,'loc_id='.$l->id); } return $url; @@ -766,4 +765,4 @@ } $tutos['classes'][useaddressbook] = 'tutos_address'; -?> \ No newline at end of file +?> Modified: trunk/php/app_overview.php =================================================================== --- trunk/php/app_overview.php 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/app_overview.php 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2014 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -290,7 +290,7 @@ } else if ( $obj->getType() == "company" ) { $obj->read_members(); $this->q .= $this->qpre . " visitor in (". $_GET['link_id']; - while ( list ($i,$f) = @each ($obj->member) ) { + foreach($obj->member as $i => $f) { $this->q .= ",". $i; } $this->q .= " )"; @@ -298,7 +298,7 @@ } else if ( $obj->getType() == "department" ) { $obj->read_members(); $this->q .= $this->qpre . " visitor in (". $_GET['link_id']; - while ( list ($i,$f) = @each ($obj->member) ) { + foreach($obj->member as $i => $f) { $this->q .= ",". $i; } $this->q .= " )"; @@ -411,4 +411,4 @@ <!-- SVN Info $Id$ $Author$ ---> \ No newline at end of file +--> Modified: trunk/php/base.pinc =================================================================== --- trunk/php/base.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/base.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2002 - 2017 by Gero Kohnert + * Copyright 2002 - 2020 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 @@ -198,7 +198,7 @@ * @param int $id the object id */ function read ($id,tutos_base $obj) { - global $g_hash,$tutos; + global $g_hash,$tutos,$table; if ( empty($id) ) return -1; if ( -1 == $id ) return -1; @@ -206,6 +206,11 @@ if ( ! is_object($obj) ) return -1; if ( $obj->tablename == 'UNKNOWN' ) return -1; + // no id to search for + if (! isset($table[$this->getType()]['id'])) { + return -1; + } + if ( !isset($tutos['nohash']) && isset($g_hash[$id]) && is_object($g_hash[$id]) ) { // check if we have the corrct objecttype if ($g_hash[$id]->getTypeId() != $obj->getTypeId()) return -1; @@ -2094,4 +2099,4 @@ return ''; } } -?> \ No newline at end of file +?> Modified: trunk/php/company.pinc =================================================================== --- trunk/php/company.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/company.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2017 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -459,8 +459,7 @@ function getModURL($arg = '') { $url = parent::getModURL($arg); if ( count($this->location) > 0 ) { - @reset($this->location); - list ($j,$l) = @each ($this->location); + $l = @reset($this->location); $url = addUrlParameter($url,'loc_id='.$l->id); } return $url; @@ -538,4 +537,4 @@ } } $tutos['classes'][usecompany] = 'company'; -?> \ No newline at end of file +?> Modified: trunk/php/config_default.pinc =================================================================== --- trunk/php/config_default.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/config_default.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2016 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -743,10 +743,10 @@ // // The TUTOS Version number // -$tutos[version] = '1.12.20160813'; +$tutos[version] = '1.12.20201229'; // ### Local Variables: *** ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Modified: trunk/php/handler.pinc =================================================================== --- trunk/php/handler.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/handler.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2002 - 2017 by Gero Kohnert + * Copyright 2002 - 2020 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 @@ -45,7 +45,9 @@ if (file_exists($tutos['base'] .'/php/'. $f)) { include_once $tutos['base'] .'/php/'. $f; if (class_exists($i)) { - $x = new $i($obj->dbconn); + #if (! is_object($obj)) continue; + #$x = new $i($obj->dbconn); + $x = new $i(); if ( ! is_subclass_of($x,'tutos_handler') ) { Fatal_Error('Wrong handler class: '. $i); } @@ -108,4 +110,4 @@ } } $tutos[handler]['url']['url_handler'] = 'handler.pinc'; -?> \ No newline at end of file +?> Modified: trunk/php/history.pinc =================================================================== --- trunk/php/history.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/history.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -24,7 +24,7 @@ * @param $from start time * @param $to end time */ -function readHistory (tutos_base $obj,$adr_id,$sort = "m_time" ,$dir,$start,$from = null,$to = null, $oldfilter = '', $newfilter = '', $fieldfilter = array()) { +function readHistory (tutos_base $obj,$adr_id,$sort = "m_time" ,$dir,$start,$from = null,$to = null, $oldfilter = '', $newfilter = '', $fieldfilter = '') { global $tutos,$table; if ( ! isset($obj->id) ) { @@ -75,7 +75,7 @@ } // filter by fields - if (count($fieldfilter) > 0) { + if ($fieldfilter != '') { $query->addWC('m_field',$fieldfilter,'STRING','IN'); } @@ -319,4 +319,4 @@ return $f; } -?> \ No newline at end of file +?> Modified: trunk/php/mail.pinc =================================================================== --- trunk/php/mail.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/mail.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2017 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -720,6 +720,7 @@ $this->date = ''; $this->from = null; $this->from_adr = ''; + $this->from_name = ''; $this->reply = array(); $this->reply_adr = array(); $this->show_header = false; @@ -1074,6 +1075,7 @@ if ($tutos['email_sender'] != '') { $this->AddReply($obj); + $this->from_name = $obj->getFullName(); } else { $this->from = &$obj; } @@ -1084,6 +1086,7 @@ if ($tutos['email_sender'] != '') { $this->AddReply($from); + $this->from_name = $from; } else { $this->from_adr = $from; } @@ -1233,7 +1236,7 @@ $reply = ''; $pre = ''; if ( count($this->reply) ) { - foreach($this->reply as $i => $obj) { + foreach($this->reply as $obj) { $t = $obj->default_email(); if ( $t == '' ) { continue; @@ -1243,17 +1246,17 @@ } else { $x = $obj->getFullName(); } - $reply .= $pre .'"'. $x .'" <'. $t .'>'; + $reply .= $pre .'"'.$x.'" <'.$t.'>'; $pre = ","; } } if ( count($this->reply_adr) ) { - foreach($this->reply_adr as $i => $obj ) { + foreach($this->reply_adr as $obj ) { list($name,$em) = mail::split_name_email($obj); if (isset($this->charset) ) { $name = "=?". $this->charset ."?B?" . base64_encode( $name ) . "?="; } - $reply .= $name ." <". $em .">"; + $reply .= $pre .'"'.$name.'" <'.$em.'>'; $pre = ","; } } @@ -1855,6 +1858,8 @@ if (is_object($this->from)) { $x = "=?". $lang['content_encoding'] ."?B?" . base64_encode($this->from->getFullName()) . "?="; + } else if ($this->from_name != '') { + $x = "=?". $lang['content_encoding'] ."?B?" . base64_encode($this->from_name) . "?="; } else { $x = "=?". $lang['content_encoding'] ."?B?" . base64_encode($from) . "?="; } @@ -1901,4 +1906,4 @@ dterror_log(trim($info)."\n",3,$tutos[errlog].'.mail'); } } -?> \ No newline at end of file +?> Modified: trunk/php/map24/map24.pinc =================================================================== --- trunk/php/map24/map24.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/map24/map24.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -17,7 +17,7 @@ /** * run the handler */ - function handle(&$obj,$arg,$cnt) { + function handle($obj,$arg,$cnt) { global $lang,$current_user; if (empty($arg)) { @@ -38,7 +38,7 @@ /** * check if all is ok */ - function check(&$obj,$arg) { + function check($obj,$arg) { global $lang,$current_user; if ( ! $current_user->feature_ok(usemaplink,PERM_SEE) ) { @@ -48,4 +48,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/mapquest/mapquest.pinc =================================================================== --- trunk/php/mapquest/mapquest.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/mapquest/mapquest.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -17,7 +17,7 @@ /** * run the handler */ - function handle(&$obj,$arg,$cnt) { + function handle($obj,$arg,$cnt) { global $lang,$current_user; if (empty($arg)) { @@ -40,7 +40,7 @@ /** * check if all is ok */ - function check(&$obj,$arg) { + function check($obj,$arg) { global $lang,$current_user; if ( ! $current_user->feature_ok(usemaplink,PERM_SEE) ) { @@ -49,4 +49,4 @@ return true; } } -?> \ No newline at end of file +?> Modified: trunk/php/pdf.pinc =================================================================== --- trunk/php/pdf.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/pdf.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2004 - 2013 by Gero Kohnert + * Copyright 2004 - 2020 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 @@ -31,7 +31,7 @@ if ($format == "xx") { $format = $tutos[paperformat]; } - $this->fpdf($orientation,"mm",$format); + parent::__construct($orientation,"mm",$format); $this->dbconn = &$dbconn; $this->AliasNbPages(); $this->setCreator("TUTOS Version ".$tutos[version]); @@ -116,4 +116,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/permission.p3 =================================================================== --- trunk/php/permission.p3 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/permission.p3 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2014 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -200,9 +200,9 @@ ini_set("magic_quotes_runtime","Off"); ini_set("magic_quotes_qpc","Off"); -if (get_magic_quotes_gpc() != 0) { - die ('ini value magic_quotes_gpc is :'. get_magic_quotes_gpc()." Please switch it off ini php.ini or .htaccess\r\n"); -} +//if (get_magic_quotes_gpc() != 0) { +// die ('ini value magic_quotes_gpc is :'. get_magic_quotes_gpc()." Please switch it off ini php.ini or .htaccess\r\n"); +//} // // IIS NT Hack // @@ -446,7 +446,7 @@ if ( isset($_COOKIE['TUTOS']) ) { $tutos['SESSID'] = $_COOKIE['TUTOS']; // dterror_log('cookie session '."\n", 3, $tutos[errlog]); - session_id($tutos['SESSID']); + // TODO // session_id($tutos['SESSID']); // } elseif ( isset($_REQUEST['TUTOS']) ) { // $tutos['SESSID'] = $_REQUEST['TUTOS']; // dterror_log('arg session '."\n", 3, $tutos[errlog]); Modified: trunk/php/phpweather/pw.pinc =================================================================== --- trunk/php/phpweather/pw.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/phpweather/pw.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -41,7 +41,7 @@ /** * run the handler */ - function handle(&$obj,$arg,$cnt) { + function handle($obj,$arg,$cnt) { global $current_user,$lang; if (empty($arg)) { @@ -66,7 +66,7 @@ /** * check if all is ok */ - function check(&$obj,$arg) { + function check($obj,$arg) { if ( ! class_exists('phpweather') ) { return false; } @@ -73,4 +73,4 @@ return true; } } -?> \ No newline at end of file +?> Modified: trunk/php/product.pinc =================================================================== --- trunk/php/product.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/product.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2017 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -319,7 +319,7 @@ $r = "<select id=\"class".$c."\" name=\"cl".$c."\">\n"; @reset($lang['ProdClasses'.$c]); - while ( list ($i,$f) = @each ($lang['ProdClasses'.$c]) ) { + foreach($lang['ProdClasses'.$c] as $i => $f) { $r .= " <option value=\"". $i ."\""; if ( $i == $default ) { $r .= ' selected="selected"'; @@ -1913,7 +1913,7 @@ $l = $obj->id; if ( count($obj->member) ) { @reset($obj->member); - while( list ($i,$f) = @each ($obj->member)) { + foreach($obj->member as $i => $f) { $l .= "," . $i; } } @@ -2173,4 +2173,4 @@ } } $tutos['classes'][useprojects] = 'product'; -?> \ No newline at end of file +?> Modified: trunk/php/product_ins.php =================================================================== --- trunk/php/product_ins.php 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/product_ins.php 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 2020 by Gero Kohnert * cloning option added by Michal Salaban, 2003 * * This program is free software; you can redistribute it and/or modify it @@ -73,7 +73,7 @@ // Delete given Roles if ( isset($_POST['del']) ) { @reset ($_POST['del']); - while( list ($i,$f) = @each ($_POST['del'])) { + foreach($_POST['del'] as $i => $f) { preg_match ("#([0-9]*),([0-9]*)#",$f,$regs); $m = getObject($dbconn,$regs[1]); $p->delRole($m,$regs[2]); Modified: trunk/php/product_overview.php =================================================================== --- trunk/php/product_overview.php 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/product_overview.php 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2014 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -321,7 +321,7 @@ if ( $c == 'cl'.$cl ) { $sep = ''; @reset($p->cl[$cl]); - while ( list ($i,$f) = @each ($p->cl[$cl]) ) { + foreach($p->cl[$cl] as $i => $f) { if ( isset ($lang['ProdClasses'.$cl][$f]) ) { $xx .= $sep . $lang['ProdClasses'.$cl][$f] ; } else { @@ -485,7 +485,7 @@ if (isset($p->role[1]) && (count($p->role[1]) > 0) ) { @reset ($p->role[1]) ; $x = 0; - while ( list ($i,$rx) = @each ($p->role[1]) ) { + foreach($p->role[1] as $i => $rx) { if ( !isset($manager[$rx->id]) ) { $manager[$rx->id] = 0; } @@ -495,7 +495,7 @@ if (isset($p->role[3]) && (count($p->role[3]) > 0) ) { @reset ($p->role[3]) ; $x = 0; - while ( list ($i,$rx) = @each ($p->role[3]) ) { + foreach($p->role[3] as $i => $rx) { if ( !isset($manager[$rx->id]) ) { $manager[$rx->id] = 0; } @@ -512,7 +512,7 @@ // Classifications for ( $c = 1;$c <= 2; $c++) { @reset($p->cl[$c]); - while ( list ($i,$f) = @each ($p->cl[$c]) ) { + foreach($p->cl[$c] as $i => $f) { if ( !isset($cl[$c][$i]) ) { $cl[$c][$i] = 0; } Modified: trunk/php/product_role_ins.php =================================================================== --- trunk/php/product_role_ins.php 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/product_role_ins.php 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 2020 by Gero Kohnert * cloning option added by Michal Salaban, 2003 * * this script parses all the inputs and stores the object into the database. @@ -42,7 +42,7 @@ // Delete given Roles if ( isset($_POST['del']) ) { @reset ($_POST['del']); - while( list ($i,$f) = @each ($_POST['del'])) { + foreach($_POST['del'] as $i => $f) { preg_match ("#([0-9]*),([0-9]*)#",$f,$regs); $m = getObject($dbconn,$regs[1]); $p->delRole($m,$regs[2]); Modified: trunk/php/reminder/reminder_overview.php =================================================================== --- trunk/php/reminder/reminder_overview.php 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/reminder/reminder_overview.php 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2004 - 2014 by Gero Kohnert + * Copyright 2004 - 2020 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 @@ -178,7 +178,7 @@ return; } if ( $_GET['action'] == -4 ) { - $this->redirect = acl_action(); + $this->redirect = "../".acl_action(); return; } if (class_exists('watchlist')) { Modified: trunk/php/report-engine/rep_index/rep_index.pinc =================================================================== --- trunk/php/report-engine/rep_index/rep_index.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/report-engine/rep_index/rep_index.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -11,6 +11,8 @@ */ $tutos['files'][__FILE__] = '$Rev$'; +require_once 'pdf2.pinc'; + class rep_index extends rep_base { function __construct($dbconn,$report) { @@ -32,6 +34,8 @@ $this->obj->readroles(); $pdf=new tutospdf($this->dbconn); + $pdf->setPrintFooter(false); + $pdf->setPrintHeader(false); $pdf->SetAutoPageBreak(false,0); $pdf->Open(); if (is_object($this->obj->creator)) { @@ -53,23 +57,23 @@ //Move to the right $pdf->SetY($y); $pdf->SetX(120); - $pdf->SetFont('Arial','B',$fs+5); + $pdf->SetFont('FreeSans','B',$fs+5); $pdf->Cell(90,$h,$i,'B',0,'R'); - $pdf->SetFont('Arial','B',$fs+1); + $pdf->SetFont('FreeSans','B',$fs+1); if (isset($j) && is_array($j)) { foreach($j as $i2 => $line) { $pdf->SetY($y+$i2*5); $pdf->SetX(120); - $pdf->Cell(0,$fs,myiconv($line),'',0,'L'); + $pdf->Cell(0,$fs,$line,'',0,'L'); } } if (isset($lang['folder_info'][$i])) { - $pdf->SetFont('Arial','',$fs-4); + $pdf->SetFont('FreeSans','',$fs-4); foreach($lang['folder_info'][$i] as $i2 => $line) { $pdf->SetY($y+$i2*2); $pdf->SetX(90); - $pdf->Cell(0,$fs,myiconv($line),'',0,'L'); + $pdf->Cell(0,$fs,$line,'',0,'L'); } } $y += 15; @@ -77,72 +81,72 @@ $pdf->SetY(10); $pdf->SetX(10); - $pdf->SetFont('Arial','B',30); + $pdf->SetFont('FreeSans','B',30); $pdf->Cell(90,$h,$lang['rep_index_company'],'',0,'L'); $pdf->SetY(40); $pdf->SetX(10); - $pdf->SetFont('Arial','B',15); + $pdf->SetFont('FreeSans','B',15); $pdf->Cell(90,$h,sprintf($lang['rep_index_foldername'],$this->fid),'',0,'L'); $pdf->SetY(70); $pdf->SetX(10); - $pdf->SetFont('Arial','B',10); - $pdf->Cell(90,$h,myiconv($lang['ProdRole'][PROD_ROLE_CUSTOMER]) .":",'',0,'L'); - $pdf->SetFont('Arial','',10); + $pdf->SetFont('FreeSans','B',10); + $pdf->Cell(90,$h,$lang['ProdRole'][PROD_ROLE_CUSTOMER] .":",'',0,'L'); + $pdf->SetFont('FreeSans','',10); $i1 = 0; foreach ($this->obj->role[PROD_ROLE_CUSTOMER] as $i => $j) { $pdf->SetY(75 + $i1*5); - $pdf->Cell(90,$h,myiconv($j->getFullName()),'',0,'L'); + $pdf->Cell(90,$h,$j->getFullName(),'',0,'L'); $i1++; } $pdf->SetY(100); $pdf->SetX(10); - $pdf->SetFont('Arial','B',10); - $pdf->Cell(90,$h,myiconv($lang['Project']) .":",'',0,'L'); + $pdf->SetFont('FreeSans','B',10); + $pdf->Cell(90,$h,$lang['Project'] .":",'',0,'L'); $pdf->SetY(105); - $pdf->SetFont('Arial','',10); - $pdf->Cell(90,$h,myiconv($this->obj->name),'',0,'L'); + $pdf->SetFont('FreeSans','',10); + $pdf->Cell(90,$h,$this->obj->name,'',0,'L'); $pdf->SetY(130); $pdf->SetX(10); - $pdf->SetFont('Arial','',10); - $pdf->Cell(90,$h,myiconv($lang['ProdDesc2']) .":",'',0,'L'); + $pdf->SetFont('FreeSans','',10); + $pdf->Cell(90,$h,$lang['ProdDesc2'] .":",'',0,'L'); $pdf->SetY(135); - $pdf->SetFont('Arial','B',12); - $pdf->Cell(90,$h,myiconv($this->obj->desc2),'',0,'L'); + $pdf->SetFont('FreeSans','B',12); + $pdf->Cell(90,$h,$this->obj->desc2,'',0,'L'); $pdf->SetY(160); $pdf->SetX(10); - $pdf->SetFont('Arial','B',10); - $pdf->Cell(90,$h,myiconv($lang['ProdRole'][PROD_ROLE_MANAGER]) .":",'',0,'L'); - $pdf->SetFont('Arial','',12); + $pdf->SetFont('FreeSans','B',10); + $pdf->Cell(90,$h,$lang['ProdRole'][PROD_ROLE_MANAGER] .":",'',0,'L'); + $pdf->SetFont('FreeSans','',12); $i1 = 0; foreach ($this->obj->role[PROD_ROLE_MANAGER] as $i => $j) { $pdf->SetY(165 + $i1*5); - $pdf->Cell(90,$h,myiconv($j->getFullName()),'',1,'L'); + $pdf->Cell(90,$h,$j->getFullName(),'',1,'L'); $i1++; } $pdf->SetY(190); $pdf->SetX(10); - $pdf->SetFont('Arial','B',10); - $pdf->Cell(90,$h,myiconv($lang['ProdRole'][PROD_ROLE_COMMERCIAL]) .":",'',0,'L'); + $pdf->SetFont('FreeSans','B',10); + $pdf->Cell(90,$h,$lang['ProdRole'][PROD_ROLE_COMMERCIAL] .":",'',0,'L'); $pdf->SetY(195); - $pdf->SetFont('Arial','',12); + $pdf->SetFont('FreeSans','',12); foreach ($this->obj->role[PROD_ROLE_COMMERCIAL] as $i => $j) { - $pdf->Cell(90,$h,myiconv($j->getFullName()),'',0,'L'); + $pdf->Cell(90,$h,$j->getFullName(),'',0,'L'); } $d = new TUTOS_Date_Time(); - $pdf->SetFont('Arial','I',8); + $pdf->SetFont('FreeSans','I',8); $pdf->SetY(-15); $pdf->SetX(5); $pdf->Cell(0,10,$d->getDateTime(),0,0,'L'); // LABEL - $pdf->SetFont('Arial','',6); + $pdf->SetFont('FreeSans','',6); $pdf->SetY(-10); $pdf->SetX(5); $pdf->Cell(0,10,"generated by TUTOS ".$tutos[version],'',1,'L',0,"http://www.tutos.org"); @@ -151,9 +155,13 @@ $pdf->Close(); - $data = $pdf->buffer; - export_headers('TUTOS_'.$this->obj->name,'pdf'); + $data = $pdf->Output('','S'); + export_headers_base(); + Header("Content-Description: ". $this->obj->name ); Header('Content-Length: '.strlen($data)); + Header("Connection: close"); + Header("Content-Transfer-Encoding: binary"); + export_headers('TUTOS_'.$this->obj->name,'pdf',false); return $data; } @@ -179,4 +187,4 @@ } } -?> +?> \ No newline at end of file Modified: trunk/php/report-engine/rep_spine/rep_spine.pinc =================================================================== --- trunk/php/report-engine/rep_spine/rep_spine.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/report-engine/rep_spine/rep_spine.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -11,6 +11,8 @@ */ $tutos['files'][__FILE__] = '$Rev$'; +require_once 'pdf2.pinc'; + class rep_spine extends rep_base { function __construct($dbconn,$report) { @@ -33,6 +35,8 @@ $this->obj->readroles(); $pdf=new tutospdf($this->dbconn); + $pdf->setPrintFooter(false); + $pdf->setPrintHeader(false); $pdf->Open(); $pdf->setAuthor($this->obj->creator->getFullName()); $pdf->setTitle($this->obj->getFullName()); @@ -51,17 +55,17 @@ $h = 0; $pdf->SetY($yoff + 20); $pdf->SetX($xoff + $pos * $w); - $pdf->SetFont('Arial','B',22); + $pdf->SetFont('FreeSans','B',22); $pdf->Cell($w,$h,$lang['rep_spine_company'],'',0,'C'); $pdf->SetY($yoff + 45); $pdf->SetX($xoff + $pos * $w); - $pdf->SetFont('Arial','B',12); + $pdf->SetFont('FreeSans','B',12); $pdf->Cell($w,$h,$lang['rep_spine_department'],'',0,'C'); $pdf->SetY($yoff + 60); $pdf->SetX($xoff + $pos * $w); - $pdf->SetFont('Arial','B',15); + $pdf->SetFont('FreeSans','B',13); $xx = explode("/",$this->obj->desc2); $pdf->Cell($w,$h,$xx[0],'',0,'C'); $pdf->SetY($yoff + 65); @@ -71,16 +75,16 @@ } $pdf->SetY($yoff + 85); $pdf->SetX($xoff + $pos * $w); - $pdf->SetFont('Arial','',7); + $pdf->SetFont('FreeSans','',7); $pdf->Cell($w,$h,$lang['rep_spine_title'],'',0,'C'); $pdf->SetY($yoff + 110); $pdf->SetX($xoff + $pos * $w); - $pdf->SetFont('Arial','B',10); + $pdf->SetFont('FreeSans','B',10); $pdf->Cell($w,$h,$this->obj->getFullName(),'',0,'C'); //Ordnernummer - $pdf->SetFont('Arial','B',9); + $pdf->SetFont('FreeSans','B',9); $i1 = 0; foreach ($this->obj->role[PROD_ROLE_MANAGER] as $i => $j) { $pdf->SetY($yoff + 175+ $i1*5); @@ -92,31 +96,34 @@ //Ordnernummer $pdf->SetY($yoff + 195); $pdf->SetX($xoff + $pos * $w); - $pdf->SetFont('Arial','B',10); + $pdf->SetFont('FreeSans','B',10); $pdf->Cell($w,$h,$this->fid,'',0,'C'); $pdf->SetY($yoff + 222); $pdf->SetX($xoff + $pos * $w); - $pdf->SetFont('Arial','B',35); + $pdf->SetFont('FreeSans','B',35); $pdf->Cell($w,$h,"O",'',0,'C'); $pdf->SetY($yoff + 259); $pdf->SetX($xoff + $pos * $w); - $pdf->SetFont('Arial','',7); + $pdf->SetFont('FreeSans','',7); $pdf->Cell($w,$h,$lang['rep_spine_subline1_head'],'',0,'C'); $pdf->SetY($yoff + 274); $pdf->SetX($xoff + $pos * $w); - $pdf->SetFont('Arial','',7); + $pdf->SetFont('FreeSans','',7); $pdf->Cell($w,$h,$lang['rep_spine_subline2_head'],'',0,'C'); $pdf->Close(); - $data = $pdf->buffer; - - export_headers('TUTOS_'.$this->obj->name,'pdf'); + $data = $pdf->Output('','S'); + export_headers_base(); + Header("Content-Description: ". $this->obj->name ); Header('Content-Length: '.strlen($data)); + Header("Connection: close"); + Header("Content-Transfer-Encoding: binary"); + export_headers('TUTOS_'.$this->obj->name,'pdf',false); return $data; } @@ -152,4 +159,4 @@ } -?> +?> \ No newline at end of file Modified: trunk/php/res_cal.php =================================================================== --- trunk/php/res_cal.php 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/res_cal.php 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2014 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -625,8 +625,7 @@ } if ( $this->base->gettype() == "team" ) { $this->base->read_member(); - @reset($this->base->member); - while ( list ($i,$f) = @each ($this->base->member) ) { + foreach($this->base->member as $i => $f) { $this->uids[$i] = $f; } } else if ( $this->base->gettype() == "address" ) { Modified: trunk/php/scrum/log_overview.php =================================================================== --- trunk/php/scrum/log_overview.php 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/scrum/log_overview.php 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2009 - 2014 by Gero Kohnert + * Copyright 2009 - 2020 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 @@ -192,7 +192,7 @@ } // Prio if ($this->head['prio']) { - $x = '<div class="logprio" style="'.$obj->getPrioColor($obj->prio).'">'; + $x = '<div class="logprio" style="'.ScrumLog::getPrioColor($obj->prio).'">'; if ($obj->mod_ok() && !is_object($obj->sprint)) { $u = addUrlParameter($this->link1,'action=PP'); $u = addUrlParameter($u,'mark[]='.$obj->id); @@ -234,9 +234,9 @@ $obj->readTimetrackSum(); $x = ''; if ( ($this->user->id == $obj->w_id) && - ($obj->state != SCRUMLOGSTATE_DONE) && - ($obj->sprint->state != SCRUMSPRINT_STATE_CLOSED) && - ($obj->sprint->state != SCRUMSPRINT_STATE_INITIAL) ) { + ($obj->state != SCRUMLOGSTATE_DONE) && + ($obj->sprint->state != SCRUMSPRINT_STATE_CLOSED) && + ($obj->sprint->state != SCRUMSPRINT_STATE_INITIAL) ) { $url = 'timetrack/timetrack_new.php?lid='.$obj->id; $url = addUrlParameter($url,'hide[]=distance'); $url = addUrlParameter($url,'state=0'); @@ -608,10 +608,10 @@ // Link to personal backlog $l = 'scrum/log_overview.php?w_id='.$this->user->id; $x = array( url => $l, - text => $lang['ScrumLogU'], - info => $lang['ScrumLogU'], - category => array('support','sprint',USESCRUMLOG) - ); + text => $lang['ScrumLogU'], + info => $lang['ScrumLogU'], + category => array('support','sprint',USESCRUMLOG) + ); $this->addMenu($x); if ( isset($_GET['maxshow']) && ($_GET['maxshow'] != "") ) { @@ -623,19 +623,19 @@ if ( $this->format != 'csv' ) { $ll = addUrlParameter($this->link1,'format=csv'); $x = array( url => $ll, - text => $lang['Export'].' (CSV)', - info => $lang['Export'].' (CSV)', - category => array('csv','sprint','view',USESCRUMLOG) - ); + text => $lang['Export'].' (CSV)', + info => $lang['Export'].' (CSV)', + category => array('csv','sprint','view',USESCRUMLOG) + ); $this->addMenu($x); } if ( $this->format != "paper" ) { $ll = addUrlParameter($this->link1,'format=paper'); $x = array( url => $ll, - text => $lang['Printable'], - info => $lang['PrintableInfo'], - category => array('print','sprint','view',USESCRUMLOG) - ); + text => $lang['Printable'], + info => $lang['PrintableInfo'], + category => array('print','sprint','view',USESCRUMLOG) + ); $this->addMenu($x); } Modified: trunk/php/scrum/scrum.pinc =================================================================== --- trunk/php/scrum/scrum.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/scrum/scrum.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2014 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -176,7 +176,7 @@ $info .= '<tr><th>'.$name .'</th></tr>'; $info .= '<tr><td nowrap="nowrap">'.$lang['ScrumLogRCap'].': '. hour_format($this->capacity).' '.$lang['hours'].'</td></tr>'; - $info .= '<tr><td nowrap="nowrap">'.$lang['ScrumLogPrio'].':<span style="'.$this->getPrioColor($this->prio).'"> '. $this->prio .'  </span> '.$this->start_dt->getDate().'</td></tr>'; + $info .= '<tr><td nowrap="nowrap">'.$lang['ScrumLogPrio'].':<span style="'.ScrumLog::getPrioColor($this->prio).'"> '. $this->prio .'  </span> '.$this->start_dt->getDate().'</td></tr>'; if (is_object($this->worker)) $info .= '<tr><td>'.$lang['ScrumLogWorker'].': '. $this->worker->getFullName().'</td></tr>'; @@ -431,7 +431,7 @@ /** * get the Prio Color as triple hex (RGB) */ - function getPrioColor($prio) { + static function getPrioColor($prio) { $steps = SCRUMLOG_MAXPRIO; $step = floor(256 / $steps); $b = '#'; @@ -1823,4 +1823,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/sipgate/sipgate.pinc =================================================================== --- trunk/php/sipgate/sipgate.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/sipgate/sipgate.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2005 - 2011 by Gero Kohnert + * Copyright 2005 - 2020 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 @@ -17,7 +17,7 @@ /** * run the handler */ - function handle(&$obj,$arg,$cnt) { + function handle($obj,$arg,$cnt) { global $tutos,$lang,$current_user; $r = ''; @@ -59,7 +59,7 @@ /** * check if all is ok */ - function check(&$obj,$arg) { + function check($obj,$arg) { global $tutos; if (!isset($tutos['sipaddress'])) { return false; @@ -68,4 +68,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/subversion/revision.pinc =================================================================== --- trunk/php/subversion/revision.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/subversion/revision.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2002 - 2013 by Gero Kohnert + * Copyright 2002 - 2020 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 @@ -33,7 +33,7 @@ /** * run the handler */ - function handle(tutos_base $obj,$arg,$cnt) { + function handle($obj,$arg,$cnt) { global $lang,$current_user; // search the svn object @@ -78,4 +78,4 @@ return false; } } -?> \ No newline at end of file +?> Modified: trunk/php/user.pinc =================================================================== --- trunk/php/user.pinc 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/user.pinc 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2017 by Gero Kohnert + * Copyright 1999 - 2020 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 @@ -177,7 +177,7 @@ } if ( strlen($holidays) > 0 ) { $h = preg_split("#,#",$holidays); - while( list ($i,$f) = @each ($h) ) { + foreach($h as $i => $f) { $this->holiday[strtolower($f)] = 1; } } @@ -187,7 +187,7 @@ } if ( strlen($rowiconsbefore) > 0 ) { $h = preg_split("#,#",$rowiconsbefore); - while( list ($i,$f) = @each ($h) ) { + foreach($h as $i => $f) { if ( $f != "" ) $this->rowiconsbefore[strtolower($f)] = 1; } @@ -198,7 +198,7 @@ } if ( strlen($rowiconsafter) > 0 ) { $h = preg_split("#,#",$rowiconsafter); - while( list ($i,$f) = @each ($h) ) { + foreach($h as $i => $f) { if ( $f != "" ) $this->rowiconsafter[strtolower($f)] = 1; } @@ -206,7 +206,7 @@ $namedays = $r->get($pos, "namedays"); if ( strlen($namedays) > 0 ) { $h = preg_split("#,#",$namedays); - while( list ($i,$f) = @each ($h) ) { + foreach($h as $i => $f) { if ( $f != "" ) $this->nameday[strtolower($f)] = 1; } @@ -220,7 +220,7 @@ if ( strlen($wd) > 0 ) { $this->workday = array(); $h = preg_split("#,#",$wd); - while( list ($i,$f) = @each ($h) ) { + foreach($h as $i => $f) { if ( is_numeric($f) ) { $this->workday[] = $f; } @@ -1116,4 +1116,4 @@ } } $tutos['classes'][useuser] = 'Tutos_user'; -?> \ No newline at end of file +?> Modified: trunk/php/webelements.p3 =================================================================== --- trunk/php/webelements.p3 2020-12-31 10:23:57 UTC (rev 1338) +++ trunk/php/webelements.p3 2020-12-31 14:32:52 UTC (rev 1339) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2014 Gero Kohnert + * Copyright 1999 - 2020 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 @@ -842,7 +842,7 @@ if ($f == 'php' ) break; unset($d[$i]); } - $dir = implode($d,'/'); + $dir = implode('/',$d); if ( $dir == "/" ) { $dir = ""; } @@ -3745,4 +3745,4 @@ return join("\n",$out); } -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2020-12-31 10:23:59
|
Revision: 1338 http://sourceforge.net/p/tutos/code/1338 Author: gokohnert Date: 2020-12-31 10:23:57 +0000 (Thu, 31 Dec 2020) Log Message: ----------- added .svnignore Added Paths: ----------- trunk/php/bugtracking/.svnignore trunk/php/checklist/.svnignore trunk/php/counter/.svnignore trunk/php/expense/.svnignore trunk/php/file/.svnignore trunk/php/group/.svnignore trunk/php/installation/.svnignore trunk/php/invoice/.svnignore trunk/php/module_template/.svnignore trunk/php/note/.svnignore trunk/php/rate/.svnignore trunk/php/reminder/.svnignore trunk/php/scrum/.svnignore trunk/php/testmanager/.svnignore trunk/php/timetrack/.svnignore trunk/php/url/.svnignore trunk/php/watchlist/.svnignore Added: trunk/php/bugtracking/.svnignore =================================================================== --- trunk/php/bugtracking/.svnignore (rev 0) +++ trunk/php/bugtracking/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/checklist/.svnignore =================================================================== --- trunk/php/checklist/.svnignore (rev 0) +++ trunk/php/checklist/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/counter/.svnignore =================================================================== --- trunk/php/counter/.svnignore (rev 0) +++ trunk/php/counter/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/expense/.svnignore =================================================================== --- trunk/php/expense/.svnignore (rev 0) +++ trunk/php/expense/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/file/.svnignore =================================================================== --- trunk/php/file/.svnignore (rev 0) +++ trunk/php/file/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/group/.svnignore =================================================================== --- trunk/php/group/.svnignore (rev 0) +++ trunk/php/group/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/installation/.svnignore =================================================================== --- trunk/php/installation/.svnignore (rev 0) +++ trunk/php/installation/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/invoice/.svnignore =================================================================== --- trunk/php/invoice/.svnignore (rev 0) +++ trunk/php/invoice/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,4 @@ +*_custom.p3 +custom.pinc +invoice_*.txt +.svnignore Added: trunk/php/module_template/.svnignore =================================================================== --- trunk/php/module_template/.svnignore (rev 0) +++ trunk/php/module_template/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/note/.svnignore =================================================================== --- trunk/php/note/.svnignore (rev 0) +++ trunk/php/note/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/rate/.svnignore =================================================================== --- trunk/php/rate/.svnignore (rev 0) +++ trunk/php/rate/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/reminder/.svnignore =================================================================== --- trunk/php/reminder/.svnignore (rev 0) +++ trunk/php/reminder/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/scrum/.svnignore =================================================================== --- trunk/php/scrum/.svnignore (rev 0) +++ trunk/php/scrum/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/testmanager/.svnignore =================================================================== --- trunk/php/testmanager/.svnignore (rev 0) +++ trunk/php/testmanager/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/timetrack/.svnignore =================================================================== --- trunk/php/timetrack/.svnignore (rev 0) +++ trunk/php/timetrack/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/url/.svnignore =================================================================== --- trunk/php/url/.svnignore (rev 0) +++ trunk/php/url/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore Added: trunk/php/watchlist/.svnignore =================================================================== --- trunk/php/watchlist/.svnignore (rev 0) +++ trunk/php/watchlist/.svnignore 2020-12-31 10:23:57 UTC (rev 1338) @@ -0,0 +1,3 @@ +*_custom.p3 +custom.pinc +.svnignore This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2019-11-25 08:18:07
|
Revision: 1337 http://sourceforge.net/p/tutos/code/1337 Author: gokohnert Date: 2019-11-25 08:18:05 +0000 (Mon, 25 Nov 2019) Log Message: ----------- patch by Paddy Doyle https://sourceforge.net/p/tutos/bugs/503/ Modified Paths: -------------- trunk/php/permission.p3 Modified: trunk/php/permission.p3 =================================================================== --- trunk/php/permission.p3 2018-03-12 11:55:26 UTC (rev 1336) +++ trunk/php/permission.p3 2019-11-25 08:18:05 UTC (rev 1337) @@ -851,7 +851,7 @@ if ($file == basename($tutos[errlog]).'.sql') continue; if ($file == basename($tutos[errlog]).'.mail') continue; - $filename = $tutos[sessionpath] .'/'. $file; + $filename = dirname($tutos[errlog]) . '/' . $file; if ( ! is_writeable($filename) ) continue; // calc the age in days @@ -859,7 +859,7 @@ if ($age < 60) { continue; } - //echo $filename." ". $age ."<br>"; + dterror_log("remove_debugfiles: deleting: $filename\n", 3, $tutos[errlog]); unlink($filename); } closedir($handle); @@ -892,4 +892,4 @@ . 'WHERE (a.perm is null OR a.perm>='.$tutos[seeok].')' .' AND ((a.adr_id is null) OR (a.adr_id='.$user_id.') OR (a.adr_id=0) OR (a.adr_id < 0)'. $t2 .' )'; } -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2018-03-12 11:55:29
|
Revision: 1336 http://sourceforge.net/p/tutos/code/1336 Author: gokohnert Date: 2018-03-12 11:55:26 +0000 (Mon, 12 Mar 2018) Log Message: ----------- prepare for dockerfile Modified Paths: -------------- trunk/Makefile Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2017-09-29 14:28:15 UTC (rev 1335) +++ trunk/Makefile 2018-03-12 11:55:26 UTC (rev 1336) @@ -2,7 +2,7 @@ # the ultimate team organization software # --------------------------------------- # -# Copyright 1999-2016 by Gero Kohnert +# Copyright 1999-2018 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 @@ -463,7 +463,7 @@ $(wildcard libs/tcpdf/fonts/*.z) \ $(wildcard libs/tcpdf/config/*.php) \ libs/tcpdf/TUTOS-README \ - libs/tcpdf/README.TXT \ + libs/tcpdf/README.md \ libs/tcpdf/LICENSE.TXT LIBS_CKEDITOR = \ @@ -795,6 +795,7 @@ @tar -T php.list --no-recursion -czf TUTOS-php-${FULLVERSION}.tar.gz @cat php.list | $(ZIP) $(ZIPARGS) -@ TUTOS-php-${FULLVERSION}.zip $(ZIP) TUTOS-php-${FULLVERSION}.zip -z < README + @ln -fs TUTOS-php-${FULLVERSION}.tar.bz2 TUTOS-php-current.tar.bz2 @$(ECHO) "# Packages created (PHP)" upload-php: download-php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-09-29 14:28:17
|
Revision: 1335 http://sourceforge.net/p/tutos/code/1335 Author: gokohnert Date: 2017-09-29 14:28:15 +0000 (Fri, 29 Sep 2017) Log Message: ----------- update Modified Paths: -------------- trunk/php/report-engine/report_show.php Modified: trunk/php/report-engine/report_show.php =================================================================== --- trunk/php/report-engine/report_show.php 2017-09-29 14:27:19 UTC (rev 1334) +++ trunk/php/report-engine/report_show.php 2017-09-29 14:28:15 UTC (rev 1335) @@ -22,7 +22,7 @@ require_once 'webelements.p3'; require_once 'permission.p3'; require_once 'reporter.pinc'; -require_once 'pdf.pinc'; +#require_once 'pdf.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. |
From: <gok...@us...> - 2017-09-29 14:27:21
|
Revision: 1334 http://sourceforge.net/p/tutos/code/1334 Author: gokohnert Date: 2017-09-29 14:27:19 +0000 (Fri, 29 Sep 2017) Log Message: ----------- update Modified Paths: -------------- trunk/php/invoice/invoice.pinc trunk/php/invoice/invoice_pdf.pinc trunk/php/invoice/invoice_show.php Modified: trunk/php/invoice/invoice.pinc =================================================================== --- trunk/php/invoice/invoice.pinc 2017-09-29 12:46:52 UTC (rev 1333) +++ trunk/php/invoice/invoice.pinc 2017-09-29 14:27:19 UTC (rev 1334) @@ -941,7 +941,7 @@ $pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); $pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); - $pdf->SetHeaderData($tutos['logo'],15,$this->name,$this->name); + $pdf->SetHeaderData($tutos['logo'],15,$lang['Invoice']." ". $this->getFullName(),$this->name); $pdf->AddPage(); $pdf->SetFont('times','B',12); Modified: trunk/php/invoice/invoice_pdf.pinc =================================================================== --- trunk/php/invoice/invoice_pdf.pinc 2017-09-29 12:46:52 UTC (rev 1333) +++ trunk/php/invoice/invoice_pdf.pinc 2017-09-29 14:27:19 UTC (rev 1334) @@ -1,6 +1,6 @@ <?php /* - * Copyright 2003 - 2014 by Gero Kohnert + * Copyright 2003 - 2017 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -11,7 +11,7 @@ */ $tutos['files'][__FILE__] = '$Rev$'; -class invoice_pdf extends TCPDF { +class invoice_pdf extends Tutospdf { function __construct(tutos_base $obj) { global $tutos; @@ -20,10 +20,6 @@ $this->obj = $obj; - $this->setCreator('TCPDF and TUTOS Version '.$tutos[version]); - $this->setKeywords("TUTOS"); - $this->setDisplayMode('fullpage','continuous'); - $this->SetCompression(true); $this->SetAutoPageBreak(true,25); $this->setTopMargin(18); $this->setHeaderMargin(0); @@ -31,43 +27,6 @@ } /** - * Page header - */ - function Header() { - global $lang,$tutos; - - - $this->SetX(40); - # $this->SetFont('Arial','B',2); - # $this->Text(40,40, "X:".$this->obj->dbconn->db->logo); - - $p = (preg_match("#^http#i",$tutos['logo']) ? '':$tutos['base']."/" ). myentities($tutos['logo']); - - //Title - if ($this->PageNo() == 1) { - //Logo - if (preg_match("#png#i",$tutos['logo'])) { - $this->Image($p,10,2,20,0,"PNG"); - } else if (preg_match("#jpg#i",$tutos['logo']) || preg_match("#jpeg#i",$tutos['logo']) ) { - $this->Image($p,10,2,20,0,"JPG"); - } - $this->SetFont('times','B',26); - $this->Cell(0,20, $lang['Invoice']." ". $this->obj->getFullName(),1,1,'C'); - } else { - if (preg_match("#png#i",$tutos['logo'])) { - $this->Image($p,10,2,10,0,"PNG"); - } else if (preg_match("#jpg#i",$tutos['logo']) || preg_match("#jpeg#i",$tutos['logo']) ) { - $this->Image($p,10,2,10,0,"JPG"); - } - $this->SetFont('times','B',12); - $this->Cell(90,8,$lang[$this->obj->getType()].":". $this->obj->getFullName() ,1,0,'L'); - } - - //Line break - $this->Ln(20); - } - - /** * add a template block from a file */ function addFileBlock($fname,$h = 5) { @@ -129,11 +88,8 @@ $this->SetY(-26); $this->SetFont('times','',5); $this->addFileBlock("invoice_footer.txt",1.5); - //Position at 1.5 cm from bottom - $this->SetY(-14); - $this->SetFont('times','I',8); - //Page number - $this->Cell(0,10,sprintf($lang['pageof'],$this->PageNo(),$this->getAliasNbPages()),0,0,'C'); + + parent::Footer(); } } ?> \ No newline at end of file Modified: trunk/php/invoice/invoice_show.php =================================================================== --- trunk/php/invoice/invoice_show.php 2017-09-29 12:46:52 UTC (rev 1333) +++ trunk/php/invoice/invoice_show.php 2017-09-29 14:27:19 UTC (rev 1334) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2002 - 2014 by Gero Kohnert + * Copyright 2002 - 2017 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 @@ -21,6 +21,7 @@ ini_set("include_path",".."); require_once 'webelements.p3'; require_once 'permission.p3'; +require_once 'pdf2.pinc'; /* Check if user is allowed to use it */ check_user(); @@ -236,20 +237,22 @@ add_module_addlinks($this,$this->obj); if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) { - $x = array( url => $this->obj->getModUrl(), - text => $lang['Modify'], - info => sprintf($lang['InvModInfo'],$this->obj->getFullname()), - category => array('invoice','mod','obj',useinvoice) - ); + $x = array( + url => $this->obj->getModUrl(), + text => $lang['Modify'], + info => sprintf($lang['InvModInfo'],$this->obj->getFullname()), + category => array('invoice','mod','obj',useinvoice) + ); $this->addMenu($x); } if ( ($this->obj->id > 0) && $this->obj->see_ok() && class_exists( 'TCPDF') ) { - $x = array( url => $this->obj->getUrl() .'&format=pdf', - text => $lang['InvDocument'], - info => $lang['InvDocumentI'], - category => array('invoice','view','pdf',useinvoice) - ); + $x = array( + url => $this->obj->getUrl() .'&format=pdf', + text => $lang['InvDocument'], + info => $lang['InvDocumentI'], + category => array('invoice','view','pdf',useinvoice) + ); $this->addMenu($x); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-09-29 12:46:55
|
Revision: 1333 http://sourceforge.net/p/tutos/code/1333 Author: gokohnert Date: 2017-09-29 12:46:52 +0000 (Fri, 29 Sep 2017) Log Message: ----------- updates Modified Paths: -------------- trunk/php/invoice/invoice.pinc trunk/php/pdf2.pinc trunk/php/report-engine/reporter.pinc trunk/php/url/url.pinc trunk/php/url/urlcat_show.php Modified: trunk/php/invoice/invoice.pinc =================================================================== --- trunk/php/invoice/invoice.pinc 2017-09-19 15:18:37 UTC (rev 1332) +++ trunk/php/invoice/invoice.pinc 2017-09-29 12:46:52 UTC (rev 1333) @@ -973,7 +973,7 @@ $tbl .= ' <table border ="0.5" cellpadding="2"> <thead> - <tr> + <tr nobr="true"> <th style="background-color:#BBB" align="center"><b>'.$lang['InvPosPos'].'</b></th> <th style="background-color:#BBB" align="center"><b>'.$lang['InvPosItems'].'</b></th> <th style="background-color:#BBB" align="center"><b>'.$lang['InvPosIType'].'</b></th> @@ -986,7 +986,7 @@ '; foreach($this->pos as $i => $f) { - $tbl .= '<tr>'; + $tbl .= '<tr nobr="true">'; // Default line height $l = explode("\n",$f->description); $subline = 1; @@ -1008,7 +1008,7 @@ $tbl .= '</tr>'; } // Summary - $tbl .= '<tr>'; + $tbl .= '<tr nobr="true">'; $tbl .= '<td colspan="5"> </td>'; $cc = ''; foreach($tutos[currencies] as $c) { @@ -1149,7 +1149,7 @@ while ($a < $n) { $i = new invoice($obj->dbconn); $i->read_result($r,$a); - if ( $i->see_ok() ) { + if (is_object($i) && $i->see_ok() ) { $obj->list[useinvoice][1][$i->id] = &$i; } $a++; @@ -1165,7 +1165,7 @@ while ($a < $n) { $i = new invoice($obj->dbconn); $i = $i->read($r->get($a,"inv_id"),$i); - if ( $i->see_ok() ) { + if ( is_object($i) && $i->see_ok() ) { $obj->list[useinvoice][2][$i->id] = &$i; } $a++; Modified: trunk/php/pdf2.pinc =================================================================== --- trunk/php/pdf2.pinc 2017-09-19 15:18:37 UTC (rev 1332) +++ trunk/php/pdf2.pinc 2017-09-29 12:46:52 UTC (rev 1333) @@ -26,6 +26,7 @@ } if (file_exists($tutos['base'] .'/php/pdf_custom.php')) { + // source a alternate PDF class which has to be named Tutospdf require_once $tutos['base'] .'/php/pdf_custom.php'; return; } Modified: trunk/php/report-engine/reporter.pinc =================================================================== --- trunk/php/report-engine/reporter.pinc 2017-09-19 15:18:37 UTC (rev 1332) +++ trunk/php/report-engine/reporter.pinc 2017-09-29 12:46:52 UTC (rev 1333) @@ -54,6 +54,7 @@ return; } $cname = $report[$name]['classname']; + ReadLang1($lang,dirname($tutos['base'] ."/php/report-engine/".$report[$name]['dir']."/".$report[$name]['file'] ),$current_user); $this->report = new $cname($this->dbconn,$report[$name]); if (isset($report[$name]['category'])) { $this->category = $report[$name]['category']; @@ -61,7 +62,6 @@ if (isset($report[$name]['target'])) { $this->target = $report[$name]['target']; } - ReadLang1($lang,dirname($tutos['base'] ."/php/report-engine/".$report[$name]['dir']."/".$report[$name]['file'] ),$current_user); return; } Modified: trunk/php/url/url.pinc =================================================================== --- trunk/php/url/url.pinc 2017-09-19 15:18:37 UTC (rev 1332) +++ trunk/php/url/url.pinc 2017-09-29 12:46:52 UTC (rev 1333) @@ -758,7 +758,7 @@ /** * create a list of urls for the given object and given user */ - static function infolist (tutos_user $user,tutos_base $obj,$cols,$format) { + static function infolist (tutos_user $user,tutos_base $obj,$cols,$format = "html") { global $lang; $r = ''; Modified: trunk/php/url/urlcat_show.php =================================================================== --- trunk/php/url/urlcat_show.php 2017-09-19 15:18:37 UTC (rev 1332) +++ trunk/php/url/urlcat_show.php 2017-09-29 12:46:52 UTC (rev 1333) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2000 - 2013 by Gero Kohnert + * Copyright 2000 - 2017 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -47,7 +47,7 @@ $r .= $this->showdata('<b><font size="+1">'. myentities($this->obj->name) .'</font></b>'); $r .= $this->ContentRowEnd(); - $r .= url::infolist($this->user,$this->obj,$this->width); + $r .= url::infolist($this->user,$this->obj,$this->width,$this->format); // Show additional custom fields $r .= show_custom_fields($this,$this->obj->gettype(),$this->obj,$this->width); // References to modules @@ -100,6 +100,6 @@ $dbconn->Close(); ?> <!-- -SVN Info $Id$ -$Author$ ---> \ No newline at end of file + 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. |
From: <gok...@us...> - 2017-09-19 15:18:39
|
Revision: 1332 http://sourceforge.net/p/tutos/code/1332 Author: gokohnert Date: 2017-09-19 15:18:37 +0000 (Tue, 19 Sep 2017) Log Message: ----------- updated pdf generation Modified Paths: -------------- trunk/php/address_overview.php trunk/php/group/group_show.php trunk/php/invoice/invoice_pdf.pinc trunk/php/pdf2.pinc trunk/php/product_contacts.php trunk/php/stuff/stuff_overview.php trunk/php/team_show.php Modified: trunk/php/address_overview.php =================================================================== --- trunk/php/address_overview.php 2017-09-14 17:38:33 UTC (rev 1331) +++ trunk/php/address_overview.php 2017-09-19 15:18:37 UTC (rev 1332) @@ -104,6 +104,7 @@ $tbl .= '</tr>'; } $tbl .= '</table>'; + $pdf->SetFont('times', '', 8); $pdf->writeHTML($tbl, true, false, false, false, ''); @@ -191,9 +192,9 @@ $r .= txt2csv($a->l_name); // Check for empty adress if ( ($l->street1 == '') && - ($l->street2 == '') && - ($l->zip == '') && - ($l->city == '') ) { + ($l->street2 == '') && + ($l->zip == '') && + ($l->city == '') ) { // Try to get Address from eleswhere if (is_object($l->department)) { $l->department->read_locs_data(); @@ -200,9 +201,9 @@ if (isset($l->department->location) && count($l->department->location) > 0) { foreach($l->department->location as $ld) { if ( ($ld->street1 != '') || - ($ld->street2 != '') || - ($ld->zip != '') || - ($ld->city != '') ) { + ($ld->street2 != '') || + ($ld->zip != '') || + ($ld->city != '') ) { $l->street1 = $ld->street1; $l->street2 = $ld->street2; $l->zip = $ld->zip; @@ -214,9 +215,9 @@ } } if ( ($l->street1 == '') && - ($l->street2 == '') && - ($l->zip == '') && - ($l->city == '') ) { + ($l->street2 == '') && + ($l->zip == '') && + ($l->city == '') ) { // Try to get Address from eleswhere if (is_object($l->company)) { $l->company->read_locs_data(); @@ -223,9 +224,9 @@ if (isset($l->company->location) && count($l->company->location) > 0) { foreach($l->company->location as $lc) { if ( ($lc->street1 != '') || - ($lc->street2 != '') || - ($lc->zip != '') || - ($lc->city != '') ) { + ($lc->street2 != '') || + ($lc->zip != '') || + ($lc->city != '') ) { $l->street1 = $lc->street1; $l->street2 = $lc->street2; $l->zip = $lc->zip; @@ -554,37 +555,37 @@ if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) { $x = array( url => 'address_new.php', - text => $lang['NewEntry'], - info => $lang['AdrCreateInfo'], - category => array('address','new','obj',useaddressbook) - ); + text => $lang['NewEntry'], + info => $lang['AdrCreateInfo'], + category => array('address','new','obj',useaddressbook) + ); $this->addMenu($x); } if ( $this->format != 'csv' ) { $ll = addUrlParameter($this->link1,'format=csv'); $x = array( url => $ll, - text => $lang['Export'].' (CSV)', - info => $lang['Export'].' (CSV)', - category => array('csv','address','view',useaddressbook) - ); + text => $lang['Export'].' (CSV)', + info => $lang['Export'].' (CSV)', + category => array('csv','address','view',useaddressbook) + ); $this->addMenu($x); } if ( $this->format != "paper" ) { $ll = addUrlParameter($this->link1,'format=paper'); $x = array( url => $ll, - text => $lang['Printable'], - info => $lang['PrintableInfo'], - category => array('print','address','view',useaddressbook) - ); + text => $lang['Printable'], + info => $lang['PrintableInfo'], + category => array('print','address','view',useaddressbook) + ); $this->addMenu($x); } if ( $this->format != "pdf" ) { $ll = addUrlParameter($this->link1,'format=pdf'); $x = array( url => $ll, - text => 'PDF', - info => 'PDF', - category => array('pdf','address','view',useaddressbook) - ); + text => 'PDF', + info => 'PDF', + category => array('pdf','address','view',useaddressbook) + ); $this->addMenu($x); } Modified: trunk/php/group/group_show.php =================================================================== --- trunk/php/group/group_show.php 2017-09-14 17:38:33 UTC (rev 1331) +++ trunk/php/group/group_show.php 2017-09-19 15:18:37 UTC (rev 1332) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2001 - 2013 by Gero Kohnert + * Copyright 2001 - 2017 by Gero Kohnert * * SVN Info $Id$ * $Author$ @@ -168,7 +168,7 @@ $tbl .= ' <td colspan="4">'.$this->obj->member[$i][2]->getDate().' '.$this->obj->member[$i][1].'</td>'; $tbl .= '</tr>'; } else if ($x == "team") { - $tbl .= '<tr>'; + $tbl .= '<tr nobr="true">'; $tbl .= ' <td rowspan="2">'.$lang[$x].' '.$obj->getFullName().'</td>'; $tbl .= ' <td></td>'; $tbl .= ' <td></td>'; @@ -179,7 +179,7 @@ $tbl .= ' <td colspan="4">'.$this->obj->member[$i][2]->getDate().' '.$this->obj->member[$i][1].'</td>'; $tbl .= '</tr>'; } else { - $tbl .= '<tr>'; + $tbl .= '<tr nobr="true">'; $tbl .= ' <td rowspan="2">'.$lang[$x].' '.$obj->getFullName().'</td>'; $tbl .= ' <td></td>'; $tbl .= ' <td></td>'; @@ -200,7 +200,7 @@ $pdf->Close(); $data = $pdf->Output('','S'); - export_headers('TUTOS_'.$this->obj->name,'pdf'); + export_headers('TUTOS_'.$this->obj->name,'pdf',false); Header('Content-Length: '.strlen($data)); return $data; } @@ -382,32 +382,32 @@ if ( $this->user->feature_ok(usegroups,PERM_NEW) ) { $x = array( url => 'group/group_new.php', - text => $lang['NewEntry'], - info => $lang['GroupCreate'], - category => array('group','new','obj',usegroups) - ); + text => $lang['NewEntry'], + info => $lang['GroupCreate'], + category => array('group','new','obj',usegroups) + ); $this->addMenu($x); } if ( $this->obj->mod_ok() ) { $x = array( url => $this->obj->getModUrl(), - text => $lang['Modify'], - info => sprintf($lang['GroupModifyI'],$this->obj->getFullName()), - category => array('group','mod','obj',usegroups) - ); + text => $lang['Modify'], + info => sprintf($lang['GroupModifyI'],$this->obj->getFullName()), + category => array('group','mod','obj',usegroups) + ); $this->addMenu($x); } if (($this->obj->id > 0) && $this->user->feature_ok(usegroups,PERM_SEE) ) { $x = array( url => 'group/group_show.php?format=pdf&id='.$this->obj->id, - text => 'PDF', - info => 'PDF', - category => array('group','view','pdf',usegroups) - ); + text => 'PDF', + info => 'PDF', + category => array('group','view','pdf',usegroups) + ); $this->addMenu($x); $x = array( url => 'group/group_show.php?format=csv&id='.$this->obj->id, - text => 'CSV', - info => 'CSV', - category => array('group','view','csv',usegroups) - ); + text => 'CSV', + info => 'CSV', + category => array('group','view','csv',usegroups) + ); $this->addMenu($x); } $x = $this->obj->getMailLink(); Modified: trunk/php/invoice/invoice_pdf.pinc =================================================================== --- trunk/php/invoice/invoice_pdf.pinc 2017-09-14 17:38:33 UTC (rev 1331) +++ trunk/php/invoice/invoice_pdf.pinc 2017-09-19 15:18:37 UTC (rev 1332) @@ -17,7 +17,7 @@ global $tutos; parent::__construct('P','mm',$tutos[paperformat], true, 'UTF-8', false,true); - # $this->AliasNbPages("{nb}"); + $this->obj = $obj; $this->setCreator('TCPDF and TUTOS Version '.$tutos[version]); @@ -133,7 +133,7 @@ $this->SetY(-14); $this->SetFont('times','I',8); //Page number - $this->Cell(0,10,sprintf($lang['pageof'],$this->PageNo(),'{nb}'),0,0,'C'); + $this->Cell(0,10,sprintf($lang['pageof'],$this->PageNo(),$this->getAliasNbPages()),0,0,'C'); } } ?> \ No newline at end of file Modified: trunk/php/pdf2.pinc =================================================================== --- trunk/php/pdf2.pinc 2017-09-14 17:38:33 UTC (rev 1331) +++ trunk/php/pdf2.pinc 2017-09-19 15:18:37 UTC (rev 1332) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2004 - 2014 by Gero Kohnert + * Copyright 2004 - 2017 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -13,6 +13,8 @@ */ $tutos['files'][__FILE__] = '$Rev$'; +define('K_PATH_IMAGES',''); + if ($tutos[tcpdfpath] != '') { if (!file_exists($tutos['base'] .'/'. $tutos[tcpdfpath].'/tcpdf.php')) { $msg = addLine($msg,"<br />NO TCPDF support. <br />\nSee \$tutos[tcpdfpath] in config. <br />\nmissing:".$tutos['base'] ."/". $tutos[tcpdfpath].'/tcpdf.php');return; @@ -23,6 +25,11 @@ return; } +if (file_exists($tutos['base'] .'/php/pdf_custom.php')) { + require_once $tutos['base'] .'/php/pdf_custom.php'; + return; +} + class Tutospdf extends TCPDF { /** * Constructor @@ -40,10 +47,10 @@ $this->setKeywords("TUTOS"); $this->setDisplayMode('fullpage','continuous'); $this->SetCompression(true); - $this->SetAutoPageBreak(true,16); + $this->SetAutoPageBreak(true,15); - $this->setTopMargin(18); - $this->setHeaderMargin(0); + $this->setTopMargin(25); + $this->setHeaderMargin(2); $this->setFooterMargin(5); $this->footer_central = ''; } @@ -59,7 +66,7 @@ $headerfont = $this->getHeaderFont(); $headerdata = $this->getHeaderData(); if (($headerdata['logo']) AND ($headerdata['logo'] != K_BLANK_IMAGE)) { - $imgtype = $this->getImageFileType($headerdata['logo']); + $imgtype = TCPDF_IMAGES::getImageFileType($headerdata['logo']); if (($imgtype == 'eps') OR ($imgtype == 'ai')) { $this->ImageEps($headerdata['logo'], '', '', $headerdata['logo_width']); } elseif ($imgtype == 'svg') { @@ -115,7 +122,7 @@ $this->Cell(0,10,$d->getDateTime(),0,0,'L'); //Page number $this->SetX(10); - $this->Cell(0,10,sprintf($lang['pageof'],$this->PageNo(),'{nb}'),0,0,'C'); + $this->Cell(0,10,sprintf($lang['pageof'],$this->PageNo(),$this->getAliasNbPages()),0,0,'C'); // LABEL $this->SetFont('helvetica','',6); $this->SetX(10); @@ -137,13 +144,13 @@ * overwrite SetHeaderData * add base if relativ */ - function SetHeaderData($path = '',$width = 0 ,$text1 = '',$text2 = '') { + function SetHeaderData($path = '',$width = 0 ,$text1 = '',$text2 = '',$tc=array(0,0,0), $lc=array(0,0,0)) { global $tutos; if (!preg_match('#^http[s]*://#i',$path)) { $path = $tutos['base'].'/'.$path; // add base path } - return parent::SetHeaderData($path,$width,$text1,$text2); + return parent::SetHeaderData($path,$width,$text1,$text2,$tc,$lc); } } ?> \ No newline at end of file Modified: trunk/php/product_contacts.php =================================================================== --- trunk/php/product_contacts.php 2017-09-14 17:38:33 UTC (rev 1331) +++ trunk/php/product_contacts.php 2017-09-19 15:18:37 UTC (rev 1332) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2004 - 2014 by Gero Kohnert + * Copyright 2004 - 2017 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 @@ -45,7 +45,7 @@ $pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); $pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); - $pdf->SetHeaderData($tutos['logo'],15,$this->name,$this->name); + $pdf->SetHeaderData($tutos['logo'],15,$lang['ProductsContacts'], $this->obj->getFullName()); $pdf->AddPage(); @@ -167,7 +167,7 @@ $border .= "B"; $h += 1; } - $tbl .= '<tr>'; + $tbl .= '<tr nobr="true">'; //name $tbl .= '<td>'.(isset($name[$i]) ? $name[$i] : " ").'</td>'; //role @@ -190,7 +190,7 @@ $pdf->Close(); $data = $pdf->Output('','S'); - export_headers('TUTOS_'.$this->obj->name,'pdf'); + export_headers('TUTOS_'.$this->obj->name,'pdf',false); Header('Content-Length: '.strlen($data)); return $data; } @@ -381,35 +381,35 @@ $this->addMenu($x); if ( $this->user->feature_ok(useprojects,PERM_NEW) ) { $x = array( url => "product_new.php", - text => $lang['NewEntry'], - info => $lang['ProdCreateInfo'], - category => array('product','new','obj',useprojects) - ); + text => $lang['NewEntry'], + info => $lang['ProdCreateInfo'], + category => array('product','new','obj',useprojects) + ); $this->addMenu($x); } if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) { $x = array( url => $this->obj->getModURL(), - text => $lang['Modify'], - info => sprintf($lang['ProdModInfo'],$this->obj->getFullname()), - category => array('product','mod','obj',useprojects) - ); + text => $lang['Modify'], + info => sprintf($lang['ProdModInfo'],$this->obj->getFullname()), + category => array('product','mod','obj',useprojects) + ); $this->addMenu($x); } if ( ($this->obj->id > 0) && $this->user->feature_ok(useprojects,PERM_SEE) ) { $x = array( url => 'product_contacts.php?format=paper&id='.$this->obj->id, - text => $lang['Printable'], - info => $lang['PrintableInfo'], - category => array('print','product','view',useprojects) - ); + text => $lang['Printable'], + info => $lang['PrintableInfo'], + category => array('print','product','view',useprojects) + ); $this->addMenu($x); } if (($this->obj->id > 0) && $this->user->feature_ok(useprojects,PERM_SEE) ) { if ($tutos[tcpdfpath] != "") { $x = array( url => 'product_contacts.php?format=pdf&id='.$this->obj->id, - text => 'PDF', - info => 'PDF', - category => array('pdf','product','view',useprojects) - ); + text => 'PDF', + info => 'PDF', + category => array('pdf','product','view',useprojects) + ); $this->addMenu($x); } } @@ -422,6 +422,6 @@ $dbconn->Close(); ?> <!-- -SVN Info $Id$ -$Author$ ---> \ No newline at end of file + SVN Info $Id$ + $Author$ + --> \ No newline at end of file Modified: trunk/php/stuff/stuff_overview.php =================================================================== --- trunk/php/stuff/stuff_overview.php 2017-09-14 17:38:33 UTC (rev 1331) +++ trunk/php/stuff/stuff_overview.php 2017-09-19 15:18:37 UTC (rev 1332) @@ -25,7 +25,7 @@ check_user(); $tutos['mobileok'] = 1; -require_once 'pdf.pinc'; +require_once 'pdf2.pinc'; loadmodules('stuff','overview'); loadmodule('stuff'); @@ -36,54 +36,6 @@ */ class Stuff_overview extends layout { /** - * Headline for PDF output - */ - function pdf_headtitle() { - global $lang; - - $y = $this->pdf->y; - $x = $this->pdf->x; - - $this->pdf->setFillColor(210,210,210); - $this->pdf->cell($this->xpos[4],20,'',0,0,'',1); - - $h = 7; - $this->pdf->SetFont('Arial','B',8); - $this->pdf->x = $this->xpos[0]; - $this->pdf->y = $y; - $this->pdf->Write($h, myiconv($lang['StuffType'])); - - $this->pdf->x = $this->xpos[0]; - $this->pdf->y = $y+7; - $this->pdf->Write($h, myiconv($lang['StuffName'])); - - $this->pdf->x = $this->xpos[1]; - $this->pdf->y = $y; - $this->pdf->Write($h, myiconv($lang['StuffId'])); - - - $this->pdf->x = $this->xpos[3]; - $this->pdf->y = $y; - $this->pdf->Write($h, myiconv($lang['StuffOwner'])); - - $this->pdf->x = $this->xpos[3]; - $this->pdf->y = $y+5; - $this->pdf->Write($h, myiconv($lang['StuffUser'])); - - $this->pdf->x = $this->xpos[3]; - $this->pdf->y = $y+10; - $this->pdf->Write($h, myiconv($lang['StuffSource'])); - - $this->pdf->x = $this->xpos[1]; - $this->pdf->y = $y+15; - $this->pdf->Write($h, myiconv($lang['StuffSerial'])); - - $this->pdf->Ln(); - - - } - - /** * output as PDF */ Function pdf_info() { @@ -96,21 +48,34 @@ } $n = $this->result->numrows(); - $this->xpos = array(10,45,80,140,180); - $this->pdf=new Tutospdf($this->obj->dbconn); - $this->pdf->Open(); - $this->pdf->setAuthor(myiconv($this->user->getFullName())); - $this->pdf->setTitle(myiconv($this->name)); - $this->pdf->setSubject(myiconv($this->name)); + $pdf=new Tutospdf($this->dbconn); + $pdf->Open(); + $pdf->setAuthor(myiconv($this->user->getFullName())); + $pdf->setTitle(myiconv($this->name)); + $pdf->setSubject(myiconv($this->name)); - $this->pdf->headtitle = myiconv($this->name); - $this->pdf->addPage(); - $this->pdf_headtitle(); - $this->pdf->SetFont('Arial','',8); + $pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); + $pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); + $pdf->SetHeaderData($tutos['logo'],15,$lang['StuffOverview'],''); + $pdf->addPage(); + + $pdf->SetFont('FreeSans','',8); + $h = 5; $cnt = 0; + $tbl = ' +<table cellpadding="2" > + <thead> + <tr> + <th style="background-color:#BBB;border-left-width: 0.1em;border-top-width: 0.1em;border-bottom-width: 0.1em;" align="center"><b>'.$lang['StuffType'].'<br>'.$lang['StuffName'].'</b></th> + <th style="background-color:#BBB;border-top-width: 0.1em;border-bottom-width: 0.1em;" align="center"><b>'.$lang['StuffId'].'<br>'.$lang['StuffSerial'].'</b></th> + <th style="background-color:#BBB;border-right-width: 0.1em;border-top-width: 0.1em;border-bottom-width: 0.1em;" align="center"><b>'.$lang['StuffOwner'].'<br>'.$lang['StuffUser'].'<br>'.$lang['StuffSource'].'</b></th> + </tr> + </thead> +'; + while ( $cnt < $n ) { $c = new stuff($this->dbconn); $c->read_result($this->result,$cnt); @@ -123,67 +88,32 @@ } else { $url = ''; } - $y = $this->pdf->y; - $x = $this->pdf->x; + $tbl .= '<tr nobr="true">'; + $tbl .= '<td style="border-left-width: 0.1em;border-bottom-width: 0.1em;">'.$lang['StuffTypes'][$c->type].'<br>'.$c->name.'</td>'; + $tbl .= '<td style="border-bottom-width: 0.1em;">'.$c->invid.'<br>'.$c->serial; - $this->pdf->line($this->pdf->x,$this->pdf->y, - $this->pdf->w - $this->pdf->rMargin,$this->pdf->y); - - $this->pdf->x = $this->xpos[0]; - $this->pdf->y = $y; - $this->pdf->Write($h, myiconv($lang['StuffTypes'][$c->type])); - - $this->pdf->x = $this->xpos[0]; - $this->pdf->y = $y+$h; - $this->pdf->Write($h, myiconv($c->name)); - - $this->pdf->y = $y; - $this->pdf->x = $this->xpos[1]; - $this->pdf->Write($h, myiconv($c->invid)); - - $this->pdf->y = $y+15; - $this->pdf->x = $this->xpos[1]; - $this->pdf->Write($h, myiconv($c->serial)); - - $this->pdf->y = $y; - $this->pdf->x = $this->xpos[1]; if ($url != '') - $this->pdf->Image($url,$this->xpos[2],$this->pdf->y+5,50,10,"PNG",getBaseUrl(true).'../'.$c->getUrl()); + $tbl .= '<br><img width="70" src="'.$url.'" />'; - $this->pdf->y = $y; - $this->pdf->x = $this->xpos[3]; - $info = (is_object($c->owner) ? $c->owner->getFullName():'-'); - $this->pdf->Write($h, myiconv($info)); + $tbl .= '</td>'; + $tbl .= '<td style="border-right-width: 0.1em;border-bottom-width: 0.1em;">'.(is_object($c->owner) ? $c->owner->getFullName():'-').'<br>'.(is_object($c->suser) ? $c->suser->getFullName():'-').'<br>'.(is_object($c->source) ? $c->source->getFullName():'-').'</td>'; - $this->pdf->y = $y+$h; - $this->pdf->x = $this->xpos[3]; - $info = (is_object($c->suser) ? $c->suser->getFullName():'-'); - $this->pdf->Write($h, myiconv($info)); - - $this->pdf->y = $y+$h+$h; - $this->pdf->x = $this->xpos[3]; - $info = (is_object($c->source) ? $c->source->getFullName():'-'); - $this->pdf->Write($h, myiconv($info)); - - $this->pdf->ln(16); - - if ($this->pdf->y+40 > $this->pdf->h - $this->pdf->bmargin) { - $this->pdf->headtitle = $this; - $this->pdf->addPage(); - } unset($c); + $tbl .= '</tr>'; } + $tbl .= '</table>'; + $pdf->writeHTML($tbl, true, false, false, false, ''); - $this->pdf->Close(); - $r = $this->pdf->buffer; + $pdf->Close(); + $r = $pdf->Output('','S'); export_headers('TUTOS_'.$this->name,'pdf',false); Header('Content-Length: '.strlen($r)); return $r; } - /** - * the data display part - */ +/** + * the data display part + */ Function info() { global $tutos,$lang; @@ -389,9 +319,9 @@ return $r; } - /** - * do mass actions - */ +/** + * do mass actions + */ Function action() { global $msg,$info,$lang; @@ -424,9 +354,9 @@ } } - /** - * prepare - */ +/** + * prepare + */ Function prepare() { global $msg,$lang,$tutos,$table; @@ -507,10 +437,10 @@ if ( $this->user->feature_ok(USESTUFF,PERM_NEW) ) { $x = array( url => "stuff/stuff_new.php", - text => $lang['NewEntry'], - info => $lang['StuffCreate'], - category => array('stuff','new','obj',USESTUFF) - ); + text => $lang['NewEntry'], + info => $lang['StuffCreate'], + category => array('stuff','new','obj',USESTUFF) + ); $this->addMenu($x); } @@ -517,20 +447,20 @@ if ( $this->format != "paper" ) { $ll = addUrlParameter($this->link1,'format=paper'); $x = array( url => $ll, - text => $lang['Printable'], - info => $lang['PrintableInfo'], - category => array('print','stuff','view',USESTUFF) - ); + text => $lang['Printable'], + info => $lang['PrintableInfo'], + category => array('print','stuff','view',USESTUFF) + ); $this->addMenu($x); } if ($tutos[tcpdfpath] != "") { $x = array( url => addUrlParameter($this->link1,'format=PDF'), - text => 'PDF', - info => 'PDF', - confirm => false, - category => array('pdf','stuff','view',USESTUFF) - ); + text => 'PDF', + info => 'PDF', + confirm => false, + category => array('pdf','stuff','view',USESTUFF) + ); $this->addMenu($x); } if (class_exists('url')) { @@ -544,6 +474,6 @@ $dbconn->Close(); ?> <!-- -SVN Info $Id$ -$Author$ ---> \ No newline at end of file + SVN Info $Id$ + $Author$ + --> \ No newline at end of file Modified: trunk/php/team_show.php =================================================================== --- trunk/php/team_show.php 2017-09-14 17:38:33 UTC (rev 1331) +++ trunk/php/team_show.php 2017-09-19 15:18:37 UTC (rev 1332) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2014 by Gero Kohnert + * Copyright 1999 - 2017 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 @@ -60,7 +60,7 @@ $pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); $pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); - $pdf->SetHeaderData($tutos['logo'],15,$this->name,$this->name); + $pdf->SetHeaderData($tutos['logo'],15,$lang['TeamDetail'],$lang['Team'].' '.$this->obj->getFullName()); $pdf->AddPage(); @@ -132,7 +132,7 @@ $border .= "B"; $h += 1; } - $tbl .= '<tr>'; + $tbl .= '<tr nobr="true">'; // name $tbl .= '<td>'.(isset($name[$i]) ? $name[$i]:' ').'</td>'; // desc @@ -267,18 +267,18 @@ if ( $this->user->isAdmin() ) { $x = array( url => 'team_new.php', - text => $lang['NewEntry'], - info => $lang['TeamCreateI'], - category => array('team','new','obj',useteams) - ); + text => $lang['NewEntry'], + info => $lang['TeamCreateI'], + category => array('team','new','obj',useteams) + ); $this->addMenu($x); } if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) { $x = array( url => $this->obj->getModURL(), - text => $lang['Modify'], - info => sprintf($lang['TeamModifyI'],$this->obj->name), - category => array('team','new','obj',useteams) - ); + text => $lang['Modify'], + info => sprintf($lang['TeamModifyI'],$this->obj->name), + category => array('team','new','obj',useteams) + ); $this->addMenu($x); } @@ -286,19 +286,19 @@ $this->link1 = 'team_show.php?id='.$this->obj->id; $l = addUrlParameter($this->link1,'format=paper'); $x = array( url => $l, - text => $lang['Printable'], - info => $lang['PrintableInfo'], - category => array('print','view','team',useteams) - ); + text => $lang['Printable'], + info => $lang['PrintableInfo'], + category => array('print','view','team',useteams) + ); $this->addMenu($x); if ($tutos[tcpdfpath] != "") { $l = addUrlParameter($this->link1,'format=pdf'); $x = array( url => $l, - text => 'PDF', - info => 'PDF', - category => array('pdf','view','team',useteams) - ); + text => 'PDF', + info => 'PDF', + category => array('pdf','view','team',useteams) + ); $this->addMenu($x); } } @@ -305,29 +305,29 @@ if ( ($this->obj->id > 0) && $this->user->feature_ok(usetimetrack,PERM_SEE) ) { $x = array( url => 'timetrack/timetrack_overview.php?worker='.$this->obj->id, - text => $lang['TimetrackBooked'], - info => sprintf($lang['TimetrackBookedI'],$this->obj->getFullName()), - category => array('timetrack','support',usetimetrack) - ); + text => $lang['TimetrackBooked'], + info => sprintf($lang['TimetrackBookedI'],$this->obj->getFullName()), + category => array('timetrack','support',usetimetrack) + ); $this->addMenu($x); } if ( ($this->obj->id > 0) && $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) { $x = array( url => 'task_overview.php?id='.$this->obj->id, - text => $lang['TaskOverview'], - info => sprintf($lang['TaskOverviewInfo'],$this->obj->getFullName()), - category => array('task','support',usetaskmanagement) - ); + text => $lang['TaskOverview'], + info => sprintf($lang['TaskOverviewInfo'],$this->obj->getFullName()), + category => array('task','support',usetaskmanagement) + ); $this->addMenu($x); } if ( ($this->obj->id > 0) - && $this->user->feature_ok(usetaskmanagement,PERM_SEE) - && $this->user->feature_ok(usetimetrack,PERM_SEE) - ) { + && $this->user->feature_ok(usetaskmanagement,PERM_SEE) + && $this->user->feature_ok(usetimetrack,PERM_SEE) + ) { $x = array( url => 'res_cal.php?id='.$this->obj->id, - text => $lang['ResCal'], - info => $lang['ResCal'], - category => array('timetrack','task','support') - ); + text => $lang['ResCal'], + info => $lang['ResCal'], + category => array('timetrack','task','support') + ); $this->addMenu($x); } if ( $this->obj->id > 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-09-14 17:38:36
|
Revision: 1331 http://sourceforge.net/p/tutos/code/1331 Author: gokohnert Date: 2017-09-14 17:38:33 +0000 (Thu, 14 Sep 2017) Log Message: ----------- fix Modified Paths: -------------- trunk/php/watchlist/watchlist.pinc trunk/php/webelements.p3 Modified: trunk/php/watchlist/watchlist.pinc =================================================================== --- trunk/php/watchlist/watchlist.pinc 2017-09-09 16:13:24 UTC (rev 1330) +++ trunk/php/watchlist/watchlist.pinc 2017-09-14 17:38:33 UTC (rev 1331) @@ -199,7 +199,7 @@ /** * Update */ - function update (&$obj,&$adr) { + static function update (tutos_base $obj,tutos_base $adr) { $msg = ""; $q = "UPDATE ". $obj->dbconn->prefix ."watchlist SET lastcall = ". $obj->dbconn->now() ." WHERE obj_id = ". $obj->id ." AND adr_id = ".$adr->id; $obj->dbconn->Exec($q); Modified: trunk/php/webelements.p3 =================================================================== --- trunk/php/webelements.p3 2017-09-09 16:13:24 UTC (rev 1330) +++ trunk/php/webelements.p3 2017-09-14 17:38:33 UTC (rev 1331) @@ -2286,7 +2286,7 @@ unset($g_hash[$to->id]); $u = new tutos_user($current_user->dbconn); $to->lg = $lang; - $u = $u->read($to->id,$u); + $u = $u->read_user($to->id,$u); ReadLang1($to->lg,$tutos['base'] ."/php/localization",$u); load_module_langfiles($u,$to->lg); $fn = $p ."/". $name .".". $u->lang; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-09-09 16:13:27
|
Revision: 1330 http://sourceforge.net/p/tutos/code/1330 Author: gokohnert Date: 2017-09-09 16:13:24 +0000 (Sat, 09 Sep 2017) Log Message: ----------- update Modified Paths: -------------- trunk/php/custom.pinc trunk/php/expense/mtable.pinc trunk/php/file/file.pinc trunk/php/invoice/invoice_pdf.pinc trunk/php/layout/layout_base.pinc trunk/php/module_overview.php trunk/php/pdf2.pinc trunk/php/webelements.p3 Property Changed: ---------------- trunk/php/bugtracking/ trunk/php/checklist/ trunk/php/counter/ trunk/php/expense/ trunk/php/file/ trunk/php/group/ trunk/php/installation/ trunk/php/invoice/ trunk/php/module_template/ trunk/php/note/ trunk/php/rate/ trunk/php/reminder/ trunk/php/scrum/ trunk/php/stc/ trunk/php/testmanager/ trunk/php/timetrack/ trunk/php/url/ trunk/php/watchlist/ Index: trunk/php/bugtracking =================================================================== --- trunk/php/bugtracking 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/bugtracking 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/bugtracking ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## *_custom.p3 +custom.pinc Index: trunk/php/checklist =================================================================== --- trunk/php/checklist 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/checklist 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/checklist ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## *_custom.p3 +custom.pinc Index: trunk/php/counter =================================================================== --- trunk/php/counter 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/counter 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/counter ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Modified: trunk/php/custom.pinc =================================================================== --- trunk/php/custom.pinc 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/custom.pinc 2017-09-09 16:13:24 UTC (rev 1330) @@ -848,10 +848,18 @@ if ($this->layout != null) { $r = '<span class="CL_'.$this->get_parsename().' CL_'.$this->get_parsename().'_'.$this->content.'">'; - $r .= myentities(isset($lang[$this->x['lang'].'_'][$this->content]) ? $lang[$this->x['lang'].'_'][$this->content]: ($this->required ? $this->content .'??' : '')); + if ( isset($this->x['langI']) && isset($lang[$this->x['langI']]) ) { + $r .= myentities(isset($lang[$this->x['langI']][$this->content]) ? $lang[$this->x['langI']][$this->content]: ($this->required ? $this->content .'??' : '')); + } else { + $r .= myentities(isset($lang[$this->x['lang'].'_'][$this->content]) ? $lang[$this->x['lang'].'_'][$this->content]: ($this->required ? $this->content .'??' : '')); + } $r .= '</span>'; } else { - $r = (isset($lang[$this->x['lang'].'_'][$this->content]) ? $lang[$this->x['lang'].'_'][$this->content]: ($this->required ? $this->content .'??' : '')); + if ( isset($this->x['langI']) && isset($lang[$this->x['langI']]) ) { + $r = (isset($lang[$this->x['langI']][$this->content]) ? $lang[$this->x['langI']][$this->content]: ($this->required ? $this->content .'??' : '')); + } else { + $r = (isset($lang[$this->x['lang'].'_'][$this->content]) ? $lang[$this->x['lang'].'_'][$this->content]: ($this->required ? $this->content .'??' : '')); + } } return $r; } @@ -860,7 +868,11 @@ * edit the content */ function edit() { - return SelectLangArray($this->get_parsename(),$this->x['lang'].'_',$this->content); + if ( isset($this->x['langI']) ) { + return SelectLangArray($this->get_parsename(),$this->x['langI'],$this->content); + } else { + return SelectLangArray($this->get_parsename(),$this->x['lang'].'_',$this->content); + } } /** Index: trunk/php/expense =================================================================== --- trunk/php/expense 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/expense 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/expense ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## *_custom.p3 +custom.pinc Modified: trunk/php/expense/mtable.pinc =================================================================== --- trunk/php/expense/mtable.pinc 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/expense/mtable.pinc 2017-09-09 16:13:24 UTC (rev 1330) @@ -16,109 +16,163 @@ $table['expense'][name] = 'expenses'; $table['expense'][Desc] = 'TUTOS expenses'; $table['expense']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'); -$table['expense']['link_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'id of linked object'); -$table['expense']['adr_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'id of linked address'); -$table['expense']['name'] = array(type => 'VARCHAR', size => 50, constraints => 'NN', - Desc => 'short name of expenses', - 'required' => true, - 'field' => 'name', - 'lang' => 'ExpenseName', - ); -$table['expense']['state'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'state of expense'); -$table['expense']['description'] = array(type => 'TX_TYPE', constraints => '', - Desc => 'long description of expenses', - 'hideempty' => true, - 'allowimages' => true, - 'allowurls' => true, - 'pre' => true, - 'field' => 'description', - 'lang' => 'ExpenseDescription', - ); -$table['expense']['category'] = array(type => 'ID_TYPE', constraints => '', - Desc => 'category of expenses', - 'ftype' => 'SelectOne', - 'field' => 'category', - 'hideempty' => true, - 'empty' => -1, - 'lang' => 'ExpenseCategory', - 'langI' => 'ExpenseCategories', - ); -$table['expense']['reason'] = array(type => 'VARCHAR', size => 50, constraints => '', - Desc => 'reason of the expense', - 'hideempty' => true, - 'field' => 'reason', - 'lang' => 'ExpenseReason', - ); -$table['expense']['people'] = array(type => 'TX_TYPE', constraints => '', - Desc => 'concerned persons', - 'hideempty' => true, - 'allowimages' => true, - 'allowurls' => true, - 'pre' => true, - 'field' => 'people', - 'lang' => 'ExpensePeople', - ); -$table['expense']['city'] = array(type => 'VARCHAR', size => 50, constraints => '', - Desc => 'city name', - 'hideempty' => true, - 'field' => 'city', - 'lang' => 'City', - ); -$table['expense']['country'] = array(type => 'VARCHAR', size => 3, constraints => '', Desc => 'ISO Country code'); -$table['expense']['quantity'] = array(type => 'float', constraints => '', - Desc => 'quantity', - 'field' => 'quantity', - 'lang' => 'ExpenseQuantity', - ); -$table['expense']['gamount'] = array(type => 'float', constraints => 'NN', Desc => 'gross amount'); -$table['expense']['currency'] = array(type => 'VARCHAR', size => 4, constraints => 'NN', Desc => 'currency for gross amount'); -$table['expense']['deduction'] = array(type => 'float', constraints => '', Desc => 'possible deduction'); -$table['expense']['itax'] = array(type => 'float', constraints => '', Desc => 'input tax for gross amount'); -$table['expense']['mop'] = array(type => 'ID_TYPE', constraints => '', - Desc => 'method of payment', - 'ftype' => 'SelectOne', - 'hideempty' => true, - 'empty' => -1, - 'field' => 'mop', - 'lang' => 'ExpenseMOP', - 'langI' => 'ExpenseMOPs', - ); -$table['expense']['ccentre'] = array(type => 'VARCHAR', size => 50, constraints => '', - Desc => 'cost centre', - 'hideempty' => true, - 'field' => 'ccentre', - 'lang' => 'ExpenseCCentre', - ); -$table['expense']['invoice'] = array(type => 'ID_TYPE', constraints => '', Desc => 'id of invoice'); -$table['expense']['t_start'] = array(type => 'TS_TYPE', constraints => 'NN', - Desc => 'start date/time of using expenses', - 'ftype' => 'DateTime', - 'hideempty' => true, - 'field' => 't_start', - 'lang' => 'ExpenseStartTime', - ); -$table['expense']['t_end'] = array(type => 'TS_TYPE', constraints => '', - Desc => 'end date/time of using expenses', - 'ftype' => 'DateTime', - 'hideempty' => true, - 'field' => 't_end', - 'lang' => 'ExpenseEndTime', - ); -$table['expense']['supplier'] = array(type => 'ID_TYPE', constraints => '', Desc => 'supplier ID'); -$table['expense']['creator'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'creator ID'); -$table['expense']['creation'] = array(type => 'TS_TYPE', constraints => 'NN', Desc => 'creation date'); +$table['expense']['link_id'] = array( + type => 'ID_TYPE', constraints => 'NN', Desc => 'id of linked object' +); + +$table['expense']['adr_id'] = array( + type => 'ID_TYPE', constraints => 'NN', Desc => 'id of linked address' +); + +$table['expense']['name'] = array( + type => 'VARCHAR', size => 50, constraints => 'NN', + Desc => 'short name of expenses', + 'required' => true, + 'field' => 'name', + 'lang' => 'ExpenseName', +); + +$table['expense']['state'] = array( + type => 'ID_TYPE', constraints => 'NN', + Desc => 'state of expense' +); + +$table['expense']['description'] = array( + type => 'TX_TYPE', constraints => '', + Desc => 'long description of expenses', + 'hideempty' => true, + 'allowimages' => true, + 'allowurls' => true, + 'pre' => true, + 'field' => 'description', + 'lang' => 'ExpenseDescription', +); + +$table['expense']['category'] = array( + type => 'ID_TYPE', constraints => '', + Desc => 'category of expenses', + 'ftype' => 'SelectOne', + 'field' => 'category', + 'hideempty' => true, + 'empty' => -1, + 'lang' => 'ExpenseCategory', + 'langI' => 'ExpenseCategories', +); + +$table['expense']['reason'] = array( + type => 'VARCHAR', size => 50, constraints => '', + Desc => 'reason of the expense', + 'hideempty' => true, + 'field' => 'reason', + 'lang' => 'ExpenseReason', +); + +$table['expense']['people'] = array( + type => 'TX_TYPE', constraints => '', + Desc => 'concerned persons', + 'hideempty' => true, + 'allowimages' => true, + 'allowurls' => true, + 'pre' => true, + 'field' => 'people', + 'lang' => 'ExpensePeople', +); + +$table['expense']['city'] = array( + type => 'VARCHAR', size => 50, constraints => '', + Desc => 'city name', + 'hideempty' => true, + 'field' => 'city', + 'lang' => 'City', +); + +$table['expense']['country'] = array( + type => 'VARCHAR', size => 3, constraints => '', Desc => 'ISO Country code'); + +$table['expense']['quantity'] = array( + type => 'float', constraints => '', + Desc => 'quantity', + 'field' => 'quantity', + 'lang' => 'ExpenseQuantity', +); + +$table['expense']['gamount'] = array( + type => 'float', constraints => 'NN', Desc => 'gross amount'); + +$table['expense']['currency'] = array( + type => 'VARCHAR', size => 4, constraints => 'NN', Desc => 'currency for gross amount'); + +$table['expense']['deduction'] = array( + type => 'float', constraints => '', Desc => 'possible deduction'); + +$table['expense']['itax'] = array( + type => 'float', constraints => '', Desc => 'input tax for gross amount'); + +$table['expense']['mop'] = array( + type => 'ID_TYPE', constraints => '', + Desc => 'method of payment', + 'ftype' => 'SelectOne', + 'hideempty' => true, + 'empty' => -1, + 'field' => 'mop', + 'lang' => 'ExpenseMOP', + 'langI' => 'ExpenseMOPs', +); + +$table['expense']['ccentre'] = array( + type => 'VARCHAR', size => 50, constraints => '', + Desc => 'cost centre', + 'hideempty' => true, + 'field' => 'ccentre', + 'lang' => 'ExpenseCCentre', +); + +$table['expense']['invoice'] = array( + type => 'ID_TYPE', constraints => '', Desc => 'id of invoice' +); + +$table['expense']['t_start'] = array( + type => 'TS_TYPE', constraints => 'NN', + Desc => 'start date/time of using expenses', + 'ftype' => 'DateTime', + 'hideempty' => true, + 'field' => 't_start', + 'lang' => 'ExpenseStartTime', +); + +$table['expense']['t_end'] = array( + type => 'TS_TYPE', constraints => '', + Desc => 'end date/time of using expenses', + 'ftype' => 'DateTime', + 'hideempty' => true, + 'field' => 't_end', + 'lang' => 'ExpenseEndTime', +); + +$table['expense']['supplier'] = array( + type => 'ID_TYPE', constraints => '', Desc => 'supplier ID' +); + +$table['expense']['creator'] = array( + type => 'ID_TYPE', constraints => 'NN', Desc => 'creator ID' +); + +$table['expense']['creation'] = array( + type => 'TS_TYPE', constraints => 'NN', Desc => 'creation date' +); + $tableidx['expense1'] = array( name => 'expense_idx1', table => 'expenses', column => array('link_id'), Desc => 'objects with expenses', - ); +); $tableidx['expense2'] = array( name => 'expense_idx2', table => 'expenses', column => array('adr_id'), Desc => 'adress with expenses', - ); +); ?> \ No newline at end of file Index: trunk/php/file =================================================================== --- trunk/php/file 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/file 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/file ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## *_custom.p3 +custom.pinc Modified: trunk/php/file/file.pinc =================================================================== --- trunk/php/file/file.pinc 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/file/file.pinc 2017-09-09 16:13:24 UTC (rev 1330) @@ -1658,7 +1658,7 @@ /** * reads the list of dociment and get a summary */ - function summary(&$obj) { + static function summary(&$obj) { global $lang; if (! is_object($obj) ) return; Index: trunk/php/group =================================================================== --- trunk/php/group 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/group 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/group ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Index: trunk/php/installation =================================================================== --- trunk/php/installation 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/installation 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/installation ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Index: trunk/php/invoice =================================================================== --- trunk/php/invoice 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/invoice 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/invoice ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,3 ## +*_custom.p3 +custom.pinc +invoice_*.txt Modified: trunk/php/invoice/invoice_pdf.pinc =================================================================== --- trunk/php/invoice/invoice_pdf.pinc 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/invoice/invoice_pdf.pinc 2017-09-09 16:13:24 UTC (rev 1330) @@ -13,14 +13,14 @@ class invoice_pdf extends TCPDF { - function invoice_pdf(tutos_base $obj) { + function __construct(tutos_base $obj) { global $tutos; parent::__construct('P','mm',$tutos[paperformat], true, 'UTF-8', false,true); - $this->AliasNbPages("{nb}"); + # $this->AliasNbPages("{nb}"); $this->obj = $obj; - $this->setCreator('TCPDF '.$this->getTCPDFVersion() .' and TUTOS Version '.$tutos[version]); + $this->setCreator('TCPDF and TUTOS Version '.$tutos[version]); $this->setKeywords("TUTOS"); $this->setDisplayMode('fullpage','continuous'); $this->SetCompression(true); Modified: trunk/php/layout/layout_base.pinc =================================================================== --- trunk/php/layout/layout_base.pinc 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/layout/layout_base.pinc 2017-09-09 16:13:24 UTC (rev 1330) @@ -835,6 +835,12 @@ } else { $r .= $this->showdata(myentities($obj->$field) ,$colsd); } + } else if ($tarr[type] == 'ID_TYPE') { + if ( isset($tarr['ftype']) && ($tarr['ftype'] == 'Object') ) { + $r .= $this->showdata(is_object($obj->$field) ? $obj->$field->getLink():'-',$colsd); + } else { + $r .= $this->showdata(myentities($obj->$field) ,$colsd); + } } else { $r .= $this->showdata('## unsupported type/field ## '.$tarr[type].'/'.$field ,$colsd); } @@ -867,9 +873,7 @@ $r = ''; if ( isset($tarr['hide']) && ($tarr['hide'] == true) ) 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); return $r; } Modified: trunk/php/module_overview.php =================================================================== --- trunk/php/module_overview.php 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/module_overview.php 2017-09-09 16:13:24 UTC (rev 1330) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2004 - 2014 by Gero Kohnert + * Copyright 2004 - 2017 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 @@ -29,62 +29,16 @@ $errno = ""; $errstr = ""; $r = array(); - $url = parse_url($u); - # var_dump($url); - # var_dump($u); - if (!isset($tutos['proxy_host']) || empty($tutos['proxy_host']) ) { - $fp = fsockopen($url['host'], "80", $errno, $errstr, $timeout); - } else { - $fp = fsockopen($tutos['proxy_host'], $tutos['proxy_port'], $errno, $errstr, $timeout); + if (isset($tutos['proxy_host']) && isset($tutos['proxy_port']) && !empty($tutos['proxy_host']) && !empty($tutos['proxy_port'])) { + $arrContextOptions['http']['proxy'] = 'tcp://'.$tutos['proxy_host'].':'.$tutos['proxy_port']; } - if (!$fp) return $errno." ".$errstr; //just quit on error + $arrContextOptions['http']['user_agent'] = 'TUTOS@'.$_SERVER['SERVER_NAME']; + $arrContextOptions['http']['header'] = 'Referer: http://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']; + $arrContextOptions['ssl']['verify_peer'] =false; + $arrContextOptions['ssl']['verify_peer_name'] = false; - if (!isset($tutos['proxy_host']) || empty($tutos['proxy_host']) ) { - fputs($fp, "GET " . $url['path'].(isset($url['query']) ? "?".$url['query']:"") . " HTTP/1.0\r\n". - "Host: " . $url['host'] . "\r\n". - "User-Agent: TUTOS@".$_SERVER['SERVER_NAME']."\r\n". - "Connection: close\r\n". - "Referer: http://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']."\r\n". - "Cache-Control: no-cache\r\n". - "Pragma: no-cache\r\n". - "\r\n"); - } else { - fputs($fp, "GET " . $u . " HTTP/1.0\r\n". - "Host: " . $url['host'] . "\r\n". - "User-Agent: TUTOS@".$_SERVER['SERVER_NAME']."\r\n". - "Connection: close\r\n". - "Proxy-Connection: close\r\n". - "Accept-Encoding: deflate\r\n". - "Referer: http://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']."\r\n". - "Cache-Control: no-cache\r\n". - "Pragma: no-cache\r\n". - "\r\n"); - } - $head = true; - while(!feof($fp)) { - $x = fgets($fp, 8192); - if (preg_match('#^location:(.*)#i',$x,$reg)) { - $redir = trim($reg[1]); - if (isset($url['query'])) { - $redir .= "?". $url['query']; - } - - break; - } - - if ($head) { - if ($x == "\r\n") { - $head = false; - } - continue; - } - - $r[] = $x; - } - fclose($fp); - if ($redir != "") { - $r = get_url_data($redir); - } + $xx = file_get_contents($u,false,stream_context_create($arrContextOptions)); + $r = explode("\n",$xx); return $r; } @@ -206,6 +160,6 @@ $dbconn->close(); ?> <!-- -SVN Info $Id$ -$Author$ ---> \ No newline at end of file + SVN Info $Id$ + $Author$ + --> \ No newline at end of file Index: trunk/php/module_template =================================================================== --- trunk/php/module_template 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/module_template 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/module_template ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Index: trunk/php/note =================================================================== --- trunk/php/note 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/note 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/note ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Modified: trunk/php/pdf2.pinc =================================================================== --- trunk/php/pdf2.pinc 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/pdf2.pinc 2017-09-09 16:13:24 UTC (rev 1330) @@ -35,8 +35,8 @@ $format = $tutos[paperformat]; } parent::__construct($orientation,'mm',$format, true, 'UTF-8', false,true); - $this->AliasNbPages(); - $this->setCreator('TCPDF '.$this->getTCPDFVersion() .' and TUTOS Version '.$tutos[version]); + #$this->AliasNbPages(); + $this->setCreator('TCPDF and TUTOS Version '.$tutos[version]); $this->setKeywords("TUTOS"); $this->setDisplayMode('fullpage','continuous'); $this->SetCompression(true); Index: trunk/php/rate =================================================================== --- trunk/php/rate 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/rate 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/rate ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Index: trunk/php/reminder =================================================================== --- trunk/php/reminder 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/reminder 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/reminder ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Index: trunk/php/scrum =================================================================== --- trunk/php/scrum 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/scrum 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/scrum ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Index: trunk/php/stc =================================================================== --- trunk/php/stc 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/stc 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/stc ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +custom.pinc Index: trunk/php/testmanager =================================================================== --- trunk/php/testmanager 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/testmanager 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/testmanager ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## *_custom.p3 +custom.pinc Index: trunk/php/timetrack =================================================================== --- trunk/php/timetrack 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/timetrack 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/timetrack ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## *_custom.p3 +custom.pinc Index: trunk/php/url =================================================================== --- trunk/php/url 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/url 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/url ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Index: trunk/php/watchlist =================================================================== --- trunk/php/watchlist 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/watchlist 2017-09-09 16:13:24 UTC (rev 1330) Property changes on: trunk/php/watchlist ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*_custom.p3 +custom.pinc Modified: trunk/php/webelements.p3 =================================================================== --- trunk/php/webelements.p3 2017-09-09 15:54:39 UTC (rev 1329) +++ trunk/php/webelements.p3 2017-09-09 16:13:24 UTC (rev 1330) @@ -189,7 +189,7 @@ asort($lang[$lgname]); } foreach ($lang[$lgname] as $f => $i) { - if ( $f < 0 ) continue; + # if ( $f < 0 ) continue; $old = false; if (isset($tutos['deprecated'][$lgname]) @@ -506,8 +506,8 @@ $xx .= $sep; switch($t) { case 'string': - if (mb_strlen($a) > 10) { - $xx .= "'".mb_substr($a,0,10)."...'"; + if (mb_strlen($a) > 15) { + $xx .= "'".mb_substr($a,0,15)."...'"; } else { $xx .= "'".$a."'"; } @@ -550,12 +550,12 @@ } $xx .= ')'; } - $r .= substr($xx.str_repeat(' ',50),0,50).' '; + $r .= substr($xx.str_repeat(' ',70),0,70).' '; if (isset($s['file'])) { if (isset($tutos['files'][$s['file']])) { - $r .= substr('('.trim($tutos['files'][$s['file']],'$ ').')'.str_repeat(' ',18),0,18); + $r .= substr('('.trim($tutos['files'][$s['file']],'$ ').')'.str_repeat(' ',28),0,28); } else { - $r .= str_repeat(' ',18); + $r .= str_repeat(' ',28); } $r .= $s["file"] ." +". $s["line"]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-09-09 15:54:46
|
Revision: 1329 http://sourceforge.net/p/tutos/code/1329 Author: gokohnert Date: 2017-09-09 15:54:39 +0000 (Sat, 09 Sep 2017) Log Message: ----------- new tcpdf version Modified Paths: -------------- trunk/libs/jpgraph/TUTOS-README trunk/libs/tcpdf/LICENSE.TXT trunk/libs/tcpdf/config/tcpdf_config.php trunk/libs/tcpdf/fonts/courier.php trunk/libs/tcpdf/fonts/dejavusans.ctg.z trunk/libs/tcpdf/fonts/dejavusans.php trunk/libs/tcpdf/fonts/dejavusans.z trunk/libs/tcpdf/fonts/dejavusansb.ctg.z trunk/libs/tcpdf/fonts/dejavusansb.php trunk/libs/tcpdf/fonts/dejavusansb.z trunk/libs/tcpdf/fonts/dejavusansbi.ctg.z trunk/libs/tcpdf/fonts/dejavusansbi.php trunk/libs/tcpdf/fonts/dejavusansbi.z trunk/libs/tcpdf/fonts/dejavusanscondensed.ctg.z trunk/libs/tcpdf/fonts/dejavusanscondensed.php trunk/libs/tcpdf/fonts/dejavusanscondensed.z trunk/libs/tcpdf/fonts/dejavusanscondensedb.ctg.z trunk/libs/tcpdf/fonts/dejavusanscondensedb.php trunk/libs/tcpdf/fonts/dejavusanscondensedb.z trunk/libs/tcpdf/fonts/dejavusanscondensedbi.ctg.z trunk/libs/tcpdf/fonts/dejavusanscondensedbi.php trunk/libs/tcpdf/fonts/dejavusanscondensedbi.z trunk/libs/tcpdf/fonts/dejavusanscondensedi.ctg.z trunk/libs/tcpdf/fonts/dejavusanscondensedi.php trunk/libs/tcpdf/fonts/dejavusanscondensedi.z trunk/libs/tcpdf/fonts/dejavusansextralight.ctg.z trunk/libs/tcpdf/fonts/dejavusansextralight.php trunk/libs/tcpdf/fonts/dejavusansextralight.z trunk/libs/tcpdf/fonts/dejavusansi.ctg.z trunk/libs/tcpdf/fonts/dejavusansi.php trunk/libs/tcpdf/fonts/dejavusansi.z trunk/libs/tcpdf/fonts/dejavusansmono.ctg.z trunk/libs/tcpdf/fonts/dejavusansmono.php trunk/libs/tcpdf/fonts/dejavusansmono.z trunk/libs/tcpdf/fonts/dejavusansmonob.ctg.z trunk/libs/tcpdf/fonts/dejavusansmonob.php trunk/libs/tcpdf/fonts/dejavusansmonob.z trunk/libs/tcpdf/fonts/dejavusansmonobi.ctg.z trunk/libs/tcpdf/fonts/dejavusansmonobi.php trunk/libs/tcpdf/fonts/dejavusansmonobi.z trunk/libs/tcpdf/fonts/dejavusansmonoi.ctg.z trunk/libs/tcpdf/fonts/dejavusansmonoi.php trunk/libs/tcpdf/fonts/dejavusansmonoi.z trunk/libs/tcpdf/fonts/dejavuserif.ctg.z trunk/libs/tcpdf/fonts/dejavuserif.php trunk/libs/tcpdf/fonts/dejavuserif.z trunk/libs/tcpdf/fonts/dejavuserifb.ctg.z trunk/libs/tcpdf/fonts/dejavuserifb.php trunk/libs/tcpdf/fonts/dejavuserifb.z trunk/libs/tcpdf/fonts/dejavuserifbi.ctg.z trunk/libs/tcpdf/fonts/dejavuserifbi.php trunk/libs/tcpdf/fonts/dejavuserifbi.z trunk/libs/tcpdf/fonts/dejavuserifcondensed.ctg.z trunk/libs/tcpdf/fonts/dejavuserifcondensed.php trunk/libs/tcpdf/fonts/dejavuserifcondensed.z trunk/libs/tcpdf/fonts/dejavuserifcondensedb.ctg.z trunk/libs/tcpdf/fonts/dejavuserifcondensedb.php trunk/libs/tcpdf/fonts/dejavuserifcondensedb.z trunk/libs/tcpdf/fonts/dejavuserifcondensedbi.ctg.z trunk/libs/tcpdf/fonts/dejavuserifcondensedbi.php trunk/libs/tcpdf/fonts/dejavuserifcondensedbi.z trunk/libs/tcpdf/fonts/dejavuserifcondensedi.ctg.z trunk/libs/tcpdf/fonts/dejavuserifcondensedi.php trunk/libs/tcpdf/fonts/dejavuserifcondensedi.z trunk/libs/tcpdf/fonts/dejavuserifi.ctg.z trunk/libs/tcpdf/fonts/dejavuserifi.php trunk/libs/tcpdf/fonts/dejavuserifi.z trunk/libs/tcpdf/fonts/freemono.ctg.z trunk/libs/tcpdf/fonts/freemono.php trunk/libs/tcpdf/fonts/freemono.z trunk/libs/tcpdf/fonts/freemonob.ctg.z trunk/libs/tcpdf/fonts/freemonob.php trunk/libs/tcpdf/fonts/freemonob.z trunk/libs/tcpdf/fonts/freemonobi.ctg.z trunk/libs/tcpdf/fonts/freemonobi.php trunk/libs/tcpdf/fonts/freemonobi.z trunk/libs/tcpdf/fonts/freemonoi.ctg.z trunk/libs/tcpdf/fonts/freemonoi.php trunk/libs/tcpdf/fonts/freemonoi.z trunk/libs/tcpdf/fonts/freesans.ctg.z trunk/libs/tcpdf/fonts/freesans.php trunk/libs/tcpdf/fonts/freesans.z trunk/libs/tcpdf/fonts/freesansb.ctg.z trunk/libs/tcpdf/fonts/freesansb.php trunk/libs/tcpdf/fonts/freesansb.z trunk/libs/tcpdf/fonts/freesansbi.ctg.z trunk/libs/tcpdf/fonts/freesansbi.php trunk/libs/tcpdf/fonts/freesansbi.z trunk/libs/tcpdf/fonts/freesansi.ctg.z trunk/libs/tcpdf/fonts/freesansi.php trunk/libs/tcpdf/fonts/freesansi.z trunk/libs/tcpdf/fonts/freeserif.ctg.z trunk/libs/tcpdf/fonts/freeserif.php trunk/libs/tcpdf/fonts/freeserif.z trunk/libs/tcpdf/fonts/freeserifb.ctg.z trunk/libs/tcpdf/fonts/freeserifb.php trunk/libs/tcpdf/fonts/freeserifb.z trunk/libs/tcpdf/fonts/freeserifbi.ctg.z trunk/libs/tcpdf/fonts/freeserifbi.php trunk/libs/tcpdf/fonts/freeserifbi.z trunk/libs/tcpdf/fonts/freeserifi.ctg.z trunk/libs/tcpdf/fonts/freeserifi.php trunk/libs/tcpdf/fonts/freeserifi.z trunk/libs/tcpdf/fonts/helvetica.php trunk/libs/tcpdf/fonts/helveticab.php trunk/libs/tcpdf/fonts/helveticabi.php trunk/libs/tcpdf/fonts/helveticai.php trunk/libs/tcpdf/fonts/symbol.php trunk/libs/tcpdf/fonts/times.php trunk/libs/tcpdf/fonts/timesb.php trunk/libs/tcpdf/fonts/timesbi.php trunk/libs/tcpdf/fonts/timesi.php trunk/libs/tcpdf/fonts/uni2cid_ac15.php trunk/libs/tcpdf/fonts/uni2cid_ag15.php trunk/libs/tcpdf/fonts/uni2cid_aj16.php trunk/libs/tcpdf/fonts/uni2cid_ak12.php trunk/libs/tcpdf/fonts/zapfdingbats.php trunk/libs/tcpdf/tcpdf.php Added Paths: ----------- trunk/libs/tcpdf/CHANGELOG.TXT trunk/libs/tcpdf/README.md trunk/libs/tcpdf/composer.json trunk/libs/tcpdf/examples/ trunk/libs/tcpdf/examples/barcodes/ trunk/libs/tcpdf/examples/barcodes/example_1d_html.php trunk/libs/tcpdf/examples/barcodes/example_1d_png.php trunk/libs/tcpdf/examples/barcodes/example_1d_svg.php trunk/libs/tcpdf/examples/barcodes/example_1d_svgi.php trunk/libs/tcpdf/examples/barcodes/example_2d_datamatrix_html.php trunk/libs/tcpdf/examples/barcodes/example_2d_datamatrix_png.php trunk/libs/tcpdf/examples/barcodes/example_2d_datamatrix_svg.php trunk/libs/tcpdf/examples/barcodes/example_2d_datamatrix_svgi.php trunk/libs/tcpdf/examples/barcodes/example_2d_pdf417_html.php trunk/libs/tcpdf/examples/barcodes/example_2d_pdf417_png.php trunk/libs/tcpdf/examples/barcodes/example_2d_pdf417_svg.php trunk/libs/tcpdf/examples/barcodes/example_2d_pdf417_svgi.php trunk/libs/tcpdf/examples/barcodes/example_2d_qrcode_html.php trunk/libs/tcpdf/examples/barcodes/example_2d_qrcode_png.php trunk/libs/tcpdf/examples/barcodes/example_2d_qrcode_svg.php trunk/libs/tcpdf/examples/barcodes/example_2d_qrcode_svgi.php trunk/libs/tcpdf/examples/barcodes/tcpdf_barcodes_1d_include.php trunk/libs/tcpdf/examples/barcodes/tcpdf_barcodes_2d_include.php trunk/libs/tcpdf/examples/config/ trunk/libs/tcpdf/examples/config/tcpdf_config_alt.php trunk/libs/tcpdf/examples/data/ trunk/libs/tcpdf/examples/data/cert/ trunk/libs/tcpdf/examples/data/cert/tcpdf.crt trunk/libs/tcpdf/examples/data/cert/tcpdf.fdf trunk/libs/tcpdf/examples/data/cert/tcpdf.p12 trunk/libs/tcpdf/examples/data/chapter_demo_1.txt trunk/libs/tcpdf/examples/data/chapter_demo_2.txt trunk/libs/tcpdf/examples/data/table_data_demo.txt trunk/libs/tcpdf/examples/data/utf8test.txt trunk/libs/tcpdf/examples/example_001.php trunk/libs/tcpdf/examples/example_002.php trunk/libs/tcpdf/examples/example_003.php trunk/libs/tcpdf/examples/example_004.php trunk/libs/tcpdf/examples/example_005.php trunk/libs/tcpdf/examples/example_006.php trunk/libs/tcpdf/examples/example_007.php trunk/libs/tcpdf/examples/example_008.php trunk/libs/tcpdf/examples/example_009.php trunk/libs/tcpdf/examples/example_010.php trunk/libs/tcpdf/examples/example_011.php trunk/libs/tcpdf/examples/example_012.pdf trunk/libs/tcpdf/examples/example_012.php trunk/libs/tcpdf/examples/example_013.php trunk/libs/tcpdf/examples/example_014.php trunk/libs/tcpdf/examples/example_015.php trunk/libs/tcpdf/examples/example_016.php trunk/libs/tcpdf/examples/example_017.php trunk/libs/tcpdf/examples/example_018.php trunk/libs/tcpdf/examples/example_019.php trunk/libs/tcpdf/examples/example_020.php trunk/libs/tcpdf/examples/example_021.php trunk/libs/tcpdf/examples/example_022.php trunk/libs/tcpdf/examples/example_023.php trunk/libs/tcpdf/examples/example_024.php trunk/libs/tcpdf/examples/example_025.php trunk/libs/tcpdf/examples/example_026.php trunk/libs/tcpdf/examples/example_027.php trunk/libs/tcpdf/examples/example_028.php trunk/libs/tcpdf/examples/example_029.php trunk/libs/tcpdf/examples/example_030.php trunk/libs/tcpdf/examples/example_031.php trunk/libs/tcpdf/examples/example_032.php trunk/libs/tcpdf/examples/example_033.php trunk/libs/tcpdf/examples/example_034.php trunk/libs/tcpdf/examples/example_035.php trunk/libs/tcpdf/examples/example_036.php trunk/libs/tcpdf/examples/example_037.php trunk/libs/tcpdf/examples/example_038.php trunk/libs/tcpdf/examples/example_039.php trunk/libs/tcpdf/examples/example_040.php trunk/libs/tcpdf/examples/example_041.php trunk/libs/tcpdf/examples/example_042.php trunk/libs/tcpdf/examples/example_043.php trunk/libs/tcpdf/examples/example_044.php trunk/libs/tcpdf/examples/example_045.php trunk/libs/tcpdf/examples/example_046.php trunk/libs/tcpdf/examples/example_047.php trunk/libs/tcpdf/examples/example_048.php trunk/libs/tcpdf/examples/example_049.php trunk/libs/tcpdf/examples/example_050.php trunk/libs/tcpdf/examples/example_051.php trunk/libs/tcpdf/examples/example_052.php trunk/libs/tcpdf/examples/example_053.php trunk/libs/tcpdf/examples/example_054.php trunk/libs/tcpdf/examples/example_055.php trunk/libs/tcpdf/examples/example_056.php trunk/libs/tcpdf/examples/example_057.php trunk/libs/tcpdf/examples/example_058.php trunk/libs/tcpdf/examples/example_059.php trunk/libs/tcpdf/examples/example_060.php trunk/libs/tcpdf/examples/example_061.php trunk/libs/tcpdf/examples/example_062.php trunk/libs/tcpdf/examples/example_063.php trunk/libs/tcpdf/examples/example_064.php trunk/libs/tcpdf/examples/example_065.php trunk/libs/tcpdf/examples/images/ trunk/libs/tcpdf/examples/images/_blank.png trunk/libs/tcpdf/examples/images/alpha.png trunk/libs/tcpdf/examples/images/image_demo.jpg trunk/libs/tcpdf/examples/images/image_with_alpha.png trunk/libs/tcpdf/examples/images/img.png trunk/libs/tcpdf/examples/images/logo_example.gif trunk/libs/tcpdf/examples/images/logo_example.jpg trunk/libs/tcpdf/examples/images/logo_example.png trunk/libs/tcpdf/examples/images/tcpdf_box.ai trunk/libs/tcpdf/examples/images/tcpdf_box.svg trunk/libs/tcpdf/examples/images/tcpdf_cell.png trunk/libs/tcpdf/examples/images/tcpdf_logo.jpg trunk/libs/tcpdf/examples/images/tcpdf_signature.png trunk/libs/tcpdf/examples/images/testsvg.svg trunk/libs/tcpdf/examples/images/tux.svg trunk/libs/tcpdf/examples/index.php trunk/libs/tcpdf/examples/lang/ trunk/libs/tcpdf/examples/lang/afr.php trunk/libs/tcpdf/examples/lang/ara.php trunk/libs/tcpdf/examples/lang/aze.php trunk/libs/tcpdf/examples/lang/bel.php trunk/libs/tcpdf/examples/lang/bra.php trunk/libs/tcpdf/examples/lang/bul.php trunk/libs/tcpdf/examples/lang/cat.php trunk/libs/tcpdf/examples/lang/ces.php trunk/libs/tcpdf/examples/lang/chi.php trunk/libs/tcpdf/examples/lang/cym.php trunk/libs/tcpdf/examples/lang/dan.php trunk/libs/tcpdf/examples/lang/eng.php trunk/libs/tcpdf/examples/lang/est.php trunk/libs/tcpdf/examples/lang/eus.php trunk/libs/tcpdf/examples/lang/far.php trunk/libs/tcpdf/examples/lang/fra.php trunk/libs/tcpdf/examples/lang/ger.php trunk/libs/tcpdf/examples/lang/gle.php trunk/libs/tcpdf/examples/lang/glg.php trunk/libs/tcpdf/examples/lang/hat.php trunk/libs/tcpdf/examples/lang/heb.php trunk/libs/tcpdf/examples/lang/hrv.php trunk/libs/tcpdf/examples/lang/hun.php trunk/libs/tcpdf/examples/lang/hye.php trunk/libs/tcpdf/examples/lang/ind.php trunk/libs/tcpdf/examples/lang/ita.php trunk/libs/tcpdf/examples/lang/jpn.php trunk/libs/tcpdf/examples/lang/kat.php trunk/libs/tcpdf/examples/lang/kor.php trunk/libs/tcpdf/examples/lang/mkd.php trunk/libs/tcpdf/examples/lang/mlt.php trunk/libs/tcpdf/examples/lang/msa.php trunk/libs/tcpdf/examples/lang/nld.php trunk/libs/tcpdf/examples/lang/nob.php trunk/libs/tcpdf/examples/lang/pol.php trunk/libs/tcpdf/examples/lang/por.php trunk/libs/tcpdf/examples/lang/ron.php trunk/libs/tcpdf/examples/lang/rus.php trunk/libs/tcpdf/examples/lang/slv.php trunk/libs/tcpdf/examples/lang/spa.php trunk/libs/tcpdf/examples/lang/sqi.php trunk/libs/tcpdf/examples/lang/srp.php trunk/libs/tcpdf/examples/lang/swa.php trunk/libs/tcpdf/examples/lang/swe.php trunk/libs/tcpdf/examples/lang/ukr.php trunk/libs/tcpdf/examples/lang/urd.php trunk/libs/tcpdf/examples/lang/yid.php trunk/libs/tcpdf/examples/lang/zho.php trunk/libs/tcpdf/examples/tcpdf_include.php trunk/libs/tcpdf/fonts/ae_fonts_2.0/ trunk/libs/tcpdf/fonts/ae_fonts_2.0/COPYING trunk/libs/tcpdf/fonts/ae_fonts_2.0/ChangeLog trunk/libs/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK trunk/libs/tcpdf/fonts/ae_fonts_2.0/README trunk/libs/tcpdf/fonts/aealarabiya.ctg.z trunk/libs/tcpdf/fonts/aealarabiya.php trunk/libs/tcpdf/fonts/aealarabiya.z trunk/libs/tcpdf/fonts/aefurat.ctg.z trunk/libs/tcpdf/fonts/aefurat.php trunk/libs/tcpdf/fonts/aefurat.z trunk/libs/tcpdf/fonts/cid0cs.php trunk/libs/tcpdf/fonts/cid0ct.php trunk/libs/tcpdf/fonts/cid0jp.php trunk/libs/tcpdf/fonts/cid0kr.php trunk/libs/tcpdf/fonts/courierb.php trunk/libs/tcpdf/fonts/courierbi.php trunk/libs/tcpdf/fonts/courieri.php trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/ trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/README trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.34/ trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.34/README trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt trunk/libs/tcpdf/fonts/freefont-20120503/ trunk/libs/tcpdf/fonts/freefont-20120503/AUTHORS trunk/libs/tcpdf/fonts/freefont-20120503/COPYING trunk/libs/tcpdf/fonts/freefont-20120503/CREDITS trunk/libs/tcpdf/fonts/freefont-20120503/ChangeLog trunk/libs/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK trunk/libs/tcpdf/fonts/freefont-20120503/INSTALL trunk/libs/tcpdf/fonts/freefont-20120503/README trunk/libs/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING trunk/libs/tcpdf/fonts/freefont-20120503/USAGE trunk/libs/tcpdf/fonts/pdfacourier.php trunk/libs/tcpdf/fonts/pdfacourier.z trunk/libs/tcpdf/fonts/pdfacourierb.php trunk/libs/tcpdf/fonts/pdfacourierb.z trunk/libs/tcpdf/fonts/pdfacourierbi.php trunk/libs/tcpdf/fonts/pdfacourierbi.z trunk/libs/tcpdf/fonts/pdfacourieri.php trunk/libs/tcpdf/fonts/pdfacourieri.z trunk/libs/tcpdf/fonts/pdfahelvetica.php trunk/libs/tcpdf/fonts/pdfahelvetica.z trunk/libs/tcpdf/fonts/pdfahelveticab.php trunk/libs/tcpdf/fonts/pdfahelveticab.z trunk/libs/tcpdf/fonts/pdfahelveticabi.php trunk/libs/tcpdf/fonts/pdfahelveticabi.z trunk/libs/tcpdf/fonts/pdfahelveticai.php trunk/libs/tcpdf/fonts/pdfahelveticai.z trunk/libs/tcpdf/fonts/pdfasymbol.php trunk/libs/tcpdf/fonts/pdfasymbol.z trunk/libs/tcpdf/fonts/pdfatimes.php trunk/libs/tcpdf/fonts/pdfatimes.z trunk/libs/tcpdf/fonts/pdfatimesb.php trunk/libs/tcpdf/fonts/pdfatimesb.z trunk/libs/tcpdf/fonts/pdfatimesbi.php trunk/libs/tcpdf/fonts/pdfatimesbi.z trunk/libs/tcpdf/fonts/pdfatimesi.php trunk/libs/tcpdf/fonts/pdfatimesi.z trunk/libs/tcpdf/fonts/pdfazapfdingbats.php trunk/libs/tcpdf/fonts/pdfazapfdingbats.z trunk/libs/tcpdf/include/ trunk/libs/tcpdf/include/barcodes/ trunk/libs/tcpdf/include/barcodes/datamatrix.php trunk/libs/tcpdf/include/barcodes/pdf417.php trunk/libs/tcpdf/include/barcodes/qrcode.php trunk/libs/tcpdf/include/sRGB.icc trunk/libs/tcpdf/include/tcpdf_colors.php trunk/libs/tcpdf/include/tcpdf_filters.php trunk/libs/tcpdf/include/tcpdf_font_data.php trunk/libs/tcpdf/include/tcpdf_fonts.php trunk/libs/tcpdf/include/tcpdf_images.php trunk/libs/tcpdf/include/tcpdf_static.php trunk/libs/tcpdf/tcpdf_autoconfig.php trunk/libs/tcpdf/tcpdf_barcodes_1d.php trunk/libs/tcpdf/tcpdf_barcodes_2d.php trunk/libs/tcpdf/tcpdf_import.php trunk/libs/tcpdf/tcpdf_parser.php trunk/libs/tcpdf/tools/ trunk/libs/tcpdf/tools/.htaccess trunk/libs/tcpdf/tools/convert_fonts_examples.txt trunk/libs/tcpdf/tools/tcpdf_addfont.php Removed Paths: ------------- trunk/libs/tcpdf/README.TXT trunk/libs/tcpdf/fonts/README.TXT trunk/libs/tcpdf/fonts/almohanad.ctg.z trunk/libs/tcpdf/fonts/almohanad.php trunk/libs/tcpdf/fonts/almohanad.z trunk/libs/tcpdf/fonts/arialunicid0.php trunk/libs/tcpdf/fonts/chinese.php trunk/libs/tcpdf/fonts/dejavu-fonts-ttf-2.32/ trunk/libs/tcpdf/fonts/utils/ trunk/libs/tcpdf/fonts/zarbold.ctg.z trunk/libs/tcpdf/fonts/zarbold.php trunk/libs/tcpdf/fonts/zarbold.z trunk/libs/tcpdf/htmlcolors.php trunk/libs/tcpdf/unicode_data.php Modified: trunk/libs/jpgraph/TUTOS-README =================================================================== --- trunk/libs/jpgraph/TUTOS-README 2017-09-07 13:00:49 UTC (rev 1328) +++ trunk/libs/jpgraph/TUTOS-README 2017-09-09 15:54:39 UTC (rev 1329) @@ -3,7 +3,7 @@ You should install the jpgraph tool in this directory Please see -http://www.aditus.nu/jpgraph/ +http://jpgraph.net for more info Added: trunk/libs/tcpdf/CHANGELOG.TXT =================================================================== --- trunk/libs/tcpdf/CHANGELOG.TXT (rev 0) +++ trunk/libs/tcpdf/CHANGELOG.TXT 2017-09-09 15:54:39 UTC (rev 1329) @@ -0,0 +1,2946 @@ +6.2.13 (2016-06-10) + - IMPORTANT: A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this version will not receive any additional development or support. This version should be considered obsolete, new projects should use the new version as soon it will become stable. + +6.2.12 (2015-09-12) + - fix composer package name to tecnickcom/tcpdf + +6.2.11 (2015-08-02) + - Bug #1070 "PNG regression in 6.2.9 (they appear as their alpha channel)" was fixed. + - Bug #1069 "Encoded SRC URLs in <img> tags don't work anymore" was fixed. + +6.2.10 (2015-07-28) + - Minor mod to PNG parsing. + - Make dependency on mcrypt optional. + +6.2.8 (2015-04-29) + - Removed unwanted file. + +6.2.7 (2015-04-28) + - Merged PR 17: Avoid warning when iterating a non-array variable. + - Merged PR 16: Improve MuliCell param definition. + - Improved column check (PR 15). + - Merged PR 11: Use stream_is_local instead of limit to file://. + - Merged PR 10: ImageMagick link on README.txt. + +6.2.6 (2015-01-28) + - Bug #1008 "UTC offset sing breaks PDF/A-1b compliance" was fixed. + +6.2.5 (2015-01-24) + - Bug #1019 "$this in static context" was fixed. + - Bug #1015 "Infinite loop in getIndirectObject method of parser" was fixed. + +6.2.4 (2015-01-08) + - fix warning related to empty K_PATH_URL. + - fix error when a $table_colwidths key is not set. + +6.2.3 (2014-12-18) + - New comment. + - Moved the K_PATH_IMAGES definition in tcpdf_autoconfig. + +6.2.2 (2014-12-18) + - Fixed mispelled words. + - Fixed version number. + +6.2.1 (2014-12-18) + - The constant K_TCPDF_THROW_EXCEPTION_ERROR is now set to false in the default configuration file. + - An issue with the _destroy() method was fixed. + +6.2.0 (2014-12-10) + - Bug #1005 "Security Report, LFI posting internal files externally abusing default parameter" was fixed. + - Static methods serializeTCPDFtagParameters() and unserializeTCPDFtagParameters() were moved as non static to the main TCPDF class (see changes in example n. 49). + - Deprecated methods were removed, please use the equivalents defined in other classes (i.e. TCPDF_STATIC and TCPDF_FONTS). + - The constant K_TCPDF_CALLS_IN_HTML is now set by default to FALSE. + - DLE, DLX and DLP page format was added. + - Page format are now defined as a public property in TCPDF_STATIC. + +6.1.1 (2014-12-09) + - Fixed bug with the register_shutdown_function(). + +6.1.0 (2014-12-07) + - The method TCPDF_STATIC::getRandomSeed() was improved. + - The disk caching feature was removed. + - Bug #1003 "Backslashes become duplicated in table, using WriteHTML" was fixed. + - Bug #1002 "SVG radialGradient within non-square Rect" was fixed. + +6.0.099 (2014-11-15) + - Added basic support for nested SVG images (adapted PR from SamMousa). + - A bug related to setGDImageTransparency() was fixed (thanks to Maarten Boerema). + +6.0.098 (2014-11-08) + - Bug item #996 "getCharBBox($char) returns incorrect results for TTF glyphs without outlines" was fixed. + - Bug item #991 "Text problem with SVG" was fixed (only the font style part). + +6.0.097 (2014-10-20) + - Bug item #988 "hyphenateText - charmin parameter not work" was fixed. + - New 1D barcode method to print pre-formatted IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200. + +6.0.096 (2014-10-06) + - Bug item #982 "Display style is not inherited in SVG" was fixed. + - Bug item #984 "Double quote url in CSS" was fixed. + +6.0.095 (2014-10-02) + - Bug item #979 "New Timezone option overwriting current timezone" was fixed. + +6.0.094 (2014-09-30) + - Bug item #978 "Variable Undefined: $cborder" was fixed. + +6.0.093 (2014-09-02) + - Security fix: some serialize/unserialize methods were replaced with json_encode/json_decode to avoid a potential object injection with user supplied content. Thanks to ownCloud Inc. for reporting this issue. + - K_TIMEZONE constant was added to the default configuration to suppress date-time warnings. + +6.0.092 (2014-09-01) + - Bug item #956 "Monospaced fonts are not alignd at the baseline" was fixed. + - Bug item #964 "Problem when changing font size" was fixed. + - Bug item #969 "ImageSVG with radialGradient problem" was fixed. + - sRGB.icc file was replaced with the one from the Debian package icc-profiles-free (2.0.1+dfsg-1) + +6.0.091 (2014-08-13) + - Issue #325"Division by zero when css fontsize equals 0" was fixed. + +6.0.090 (2014-08-08) + - Starting from this version TCPDF is also available in GitHub at https://github.com/tecnickcom/TCPDF + - Function getmypid() was removed for better compatibility with shared hosting environments. + - Support for pulling SVG stroke opacity value from RGBa color was mergeg [adf006]. + - Bug item #951 "HTML Table within TCPDF columns doesnt flow correctly on page break ..." was fixed. + +6.0.089 (2014-07-16) + - Bug item #948 "bottom line of rowspan cell not work correctly" was fixed. + +6.0.088 (2014-07-09) + - Bug item #946 "Case sensitive type check causes broken match for SVG" was fixed. + - Bug item #945 "Imagick load doesn't account for passed data string " was fixed. + +6.0.087 (2014-06-25) + - A bug affecting fitcell option in Multicell was fixed. + +6.0.086 (2014-06-20) + - Bug item #938 "Hyphenation-dash extends outside of cell" was fixed (collateral effect). + +6.0.085 (2014-06-19) + - Some example images were replaced. + - A race condition bug was fixed. + - Bug item #938 "Hyphenation-dash extends outside of cell" was fixed. + +6.0.084 (2014-06-13) + - A bug related to MultiCell fitcell feature was fixed. + - Bug item #931 "Documentation error for setPageFormat()" was fixed. + +6.0.083 (2014-05-29) + - Bug item #928 "setHtmlVSpace with HR element" was fixed. + +6.0.082 (2014-05-23) + - Bug item #926 "test statement instead of assignment used in tcpdf_fonts.php" was fixed. + - Bug item #925 "924 transparent images bug" was fixed. + +6.0.081 (2014-05-22) + - Bug item #922 "writehtml tables thead repeating" was fixed. + - Patch #71 "External and internal links, local and remote" wa applied. + +6.0.080 (2014-05-20) + - Bug item #921 "Fatal error in hyphenateText() function" was fixed. + - Bug item #923 "Automatic Hyphenation error" was fixed. + - Patch #70 "Augument TCPDFBarcode classes with ability to return raw png image data" was applied. + +6.0.079 (2014-05-19) + - Patch item #69 "Named destinations, HTML internal and external links" was merged. + - Bug item #920 "hyphenateText() should not hyphenate the content of style-tags in HTML mode" was fixed. + - Image method now trigs an error in case the cache is now writeable. + - Fixed issue with layer default status. + +6.0.078 (2014-05-12) + - A warning issue in addTTFfont() method was fixed. + - Fonts were updated to include cbbox metrics. + +6.0.077 (2014-05-06) + - A Datamatrix barcode bug was fixed. + +6.0.076 (2014-05-06) + - A bug in Datamatrix Base256 encoding was fixed. + - Merged fix for SVG use/clip-gradient. + - Now it is possible to prefix a page number in Link methods with the * character to avoid been changed when adding/deleting/moving pages (see example_045.php). + +6.0.075 (2014-05-05) + - Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed. + +6.0.074 (2014-05-03) + - Part of Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed. + - Bug #915 "Problem with SVG Image using Radial Gradients" was fixed. + +6.0.073 (2014-04-29) + - Bug #913 "Possible bug with line-height" was fixed. + - Bug #914 "MultiCell and FitCell" was fixed. + - Bug #915 "Problem with SVG Image using Radial Gradients" was fixed. + +6.0.072 (2014-04-27) + - Deprecated curly braces substring syntax was replaced with square braces. + +6.0.071 (2014-04-25) + - Bug #911 "error with buffered png pics" was fixed. + +6.0.070 (2014-04-24) + - Bug #910 "An SVG image is being cut off (with clipping mask) when you use align options" was fixed. + +6.0.069 (2014-04-24) + - Datamatrix Base256 encoding was fixed. + +6.0.068 (2014-04-22) + - Some Datamatrix barcode bugs were fixed. + +6.0.067 (2014-04-21) + - startLayer() method signature was changed to include a new "lock" parameter. + +6.0.066 (2014-04-20) + - Bug #908 "Linebreak is not considered when getting length of the next string" was fixed. + +6.0.065 (2014-04-10) + - Bug #905 "RGB percentage color bug in convertHTMLColorToDec()" was fixed. + +6.0.064 (2014-04-07) + - Header and Footer fonts are now set by default. + - Bug #904 "PDF corrupted" was fixed. + +6.0.063 (2014-04-03) + - Method TCPDF_IMAGES::_parsepng() was fixed to support transparency in Indexed images. + +6.0.062 (2014-03-02) + - The method startLayer() now accepts the NULL value for the $print parameter to not set the print layer option. + +6.0.061 (2014-02-18) + - Bug #893 "Parsing error on streamed xref for secured pdf" was fixed. + +6.0.060 (2014-02-16) + - Bug #891 "Error on parsing hexa fields" was fixed. + - Bug #892 "Parsing pdf with trailing space at start" was fixed. + +6.0.059 (2014-02-03) + - SVG 'use' support was imporved. + +6.0.058 (2014-01-31) + - Bug #886 "Bugs with SVG using <defs> and <use>" was fixed. + +6.0.057 (2014-01-26) + - Bug #883 "Parsing error" was fixed. + +6.0.056 (2014-01-25) + - The automatic cache folder selection now works also with some restricted hosting environments. + - CSS text-transform property is now supported (requires the multibyte string library for php) - see examle n. 061 (Thanks to Walter Ferraz). + - Bug #884 "Parsing error prev tag looking for" was fixed. + +6.0.055 (2014-01-15) + - Bug #880 "Error detecting hX tags (h1,h2..)" was fixed + - Bug #879 "Thead on the second page inherits style of previous tr" was fixed + +6.0.054 (2014-01-13) + - Bug #877 "Parenteses causing corrupt text" was fixed. + +6.0.053 (2014-01-03) + - Bug #876 "Cell padding should not be multiplied with number of lines in getStringHeight" was fixed. + - Patch #68 "Empty img src attribute leads to access of uninitialized string offset" was applied. + +6.0.052 (2013-12-12) + - Bug #871 "Datamatrix coding" was fixed. + +6.0.051 (2013-12-02) + - cbbox array values in addTTFfont() were converted to integers. + +6.0.050 (2013-12-01) + - The method getNumLines() was extended to support hyphenation. + - The CSS property line-height now supports non percentage values. + +6.0.050 (2013-11-27) + - A bug related to PNG images was fixed. + +6.0.048 (2013-11-24) + - SVG vars are now reset in ImageSVG() method. + +6.0.047 (2013-11-19) + - SVG support was extended to support some nested defs. + +6.0.046 (2013-11-17) + - preg_replace_callback functions were replaced to improve memory performances. + +6.0.045 (2013-11-17) + - Bug #862 "Parsing error on flate filter" was fixed. + +6.0.044 (2013-11-10) + - Bug #857 "Undefined offset error" was fixed. + - The uniord method now uses a static cache to improve performances (thanks to Mathieu Masseboeuf for the sugegstion). + - Two bugs in the TCPDF_FONTS class were fixed. + +6.0.043 (2013-10-29) + - Bug #854 "CSS instruction display" was fixed. + +6.0.042 (2013-10-25) + - Bug #852 "CMYK Colors Bug" was fixed. + +6.0.041 (2013-10-21) + - Bug #851 "Problem with images in PDF. PHP timing out" was fixed. + +6.0.040 (2013-10-20) + - Bug #849 "SVG import bug" was fixed. + +6.0.039 (2013-10-13) + - Bug #843 "Wrong call in parser" was fixed. + - Bug #844 "Wrong object type named" was fixed. + - Bug #845 "Parsing error on obj ref prefixed by '000000'" was fixed. + +6.0.038 (2013-10-06) + - Bug #841 "Division by zero warning at writeHTML a <li> tag" was fixed. + +6.0.037 (2013-09-30) + - Method getAllSpotColors() was added to return all spot colors. + - Method colorRegistrationBar() was extended to automatically print all spot colors and support individual spot colors. + - The method registrationMarkCMYK() was added to print a registration mark for CMYK colors. + - A bug related to page groups was fixed. + - Gradient() method now supports CMYK equivalents of spot colors. + - Example n. 56 was updated. + +6.0.036 (2013-09-29) + - Methods for registration bars and crop marks were extended to support registration color (see example n. 56). + - New default spot colors were added to tcpdf_colors.php, including the 'All' and 'None' special registration colors. + +6.0.035 (2013-09-25) + - TCPDF_PARSER class was improved. + +6.0.034 (2013-09-24) + - Bug #839 "Error in xref parsing in mixed newline chars" was fixed. + +6.0.033 (2013-09-23) + - Bug fix related to PNG image transparency using GD library. + +6.0.032 (2013-09-23) + - Bug #838 "Fatal error when imagick cannot handle the image, even though GD is available and can" was fixed. + +6.0.031 (2013-09-18) + - Bug #836 "Optional EOL marker before endstream" was fixed. + - Some additional controls were added to avoid "division by zero" error with badly formatted input. + +6.0.030 (2013-09-17) + - Bug #835 "PDF417 and Cyrilic simbols" was fixed. + +6.0.029 (2013-09-15) + - Constants K_TCPDF_PARSER_THROW_EXCEPTION_ERROR and K_TCPDF_PARSER_IGNORE_DECODING_ERRORS where removed in favor of a new configuration array in the TCPDF_PARSER class. + - The TCPDF_PARSER class can now be configured using the new $cfg parameter. + +6.0.028 (2013-09-15) + - A debug print_r was removed form tcpdf_parser.php. + - TCPDF_FILTERS class now throws an exception in case of error. + - TCPDF_PARSER class now throws an exception in case of error unless you define the constant K_TCPDF_PARSER_THROW_EXCEPTION_ERROR to false. + - The constant K_TCPDF_PARSER_IGNORE_DECODING_ERRORS can be set to tru eto ignore decoding errors on TCPDF_PARSER. + +6.0.027 (2013-09-14) + - A bug in tcpdf_parser wen parsing hexadecimal strings was fixed. + - A bug in tcpdf_parser wen looking for statxref was fixed. + - A bug on RC4 encryption was fixed. + +6.0.026 (2013-09-14) + - A bug in tcpdf_parser wen decoding streams was fixed. + +6.0.025 (2013-09-04) + - A pregSplit() bug was fixed. + - Improved content loading from URLs. + - Improved font path loading. + +6.0.024 (2013-09-02) + - Bug #826 "addEmptySignatureAppearance issue" was fixed. + +6.0.023 (2013-08-05) + - GNU Freefont fonts were updated. + - Licensing and copyright information about fonts were improved. + - PNG image support was improved. + +6.0.022 (2013-08-02) + - fixing initialization problem for signature_appearance property. + +6.0.021 (2013-07-18) + - The bug caused by the preg_split function on some PHP 5.2.x versions was fixed. + +6.0.020 (2013-06-04) + - The method addTTFfont() was fixed (Bug item #813 Undefined offset). + +6.0.019 (2013-06-04) + - The magic constant __DIR__ was replaced with dirname(__FILE__) for php 5.2 compatibility. + - The exceptions raised by file_exists() function were suppressed. + +6.0.018 (2013-05-19) + - The barcode examples were changed to automatically search for the barcode class path (in case the examples directory is not installed under the TCPDF root). + +6.0.017 (2013-05-16) + - The command line tool tcpdf_addfont.php was improved. + - The php logic was removed from configuration files that now contains only constant defines. + - The tcpdf_autoconfig.php file was added to automatically set missing configuration values. + +6.0.016 (2013-05-15) + - The tcpdf_addfont.php tool was improved (thanks to Remi Collet). + - Constant K_PATH_IMAGES is now automatically set in configuration file. + +6.0.015 (2013-05-14) + - Some unused vars were removed from AddFont() method. + - Some directories were moved inside the examples directory. + - All examples were updated to reflect the new default structure. + - Source code were clean-up up to be more compatible with system packaging. + - Files encodings and permissions were reset. + - The command line tool tcpdf_addfont.php was added on the tools directory. + +6.0.014 (2013-04-13) + - The signature of addTTFfont() method includes a new parameter to link existing fonts instead of copying and compressing them. + +6.0.013 (2013-04-10) + - Add support for SVG dx and dy text/tspan attributes. + - replace require() with require_once(). + - fix some minor typos on documentation. + - fix a problem when deleting all pages. + +6.0.012 (2013-04-24) + - An error condition in addHtmlLink() method was fixed (bug #799). + +6.0.011 (2013-04-22) + - Minor documentation changes. + +6.0.010 (2013-04-03) + - The method Rect() was fixed to print borders correctly. + +6.0.009 (2013-04-02) + - Adding back some files that were not properly committed on the latest release. + +6.0.008 (2013-04-01) + - Duplicated encoding maps was removed from tcpdf_font_data.php. + - Fixing bug on AddTTFFont(). + +6.0.007 (2013-03-29) + - HTML/CSS font size conversion were improved. + +6.0.006 (2013-03-27) + - Bug related to SVG and EPS files on xobjects were fixed. + +6.0.005 (2013-03-26) + - Default font path was fixed. + +6.0.004 (2013-03-21) + - Return value of addTTFfont() method was fixed. + +6.0.003 (2013-03-20) + - A bug related to non-unicode mode was fixed. + +6.0.002 (2013-03-18) + - _getFIXED call on tcpdf_fonts.php was fixed. + +6.0.001 (2013-03-18) + - Fixed $uni_type call on tcpdf.php. + +6.0.000 (2013-03-17) + - IMPORTANT: PHP4 support has been removed starting from this version. + - Several TCPDF methods and vars were moved to new class files: tcpdf_static.php, tcpdf_colors.php, tcpdf_images.php, tcpdf_font_data.php, tcpdf_fonts.php. + - Files htmlcolors.php, spotcolors.php, unicode_data.php and ecodings_maps.php were removed. + - Barcode classes were renamed and new barcode examples were added. + - Class TCPDF_PARSER was improved. + +******************************************************************************** + +5.9.209 (2013-03-15) + - Image method was improved. + +5.9.208 (2013-03-15) + - objclone function was patched to support old imagick extensions. + - tcpdf_parser was improved to support Cross-Reference Streams and large streams. + +5.9.207 (2013-03-04) + - Datamatrix class was fixed (a debug echo was removed). + +5.9.206 (2013-02-22) + - Bug item #754 "PNG with alpha channel becomes gray scale" was fixed. + - Minor documentation fixes. + +5.9.205 (2013-02-06) + - The constant K_TCPDF_THROW_EXCEPTION_ERROR was added on configuration file to change the behavior of Error() method. + - PDF417 barcode bug was fixed. + +5.9.204 (2013-01-23) + - The method Bookmark() was extended to include named destinations, URLs, internal links or embedded files (see example n. 15). + - automatic path calculation on configuration file was fixed. + - Error() method was extended to throw new Exception if PHP > 5. + +5.9.203 (2013-01-22) + - Horizontal position of radiobuttons and checkboxes was adjusted. + +5.9.202 (2012-12-16) + - Vertical space problem after table was fixed. + +5.9.201 (2012-12-10) + - First 256 chars are now always included on font subset to overcome a problem reported on the forum. + +5.9.200 (2012-12-05) + - Bug item #768 "Rowspan with Pagebreak error" was fixed. + - Page regions now works also with limited MultiCell() cells. + +5.9.199 (2012-11-29) + - Internal setImageBuffer() method was improved. + +5.9.198 (2012-11-19) + - Datamatrix EDIFACT mode was fixed. + +5.9.197 (2012-11-06) + - Bug item #756 "TCPDF 5.9.196 shows line on top of all PDFs" was fixed. + +5.9.196 (2012-11-02) + - Several methods were improved to avoid output when the context is out of page. + - Bug item #755 "remove cached files before unsetting" was fixed. + +5.9.195 (2012-10-24) + - Method _putfonts() was improved. + +5.9.194 (2012-10-23) + - Text alignment on TextField() method was fixed. + +5.9.193 (2012-09-25) + - Support for named destinations on HTML links was added (i.e.: <a href="#destinationname">link to named destination</a>). + +5.9.192 (2012-09-24) + - A problem on the releasing process was fixed. + +5.9.191 (2012-09-24) + - SVG image naow support svg and eps images. + +5.9.190 (2012-09-23) + - "page" word translation is now set to empty if not defined. + - Tooltip feature was added on the radiobutton annotation. + +5.9.189 (2012-09-18) + - Bug item #3568969 "ini_get safe_mode error" was fixed. + +5.9.188 (2012-09-15) + - A datamatrix barcode bug was fixed. + +5.9.187 (2012-09-14) + - Subset feature was extended to include the first 256 characters. + +5.9.186 (2012-09-13) + - barcodes.php file was resynced. + - Methods SetAbsX, SetAbsY, SetAbsXY where added to set the absolute pointer coordinates. + - Method getCharBBox were added to get single character bounding box. + - Signature of addTTFfont method was changed ($addcbbox parameter was added). + +5.9.185 (2012-09-12) + - Method _putfontwidths() was fixed. + +5.9.184 (2012-09-11) + - A problem with EAN barcodes was fixed. + +5.9.183 (2012-09-07) + - A problem with font names normalization was fixed. + +5.9.182 (2012-09-05) + - Bug item #3564982 "Infinite loop in Write() method" was fixed. + +5.9.181 (2012-08-31) + - composer.json file was added. + - Bug item #3563369 "Cached images are not unlinked some time" was fixed. + +5.9.180 (2012-08-22) + - Bug item #3560493 "Problems with nested cells in HTML" was fixed. + +5.9.179 (2012-08-04) + - SVG 'use' tag was fixed for 'circle' and 'ellipse' shift problem. + - Alpha status is now correctly stored and restored by getGraphicVars() and SetGraphicVars() methods. + +5.9.178 (2012-08-02) + - SVG 'use' tag was fixed for 'circle' and 'ellipse'. + +5.9.177 (2012-08-02) + - An additional control on annotations was fixed. + +5.9.176 (2012-07-25) + - A bug related to stroke width was fixed. + - A problem related to font spacing in HTML was fixed. + +5.9.175 (2012-07-25) + - The problem of missing letter on hyphen break was fixed. + +5.9.174 (2012-07-25) + - The problem of wrong filename when downloading PDF from an Android device was fixed. + - The method setHeaderData() was extended to set text and line color for header (see example n. 1). + - The method setFooterData() was added to set text and line color for footer (see example n. 1). + - The methods setTextShadow() and getTextShadow() were added to set text shadows (see example n. 1). + - The GetCharWidth() method was fixed for negative character spacing. + - A 'none' border mode is now correctly recognized. + - Break on hyphen problem was fixed. + +5.9.173 (2012-07-23) + - Some additional control wher added on barcode methods. + - The option CURLOPT_FOLLOWLOCATION on Image method is now disabled if PHP safe_mode is on or open_basedir is set. + - Method Bookmark() was extended to include X parameter. + - Method setDestination() was extended to include X parameter. + - A problem with Thai language was fixed. + +5.9.172 (2012-07-02) + - A PNG color profile issue was fixed. + +5.9.171 (2012-07-01) + - Some SVG rendering problems were fixed. + +5.9.170 (2012-06-27) + - Bug #3538227 "Numerous errors inserting shared images" was fixed. + +5.9.169 (2012-06-25) + - Some SVG rendering problems were fixed. + +5.9.168 (2012-06-22) + - Thai language rendering was fixed. + +5.9.167 (2012-06-22) + - Thai language rendering was fixed and improved. + - Method isCharDefined() was improved. + - Protected method replaceChar() was added. + - Font "kerning" word was corrected to "tracking". + +5.9.166 (2012-06-21) + - Array to string conversion on file_id creation was fixed. + - Thai language rendering was fixed (thanks to Atsawin Chaowanakritsanakul). + +5.9.165 (2012-06-07) + - Some HTML form related bugs were fixed. + +5.9.164 (2012-06-06) + - A bug introduced on the latest release was fixed. + +5.9.163 (2012-06-05) + - Method getGDgamma() was changed. + - Rendering performances of PNG images with alpha channel were improved. + +5.9.162 (2012-05-11) + - A bug related to long text on TD cells was fixed. + +5.9.161 (2012-05-09) + - A bug on XREF table was fixed (Bug ID: 3525051). + - Deprecated Imagick:clone was replaced. + - Method objclone() was fixed for PHP4. + +5.9.160 (2012-05-03) + - A bug on tcpdf_parser.php was fixed. + +5.9.159 (2012-04-30) + - Barcode classes were updated to fix PNG export Bug (ID: 3522291). + +5.9.158 (2012-04-22) + - Some SVG-related bugs were fixed. + +5.9.157 (2012-04-16) + - Some SVG-related bugs were fixed. + +5.9.156 (2012-04-10) + - Bug item #3515885 "TOC and booklet: left and right page exchanged". + - SetAutoPageBreak(false) now works also in multicolumn mode. + +5.9.155 (2012-04-02) + - Bug item #3512596 "font import problems" was fixed. + - Method addTTFfont() was modified to extract only specified Platform ID and Encoding ID (check the source code documentation). + - All fonts were updated. + - Bug item #3513867 "booklet and setHeaderTemplateAutoreset: header shifted left" was fixed. + - Bug item #3513749 "TCPDF Superscript/Subscript" was fixed. + +5.9.154 (2012-03-29) + - A debug echo was removed. + +5.9.153 (2012-03-28) + - A bug on font conversion was fixed. + - All fonts were updated. + - Method isCharDefined() was added to find if a character is defined on the selected font. + - Method replaceMissingChars() was added to automatically replace missing chars on selected font. + - SetFont() method was fixed. + +5.9.152 (2012-03-23) + - The following overprint methods were added: setOverprint(), getOverprint(). + - Signature of setAlpha() method was changed and method getAlpha() was added. + - stroke-opacity support was added on SVG. + - The following date methods were added: setDocCreationTimestamp(), setDocModificationTimestamp(), getDocCreationTimestamp(), getDocModificationTimestamp(), getFormattedDate(), getTimestamp(). + - Signature of _datestring() method was changed. + - Method getFontBBox() was added. + - Method setPageBoxTypes() was aded. + +5.9.151 (2012-03-22) + - Bug item #3509889 "Transform() distorts PDF" was fixed. + - Precision of real number were extended. + - ComboBox and ListBox methods were fixed. + - Bulgarian language file was added. + - addTOC() method was improved to include bookmark color and font style. + +5.9.150 (2012-03-16) + - A bug related to form fields in PDF/A mode was fixed. + +5.9.149 (2012-02-21) + - Bug item #3489933 "SVG Parser treats tspan like text" was fixed. + +5.9.148 (2012-02-17) + - Bug item #3488600 "Multiple radiobutton sets get first set value" was fixed. + +5.9.147 (2012-02-14) + - A problem with SVG gradients has been fixed. + +5.9.146 (2012-02-12) + - Bug item #3486880 "$filehash undefine error" was fixed. + - The default font is now the one specified at PDF_FONT_NAME_MAIN constant. + +5.9.145 (2012-01-28) + - Japanese language file was added. + - TCPDF license and README.TXT files were updated. + +5.9.144 (2012-01-12) + - HTML output on barcode classes was improved. + +5.9.143 (2012-01-08) + - Bug item #3471057 "setCreator() has no effect" was fixed. + +5.9.142 (2011-12-23) + - Source code documentation was updated. + +5.9.141 (2011-12-14) + - Some minor bugs were fixed. + +5.9.140 (2011-12-13) + - SVG now supports embedded images encoded as base64. + +5.9.139 (2011-12-11) + - Spot color methods were fixed. + +5.9.138 (2011-12-10) + - cropMark() method was improved (check source code documentation). + - Example n. 56 was updated. + - Bug item #3452390 "Check Box still not ticked when set to true" was fixed. + +5.9.137 (2011-12-01) + - Bug item #3447005 "Background color and border of Form Elements is printed" was fixed. + - Color support for Form elements was improved. + +5.9.136 (2011-11-27) + - Bug item #3443387 "SetMargins with keep option does not work for top margin" was fixed. + +5.9.135 (2011-11-04) + - Bug item #3433406 "Double keywords in description" was fixed. + +5.9.134 (2011-10-29) + - The default value for $defcol parameter on convertHTMLColorToDec() method was fixed. + - Deafult HTTP headers were changed to avoid browser caching. + - Some deprecated syntax were replaced. + +5.9.133 (2011-10-26) + - Bug item #3428446 "copyPage method not working when diskcache enabled" was fixed. + +5.9.132 (2011-10-20) + - Bug item #3426167 "bug in function convertHTMLColorToDec()" was fixed. + +5.9.131 (2011-10-13) + - An error message was added to ImagePngAlpha() method. + +5.9.130 (2011-10-12) + - Now you can set image data strings on HTML img tag by encoding the image binary data in this way: $imgsrc = '@'.base64_encode($imgdata); + +5.9.129 (2011-10-07) + - Core fonts metrics was fixed (replace all helvetica and times php files on fonts folder). + - Form fields support was improved and some problems were fixed (check the example n. 14). + - Bug item #3420249 "Issue with booklet and MultiCell" was fixed. + +5.9.128 (2011-10-06) + - Method addTTFfont() was improved (check the source code documentation). + - Method setExtraXMP() to set custom XMP data was added. + +5.9.127 (2011-10-04) + - Readonly mode option was activated for radiobuttons. + +5.9.126 (2011-10-03) + - Bug item #3417989 "Graphics State operator in form XObject fails to render" was fixed. + - Xobjects problems with transparency, gradients and spot colors were fixed. + +5.9.125 (2011-10-03) + - Support for 8-digit CMYK hexadecimal color representation was added (to be used with XHTML and SVG). + - Spot colors support was improved (check example n. 37). + - Color methods were improved. + +5.9.124 (2011-10-02) + - Core fonts were updated. + +5.9.123 (2011-10-02) + - The method addTTFfont() wad added to automatically convert TTF fonts (check the new fonts guide at http://www.tcpdf.org). + - Old font utils were removed. + - All fonts were updated and new arabic fonts were added (almohanad were removed and replaced by aefurat and aealarabiya). + - The file unicode_data.php was updated. + - The file encodings_maps.php was added. + - PDF/A files are now compressed to save space. + - XHTML input form fields now support text-alignment attribute. + +5.9.122 (2011-09-29) + - PDF/A-1b compliance was improved to pass some online testing. + +5.9.121 (2011-09-28) + - This version includes support for PDF/A-1b format (the class constructor signature was changed - see example n. 65). + - Method setSRGBmode() was added to force sRGB_IEC61966-2.1 black scaled ICC color profile for the whole document (file sRGB.icc was added). + - 14 new fonts were added to allow embedding core fonts (for PDF/A compliance). + - Font utils were fixed. + +5.9.120 (2011-09-22) + - This version includes a fix for _getTrueTypeFontSubset() method. + +5.9.119 (2011-09-19) + - This version includes a fix for extra page numbering on TOC. + +5.9.118 (2011-09-17) + - This version includes some changes that allows you to add a bookmark for a page that do not exist. + +5.9.117 (2011-09-15) + - TCPDFBarcode and TCPDF2DBarcode classes were extended to include a method for exporting barcodes as PNG images. + +5.9.116 (2011-09-14) + - Datamatrix class was improved and documentation was fixed. + +5.9.115 (2011-09-13) + - Datamatrix ECC200 barcode support was added (a new datamatrix.php file was added) - check example n. 50. + - getBarcodeHTML() method was added on TCPDFBarcode and TCPDF2DBarcode classes to return an HTML representation of the barcode. + - cURL options on Image() method were improved. + - A bug on write2DBarcode() was fixed. + +5.9.114 (2011-09-04) + - A bug related to column position was fixed. + +5.9.113 (2011-08-24) + - This release include two new experimental files for parsing an existing PDF document (the integration with TCPDF is under development). + +5.9.112 (2011-08-18) + - A newline character was added after the 'trailer' keyword for compatibility with some parsers. + - Support for layers was improved. + +5.9.111 (2011-08-17) + - Barcode CODE 39 default gap was restored at 1. + +5.9.110 (2011-08-17) + - Barcode CODE 39 was fixed. + +5.9.109 (2011-08-12) + - Method getNumLines() was fixed. + - A bug related to page break in multi-column mode was fixed. + +5.9.108 (2011-08-09) + - A bug on PHP4 version was fixed. + +5.9.107 (2011-08-08) + - This version includes a minor bugfix. + +5.9.106 (2011-08-04) + - This version includes transparency groups: check the new parameter on startTemplate() method and example 62. + +5.9.105 (2011-08-04) + - Bug item #3386153 "Check Box not ticked when set to true" was fixed. + +5.9.104 (2011-08-01) + - Bug item #3383698 "imagemagick, resize and dpi" was fixed. + +5.9.103 (2011-07-16) + - Alignment of XHTML lines was improved. + - Spell of the "length" word was fixed. + +5.9.102 (2011-07-13) + - Methods startLayer() and endLayer() were added to support arbitrary PDF layers. + - Some improvements/fixes for images were added (thanks to Brendan Abbott). + +5.9.101 (2011-07-07) + - Support for JPEG and PNG ICC Color Profiles was added. + - Method addEmptySignatureAppearance() was added to add empty signature fields (see example n. 52). + - Bug item #3354332 "Strange line spacing with reduced font-size in writeHTML" was fixed. + +5.9.100 (2011-06-29) + - An SVG bug has been fixed. + +5.9.099 (2011-06-27) + - Bug item #3335045 "Font freesans seems somehow corrupted in footer" was fixed. + +5.9.098 (2011-06-23) + - The Named Destination feature was fixed. + +5.9.097 (2011-06-23) + - The method setHtmlVSpace() now can be used also for tags: div, li, br, dt and dd. + - The Named Destination feature was added (check the example n. 15) - thanks to Christian Deligant. + +5.9.096 (2011-06-19) + - Bug item #3322234 "Surrogate pairs codes in arrUTF8ToUTF16BE" was fixed. + +5.9.095 (2011-06-18) + - Numbers alignment for Table-Of-Content methods was improved and fixed. + - Font subsetting was fixed to include all parts of composite fonts. + +5.9.094 (2011-06-17) + - Bug item #3317898 "Page Group numbering broken in 5.9.093" was fixed. + +5.9.093 (2011-06-16) + - Method setStartingPageNumber() was added to set starting page number (for automatic page numbering). + +5.9.092 (2011-06-15) + - Method _putpages() was improved. + - Bug item #3316678 "Memory overflow when use Rotate and SetAutoPageBreak" was fixed. + - Right alignment of page numbers was improved. + +5.9.090 (2011-06-14) + - Methods AliasNbPages() and AliasNumPage() were re-added as deprecated for backward compatibility. + +5.9.089 (2011-06-13) + - Example n. 8 was updated. + - Method sendOutputData() was changed to remove default compression (it was incompatible with some server settings). + - Bugs related to page group numbers were fixed. + - Method copyPage() was fixed. + - Method Image() was improved to include support for alternative and external images. + +5.9.088 (2011-06-01) + - Method getAutoPageBreak() was added (see example n. 51). + - Example n. 51 (full page background) was updated. + +5.9.087 (2011-06-01) + - Method sendOutputData() was improved to include deflate encoding. + - Barcode classes on PHP 4 version were fixed. + +5.9.086 (2011-05-31) + - Font files were updated (the ones on the previous release were broken). + - The script fonts/utils/makeallttffonts.php was updated and fixed. + - Output() method was improved to use compression when available. + +5.9.085 (2011-05-31) + - TCPDFBarcode class (barcodes.php) now includes getBarcodeSVG() and getBarcodeSVGcode() methods to get SVG image representation of the barcode. + - TCPDF2DBarcode class (2dbarcodes.php) now includes getBarcodeSVG() and getBarcodeSVGcode() methods to get SVG image representation of the barcode. + +5.9.084 (2011-05-29) + - Font files were updated. + - The file fonts/utils/makeallttffonts.php was updated. + - Bug item# 3308774 "Problems with font subsetting" was fixed. + +5.9.083 (2011-05-24) + - Bug item #3308387 "line height & SetCellHeightRatio" was fixed. + +5.9.082 (2011-05-22) + - Bug item #3305592 "Setting fill color <> text color breaks text clipping" was fixed. + +5.9.081 (2011-05-18) + - Method resetHeaderTemplate() was added to reset the xobject template used by Header() method. + - Method setHeaderTemplateAutoreset() was added to automatically reset the xobject template used by Header() method at each page. + +5.9.080 (2011-05-17) + - A problem related to file path calculation for images was fixed. + - A problem related to unsuppressed getimagesize() error was fixed. + +5.9.079 (2011-05-16) + - Footer() method was changed to use C128 barcode as default (instead of the previous C128B). + +5.9.078 (2011-05-12) + - Bug item #3300878 "wrong rendering for html bullet list in some case" was fixed. + - Bug item #3301017 "Emphasized vs. font-weight" was fixed. + - Barcode Code 128 was improved to include AUTO mode (automatically switch between A, B and C modes). + - Examples n. 27 and 49 were updated. + +5.9.077 (2011-05-07) + - Bug item #3298591 "error code93" was fixed. + - SetLineStyle() function was improved. + +5.9.076 (2011-05-06) + - Bug item #3298264 "codebar 93 error" was fixed. + +5.9.075 (2011-05-02) + - Table header alignment when using WriteHTMLCell() or MultiCell() was fixed. + +5.9.074 (2011-04-28) + - Bug item #3294306 "CSS classes not work in <thead> table section" was fixed. + +5.9.073 (2011-04-27) + - A bug related to character entities on HTML cells was fixed. + +5.9.072 (2011-04-26) + - Method resetColumns() was added to remove multiple columns and reset page margins (example n. 10 was updated). + +5.9.071 (2011-04-19) + - Bug #3288574 "<br/> trouble" was fixed. + +5.9.069 (2011-04-19) + - Bug #3288763 "HTML-Table: non-breaking table rows: Bug" was fixed. + +5.9.068 (2011-04-15) + - Bookmark, addTOC and addHTMLTOC methods were improved to include font style and color (Examples 15, 49 and 59 were updated). + - Default $_SERVER['DOCUMENT_ROOT'] value on tcpdf_config.php file was changed. + +5.9.067 (2011-04-10) + - Performances were drastically improved (PDF documents are now created more quickly). + +5.9.066 (2011-04-09) + - A bug related to digital signature + encryption was fixed. + - A bug related to encryption + xobject templates was fixed. + +5.9.065 (2011-04-08) + - Bug item #3280512 "Text encoding iso-8859-2 crashes" was fixed. + +5.9.064 (2011-04-05) + - A bug related to character entities on HTML cells was fixed. + +5.9.063 (2011-04-01) + - Bug item #3267235 "WriteHTML() and image that doesn't fit on the page" was fixed. + +5.9.062 (2011-03-23) + - Bug item #3232650 "Using Write if there are pageRegions active creates error" was fixed. + - Bug item #3221891 "text input borders" was fixed. + - Bug item #3228958 "Adobe Reader 9.4.2 crash" was fixed. + +5.9.061 (2011-03-15) + - Bug item #3213488 "wrong function call in function Write" was fixed. + - Bug item #3203007 "list element with black background" was fixed. + +5.9.060 (2011-03-08) + - addTOC() method was fixed for text alignment problems. + +5.9.059 (2011-02-27) + - Default Header() method was improved to reduce document size. + +5.9.058 (2011-02-25) + - Image() method was improved to cache images with transparency layers (thanks to Korneliusz Jarzębski for reporting this problem). + +5.9.057 (2011-02-24) + - A problem with image caching system was fixed (thanks to Korneliusz Jarzębski for reporting this problem). + +5.9.056 (2011-02-22) + - A bug on fixHTMLCode() method was fixed. + - Automatic line break for HTML was fixed. + +5.9.055 (2011-02-17) + - Another bug related to HTML table page break was fixed. + +5.9.054 (2011-02-16) + - A bug related to HTML table page break was fixed. + +5.9.053 (2011-02-16) + - Support for HTML attribute display="none" was added. + +5.9.052 (2011-02-15) + - A bug related to HTML automatic newlines was fixed. + +5.9.051 (2011-02-12) + - "Commas at beginning of new lines" problem was fixed. + +5.9.050 (2011-02-11) + - Bug #3177606 "SVG Bar chart error" was fixed. + +5.9.049 (2011-02-03) + - Bug #3170777 "TCPDF creates a new page after a single line in writeHTML" was fixed. + +5.9.048 (2011-02-02) + - No changes. Just released to override previous release that was not uploaded correctly. + +5.9.047 (2011-01-28) + - Bug #3167115 "PDF error in <table> (example 48)" was fixed (was introduced in 5.8.046). + +5.9.046 (2011-01-18) + - PDF view/print layers are now automatically turned off if not used (see setVisibility() method). + +5.9.045 (2011-01-17) + - HTML list support were improved. + +5.9.044 (2011-01-15) + - Bug #3158422 "writeHTMLCell Loop" was fixed. + - Some HTML image alignment problems were fixed. + +5.9.043 (2011-01-14) + - Bug #3158178 "PHP Notice" was fixed. + - Bug #3158193 "Endless loop in writeHTML" was fixed. + - Bug #3157764 "SVG Pie chart incorrectly rendered2". + +5.9.042 (2011-01-14) + - Some problems of the PHP4 version were fixed. + +5.9.041 (2011-01-13) + - A problem with SVG elliptical arc path was fixed (ref. bug #3156574). + - A problem related to font weight on HTML table headers was fixed. + +5.9.040 (2011-01-12) + - A bug related to empty pages after table was fixed. + +5.9.039 (2011-01-12) + - Bug item #3155759 "openssl_random_pseudo_bytes() slow under Windows" was fixed. + +5.9.038 (2011-01-11) + - Minor bugs were fixed. + +5.9.037 (2011-01-09) + - An alignment problem for HTML texts was fixed. + +5.9.036 (2011-01-07) + - A bug related to HTML tables on header was fixed. + +5.9.035 (2011-01-03) + - A problem related to HTML table border alignment was fixed. + - Bug #2996366 "FastCGI and Header Problems" was fixed. + +5.9.034 (2010-12-19) + - DejaVu and GNU Free fonts were updated. + +5.9.033 (2010-12-18) + - Source code documetnation was improved. + +5.9.032 (2010-12-18) + - Default font stretching and spacing values are now inherited by HTML methods. + +5.9.031 (2010-12-16) + - Source code documentation errors were fixed. + +5.9.030 (2010-12-16) + - Several source code documentation errors were fixed. + - Source code style was changed for Doxygen. + - Source code documentation was moved online to http://www.tc... [truncated message content] |
From: <gok...@us...> - 2017-09-07 13:00:52
|
Revision: 1328 http://sourceforge.net/p/tutos/code/1328 Author: gokohnert Date: 2017-09-07 13:00:49 +0000 (Thu, 07 Sep 2017) Log Message: ----------- bugfix Modified Paths: -------------- trunk/libs/fpdf/fpdf.php trunk/php/user_del.php trunk/php/user_ins.php trunk/php/user_new.php trunk/php/user_overview.php Modified: trunk/libs/fpdf/fpdf.php =================================================================== --- trunk/libs/fpdf/fpdf.php 2017-09-02 15:01:56 UTC (rev 1327) +++ trunk/libs/fpdf/fpdf.php 2017-09-07 13:00:49 UTC (rev 1328) @@ -74,7 +74,7 @@ * Public methods * * * *******************************************************************************/ -function FPDF($orientation='P',$unit='mm',$format='A4') +function __construct($orientation='P',$unit='mm',$format='A4') { //Some checks $this->_dochecks(); Modified: trunk/php/user_del.php =================================================================== --- trunk/php/user_del.php 2017-09-02 15:01:56 UTC (rev 1327) +++ trunk/php/user_del.php 2017-09-07 13:00:49 UTC (rev 1328) @@ -1,6 +1,6 @@ <?php /* - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2017 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 @@ -28,7 +28,7 @@ } else if ( $_GET['id'] == $current_user->id ) { $msg = addLine($msg,$lang['Err0053']); // You cannot delete your own user entry } else { - $u = $u->read($_GET['id'],$u); + $u = $u->read_user($_GET['id'],$u); $gotourl = $u->getUrl(); } Modified: trunk/php/user_ins.php =================================================================== --- trunk/php/user_ins.php 2017-09-02 15:01:56 UTC (rev 1327) +++ trunk/php/user_ins.php 2017-09-07 13:00:49 UTC (rev 1328) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 2017 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 @@ -32,7 +32,7 @@ $msg = addLine($msg,"Please enter a id"); } else if ( isset($_POST['uid']) && ($_POST['uid'] != -1) ) { // existing entry - $u = $u->read($_POST['uid'],$u,1); + $u = $u->read_user($_POST['uid'],$u,1); $u->read_permissions(); $gotourl= addUrlParameter($gotourl,"uid=". $_POST['uid'],true); } else if ( isset($_POST['Xid']) && ($_POST['Xid'] != -1) ) { Modified: trunk/php/user_new.php =================================================================== --- trunk/php/user_new.php 2017-09-02 15:01:56 UTC (rev 1327) +++ trunk/php/user_new.php 2017-09-07 13:00:49 UTC (rev 1328) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2014 by Gero Kohnert + * Copyright 1999 - 2017 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 @@ -271,8 +271,8 @@ // Default-Groups for new objects // if ( ($tutos[defaultacl] == 2) && - ( ($this->user->isAdmin()) || (count($this->user->teamlist) > 0) ) - ) { + ( ($this->user->isAdmin()) || (count($this->user->teamlist) > 0) ) + ) { $r .= '<tbody><tr><td class="tg2" colspan="'.$this->width.'"><a href="#tg2">'.$lang['UserDefaultGrp'].'</a></td></tr></tbody>'."\n"; $r .= '<tbody class="tg2">'; $r .= '<tr>'."\n"; @@ -499,7 +499,7 @@ $this->obj->email_1 = ""; if ( isset($_GET['id']) ) { // Read address as a user entry - $this->obj = $this->obj->read($_GET['id'],$this->obj,0); + $this->obj = $this->obj->read_user($_GET['id'],$this->obj,0); if(!is_object($this->obj)) { $msg = addLine($msg,sprintf($lang['Err0040'],$lang['user'])); $this->stop = true; @@ -506,7 +506,7 @@ return; } } else if ( isset($_GET['uid']) ) { - $this->obj = $this->obj->read($_GET['uid'],$this->obj,1); + $this->obj = $this->obj->read_user($_GET['uid'],$this->obj,1); if(!is_object($this->obj)) { $msg = addLine($msg,sprintf($lang['Err0040'],$lang['user'])); $this->stop = true; @@ -592,29 +592,32 @@ preset_custom_fields('people',$this->obj); // Create the menu items if ( $this->user->feature_ok(useuser,PERM_NEW) ) { - $x = array( url => "user_new.php", - text => $lang['NewEntry'], - info => $lang['UserCreate'], - category => array("user","new","obj") - ); + $x = array( + url => "user_new.php", + text => $lang['NewEntry'], + info => $lang['UserCreate'], + category => array("user","new","obj") + ); $this->addMenu($x); } if ( ($this->obj->del_ok()) && ($this->obj->uid > 0) ) { - $x = array( url => "user_del.php?id=". $this->obj->id, - confirm => true, - text => $lang['Delete'], - info => sprintf($lang['UserDelInfo'], $this->obj->getFullName()), - category => array("user","admin","obj","del") - ); + $x = array( + url => "user_del.php?id=". $this->obj->id, + confirm => true, + text => $lang['Delete'], + info => sprintf($lang['UserDelInfo'], $this->obj->getFullName()), + category => array("user","admin","obj","del") + ); $this->addMenu($x); } if ( $this->obj->uid > 0) { - $x = array( url => "mytutos.php?adr=". $this->obj->id, - confirm => false, - text => sprintf($lang['PersonalPageFor'], $this->obj->getFullName()), - info => sprintf($lang['PersonalPageFor'], $this->obj->getFullName()), - category => array("view","obj") - ); + $x = array( + url => "mytutos.php?adr=". $this->obj->id, + confirm => false, + text => sprintf($lang['PersonalPageFor'], $this->obj->getFullName()), + info => sprintf($lang['PersonalPageFor'], $this->obj->getFullName()), + category => array("view","obj") + ); $this->addMenu($x); } add_module_newlinks($this,$this->obj); @@ -644,6 +647,6 @@ $dbconn->Close(); ?> <!-- -SVN Info $Id$ -$Author$ ---> \ No newline at end of file + SVN Info $Id$ + $Author$ + --> \ No newline at end of file Modified: trunk/php/user_overview.php =================================================================== --- trunk/php/user_overview.php 2017-09-02 15:01:56 UTC (rev 1327) +++ trunk/php/user_overview.php 2017-09-07 13:00:49 UTC (rev 1328) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2014 by Gero Kohnert + * Copyright 1999 - 2017 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 @@ -97,7 +97,7 @@ while ( ($a < $n) && ($a < $end) ) { $f = new tutos_user($this->dbconn); $uid = $result->get($a, "id"); - $f = $f->read($uid,$f,1); + $f = $f->read_user($uid,$f,1); $a++; if ( ($f->id == -1) || ! $f->see_ok() ) { continue; @@ -196,7 +196,7 @@ $this->dbconn->Begin("WORK"); foreach ($_GET['mark'] as $val) { $b = new tutos_user($this->dbconn); - $b = $b->read($val,$b,2); + $b = $b->read_user($val,$b,2); if ( $b->uid != $val ) { $msg = addLine($msg,$b->uid ." != ". $val); continue; @@ -214,7 +214,7 @@ $this->dbconn->Begin("WORK"); foreach ($_GET['mark'] as $val) { $b = new tutos_user($this->dbconn); - $b = $b->read($val,$b,2); + $b = $b->read_user($val,$b,2); if ( $b->uid != $val ) { $msg = addLine($msg,$b->uid ." != ". $val); continue; @@ -235,7 +235,7 @@ $this->dbconn->Begin("WORK"); foreach ($_GET['mark'] as $val) { $b = new tutos_user($this->dbconn); - $b = $b->read($val,$b,2); + $b = $b->read_user($val,$b,2); if ( $b->uid != $val ) { $msg = addLine($msg,$b->uid ." != ". $val); continue; @@ -256,7 +256,7 @@ $this->dbconn->Begin("WORK"); foreach ($_GET['mark'] as $val) { $b = new tutos_user($this->dbconn); - $b = $b->read($val,$b,2); + $b = $b->read_user($val,$b,2); if ( $b->uid != $val ) { $msg = addLine($msg,$b->uid ." != ". $val); continue; @@ -282,7 +282,7 @@ $this->dbconn->Begin("WORK"); foreach ($_GET['mark'] as $val) { $b = new tutos_user($this->dbconn); - $b = $b->read($val,$b,2); + $b = $b->read_user($val,$b,2); if ( $b->uid != $val ) { $msg = addLine($msg,$b->uid ." != ". $val); continue; @@ -395,11 +395,12 @@ $x[category][] = 'obj'; $this->addMenu($x); - $x = array( url => 'user_new.php', - text => $lang['NewEntry'], - info => $lang['UserCreate'], - category => array("user","new","obj") - ); + $x = array( + url => 'user_new.php', + text => $lang['NewEntry'], + info => $lang['UserCreate'], + category => array("user","new","obj") + ); $this->addMenu($x); if (class_exists('url')) { @@ -413,6 +414,6 @@ $dbconn->Close(); ?> <!-- -SVN Info $Id$ -$Author$ ---> \ No newline at end of file + 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. |
From: <gok...@us...> - 2017-09-02 15:01:59
|
Revision: 1327 http://sourceforge.net/p/tutos/code/1327 Author: gokohnert Date: 2017-09-02 15:01:56 +0000 (Sat, 02 Sep 2017) Log Message: ----------- Summary: fix Modified Paths: -------------- trunk/php/invoice/en.p3 Modified: trunk/php/invoice/en.p3 =================================================================== --- trunk/php/invoice/en.p3 2017-09-02 14:59:55 UTC (rev 1326) +++ trunk/php/invoice/en.p3 2017-09-02 15:01:56 UTC (rev 1327) @@ -30,11 +30,11 @@ $lang['InvoiceState'] = "State"; $lang['InvoiceStates'][1] = "new"; $lang['InvoiceStates'][2] = "ready to send"; -$lang['InvoiceStates'][3] = "to be payed"; +$lang['InvoiceStates'][3] = "to be paid"; $lang['InvoiceStates'][4] = "reminded"; $lang['InvoiceStates'][5] = "1. Reminder"; $lang['InvoiceStates'][6] = "2. Reminder"; -$lang['InvoiceStates'][7] = "payed"; +$lang['InvoiceStates'][7] = "paid"; $lang['InvoiceStates'][8] = "cancelled"; $lang['InvPosPos'] = "Position"; $lang['InvPosItems'] = "count"; @@ -56,7 +56,7 @@ $lang['InvDateDue'][1] = "1.Reminder due"; $lang['InvDateSent'][2] = "2.Reminder sent"; $lang['InvDateDue'][2] = "2.Reminder due"; -$lang['InvDatePayed'] = "payed at"; +$lang['InvDatePayed'] = "paid at"; $lang['InvDateCancel'] = "cancelled at"; $lang['InvLinkInfo'] = "Show invoice %s"; $lang['InvoiceSearch'] = "Search for invoices"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-09-02 14:59:58
|
Revision: 1326 http://sourceforge.net/p/tutos/code/1326 Author: gokohnert Date: 2017-09-02 14:59:55 +0000 (Sat, 02 Sep 2017) Log Message: ----------- Summary: fix Modified Paths: -------------- trunk/php/address_show.php Modified: trunk/php/address_show.php =================================================================== --- trunk/php/address_show.php 2017-09-02 14:37:53 UTC (rev 1325) +++ trunk/php/address_show.php 2017-09-02 14:59:55 UTC (rev 1326) @@ -71,7 +71,7 @@ * */ Function info() { - global $tutos, $lang; + global $tutos, $lang, $table; if ( $this->format == "vcard" ) { $b = $this->obj->getVcard(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-09-02 14:37:55
|
Revision: 1325 http://sourceforge.net/p/tutos/code/1325 Author: gokohnert Date: 2017-09-02 14:37:53 +0000 (Sat, 02 Sep 2017) Log Message: ----------- Summary: fix Modified Paths: -------------- trunk/php/mail.pinc Modified: trunk/php/mail.pinc =================================================================== --- trunk/php/mail.pinc 2017-09-02 14:30:47 UTC (rev 1324) +++ trunk/php/mail.pinc 2017-09-02 14:37:53 UTC (rev 1325) @@ -708,7 +708,7 @@ * initialize mail */ function __construct(&$user) { - parent::mail_body(); + parent::__construct(); $this->resetBodies(); $this->dbconn = $user->dbconn; $this->user = $user; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-09-02 14:30:50
|
Revision: 1324 http://sourceforge.net/p/tutos/code/1324 Author: gokohnert Date: 2017-09-02 14:30:47 +0000 (Sat, 02 Sep 2017) Log Message: ----------- default search for any Modified Paths: -------------- trunk/php/expense/expense.pinc trunk/php/expense/expense_select.php Modified: trunk/php/expense/expense.pinc =================================================================== --- trunk/php/expense/expense.pinc 2017-08-22 11:05:46 UTC (rev 1323) +++ trunk/php/expense/expense.pinc 2017-09-02 14:30:47 UTC (rev 1324) @@ -111,7 +111,7 @@ /** * ask a expense state */ -function ExpenseAskState ($default) { +function ExpenseAskState ($default,$any) { global $lang,$tutos,$current_user; $stc = getObject($current_user->dbconn,$tutos['expense_state_stc']); @@ -121,6 +121,13 @@ } $r = '<select id="state" name="state[]" multiple="multiple">'."\n"; + if ($any) { + $r .= ' <option value="-1"'; + if ( -1 == $default ) { + $r .= ' selected="selected"'; + } + $r .= '>'. myentities($lang['any']) ."</option>\n"; + } foreach ($stc->states as $f) { if($f->stc_state == STC_NOT_EXISTANT) continue; $r .= ' <option value="'. $f->stc_state .'" style="background:'.$f->color.'"'; Modified: trunk/php/expense/expense_select.php =================================================================== --- trunk/php/expense/expense_select.php 2017-08-22 11:05:46 UTC (rev 1323) +++ trunk/php/expense/expense_select.php 2017-09-02 14:30:47 UTC (rev 1324) @@ -59,7 +59,7 @@ $r .= $this->ContentRowStart('ext'); $r .= $this->showfieldc($lang['ExpenseState'],0,'state'); - $r .= $this->showdata(ExpenseAskState($this->state),2); + $r .= $this->showdata(ExpenseAskState($this->state,true),2); $r .= $this->ContentRowEnd(); $r .= $this->ContentRowStart('ext'); @@ -173,7 +173,7 @@ if ( isset($_SESSION['expense_state']) ) { $this->state = $_SESSION['expense_state']; } else { - $this->state = EXPENSE_STATE_UNDEF; + $this->state = -1; } } } @@ -183,6 +183,6 @@ $dbconn->Close(); ?> <!-- -SVN Info $Id$ -$Author$ ---> \ No newline at end of file + 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. |
From: <gok...@us...> - 2017-08-22 11:05:49
|
Revision: 1323 http://sourceforge.net/p/tutos/code/1323 Author: gokohnert Date: 2017-08-22 11:05:46 +0000 (Tue, 22 Aug 2017) Log Message: ----------- fix 2017-08-34-1124 Modified Paths: -------------- trunk/php/expense/expense_overview.php Modified: trunk/php/expense/expense_overview.php =================================================================== --- trunk/php/expense/expense_overview.php 2017-08-17 16:14:18 UTC (rev 1322) +++ trunk/php/expense/expense_overview.php 2017-08-22 11:05:46 UTC (rev 1323) @@ -496,6 +496,7 @@ // Name overview_arg($this,'name',OVERVIEW_ARG_STRING,'expense',array('name'),'ExpenseName','e.'); + overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'expense',array('link_id'),'ExpenseReference','e.'); if (isset($_REQUEST['ext']) && ($_REQUEST['ext'] == 1) ) { // State @@ -508,7 +509,6 @@ // reference overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'expense',array('link_id'),'ExpenseReference','e.',get_parent_classes('expense')); - overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'expense',array('link_id'),'ExpenseReference','e.'); // supplier overview_arg($this,'supfn',OVERVIEW_ARG_FN,'expense',array('supplier'),'ExpenseSupplier','e.','cd'); @@ -589,4 +589,4 @@ $l = new Expense_overview($current_user); $l->display(); $dbconn->Close(); -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-08-17 16:14:21
|
Revision: 1322 http://sourceforge.net/p/tutos/code/1322 Author: gokohnert Date: 2017-08-17 16:14:18 +0000 (Thu, 17 Aug 2017) Log Message: ----------- fixes and invoice template replcaement extended Modified Paths: -------------- trunk/php/custom.pinc trunk/php/database.pinc trunk/php/database_show.php trunk/php/db/table_custom_example.pinc trunk/php/invoice/invoice_pdf.pinc trunk/php/invoice/mtable.pinc trunk/php/watchlist/watchlist.pinc Modified: trunk/php/custom.pinc =================================================================== --- trunk/php/custom.pinc 2017-08-16 15:37:51 UTC (rev 1321) +++ trunk/php/custom.pinc 2017-08-17 16:14:18 UTC (rev 1322) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 2017 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 @@ -26,7 +26,7 @@ * x = db description * obj = the TUTOS object where the field is attached */ - function tutos_fld(tutos_base $obj,array $x, $section = null, $entry = null) { + function __construct(tutos_base $obj,array $x, $section = null, $entry = null) { // clean missing descriptions if (!isset($x['ftype'])) $x['ftype'] = ''; if (!isset($x['handler'])) $x['handler'] = ''; @@ -170,8 +170,10 @@ * get the title for editing content */ function edit_title() { - return $this->layout->showfield(myentities(getLang($this->x['lang'])),$this->required - ,($this->x['ftype'] == 'Date' ? $this->get_parsename().'_d':$this->get_parsename())); + return $this->layout->showfield( + myentities(getLang($this->x['lang'])), + $this->required, + ($this->x['ftype'] == 'Date' ? $this->get_parsename().'_d':$this->get_parsename())); } /** Modified: trunk/php/database.pinc =================================================================== --- trunk/php/database.pinc 2017-08-16 15:37:51 UTC (rev 1321) +++ trunk/php/database.pinc 2017-08-17 16:14:18 UTC (rev 1322) @@ -82,7 +82,7 @@ /* --------------------------------------------------------------------------- */ - function __contruct(tutos_db $dbconn = null) { + function __construct(tutos_db $dbconn = null) { global $tutos,$table; $this->init($dbconn); @@ -647,14 +647,15 @@ /** * create a link to a select page */ - function getOverviewLink (tutos_user $user, $text = "") { + static function getOverviewLink (tutos_user $user, $text = "") { global $lang,$tutos; - return array( url => 'database_overview.php', - image => $user->layout->theme->getImage(database::getHtmlIcon(),'menu'), - text => ($text == "" ? $lang['DBOverview'] : $text), - info => $lang['DBOverview'], - category => array('database','overview',usedbs) + return array( + url => 'database_overview.php', + image => $user->layout->theme->getImage(database::getHtmlIcon(),'menu'), + text => ($text == "" ? $lang['DBOverview'] : $text), + info => $lang['DBOverview'], + category => array('database','overview',usedbs) ); } } Modified: trunk/php/database_show.php =================================================================== --- trunk/php/database_show.php 2017-08-16 15:37:51 UTC (rev 1321) +++ trunk/php/database_show.php 2017-08-17 16:14:18 UTC (rev 1322) @@ -111,33 +111,6 @@ $r .= $this->ContentRowEnd(); } - /** - $r .= "<tr>\n"; - $r .= $this->showfield($lang['CfgLogo']); - $r .= $this->showdata('<span class="missing">'.$this->obj->logo.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); - - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgLogoLink']); - $r .= $this->showdata('<span class="missing">'.$this->obj->logolink.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); - - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgBugAutoName']); - $r .= $this->showdata('<span class="missing">'.$this->obj->bugautoname.'</span> (deprecated go '.makelink('bugtracking/bug_config.php','here').')',3); - - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgInvAutoName']); - $r .= $this->showdata('<span class="missing">'.$this->obj->invautoname.'</span> (deprecated go '.makelink('invoice/invoice_config.php','here').')',3); - - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgTaskAutoName']); - $r .= $this->showdata('<span class="missing">'.$this->obj->taskautoname.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); - - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgVATlist']); - $r .= $this->showdata('<span class="missing">'.$this->obj->vatlist.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); - - $r .= "</tr>\n"; - */ // Show additional custom fields $r .= show_custom_fields($this,$this->obj->gettype(),$this->obj,$this->width); @@ -177,51 +150,51 @@ if ( ($this->user->isAdmin()) ) { $x = array( url => 'database_new.php', - text => $lang['NewEntry'], - info => $lang['DBCreate'], - category => array('database','new','obj',usedbs) - ); + text => $lang['NewEntry'], + info => $lang['DBCreate'], + category => array('database','new','obj',usedbs) + ); $this->addMenu($x); } if ( is_object($this->obj) && $this->obj->mod_ok() ) { $x = array( url => 'database_new.php?id='.$this->obj->id, - text => $lang['Modify'], - info => sprintf($lang['DBModifyI'],$this->obj->getFullName()), - category => array('database','mod','obj',usedbs) - ); + text => $lang['Modify'], + info => sprintf($lang['DBModifyI'],$this->obj->getFullName()), + category => array('database','mod','obj',usedbs) + ); $this->addMenu($x); } $x = array( url => 'admin/backup.php?dbnr='.$this->obj->id, - text => 'Backup', - info => 'Backup'.$this->obj->getFullName(), - category => array('database','support',usedbs) - ); + text => 'Backup', + info => 'Backup'.$this->obj->getFullName(), + category => array('database','support',usedbs) + ); $this->addMenu($x); if ($tutos[usesync] == 1) { $x = array( url => 'admin_sync.php', - text => $lang['AdminDBSync'], - info => $lang['AdminDBSync'], - category => array('database','support',usedbs) - ); + text => $lang['AdminDBSync'], + info => $lang['AdminDBSync'], + category => array('database','support',usedbs) + ); $this->addMenu($x); } if ( is_object($this->obj) && $this->obj->is_supported() ) { $x = array( url => 'admin/update.php?id='. $this->obj->id , - text => $lang['DBUpdate'], - info => sprintf($lang['DBUpdateI'],$this->obj->getFullName()), - category => array('database','support',usedbs) - ); + text => $lang['DBUpdate'], + info => sprintf($lang['DBUpdateI'],$this->obj->getFullName()), + category => array('database','support',usedbs) + ); $this->addMenu($x); } if ( is_object($this->obj) && $this->obj->see_ok() && (isset($tutos[dbname][$this->obj->id])) ) { $x = array( url => 'logout.php?db='. $this->obj->id, - text => $lang['DBrelogin'], - info => sprintf($lang['DBreloginI'],$this->obj->getFullName()), - category => array('database','support',usedbs) - ); + text => $lang['DBrelogin'], + info => sprintf($lang['DBreloginI'],$this->obj->getFullName()), + category => array('database','support',usedbs) + ); $this->addMenu($x); } @@ -236,6 +209,6 @@ $dbconn->Close(); ?> <!-- -SVN Info $Id$ -$Author$ ---> \ No newline at end of file + SVN Info $Id$ + $Author$ + --> \ No newline at end of file Modified: trunk/php/db/table_custom_example.pinc =================================================================== --- trunk/php/db/table_custom_example.pinc 2017-08-16 15:37:51 UTC (rev 1321) +++ trunk/php/db/table_custom_example.pinc 2017-08-17 16:14:18 UTC (rev 1322) @@ -104,16 +104,17 @@ // // Add a additional text field called desc3 to the project table // -$table['product']['desc3'] = array('custom' => true, - type => "TX_TYPE", - 'txrows' => 2, - 'txcols' => 40, - 'growonly' => true, // only append new text - 'stamp' => true, // stamp with user & date - 'overview' => true, # do not show in overview - constraints => "", - Desc => "description 3", - 'lang' => "DESC3"); +$table['product']['desc3'] = array( + 'custom' => true, + type => "TX_TYPE", + 'txrows' => 2, + 'txcols' => 40, + 'growonly' => true, // only append new text + 'stamp' => true, // stamp with user & date + 'overview' => true, # do not show in overview + constraints => "", + Desc => "description 3", + 'lang' => "DESC3"); $lang['TASK_CUST1'] = "customized field"; // @@ -125,55 +126,59 @@ // // A additional Date field for a project // -$table['product']['ende'] = array('custom' => true, - 'ftype' => 'Date', - type => "TS_TYPE", - constraints => "", - 'default_today' => false, - 'overview' => true, // show in overview - Desc => "end date", - 'lang' => "DATE3", - 'hlang' => 'help for date3'); +$table['product']['ende'] = array( + 'custom' => true, + 'ftype' => 'Date', + type => "TS_TYPE", + constraints => "", + 'default_today' => false, + 'overview' => true, // show in overview + Desc => "end date", + 'lang' => "DATE3", + 'hlang' => 'help for date3'); // // A float field (required) // -$table['product']['fl'] = array('custom' => true, - type => "float", - constraints => "", - Desc => "floater", - 'sortable' => true, // show in overview as sortable - 'lang' => "FLOAT3", - 'hlang' => "help for FLOAT3", - 'overview' => true, // show in overview - 'perm_see' => array(2192,10010), // list of team/user ids who may see this - 'required' => true); +$table['product']['fl'] = array( + 'custom' => true, + type => "float", + constraints => "", + Desc => "floater", + 'sortable' => true, // show in overview as sortable + 'lang' => "FLOAT3", + 'hlang' => "help for FLOAT3", + 'overview' => true, // show in overview + 'perm_see' => array(2192,10010), // list of team/user ids who may see this + 'required' => true); // // A boolean field // -$table['product']['bo'] = array('custom' => true, - 'ftype' => 'Boolean', - type => "ID_TYPE", - constraints => "", - Desc => "yes/no", - 'lang' => "YES/NO", - 'hlang' => 'help for bo', - 'overview' => true, # show in overview - 'massupdate' => true, - 'searchable' => true, - 'required' => true); +$table['product']['bo'] = array( + 'custom' => true, + 'ftype' => 'Boolean', + type => "ID_TYPE", + constraints => "", + Desc => "yes/no", + 'lang' => "YES/NO", + 'hlang' => 'help for bo', + 'overview' => true, # show in overview + 'massupdate' => true, + 'searchable' => true, + 'required' => true); // // A list selection // -$table['product']['sel'] = array('custom' => true, - 'ftype' => 'SelectOne', - type => "ID_TYPE", - constraints => "", - Desc => "optionlist", - 'overview' => true, # show in overview - 'lang' => "OPTIONLIST", - 'hlang' => "HOPTIONLIST", - 'searchable' => true, - 'required' => true); +$table['product']['sel'] = array( + 'custom' => true, + 'ftype' => 'SelectOne', + type => "ID_TYPE", + constraints => "", + Desc => "optionlist", + 'overview' => true, # show in overview + 'lang' => "OPTIONLIST", + 'hlang' => "HOPTIONLIST", + 'searchable' => true, + 'required' => true); // HTML in the text is not interpreted !! $lang['OPTIONLIST'] = "optionlist <b><i>example</i></b>"; @@ -184,43 +189,47 @@ // // Some more field in the tasks table // -$table['task']['desc3'] = array('custom' => true, - type => "TX_TYPE", - constraints => "", - Desc => "description 3", - 'lang' => "DESC3"); +$table['task']['desc3'] = array( + 'custom' => true, + type => "TX_TYPE", + constraints => "", + Desc => "description 3", + 'lang' => "DESC3"); -$table['task']['customer'] = array('custom' => true, - 'ftype' => 'Object', - type => "ID_TYPE", - constraints => "", - 'otype' => "ac", - size => 42, // length of input field - Desc => "a customer company", - 'searchable' => true, - 'lang' => "Customer"); +$table['task']['customer'] = array( + 'custom' => true, + 'ftype' => 'Object', + type => "ID_TYPE", + constraints => "", + 'otype' => "ac", + size => 42, // length of input field + Desc => "a customer company", + 'searchable' => true, + 'lang' => "Customer"); // // Some more field in the timetrack table // -$table['timetrack']['desc3'] = array('custom' => true, - type => "VARCHAR", - size => 42, - constraints => "", - Desc => "description 3", - 'lang' => "Timetrack ++", - 'required' => true); +$table['timetrack']['desc3'] = array( + 'custom' => true, + type => "VARCHAR", + size => 42, + constraints => "", + Desc => "description 3", + 'lang' => "Timetrack ++", + 'required' => true); // // A additional field in a user record // -$table['people']['ctiserver'] = array('custom' => true, - 'ftype' => 'SelectOne', - type => "ID_TYPE", - constraints => "", - Desc => "CTI Server", - 'lang' => "CTISERVERLIST", - 'required' => false); +$table['people']['ctiserver'] = array( + 'custom' => true, + 'ftype' => 'SelectOne', + type => "ID_TYPE", + constraints => "", + Desc => "CTI Server", + 'lang' => "CTISERVERLIST", + 'required' => false); $lang['CTISERVERLIST'] = "CTI Server"; @@ -237,61 +246,65 @@ // // Example for team // -$table['team']['orgid'] = array('custom' => true, - type => "VARCHAR", - size => 142, - constraints => "", - Desc => "organisation id", - 'handler' => "geodata", - 'lang' => "Location", - 'overview' => true, # show in overview - 'required' => false, - 'hideempty' => true, - ); +$table['team']['orgid'] = array( + 'custom' => true, + type => "VARCHAR", + size => 142, + constraints => "", + Desc => "organisation id", + 'handler' => "geodata", + 'lang' => "Location", + 'overview' => true, # show in overview + 'required' => false, + 'hideempty' => true, +); // // Example for bugs // -$table['bugtracking']['externalid'] = array('custom' => true, - type => "VARCHAR", - size => 142, - constraints => "", - Desc => "external bug id", - 'lang' => "BugExternalID", - 'sortable' => true, # show in overview as sortable - 'overview' => true, # show in overview - 'required' => true, - 'hideempty' => true, - ); +$table['bugtracking']['externalid'] = array( + 'custom' => true, + type => "VARCHAR", + size => 142, + constraints => "", + Desc => "external bug id", + 'lang' => "BugExternalID", + 'sortable' => true, # show in overview as sortable + 'overview' => true, # show in overview + 'required' => true, + 'hideempty' => true, +); // // Example for notes // -$table['note']['closed'] = array('custom' => true, - 'ftype' => 'Boolean', - type => "ID_TYPE", - constraints => "", - Desc => "yes/no", - 'lang' => "Closed ?", - 'overview' => false, # show in overview - 'required' => true, - 'massupdate' => true, - ); +$table['note']['closed'] = array( + 'custom' => true, + 'ftype' => 'Boolean', + type => "ID_TYPE", + constraints => "", + Desc => "yes/no", + 'lang' => "Closed ?", + 'overview' => false, # show in overview + 'required' => true, + 'massupdate' => true, +); // // Examples for file // -$table['file']['status'] = array('custom' => true, - 'ftype' => 'SelectOne', - type => "ID_TYPE", - constraints => "", - Desc => "Document State", - 'lang' => "DOCSTATUS", - 'overview' => true, # show in overview - 'sortable' => true, # show in overview as sortable - 'searchable' => true, # show in select page - 'required' => true - ); +$table['file']['status'] = array( + 'custom' => true, + 'ftype' => 'SelectOne', + type => "ID_TYPE", + constraints => "", + Desc => "Document State", + 'lang' => "DOCSTATUS", + 'overview' => true, # show in overview + 'sortable' => true, # show in overview as sortable + 'searchable' => true, # show in select page + 'required' => true +); $lang['DOCSTATUS'] = "Document state"; $lang['DOCSTATUS_'][1] = "released"; @@ -303,19 +316,20 @@ // index 123 and 223 is outdated $tutos['deprecated']['DOCSTATUS_'] = array(123,223); -$table['file']['reviewby'] = array('custom' => true, - 'ftype' => 'Object', - 'otype' => 'a', - type => "ID_TYPE", - size => 20, - constraints => "", - Desc => "Document Review by", - 'lang' => "DOC_REVIEW", - 'overview' => true, # show in overview - 'sortable' => true, # show in overview as sortable - 'searchable' => true, # show in select page - 'required' => false, - ); +$table['file']['reviewby'] = array( + 'custom' => true, + 'ftype' => 'Object', + 'otype' => 'a', + type => "ID_TYPE", + size => 20, + constraints => "", + Desc => "Document Review by", + 'lang' => "DOC_REVIEW", + 'overview' => true, # show in overview + 'sortable' => true, # show in overview as sortable + 'searchable' => true, # show in select page + 'required' => false, +); $lang['DOC_REVIEW'] = "Review by"; @@ -322,44 +336,47 @@ // // Example for address // -$table['address']['lastsale'] = array('custom' => true, - type => "VARCHAR", - size => 4, - constraints => "", - Desc => "Year of last sale", - 'lang' => "Year of Last Sale", - 'overview' => true, # show in overview - 'required' => false, - 'popup' => true, # appear in popup - 'hideempty' => true, - ); +$table['address']['lastsale'] = array( + 'custom' => true, + type => "VARCHAR", + size => 4, + constraints => "", + Desc => "Year of last sale", + 'lang' => "Year of Last Sale", + 'overview' => true, # show in overview + 'required' => false, + 'popup' => true, # appear in popup + 'hideempty' => true, +); // // Example in installations // -$table['installation']['gurantee'] = array('custom' => true, - 'ftype' => 'Boolean', - type => "ID_TYPE", - constraints => "", - Desc => "with gurantee", - 'lang' => "Gurantee sold", - 'overview' => true, # show in overview - 'sortable' => true, # show in overview as sortable - 'required' => false - ); +$table['installation']['gurantee'] = array( + 'custom' => true, + 'ftype' => 'Boolean', + type => "ID_TYPE", + constraints => "", + Desc => "with gurantee", + 'lang' => "Gurantee sold", + 'overview' => true, # show in overview + 'sortable' => true, # show in overview as sortable + 'required' => false +); // // Example in groups // -$table['group']['salesgroup'] = array('custom' => true, - 'ftype' => 'SelectOne', - type => "ID_TYPE", - constraints => "", - Desc => "SalesGroup", - 'lang' => "INDID", - 'overview' => true, # show in overview - 'sortable' => true, # show in overview as sortable - 'required' => false - ); +$table['group']['salesgroup'] = array( + 'custom' => true, + 'ftype' => 'SelectOne', + type => "ID_TYPE", + constraints => "", + Desc => "SalesGroup", + 'lang' => "INDID", + 'overview' => true, # show in overview + 'sortable' => true, # show in overview as sortable + 'required' => false +); $lang['INDID'] = "Sales Group"; $lang['INDID_'][1] = "CHEM"; $lang['INDID_'][4] = "PAPER"; @@ -380,17 +397,18 @@ // // Example in module_template // -$table['AAA']['salesgroup'] = array('custom' => true, - 'ftype' => 'SelectOne', - type => "ID_TYPE", - constraints => "", - Desc => "SalesGroup", - 'lang' => "INDID", - 'searchable' => true, # show in select page - 'overview' => true, # show in overview - 'sortable' => true, # show in overview as sortable - 'required' => false - ); +$table['AAA']['salesgroup'] = array( + 'custom' => true, + 'ftype' => 'SelectOne', + type => "ID_TYPE", + constraints => "", + Desc => "SalesGroup", + 'lang' => "INDID", + 'searchable' => true, # show in select page + 'overview' => true, # show in overview + 'sortable' => true, # show in overview as sortable + 'required' => false +); $lang['INDID'] = "Sales Group"; $lang['INDID_'][1] = "CHEM"; $lang['INDID_'][4] = "PAPER"; @@ -402,33 +420,35 @@ // // Modules in Projects and Bugs // -$table['product']['mods'] = array('custom' => true, - 'ftype' => 'VARCHAR', - type => "VARCHAR", - constraints => "", - size => 180, // length of input field - Desc => "modules", - 'lang' => "MODULES", - 'hlang' => "HMODULES", - 'searchable' => true, - 'required' => false); +$table['product']['mods'] = array( + 'custom' => true, + 'ftype' => 'VARCHAR', + type => "VARCHAR", + constraints => "", + size => 180, // length of input field + Desc => "modules", + 'lang' => "MODULES", + 'hlang' => "HMODULES", + 'searchable' => true, + 'required' => false); $lang['MODULES'] = "modules"; $lang['HMODULES'] = "modules (comma seperated)"; -$table['bugtracking']['mods'] = array('custom' => true, - 'ftype' => 'List', - 'function' => 'getParentModules', - type => "VARCHAR", - constraints => "", - size => 180, // length of input field - Desc => "modules", - 'lang' => "MODULES", - 'hlang' => "HMODULES", - 'searchable' => true, - 'overview' => true, - 'hideempty' => true, - 'export' => true, - 'required' => true); +$table['bugtracking']['mods'] = array( + 'custom' => true, + 'ftype' => 'List', + 'function' => 'getParentModules', + type => "VARCHAR", + constraints => "", + size => 180, // length of input field + Desc => "modules", + 'lang' => "MODULES", + 'hlang' => "HMODULES", + 'searchable' => true, + 'overview' => true, + 'hideempty' => true, + 'export' => true, + 'required' => true); $lang['MODULES'] = "modules"; $lang['HMODULES'] = "modules (comma seperated)"; @@ -443,18 +463,32 @@ $table['appointment1']['description'][size] = 101; $table['appointment1']['visitor']['searchable'] = true; -$table['location']['iban'] = array('custom' => true, - type => "VARCHAR", - size => 200, - constraints => "", - Desc => "IBAN", - 'lang' => "IBAN", - 'handler' => "url", - 'overview' => false, # show in overview - 'sortable' => false, # show in overview as sortable - 'hideempty' => true, - 'required' => false - ); +$table['location']['iban'] = array( + 'custom' => true, + type => "VARCHAR", + size => 200, + constraints => "", + Desc => "IBAN", + 'lang' => "IBAN", + 'handler' => "url", + 'overview' => false, # show in overview + 'sortable' => false, # show in overview as sortable + 'hideempty' => true, + 'required' => false +); $table['location']['acc_info1']['hideempty'] = true; +$table['invoice']['client_po'] = array( + 'custom' => true, + type => "VARCHAR", + size => 40, + constraints => "", + Desc => "Client PO", + 'lang' => "Client PO", + 'overview' => false, # show in overview + 'sortable' => false, # show in overview as sortable + 'hideempty' => true, + 'required' => false +); + ?> \ No newline at end of file Modified: trunk/php/invoice/invoice_pdf.pinc =================================================================== --- trunk/php/invoice/invoice_pdf.pinc 2017-08-16 15:37:51 UTC (rev 1321) +++ trunk/php/invoice/invoice_pdf.pinc 2017-08-17 16:14:18 UTC (rev 1322) @@ -71,7 +71,7 @@ * add a template block from a file */ function addFileBlock($fname,$h = 5) { - global $lang; + global $lang, $table; //Read text file if (file_exists($fname)) { @@ -81,13 +81,40 @@ $txt = preg_replace("/%NAME%/",$this->obj->getFullName(),$txt); $txt = preg_replace("/%DATE%/",strftime($lang['DateFormatStr']),$txt); $txt = preg_replace("/%TIME%/",strftime($lang['TimeFormatStr']),$txt); + foreach ($table['invoice'] as $n => $f) { + if (! is_array($f)) continue; + if ( isset($f['custom']) && $f['custom'] ) { + $field = '_fld_'.$n; + if ($f[type] == 'VARCHAR') { + $txt = preg_replace("/%FLD:$n%/",$this->obj->$field,$txt); + } + } else if (isset($f['field'])) { + $field = $f['field']; + if ($f[type] == 'VARCHAR') { + $txt = preg_replace("/%FLD:$n%/",$this->obj->$field,$txt); + } + } + } } else { $txt = "<p>you have to create a file called ". $fname ." to change this text<br>"; $txt .= "TUTOS will replace some TAGS when reading that file<br>"; $txt .= "%NAME% will become the name of the object<br>"; + foreach ($table['invoice'] as $n => $f) { + if (! is_array($f)) continue; + if ( isset($f['custom']) && $f['custom'] ) { + if ($f[type] == 'VARCHAR') { + $txt .= "%FLD:$n% will become ". $f[Desc].'<br>'; + } + } else if (isset($f['field'])) { + $field = $f['field']; + if ($f[type] == 'VARCHAR') { + $txt .= "%FLD:$n% will become ". $f[Desc].'<br>'; + } + } + } $txt .= "%DATE% will become the current date<br>"; $txt .= "%TIME% will become the current time</p>"; - $txt .= "Everything else will be exact as found in that file. Using long lines will cause an automatic wrap at the end of such a line.</p>"; + $txt .= "Everything else will be exact as found in that file. Using long lines will cause an automatic wrap at the end of such a line. You can use HTML tags for formatting.</p>"; } $this->writeHTML($txt, true, false, false, false, ''); Modified: trunk/php/invoice/mtable.pinc =================================================================== --- trunk/php/invoice/mtable.pinc 2017-08-16 15:37:51 UTC (rev 1321) +++ trunk/php/invoice/mtable.pinc 2017-08-17 16:14:18 UTC (rev 1322) @@ -1,6 +1,6 @@ <?php /* - * Copyright 2002 - 2013 by Gero Kohnert + * Copyright 2002 - 2017 by Gero Kohnert * * Information about the tables and indices neccessary for this module * @@ -14,7 +14,12 @@ $table['invoice']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'); $table['invoice']['state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'invoice state'); $table['invoice']['link_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'id of billed object'); -$table['invoice']['name'] = array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'invoice name'); +$table['invoice']['name'] = array( + type => 'VARCHAR', + size => 60, + constraints => '', + 'field' => 'name', + Desc => 'invoice name'); $table['invoice']['d_sent0'] = array(type => 'TS_TYPE', constraints => '', Desc => 'invoice sent'); $table['invoice']['d_due0'] = array(type => 'TS_TYPE', constraints => '', Desc => 'invoice due'); $table['invoice']['d_sent1'] = array(type => 'TS_TYPE', constraints => '', Desc => 'first reminder sent'); @@ -32,13 +37,13 @@ table => 'invoice', column => array('customer'), Desc => 'invoices customers', - ); +); $tableidx['invoice2'] = array( name => 'invoice_idx2', table => 'invoice', column => array('link_id'), Desc => 'invoices links', - ); +); $table['invpos'][name] = 'invoice_pos'; $table['invpos'][Desc] = 'TUTOS invoice positions'; @@ -58,18 +63,18 @@ table => 'invoice_pos', column => array('inv_id'), Desc => 'invoice positions invoice', - ); +); $tableidx['invpos2'] = array( name => 'invpos_idx2', table => 'invoice_pos', column => array('ref_id'), Desc => 'invoice positions reference', - ); +); $sequence['invname'] = array( name => 'invname', 'start' => 1, Desc => 'TUTOS invoice sequencer', - ); +); ?> \ No newline at end of file Modified: trunk/php/watchlist/watchlist.pinc =================================================================== --- trunk/php/watchlist/watchlist.pinc 2017-08-16 15:37:51 UTC (rev 1321) +++ trunk/php/watchlist/watchlist.pinc 2017-08-17 16:14:18 UTC (rev 1322) @@ -108,6 +108,12 @@ $this->tablename = $this->dbconn->prefix .$table['watchlist'][name]; } + /* + */ + function read ($id,tutos_base $obj) { + return -1; + } + /** * Remove one watcher */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-08-16 15:37:54
|
Revision: 1321 http://sourceforge.net/p/tutos/code/1321 Author: gokohnert Date: 2017-08-16 15:37:51 +0000 (Wed, 16 Aug 2017) Log Message: ----------- Summary: grr Modified Paths: -------------- trunk/php/acl_overview.php Modified: trunk/php/acl_overview.php =================================================================== --- trunk/php/acl_overview.php 2017-08-16 15:30:39 UTC (rev 1320) +++ trunk/php/acl_overview.php 2017-08-16 15:37:51 UTC (rev 1321) @@ -62,7 +62,7 @@ $query->setTable($this->dbconn->prefix .$this->type); $query->addFld("DISTINCT id"); $query->addOrder("id","ASC"); - } else if ( $this->xtype == "watchlist" ) { + } else if ( $this->xtype == $this->dbconn->prefix."watchlist" ) { return $r; } else if ( $this->xtype != "" ) { $query->setTable($this->xtype); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-08-16 15:30:42
|
Revision: 1320 http://sourceforge.net/p/tutos/code/1320 Author: gokohnert Date: 2017-08-16 15:30:39 +0000 (Wed, 16 Aug 2017) Log Message: ----------- Summary: fix Modified Paths: -------------- trunk/php/acl_overview.php Modified: trunk/php/acl_overview.php =================================================================== --- trunk/php/acl_overview.php 2017-08-16 14:06:28 UTC (rev 1319) +++ trunk/php/acl_overview.php 2017-08-16 15:30:39 UTC (rev 1320) @@ -62,6 +62,8 @@ $query->setTable($this->dbconn->prefix .$this->type); $query->addFld("DISTINCT id"); $query->addOrder("id","ASC"); + } else if ( $this->xtype == "watchlist" ) { + return $r; } else if ( $this->xtype != "" ) { $query->setTable($this->xtype); $query->addFld("DISTINCT id"); @@ -308,8 +310,8 @@ foreach($tutos[modules] as $x) { if ( isset($lang[$x['perm']]) ) { $ref = new $x[name]($this->user->dbconn); - if ($ref->tablename != 'UNKNOWN') - $r .= ' <li>'. menulink('acl_overview.php?xtype='. $ref->tablename.$pre,$lang[$x['perm']].' (M)',$lang[$x['perm']]) ."</li>\n"; + if ($ref->tablename == 'UNKNOWN') continue; + $r .= ' <li>'. menulink('acl_overview.php?xtype='. $ref->tablename.$pre,$lang[$x['perm']].' (M)',$lang[$x['perm']]) ."</li>\n"; } } $r .= "</ul></td></tr>\n"; @@ -395,6 +397,6 @@ $dbconn->close(); ?> <!-- -SVN Info $Id$ -$Author$ ---> \ No newline at end of file + 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. |
From: <gok...@us...> - 2017-08-16 14:06:31
|
Revision: 1319 http://sourceforge.net/p/tutos/code/1319 Author: gokohnert Date: 2017-08-16 14:06:28 +0000 (Wed, 16 Aug 2017) Log Message: ----------- Summary: fix Modified Paths: -------------- trunk/php/invoice/invoice_pdf.pinc Modified: trunk/php/invoice/invoice_pdf.pinc =================================================================== --- trunk/php/invoice/invoice_pdf.pinc 2017-08-16 13:42:44 UTC (rev 1318) +++ trunk/php/invoice/invoice_pdf.pinc 2017-08-16 14:06:28 UTC (rev 1319) @@ -48,7 +48,7 @@ //Logo if (preg_match("#png#i",$tutos['logo'])) { $this->Image($p,10,2,20,0,"PNG"); - } else if (preg_match("#jpg#i",$tutos['logo']) || eregi("jpeg",$tutos['logo']) ) { + } else if (preg_match("#jpg#i",$tutos['logo']) || preg_match("#jpeg#i",$tutos['logo']) ) { $this->Image($p,10,2,20,0,"JPG"); } $this->SetFont('times','B',26); @@ -56,7 +56,7 @@ } else { if (preg_match("#png#i",$tutos['logo'])) { $this->Image($p,10,2,10,0,"PNG"); - } else if (preg_match("#jpg#i",$tutos['logo']) || eregi("jpeg",$tutos['logo']) ) { + } else if (preg_match("#jpg#i",$tutos['logo']) || preg_match("#jpeg#i",$tutos['logo']) ) { $this->Image($p,10,2,10,0,"JPG"); } $this->SetFont('times','B',12); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-08-16 13:42:46
|
Revision: 1318 http://sourceforge.net/p/tutos/code/1318 Author: gokohnert Date: 2017-08-16 13:42:44 +0000 (Wed, 16 Aug 2017) Log Message: ----------- enabled php7 support Modified Paths: -------------- trunk/php/db/db_db2.pinc trunk/php/db/db_interbase.pinc trunk/php/db/db_mssqlnative.pinc trunk/php/db/db_mysql.pinc trunk/php/db/db_oci.pinc trunk/php/db/db_ora.pinc trunk/php/db/db_sqlite.pinc trunk/php/db/db_sqlite3.pinc Modified: trunk/php/db/db_db2.pinc =================================================================== --- trunk/php/db/db_db2.pinc 2017-08-16 13:36:22 UTC (rev 1317) +++ trunk/php/db/db_db2.pinc 2017-08-16 13:42:44 UTC (rev 1318) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2007 - 2014 by Gero Kohnert + * Copyright 2007 - 2017 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 @@ -74,7 +74,7 @@ class db_db2 extends tutos_db { /* --------------------------------------------------------------------------- */ - function db_db2(&$db) { + function __construct(&$db) { global $tutos; parent::init($db); $tutos[use_check_dbacl] = 0; @@ -609,9 +609,9 @@ */ class result_db2 extends result { - function result_db2(&$dbconn) { + function __construct(&$dbconn) { $this->rs = ""; - parent::result($dbconn); + parent::__construct($dbconn); } /* --------------------------------------------------------------------------- */ Modified: trunk/php/db/db_interbase.pinc =================================================================== --- trunk/php/db/db_interbase.pinc 2017-08-16 13:36:22 UTC (rev 1317) +++ trunk/php/db/db_interbase.pinc 2017-08-16 13:42:44 UTC (rev 1318) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2001 - 2014 by Gero Kohnert + * Copyright 2001 - 2017 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 @@ -91,7 +91,7 @@ class db_interbase extends tutos_db { /** */ - function db_interbase(&$db) { + function __construct(Database &$db) { global $tutos; parent::init($db); @@ -564,4 +564,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/db/db_mssqlnative.pinc =================================================================== --- trunk/php/db/db_mssqlnative.pinc 2017-08-16 13:36:22 UTC (rev 1317) +++ trunk/php/db/db_mssqlnative.pinc 2017-08-16 13:42:44 UTC (rev 1318) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2001 - 2014 by Gero Kohnert + * Copyright 2001 - 2017 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 @@ -99,7 +99,7 @@ class db_mssqlnative extends tutos_db { /** */ - function db_mssqlnative(&$db) { + function __construct(Database &$db) { global $tutos; parent::init($db); @@ -611,7 +611,7 @@ */ class result_mssqlnative extends result { - function result_mssqlnative(&$dbconn,$queryresult=false) { + function __construct(&$dbconn,$queryresult=false) { $this->dbconn = &$dbconn; $this->offset = 0; $this->rows = array(); @@ -714,4 +714,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/db/db_mysql.pinc =================================================================== --- trunk/php/db/db_mysql.pinc 2017-08-16 13:36:22 UTC (rev 1317) +++ trunk/php/db/db_mysql.pinc 2017-08-16 13:42:44 UTC (rev 1318) @@ -682,7 +682,7 @@ function __construct(&$dbconn) { $this->rs = ""; - parent::result($dbconn); + parent::__construct($dbconn); } /** Modified: trunk/php/db/db_oci.pinc =================================================================== --- trunk/php/db/db_oci.pinc 2017-08-16 13:36:22 UTC (rev 1317) +++ trunk/php/db/db_oci.pinc 2017-08-16 13:42:44 UTC (rev 1318) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2002 - 2014 by Gero Kohnert + * Copyright 2002 - 2017 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 @@ -51,7 +51,7 @@ class db_oci extends tutos_db { /** */ - function db_oci(&$db) { + function __construct(Database &$db) { global $tutos; parent::init($db); @@ -556,4 +556,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/db/db_ora.pinc =================================================================== --- trunk/php/db/db_ora.pinc 2017-08-16 13:36:22 UTC (rev 1317) +++ trunk/php/db/db_ora.pinc 2017-08-16 13:42:44 UTC (rev 1318) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2001 - 2014 by Gero Kohnert + * Copyright 2001 - 2017 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 @@ -43,7 +43,7 @@ class db_ora extends tutos_db { /* --------------------------------------------------------------------------- */ - function db_ora(&$db) { + function __construct(Database &$db) { global $tutos; parent::init($db); @@ -559,4 +559,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/db/db_sqlite.pinc =================================================================== --- trunk/php/db/db_sqlite.pinc 2017-08-16 13:36:22 UTC (rev 1317) +++ trunk/php/db/db_sqlite.pinc 2017-08-16 13:42:44 UTC (rev 1318) @@ -524,7 +524,7 @@ function __construct(&$dbconn) { $this->rs = ""; $this->ar = array(); - parent::result($dbconn); + parent::__construct($dbconn); } /** @@ -585,4 +585,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/db/db_sqlite3.pinc =================================================================== --- trunk/php/db/db_sqlite3.pinc 2017-08-16 13:36:22 UTC (rev 1317) +++ trunk/php/db/db_sqlite3.pinc 2017-08-16 13:42:44 UTC (rev 1318) @@ -629,7 +629,7 @@ function __construct(&$dbconn) { $this->rs = ""; $this->ar = array(); - parent::result($dbconn); + parent::__construct($dbconn); } function setresult(SQLite3Result $rs) { @@ -721,4 +721,4 @@ } } -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2017-08-16 13:36:25
|
Revision: 1317 http://sourceforge.net/p/tutos/code/1317 Author: gokohnert Date: 2017-08-16 13:36:22 +0000 (Wed, 16 Aug 2017) Log Message: ----------- fix Modified Paths: -------------- trunk/php/address_tools.p3 trunk/php/db/db.pinc trunk/php/db/db_mysqli.pinc Modified: trunk/php/address_tools.p3 =================================================================== --- trunk/php/address_tools.p3 2017-08-16 13:26:07 UTC (rev 1316) +++ trunk/php/address_tools.p3 2017-08-16 13:36:22 UTC (rev 1317) @@ -83,7 +83,7 @@ $r .= "<a href=\"JavaScript: mywindow = window.open('". myentities($l->lname) ."', 'help', 'width=300,height=300,top=200,left=200,scrollbars=1'); mywindow.location.href = '". $url ."'; mywindow.focus();\" onmouseover=\"self.status='". myentities($l->lname,1) ."' ;return true\" title=\"". myentities($l->lname) ."\">"; - $r .= myentities($l->$name) ."</a>"; + $r .= myentities($l->lname) ."</a>"; } else { if ( isset($table['location'][$fldname]['handler']) ) { $r .= handle($table['location'][$fldname]['handler'],$l->$name,myentities($l->$name)); @@ -562,4 +562,4 @@ } return $r; } -?> \ No newline at end of file +?> Modified: trunk/php/db/db.pinc =================================================================== --- trunk/php/db/db.pinc 2017-08-16 13:26:07 UTC (rev 1316) +++ trunk/php/db/db.pinc 2017-08-16 13:36:22 UTC (rev 1317) @@ -843,7 +843,7 @@ class result_mem extends result { function __construct(tutos_db &$dbconn) { - parent::result($dbconn); + parent::__construct($dbconn); } /** * get for serialize @@ -931,4 +931,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/php/db/db_mysqli.pinc =================================================================== --- trunk/php/db/db_mysqli.pinc 2017-08-16 13:26:07 UTC (rev 1316) +++ trunk/php/db/db_mysqli.pinc 2017-08-16 13:36:22 UTC (rev 1317) @@ -723,7 +723,7 @@ function __construct(db_mysqli $dbconn) { $this->rs = ''; - parent::result($dbconn); + parent::__construct($dbconn); } /** @@ -785,4 +785,4 @@ } } -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |