Git June 2011

git@phpmyadmin.net

7 participants
281 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4520-g1852725
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via 18527251e7036e340d5f0be1fa6122ef3d1081d3 (commit) from 93edca9c24afd953fb2924a262ed7e5085c9a1b4 (commit) - Log ----------------------------------------------------------------- commit 18527251e7036e340d5f0be1fa6122ef3d1081d3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 15:03:26 2011 +0200 Fix syntax error ----------------------------------------------------------------------- Summary of changes: libraries/export/json.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libraries/export/json.php b/libraries/export/json.php index c9bba1e..9c836e1 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -6,7 +6,6 @@ * @package phpMyAdmin-Export * @subpackage JSON */ - */ if (! defined('PHPMYADMIN')) { exit; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4519-g93edca9
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via 93edca9c24afd953fb2924a262ed7e5085c9a1b4 (commit) from e59827fa1cffb4b2c1ab43443c31612fb15a867c (commit) - Log ----------------------------------------------------------------- commit 93edca9c24afd953fb2924a262ed7e5085c9a1b4 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 14:49:04 2011 +0200 Update Blowfish to latest version available from Horde. This basically just improves documentation, defines public/private methods and simplifies some code using new PHP features. The Horde itself is no longer using this, they switched to PEAR package Crypt_Blowfish, maybe we should do it as well? ----------------------------------------------------------------------- Summary of changes: libraries/blowfish.php | 132 ++++++++++++++++++++++++++---------------------- 1 files changed, 72 insertions(+), 60 deletions(-) diff --git a/libraries/blowfish.php b/libraries/blowfish.php index ae85f43..710015f 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -1,38 +1,37 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * The Cipher_blowfish:: class implements the Cipher interface enryption data - * using the Blowfish algorithm. + * The Horde_Cipher_Blowfish:: class implements the Horde_Cipher interface + * encryption data using the Blowfish algorithm. * - * $Horde: horde/lib/Cipher/blowfish.php,v 1.2.2.3 2003/01/03 13:23:22 jan Exp $ - * - * Copyright 2002-2003 Mike Cochrane <mike(a)graftonhall.co.nz> + * Copyright 2002-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (LGPL). If you * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * - * @since Horde 2.2 - * @package horde.cipher - */ - -// Change for phpMyAdmin -//class Horde_Cipher_blowfish extends Horde_Cipher { -/** - * Horde Blowfish cipher class. - * @package horde.cipher + * @author Mike Cochrane <mike(a)graftonhall.co.nz> + * @package Horde_Cipher */ class Horde_Cipher_blowfish { - /* Pi Array */ - var $p = array( + /** + * Pi Array + * + * @var array + */ + protected $p = array( 0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344, 0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89, 0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C, 0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917, 0x9216D5D9, 0x8979FB1B); - /* S Boxes */ - var $s1 = array( + /** + * S Box (s1) + * + * @var array + */ + protected $s1 = array( 0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7, 0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99, 0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16, @@ -97,7 +96,13 @@ class Horde_Cipher_blowfish 0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915, 0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664, 0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A); - var $s2 = array( + + /** + * S Box (s2) + * + * @var array + */ + protected $s2 = array( 0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623, 0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266, 0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1, @@ -162,7 +167,13 @@ class Horde_Cipher_blowfish 0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340, 0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20, 0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7); - var $s3 = array( + + /** + * S Box (s3) + * + * @var array + */ + protected $s3 = array( 0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934, 0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068, 0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF, @@ -227,7 +238,13 @@ class Horde_Cipher_blowfish 0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C, 0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837, 0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0); - var $s4 = array( + + /** + * S Box (s4) + * + * @var array + */ + protected $s4 = array( 0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B, 0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE, 0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B, @@ -293,22 +310,28 @@ class Horde_Cipher_blowfish 0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F, 0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6); - /* The number of rounds to do */ - var $_rounds = 16; + /** + * The number of rounds to do + * + * @var integer + */ + protected $_rounds = 16; /** - * Set the key to be used for en/decryption + * Set the key to be used for en/decryption. * - * @param String $key The key to use + * @param string $key The key to use. */ - function setKey($key) + public function setKey($key) { - $key = $this->_formatKey($key); - $keyPos = $keyXor = 0; - - $iMax = count($this->p); + $key = array_values(unpack('C*', $key)); $keyLen = count($key); - for ($i = 0; $i < $iMax; $i++) { + if ($keyLen == 0) { + return false; + } + + $keyPos = $keyXor = 0; + for ($i = 0, $iMax = count($this->p); $i < $iMax; ++$i) { for ($t = 0; $t < 4; $t++) { $keyXor = ($keyXor << 8) | (($key[$keyPos]) & 0x0ff); if (++$keyPos == $keyLen) { @@ -352,18 +375,17 @@ class Horde_Cipher_blowfish $this->s4[$i] = $encZero['L']; $this->s4[$i + 1] = $encZero['R']; } - } /** - * Encrypt a block on data. + * Encrypt a block of data. * - * @param String $block The data to encrypt - * @param optional String $key The key to use + * @param string $block The data to encrypt. + * @param string $key The key to use. * - * @return String the encrypted output + * @return string The encrypted output. */ - function encryptBlock($block, $key = null) + public function encryptBlock($block, $key = null) { if (!is_null($key)) { $this->setKey($key); @@ -371,18 +393,19 @@ class Horde_Cipher_blowfish list($L, $R) = array_values(unpack('N*', $block)); $parts = $this->_encryptBlock($L, $R); - return pack("NN", $parts['L'], $parts['R']); + return pack('NN', $parts['L'], $parts['R']); } /** - * Encrypt a block on data. + * Encrypt left and right halves of a block of data. * - * @param String $L The data to encrypt. - * @param String $R The data to encrypt. + * @param integer $L Left half of the data. + * @param integer $R Right half of the data. * - * @return String The encrypted output. + * @return array A hash, with keys 'L' and 'R', and the encrypted data as + * the values. */ - function _encryptBlock($L, $R) + protected function _encryptBlock($L, $R) { $L ^= $this->p[0]; $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[1]; @@ -407,14 +430,14 @@ class Horde_Cipher_blowfish } /** - * Decrypt a block on data. + * Decrypt a block of data. * - * @param String $block The data to decrypt - * @param optional String $key The key to use + * @param string $block The data to decrypt. + * @param string $key The key to use. * - * @return String the decrypted output + * @return string The decrypted output. */ - function decryptBlock($block, $key = null) + public function decryptBlock($block, $key = null) { if (!is_null($key)) { $this->setKey($key); @@ -451,18 +474,7 @@ class Horde_Cipher_blowfish $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[2]; $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[1]; - $decrypted = pack("NN", $R ^ $this->p[0], $L); - return $decrypted; - } - - /** - * Converts a text key into an array. - * - * @return array The key. - */ - function _formatKey($key) - { - return array_values(unpack('C*', $key)); + return pack("NN", $R ^ $this->p[0], $L); } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4518-ge59827f
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via e59827fa1cffb4b2c1ab43443c31612fb15a867c (commit) via cfe283ab60636144bb16a02d480bad48e48b876a (commit) via 182bc78e0552db9dcc9841b98556bfb8f66904b1 (commit) via b7befd2f0898402e151ef6bedd01b1402979c683 (commit) via c1a1c27d12daa3decb70e65445539ea2b0d834b6 (commit) via cfcbe688fc65eacbe4cc8ca1c56bec6cb3f0f3cb (commit) via 5eb886480fbf8b5f971f3a26a8b03698c3e75b6e (commit) via 130ba10ccf1c34251665f84917db40d89b8b32f1 (commit) via 62ce089984d55bdf70e6ecc8e5c744b6dacc777f (commit) via 3680e72fa648cc913473ef0d83f315e16c04e928 (commit) via d115f618e3336c963148977d7a661eae489ca690 (commit) via dce28d9ca8c3f9938868a375ba582e008b869990 (commit) via 6a2dbd344906b3ca8ae89ad3c6a4da2d7039f869 (commit) via c01664ab04d8dad7d650073e57483cccc9c8437b (commit) via 922e8dc525a136e1329c59dd9b4ab8b27bfd52aa (commit) via 965553bc4a5f8219f8961c004baf6ec53ef190dc (commit) via ef72fedf0c6cb4062b264041edb1217a43577435 (commit) via 1d96db4fb806680a20d55de3d20486d2c98a1948 (commit) via c0bf4758b813c083ad8becb4cf5ff8caf6d7783d (commit) via f550970bb435ee102ce6d8f726af0c1863161aea (commit) via afbe7a23c547d583cc34bfc2a4a5bc0967129f0f (commit) via 1b640396af51cf65eed131960d86948ba53449c4 (commit) via 41217f03b6d5b51e956a852243d49f95cedcc42a (commit) via 52ebeec8877aef34d0b6305a3a5aac72f7abd5e2 (commit) via a827cb2ec21a1842a59b0941ad765fdd71f0f81c (commit) via 7da9021b71f65df9e69fcdb1e788bea5fc83beac (commit) via 4251fdf166dc8cd504861df2543c6ed1466585fd (commit) via 72b7a482b4ed76e5fa0e7218ea3ac4df25899d99 (commit) via e812e4a4f3fce9cdda383d0bf9f1da045a739d13 (commit) via ad18bb9516b6c506f083f856d866deeffe2dc123 (commit) via 510dde255b41372ed1beb82386521937416d9688 (commit) via c8e6ab4be1b3c9179afa4aa852fad0706f21b441 (commit) via f97f52383775fe805a5ffa71dcf7adba098c34e4 (commit) via b9e40eb7b7a291d7362bf67da52769cb2468efc2 (commit) via 46c665d0284eddede15e4df0ba4bfe36763dae14 (commit) via 45bd52841f71833f74c1278cc15549c594f159e9 (commit) via b42881bfa14ef52b578eacf82705ce8c8dec5b42 (commit) via 46c0c892017a9d3f70af4eaab7835249c0536c9d (commit) via 2bcf6c8da6210ed8b476c65836e1cf10d99635d0 (commit) via d57420c91a37254b70da0596f218337aaa0f260b (commit) via b6da4c1de4b5806be9517bb8c9593300729dfa08 (commit) via de65914775c20a5efc7fe45d7fc14afc906984ed (commit) via dd88f592d6857f1292a64a3eddf6104ecafb4413 (commit) via 3cafad3efe7ecb463f2e1e6fd8a2f045f86f23e7 (commit) via 051c33fd5f75de55b261d0bf7860f99fb240f9ab (commit) via 72fb55def67494912c1cdd47fec4dbf3fc3796a1 (commit) from 723e51dfdba31eabb1417e7dd5731680748df414 (commit) - Log ----------------------------------------------------------------- commit e59827fa1cffb4b2c1ab43443c31612fb15a867c Merge: 723e51dfdba31eabb1417e7dd5731680748df414 cfe283ab60636144bb16a02d480bad48e48b876a Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 14:24:25 2011 +0200 Merge remote-tracking branch 'pootle/master' commit cfe283ab60636144bb16a02d480bad48e48b876a Merge: 182bc78e0552db9dcc9841b98556bfb8f66904b1 103aed54d932caf536fcb5f2a782fb754706a997 Author: Pootle server <pootle(a)cihar.com> Date: Tue Jun 21 12:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit 182bc78e0552db9dcc9841b98556bfb8f66904b1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:38:03 2011 +0200 Translation update done using Pootle. commit b7befd2f0898402e151ef6bedd01b1402979c683 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:35:48 2011 +0200 Translation update done using Pootle. commit c1a1c27d12daa3decb70e65445539ea2b0d834b6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:28:54 2011 +0200 Translation update done using Pootle. commit cfcbe688fc65eacbe4cc8ca1c56bec6cb3f0f3cb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:26:35 2011 +0200 Translation update done using Pootle. commit 5eb886480fbf8b5f971f3a26a8b03698c3e75b6e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:24:53 2011 +0200 Translation update done using Pootle. commit 130ba10ccf1c34251665f84917db40d89b8b32f1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:24:33 2011 +0200 Translation update done using Pootle. commit 62ce089984d55bdf70e6ecc8e5c744b6dacc777f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:23:06 2011 +0200 Translation update done using Pootle. commit 3680e72fa648cc913473ef0d83f315e16c04e928 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:21:14 2011 +0200 Translation update done using Pootle. commit d115f618e3336c963148977d7a661eae489ca690 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:17:50 2011 +0200 Translation update done using Pootle. commit dce28d9ca8c3f9938868a375ba582e008b869990 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:17:26 2011 +0200 Translation update done using Pootle. commit 6a2dbd344906b3ca8ae89ad3c6a4da2d7039f869 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:14:41 2011 +0200 Translation update done using Pootle. commit c01664ab04d8dad7d650073e57483cccc9c8437b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:09:40 2011 +0200 Translation update done using Pootle. commit 922e8dc525a136e1329c59dd9b4ab8b27bfd52aa Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:08:14 2011 +0200 Translation update done using Pootle. commit 965553bc4a5f8219f8961c004baf6ec53ef190dc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:05:33 2011 +0200 Translation update done using Pootle. commit ef72fedf0c6cb4062b264041edb1217a43577435 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:04:24 2011 +0200 Translation update done using Pootle. commit 1d96db4fb806680a20d55de3d20486d2c98a1948 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:00:54 2011 +0200 Translation update done using Pootle. commit c0bf4758b813c083ad8becb4cf5ff8caf6d7783d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 12:00:44 2011 +0200 Translation update done using Pootle. commit f550970bb435ee102ce6d8f726af0c1863161aea Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:58:42 2011 +0200 Translation update done using Pootle. commit afbe7a23c547d583cc34bfc2a4a5bc0967129f0f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:57:56 2011 +0200 Translation update done using Pootle. commit 1b640396af51cf65eed131960d86948ba53449c4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:57:34 2011 +0200 Translation update done using Pootle. commit 41217f03b6d5b51e956a852243d49f95cedcc42a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:57:15 2011 +0200 Translation update done using Pootle. commit 52ebeec8877aef34d0b6305a3a5aac72f7abd5e2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:55:57 2011 +0200 Translation update done using Pootle. commit a827cb2ec21a1842a59b0941ad765fdd71f0f81c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:55:21 2011 +0200 Translation update done using Pootle. commit 7da9021b71f65df9e69fcdb1e788bea5fc83beac Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:54:03 2011 +0200 Translation update done using Pootle. commit 4251fdf166dc8cd504861df2543c6ed1466585fd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:52:32 2011 +0200 Translation update done using Pootle. commit 72b7a482b4ed76e5fa0e7218ea3ac4df25899d99 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:50:17 2011 +0200 Translation update done using Pootle. commit e812e4a4f3fce9cdda383d0bf9f1da045a739d13 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:50:07 2011 +0200 Translation update done using Pootle. commit ad18bb9516b6c506f083f856d866deeffe2dc123 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:49:25 2011 +0200 Translation update done using Pootle. commit 510dde255b41372ed1beb82386521937416d9688 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:42:27 2011 +0200 Translation update done using Pootle. commit c8e6ab4be1b3c9179afa4aa852fad0706f21b441 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:41:44 2011 +0200 Translation update done using Pootle. commit f97f52383775fe805a5ffa71dcf7adba098c34e4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:39:02 2011 +0200 Translation update done using Pootle. commit b9e40eb7b7a291d7362bf67da52769cb2468efc2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:38:14 2011 +0200 Translation update done using Pootle. commit 46c665d0284eddede15e4df0ba4bfe36763dae14 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:38:10 2011 +0200 Translation update done using Pootle. commit 45bd52841f71833f74c1278cc15549c594f159e9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:38:01 2011 +0200 Translation update done using Pootle. commit b42881bfa14ef52b578eacf82705ce8c8dec5b42 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:37:48 2011 +0200 Translation update done using Pootle. commit 46c0c892017a9d3f70af4eaab7835249c0536c9d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:37:39 2011 +0200 Translation update done using Pootle. commit 2bcf6c8da6210ed8b476c65836e1cf10d99635d0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:36:52 2011 +0200 Translation update done using Pootle. commit d57420c91a37254b70da0596f218337aaa0f260b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:36:45 2011 +0200 Translation update done using Pootle. commit b6da4c1de4b5806be9517bb8c9593300729dfa08 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:36:22 2011 +0200 Translation update done using Pootle. commit de65914775c20a5efc7fe45d7fc14afc906984ed Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:35:43 2011 +0200 Translation update done using Pootle. commit dd88f592d6857f1292a64a3eddf6104ecafb4413 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:35:16 2011 +0200 Translation update done using Pootle. commit 3cafad3efe7ecb463f2e1e6fd8a2f045f86f23e7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:34:57 2011 +0200 Translation update done using Pootle. commit 051c33fd5f75de55b261d0bf7860f99fb240f9ab Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:34:35 2011 +0200 Translation update done using Pootle. commit 72fb55def67494912c1cdd47fec4dbf3fc3796a1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 21 11:30:03 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 114 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 49 insertions(+), 65 deletions(-) diff --git a/po/ja.po b/po/ja.po index 81fc96e..6ef6ebb 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-21 09:16+0200\n" -"PO-Revision-Date: 2011-06-18 12:09+0200\n" +"PO-Revision-Date: 2011-06-21 12:38+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -410,7 +410,7 @@ msgstr[0] "%s テーブル" #: db_qbe.php:41 msgid "You have to choose at least one column to display" -msgstr "最低ひとつは表示するカラムを選択してください" +msgstr "最低 1 つは表示するカラムを選択してください" #: db_qbe.php:186 msgid "Switch to" @@ -508,10 +508,10 @@ msgid "%s row(s) affected by the last statement inside the procedure" msgstr "" #: db_routines.php:165 -#, fuzzy, php-format +#, php-format #| msgid "Allows executing stored routines." msgid "Execution results of routine %s" -msgstr "ストアドルーチンの実行を許可する" +msgstr "ルーチン %s の実行結果" #: db_routines.php:185 libraries/import.lib.php:153 sql.php:678 #: tbl_change.php:180 tbl_get_field.php:34 @@ -530,32 +530,31 @@ msgid "MySQL said: " msgstr "MySQLのメッセージ: " #: db_routines.php:208 db_routines.php:263 db_routines.php:402 -#, fuzzy #| msgid "Error in Processing Request" msgid "Error in processing request" msgstr "要求処理中でのエラー" #: db_routines.php:209 db_routines.php:264 db_routines.php:403 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No routine with name %s found in database %s" -msgstr "このデータベースにはテーブルがありません" +msgstr "データベース %2$s に %1$s という名前のルーチンはありません" #: db_routines.php:230 db_routines.php:234 msgid "Execute routine" -msgstr "" +msgstr "ルーチンを実行する" #: db_routines.php:254 db_routines.php:258 -#, fuzzy, php-format +#, php-format #| msgid "Export defaults" msgid "Export of routine %s" -msgstr "エクスポートのデフォルト" +msgstr "ルーチン %s のエクスポート" #: db_routines.php:283 libraries/db_routines.lib.php:960 -#, fuzzy, php-format +#, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid routine type: \"%s\"" -msgstr "サーバのインデックスが不正です: \"%s\"" +msgstr "ルーチンタイプが不正です: \"%s\"" #: db_routines.php:304 msgid "Sorry, we failed to restore the dropped routine." @@ -566,32 +565,30 @@ msgid "The backed up query was:" msgstr "" #: db_routines.php:309 -#, fuzzy, php-format +#, php-format #| msgid "Column %s has been dropped" msgid "Routine %1$s has been modified." -msgstr "カラム %s を削除しました" +msgstr "ルーチン %1$s を変更しました。" #: db_routines.php:322 -#, fuzzy, php-format +#, php-format #| msgid "Table %1$s has been created." msgid "Routine %1$s has been created." -msgstr "テーブル %1$s を作成しました。" +msgstr "ルーチン %1$s を作成しました。" #: db_routines.php:330 msgid "<b>One or more errors have occured while processing your request:</b>" msgstr "" #: db_routines.php:374 -#, fuzzy #| msgid "Create relation" msgid "Create routine" -msgstr "リレーションを作成" +msgstr "ルーチンを作成する" #: db_routines.php:378 -#, fuzzy #| msgid "Edit mode" msgid "Edit routine" -msgstr "編集モード" +msgstr "ルーチンを編集する" #: db_routines.php:429 msgid "" @@ -1102,10 +1099,9 @@ msgstr "数値ではありません!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:49 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "ログファイル数" +msgstr "数量" #: js/messages.php:52 msgid "The host name is empty!" @@ -1191,19 +1187,19 @@ msgstr "." #: js/messages.php:78 msgid "KiB sent since last refresh" -msgstr "" +msgstr "更新間隔中の送信量 (単位：KiB)" #: js/messages.php:79 msgid "KiB received since last refresh" -msgstr "" +msgstr "更新間隔中の受信量 (単位：KiB)" #: js/messages.php:80 msgid "Server traffic (in KiB)" -msgstr "サーバのトラフィック（単位：KiB）" +msgstr "サーバのトラフィック (単位：KiB)" #: js/messages.php:81 msgid "Connections since last refresh" -msgstr "" +msgstr "更新間隔中の接続数" #: js/messages.php:82 server_status.php:788 msgid "Processes" @@ -1215,13 +1211,12 @@ msgstr "接続／プロセス" #: js/messages.php:84 msgid "Issued queries since last refresh" -msgstr "" +msgstr "更新間隔中に発行されたクエリ数" #: js/messages.php:85 -#, fuzzy #| msgid "SQL queries" msgid "Issued queries" -msgstr "SQL クエリ" +msgstr "発行されたクエリ数" #: js/messages.php:87 server_status.php:402 msgid "Query statistics" @@ -1278,7 +1273,7 @@ msgstr "文字セットの変更中" #: js/messages.php:106 msgid "Table must have at least one column" -msgstr "テーブルには最低ひとつのカラムが必要です" +msgstr "テーブルには最低 1 つのカラムが必要です" #: js/messages.php:107 msgid "Create Table" @@ -1313,10 +1308,9 @@ msgid "The definition of a stored function must contain a RETURN statement!" msgstr "" #: js/messages.php:123 -#, fuzzy #| msgid "Missing value in the form!" msgid "Value too long in the form!" -msgstr "フォームに入力されていない値があります!" +msgstr "フォームに長すぎる値があります！" #: js/messages.php:126 msgid "" @@ -4780,16 +4774,14 @@ msgid "Triggers" msgstr "トリガ" #: libraries/db_routines.lib.php:659 -#, fuzzy #| msgid "Details..." msgid "Details" -msgstr "詳細..." +msgstr "詳細" #: libraries/db_routines.lib.php:662 -#, fuzzy #| msgid "Routines" msgid "Routine name" -msgstr "ルーチン" +msgstr "ルーチン名" #: libraries/db_routines.lib.php:679 #, fuzzy, php-format @@ -4799,7 +4791,7 @@ msgstr "変更" #: libraries/db_routines.lib.php:684 msgid "Parameters" -msgstr "" +msgstr "パラメータ" #: libraries/db_routines.lib.php:689 #, fuzzy @@ -4830,10 +4822,9 @@ msgid "Options" msgstr "オプション" #: libraries/db_routines.lib.php:707 -#, fuzzy #| msgid "Add prefix" msgid "Add parameter" -msgstr "追加する接頭辞" +msgstr "パラメータを追加する" #: libraries/db_routines.lib.php:710 #, fuzzy @@ -4882,10 +4873,9 @@ msgid "SQL data access" msgstr "" #: libraries/db_routines.lib.php:839 libraries/db_routines.lib.php:842 -#, fuzzy #| msgid "Routines" msgid "Routine parameters" -msgstr "ルーチン" +msgstr "ルーチンのパラメータ" #: libraries/db_routines.lib.php:849 tbl_change.php:284 tbl_change.php:322 msgid "Function" @@ -4900,7 +4890,7 @@ msgstr "値" #: libraries/db_routines.lib.php:965 msgid "You must provide a routine name" -msgstr "" +msgstr "ルーチン名を入力する必要があります" #: libraries/db_routines.lib.php:984 #, php-format @@ -4922,22 +4912,19 @@ msgid "You must provide a routine definition." msgstr "" #: libraries/db_routines.lib.php:1209 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no routines to display." -msgstr "アップロードファイルがありません" +msgstr "表示できるルーチンがありません" #: libraries/db_routines.lib.php:1253 -#, fuzzy #| msgid "Add index" msgid "Add routine" -msgstr "インデックスを追加する" +msgstr "ルーチンを追加する" #: libraries/db_routines.lib.php:1256 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create a new routine" -msgstr "特権不足でアクセスできません!" +msgstr "ルーチンを作成する特権がありません" #: libraries/db_structure.lib.php:48 libraries/display_tbl.lib.php:2121 msgid "" @@ -5404,27 +5391,26 @@ msgid "Link not found" msgstr "リンク先が見つかりません" #: libraries/display_triggers.inc.php:35 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of trigger %s" -msgstr "内容をエクスポートする" +msgstr "トリガ %s をエクスポートする" #: libraries/display_triggers.inc.php:39 #, php-format msgid "Export of trigger \"%s\"" -msgstr "" +msgstr "トリガ \"%s\" をエクスポートする" #: libraries/display_triggers.inc.php:47 -#, fuzzy, php-format +#, php-format #| msgid "No valid image path for theme %s found!" msgid "No trigger with name %s found" -msgstr "テーマ %s の画像パスが無効です!" +msgstr "%s という名前のトリガが見つかりません" #: libraries/display_triggers.inc.php:64 libraries/display_triggers.inc.php:66 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no triggers to display." -msgstr "アップロードファイルがありません" +msgstr "表示できるトリガがありません" #: libraries/display_triggers.inc.php:77 server_status.php:794 sql.php:936 msgid "Time" @@ -5435,10 +5421,9 @@ msgid "Event" msgstr "イベント" #: libraries/display_triggers.inc.php:120 -#, fuzzy #| msgid "Add a new server" msgid "Add a new Trigger" -msgstr "新しいサーバの追加" +msgstr "新しいトリガを追加する" #: libraries/engines/bdb.lib.php:20 main.php:211 msgid "Version information" @@ -10106,7 +10091,7 @@ msgstr "(1 回)" #: tbl_operations.php:293 msgid "Move table to (database<b>.</b>table):" -msgstr "テーブルを (データベース)<b>.</b>(テーブル) へ移動する:" +msgstr "テーブルを (データベース)<b>.</b>(テーブル) へ移動する" #: tbl_operations.php:351 msgid "Table options" @@ -10118,7 +10103,7 @@ msgstr "リネーム後のテーブル名" #: tbl_operations.php:531 msgid "Copy table to (database<b>.</b>table):" -msgstr "テーブルを(database<b>.</b>table)にコピーする:" +msgstr "テーブルを (データベース)<b>.</b>(テーブル) にコピーする" #: tbl_operations.php:578 msgid "Switch to copied table" @@ -10139,7 +10124,7 @@ msgstr "テーブル %s をフラッシュしました" #: tbl_operations.php:668 msgid "Flush the table (FLUSH)" -msgstr "テーブルをフラッシュする(FLUSH)" +msgstr "テーブルをフラッシュする (FLUSH)" #: tbl_operations.php:677 msgid "Delete data or table" @@ -10147,11 +10132,11 @@ msgstr "データまたはテーブルの削除" #: tbl_operations.php:692 msgid "Empty the table (TRUNCATE)" -msgstr "テーブルを空にする(TRUNCATE)" +msgstr "テーブルを空にする (TRUNCATE)" #: tbl_operations.php:712 msgid "Delete the table (DROP)" -msgstr "テーブルを削除する(DROP)" +msgstr "テーブルを削除する (DROP)" #: tbl_operations.php:733 msgid "Partition maintenance" @@ -10274,7 +10259,7 @@ msgstr "表示順:" #: tbl_structure.php:158 tbl_structure.php:163 tbl_structure.php:611 msgid "Spatial" -msgstr "" +msgstr "空間" #: tbl_structure.php:165 tbl_structure.php:169 msgid "Browse distinct values" @@ -10293,10 +10278,9 @@ msgid "Add unique index" msgstr "ユニークインデックスを追加する" #: tbl_structure.php:176 tbl_structure.php:177 -#, fuzzy #| msgid "Add index" msgid "Add SPATIAL index" -msgstr "インデックスを追加する" +msgstr "空間インデックスを追加する" #: tbl_structure.php:178 tbl_structure.php:179 msgid "Add FULLTEXT index" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4472-g723e51d
by Marc Delisle 21 Jun '11

21 Jun '11

The branch, master has been updated via 723e51dfdba31eabb1417e7dd5731680748df414 (commit) via ede177c577668a712e0d89a8c895c1d0c200f42f (commit) via 238ceb8f98861482d153b1c38a8e46ca07f2993c (commit) via c5d1aae6f6565a69b65546ceab6113ede41c61da (commit) via 24a257ffcea338546613bc60c6c0b6f98c99389e (commit) via 21b84f5c882cc1ac267d380f042218f184ce1781 (commit) via 6e65d3d7fc04653be59e133acfe5f10f5eb6cbc5 (commit) via 7e5fddf4ae2893cc08428b3c3f37241ff85d2457 (commit) from 103aed54d932caf536fcb5f2a782fb754706a997 (commit) - Log ----------------------------------------------------------------- commit 723e51dfdba31eabb1417e7dd5731680748df414 Merge: 103aed54d932caf536fcb5f2a782fb754706a997 ede177c577668a712e0d89a8c895c1d0c200f42f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 21 08:13:41 2011 -0400 Merge commit 'ede177c577668a712e0d89a8c895c1d0c200f42f' commit ede177c577668a712e0d89a8c895c1d0c200f42f Merge: 238ceb8f98861482d153b1c38a8e46ca07f2993c 21b84f5c882cc1ac267d380f042218f184ce1781 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue Jun 21 12:37:59 2011 +0700 Merge branch 'recent' into aris commit 238ceb8f98861482d153b1c38a8e46ca07f2993c Merge: 6e65d3d7fc04653be59e133acfe5f10f5eb6cbc5 c5d1aae6f6565a69b65546ceab6113ede41c61da Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue Jun 21 12:37:55 2011 +0700 Merge branch 'colresize' into aris commit c5d1aae6f6565a69b65546ceab6113ede41c61da Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue Jun 21 12:37:20 2011 +0700 Column reordering: better placement of code for displaying remembered column order commit 24a257ffcea338546613bc60c6c0b6f98c99389e Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue Jun 21 12:25:31 2011 +0700 Column reordering: add checking for different server commit 21b84f5c882cc1ac267d380f042218f184ce1781 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue Jun 21 11:43:32 2011 +0700 Recent tables: better checking of different server commit 6e65d3d7fc04653be59e133acfe5f10f5eb6cbc5 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue Jun 21 10:54:48 2011 +0700 Fix bug: Recent tables list doesn't honor current server commit 7e5fddf4ae2893cc08428b3c3f37241ff85d2457 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Mon Jun 20 13:21:07 2011 +0700 Recent table: Add support for browser without javascript ----------------------------------------------------------------------- Summary of changes: index.php | 2 +- js/makegrid.js | 1 + libraries/RecentTable.class.php | 11 ++++++----- libraries/Table.class.php | 7 ++++--- libraries/common.inc.php | 19 +++++++++++++++---- libraries/display_tbl.lib.php | 16 ++++++++-------- navigation.php | 12 +++++++++--- 7 files changed, 44 insertions(+), 24 deletions(-) diff --git a/index.php b/index.php index 36a6118..070099b 100644 --- a/index.php +++ b/index.php @@ -73,7 +73,7 @@ if (! strlen($GLOBALS['db'])) { } else { $_GET['db'] = $GLOBALS['db']; $_GET['table'] = $GLOBALS['table']; - $main_target = $GLOBALS['cfg']['DefaultTabTable']; + $main_target = isset($GLOBALS['goto']) ? $GLOBALS['goto'] : $GLOBALS['cfg']['DefaultTabTable']; } $url_query = PMA_generate_common_url($_GET); diff --git a/js/makegrid.js b/js/makegrid.js index 80a62ad..6e16db9 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -314,6 +314,7 @@ db: window.parent.db, table: window.parent.table, token: window.parent.token, + server: window.parent.server, set_col_order: true, col_order: this.colOrder.toString(), table_create_time: this.tableCreateTime diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index b42a0aa..4e5bd27 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -46,11 +46,12 @@ class PMA_RecentTable $this->pma_table = PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) .".". PMA_backquote($GLOBALS['cfg']['Server']['recent']); } - if (! isset($_SESSION['tmp_user_values']['recent_tables'])) { - $_SESSION['tmp_user_values']['recent_tables'] = + $server_id = $GLOBALS['server']; + if (! isset($_SESSION['tmp_user_values']['recent_tables'][$server_id])) { + $_SESSION['tmp_user_values']['recent_tables'][$server_id] = isset($this->pma_table) ? $this->getFromDb() : array(); } - $this->tables =& $_SESSION['tmp_user_values']['recent_tables']; + $this->tables =& $_SESSION['tmp_user_values']['recent_tables'][$server_id]; } /** @@ -163,9 +164,9 @@ class PMA_RecentTable */ public function getHtmlSelect() { - $html = '<input type="hidden" id="LeftDefaultTabTable" value="' . + $html = '<input type="hidden" name="goto" id="LeftDefaultTabTable" value="' . $GLOBALS['cfg']['LeftDefaultTabTable'] . '" />'; - $html .= '<select id="recentTable">'; + $html .= '<select name="table" id="recentTable">'; $html .= $this->getHtmlSelectOption(); $html .= '</select>'; diff --git a/libraries/Table.class.php b/libraries/Table.class.php index cfc28d6..cec5b66 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1286,15 +1286,16 @@ class PMA_Table */ protected function loadUiPrefs() { + $server_id = $GLOBALS['server']; // set session variable if it's still undefined - if (! isset($_SESSION['tmp_user_values']['table_uiprefs'][$this->db_name][$this->name])) { - $_SESSION['tmp_user_values']['table_uiprefs'][$this->db_name][$this->name] = + if (! isset($_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name][$this->name])) { + $_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name][$this->name] = // check whether we can get from pmadb (strlen($GLOBALS['cfg']['Server']['pmadb']) && strlen($GLOBALS['cfg']['Server']['table_uiprefs'])) ? $this->getUiPrefsFromDb() : array(); } - $this->uiprefs =& $_SESSION['tmp_user_values']['table_uiprefs'][$this->db_name][$this->name]; + $this->uiprefs =& $_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name][$this->name]; } /** diff --git a/libraries/common.inc.php b/libraries/common.inc.php index a0b8628..0887db8 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -509,10 +509,21 @@ if (PMA_isValid($_REQUEST['db'])) { */ $GLOBALS['table'] = ''; if (PMA_isValid($_REQUEST['table'])) { - // can we strip tags from this? - // only \ and / is not allowed in table names for MySQL - $GLOBALS['table'] = $_REQUEST['table']; - $GLOBALS['url_params']['table'] = $GLOBALS['table']; + // check if specified table contain db name + if (strpos($_REQUEST['table'], '.')) { + $splitted = explode('.', $_REQUEST['table']); + if (count($splitted) == 2) { // make sure the format is "db.table" + $GLOBALS['db'] = $splitted[0]; + $GLOBALS['url_params']['db'] = $GLOBALS['db']; + $GLOBALS['table'] = $splitted[1]; + $GLOBALS['url_params']['table'] = $GLOBALS['table']; + } + } else { + // can we strip tags from this? + // only \ and / is not allowed in table names for MySQL + $GLOBALS['table'] = $_REQUEST['table']; + $GLOBALS['url_params']['table'] = $GLOBALS['table']; + } } /** diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d41e245..85eac32 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1193,6 +1193,14 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // name of the class added to all inline editable elements $inline_edit_class = 'inline_edit'; + // prepare to get the column order, if available + if (PMA_isSelect()) { + $pmatable = new PMA_Table($GLOBALS['table'], $GLOBALS['db']); + $col_order = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_ORDER); + } else { + $col_order = false; + } + // Correction University of Virginia 19991216 in the while below // Previous code assumed that all tables have keys, specifically that // the phpMyAdmin GUI should support row delete/edit only for such @@ -1354,14 +1362,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // 2. Displays the rows' values - if (PMA_isSelect()) { - // prepare to get the column order, if available - $pmatable = new PMA_Table($GLOBALS['table'], $GLOBALS['db']); - $col_order = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_ORDER); - } else { - $col_order = false; - } - for ($j = 0; $j < $fields_cnt; ++$j) { // assign $i with appropriate column order $i = $col_order ? $col_order[$j] : $j; diff --git a/navigation.php b/navigation.php index af3f138..b63f775 100644 --- a/navigation.php +++ b/navigation.php @@ -194,9 +194,15 @@ require './libraries/navigation_header.inc.php'; // display recently used tables if ($GLOBALS['cfg']['LeftRecentTable'] > 0) { - echo '<div id="recentTableList">'; - echo PMA_RecentTable::getInstance()->getHtmlSelect(); - echo '</div>'; + echo '<div id="recentTableList">' . "\n" + .'<form method="post" action="index.php" target="_parent">' . "\n" + .PMA_generate_common_hidden_inputs() . "\n" + .PMA_RecentTable::getInstance()->getHtmlSelect() + .'<noscript>' . "\n" + .'<input type="submit" name="Go" value="' . __('Go') . '" />' . "\n" + .'</noscript>' . "\n" + .'</form>' . "\n" + .'</div>' . "\n"; } if (! $GLOBALS['server']) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4464-g103aed5
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via 103aed54d932caf536fcb5f2a782fb754706a997 (commit) via 341dc1296f8e3fe6b80a9b5f5e752cfd868bdb10 (commit) via dc6c1e8b5cc0d2d116e000cba7752f60be248ffd (commit) via 3336bf363625d3512da5f32d5d9f276a64dae02b (commit) via cb043f4365be9b8edec63188d339eda2154401fc (commit) via 7ecb1abaa49142a7e0b3f6d6e37cb4855e17ddf9 (commit) via a8caf74fdafdce6b65a411635593f2347ae984ae (commit) from ffc01b199aa99744a4b21d7b3bdfb24c593bb314 (commit) - Log ----------------------------------------------------------------- commit 103aed54d932caf536fcb5f2a782fb754706a997 Merge: ffc01b199aa99744a4b21d7b3bdfb24c593bb314 341dc1296f8e3fe6b80a9b5f5e752cfd868bdb10 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 12:10:29 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: enum_editor.php | 4 ++-- import.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/enum_editor.php b/enum_editor.php index 586e85e..ab86d73 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -53,11 +53,11 @@ require_once './libraries/header_meta_style.inc.php'; ?> </div> <p> - <a href="enum_editor.php?token=<?php echo urlencode($_GET['token']); ?>&field=<?php echo urlencode($_GET['field']); ?>&extra_fields=<?php echo $_GET['extra_fields'] + 1; ?>&values=<?php echo urlencode(join(",", $values)); ?>"> + <a href="enum_editor.php<?php echo PMA_generate_common_url(array('field' => $_GET['field'], 'extra_fields' => $_GET['extra_fields'] + 1, 'values' => join(',', $values))); ?>"> <?php echo __('+ Restart insertion and add a new value'); ?> </a> </p> - <input type="hidden" name="token" value="<?php echo htmlspecialchars($_GET['token']); ?>" /> + <?php echo PMA_generate_common_hidden_inputs(); ?> <input type="hidden" name="field" value="<?php echo htmlspecialchars($_GET['field']); ?>" /> <input type="hidden" name="num_fields" value="<?php echo $total_fields; ?>" /> <input type="submit" value="<?php echo __('Go'); ?>" /> diff --git a/import.php b/import.php index cd56bc2..fea35c5 100644 --- a/import.php +++ b/import.php @@ -108,7 +108,7 @@ if ($import_type == 'table') { } $err_url = $goto . '?' . $common - . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . urlencode($table) : ''); + . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . htmlspecialchars($table) : ''); $_SESSION['Import_message']['go_back_url'] = $err_url; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-5-g341dc12
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, QA_3_4 has been updated via 341dc1296f8e3fe6b80a9b5f5e752cfd868bdb10 (commit) via dc6c1e8b5cc0d2d116e000cba7752f60be248ffd (commit) from 3336bf363625d3512da5f32d5d9f276a64dae02b (commit) - Log ----------------------------------------------------------------- commit 341dc1296f8e3fe6b80a9b5f5e752cfd868bdb10 Merge: 3336bf363625d3512da5f32d5d9f276a64dae02b dc6c1e8b5cc0d2d116e000cba7752f60be248ffd Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 12:08:54 2011 +0200 Merge branch 'MAINT_3_4_3' into QA_3_4 ----------------------------------------------------------------------- Summary of changes: import.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/import.php b/import.php index 78e5ffd..d706b60 100644 --- a/import.php +++ b/import.php @@ -108,7 +108,7 @@ if ($import_type == 'table') { } $err_url = $goto . '?' . $common - . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . urlencode($table) : ''); + . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . htmlspecialchars($table) : ''); $_SESSION['Import_message']['go_back_url'] = $err_url; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_3, updated. RELEASE_3_4_3RC1-2-gdc6c1e8
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, MAINT_3_4_3 has been updated via dc6c1e8b5cc0d2d116e000cba7752f60be248ffd (commit) from cb043f4365be9b8edec63188d339eda2154401fc (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: import.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/import.php b/import.php index 78e5ffd..d706b60 100644 --- a/import.php +++ b/import.php @@ -108,7 +108,7 @@ if ($import_type == 'table') { } $err_url = $goto . '?' . $common - . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . urlencode($table) : ''); + . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . htmlspecialchars($table) : ''); $_SESSION['Import_message']['go_back_url'] = $err_url; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-3-g3336bf3
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, QA_3_4 has been updated via 3336bf363625d3512da5f32d5d9f276a64dae02b (commit) via cb043f4365be9b8edec63188d339eda2154401fc (commit) via a8caf74fdafdce6b65a411635593f2347ae984ae (commit) from 7ecb1abaa49142a7e0b3f6d6e37cb4855e17ddf9 (commit) - Log ----------------------------------------------------------------- commit 3336bf363625d3512da5f32d5d9f276a64dae02b Merge: 7ecb1abaa49142a7e0b3f6d6e37cb4855e17ddf9 cb043f4365be9b8edec63188d339eda2154401fc Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 12:05:16 2011 +0200 Merge branch 'MAINT_3_4_3' into QA_3_4 ----------------------------------------------------------------------- Summary of changes: enum_editor.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/enum_editor.php b/enum_editor.php index 586e85e..ab86d73 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -53,11 +53,11 @@ require_once './libraries/header_meta_style.inc.php'; ?> </div> <p> - <a href="enum_editor.php?token=<?php echo urlencode($_GET['token']); ?>&field=<?php echo urlencode($_GET['field']); ?>&extra_fields=<?php echo $_GET['extra_fields'] + 1; ?>&values=<?php echo urlencode(join(",", $values)); ?>"> + <a href="enum_editor.php<?php echo PMA_generate_common_url(array('field' => $_GET['field'], 'extra_fields' => $_GET['extra_fields'] + 1, 'values' => join(',', $values))); ?>"> <?php echo __('+ Restart insertion and add a new value'); ?> </a> </p> - <input type="hidden" name="token" value="<?php echo htmlspecialchars($_GET['token']); ?>" /> + <?php echo PMA_generate_common_hidden_inputs(); ?> <input type="hidden" name="field" value="<?php echo htmlspecialchars($_GET['field']); ?>" /> <input type="hidden" name="num_fields" value="<?php echo $total_fields; ?>" /> <input type="submit" value="<?php echo __('Go'); ?>" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_3, updated. RELEASE_3_4_3RC1-1-gcb043f4
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, MAINT_3_4_3 has been updated via cb043f4365be9b8edec63188d339eda2154401fc (commit) from a8caf74fdafdce6b65a411635593f2347ae984ae (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: enum_editor.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/enum_editor.php b/enum_editor.php index 586e85e..ab86d73 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -53,11 +53,11 @@ require_once './libraries/header_meta_style.inc.php'; ?> </div> <p> - <a href="enum_editor.php?token=<?php echo urlencode($_GET['token']); ?>&field=<?php echo urlencode($_GET['field']); ?>&extra_fields=<?php echo $_GET['extra_fields'] + 1; ?>&values=<?php echo urlencode(join(",", $values)); ?>"> + <a href="enum_editor.php<?php echo PMA_generate_common_url(array('field' => $_GET['field'], 'extra_fields' => $_GET['extra_fields'] + 1, 'values' => join(',', $values))); ?>"> <?php echo __('+ Restart insertion and add a new value'); ?> </a> </p> - <input type="hidden" name="token" value="<?php echo htmlspecialchars($_GET['token']); ?>" /> + <?php echo PMA_generate_common_hidden_inputs(); ?> <input type="hidden" name="field" value="<?php echo htmlspecialchars($_GET['field']); ?>" /> <input type="hidden" name="num_fields" value="<?php echo $total_fields; ?>" /> <input type="submit" value="<?php echo __('Go'); ?>" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 47f8b5b5dd42059dd6e0a723355ba7532121f5a0
by Michal Čihař 21 Jun '11

21 Jun '11

The branch, master has been updated via 47f8b5b5dd42059dd6e0a723355ba7532121f5a0 (commit) from 0b5a42cf26e3bbffba51d8c6c2222e10e2f755ec (commit) - Log ----------------------------------------------------------------- commit 47f8b5b5dd42059dd6e0a723355ba7532121f5a0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jun 21 11:52:33 2011 +0200 Update piwik tracking code ----------------------------------------------------------------------- Summary of changes: theme/index.html.tmpl | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/theme/index.html.tmpl b/theme/index.html.tmpl index 63e38e1..66b1035 100644 --- a/theme/index.html.tmpl +++ b/theme/index.html.tmpl @@ -221,12 +221,12 @@ var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.cihar document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); </script><script type="text/javascript"> try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1); - piwikTracker.trackPageView(); - piwikTracker.enableLinkTracking(); +var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1); +piwikTracker.trackPageView(); +piwikTracker.enableLinkTracking(); } catch( err ) {} -</script> - +</script><noscript><p><img src="http://stats.cihar.com/piwik.php?idsite=1" style="border:0" alt="" /></p></noscript> + </body> </html> hooks/post-receive -- Planet phpMyAdmin

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2011