- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-280-g2f8fdcd
by Marc Delisle 30 Jan '12

30 Jan '12

The branch, QA_3_5 has been updated via 2f8fdcda24965ec7f0656e82d02e9471cd6ec20f (commit) via 496cdc62e6bb832c9d503fe816327fd5406bc335 (commit) via 12e2e8b7fc67fe4378d7a60d595345ac92b0912a (commit) from 68490d6ec434bef252b9a096bb84314ebcc11439 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08694de..308b374 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ phpMyAdmin - ChangeLog - patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' - bug #3469254 [edit] Setting data to NULL and drop-downs - bug #3477063 [edit] Missing set fields and values in generated INSERT query +- bug #3460867 [libraries] license issue with TCPDF (updated to 5.9.145) 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_10RC1-7-g496cdc6
by Marc Delisle 30 Jan '12

30 Jan '12

The branch, QA_3_4 has been updated via 496cdc62e6bb832c9d503fe816327fd5406bc335 (commit) via 12e2e8b7fc67fe4378d7a60d595345ac92b0912a (commit) from 478169d63ef333c0e7e2af4747eedc546135bf0a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e20e33..84b03c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' - bug #3469254 [edit] Setting data to NULL and drop-downs - bug #3477063 [edit] Missing set fields and values in generated INSERT query +- bug #3460867 [libraries] license issue with TCPDF (updated to 5.9.145) 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_10, updated. RELEASE_3_4_10RC1-2-g12e2e8b
by Marc Delisle 30 Jan '12

30 Jan '12

The branch, MAINT_3_4_10 has been updated via 12e2e8b7fc67fe4378d7a60d595345ac92b0912a (commit) from 6072137cddb683349ca038cacec5b70910809ad8 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a61a573..9652c29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' - bug #3469254 [edit] Setting data to NULL and drop-downs - bug #3477063 [edit] Missing set fields and values in generated INSERT query +- bug #3460867 [libraries] license issue with TCPDF (updated to 5.9.145) 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-281-g1ee05ae
by Madhura Jayaratne 29 Jan '12

29 Jan '12

The branch, master has been updated via 1ee05ae7297c8f53e3745255824577362ddeed69 (commit) via 68490d6ec434bef252b9a096bb84314ebcc11439 (commit) via 478169d63ef333c0e7e2af4747eedc546135bf0a (commit) via b04586ea4274a69d2058f4162675f3b5aa012bb9 (commit) via 6072137cddb683349ca038cacec5b70910809ad8 (commit) via 6d58b78a322a8a0fecd5c914d04cb4402cdab910 (commit) from 693b0a59aad90cac2a1faf7375fd093a53ae2f65 (commit) - Log ----------------------------------------------------------------- commit 1ee05ae7297c8f53e3745255824577362ddeed69 Merge: 693b0a5 68490d6 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 29 21:54:45 2012 +0530 Merge branch 'QA_3_5' ----------------------------------------------------------------------- Summary of changes: libraries/tcpdf/LICENSE.TXT | 4 +--- libraries/tcpdf/README.TXT | 30 ++++++++++++++++++------------ libraries/tcpdf/config/tcpdf_config.php | 28 +++++++++++++++++++--------- libraries/tcpdf/encodings_maps.php | 4 ++-- libraries/tcpdf/htmlcolors.php | 4 ++-- libraries/tcpdf/tcpdf.php | 23 +++++++++++------------ libraries/tcpdf/unicode_data.php | 4 ++-- 7 files changed, 55 insertions(+), 42 deletions(-) diff --git a/libraries/tcpdf/LICENSE.TXT b/libraries/tcpdf/LICENSE.TXT index 26adda0..daf21f7 100644 --- a/libraries/tcpdf/LICENSE.TXT +++ b/libraries/tcpdf/LICENSE.TXT @@ -5,9 +5,7 @@ TCPDF is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. Additionally, - YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE - GENERATED PDF DOCUMENTS. + License, or (at your option) any later version. ********************************************************************** ********************************************************************** diff --git a/libraries/tcpdf/README.TXT b/libraries/tcpdf/README.TXT index 3e9acc3..f78081f 100644 --- a/libraries/tcpdf/README.TXT +++ b/libraries/tcpdf/README.TXT @@ -8,16 +8,16 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.141 -Release date: 2011-12-14 +Version: 5.9.145 +Release date: 2012-01-28 Author: Nicola Asuni -Copyright (c) 2002-2011: +Copyright (c) 2002-2012: Nicola Asuni - Tecnick.com s.r.l. - Via Della Pace, 11 - 09044 Quartucciu (CA) - ITALY + Tecnick.com LTD + Manor Coach House, Church Hill + Aldershot, Hants, GU12 4RQ + UK www.tecnick.com URLs: @@ -64,18 +64,16 @@ Installation (full instructions on http: www.tcpdf.org) Source Code Documentation: http://www.tcpdf.org -For Additional Documentation: +Additional Documentation: http://www.tcpdf.org License - Copyright (C) 2002-2011 Nicola Asuni - Tecnick.com S.r.l. + Copyright (C) 2002-2012 Nicola Asuni - Tecnick.com LTD TCPDF is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. Additionally, - YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE - GENERATED PDF DOCUMENTS. + License, or (at your option) any later version. TCPDF is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -88,4 +86,12 @@ License See LICENSE.TXT file for more information. +Third party fonts + This library includes third party font files released with different licenses. + These fonts are not required by TCPDF but have been included as you convenience. + The original TTF font files have been renamed for compatibility with TCPDF and compressed using the gzcompress PHP function that uses the ZLIB data format (.z files). + To get the original distribution archives please check the information on fonts subfolders: + - DejaVu fonts 2.33 (Bitstream) - Copyright, License and other info: fonts/dejavu-fonts-ttf-2.33 + - GNU FreeFont (GNU-GPLv3) - Copyright, License and other info: fonts/freefont-20100919 + ============================================================ diff --git a/libraries/tcpdf/config/tcpdf_config.php b/libraries/tcpdf/config/tcpdf_config.php index 811145f..e3b3e4a 100644 --- a/libraries/tcpdf/config/tcpdf_config.php +++ b/libraries/tcpdf/config/tcpdf_config.php @@ -5,17 +5,27 @@ // Last Update : 2011-04-15 // // Description : Configuration file for TCPDF. +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com +// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) +// ------------------------------------------------------------------- +// Copyright (C) 2004-2012 Nicola Asuni - Tecnick.com LTD // -// Author: Nicola Asuni +// This file is part of TCPDF software library. // -// (c) Copyright: -// Nicola Asuni -// Tecnick.com s.r.l. -// Via Della Pace, 11 -// 09044 Quartucciu (CA) -// ITALY -// www.tecnick.com -// info(a)tecnick.com +// TCPDF is free software: you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// TCPDF is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// See the GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with TCPDF. If not, see <http://www.gnu.org/licenses/>. +// +// See LICENSE.TXT file for more information. //============================================================+ /** diff --git a/libraries/tcpdf/encodings_maps.php b/libraries/tcpdf/encodings_maps.php index 3d8543b..414f8b6 100644 --- a/libraries/tcpdf/encodings_maps.php +++ b/libraries/tcpdf/encodings_maps.php @@ -4,10 +4,10 @@ // Version : 1.0.001 // Begin : 2011-10-01 // Last Update : 2011-11-15 -// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info(a)tecnick.com +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- -// Copyright (C) 2008-2011 Nicola Asuni - Tecnick.com S.r.l. +// Copyright (C) 2008-2012 Nicola Asuni - Tecnick.com LTD // // This file is part of TCPDF software library. // diff --git a/libraries/tcpdf/htmlcolors.php b/libraries/tcpdf/htmlcolors.php index d1075dd..e1a58b5 100644 --- a/libraries/tcpdf/htmlcolors.php +++ b/libraries/tcpdf/htmlcolors.php @@ -4,10 +4,10 @@ // Version : 1.0.008 // Begin : 2002-04-09 // Last Update : 2010-12-16 -// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info(a)tecnick.com +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- -// Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l. +// Copyright (C) 2002-2012 Nicola Asuni - Tecnick.com LTD // // This file is part of TCPDF software library. // diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php index 17a9a20..7ce0329 100644 --- a/libraries/tcpdf/tcpdf.php +++ b/libraries/tcpdf/tcpdf.php @@ -1,21 +1,20 @@ <?php //============================================================+ // File name : tcpdf.php -// Version : 5.9.141 +// Version : 5.9.145 // Begin : 2002-08-03 -// Last Update : 2011-12-14 -// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info(a)tecnick.com -// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS. +// Last Update : 2012-01-28 +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com +// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 // ------------------------------------------------------------------- +// Copyright (C) 2002-2012 Nicola Asuni - Tecnick.com LTD // // This file is part of TCPDF software library. // // TCPDF is free software: you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as // published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. Additionally, -// YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE -// GENERATED PDF DOCUMENTS. +// License, or (at your option) any later version. // // TCPDF is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of @@ -138,7 +137,7 @@ * Tools to encode your unicode fonts are on fonts/utils directory.</p> * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.141 + * @version 5.9.145 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -150,7 +149,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php'); * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org) but now is almost entirely rewritten.<br> * @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 5.9.141 + * @version 5.9.145 * @author Nicola Asuni - info(a)tecnick.com */ class TCPDF { @@ -161,7 +160,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.141'; + private $tcpdf_version = '5.9.145'; // Protected properties @@ -12286,7 +12285,7 @@ class TCPDF { $docdate = $this->_escapeXML($docdate); $xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">'."\n"; $xmp .= "\t\t\t".'<xmp:CreateDate>'.$docdate.'</xmp:CreateDate>'."\n"; - $xmp .= "\t\t\t".'<xmp:CreatorTool>TCPDF</xmp:CreatorTool>'."\n"; + $xmp .= "\t\t\t".'<xmp:CreatorTool>'.$this->creator.'</xmp:CreatorTool>'."\n"; $xmp .= "\t\t\t".'<xmp:ModifyDate>'.$docdate.'</xmp:ModifyDate>'."\n"; $xmp .= "\t\t\t".'<xmp:MetadataDate>'.$docdate.'</xmp:MetadataDate>'."\n"; $xmp .= "\t\t".'</rdf:Description>'."\n"; @@ -14092,7 +14091,7 @@ class TCPDF { fwrite($f, $envelope, $envelope_length); fclose($f); $tempencfile = tempnam(K_PATH_CACHE, 'tmpenc_'); - if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_DETACHED | PKCS7_BINARY)) { + if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_BINARY | PKCS7_DETACHED)) { $this->Error('Unable to encrypt the file: '.$tempkeyfile); } unlink($tempkeyfile); diff --git a/libraries/tcpdf/unicode_data.php b/libraries/tcpdf/unicode_data.php index c05cb94..936f4fe 100644 --- a/libraries/tcpdf/unicode_data.php +++ b/libraries/tcpdf/unicode_data.php @@ -4,10 +4,10 @@ // Version : 1.0.009 // Begin : 2008-01-01 // Last Update : 2011-10-01 -// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info(a)tecnick.com +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- -// Copyright (C) 2008-2011 Nicola Asuni - Tecnick.com S.r.l. +// Copyright (C) 2008-2012 Nicola Asuni - Tecnick.com LTD // // This file is part of TCPDF software library. // hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-277-g68490d6
by Madhura Jayaratne 29 Jan '12

29 Jan '12

The branch, QA_3_5 has been updated via 68490d6ec434bef252b9a096bb84314ebcc11439 (commit) via 478169d63ef333c0e7e2af4747eedc546135bf0a (commit) via b04586ea4274a69d2058f4162675f3b5aa012bb9 (commit) via 6072137cddb683349ca038cacec5b70910809ad8 (commit) via 6d58b78a322a8a0fecd5c914d04cb4402cdab910 (commit) from 28779212196686f44650e362ec0fcfbb23140288 (commit) - Log ----------------------------------------------------------------- commit 68490d6ec434bef252b9a096bb84314ebcc11439 Merge: 2877921 478169d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 29 21:51:20 2012 +0530 Merge branch 'QA_3_4' into QA_3_5 Conflicts: libraries/tcpdf/README.TXT libraries/tcpdf/encodings_maps.php libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE libraries/tcpdf/fonts/dejavuserif.ctg.z libraries/tcpdf/fonts/dejavuserif.php libraries/tcpdf/fonts/dejavuserif.z libraries/tcpdf/fonts/dejavuserifb.ctg.z libraries/tcpdf/fonts/dejavuserifb.php libraries/tcpdf/fonts/dejavuserifb.z libraries/tcpdf/tcpdf.php libraries/tcpdf/unicode_data.php ----------------------------------------------------------------------- Summary of changes: libraries/tcpdf/LICENSE.TXT | 4 +--- libraries/tcpdf/README.TXT | 30 ++++++++++++++++++------------ libraries/tcpdf/config/tcpdf_config.php | 28 +++++++++++++++++++--------- libraries/tcpdf/encodings_maps.php | 4 ++-- libraries/tcpdf/htmlcolors.php | 4 ++-- libraries/tcpdf/tcpdf.php | 23 +++++++++++------------ libraries/tcpdf/unicode_data.php | 4 ++-- 7 files changed, 55 insertions(+), 42 deletions(-) diff --git a/libraries/tcpdf/LICENSE.TXT b/libraries/tcpdf/LICENSE.TXT index 26adda0..daf21f7 100644 --- a/libraries/tcpdf/LICENSE.TXT +++ b/libraries/tcpdf/LICENSE.TXT @@ -5,9 +5,7 @@ TCPDF is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. Additionally, - YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE - GENERATED PDF DOCUMENTS. + License, or (at your option) any later version. ********************************************************************** ********************************************************************** diff --git a/libraries/tcpdf/README.TXT b/libraries/tcpdf/README.TXT index 3e9acc3..f78081f 100644 --- a/libraries/tcpdf/README.TXT +++ b/libraries/tcpdf/README.TXT @@ -8,16 +8,16 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.141 -Release date: 2011-12-14 +Version: 5.9.145 +Release date: 2012-01-28 Author: Nicola Asuni -Copyright (c) 2002-2011: +Copyright (c) 2002-2012: Nicola Asuni - Tecnick.com s.r.l. - Via Della Pace, 11 - 09044 Quartucciu (CA) - ITALY + Tecnick.com LTD + Manor Coach House, Church Hill + Aldershot, Hants, GU12 4RQ + UK www.tecnick.com URLs: @@ -64,18 +64,16 @@ Installation (full instructions on http: www.tcpdf.org) Source Code Documentation: http://www.tcpdf.org -For Additional Documentation: +Additional Documentation: http://www.tcpdf.org License - Copyright (C) 2002-2011 Nicola Asuni - Tecnick.com S.r.l. + Copyright (C) 2002-2012 Nicola Asuni - Tecnick.com LTD TCPDF is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. Additionally, - YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE - GENERATED PDF DOCUMENTS. + License, or (at your option) any later version. TCPDF is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -88,4 +86,12 @@ License See LICENSE.TXT file for more information. +Third party fonts + This library includes third party font files released with different licenses. + These fonts are not required by TCPDF but have been included as you convenience. + The original TTF font files have been renamed for compatibility with TCPDF and compressed using the gzcompress PHP function that uses the ZLIB data format (.z files). + To get the original distribution archives please check the information on fonts subfolders: + - DejaVu fonts 2.33 (Bitstream) - Copyright, License and other info: fonts/dejavu-fonts-ttf-2.33 + - GNU FreeFont (GNU-GPLv3) - Copyright, License and other info: fonts/freefont-20100919 + ============================================================ diff --git a/libraries/tcpdf/config/tcpdf_config.php b/libraries/tcpdf/config/tcpdf_config.php index 811145f..e3b3e4a 100644 --- a/libraries/tcpdf/config/tcpdf_config.php +++ b/libraries/tcpdf/config/tcpdf_config.php @@ -5,17 +5,27 @@ // Last Update : 2011-04-15 // // Description : Configuration file for TCPDF. +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com +// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) +// ------------------------------------------------------------------- +// Copyright (C) 2004-2012 Nicola Asuni - Tecnick.com LTD // -// Author: Nicola Asuni +// This file is part of TCPDF software library. // -// (c) Copyright: -// Nicola Asuni -// Tecnick.com s.r.l. -// Via Della Pace, 11 -// 09044 Quartucciu (CA) -// ITALY -// www.tecnick.com -// info(a)tecnick.com +// TCPDF is free software: you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// TCPDF is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// See the GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with TCPDF. If not, see <http://www.gnu.org/licenses/>. +// +// See LICENSE.TXT file for more information. //============================================================+ /** diff --git a/libraries/tcpdf/encodings_maps.php b/libraries/tcpdf/encodings_maps.php index 3d8543b..414f8b6 100644 --- a/libraries/tcpdf/encodings_maps.php +++ b/libraries/tcpdf/encodings_maps.php @@ -4,10 +4,10 @@ // Version : 1.0.001 // Begin : 2011-10-01 // Last Update : 2011-11-15 -// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info(a)tecnick.com +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- -// Copyright (C) 2008-2011 Nicola Asuni - Tecnick.com S.r.l. +// Copyright (C) 2008-2012 Nicola Asuni - Tecnick.com LTD // // This file is part of TCPDF software library. // diff --git a/libraries/tcpdf/htmlcolors.php b/libraries/tcpdf/htmlcolors.php index d1075dd..e1a58b5 100644 --- a/libraries/tcpdf/htmlcolors.php +++ b/libraries/tcpdf/htmlcolors.php @@ -4,10 +4,10 @@ // Version : 1.0.008 // Begin : 2002-04-09 // Last Update : 2010-12-16 -// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info(a)tecnick.com +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- -// Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l. +// Copyright (C) 2002-2012 Nicola Asuni - Tecnick.com LTD // // This file is part of TCPDF software library. // diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php index 17a9a20..7ce0329 100644 --- a/libraries/tcpdf/tcpdf.php +++ b/libraries/tcpdf/tcpdf.php @@ -1,21 +1,20 @@ <?php //============================================================+ // File name : tcpdf.php -// Version : 5.9.141 +// Version : 5.9.145 // Begin : 2002-08-03 -// Last Update : 2011-12-14 -// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info(a)tecnick.com -// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS. +// Last Update : 2012-01-28 +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com +// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 // ------------------------------------------------------------------- +// Copyright (C) 2002-2012 Nicola Asuni - Tecnick.com LTD // // This file is part of TCPDF software library. // // TCPDF is free software: you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as // published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. Additionally, -// YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE -// GENERATED PDF DOCUMENTS. +// License, or (at your option) any later version. // // TCPDF is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of @@ -138,7 +137,7 @@ * Tools to encode your unicode fonts are on fonts/utils directory.</p> * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.141 + * @version 5.9.145 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -150,7 +149,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php'); * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org) but now is almost entirely rewritten.<br> * @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 5.9.141 + * @version 5.9.145 * @author Nicola Asuni - info(a)tecnick.com */ class TCPDF { @@ -161,7 +160,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.141'; + private $tcpdf_version = '5.9.145'; // Protected properties @@ -12286,7 +12285,7 @@ class TCPDF { $docdate = $this->_escapeXML($docdate); $xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">'."\n"; $xmp .= "\t\t\t".'<xmp:CreateDate>'.$docdate.'</xmp:CreateDate>'."\n"; - $xmp .= "\t\t\t".'<xmp:CreatorTool>TCPDF</xmp:CreatorTool>'."\n"; + $xmp .= "\t\t\t".'<xmp:CreatorTool>'.$this->creator.'</xmp:CreatorTool>'."\n"; $xmp .= "\t\t\t".'<xmp:ModifyDate>'.$docdate.'</xmp:ModifyDate>'."\n"; $xmp .= "\t\t\t".'<xmp:MetadataDate>'.$docdate.'</xmp:MetadataDate>'."\n"; $xmp .= "\t\t".'</rdf:Description>'."\n"; @@ -14092,7 +14091,7 @@ class TCPDF { fwrite($f, $envelope, $envelope_length); fclose($f); $tempencfile = tempnam(K_PATH_CACHE, 'tmpenc_'); - if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_DETACHED | PKCS7_BINARY)) { + if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_BINARY | PKCS7_DETACHED)) { $this->Error('Unable to encrypt the file: '.$tempkeyfile); } unlink($tempkeyfile); diff --git a/libraries/tcpdf/unicode_data.php b/libraries/tcpdf/unicode_data.php index c05cb94..936f4fe 100644 --- a/libraries/tcpdf/unicode_data.php +++ b/libraries/tcpdf/unicode_data.php @@ -4,10 +4,10 @@ // Version : 1.0.009 // Begin : 2008-01-01 // Last Update : 2011-10-01 -// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info(a)tecnick.com +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info(a)tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- -// Copyright (C) 2008-2011 Nicola Asuni - Tecnick.com S.r.l. +// Copyright (C) 2008-2012 Nicola Asuni - Tecnick.com LTD // // This file is part of TCPDF software library. // hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-275-g693b0a5
by Marc Delisle 28 Jan '12

28 Jan '12

The branch, master has been updated via 693b0a59aad90cac2a1faf7375fd093a53ae2f65 (commit) via 2091a1727627d6dbdee6d9a3e8335156895d8f60 (commit) via 28779212196686f44650e362ec0fcfbb23140288 (commit) via 52f60156cb8ddc5a24fbd7c0a43c856f00391d38 (commit) from db22f56fd2584508bc77cb03922020183ac8bb49 (commit) - Log ----------------------------------------------------------------- commit 693b0a59aad90cac2a1faf7375fd093a53ae2f65 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 28 04:50:14 2012 -0500 Put back 3.6.0-dev version info commit 2091a1727627d6dbdee6d9a3e8335156895d8f60 Merge: db22f56 2877921 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 28 04:48:23 2012 -0500 Merge branch 'QA_3_5' ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 3389933..58c087e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.6.0-dev + 3.6.0-dev Documentation </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-271-gdb22f56
by Marc Delisle 28 Jan '12

28 Jan '12

The branch, master has been updated via db22f56fd2584508bc77cb03922020183ac8bb49 (commit) from 34d01c91073384ab28713fc8a599d5df6978e08e (commit) - Log ----------------------------------------------------------------- commit db22f56fd2584508bc77cb03922020183ac8bb49 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 28 04:12:07 2012 -0500 Document MaxRows behavior when a LIMIT clause is present ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index 8fafa5f..3389933 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1661,8 +1661,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> "show all (rows)" button in browse mode or not.</dd> <dt id="cfg_MaxRows">$cfg['MaxRows'] integer</dt> - <dd>Number of rows displayed when browsing a result set. If the result set - contains more rows, "Previous" and "Next" links will be shown.</dd> + <dd>Number of rows displayed when browsing a result set and no LIMIT + clause is used. If the result set contains more rows, "Previous" and "Next" links will be shown.</dd> <dt id="cfg_Order">$cfg['Order'] string [<tt>DESC</tt>|<tt>ASC</tt>|<tt>SMART</tt>]</dt> <dd>Defines whether columns are displayed in ascending (<tt>ASC</tt>) order, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-272-g2877921
by Marc Delisle 28 Jan '12

28 Jan '12

The branch, QA_3_5 has been updated via 28779212196686f44650e362ec0fcfbb23140288 (commit) from 52f60156cb8ddc5a24fbd7c0a43c856f00391d38 (commit) - Log ----------------------------------------------------------------- commit 28779212196686f44650e362ec0fcfbb23140288 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 28 04:12:07 2012 -0500 Document MaxRows behavior when a LIMIT clause is present ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index 49f6ec1..a4841d4 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1661,8 +1661,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> "show all (rows)" button in browse mode or not.</dd> <dt id="cfg_MaxRows">$cfg['MaxRows'] integer</dt> - <dd>Number of rows displayed when browsing a result set. If the result set - contains more rows, "Previous" and "Next" links will be shown.</dd> + <dd>Number of rows displayed when browsing a result set and no LIMIT + clause is used. If the result set contains more rows, "Previous" and "Next" links will be shown.</dd> <dt id="cfg_Order">$cfg['Order'] string [<tt>DESC</tt>|<tt>ASC</tt>|<tt>SMART</tt>]</dt> <dd>Defines whether columns are displayed in ascending (<tt>ASC</tt>) order, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-271-g52f6015
by Marc Delisle 28 Jan '12

28 Jan '12

The branch, QA_3_5 has been updated via 52f60156cb8ddc5a24fbd7c0a43c856f00391d38 (commit) from 34d01c91073384ab28713fc8a599d5df6978e08e (commit) - Log ----------------------------------------------------------------- commit 52f60156cb8ddc5a24fbd7c0a43c856f00391d38 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 28 04:06:37 2012 -0500 Put back correct version in this branch (was lost during commit f196b4804d8e96386a822e68927e2103956a868f) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 -- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53c143a..08694de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,6 @@ phpMyAdmin - ChangeLog ====================== -3.6.0.0 (not yet released) - 3.5.0.0 (not yet released) + rfe #2021981 [interface] Add support for mass prefix change. + "up to date" message on main page when current version is up to date diff --git a/Documentation.html b/Documentation.html index 8fafa5f..49f6ec1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.6.0-dev - Documentation</title> + <title>phpMyAdmin 3.5.0-beta2 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.6.0-dev + 3.5.0-beta2 Documentation </h1> </div> diff --git a/README b/README index f1ba37a..5e1d40b 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.6.0-dev +Version 3.5.0-beta2 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 635a02e..8235d83 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.6.0-dev'); + $this->set('PMA_VERSION', '3.5.0-beta2'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-270-g34d01c9
by Michal Čihař 27 Jan '12

27 Jan '12

The branch, master has been updated via 34d01c91073384ab28713fc8a599d5df6978e08e (commit) via c414374aba8af92f556b5f35b90962ffee012999 (commit) via ca035b4ca596300d2fc51ad00d63cfa72ccc64d6 (commit) via 1d2ce6b4549f11cd7e7f9e8d2592c689a96ff956 (commit) via 945038f564ccfa2d6783c799bd5596f005624702 (commit) via a43c83db4258057a273039f78114161797c191b0 (commit) via 1f1c915482d60932a4d232981f897b85a2d5eb2b (commit) via b8d00c5f02b64e5cd9a5ab21ffa96b432851a348 (commit) via 7bf8d9495f29850f59f235489db8547cfbf78031 (commit) via 649ba9f5b194bcd29da799244601cf26592509da (commit) via d8d42a642b627547e9a93429025b69325caae519 (commit) via 0aecbea9df31c99b854747c5ad42c52bb315af49 (commit) from 90f29bceede052dfaf509600ad11f73bc059c335 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index d570530..4b28ad4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-25 17:45+0100\n" -"PO-Revision-Date: 2011-12-29 18:17+0200\n" -"Last-Translator: WillBa <widelan10(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-27 15:50+0200\n" +"Last-Translator: any anonymous user <>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -1541,7 +1541,7 @@ msgstr "Dividido por %s:" #: js/messages.php:172 msgid "Unit" -msgstr "" +msgstr "Unidade" #: js/messages.php:174 msgid "From slow log" @@ -1600,7 +1600,7 @@ msgstr "Analisando..." #, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "Explicar SQL" +msgstr "Explicar saída SQL" #: js/messages.php:188 js/messages.php:494 libraries/rte/rte_list.lib.php:62 #: server_status.php:1236 sql.php:897 @@ -1615,7 +1615,7 @@ msgstr "Tempo total:" #, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "Perfil" +msgstr "Resultado do Perfil" #: js/messages.php:191 msgctxt "Display format" @@ -1687,7 +1687,7 @@ msgstr "Linhas afetadas:" #, fuzzy msgid "Failed parsing config file. It doesn't seem to be valid JSON code." msgstr "" -"Falha ao processar o arquivo de configuração. Não parece ser código JSON " +"Falha ao processar o arquivo de configuração. Não parece ser um código JSON " "válido" #: js/messages.php:211 @@ -1713,7 +1713,7 @@ msgstr "Analisar a consulta" #: js/messages.php:218 msgid "Advisor system" -msgstr "" +msgstr "Sistema de assessoria" #: js/messages.php:219 msgid "Possible performance issues" hooks/post-receive -- phpMyAdmin

1 0