- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-31-g22b0ac9
by Dieter Adriaenssens 13 Jul '10

13 Jul '10

The branch, QA_3_3 has been updated via 22b0ac9079c5cf16260c182afa8a4facfb81614f (commit) from 6648c620d917300bfddf6d90555976589844ec19 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6c9af2..fe595fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,8 +15,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3024344 [setup] Setup forces numeric MemoryLimit - bug #3025975 [auth] Odd LoginCookieValidity default value - bug #3026400 [PHP] ereg functions are deprecated -- bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from -master, todo: update PHP excel?) +- bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master) - bug #3023507 [core] No result set display from stored procedure SELECT - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5348-g17fc137
by Dieter Adriaenssens 13 Jul '10

13 Jul '10

The branch, master has been updated via 17fc1370f31ee8be51d5796e3e72252e96e4590e (commit) via 6648c620d917300bfddf6d90555976589844ec19 (commit) via 8b8562b435c81d72c02e38e1135d5fe0fa48d711 (commit) via 64a2832ac89bcb29f5e7e894cabc21d7a50870b0 (commit) via ee0b2895ce966f62e26185ee92a8bf6e41f4fd41 (commit) via b90a1b496b96d1058e152cb7d33bb13ee39ba66f (commit) via 798def6e4505ae239c4bd8c4a2754da534bc736e (commit) from d7b824899783282fe59b7c541d3d88fb5e051738 (commit) - Log ----------------------------------------------------------------- commit 17fc1370f31ee8be51d5796e3e72252e96e4590e Merge: d7b824899783282fe59b7c541d3d88fb5e051738 6648c620d917300bfddf6d90555976589844ec19 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Tue Jul 13 23:27:15 2010 +0200 Merge branch 'QA_3_3' Conflicts: ChangeLog libraries/import.lib.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import.lib.php | 29 ++++++++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a25731..07c9a76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,6 +101,7 @@ master, todo: update PHP excel?) - bug #3023507 [core] No result set display from stored procedure SELECT - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c +- bug #2994885 [import] Convert Excel column name correctly 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/import.lib.php b/libraries/import.lib.php index e012287..cd8741c 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -343,27 +343,42 @@ function PMA_getColumnAlphaName($num) /** * Returns the column number based on the Excel name. - * So "A" = 1, "AZ" = 27, etc. + * So "A" = 1, "Z" = 26, "AA" = 27, etc. * + * Basicly this is a base26 (A-Z) to base10 (0-9) conversion. + * It iterates through all characters in the column name and + * calculates the corresponding value, based on character value + * (A = 1, ..., Z = 26) and position in the string. * * @access public * * @uses strtoupper() * @uses strlen() - * @uses count() * @uses ord() * @param string $name (i.e. "A", or "BC", etc.) * @return int The column number */ function PMA_getColumnNumberFromName($name) { - if (strlen($name) != 0) { + if (!empty($name)) { $name = strtoupper($name); - $num_chars = count($name); - $number = 0; + $num_chars = strlen($name); + $column_number = 0; for ($i = 0; $i < $num_chars; ++$i) { - $number += (ord($name[$i]) - 64); + // read string from back to front + $char_pos = ($num_chars - 1) - $i; + + // convert capital character to ASCII value + // and subtract 64 to get corresponding decimal value + // ASCII value of "A" is 65, "B" is 66, etc. + // Decimal equivalent of "A" is 1, "B" is 2, etc. + $number = (ord($name[$char_pos]) - 64); + + // base26 to base10 conversion : multiply each number + // with corresponding value of the position, in this case + // $i=0 : 1; $i=1 : 26; $i=2 : 676; ... + $column_number += $number * pow(26,$i); } - return $number; + return $column_number; } else { return 0; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-30-g6648c62
by Dieter Adriaenssens 13 Jul '10

13 Jul '10

The branch, QA_3_3 has been updated via 6648c620d917300bfddf6d90555976589844ec19 (commit) from 8b8562b435c81d72c02e38e1135d5fe0fa48d711 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import.lib.php | 30 ++++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e793238..d6c9af2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ master, todo: update PHP excel?) - bug #3023507 [core] No result set display from stored procedure SELECT - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c +- bug #2994885 [import] Convert Excel column name correctly 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 56caeeb..70e5f13 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -344,28 +344,42 @@ function PMA_getColumnAlphaName($num) /** * Returns the column number based on the Excel name. - * So "A" = 1, "AZ" = 27, etc. + * So "A" = 1, "Z" = 26, "AA" = 27, etc. * - * @author Derek Schaefer (derek.schaefer(a)gmail.com) + * Basicly this is a base26 (A-Z) to base10 (0-9) conversion. + * It iterates through all characters in the column name and + * calculates the corresponding value, based on character value + * (A = 1, ..., Z = 26) and position in the string. * * @access public * * @uses strtoupper() * @uses strlen() - * @uses count() * @uses ord() * @param string $name (i.e. "A", or "BC", etc.) * @return int The column number */ function PMA_getColumnNumberFromName($name) { - if (strlen($name) != 0) { + if (!empty($name)) { $name = strtoupper($name); - $num_chars = count($name); - $number = 0; + $num_chars = strlen($name); + $column_number = 0; for ($i = 0; $i < $num_chars; ++$i) { - $number += (ord($name[$i]) - 64); + // read string from back to front + $char_pos = ($num_chars - 1) - $i; + + // convert capital character to ASCII value + // and subtract 64 to get corresponding decimal value + // ASCII value of "A" is 65, "B" is 66, etc. + // Decimal equivalent of "A" is 1, "B" is 2, etc. + $number = (ord($name[$char_pos]) - 64); + + // base26 to base10 conversion : multiply each number + // with corresponding value of the position, in this case + // $i=0 : 1; $i=1 : 26; $i=2 : 676; ... + $column_number += $number * pow(26,$i); } - return $number; + return $column_number; } else { return 0; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-29-g8b8562b
by Dieter Adriaenssens 13 Jul '10

13 Jul '10

The branch, QA_3_3 has been updated via 8b8562b435c81d72c02e38e1135d5fe0fa48d711 (commit) from 64a2832ac89bcb29f5e7e894cabc21d7a50870b0 (commit) - Log ----------------------------------------------------------------- commit 8b8562b435c81d72c02e38e1135d5fe0fa48d711 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Wed May 26 21:24:26 2010 +0200 cleanup (re)moved files ----------------------------------------------------------------------- Summary of changes: .../PHPExcel/PHPExcel/Shared/OLE/OLE_File.php | 130 ------ libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_PPS.php | 228 --------- .../PHPExcel/PHPExcel/Shared/OLE/OLE_Root.php | 489 -------------------- libraries/PHPExcel/PHPExcel/Shared/PDF.php | 39 -- 4 files changed, 0 insertions(+), 886 deletions(-) delete mode 100644 libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_File.php delete mode 100644 libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_PPS.php delete mode 100644 libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_Root.php delete mode 100644 libraries/PHPExcel/PHPExcel/Shared/PDF.php diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_File.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_File.php deleted file mode 100644 index 02ec4c9..0000000 --- a/libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_File.php +++ /dev/null @@ -1,130 +0,0 @@ -<?php -/* vim: set expandtab tabstop=4 shiftwidth=4: */ -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2002 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available at through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license(a)php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Author: Xavier Noguer <xnoguer(a)php.net> | -// | Based on OLE::Storage_Lite by Kawai, Takanori | -// +----------------------------------------------------------------------+ -// -// $Id: File.php,v 1.11 2007/02/13 21:00:42 schmidt Exp $ - - -/** PHPExcel root directory */ -if (!defined('PHPEXCEL_ROOT')) { - /** - * @ignore - */ - define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../../'); -} - -require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/OLE/OLE_PPS.php'; - -/** -* Class for creating File PPS's for OLE containers -* -* @author Xavier Noguer <xnoguer(a)php.net> -* @category PHPExcel -* @package PHPExcel_Shared_OLE -*/ -class PHPExcel_Shared_OLE_PPS_File extends PHPExcel_Shared_OLE_PPS - { - /** - * The temporary dir for storing the OLE file - * @var string - */ - public $_tmp_dir; - - /** - * The constructor - * - * @access public - * @param string $name The name of the file (in Unicode) - * @see OLE::Asc2Ucs() - */ - public function __construct($name) - { - $this->_tmp_dir = ''; - parent::__construct( - null, - $name, - PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE, - null, - null, - null, - null, - null, - '', - array()); - } - - /** - * Sets the temp dir used for storing the OLE file - * - * @access public - * @param string $dir The dir to be used as temp dir - * @return true if given dir is valid, false otherwise - */ - public function setTempDir($dir) - { - if (is_dir($dir)) { - $this->_tmp_dir = $dir; - return true; - } - return false; - } - - /** - * Initialization method. Has to be called right after OLE_PPS_File(). - * - * @access public - * @return mixed true on success - */ - public function init() - { - $this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_File"); - $fh = fopen($this->_tmp_filename, "w+b"); - if ($fh === false) { - throw new Exception("Can't create temporary file"); - } - $this->_PPS_FILE = $fh; - if ($this->_PPS_FILE) { - fseek($this->_PPS_FILE, 0); - } - return true; - } - - /** - * Append data to PPS - * - * @access public - * @param string $data The data to append - */ - public function append($data) - { - if ($this->_PPS_FILE) { - fwrite($this->_PPS_FILE, $data); - } else { - $this->_data .= $data; - } - } - - /** - * Returns a stream for reading this file using fread() etc. - * @return resource a read-only stream - */ - public function getStream() - { - $this->ole->getStream($this); - } -} diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_PPS.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_PPS.php deleted file mode 100644 index a0d6ad2..0000000 --- a/libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_PPS.php +++ /dev/null @@ -1,228 +0,0 @@ -<?php -/* vim: set expandtab tabstop=4 shiftwidth=4: */ -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2002 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available at through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license(a)php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Author: Xavier Noguer <xnoguer(a)php.net> | -// | Based on OLE::Storage_Lite by Kawai, Takanori | -// +----------------------------------------------------------------------+ -// -// $Id: PPS.php,v 1.7 2007/02/13 21:00:42 schmidt Exp $ - - -/** PHPExcel root directory */ -if (!defined('PHPEXCEL_ROOT')) { - /** - * @ignore - */ - define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../../'); -} - -require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/OLE.php'; - -/** -* Class for creating PPS's for OLE containers -* -* @author Xavier Noguer <xnoguer(a)php.net> -* @category PHPExcel -* @package PHPExcel_Shared_OLE -*/ -class PHPExcel_Shared_OLE_PPS -{ - /** - * The PPS index - * @var integer - */ - public $No; - - /** - * The PPS name (in Unicode) - * @var string - */ - public $Name; - - /** - * The PPS type. Dir, Root or File - * @var integer - */ - public $Type; - - /** - * The index of the previous PPS - * @var integer - */ - public $PrevPps; - - /** - * The index of the next PPS - * @var integer - */ - public $NextPps; - - /** - * The index of it's first child if this is a Dir or Root PPS - * @var integer - */ - public $DirPps; - - /** - * A timestamp - * @var integer - */ - public $Time1st; - - /** - * A timestamp - * @var integer - */ - public $Time2nd; - - /** - * Starting block (small or big) for this PPS's data inside the container - * @var integer - */ - public $_StartBlock; - - /** - * The size of the PPS's data (in bytes) - * @var integer - */ - public $Size; - - /** - * The PPS's data (only used if it's not using a temporary file) - * @var string - */ - public $_data; - - /** - * Array of child PPS's (only used by Root and Dir PPS's) - * @var array - */ - public $children = array(); - - /** - * Pointer to OLE container - * @var OLE - */ - public $ole; - - /** - * The constructor - * - * @access public - * @param integer $No The PPS index - * @param string $name The PPS name - * @param integer $type The PPS type. Dir, Root or File - * @param integer $prev The index of the previous PPS - * @param integer $next The index of the next PPS - * @param integer $dir The index of it's first child if this is a Dir or Root PPS - * @param integer $time_1st A timestamp - * @param integer $time_2nd A timestamp - * @param string $data The (usually binary) source data of the PPS - * @param array $children Array containing children PPS for this PPS - */ - public function __construct($No, $name, $type, $prev, $next, $dir, $time_1st, $time_2nd, $data, $children) - { - $this->No = $No; - $this->Name = $name; - $this->Type = $type; - $this->PrevPps = $prev; - $this->NextPps = $next; - $this->DirPps = $dir; - $this->Time1st = $time_1st; - $this->Time2nd = $time_2nd; - $this->_data = $data; - $this->children = $children; - if ($data != '') { - $this->Size = strlen($data); - } else { - $this->Size = 0; - } - } - - /** - * Returns the amount of data saved for this PPS - * - * @access public - * @return integer The amount of data (in bytes) - */ - public function _DataLen() - { - if (!isset($this->_data)) { - return 0; - } - if (isset($this->_PPS_FILE)) { - fseek($this->_PPS_FILE, 0); - $stats = fstat($this->_PPS_FILE); - return $stats[7]; - } else { - return strlen($this->_data); - } - } - - /** - * Returns a string with the PPS's WK (What is a WK?) - * - * @access public - * @return string The binary string - */ - public function _getPpsWk() - { - $ret = $this->Name; - for ($i = 0; $i < (64 - strlen($this->Name)); ++$i) { - $ret .= "\x00"; - } - $ret .= pack("v", strlen($this->Name) + 2) // 66 - . pack("c", $this->Type) // 67 - . pack("c", 0x00) //UK // 68 - . pack("V", $this->PrevPps) //Prev // 72 - . pack("V", $this->NextPps) //Next // 76 - . pack("V", $this->DirPps) //Dir // 80 - . "\x00\x09\x02\x00" // 84 - . "\x00\x00\x00\x00" // 88 - . "\xc0\x00\x00\x00" // 92 - . "\x00\x00\x00\x46" // 96 // Seems to be ok only for Root - . "\x00\x00\x00\x00" // 100 - . PHPExcel_Shared_OLE::LocalDate2OLE($this->Time1st) // 108 - . PHPExcel_Shared_OLE::LocalDate2OLE($this->Time2nd) // 116 - . pack("V", isset($this->_StartBlock)? - $this->_StartBlock:0) // 120 - . pack("V", $this->Size) // 124 - . pack("V", 0); // 128 - return $ret; - } - - /** - * Updates index and pointers to previous, next and children PPS's for this - * PPS. I don't think it'll work with Dir PPS's. - * - * @access public - * @param array &$pps_array Reference to the array of PPS's for the whole OLE - * container - * @return integer The index for this PPS - */ - public function _savePpsSetPnt(&$pps_array) - { - $pps_array[count($pps_array)] = &$this; - $this->No = count($pps_array) - 1; - $this->PrevPps = 0xFFFFFFFF; - $this->NextPps = 0xFFFFFFFF; - if (count($this->children) > 0) { - $this->DirPps = $this->children[0]->_savePpsSetPnt($pps_array); - } else { - $this->DirPps = 0xFFFFFFFF; - } - return $this->No; - } - } diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_Root.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_Root.php deleted file mode 100644 index 3cf1d1b..0000000 --- a/libraries/PHPExcel/PHPExcel/Shared/OLE/OLE_Root.php +++ /dev/null @@ -1,489 +0,0 @@ -<?php -/* vim: set expandtab tabstop=4 shiftwidth=4: */ -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2002 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available at through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license(a)php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Author: Xavier Noguer <xnoguer(a)php.net> | -// | Based on OLE::Storage_Lite by Kawai, Takanori | -// +----------------------------------------------------------------------+ -// -// $Id: Root.php,v 1.9 2005/04/23 21:53:49 dufuz Exp $ - - -/** PHPExcel root directory */ -if (!defined('PHPEXCEL_ROOT')) { - /** - * @ignore - */ - define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../../'); -} - -require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/OLE/OLE_PPS.php'; - -/** -* Class for creating Root PPS's for OLE containers -* -* @author Xavier Noguer <xnoguer(a)php.net> -* @category PHPExcel -* @package PHPExcel_Shared_OLE -*/ -class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS - { - /** - * The temporary dir for storing the OLE file - * @var string - */ - public $_tmp_dir; - - /** - * @param integer $time_1st A timestamp - * @param integer $time_2nd A timestamp - */ - public function __construct($time_1st, $time_2nd, $raChild) - { - $this->_tmp_dir = ''; - parent::__construct( - null, - PHPExcel_Shared_OLE::Asc2Ucs('Root Entry'), - PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT, - null, - null, - null, - $time_1st, - $time_2nd, - null, - $raChild); - } - - /** - * Sets the temp dir used for storing the OLE file - * - * @access public - * @param string $dir The dir to be used as temp dir - * @return true if given dir is valid, false otherwise - */ - public function setTempDir($dir) - { - if (is_dir($dir)) { - $this->_tmp_dir = $dir; - return true; - } - return false; - } - - /** - * Method for saving the whole OLE container (including files). - * In fact, if called with an empty argument (or '-'), it saves to a - * temporary file and then outputs it's contents to stdout. - * - * @param string $filename The name of the file where to save the OLE container - * @access public - * @return mixed true on success - */ - public function save($filename) - { - // Initial Setting for saving - $this->_BIG_BLOCK_SIZE = pow(2, - ((isset($this->_BIG_BLOCK_SIZE))? $this->_adjust2($this->_BIG_BLOCK_SIZE) : 9)); - $this->_SMALL_BLOCK_SIZE= pow(2, - ((isset($this->_SMALL_BLOCK_SIZE))? $this->_adjust2($this->_SMALL_BLOCK_SIZE): 6)); - - // Open temp file if we are sending output to stdout - if ($filename == '-' || $filename == '') { - $this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root"); - $this->_FILEH_ = fopen($this->_tmp_filename,"w+b"); - if ($this->_FILEH_ == false) { - throw new Exception("Can't create temporary file."); - } - } else { - $this->_FILEH_ = fopen($filename, "wb"); - if ($this->_FILEH_ == false) { - throw new Exception("Can't open $filename. It may be in use or protected."); - } - } - // Make an array of PPS's (for Save) - $aList = array(); - $this->_savePpsSetPnt($aList); - // calculate values for header - list($iSBDcnt, $iBBcnt, $iPPScnt) = $this->_calcSize($aList); //, $rhInfo); - // Save Header - $this->_saveHeader($iSBDcnt, $iBBcnt, $iPPScnt); - - // Make Small Data string (write SBD) - $this->_data = $this->_makeSmallData($aList); - - // Write BB - $this->_saveBigData($iSBDcnt, $aList); - // Write PPS - $this->_savePps($aList); - // Write Big Block Depot and BDList and Adding Header informations - $this->_saveBbd($iSBDcnt, $iBBcnt, $iPPScnt); - // Close File, send it to stdout if necessary - if (($filename == '-') || ($filename == '')) { - fseek($this->_FILEH_, 0); - fpassthru($this->_FILEH_); - fclose($this->_FILEH_); - // Delete the temporary file. - unlink($this->_tmp_filename); - } else { - fclose($this->_FILEH_); - } - - return true; - } - - /** - * Calculate some numbers - * - * @access public - * @param array $raList Reference to an array of PPS's - * @return array The array of numbers - */ - public function _calcSize(&$raList) - { - // Calculate Basic Setting - list($iSBDcnt, $iBBcnt, $iPPScnt) = array(0,0,0); - $iSmallLen = 0; - $iSBcnt = 0; - for ($i = 0; $i < count($raList); ++$i) { - if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) { - $raList[$i]->Size = $raList[$i]->_DataLen(); - if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) { - $iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE) - + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0); - } else { - $iBBcnt += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) + - (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0)); - } - } - } - $iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE; - $iSlCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE); - $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt)? 1:0); - $iBBcnt += (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) + - (( $iSmallLen % $this->_BIG_BLOCK_SIZE)? 1: 0)); - $iCnt = count($raList); - $iBdCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE; - $iPPScnt = (floor($iCnt/$iBdCnt) + (($iCnt % $iBdCnt)? 1: 0)); - - return array($iSBDcnt, $iBBcnt, $iPPScnt); - } - - /** - * Helper function for caculating a magic value for block sizes - * - * @access public - * @param integer $i2 The argument - * @see save() - * @return integer - */ - public function _adjust2($i2) - { - $iWk = log($i2)/log(2); - return ($iWk > floor($iWk))? floor($iWk)+1:$iWk; - } - - /** - * Save OLE header - * - * @access public - * @param integer $iSBDcnt - * @param integer $iBBcnt - * @param integer $iPPScnt - */ - public function _saveHeader($iSBDcnt, $iBBcnt, $iPPScnt) - { - $FILE = $this->_FILEH_; - - // Calculate Basic Setting - $iBlCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE; - $i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE; - - $iBdExL = 0; - $iAll = $iBBcnt + $iPPScnt + $iSBDcnt; - $iAllW = $iAll; - $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0); - $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0); - - // Calculate BD count - if ($iBdCnt > $i1stBdL) { - while (1) { - ++$iBdExL; - ++$iAllW; - $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0); - $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0); - if ($iBdCnt <= ($iBdExL*$iBlCnt+ $i1stBdL)) { - break; - } - } - } - - // Save Header - fwrite($FILE, - "\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1" - . "\x00\x00\x00\x00" - . "\x00\x00\x00\x00" - . "\x00\x00\x00\x00" - . "\x00\x00\x00\x00" - . pack("v", 0x3b) - . pack("v", 0x03) - . pack("v", -2) - . pack("v", 9) - . pack("v", 6) - . pack("v", 0) - . "\x00\x00\x00\x00" - . "\x00\x00\x00\x00" - . pack("V", $iBdCnt) - . pack("V", $iBBcnt+$iSBDcnt) //ROOT START - . pack("V", 0) - . pack("V", 0x1000) - . pack("V", $iSBDcnt ? 0 : -2) //Small Block Depot - . pack("V", $iSBDcnt) - ); - // Extra BDList Start, Count - if ($iBdCnt < $i1stBdL) { - fwrite($FILE, - pack("V", -2). // Extra BDList Start - pack("V", 0) // Extra BDList Count - ); - } else { - fwrite($FILE, pack("V", $iAll+$iBdCnt) . pack("V", $iBdExL)); - } - - // BDList - for ($i = 0; $i < $i1stBdL && $i < $iBdCnt; ++$i) { - fwrite($FILE, pack("V", $iAll+$i)); - } - if ($i < $i1stBdL) { - for ($j = 0; $j < ($i1stBdL-$i); ++$j) { - fwrite($FILE, (pack("V", -1))); - } - } - } - - /** - * Saving big data (PPS's with data bigger than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) - * - * @access public - * @param integer $iStBlk - * @param array &$raList Reference to array of PPS's - */ - public function _saveBigData($iStBlk, &$raList) - { - $FILE = $this->_FILEH_; - - // cycle through PPS's - for ($i = 0; $i < count($raList); ++$i) { - if ($raList[$i]->Type != PHPExcel_Shared_OLE::OLE_PPS_TYPE_DIR) { - $raList[$i]->Size = $raList[$i]->_DataLen(); - if (($raList[$i]->Size >= PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) || - (($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT) && isset($raList[$i]->_data))) - { - // Write Data - if (isset($raList[$i]->_PPS_FILE)) { - $iLen = 0; - fseek($raList[$i]->_PPS_FILE, 0); // To The Top - while($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) { - $iLen += strlen($sBuff); - fwrite($FILE, $sBuff); - } - } else { - fwrite($FILE, $raList[$i]->_data); - } - - if ($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) { - for ($j = 0; $j < ($this->_BIG_BLOCK_SIZE - ($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)); ++$j) { - fwrite($FILE, "\x00"); - } - } - // Set For PPS - $raList[$i]->_StartBlock = $iStBlk; - $iStBlk += - (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) + - (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0)); - } - // Close file for each PPS, and unlink it - if (isset($raList[$i]->_PPS_FILE)) { - fclose($raList[$i]->_PPS_FILE); - $raList[$i]->_PPS_FILE = null; - unlink($raList[$i]->_tmp_filename); - } - } - } - } - - /** - * get small data (PPS's with data smaller than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) - * - * @access public - * @param array &$raList Reference to array of PPS's - */ - public function _makeSmallData(&$raList) - { - $sRes = ''; - $FILE = $this->_FILEH_; - $iSmBlk = 0; - - for ($i = 0; $i < count($raList); ++$i) { - // Make SBD, small data string - if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) { - if ($raList[$i]->Size <= 0) { - continue; - } - if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) { - $iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE) - + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0); - // Add to SBD - for ($j = 0; $j < ($iSmbCnt-1); ++$j) { - fwrite($FILE, pack("V", $j+$iSmBlk+1)); - } - fwrite($FILE, pack("V", -2)); - - // Add to Data String(this will be written for RootEntry) - if ($raList[$i]->_PPS_FILE) { - fseek($raList[$i]->_PPS_FILE, 0); // To The Top - while ($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) { - $sRes .= $sBuff; - } - } else { - $sRes .= $raList[$i]->_data; - } - if ($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) { - for ($j = 0; $j < ($this->_SMALL_BLOCK_SIZE - ($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)); ++$j) { - $sRes .= "\x00"; - } - } - // Set for PPS - $raList[$i]->_StartBlock = $iSmBlk; - $iSmBlk += $iSmbCnt; - } - } - } - $iSbCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE); - if ($iSmBlk % $iSbCnt) { - for ($i = 0; $i < ($iSbCnt - ($iSmBlk % $iSbCnt)); ++$i) { - fwrite($FILE, pack("V", -1)); - } - } - return $sRes; - } - - /** - * Saves all the PPS's WKs - * - * @access public - * @param array $raList Reference to an array with all PPS's - */ - public function _savePps(&$raList) - { - // Save each PPS WK - for ($i = 0; $i < count($raList); ++$i) { - fwrite($this->_FILEH_, $raList[$i]->_getPpsWk()); - } - // Adjust for Block - $iCnt = count($raList); - $iBCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE; - if ($iCnt % $iBCnt) { - for ($i = 0; $i < (($iBCnt - ($iCnt % $iBCnt)) * PHPExcel_Shared_OLE::OLE_PPS_SIZE); ++$i) { - fwrite($this->_FILEH_, "\x00"); - } - } - } - - /** - * Saving Big Block Depot - * - * @access public - * @param integer $iSbdSize - * @param integer $iBsize - * @param integer $iPpsCnt - */ - public function _saveBbd($iSbdSize, $iBsize, $iPpsCnt) - { - $FILE = $this->_FILEH_; - // Calculate Basic Setting - $iBbCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE; - $i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE; - - $iBdExL = 0; - $iAll = $iBsize + $iPpsCnt + $iSbdSize; - $iAllW = $iAll; - $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0); - $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0); - // Calculate BD count - if ($iBdCnt >$i1stBdL) { - while (1) { - ++$iBdExL; - ++$iAllW; - $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0); - $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0); - if ($iBdCnt <= ($iBdExL*$iBbCnt+ $i1stBdL)) { - break; - } - } - } - - // Making BD - // Set for SBD - if ($iSbdSize > 0) { - for ($i = 0; $i < ($iSbdSize - 1); ++$i) { - fwrite($FILE, pack("V", $i+1)); - } - fwrite($FILE, pack("V", -2)); - } - // Set for B - for ($i = 0; $i < ($iBsize - 1); ++$i) { - fwrite($FILE, pack("V", $i+$iSbdSize+1)); - } - fwrite($FILE, pack("V", -2)); - - // Set for PPS - for ($i = 0; $i < ($iPpsCnt - 1); ++$i) { - fwrite($FILE, pack("V", $i+$iSbdSize+$iBsize+1)); - } - fwrite($FILE, pack("V", -2)); - // Set for BBD itself ( 0xFFFFFFFD : BBD) - for ($i = 0; $i < $iBdCnt; ++$i) { - fwrite($FILE, pack("V", 0xFFFFFFFD)); - } - // Set for ExtraBDList - for ($i = 0; $i < $iBdExL; ++$i) { - fwrite($FILE, pack("V", 0xFFFFFFFC)); - } - // Adjust for Block - if (($iAllW + $iBdCnt) % $iBbCnt) { - for ($i = 0; $i < ($iBbCnt - (($iAllW + $iBdCnt) % $iBbCnt)); ++$i) { - fwrite($FILE, pack("V", -1)); - } - } - // Extra BDList - if ($iBdCnt > $i1stBdL) { - $iN=0; - $iNb=0; - for ($i = $i1stBdL;$i < $iBdCnt; $i++, ++$iN) { - if ($iN >= ($iBbCnt - 1)) { - $iN = 0; - ++$iNb; - fwrite($FILE, pack("V", $iAll+$iBdCnt+$iNb)); - } - fwrite($FILE, pack("V", $iBsize+$iSbdSize+$iPpsCnt+$i)); - } - if (($iBdCnt-$i1stBdL) % ($iBbCnt-1)) { - for ($i = 0; $i < (($iBbCnt - 1) - (($iBdCnt - $i1stBdL) % ($iBbCnt - 1))); ++$i) { - fwrite($FILE, pack("V", -1)); - } - } - fwrite($FILE, pack("V", -2)); - } - } - } diff --git a/libraries/PHPExcel/PHPExcel/Shared/PDF.php b/libraries/PHPExcel/PHPExcel/Shared/PDF.php deleted file mode 100644 index b66e8e0..0000000 --- a/libraries/PHPExcel/PHPExcel/Shared/PDF.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php -/** - * PHPExcel - * - * Copyright (c) 2006 - 2010 PHPExcel - * - * This library 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 2.1 of the License, or (at your option) any later version. - * - * This library 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * @category PHPExcel - * @package PHPExcel_Shared - * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) - * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.2, 2010-01-11 - */ - - -/** PHPExcel root directory */ -if (!defined('PHPEXCEL_ROOT')) { - /** - * @ignore - */ - define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../'); -} - -/** Require FPDF library */ -$k_path_url = dirname(__FILE__) . '/PDF'; -require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/PDF/tcpdf.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5341-gd7b8248
by Dieter Adriaenssens 13 Jul '10

13 Jul '10

The branch, master has been updated via d7b824899783282fe59b7c541d3d88fb5e051738 (commit) from 6ea41018b2c17ad01f80aea6aefd3b7a1687fd0b (commit) - Log ----------------------------------------------------------------- commit d7b824899783282fe59b7c541d3d88fb5e051738 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Tue Jul 13 20:23:31 2010 +0200 Update library PHPExcel 1.7.3c in QA_3_3 branch ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0ce1ea..8a25731 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,7 +83,6 @@ $Id$ + [core] Include Content Security Policy HTTP headers. - bug #3004216 [CSS] Field attributes use inline CSS - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame. -- [core] Update library PHPExcel to version 1.7.3c - patch #3025161 [core] Prevent sending of unnecessary cookies, thanks to Piotr Przybylski - crackpl @@ -101,6 +100,7 @@ $Id$ master, todo: update PHP excel?) - bug #3023507 [core] No result set display from stored procedure SELECT - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator +- [core] Update library PHPExcel to version 1.7.3c 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5340-g6ea4101
by Marc Delisle 12 Jul '10

12 Jul '10

The branch, master has been updated via 6ea41018b2c17ad01f80aea6aefd3b7a1687fd0b (commit) via 768de14815c5076a560ad3d1c46d18198f60edf0 (commit) from f6ef0c87a814d96cea4a1e868fcac15935deca13 (commit) - Log ----------------------------------------------------------------- commit 6ea41018b2c17ad01f80aea6aefd3b7a1687fd0b Merge: f6ef0c87a814d96cea4a1e868fcac15935deca13 768de14815c5076a560ad3d1c46d18198f60edf0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 12 09:01:05 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/export/csv.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/export/csv.php b/libraries/export/csv.php index d4b1811..8e1973f 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -75,10 +75,10 @@ function PMA_exportHeader() { // as tested on Windows with Excel 2002 and Excel 2007 $csv_separator = ';'; break; - case 'max_excel2003': + case 'mac_excel2003': $csv_separator = ';'; break; - case 'max_excel2008': + case 'mac_excel2008': $csv_separator = ','; break; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-24-g768de14
by Marc Delisle 12 Jul '10

12 Jul '10

The branch, QA_3_3 has been updated via 768de14815c5076a560ad3d1c46d18198f60edf0 (commit) from cda9df71016cd7a85d93fbe5b38da6f532c938de (commit) - Log ----------------------------------------------------------------- commit 768de14815c5076a560ad3d1c46d18198f60edf0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 12 09:00:39 2010 -0400 typo ----------------------------------------------------------------------- Summary of changes: libraries/export/csv.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/export/csv.php b/libraries/export/csv.php index ebcf0cd..e59e3bd 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -75,10 +75,10 @@ function PMA_exportHeader() { // as tested on Windows with Excel 2002 and Excel 2007 $csv_separator = ';'; break; - case 'max_excel2003': + case 'mac_excel2003': $csv_separator = ';'; break; - case 'max_excel2008': + case 'mac_excel2008': $csv_separator = ','; break; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5338-gf6ef0c8
by Marc Delisle 12 Jul '10

12 Jul '10

The branch, master has been updated via f6ef0c87a814d96cea4a1e868fcac15935deca13 (commit) via cda9df71016cd7a85d93fbe5b38da6f532c938de (commit) from ce2cad288666f2bfd71dc21ae8e0277288834657 (commit) - Log ----------------------------------------------------------------- commit f6ef0c87a814d96cea4a1e868fcac15935deca13 Merge: ce2cad288666f2bfd71dc21ae8e0277288834657 cda9df71016cd7a85d93fbe5b38da6f532c938de Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 12 08:57:05 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/csv.php | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6373434..c0ce1ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ $Id$ - bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) - bug #3023507 [core] No result set display from stored procedure SELECT +- bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/export/csv.php b/libraries/export/csv.php index e3d78f2..d4b1811 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -70,7 +70,18 @@ function PMA_exportHeader() { // Here we just prepare some values for export if ($what == 'excel') { $csv_terminated = "\015\012"; - $csv_separator = isset($GLOBALS['excel_edition']) && $GLOBALS['excel_edition'] == 'mac_excel2003' ? ';' : ','; + switch($GLOBALS['excel_edition']) { + case 'win': + // as tested on Windows with Excel 2002 and Excel 2007 + $csv_separator = ';'; + break; + case 'max_excel2003': + $csv_separator = ';'; + break; + case 'max_excel2008': + $csv_separator = ','; + break; + } $csv_enclosed = '"'; $csv_escaped = '"'; if (isset($GLOBALS['excel_columns'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-23-gcda9df7
by Marc Delisle 12 Jul '10

12 Jul '10

The branch, QA_3_3 has been updated via cda9df71016cd7a85d93fbe5b38da6f532c938de (commit) from b55ba34d43138b11b71d8eeae6b09ea160ded213 (commit) - Log ----------------------------------------------------------------- commit cda9df71016cd7a85d93fbe5b38da6f532c938de Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 12 08:56:30 2010 -0400 bug [export] CSV for MS Excel (Windows) should have semi-colon as separator ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/csv.php | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index de56291..ab9802e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) - bug #3023507 [core] No result set display from stored procedure SELECT +- bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 9a8e520..ebcf0cd 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -70,7 +70,18 @@ function PMA_exportHeader() { // Here we just prepare some values for export if ($what == 'excel') { $csv_terminated = "\015\012"; - $csv_separator = isset($GLOBALS['excel_edition']) && $GLOBALS['excel_edition'] == 'mac_excel2003' ? ';' : ','; + switch($GLOBALS['excel_edition']) { + case 'win': + // as tested on Windows with Excel 2002 and Excel 2007 + $csv_separator = ';'; + break; + case 'max_excel2003': + $csv_separator = ';'; + break; + case 'max_excel2008': + $csv_separator = ','; + break; + } $csv_enclosed = '"'; $csv_escaped = '"'; if (isset($GLOBALS['excel_columns'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5336-gce2cad2
by Marc Delisle 11 Jul '10

11 Jul '10

The branch, master has been updated via ce2cad288666f2bfd71dc21ae8e0277288834657 (commit) via b55ba34d43138b11b71d8eeae6b09ea160ded213 (commit) via b2616ac46ddbc72ee3a03f13ee4d4ec746518274 (commit) from 90ce4c77b38f5e51b35fea23125df861ed3bd1cc (commit) - Log ----------------------------------------------------------------- commit ce2cad288666f2bfd71dc21ae8e0277288834657 Merge: 90ce4c77b38f5e51b35fea23125df861ed3bd1cc b55ba34d43138b11b71d8eeae6b09ea160ded213 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 11 08:05:50 2010 -0400 fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ libraries/db_common.inc.php | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 867bebf..6373434 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,9 @@ $Id$ - bug #3024344 [setup] Setup forces numeric MemoryLimit - bug #3025975 [auth] Odd LoginCookieValidity default value - bug #3026400 [PHP] ereg functions are deprecated +- bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from +master, todo: update PHP excel?) +- bug #3023507 [core] No result set display from stored procedure SELECT 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 955e7c8..5d16995 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -37,12 +37,19 @@ $err_url = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db); * Ensures the database exists (else move to the "parent" script) and displays * headers */ -if (!isset($is_db) || !$is_db) { - // Not a valid db name -> back to the welcome page +if (! isset($is_db) || ! $is_db) { if (strlen($db)) { $is_db = PMA_DBI_select_db($db); + // This "Command out of sync" 2014 error may happen, for example + // after calling a MySQL procedure; at this point we can't select + // the db but it's not necessarily wrong + if (PMA_DBI_getError() && $GLOBALS['errno'] == 2014) { + $is_db = true; + unset($GLOBALS['errno']); + } } - if (! strlen($db) || !$is_db) { + // Not a valid db name -> back to the welcome page + if (! strlen($db) || ! $is_db) { PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1'); exit; } hooks/post-receive -- phpMyAdmin

1 0