- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-7363-gbfe8c50
by Michal Čihař 07 Jul '11

07 Jul '11

The branch, master has been updated via bfe8c502de66f518ab10ca1b4044ad49ba299c6f (commit) via 7964ea9ad57af15a2dd105ce58b32958d19a4c5b (commit) via 394c7c4c1843fb7f16fd03285d5dc5feffe2759f (commit) via 2a6eb571dcacbb2b7ddd45ecd0ac6ea3e8fc4ccf (commit) via dc7c6d70c4b32ce27bd5fba3877d8fcc3e12f528 (commit) via 96dc32c94bb50fc92af061ff5b92f2519048b61e (commit) via 9d2d16fff2c2f1557d3e874eb6d49ff906600cfe (commit) via 5fa74308c2dab8d715de49d834ae89ea64de476d (commit) via 2b7057d0ebc01ccdd6d7ba3a9224d20d7350603e (commit) via c0d56d5a7a3938fe56628cbafe2bdfe7abc2e72f (commit) via 17941aacc932ad46ceedfd07348136063011a972 (commit) via cc8d8e3059eee8112a154b7895b38124e88dd2bd (commit) via a015550a6164f91a02ce94c092533e58c5d1b104 (commit) via 6b09a506882864375f91918c1738c8c1cd91e874 (commit) via 5794fb83c0587fda1f332ef0f7d0eec22cfd9ba7 (commit) via 3104ecf1ed4184173c17fd9cbef4e4cead2bf2c5 (commit) via e7990557dda47309caafcb810d61411db8755956 (commit) via aceb36c4716554f9d35e3e9df62627b57e81f243 (commit) via 8b2881fd8a1dc154084ff761a85a5a85586f28cb (commit) via bdcfca9259cfaca3a5dbe087b09194668582d4f6 (commit) via de3817ad84f3c6721ac85f7738b5d478e951d210 (commit) via 16a16ad7e3c91ed2d44f787e58e1974a78b007dd (commit) via d74bd06400b19ece3f6e770e5192bcde024bb2d2 (commit) via efaea4c2a9da1dd2f3b5ea30cc9fa76d2d7079cd (commit) via 994b435b0057432d9804348ca77357fa189917eb (commit) via ebb98ba36a7c54697c03cf655f4cb47ca5489010 (commit) via 0a640962947d731b6b14c469eb87370e0b279dc3 (commit) via c7c3612ed08c44ad500b5cdd58857ec6dd671ec6 (commit) via 5092c0f003a40cbbbb47fa92c47bf741f1d81866 (commit) via a17457bed2dfdf0093d87de4185a5d92f0baaf83 (commit) via cf16dff3caec5973f89cc23196b82ed3153c3b4b (commit) via e5f68d7fc030964959e2e5c7685eee4d4247aafd (commit) via 7c9403d4dfa44569613c1257455efd6784e05d9a (commit) via 6a8c28aec6007d3b0d1c4a50ed9715e41e7d3887 (commit) via 1070bc01f6ee04e4d51eed362f68680e715b7c54 (commit) via 717d50c214b9f85f5cda0d49f3c3d0cb75cc55b3 (commit) via 5235574a5b1e2a8b08b21921a88d00c63d7242a9 (commit) via 681b33f005e3fe529297d98cfb58623a91d26e4c (commit) via 1f335069dbcd40668799e8d05bb484e74bb55e74 (commit) via c17ee2b99bae15ea3c1f1f9aa7e1e7103a276ebe (commit) via c3966c59fea128f8f95ebaa68c52f96d461b329e (commit) via b5c795beb40f71b858d1a8971ed43adc9e294b8b (commit) via 530de174dc5c572d6f1c54e0e133631094a449df (commit) via f27f0f936c4d751da667a021444bfaa520cc3c6e (commit) via efd5e9a61c3d53b741943b1d5b68f4a3ee1c406a (commit) via 371c481e1e7a52c1f76eeb044d9f56d94839d7ae (commit) via ca4b6613d37c32ec63d668264d5670bec292f35f (commit) via 3f761b36de3044f1ec8f8a1162160ec327d073fa (commit) via 2382f2cbd133ffef0ea0a4caa51de50a12c3f761 (commit) via 1824dfcd84cfb530a73dc858144d02368a43917a (commit) via 7322ce3f1eae6ad245b94e9ef762c2cd7c1f06d2 (commit) via 16255508087df433ff7c5bc4fb2230126fbbd0d0 (commit) via 7f42b4edfbc17574b6309940fd262643af723846 (commit) via ddad0aa76759973bd61b5eeb3af91d42adca0da3 (commit) via d9973839d74e57c7640c75bb4a757f162a26bb58 (commit) via e535ca62064d8b2045e23af246f4d6b439dd2ae4 (commit) via 2344fa0d0cd903133a3b09e3762f030a765ce3de (commit) via 68a32cdd997b9f5003cbd3b032cec9c8e16dcc32 (commit) via f4e2eb0b505e61a77726114907843dfe16c346d4 (commit) via e1f331deb827bd4f091be96ca1965ca437dfd255 (commit) via 5bc63c9045a5f6997895bd7c33e439466c67697a (commit) via 31a5c5d230e3fc5c59e5487994c7653fc1801b6a (commit) via 0deff4362ed55b8cd525e7a2b21aa11cd24c8606 (commit) via f4fb5bbd786908a08a3ffaf8042d56d84fc466e7 (commit) via 9b6598de0422578f5d8341ad7bbdd5bf8072f8de (commit) via 1e2fc89f8ec1e93909257aa61d168c5a5b707623 (commit) via 12f86c96506824e149cca4d5ca9fa319e1fb9339 (commit) via d686ec523e0647cd5ebf42b0078e211ab2dee753 (commit) via c7f719105ceb0f505b7a4c25837b519b37e797a3 (commit) via 0b071cea8d8284860a378f91ea05a469e1d507d0 (commit) via 0e9c4d5039a90a248c47bd5e69d1f59630f45cf5 (commit) via d453650c254dd56e8dd3b777d9ebf750046e7df3 (commit) via 88d8102435649d7c4f5e02eca3793eefbb059112 (commit) via 2ea52851290e7f0a4d5f54dacedc16cbd5f81c62 (commit) via 3eae388a77465df15becd756d15e83f30c3e62f9 (commit) via 943364a449b81a0c0c3ec7cfe4e3f538114a187f (commit) via 53f8bd50722ad5a1551f3ac20e3c7f0cacd05fa3 (commit) via 13a5dcdfa857faea719b89f5d598a4b1e4e68358 (commit) via ce87f6ae3062920801877b1725e4eb1395e3c28b (commit) via b25faa4e55528208602eb67ed7ad7f1ef858ea4b (commit) via d46bd622dd87a660f1dd408c940be0173f1e7663 (commit) via c75769a3dbaf6e8bacb067a11f0acfb56bc51408 (commit) via 1dfcdfb9af5de18ab5895c853709d3ef460aa8b2 (commit) via 8d6d8b79fc9c0d17e4f38f06f5e3528034963c40 (commit) via 7cb31c208224566b44da52ae0c8ab48e46263a49 (commit) via 8345af390599eced97e7a4f94c25558c4add7cee (commit) via 70e8b4bea3a9b2db44398dc834ac8fcb4beca195 (commit) via 49c667554031d2ef091557b43d06653a982b85b4 (commit) via fe93a8c107dca44215a4b1b670ce88aac69b90ee (commit) via 6ca6bd37a6b81ecb8464995d5a3884521c354207 (commit) via 4aa594c7abcaf4c884e5e4a0a1764b2df3813467 (commit) via ec3190107fecc938d56e5114a7b356466eb510da (commit) via 87944d2584911a90669fcc7d216eaa852373e4d7 (commit) via d4a2253c9fe36b86ccd6d1c3d1d3f775cc81ba23 (commit) via 30d6bb125d6a370a6836c1620c504427babbf9ee (commit) via 4baf969d683810deba66b66f47ac4b891174363e (commit) from e15d5de30991885663c3538b46e4de02d41dd74b (commit) - Log ----------------------------------------------------------------- commit bfe8c502de66f518ab10ca1b4044ad49ba299c6f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:37:31 2011 +0200 Translation update done using Pootle. commit 7964ea9ad57af15a2dd105ce58b32958d19a4c5b Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:37:22 2011 +0200 Translation update done using Pootle. commit 394c7c4c1843fb7f16fd03285d5dc5feffe2759f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:37:00 2011 +0200 Translation update done using Pootle. commit 2a6eb571dcacbb2b7ddd45ecd0ac6ea3e8fc4ccf Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:36:22 2011 +0200 Translation update done using Pootle. commit dc7c6d70c4b32ce27bd5fba3877d8fcc3e12f528 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:36:09 2011 +0200 Translation update done using Pootle. commit 96dc32c94bb50fc92af061ff5b92f2519048b61e Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:35:52 2011 +0200 Translation update done using Pootle. commit 9d2d16fff2c2f1557d3e874eb6d49ff906600cfe Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:35:32 2011 +0200 Translation update done using Pootle. commit 5fa74308c2dab8d715de49d834ae89ea64de476d Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:34:42 2011 +0200 Translation update done using Pootle. commit 2b7057d0ebc01ccdd6d7ba3a9224d20d7350603e Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:34:29 2011 +0200 Translation update done using Pootle. commit c0d56d5a7a3938fe56628cbafe2bdfe7abc2e72f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:33:57 2011 +0200 Translation update done using Pootle. commit 17941aacc932ad46ceedfd07348136063011a972 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:32:44 2011 +0200 Translation update done using Pootle. commit cc8d8e3059eee8112a154b7895b38124e88dd2bd Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jul 7 12:32:28 2011 +0200 Translation update done using Pootle. commit a015550a6164f91a02ce94c092533e58c5d1b104 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:29:21 2011 +0200 Translation update done using Pootle. commit 6b09a506882864375f91918c1738c8c1cd91e874 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:28:57 2011 +0200 Translation update done using Pootle. commit 5794fb83c0587fda1f332ef0f7d0eec22cfd9ba7 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:26:37 2011 +0200 Translation update done using Pootle. commit 3104ecf1ed4184173c17fd9cbef4e4cead2bf2c5 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:26:29 2011 +0200 Translation update done using Pootle. commit e7990557dda47309caafcb810d61411db8755956 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:22:24 2011 +0200 Translation update done using Pootle. commit aceb36c4716554f9d35e3e9df62627b57e81f243 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:21:49 2011 +0200 Translation update done using Pootle. commit 8b2881fd8a1dc154084ff761a85a5a85586f28cb Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:21:02 2011 +0200 Translation update done using Pootle. commit bdcfca9259cfaca3a5dbe087b09194668582d4f6 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:20:43 2011 +0200 Translation update done using Pootle. commit de3817ad84f3c6721ac85f7738b5d478e951d210 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:20:00 2011 +0200 Translation update done using Pootle. commit 16a16ad7e3c91ed2d44f787e58e1974a78b007dd Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:19:35 2011 +0200 Translation update done using Pootle. commit d74bd06400b19ece3f6e770e5192bcde024bb2d2 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:19:16 2011 +0200 Translation update done using Pootle. commit efaea4c2a9da1dd2f3b5ea30cc9fa76d2d7079cd Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:18:48 2011 +0200 Translation update done using Pootle. commit 994b435b0057432d9804348ca77357fa189917eb Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:18:39 2011 +0200 Translation update done using Pootle. commit ebb98ba36a7c54697c03cf655f4cb47ca5489010 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:17:55 2011 +0200 Translation update done using Pootle. commit 0a640962947d731b6b14c469eb87370e0b279dc3 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:17:41 2011 +0200 Translation update done using Pootle. commit c7c3612ed08c44ad500b5cdd58857ec6dd671ec6 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:17:28 2011 +0200 Translation update done using Pootle. commit 5092c0f003a40cbbbb47fa92c47bf741f1d81866 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:17:02 2011 +0200 Translation update done using Pootle. commit a17457bed2dfdf0093d87de4185a5d92f0baaf83 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:16:44 2011 +0200 Translation update done using Pootle. commit cf16dff3caec5973f89cc23196b82ed3153c3b4b Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:16:16 2011 +0200 Translation update done using Pootle. commit e5f68d7fc030964959e2e5c7685eee4d4247aafd Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:16:07 2011 +0200 Translation update done using Pootle. commit 7c9403d4dfa44569613c1257455efd6784e05d9a Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:15:58 2011 +0200 Translation update done using Pootle. commit 6a8c28aec6007d3b0d1c4a50ed9715e41e7d3887 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:15:03 2011 +0200 Translation update done using Pootle. commit 1070bc01f6ee04e4d51eed362f68680e715b7c54 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:14:26 2011 +0200 Translation update done using Pootle. commit 717d50c214b9f85f5cda0d49f3c3d0cb75cc55b3 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:14:11 2011 +0200 Translation update done using Pootle. commit 5235574a5b1e2a8b08b21921a88d00c63d7242a9 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:14:00 2011 +0200 Translation update done using Pootle. commit 681b33f005e3fe529297d98cfb58623a91d26e4c Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:13:39 2011 +0200 Translation update done using Pootle. commit 1f335069dbcd40668799e8d05bb484e74bb55e74 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:12:28 2011 +0200 Translation update done using Pootle. commit c17ee2b99bae15ea3c1f1f9aa7e1e7103a276ebe Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:12:19 2011 +0200 Translation update done using Pootle. commit c3966c59fea128f8f95ebaa68c52f96d461b329e Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:12:11 2011 +0200 Translation update done using Pootle. commit b5c795beb40f71b858d1a8971ed43adc9e294b8b Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:11:21 2011 +0200 Translation update done using Pootle. commit 530de174dc5c572d6f1c54e0e133631094a449df Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:11:14 2011 +0200 Translation update done using Pootle. commit f27f0f936c4d751da667a021444bfaa520cc3c6e Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:11:08 2011 +0200 Translation update done using Pootle. commit efd5e9a61c3d53b741943b1d5b68f4a3ee1c406a Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:09:55 2011 +0200 Translation update done using Pootle. commit 371c481e1e7a52c1f76eeb044d9f56d94839d7ae Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:09:02 2011 +0200 Translation update done using Pootle. commit ca4b6613d37c32ec63d668264d5670bec292f35f Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:08:15 2011 +0200 Translation update done using Pootle. commit 3f761b36de3044f1ec8f8a1162160ec327d073fa Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:06:49 2011 +0200 Translation update done using Pootle. commit 2382f2cbd133ffef0ea0a4caa51de50a12c3f761 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:06:27 2011 +0200 Translation update done using Pootle. commit 1824dfcd84cfb530a73dc858144d02368a43917a Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:04:42 2011 +0200 Translation update done using Pootle. commit 7322ce3f1eae6ad245b94e9ef762c2cd7c1f06d2 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:04:36 2011 +0200 Translation update done using Pootle. commit 16255508087df433ff7c5bc4fb2230126fbbd0d0 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:04:29 2011 +0200 Translation update done using Pootle. commit 7f42b4edfbc17574b6309940fd262643af723846 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:04:24 2011 +0200 Translation update done using Pootle. commit ddad0aa76759973bd61b5eeb3af91d42adca0da3 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:04:19 2011 +0200 Translation update done using Pootle. commit d9973839d74e57c7640c75bb4a757f162a26bb58 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:04:12 2011 +0200 Translation update done using Pootle. commit e535ca62064d8b2045e23af246f4d6b439dd2ae4 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:03:56 2011 +0200 Translation update done using Pootle. commit 2344fa0d0cd903133a3b09e3762f030a765ce3de Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:03:50 2011 +0200 Translation update done using Pootle. commit 68a32cdd997b9f5003cbd3b032cec9c8e16dcc32 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:03:18 2011 +0200 Translation update done using Pootle. commit f4e2eb0b505e61a77726114907843dfe16c346d4 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 12:02:59 2011 +0200 Translation update done using Pootle. commit e1f331deb827bd4f091be96ca1965ca437dfd255 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:50:53 2011 +0200 Translation update done using Pootle. commit 5bc63c9045a5f6997895bd7c33e439466c67697a Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:48:45 2011 +0200 Translation update done using Pootle. commit 31a5c5d230e3fc5c59e5487994c7653fc1801b6a Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:48:40 2011 +0200 Translation update done using Pootle. commit 0deff4362ed55b8cd525e7a2b21aa11cd24c8606 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:47:17 2011 +0200 Translation update done using Pootle. commit f4fb5bbd786908a08a3ffaf8042d56d84fc466e7 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:47:12 2011 +0200 Translation update done using Pootle. commit 9b6598de0422578f5d8341ad7bbdd5bf8072f8de Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:47:02 2011 +0200 Translation update done using Pootle. commit 1e2fc89f8ec1e93909257aa61d168c5a5b707623 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:46:59 2011 +0200 Translation update done using Pootle. commit 12f86c96506824e149cca4d5ca9fa319e1fb9339 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:46:55 2011 +0200 Translation update done using Pootle. commit d686ec523e0647cd5ebf42b0078e211ab2dee753 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:46:36 2011 +0200 Translation update done using Pootle. commit c7f719105ceb0f505b7a4c25837b519b37e797a3 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 7 11:46:29 2011 +0200 Translation update done using Pootle. commit 0b071cea8d8284860a378f91ea05a469e1d507d0 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:20:53 2011 +0200 Translation update done using Pootle. commit 0e9c4d5039a90a248c47bd5e69d1f59630f45cf5 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:20:08 2011 +0200 Translation update done using Pootle. commit d453650c254dd56e8dd3b777d9ebf750046e7df3 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:19:22 2011 +0200 Translation update done using Pootle. commit 88d8102435649d7c4f5e02eca3793eefbb059112 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:18:45 2011 +0200 Translation update done using Pootle. commit 2ea52851290e7f0a4d5f54dacedc16cbd5f81c62 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:18:32 2011 +0200 Translation update done using Pootle. commit 3eae388a77465df15becd756d15e83f30c3e62f9 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:18:00 2011 +0200 Translation update done using Pootle. commit 943364a449b81a0c0c3ec7cfe4e3f538114a187f Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:17:55 2011 +0200 Translation update done using Pootle. commit 53f8bd50722ad5a1551f3ac20e3c7f0cacd05fa3 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:17:40 2011 +0200 Translation update done using Pootle. commit 13a5dcdfa857faea719b89f5d598a4b1e4e68358 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:17:21 2011 +0200 Translation update done using Pootle. commit ce87f6ae3062920801877b1725e4eb1395e3c28b Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:16:58 2011 +0200 Translation update done using Pootle. commit b25faa4e55528208602eb67ed7ad7f1ef858ea4b Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:16:26 2011 +0200 Translation update done using Pootle. commit d46bd622dd87a660f1dd408c940be0173f1e7663 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:15:49 2011 +0200 Translation update done using Pootle. commit c75769a3dbaf6e8bacb067a11f0acfb56bc51408 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:15:36 2011 +0200 Translation update done using Pootle. commit 1dfcdfb9af5de18ab5895c853709d3ef460aa8b2 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:14:46 2011 +0200 Translation update done using Pootle. commit 8d6d8b79fc9c0d17e4f38f06f5e3528034963c40 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:13:31 2011 +0200 Translation update done using Pootle. commit 7cb31c208224566b44da52ae0c8ab48e46263a49 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:13:24 2011 +0200 Translation update done using Pootle. commit 8345af390599eced97e7a4f94c25558c4add7cee Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:12:25 2011 +0200 Translation update done using Pootle. commit 70e8b4bea3a9b2db44398dc834ac8fcb4beca195 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:12:21 2011 +0200 Translation update done using Pootle. commit 49c667554031d2ef091557b43d06653a982b85b4 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:12:17 2011 +0200 Translation update done using Pootle. commit fe93a8c107dca44215a4b1b670ce88aac69b90ee Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:12:13 2011 +0200 Translation update done using Pootle. commit 6ca6bd37a6b81ecb8464995d5a3884521c354207 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 11:12:07 2011 +0200 Translation update done using Pootle. commit 4aa594c7abcaf4c884e5e4a0a1764b2df3813467 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 09:49:04 2011 +0200 Translation update done using Pootle. commit ec3190107fecc938d56e5114a7b356466eb510da Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 09:48:43 2011 +0200 Translation update done using Pootle. commit 87944d2584911a90669fcc7d216eaa852373e4d7 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 09:48:26 2011 +0200 Translation update done using Pootle. commit d4a2253c9fe36b86ccd6d1c3d1d3f775cc81ba23 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 09:47:00 2011 +0200 Translation update done using Pootle. commit 30d6bb125d6a370a6836c1620c504427babbf9ee Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 09:46:49 2011 +0200 Translation update done using Pootle. commit 4baf969d683810deba66b66f47ac4b891174363e Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jul 7 09:45:26 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/bg.po | 128 +++++++++++++++++++++++++++++++------------------------------- po/el.po | 29 ++++++-------- po/sl.po | 31 ++++++--------- 3 files changed, 89 insertions(+), 99 deletions(-) diff --git a/po/bg.po b/po/bg.po index 13a18c7..0b3c178 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,13 +4,13 @@ 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-07-03 07:35-0400\n" -"PO-Revision-Date: 2011-07-06 10:00+0200\n" +"PO-Revision-Date: 2011-07-07 12:29+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -986,7 +986,7 @@ msgid "" "for it is not implemented or disabled by your configuration." msgstr "" "Опитвате да заредите файл с неподдържана компресия (%s). Или поддръжката ѝ " -"не е реализирана, или е изключена от конфигурацията." +"не е реализирана, или е забранена от конфигурацията." #: import.php:335 msgid "" @@ -1095,7 +1095,7 @@ msgstr "Операцията може да продължи дълго. Да п #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "На път сте да ИЗКЛЮЧИТЕ BLOB хранилището!" +msgstr "На път сте да ЗАБРАНИТЕ BLOB хранилище!" #: js/messages.php:41 #, php-format @@ -1134,7 +1134,7 @@ msgstr "Паролата не е същата!" #: js/messages.php:56 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 msgid "Add user" -msgstr "Добавяне потребител" +msgstr "Нов потребител" #: js/messages.php:57 msgid "Reloading Privileges" @@ -1291,23 +1291,21 @@ msgstr "Таблицата трябва да има поне една колон #: js/messages.php:107 msgid "Create Table" -msgstr "Създаване таблица" +msgstr "Създаване на таблица" #: js/messages.php:112 msgid "Insert Table" msgstr "Вмъкване на таблица" #: js/messages.php:113 -#, fuzzy #| msgid "Add index" msgid "Hide indexes" -msgstr "Добавяне на индекс" +msgstr "Скриване на индексите" #: js/messages.php:114 -#, fuzzy #| msgid "Show grid" msgid "Show indexes" -msgstr "Покажи мрежа" +msgstr "Показване на индексите" #: js/messages.php:117 msgid "Searching" @@ -1849,7 +1847,7 @@ msgstr "%s е разрешен на този MySQL сървър." #: libraries/StorageEngine.class.php:319 #, php-format msgid "%s has been disabled for this MySQL server." -msgstr "%s е изключен за този MySQL сървър." +msgstr "%s е забранено за този MySQL сървър." #: libraries/StorageEngine.class.php:323 #, php-format @@ -2219,7 +2217,7 @@ msgstr "Създаване на PHP код" #: libraries/common.lib.php:1131 libraries/config/messages.inc.php:475 #: server_status.php:410 server_status.php:436 server_status.php:457 msgid "Refresh" -msgstr "Презареждане" +msgstr "Опресняване" #: libraries/common.lib.php:1140 msgid "Skip Validate SQL" @@ -2503,12 +2501,12 @@ msgstr "най-много %s" #: libraries/config/FormDisplay.tpl.php:167 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "Тази настройка е изключена, тя няма да влияе на конфигурацията" +msgstr "Тази настройка е забранена, тя няма да влияе на конфигурацията" #: libraries/config/FormDisplay.tpl.php:167 libraries/relation.lib.php:78 #: libraries/relation.lib.php:85 pmd_relation_new.php:68 msgid "Disabled" -msgstr "Изключено" +msgstr "Забрано" #: libraries/config/FormDisplay.tpl.php:242 #, php-format @@ -2725,18 +2723,20 @@ msgstr "" #: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "Показване на сървърите в списък" #: libraries/config/messages.inc.php:60 msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Забранява възможността за избор на много таблици за едновременно извършване " +"на профилактика като оптимизиране или поправка." #: libraries/config/messages.inc.php:61 #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Изключване на избора на множество таблици при поддръжката" +msgstr "Забрана на избора на много таблици за профилактика" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -2929,7 +2929,7 @@ msgstr "Използване на отложени вмъквания" #: libraries/config/messages.inc.php:125 libraries/export/sql.php:79 msgid "Disable foreign key checks" -msgstr "Забраняване на проверките за външен ключ" +msgstr "Забрана на проверките за външен ключ" #: libraries/config/messages.inc.php:128 msgid "Use hexadecimal for BLOB" @@ -3423,7 +3423,7 @@ msgstr "" #: libraries/config/messages.inc.php:277 msgid "Disable this if you want to see all databases at once" -msgstr "" +msgstr "Изключете ако искате да виждате всички БД наведнъж" #: libraries/config/messages.inc.php:278 msgid "Use light version" @@ -3469,7 +3469,7 @@ msgstr "" #: libraries/config/messages.inc.php:288 msgid "Maximum number of recently used tables; set 0 to disable" -msgstr "" +msgstr "Максимален брой скоро отваряни таблици; 0 за забрана" #: libraries/config/messages.inc.php:289 msgid "Recently used tables" @@ -3590,6 +3590,7 @@ msgid "" "Disable the default warning that is displayed if mcrypt is missing for " "cookie authentication" msgstr "" +"Скрива предупреждението за липсващ mcrypt при удостоверяване с бисквитки" #: libraries/config/messages.inc.php:316 msgid "mcrypt warning" @@ -4080,7 +4081,7 @@ msgstr "" #: libraries/config/messages.inc.php:429 msgid "Add DROP DATABASE" -msgstr "" +msgstr "Добавяне DROP DATABASE" #: libraries/config/messages.inc.php:430 msgid "" @@ -4090,7 +4091,7 @@ msgstr "" #: libraries/config/messages.inc.php:431 msgid "Add DROP TABLE" -msgstr "" +msgstr "Добавяне DROP TABLE" #: libraries/config/messages.inc.php:432 msgid "" @@ -4100,7 +4101,7 @@ msgstr "" #: libraries/config/messages.inc.php:433 msgid "Add DROP VIEW" -msgstr "" +msgstr "Добавяне DROP VIEW" #: libraries/config/messages.inc.php:434 msgid "Defines the list of statements the auto-creation uses for new versions." @@ -4194,10 +4195,9 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:454 -#, fuzzy #| msgid "Default display direction" msgid "Show display direction" -msgstr "Ориентация по подразбиране" +msgstr "" #: libraries/config/messages.inc.php:455 msgid "" @@ -4551,7 +4551,7 @@ msgstr "" #: libraries/config/validate.lib.php:359 #, php-format msgid "Incorrect IP address: %s" -msgstr "" +msgstr "Грешен IP адрес: %s" #. l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. #: libraries/core.lib.php:242 @@ -4659,7 +4659,7 @@ msgstr "Подробности" #: libraries/db_routines.lib.php:633 #| msgid "Column names" msgid "Routine name" -msgstr "Име на процедура" +msgstr "Име" #: libraries/db_routines.lib.php:650 #, php-format @@ -4698,7 +4698,7 @@ msgstr "Настройки" #: libraries/db_routines.lib.php:678 msgid "Add parameter" -msgstr "Добавяне на параметър" +msgstr "Нов параметър" #: libraries/db_routines.lib.php:681 #| msgid "Remove database" @@ -4735,7 +4735,7 @@ msgstr "" #: libraries/db_routines.lib.php:729 #| msgid "Security" msgid "Security type" -msgstr "Тип на сигурност" +msgstr "Сигурност" #: libraries/db_routines.lib.php:736 msgid "SQL data access" @@ -4787,7 +4787,7 @@ msgstr "Няма процедури." #: libraries/db_routines.lib.php:1192 #| msgid "Add index" msgid "Add routine" -msgstr "Добавяне на процедура" +msgstr "Нова процедура" #: libraries/db_routines.lib.php:1195 #| msgid "You don't have sufficient privileges to be here right now!" @@ -5125,22 +5125,19 @@ msgid "%d is not valid row number." msgstr "%d не е валиден номер на ред." #: libraries/display_tbl.lib.php:436 -#, fuzzy #| msgid "Textarea rows" msgid "Start row" -msgstr "Реда в текстово поле" +msgstr "" #: libraries/display_tbl.lib.php:438 -#, fuzzy #| msgid "Number of rows:" msgid "Number of rows" -msgstr "Брой редове:" +msgstr "Брой редове" #: libraries/display_tbl.lib.php:443 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Още" +msgstr "" #: libraries/display_tbl.lib.php:445 msgid "horizontal" @@ -5159,10 +5156,9 @@ msgid "Headers every" msgstr "" #: libraries/display_tbl.lib.php:454 -#, fuzzy #| msgid "Browse" msgid "rows" -msgstr "Прелистване" +msgstr "реда" #: libraries/display_tbl.lib.php:546 msgid "Sort by key" @@ -5296,7 +5292,7 @@ msgstr "Действие" #: libraries/display_triggers.inc.php:120 #| msgid "Add a new server" msgid "Add a trigger" -msgstr "Добавяне на тригер" +msgstr "Нов тригер" #: libraries/engines/bdb.lib.php:20 main.php:211 msgid "Version information" @@ -5639,7 +5635,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:62 msgid "Log buffer size" -msgstr "Размер буфер на дневника" +msgstr "Размер на буфера на дневника" #: libraries/engines/pbxt.lib.php:63 msgid "" @@ -5845,7 +5841,7 @@ msgstr "" #: libraries/export/sql.php:167 #, php-format msgid "Add %s statement" -msgstr "" +msgstr "Ново заявление %s" #: libraries/export/sql.php:145 msgid "Add statements:" @@ -6121,11 +6117,11 @@ msgstr "Изпълнение" #: libraries/mult_submits.inc.php:268 msgid "Add table prefix" -msgstr "" +msgstr "Добавяне на представка на таблица" #: libraries/mult_submits.inc.php:271 msgid "Add prefix" -msgstr "" +msgstr "Добавяне на представка" #: libraries/mult_submits.inc.php:488 tbl_replace.php:313 msgid "No change" @@ -6591,11 +6587,11 @@ msgstr "Моля изберете страница за редакция" #: libraries/schema/User_Schema.class.php:149 msgid "Select page" -msgstr "Избор страница" +msgstr "Избор на страница" #: libraries/schema/User_Schema.class.php:207 msgid "Select Tables" -msgstr "Избери таблици" +msgstr "Избор на таблици" #: libraries/schema/User_Schema.class.php:342 msgid "Display relational schema" @@ -6945,7 +6941,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:606 tbl_structure.php:678 #, php-format msgid "Add %s column(s)" -msgstr "Добавяне на %s колона(и)" +msgstr "Нови %s колона(и)" #: libraries/tbl_properties.inc.php:608 tbl_structure.php:672 msgid "You have to add at least one column." @@ -6963,7 +6959,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:776 #| msgid "+ Add a new value" msgid "+ Add a value" -msgstr "+ Добавяне на стойност" +msgstr "+ Нова стойност" #: libraries/transformations/application_octetstream__download.inc.php:9 msgid "" @@ -7422,15 +7418,15 @@ msgstr "Импорт от избрания файл" #: pmd_pdf.php:100 msgid "Export to selected page" -msgstr "" +msgstr "Експорт към избраната страница" #: pmd_pdf.php:102 msgid "Create a page and export to it" -msgstr "" +msgstr "създаване на страница и експорт към нея" #: pmd_pdf.php:111 msgid "New page name: " -msgstr "" +msgstr "Име: " #: pmd_pdf.php:114 msgid "Export/Import to scale" @@ -7438,31 +7434,31 @@ msgstr "" #: pmd_pdf.php:119 msgid "recommended" -msgstr "" +msgstr "препоръчително" #: pmd_relation_new.php:29 msgid "Error: relation already exists." -msgstr "" +msgstr "Грешка: Зависимостта вече съществува." #: pmd_relation_new.php:61 pmd_relation_new.php:86 msgid "Error: Relation not added." -msgstr "" +msgstr "Грешка: Зависимостта не е добавена." #: pmd_relation_new.php:62 msgid "FOREIGN KEY relation added" -msgstr "" +msgstr "FOREIGN KEY зависимост е добавена" #: pmd_relation_new.php:84 msgid "Internal relation added" -msgstr "Вътрешна връзка добавена" +msgstr "Вътрешна зависимост е добавена" #: pmd_relation_upd.php:55 msgid "Relation deleted" -msgstr "Изтрита връзка" +msgstr "Зависимостта изтрита" #: pmd_save_pos.php:44 msgid "Error saving coordinates for Designer." -msgstr "" +msgstr "Грешка при запазване на координатите в Строител." #: pmd_save_pos.php:52 msgid "Modifications have been saved" @@ -7470,7 +7466,7 @@ msgstr "Промените бяха запазени" #: prefs_forms.php:78 msgid "Cannot save settings, submitted form contains errors" -msgstr "" +msgstr "Промените не бяха запазени, изпратения формуляр съдържа грешки." #: prefs_manage.php:80 msgid "Could not import configuration" @@ -7478,11 +7474,11 @@ msgstr "Конфигурацията не може да бъде импорти #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "Конфигурацията съдържа грешни данни за някои ключове." #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Искате ли да импортирате оставащите настройки?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" @@ -7557,7 +7553,7 @@ msgstr "Файлът не съществува" #: server_binlog.php:87 msgid "Select binary log to view" -msgstr "Изберете двоичен журнал за преглед" +msgstr "Изберете двоичен дневник за преглед" #: server_binlog.php:103 server_status.php:275 msgid "Files" @@ -7613,11 +7609,11 @@ msgstr "Статистика за базите данни" #: server_databases.php:183 server_replication.php:179 #: server_replication.php:207 msgid "Master replication" -msgstr "" +msgstr "Главен сървър" #: server_databases.php:185 server_replication.php:246 msgid "Slave replication" -msgstr "" +msgstr "Подчинен сървър" #: server_databases.php:272 server_databases.php:273 msgid "Enable Statistics" @@ -8050,7 +8046,7 @@ msgstr "Даване на пълни права над БД "%s"" #: server_privileges.php:2146 #, php-format msgid "Users having access to "%s"" -msgstr "Потребители които имат достъп до "%s"" +msgstr "Потребители с достъп до "%s"" #: server_privileges.php:2254 msgid "global" @@ -8109,6 +8105,8 @@ msgid "" "This server is not configured as master in a replication process. Would you " "like to <a href=\"%s\">configure</a> it?" msgstr "" +"Този сървър не е настроен като главен в репликация. Желаете ли да го <a " +"href=\"%s\">настроите</a>?" #: server_replication.php:215 msgid "Master configuration" @@ -8227,6 +8225,8 @@ msgid "" "This server is not configured as slave in a replication process. Would you " "like to <a href=\"%s\">configure</a> it?" msgstr "" +"Този сървър не е настроен като подчинен в репликация. Желаете ли да го <a " +"href=\"%s\">настроите</a>?" #: server_status.php:27 #| msgid "Refresh" @@ -8323,7 +8323,7 @@ msgstr "Информация за състоянието на MySQL сървър #: server_status.php:401 #| msgid "Server Choice" msgid "Server traffic" -msgstr "Трафик сървър" +msgstr "Трафик" #: server_status.php:403 msgid "All status variables" diff --git a/po/el.po b/po/el.po index a12ea32..f35c8ac 100644 --- a/po/el.po +++ b/po/el.po @@ -4,13 +4,13 @@ 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-07-03 07:35-0400\n" -"PO-Revision-Date: 2011-07-01 12:28+0200\n" +"PO-Revision-Date: 2011-07-07 12:37+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1296,16 +1296,14 @@ msgid "Insert Table" msgstr "Εισαγωγή Πίνακα" #: js/messages.php:113 -#, fuzzy #| msgid "Add index" msgid "Hide indexes" -msgstr "Προσθήκη ευρετηρίου" +msgstr "Απόκρυψη ευρετηρίων" #: js/messages.php:114 -#, fuzzy #| msgid "Show grid" msgid "Show indexes" -msgstr "Εμφάνιση πλέγματος" +msgstr "Εμφάνιση ευρετηρίων" #: js/messages.php:117 msgid "Searching" @@ -4367,12 +4365,13 @@ msgid "" "Defines whether or not type display direction option is shown when browsing " "a table" msgstr "" +"Ορίζεται αν θα εμφανίζετια ή όχι η επιλογή κατεύθυνσης προβολής κατά την " +"περιήγηση σε πίνακα" #: libraries/config/messages.inc.php:454 -#, fuzzy #| msgid "Default display direction" msgid "Show display direction" -msgstr "Προεπιλεγμένη κατεύθυνση προβολής" +msgstr "Προβολή κατεύθυνσης προβολής" #: libraries/config/messages.inc.php:455 msgid "" @@ -5350,7 +5349,7 @@ msgstr "Πατήστε για εναλλαγή επισήμανσης" #: libraries/display_tbl.lib.php:420 msgid "Click the drop-down arrow<br />to toggle column's visibility" -msgstr "" +msgstr "Πατήστε το βέλος (προς τα κάτω)<br />για εναλλαγή της εμφάνισης στηλών" #: libraries/display_tbl.lib.php:431 #, php-format @@ -5358,22 +5357,19 @@ msgid "%d is not valid row number." msgstr "Ο αριθμός %d δεν είναι έγκυρος αριθμός γραμμών." #: libraries/display_tbl.lib.php:436 -#, fuzzy #| msgid "Textarea rows" msgid "Start row" -msgstr "Γραμμές περιοχής κειμένου (textarea)" +msgstr "Εγγραφή έναρξης" #: libraries/display_tbl.lib.php:438 -#, fuzzy #| msgid "Number of rows:" msgid "Number of rows" msgstr "Αριθμός εγγραφών" #: libraries/display_tbl.lib.php:443 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Περισσότερα" +msgstr "Μορφή" #: libraries/display_tbl.lib.php:445 msgid "horizontal" @@ -5389,13 +5385,12 @@ msgstr "κάθετη" #: libraries/display_tbl.lib.php:452 msgid "Headers every" -msgstr "" +msgstr "Κεφαλίδες κάθε" #: libraries/display_tbl.lib.php:454 -#, fuzzy #| msgid "Browse" msgid "rows" -msgstr "Περιήγηση" +msgstr "εγγραφές" #: libraries/display_tbl.lib.php:546 msgid "Sort by key" diff --git a/po/sl.po b/po/sl.po index bc64677..8bf955b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,13 +4,13 @@ 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-07-03 07:35-0400\n" -"PO-Revision-Date: 2011-07-03 19:04+0200\n" +"PO-Revision-Date: 2011-07-07 11:50+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " "n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" @@ -1292,16 +1292,14 @@ msgid "Insert Table" msgstr "Vstavi tabelo" #: js/messages.php:113 -#, fuzzy #| msgid "Add index" msgid "Hide indexes" -msgstr "Dodaj indeks" +msgstr "Skrij indekse" #: js/messages.php:114 -#, fuzzy #| msgid "Show grid" msgid "Show indexes" -msgstr "Pokaži mrežo" +msgstr "Pokaži indekse" #: js/messages.php:117 msgid "Searching" @@ -4328,12 +4326,13 @@ msgid "" "Defines whether or not type display direction option is shown when browsing " "a table" msgstr "" +"Določa ali naj bo med brskanjem po tabelah prikazana možnost vrste smeri " +"prikaza" #: libraries/config/messages.inc.php:454 -#, fuzzy #| msgid "Default display direction" msgid "Show display direction" -msgstr "Privzeta smer prikaza" +msgstr "Prikaži smer prikaza" #: libraries/config/messages.inc.php:455 msgid "" @@ -5292,7 +5291,7 @@ msgstr "Kliknite za označitev/opustitev" #: libraries/display_tbl.lib.php:420 msgid "Click the drop-down arrow<br />to toggle column's visibility" -msgstr "" +msgstr "Kliknite spustno puščico<br />za preklop vidnosti stolpcev" #: libraries/display_tbl.lib.php:431 #, php-format @@ -5300,22 +5299,19 @@ msgid "%d is not valid row number." msgstr "%d ni veljavna številka vrstice." #: libraries/display_tbl.lib.php:436 -#, fuzzy #| msgid "Textarea rows" msgid "Start row" -msgstr "Vrstic besedilnega polja" +msgstr "Začetna vrstica" #: libraries/display_tbl.lib.php:438 -#, fuzzy #| msgid "Number of rows:" msgid "Number of rows" -msgstr "Število vrstic:" +msgstr "Število vrstic" #: libraries/display_tbl.lib.php:443 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Več" +msgstr "Način" #: libraries/display_tbl.lib.php:445 msgid "horizontal" @@ -5331,13 +5327,12 @@ msgstr "navpičnem" #: libraries/display_tbl.lib.php:452 msgid "Headers every" -msgstr "" +msgstr "Glave vsakih" #: libraries/display_tbl.lib.php:454 -#, fuzzy #| msgid "Browse" msgid "rows" -msgstr "Prebrskaj" +msgstr "vrstic" #: libraries/display_tbl.lib.php:546 msgid "Sort by key" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 3b3299e9aea0aec6e6dd6ba3528411e0c40cd807
by Michal Čihař 07 Jul '11

07 Jul '11

The branch, master has been updated via 3b3299e9aea0aec6e6dd6ba3528411e0c40cd807 (commit) via bcd0b494e90ce9c318599ea93e1992408cbb8565 (commit) from 0c2863c91c919d7def3b7f2cd7b423e14d7ad2eb (commit) - Log ----------------------------------------------------------------- commit 3b3299e9aea0aec6e6dd6ba3528411e0c40cd807 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jul 6 10:46:23 2011 +0200 Translation update done using Pootle. commit bcd0b494e90ce9c318599ea93e1992408cbb8565 Author: ostatni <ostatni(a)hutsky.cz> Date: Tue Jul 5 15:29:51 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 9 +++++++-- po/tr.po | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index 1891ffc..71e456c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: po 4a\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-27 10:28+0300\n" -"PO-Revision-Date: 2011-05-18 14:05+0200\n" -"Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" +"PO-Revision-Date: 2011-07-05 15:29+0200\n" +"Last-Translator: <ostatni(a)hutsky.cz>\n" "Language-Team: Czech <cs(a)li.org>\n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -570,6 +570,11 @@ msgid "" "\"#faq1_26\"><abbr title=\"Frequently Asked Questions\">FAQ</abbr> 1.26</a> " "for suggestions." msgstr "" +"Ujistěte se, že všechny skripty patří odpovídajícímu vlastníkovi (pokud PHP " +"běží v tzv. safe režimu, mohl by fakt, že různé soubory patří rozdílným " +"vlastníkům, působit problémy). Více informací naleznete zde <a " +"href=\"#faq4_2\"> <abbr title=\"často kladené dotazy\">FAQ</abbr> 4.2</a> a zde " +"<a href=\"#faq1_26\"><abbr title=\"často kladené dotazy\">FAQ</abbr> 1.26</a>." #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:213 diff --git a/po/tr.po b/po/tr.po index 0e9acb7..066e8eb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-27 10:28+0300\n" -"PO-Revision-Date: 2011-06-28 18:30+0200\n" +"PO-Revision-Date: 2011-07-06 10:46+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -5634,6 +5634,7 @@ msgstr "" "<span id=\"cfg_DefaultPropDisplay\">$cfg['DefaultPropDisplay']</span> dizgi " "veya tam sayı" +# Tablo içindeki tüm alanlarda yeni sütun düzenlendiğinde/oluşturulduğunda normal olarak bir alan satır olarak sıralanır. (varsayılan: 'yatay'). Eğer bunu 'dikey' olarak ayarlarsanız, her alana dikey olarak diğerinin altında sıralanmış şekilde sahip olabilirsiniz. #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1996 msgid "" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-7267-ge15d5de
by Piotr Przybylski 06 Jul '11

06 Jul '11

The branch, master has been updated via e15d5de30991885663c3538b46e4de02d41dd74b (commit) from c8b2cf6bf30e9704b3d7d1582c43df26ad2a97ca (commit) - Log ----------------------------------------------------------------- commit e15d5de30991885663c3538b46e4de02d41dd74b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 6 19:29:54 2011 +0200 Add TO_SECONDS and UUID_SHORT to MySQL function list (only for supported versions) ----------------------------------------------------------------------- Summary of changes: libraries/data_mysql.inc.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/libraries/data_mysql.inc.php b/libraries/data_mysql.inc.php index e457d57..d504d15 100644 --- a/libraries/data_mysql.inc.php +++ b/libraries/data_mysql.inc.php @@ -226,9 +226,11 @@ if ($cfg['ShowFunctionFields']) { 'SQRT', 'TAN', 'TO_DAYS', + 'TO_SECONDS', 'TIME_TO_SEC', 'UNCOMPRESSED_LENGTH', 'UNIX_TIMESTAMP', + 'UUID_SHORT', 'WEEK', 'WEEKDAY', 'WEEKOFYEAR', @@ -256,6 +258,14 @@ if ($cfg['ShowFunctionFields']) { 'MPolyFromWKB', ), ); + // $restrict_functions holds all known functions, remove these that are unavailable on current server + if (PMA_MYSQL_INT_VERSION < 50500) { + $restrict_functions['FUNC_NUMBER'] = array_diff($restrict_functions['FUNC_NUMBER'], array('TO_SECONDS')); + } + if (PMA_MYSQL_INT_VERSION < 50120) { + $restrict_functions['FUNC_NUMBER'] = array_diff($restrict_functions['FUNC_NUMBER'], array('UUID_SHORT')); + } + if (empty($cfg['RestrictFunctions'])) { $cfg['RestrictFunctions'] = $restrict_functions; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-6554-g66158f6
by Piotr Przybylski 06 Jul '11

06 Jul '11

The branch, master has been updated via 66158f66c291b0ad1e627205d9381beeed061ded (commit) via 511cf978f6a910a3d7376884d42d1c502298aeba (commit) via 866d1da95a853cd35920253e53432c4f55ad61bf (commit) via 87a539aea7240e7563e47927f10000368a921e90 (commit) via c9df5b273323d9e8af0f86d7ce72e0e6d1728b0d (commit) from 9e34ccf57cfc97c3cac6d7f9ceecd6e1cc89e10d (commit) - Log ----------------------------------------------------------------- commit 66158f66c291b0ad1e627205d9381beeed061ded Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 6 17:46:18 2011 +0200 Move DefaultFunctions back to config.default.php commit 511cf978f6a910a3d7376884d42d1c502298aeba Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 6 17:35:22 2011 +0200 Infer $cfg['Functions'] from $cfg['RestrictFunctions'] commit 866d1da95a853cd35920253e53432c4f55ad61bf Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 6 17:11:04 2011 +0200 Move ColumnTypes, AttributeTypes, Functions, RestrictColumnTypes, RestrictFunctions and DefaultFunctions to a separate file commit 87a539aea7240e7563e47927f10000368a921e90 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 6 17:00:33 2011 +0200 Remove *Operators configuration variables commit c9df5b273323d9e8af0f86d7ce72e0e6d1728b0d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 6 16:33:27 2011 +0200 Removed unused variables ----------------------------------------------------------------------- Summary of changes: Documentation.html | 17 -- db_routines.php | 1 + libraries/common.lib.php | 6 +- libraries/config.default.php | 447 ++------------------------------------ libraries/data_mysql.inc.php | 276 +++++++++++++++++++++++ libraries/tbl_properties.inc.php | 3 + tbl_change.php | 3 + tbl_select.php | 74 +++++-- 8 files changed, 356 insertions(+), 471 deletions(-) create mode 100644 libraries/data_mysql.inc.php diff --git a/Documentation.html b/Documentation.html index 29054a2..0b3bd92 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2392,23 +2392,6 @@ setfacl -d -m "g:www-data:rwx" tmp <code>first_timestamp</code>, which is used for first timestamp column in table.</dd> - <dt id="cfg_NumOperators">$cfg['NumOperators'] array</dt> - <dd>Operators available for search operations on numeric and date columns. - </dd> - - <dt id="cfg_TextOperators">$cfg['TextOperators'] array</dt> - <dd>Operators available for search operations on character columns. - Note that we put <code>LIKE</code> by default instead of - <code>LIKE %...%</code>, to avoid unintended performance problems - in case of huge tables.</dd> - - <dt id="cfg_EnumOperators">$cfg['EnumOperators'] array</dt> - <dd>Operators available for search operations on ENUM columns.</dd> - - <dt id="cfg_NullOperators">$cfg['NullOperators'] array</dt> - <dd>Additional operators available for search operations when the - column can be null.</dd> - </dl>  diff --git a/db_routines.php b/db_routines.php index b9417fd..422ec76 100644 --- a/db_routines.php +++ b/db_routines.php @@ -13,6 +13,7 @@ require_once './libraries/common.inc.php'; require_once './libraries/common.lib.php'; require_once './libraries/db_routines.lib.php'; require_once './libraries/mysql_charsets.lib.php'; +require_once './libraries/data_mysql.inc.php'; /** * Include JavaScript libraries diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 61f3102..6d64cb6 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2872,7 +2872,7 @@ function PMA_getSupportedDatatypes($html = false, $selected = '') foreach ($cfg['ColumnTypes'] as $key => $value) { if (is_array($value)) { $retval .= "<optgroup label='" . htmlspecialchars($key) . "'>"; - foreach ($value as $subkey => $subvalue) { + foreach ($value as $subvalue) { if ($subvalue == $selected) { $retval .= "<option selected='selected'>"; $retval .= $subvalue; @@ -2896,9 +2896,9 @@ function PMA_getSupportedDatatypes($html = false, $selected = '') } } else { $retval = array(); - foreach ($cfg['ColumnTypes'] as $key => $value) { + foreach ($cfg['ColumnTypes'] as $value) { if (is_array($value)) { - foreach ($value as $subkey => $subvalue) { + foreach ($value as $subvalue) { if ($subvalue !== '-') { $retval[] = $subvalue; } diff --git a/libraries/config.default.php b/libraries/config.default.php index 809a48d..d54dc5a 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2740,379 +2740,50 @@ $cfg['DBG']['sql'] = false; */ /** - * Column types; - * VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity + * Column types + * + * Fill in this array to overwrite data from data_*.inc.php files * * @global array $cfg['ColumnTypes'] */ -$cfg['ColumnTypes'] = array( - // most used - 'INT', - 'VARCHAR', - 'TEXT', - 'DATE', - - // numeric - 'NUMERIC' => array( - 'TINYINT', - 'SMALLINT', - 'MEDIUMINT', - 'INT', - 'BIGINT', - '-', - 'DECIMAL', - 'FLOAT', - 'DOUBLE', - 'REAL', - '-', - 'BIT', - 'BOOLEAN', - 'SERIAL', - ), - - - // Date/Time - 'DATE and TIME' => array( - 'DATE', - 'DATETIME', - 'TIMESTAMP', - 'TIME', - 'YEAR', - ), - - // Text - 'STRING' => array( - 'CHAR', - 'VARCHAR', - '-', - 'TINYTEXT', - 'TEXT', - 'MEDIUMTEXT', - 'LONGTEXT', - '-', - 'BINARY', - 'VARBINARY', - '-', - 'TINYBLOB', - 'MEDIUMBLOB', - 'BLOB', - 'LONGBLOB', - '-', - 'ENUM', - 'SET', - ), - - 'SPATIAL' => array( - 'GEOMETRY', - 'POINT', - 'LINESTRING', - 'POLYGON', - 'MULTIPOINT', - 'MULTILINESTRING', - 'MULTIPOLYGON', - 'GEOMETRYCOLLECTION', - ), -); +$cfg['ColumnTypes'] = array(); /** * Attributes * + * Fill in this array to overwrite data from data_*.inc.php files + * * @global array $cfg['AttributeTypes'] */ -$cfg['AttributeTypes'] = array( - '', - 'BINARY', - 'UNSIGNED', - 'UNSIGNED ZEROFILL', - 'on update CURRENT_TIMESTAMP', -); - +$cfg['AttributeTypes'] = array(); if ($cfg['ShowFunctionFields']) { /** * Available functions * + * Fill in this array to overwrite data from data_*.inc.php files + * * @global array $cfg['Functions'] */ - $cfg['Functions'] = array( - 'ABS', - 'ACOS', - 'ASCII', - 'ASIN', - 'ATAN', - 'BIN', - 'BIT_COUNT', - 'BIT_LENGTH', - 'CEILING', - 'CHAR', - 'CHAR_LENGTH', - 'COMPRESS', - 'CONNECTION_ID', - 'COS', - 'COT', - 'CRC32', - 'CURDATE', - 'CURRENT_USER', - 'CURTIME', - 'DATABASE', - 'DATE', - 'DAYNAME', - 'DAYOFMONTH', - 'DAYOFWEEK', - 'DAYOFYEAR', - 'DEGREES', - 'DES_DECRYPT', - 'DES_ENCRYPT', - 'ENCRYPT', - 'EXP', - 'FLOOR', - 'FROM_DAYS', - 'FROM_UNIXTIME', - 'HEX', - 'HOUR', - 'INET_ATON', - 'INET_NTOA', - 'LAST_DAY', - 'LENGTH', - 'LN', - 'LOAD_FILE', - 'LOG', - 'LOG10', - 'LOG2', - 'LOWER', - 'LTRIM', - 'MD5', - 'MICROSECOND', - 'MINUTE', - 'MONTH', - 'MONTHNAME', - 'NOW', - 'OCT', - 'OLD_PASSWORD', - 'ORD', - 'PASSWORD', - 'PI', - 'QUARTER', - 'QUOTE', - 'RADIANS', - 'RAND', - 'REVERSE', - 'ROUND', - 'RTRIM', - 'SECOND', - 'SEC_TO_TIME', - 'SHA1', - 'SIGN', - 'SIN', - 'SOUNDEX', - 'SPACE', - 'SQRT', - 'SYSDATE', - 'TAN', - 'TIME', - 'TIMESTAMP', - 'TIME_TO_SEC', - 'TO_DAYS', - 'TRIM', - 'UNCOMPRESS', - 'UNCOMPRESSED_LENGTH', - 'UNHEX', - 'UNIX_TIMESTAMP', - 'UPPER', - 'USER', - 'UTC_DATE', - 'UTC_TIME', - 'UTC_TIMESTAMP', - 'UUID', - 'VERSION', - 'WEEK', - 'WEEKDAY', - 'WEEKOFYEAR', - 'YEAR', - 'YEARWEEK', - ); + $cfg['Functions'] = array(); /** * Which column types will be mapped to which Group? * + * Fill in this array to overwrite data from data_*.inc.php files + * * @global array $cfg['RestrictColumnTypes'] */ - $cfg['RestrictColumnTypes'] = array( - 'TINYINT' => 'FUNC_NUMBER', - 'SMALLINT' => 'FUNC_NUMBER', - 'MEDIUMINT' => 'FUNC_NUMBER', - 'INT' => 'FUNC_NUMBER', - 'BIGINT' => 'FUNC_NUMBER', - 'DECIMAL' => 'FUNC_NUMBER', - 'FLOAT' => 'FUNC_NUMBER', - 'DOUBLE' => 'FUNC_NUMBER', - 'REAL' => 'FUNC_NUMBER', - 'BIT' => 'FUNC_NUMBER', - 'BOOLEAN' => 'FUNC_NUMBER', - 'SERIAL' => 'FUNC_NUMBER', - - 'DATE' => 'FUNC_DATE', - 'DATETIME' => 'FUNC_DATE', - 'TIMESTAMP' => 'FUNC_DATE', - 'TIME' => 'FUNC_DATE', - 'YEAR' => 'FUNC_DATE', - - 'CHAR' => 'FUNC_CHAR', - 'VARCHAR' => 'FUNC_CHAR', - 'TINYTEXT' => 'FUNC_CHAR', - 'TEXT' => 'FUNC_CHAR', - 'MEDIUMTEXT' => 'FUNC_CHAR', - 'LONGTEXT' => 'FUNC_CHAR', - 'BINARY' => 'FUNC_CHAR', - 'VARBINARY' => 'FUNC_CHAR', - 'TINYBLOB' => 'FUNC_CHAR', - 'MEDIUMBLOB' => 'FUNC_CHAR', - 'BLOB' => 'FUNC_CHAR', - 'LONGBLOB' => 'FUNC_CHAR', - 'ENUM' => '', - 'SET' => '', - - 'GEOMETRY' => 'FUNC_SPATIAL', - 'POINT' => 'FUNC_SPATIAL', - 'LINESTRING' => 'FUNC_SPATIAL', - 'POLYGON' => 'FUNC_SPATIAL', - 'MULTIPOINT' => 'FUNC_SPATIAL', - 'MULTILINESTRING' => 'FUNC_SPATIAL', - 'MULTIPOLYGON' => 'FUNC_SPATIAL', - 'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL', - - ); + $cfg['RestrictColumnTypes'] = array(); /** * Map above defined groups to any function * + * Fill in this array to overwrite data from data_*.inc.php files + * * @global array $cfg['RestrictFunctions'] */ - $cfg['RestrictFunctions'] = array( - 'FUNC_CHAR' => array( - 'BIN', - 'CHAR', - 'CURRENT_USER', - 'COMPRESS', - 'DATABASE', - 'DAYNAME', - 'DES_DECRYPT', - 'DES_ENCRYPT', - 'ENCRYPT', - 'HEX', - 'INET_NTOA', - 'LOAD_FILE', - 'LOWER', - 'LTRIM', - 'MD5', - 'MONTHNAME', - 'OLD_PASSWORD', - 'PASSWORD', - 'QUOTE', - 'REVERSE', - 'RTRIM', - 'SHA1', - 'SOUNDEX', - 'SPACE', - 'TRIM', - 'UNCOMPRESS', - 'UNHEX', - 'UPPER', - 'USER', - 'UUID', - ), - - 'FUNC_DATE' => array( - 'CURDATE', - 'CURTIME', - 'DATE', - 'FROM_DAYS', - 'FROM_UNIXTIME', - 'LAST_DAY', - 'NOW', - 'SEC_TO_TIME', - 'SYSDATE', - 'TIME', - 'TIMESTAMP', - 'UTC_DATE', - 'UTC_TIME', - 'UTC_TIMESTAMP', - 'YEAR', - ), - - 'FUNC_NUMBER' => array( - 'ABS', - 'ACOS', - 'ASCII', - 'ASIN', - 'ATAN', - 'BIT_LENGTH', - 'BIT_COUNT', - 'CEILING', - 'CHAR_LENGTH', - 'CONNECTION_ID', - 'COS', - 'COT', - 'CRC32', - 'DAYOFMONTH', - 'DAYOFWEEK', - 'DAYOFYEAR', - 'DEGREES', - 'EXP', - 'FLOOR', - 'HOUR', - 'INET_ATON', - 'LENGTH', - 'LN', - 'LOG', - 'LOG2', - 'LOG10', - 'MICROSECOND', - 'MINUTE', - 'MONTH', - 'OCT', - 'ORD', - 'PI', - 'QUARTER', - 'RADIANS', - 'RAND', - 'ROUND', - 'SECOND', - 'SIGN', - 'SIN', - 'SQRT', - 'TAN', - 'TO_DAYS', - 'TIME_TO_SEC', - 'UNCOMPRESSED_LENGTH', - 'UNIX_TIMESTAMP', - 'WEEK', - 'WEEKDAY', - 'WEEKOFYEAR', - 'YEARWEEK', - ), - - 'FUNC_SPATIAL' => array( - 'GeomFromText', - 'GeomFromWKB', - - 'GeomCollFromText', - 'LineFromText', - 'MLineFromText', - 'PointFromText', - 'MPointFromText', - 'PolyFromText', - 'MPolyFromText', - - 'GeomCollFromWKB', - 'LineFromWKB', - 'MLineFromWKB', - 'PointFromWKB', - 'MPointFromWKB', - 'PolyFromWKB', - 'MPolyFromWKB', - ), - ); + $cfg['RestrictFunctions'] = array(); /** * Default functions for above defined groups @@ -3126,90 +2797,6 @@ if ($cfg['ShowFunctionFields']) { 'first_timestamp' => 'NOW', 'pk_char36' => 'UUID', ); -} // end if - -/** - * Search operators - * - * @global array $cfg['NumOperators'] - */ -$cfg['NumOperators'] = array( - '=', - '>', - '>=', - '<', - '<=', - '!=', - 'LIKE', - 'NOT LIKE', - 'IN (...)', - 'NOT IN (...)', - 'BETWEEN', - 'NOT BETWEEN', -); - -/** - * Search operators - * - * @global array $cfg['TextOperators'] - */ -$cfg['TextOperators'] = array( - 'LIKE', - 'LIKE %...%', - 'NOT LIKE', - '=', - '!=', - 'REGEXP', - 'REGEXP ^...$', - 'NOT REGEXP', - "= ''", - "!= ''", - 'IN (...)', - 'NOT IN (...)', - 'BETWEEN', - 'NOT BETWEEN', -); - -/** - * Search operators - * - * @global array $cfg['EnumOperators'] - */ -$cfg['EnumOperators'] = array( - '=', - '!=', -); - -/** - * Search operators - * - * @global array $cfg['SetOperators'] - */ -$cfg['SetOperators'] = array( - 'IN', - 'NOT IN', -); - -/** - * Search operators - * - * @global array $cfg['NullOperators'] - */ -$cfg['NullOperators'] = array( - 'IS NULL', - 'IS NOT NULL', -); - -/** - * Search operators - * - * @global array $cfg['UnaryOperators'] - */ -$cfg['UnaryOperators'] = array( - 'IS NULL' => 1, - 'IS NOT NULL' => 1, - "= ''" => 1, - "!= ''" => 1 -); +} ?> diff --git a/libraries/data_mysql.inc.php b/libraries/data_mysql.inc.php new file mode 100644 index 0000000..e457d57 --- /dev/null +++ b/libraries/data_mysql.inc.php @@ -0,0 +1,276 @@ +<?php +/** + * Column types and functions supported by MySQL + * + * @package phpMyAdmin + */ + +// VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity +$cfg['ColumnTypes'] = !empty($cfg['ColumnTypes']) ? $cfg['ColumnTypes'] : array( + // most used + 'INT', + 'VARCHAR', + 'TEXT', + 'DATE', + + // numeric + 'NUMERIC' => array( + 'TINYINT', + 'SMALLINT', + 'MEDIUMINT', + 'INT', + 'BIGINT', + '-', + 'DECIMAL', + 'FLOAT', + 'DOUBLE', + 'REAL', + '-', + 'BIT', + 'BOOLEAN', + 'SERIAL', + ), + + + // Date/Time + 'DATE and TIME' => array( + 'DATE', + 'DATETIME', + 'TIMESTAMP', + 'TIME', + 'YEAR', + ), + + // Text + 'STRING' => array( + 'CHAR', + 'VARCHAR', + '-', + 'TINYTEXT', + 'TEXT', + 'MEDIUMTEXT', + 'LONGTEXT', + '-', + 'BINARY', + 'VARBINARY', + '-', + 'TINYBLOB', + 'MEDIUMBLOB', + 'BLOB', + 'LONGBLOB', + '-', + 'ENUM', + 'SET', + ), + + 'SPATIAL' => array( + 'GEOMETRY', + 'POINT', + 'LINESTRING', + 'POLYGON', + 'MULTIPOINT', + 'MULTILINESTRING', + 'MULTIPOLYGON', + 'GEOMETRYCOLLECTION', + ), +); + +$cfg['AttributeTypes'] = !empty($cfg['AttributeTypes']) ? $cfg['AttributeTypes'] : array( + '', + 'BINARY', + 'UNSIGNED', + 'UNSIGNED ZEROFILL', + 'on update CURRENT_TIMESTAMP', +); + +if ($cfg['ShowFunctionFields']) { + $cfg['RestrictColumnTypes'] = !empty($cfg['RestrictColumnTypes']) ? $cfg['RestrictColumnTypes'] : array( + 'TINYINT' => 'FUNC_NUMBER', + 'SMALLINT' => 'FUNC_NUMBER', + 'MEDIUMINT' => 'FUNC_NUMBER', + 'INT' => 'FUNC_NUMBER', + 'BIGINT' => 'FUNC_NUMBER', + 'DECIMAL' => 'FUNC_NUMBER', + 'FLOAT' => 'FUNC_NUMBER', + 'DOUBLE' => 'FUNC_NUMBER', + 'REAL' => 'FUNC_NUMBER', + 'BIT' => 'FUNC_NUMBER', + 'BOOLEAN' => 'FUNC_NUMBER', + 'SERIAL' => 'FUNC_NUMBER', + + 'DATE' => 'FUNC_DATE', + 'DATETIME' => 'FUNC_DATE', + 'TIMESTAMP' => 'FUNC_DATE', + 'TIME' => 'FUNC_DATE', + 'YEAR' => 'FUNC_DATE', + + 'CHAR' => 'FUNC_CHAR', + 'VARCHAR' => 'FUNC_CHAR', + 'TINYTEXT' => 'FUNC_CHAR', + 'TEXT' => 'FUNC_CHAR', + 'MEDIUMTEXT' => 'FUNC_CHAR', + 'LONGTEXT' => 'FUNC_CHAR', + 'BINARY' => 'FUNC_CHAR', + 'VARBINARY' => 'FUNC_CHAR', + 'TINYBLOB' => 'FUNC_CHAR', + 'MEDIUMBLOB' => 'FUNC_CHAR', + 'BLOB' => 'FUNC_CHAR', + 'LONGBLOB' => 'FUNC_CHAR', + 'ENUM' => '', + 'SET' => '', + + 'GEOMETRY' => 'FUNC_SPATIAL', + 'POINT' => 'FUNC_SPATIAL', + 'LINESTRING' => 'FUNC_SPATIAL', + 'POLYGON' => 'FUNC_SPATIAL', + 'MULTIPOINT' => 'FUNC_SPATIAL', + 'MULTILINESTRING' => 'FUNC_SPATIAL', + 'MULTIPOLYGON' => 'FUNC_SPATIAL', + 'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL', + + ); + + $restrict_functions = array( + 'FUNC_CHAR' => array( + 'BIN', + 'CHAR', + 'CURRENT_USER', + 'COMPRESS', + 'DATABASE', + 'DAYNAME', + 'DES_DECRYPT', + 'DES_ENCRYPT', + 'ENCRYPT', + 'HEX', + 'INET_NTOA', + 'LOAD_FILE', + 'LOWER', + 'LTRIM', + 'MD5', + 'MONTHNAME', + 'OLD_PASSWORD', + 'PASSWORD', + 'QUOTE', + 'REVERSE', + 'RTRIM', + 'SHA1', + 'SOUNDEX', + 'SPACE', + 'TRIM', + 'UNCOMPRESS', + 'UNHEX', + 'UPPER', + 'USER', + 'UUID', + 'VERSION', + ), + + 'FUNC_DATE' => array( + 'CURDATE', + 'CURTIME', + 'DATE', + 'FROM_DAYS', + 'FROM_UNIXTIME', + 'LAST_DAY', + 'NOW', + 'SEC_TO_TIME', + 'SYSDATE', + 'TIME', + 'TIMESTAMP', + 'UTC_DATE', + 'UTC_TIME', + 'UTC_TIMESTAMP', + 'YEAR', + ), + + 'FUNC_NUMBER' => array( + 'ABS', + 'ACOS', + 'ASCII', + 'ASIN', + 'ATAN', + 'BIT_LENGTH', + 'BIT_COUNT', + 'CEILING', + 'CHAR_LENGTH', + 'CONNECTION_ID', + 'COS', + 'COT', + 'CRC32', + 'DAYOFMONTH', + 'DAYOFWEEK', + 'DAYOFYEAR', + 'DEGREES', + 'EXP', + 'FLOOR', + 'HOUR', + 'INET_ATON', + 'LENGTH', + 'LN', + 'LOG', + 'LOG2', + 'LOG10', + 'MICROSECOND', + 'MINUTE', + 'MONTH', + 'OCT', + 'ORD', + 'PI', + 'QUARTER', + 'RADIANS', + 'RAND', + 'ROUND', + 'SECOND', + 'SIGN', + 'SIN', + 'SQRT', + 'TAN', + 'TO_DAYS', + 'TIME_TO_SEC', + 'UNCOMPRESSED_LENGTH', + 'UNIX_TIMESTAMP', + 'WEEK', + 'WEEKDAY', + 'WEEKOFYEAR', + 'YEARWEEK', + ), + + 'FUNC_SPATIAL' => array( + 'GeomFromText', + 'GeomFromWKB', + + 'GeomCollFromText', + 'LineFromText', + 'MLineFromText', + 'PointFromText', + 'MPointFromText', + 'PolyFromText', + 'MPolyFromText', + + 'GeomCollFromWKB', + 'LineFromWKB', + 'MLineFromWKB', + 'PointFromWKB', + 'MPointFromWKB', + 'PolyFromWKB', + 'MPolyFromWKB', + ), + ); + if (empty($cfg['RestrictFunctions'])) { + $cfg['RestrictFunctions'] = $restrict_functions; + } + + if (empty($cfg['Functions'])) { + // build a list of functions based on $restrict_functions + $cfg['Functions'] = array(); + foreach ($restrict_functions as $cat => $functions) { + if ($cat != 'FUNC_SPATIAL') { + $cfg['Functions'] = array_merge($cfg['Functions'], $functions); + } + } + sort($cfg['Functions']); + } + unset($restrict_functions); +} // end if + +?> \ No newline at end of file diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 4cfd48a..f4ade94 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -27,6 +27,9 @@ require_once './libraries/StorageEngine.class.php'; */ require_once './libraries/Partition.class.php'; +// load additional configuration variables +require_once './libraries/data_mysql.inc.php'; + if (is_int($cfg['DefaultPropDisplay'])) { if ($num_fields <= $cfg['DefaultPropDisplay']) { $display_type = 'vertical'; diff --git a/tbl_change.php b/tbl_change.php index 94c7da0..7d5bba3 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -19,6 +19,9 @@ require_once './libraries/common.lib.php'; */ require_once './libraries/db_table_exists.lib.php'; +// load additional configuration variables +require_once './libraries/data_mysql.inc.php'; + /** * Sets global variables. * Here it's better to use a if, instead of the '?' operator diff --git a/tbl_select.php b/tbl_select.php index 33b7e48..52e8b93 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -129,31 +129,57 @@ if (! isset($param) || $param[0] == '') { <td><?php echo $fields_collation[$i]; ?></td> <td><select name="func[]"> <?php + // determine valid operators if (strncasecmp($fields_type[$i], 'enum', 4) == 0) { - foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) { - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '">' - . htmlspecialchars($fc) . '</option>'; - } + // enum operators + $operators = array( + '=', + '!=', + ); } elseif (preg_match('@char|blob|text|set@i', $fields_type[$i])) { - foreach ($GLOBALS['cfg']['TextOperators'] as $fc) { - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '">' - . htmlspecialchars($fc) . '</option>'; - } + // text operators + $operators = array( + 'LIKE', + 'LIKE %...%', + 'NOT LIKE', + '=', + '!=', + 'REGEXP', + 'REGEXP ^...$', + 'NOT REGEXP', + "= ''", + "!= ''", + 'IN (...)', + 'NOT IN (...)', + 'BETWEEN', + 'NOT BETWEEN', + ); } else { - foreach ($GLOBALS['cfg']['NumOperators'] as $fc) { - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '">' - . htmlspecialchars($fc) . '</option>'; - } + // numeric operators + $operators = array( + '=', + '>', + '>=', + '<', + '<=', + '!=', + 'LIKE', + 'NOT LIKE', + 'IN (...)', + 'NOT IN (...)', + 'BETWEEN', + 'NOT BETWEEN', + ); } // end if... else... + + // if field can be NULL, add IS NULL and IS NOT NULL if ($fields_null[$i]) { - foreach ($GLOBALS['cfg']['NullOperators'] as $fc) { - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '">' - . htmlspecialchars($fc) . '</option>'; - } + $operators[] = 'IS NULL'; + $operators[] = 'IS NOT NULL'; + } + foreach ($operators as $op) { + echo "\n" . ' ' + . '<option value="' . htmlspecialchars($op) . '">' . htmlspecialchars($op) . '</option>'; } ?> @@ -327,11 +353,17 @@ else { $sql_query .= ' WHERE ' . $where; } else { $w = $charsets = array(); + $unary_operators = array( + 'IS NULL' => 1, + 'IS NOT NULL' => 1, + "= ''" => 1, + "!= ''" => 1 + ); $cnt_func = count($func); reset($func); while (list($i, $func_type) = each($func)) { list($charsets[$i]) = explode('_', $collations[$i]); - if (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) { + if (isset($unary_operators[$func_type])) { $fields[$i] = ''; $w[] = PMA_backquote($names[$i]) . ' ' . $func_type; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-6549-g9e34ccf
by Rouslan Placella 06 Jul '11

06 Jul '11

The branch, master has been updated via 9e34ccf57cfc97c3cac6d7f9ceecd6e1cc89e10d (commit) from e9126d231887cfdeeed096648201f9e0d2f0b6f5 (commit) - Log ----------------------------------------------------------------- commit 9e34ccf57cfc97c3cac6d7f9ceecd6e1cc89e10d Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Jul 6 15:01:39 2011 +0100 Fix for bug #3354356 - Timepicker does not work in AJAX dialogs ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + themes/original/jquery/jquery-ui-1.8.override.css | 1 + themes/pmahomme/jquery/jquery-ui-1.8.override.css | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ae25e9..4df55e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ phpMyAdmin - ChangeLog + Shift/click support in database Structure + Show/hide column in table Browse - bug #3353856 [AJAX] AJAX dialogs use wrong font-size +- bug #3354356 [interface] Timepicker does not work in AJAX dialogs 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/themes/original/jquery/jquery-ui-1.8.override.css b/themes/original/jquery/jquery-ui-1.8.override.css index 4aee6fb..2835781 100644 --- a/themes/original/jquery/jquery-ui-1.8.override.css +++ b/themes/original/jquery/jquery-ui-1.8.override.css @@ -5,3 +5,4 @@ /* Component containers ----------------------------------*/ .ui-widget { font-size: 1em; } +#ui-timepicker-div { z-index: 1003; } diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.override.css b/themes/pmahomme/jquery/jquery-ui-1.8.override.css index 4aee6fb..2835781 100644 --- a/themes/pmahomme/jquery/jquery-ui-1.8.override.css +++ b/themes/pmahomme/jquery/jquery-ui-1.8.override.css @@ -5,3 +5,4 @@ /* Component containers ----------------------------------*/ .ui-widget { font-size: 1em; } +#ui-timepicker-div { z-index: 1003; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-6548-ge9126d2
by Marc Delisle 06 Jul '11

06 Jul '11

The branch, master has been updated via e9126d231887cfdeeed096648201f9e0d2f0b6f5 (commit) via c97ef9d53c554a4e5de6180247ca6d63709db77f (commit) from 39cb55a0defbf2634b2bc097f96e0d559303f5f7 (commit) - Log ----------------------------------------------------------------- commit e9126d231887cfdeeed096648201f9e0d2f0b6f5 Merge: 39cb55a0defbf2634b2bc097f96e0d559303f5f7 c97ef9d53c554a4e5de6180247ca6d63709db77f Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jul 6 08:17:45 2011 -0400 Merge commit 'c97ef9d53c554a4e5de6180247ca6d63709db77f' commit c97ef9d53c554a4e5de6180247ca6d63709db77f Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed Jul 6 09:54:38 2011 +0800 Show/hide column: fix bug - column resizer border's height not updated after toggling column visibility ----------------------------------------------------------------------- Summary of changes: js/makegrid.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index 8b1bd7c..11bfa09 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -215,6 +215,7 @@ $cb.css('left', $this.position().left + $this.outerWidth(true)) .show(); } + $(this.cRsz).css('height', $(this.t).height()); }, /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, unittesting, updated. RELEASE_3_4_3_1-6561-gf81c001
by Herman van Rink 06 Jul '11

06 Jul '11

The branch, unittesting has been updated via f81c001f76af2f39cbdc15002feefaa3821676ec (commit) via 60a2e5b3f312adf7acbe1c9ee01c21a70f9d07cf (commit) via 2e93b81172585e694c8dfdb4aa41a9272b90971e (commit) via 91709ec0c18074299b9e8560653018a9ff9206d3 (commit) via 39cb55a0defbf2634b2bc097f96e0d559303f5f7 (commit) via 82f83dac2f6b07bef76f6c3fb795ce7c0c417af8 (commit) via 70c70db1392e703346434e65d59110a6ba321367 (commit) via a88054dae9a969c0c9ec6477fce130b70a777749 (commit) via 39cb4d4798f495db25bf65dda95fc8c4e9893367 (commit) via 064d399d878f36a0a26f6db890b947bccb3ef8ab (commit) via 2ec0de3a9f8d77c750f02c27ba8d83b407a87ea5 (commit) from fc5a9a6131f9bec3c7f8c91666f483b9487c1132 (commit) - Log ----------------------------------------------------------------- commit f81c001f76af2f39cbdc15002feefaa3821676ec Merge: 60a2e5b3f312adf7acbe1c9ee01c21a70f9d07cf 2e93b81172585e694c8dfdb4aa41a9272b90971e Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Jul 6 11:03:46 2011 +0200 Merge remote-tracking branch 'zarubin/master' into unittesting commit 60a2e5b3f312adf7acbe1c9ee01c21a70f9d07cf Merge: fc5a9a6131f9bec3c7f8c91666f483b9487c1132 39cb55a0defbf2634b2bc097f96e0d559303f5f7 Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Jul 6 10:30:43 2011 +0200 Merge branch 'master' into unittesting commit 2e93b81172585e694c8dfdb4aa41a9272b90971e Merge: 91709ec0c18074299b9e8560653018a9ff9206d3 fc5a9a6131f9bec3c7f8c91666f483b9487c1132 Author: Zarubin Stas <zarubin(a)zsv.org.ua> Date: Wed Jul 6 11:30:43 2011 +0300 Merge remote-tracking branch 'upstream/unittesting' commit 91709ec0c18074299b9e8560653018a9ff9206d3 Author: Zarubin Stas <zarubin(a)zsv.org.ua> Date: Wed Jul 6 10:47:10 2011 +0300 New PHPUnit tests for common.lib.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 + js/db_routines.js | 4 +- js/functions.js | 2 +- js/indexes.js | 12 +- libraries/RecentTable.class.php | 4 +- libraries/common.lib.php | 4 +- libraries/header_meta_style.inc.php | 7 + tbl_indexes.php | 14 +- test/bootstrap-dist.php | 2 + test/libraries/common/PMA_ajaxResponse_test.php | 71 ++ .../libraries/common/PMA_browseUploadFile_test.php | 48 ++ .../common/PMA_buildActionTitles_test.php | 42 ++ test/libraries/common/PMA_cache_test.php | 14 + .../PMA_contains_nonprintable_ascii_test.php | 37 + .../common/PMA_convert_bit_default_value_test.php | 33 + .../common/PMA_displayMaximumUploadSize_test.php | 41 ++ .../common/PMA_display_html_checkbox_test.php | 55 ++ .../common/PMA_display_html_radio_test.php | 188 +++++ .../common/PMA_escapeMySqlWildcards_test.php | 2 + .../PMA_extractValueFromFormattedSize_test.php | 37 + .../common/PMA_foreignKeySupported_test.php | 2 + .../common/PMA_formatNumberByteDown_test.php | 5 +- test/libraries/common/PMA_formatSql_test.php | 743 ++++++++++++++++++++ .../common/PMA_generateHiddenMaxFileSize_test.php | 40 + .../common/PMA_generate_html_dropdown_test.php | 69 ++ test/libraries/common/PMA_getIcon_test.php | 74 ++ .../common/PMA_getTitleForTarget_test.php | 43 ++ .../common/PMA_localisedDateTimespan_test.php | 2 +- test/libraries/common/PMA_pow_test.php | 2 + .../common/PMA_printableBitValue_test.php | 1 + .../libraries/common/PMA_quoting_slashing_test.php | 7 +- .../common/PMA_showMessage_test_disabled.php | 45 ++ .../libraries/common/PMA_stringOperations_test.php | 1 + .../common/PMA_unsupportedDatatypes_test.php | 32 + test/libraries/common/PMA_whichCrlf_test.php | 1 + themes/original/jquery/jquery-ui-1.8.override.css | 7 + themes/pmahomme/jquery/jquery-ui-1.8.override.css | 7 + 37 files changed, 1675 insertions(+), 26 deletions(-) create mode 100644 test/libraries/common/PMA_ajaxResponse_test.php create mode 100644 test/libraries/common/PMA_browseUploadFile_test.php create mode 100644 test/libraries/common/PMA_buildActionTitles_test.php create mode 100644 test/libraries/common/PMA_contains_nonprintable_ascii_test.php create mode 100644 test/libraries/common/PMA_convert_bit_default_value_test.php create mode 100644 test/libraries/common/PMA_displayMaximumUploadSize_test.php create mode 100644 test/libraries/common/PMA_display_html_checkbox_test.php create mode 100644 test/libraries/common/PMA_display_html_radio_test.php create mode 100644 test/libraries/common/PMA_extractValueFromFormattedSize_test.php create mode 100644 test/libraries/common/PMA_formatSql_test.php create mode 100644 test/libraries/common/PMA_generateHiddenMaxFileSize_test.php create mode 100644 test/libraries/common/PMA_generate_html_dropdown_test.php create mode 100644 test/libraries/common/PMA_getIcon_test.php create mode 100644 test/libraries/common/PMA_getTitleForTarget_test.php create mode 100644 test/libraries/common/PMA_showMessage_test_disabled.php create mode 100644 test/libraries/common/PMA_unsupportedDatatypes_test.php create mode 100644 themes/original/jquery/jquery-ui-1.8.override.css create mode 100644 themes/pmahomme/jquery/jquery-ui-1.8.override.css diff --git a/ChangeLog b/ChangeLog index 312e148..4ae25e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog + Display direction (horizontal/vertical) no longer displayed by default + Shift/click support in database Structure + Show/hide column in table Browse +- bug #3353856 [AJAX] AJAX dialogs use wrong font-size 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes @@ -39,6 +40,8 @@ phpMyAdmin - ChangeLog - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option - bug #3340151 [export] Working SQL query exports error page - bug #3353649 [interface] "Create an index on X columns" form not validated +- bug #3350790 [interface] JS error in Table->Structure->Index->Edit +- bug #3353811 [interface] Info message has "error" class 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/js/db_routines.js b/js/db_routines.js index 95254ca..ceb0962 100644 --- a/js/db_routines.js +++ b/js/db_routines.js @@ -308,7 +308,7 @@ $(document).ready(function() { /** * Display the dialog to the user */ - $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({ + $ajaxDialog = $('<div>'+data.message+'</div>').dialog({ width: 700, // TODO: make a better decision about the size height: 550, // of the dialog based on the size of the viewport buttons: button_options, @@ -529,7 +529,7 @@ $(document).ready(function() { /** * Display the dialog to the user */ - $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({ + $ajaxDialog = $('<div>'+data.message+'</div>').dialog({ width: 650, // TODO: make a better decision about the size // of the dialog based on the size of the viewport buttons: button_options, diff --git a/js/functions.js b/js/functions.js index e25ec98..9cdb44e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2445,7 +2445,7 @@ $(document).ready(function() { /** * Display the dialog to the user */ - var $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({ + var $ajaxDialog = $('<div>'+data.message+'</div>').dialog({ width: 500, buttons: button_options, title: data.title diff --git a/js/indexes.js b/js/indexes.js index 9b64d92..ef6f877 100644 --- a/js/indexes.js +++ b/js/indexes.js @@ -17,24 +17,24 @@ function checkIndexName() } // Gets the elements pointers - var the_idx_name = document.forms['index_frm'].elements['index']; - var the_idx_type = document.forms['index_frm'].elements['index_type']; + var the_idx_name = document.forms['index_frm'].elements['index[Key_name]']; + var the_idx_type = document.forms['index_frm'].elements['index[Index_type]']; // Index is a primary key if (the_idx_type.options[0].value == 'PRIMARY' && the_idx_type.options[0].selected) { - document.forms['index_frm'].elements['index'].value = 'PRIMARY'; + document.forms['index_frm'].elements['index[Key_name]'].value = 'PRIMARY'; if (typeof(the_idx_name.disabled) != 'undefined') { - document.forms['index_frm'].elements['index'].disabled = true; + document.forms['index_frm'].elements['index[Key_name]'].disabled = true; } } // Other cases else { if (the_idx_name.value == 'PRIMARY') { - document.forms['index_frm'].elements['index'].value = ''; + document.forms['index_frm'].elements['index[Key_name]'].value = ''; } if (typeof(the_idx_name.disabled) != 'undefined') { - document.forms['index_frm'].elements['index'].disabled = false; + document.forms['index_frm'].elements['index[Key_name]'].disabled = false; } } diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index f844bbc..bfb6081 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -142,7 +142,7 @@ class PMA_RecentTable $html = '<option value="">(' . __('Recent tables') . ') ...</option>'; if (count($this->tables)) { foreach ($this->tables as $table) { - $html .= '<option value="' . $table . '">' . $table . '</option>'; + $html .= '<option value="' . htmlspecialchars($table) . '">' . htmlspecialchars($table) . '</option>'; } } else { $html .= '<option value="">' . __('There are no recent tables') . '</option>'; @@ -158,7 +158,7 @@ class PMA_RecentTable public function getHtmlSelect() { $html = '<input type="hidden" name="goto" id="LeftDefaultTabTable" value="' . - $GLOBALS['cfg']['LeftDefaultTabTable'] . '" />'; + htmlspecialchars($GLOBALS['cfg']['LeftDefaultTabTable']) . '" />'; $html .= '<select name="table" id="recentTable">'; $html .= $this->getHtmlSelectOption(); $html .= '</select>'; diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 61f3102..af4d3b2 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2774,7 +2774,9 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) header("Content-Type: application/json"); echo json_encode($response); - exit; + + if(!defined('TESTSUITE')) + exit; } /** diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 5e5c533..e78b653 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -48,4 +48,11 @@ if ($GLOBALS['text_dir'] == 'ltr') { <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" /> <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" /> +<?php + if (is_readable($GLOBALS['pmaThemePath'] . '/jquery/jquery-ui-1.8.override.css')) { +?> + <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.override.css" /> +<?php + } +?> <meta name="robots" content="noindex,nofollow" /> diff --git a/tbl_indexes.php b/tbl_indexes.php index 995ee24..7e9bec6 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -140,8 +140,8 @@ if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { ?> <form action="./tbl_indexes.php" method="post" name="index_frm" id="index_frm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> - onsubmit="if (typeof(this.elements['index'].disabled) != 'undefined') { - this.elements['index'].disabled = false}"> + onsubmit="if (typeof(this.elements['index[Key_name]'].disabled) != 'undefined') { + this.elements['index[Key_name]'].disabled = false}"> <?php $form_params = array( 'db' => $db, @@ -168,7 +168,9 @@ if (isset($_REQUEST['create_index'])) { } ?> </legend> - +<?php +PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display(); +?> <div class="formelement"> <label for="input_index_name"><?php echo __('Index name:'); ?></label> <input type="text" name="index[Key_name]" id="input_index_name" size="25" @@ -183,11 +185,7 @@ if (isset($_REQUEST['create_index'])) { <?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?> </div> - -<br class="clearfloat" /> -<?php -PMA_Message::error(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display(); -?> +<br class="clearfloat" /><br /> <table id="index_columns"> <thead> diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index 366d104..fac9b27 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -7,6 +7,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . dirname(realpath("../inde define('PHPMYADMIN', 1); define('TESTSUITE', 1); +session_start(); + // You can put some additional code that should run before tests here ?> diff --git a/test/libraries/common/PMA_ajaxResponse_test.php b/test/libraries/common/PMA_ajaxResponse_test.php new file mode 100644 index 0000000..9d5a842 --- /dev/null +++ b/test/libraries/common/PMA_ajaxResponse_test.php @@ -0,0 +1,71 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_ajaxResponse from common.lib.php + * + * @package phpMyAdmin-test + * @version $Id: PMA_ajaxResponse_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_ajaxResponse_test extends PHPUnit_Extensions_OutputTestCase +{ + function testAjaxResponseText() + { + $message = 'text'; + + $this->expectOutputString('{"success":true,"message":"' . $message . '"}'); + PMA_ajaxResponse($message); + } + + function testAjaxResponseTextWithExtra() + { + $message = 'text'; + $exra = array('str_val' => 'te\x/t"1', 'int_val' => 10); + + $this->expectOutputString('{"success":true,"message":"' . $message . '","str_val":"te\\\\x\/t\"1","int_val":10}'); + PMA_ajaxResponse($message, true, $exra); + } + + function testAjaxResponseTextError() + { + $message = 'error_text'; + + $this->expectOutputString('{"success":false,"error":"' . $message . '"}'); + PMA_ajaxResponse($message, false); + } + + function testAjaxResponseMessage() + { + $message = new PMA_Message("Message Text", 1); + + $this->expectOutputString('{"success":true,"message":"<div class=\"success\">Message Text<\/div>"}'); + PMA_ajaxResponse($message); + } + + function testAjaxResponseMessageWithExtra() + { + + $message = new PMA_Message("Message Text", 1); + $exra = array('str_val' => 'te\x/t"1', 'int_val' => 10); + + $this->expectOutputString('{"success":true,"message":"<div class=\"success\">Message Text<\/div>","str_val":"te\\\\x\/t\"1","int_val":10}'); + PMA_ajaxResponse($message, true, $exra); + } + + function testAjaxResponseMessageError() + { + + $message = new PMA_Message("Error Message Text", 1); + + // TODO: class for output div should be "error" + $this->expectOutputString('{"success":false,"error":"<div class=\"success\">Error Message Text<\/div>"}'); + PMA_ajaxResponse($message, false); + } + +} \ No newline at end of file diff --git a/test/libraries/common/PMA_browseUploadFile_test.php b/test/libraries/common/PMA_browseUploadFile_test.php new file mode 100644 index 0000000..45b8407 --- /dev/null +++ b/test/libraries/common/PMA_browseUploadFile_test.php @@ -0,0 +1,48 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_browseUploadFile from common.lib + * + * @package phpMyAdmin-test + * @version $Id: PMA_browseUploadFile_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_browseUploadFile_test extends PHPUnit_Extensions_OutputTestCase{ + + /* + * Data provider for test + */ + public function dataProvider() { + return array( + array(10, __('B'), "10"), + array(100, __('B'), "100"), + array(1024, __('B'), "1,024"), + array(102400, __('KiB'), "100"), + array(10240000, __('MiB'), "10"), + array(2147483648, __('MiB'), "2,048"), + array(21474836480, __('GiB'), "20") + ); + } + + /** + * @dataProvider dataProvider + * @return void + */ + function testBrowseUploadFile($size, $unit, $res){ + + $this->expectOutputString('<label for="radio_import_file">' . __("Browse your computer:") . '</label>' + . '<div id="upload_form_status" style="display: none;"></div>' + . '<div id="upload_form_status_info" style="display: none;"></div>' + . '<input type="file" name="import_file" id="input_import_file" />' + . "(" . __('Max: '). $res . $unit .")" . "\n" + . '<input type="hidden" name="MAX_FILE_SIZE" value="' .$size . '" />' . "\n"); + + PMA_browseUploadFile($size); + } +} \ No newline at end of file diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php new file mode 100644 index 0000000..130a972 --- /dev/null +++ b/test/libraries/common/PMA_buildActionTitles_test.php @@ -0,0 +1,42 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_buildActionTitles from common.lib + * + * @package phpMyAdmin-test + * @version $Id: PMA_buildActionTitles_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase{ + + function testBuildActionTitles(){ + $titles = array(); + + $titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse'), true); + $titles['NoBrowse'] = PMA_getIcon('bd_browse.png', __('Browse'), true); + $titles['Search'] = PMA_getIcon('b_select.png', __('Search'), true); + $titles['NoSearch'] = PMA_getIcon('bd_select.png', __('Search'), true); + $titles['Insert'] = PMA_getIcon('b_insrow.png', __('Insert'), true); + $titles['NoInsert'] = PMA_getIcon('bd_insrow.png', __('Insert'), true); + $titles['Structure'] = PMA_getIcon('b_props.png', __('Structure'), true); + $titles['Drop'] = PMA_getIcon('b_drop.png', __('Drop'), true); + $titles['NoDrop'] = PMA_getIcon('bd_drop.png', __('Drop'), true); + $titles['Empty'] = PMA_getIcon('b_empty.png', __('Empty'), true); + $titles['NoEmpty'] = PMA_getIcon('bd_empty.png', __('Empty'), true); + $titles['Edit'] = PMA_getIcon('b_edit.png', __('Edit'), true); + $titles['NoEdit'] = PMA_getIcon('bd_edit.png', __('Edit'), true); + $titles['Export'] = PMA_getIcon('b_export.png', __('Export'), true); + $titles['NoExport'] = PMA_getIcon('bd_export.png', __('Export'), true); + $titles['Execute'] = PMA_getIcon('b_nextpage.png', __('Execute'), true); + $titles['NoExecute'] = PMA_getIcon('bd_nextpage.png', __('Execute'), true); + + $this->assertEquals($titles, PMA_buildActionTitles()); + + } +} \ No newline at end of file diff --git a/test/libraries/common/PMA_cache_test.php b/test/libraries/common/PMA_cache_test.php index 9fd96a9..2284078 100644 --- a/test/libraries/common/PMA_cache_test.php +++ b/test/libraries/common/PMA_cache_test.php @@ -5,6 +5,7 @@ * * @package phpMyAdmin-test * @version $Id: PMA_cache_test.php + * @group common.lib-tests */ /* @@ -90,5 +91,18 @@ class PMA_cache_test extends PHPUnit_Framework_TestCase PMA_cacheUnset('test_data_2', true); $this->assertArrayNotHasKey('test_data_2', $_SESSION['cache']['server_server']); } + + /** + * Test clearing user cache + */ + public function testClearUserCache() + { + $GLOBALS['server'] = 'server'; + PMA_cacheSet('is_superuser', 'yes', true); + $this->assertEquals('yes', $_SESSION['cache']['server_server']['is_superuser']); + + PMA_clearUserCache(); + $this->assertArrayNotHasKey('is_superuser', $_SESSION['cache']['server_server']); + } } ?> diff --git a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php new file mode 100644 index 0000000..8f4059e --- /dev/null +++ b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php @@ -0,0 +1,37 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_contains_nonprintable_ascii from common.lib + * + * @package phpMyAdmin-test + * @version $Id: PMA_contains_nonprintable_ascii.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_contains_nonprintable_ascii extends PHPUnit_Framework_TestCase{ + + function dataProvider(){ + return array( + array("normal string", 0), + array("new\nline", 1), + array("tab\tspace", 1), + array("escape" . chr(27) . "char", 1), + array("chars%$\r\n",1), + ); + } + + /** + * @dataProvider dataProvider + */ + function testContainsNonPrintableAscii($str, $res){ + $this->assertEquals($res,PMA_contains_nonprintable_ascii($str)); + } + +} + +// PMA_contains_nonprintable_ascii \ No newline at end of file diff --git a/test/libraries/common/PMA_convert_bit_default_value_test.php b/test/libraries/common/PMA_convert_bit_default_value_test.php new file mode 100644 index 0000000..d54ab2d --- /dev/null +++ b/test/libraries/common/PMA_convert_bit_default_value_test.php @@ -0,0 +1,33 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_convert_bit_default_value from common.lib + * + * @package phpMyAdmin-test + * @version $Id: PMA_convert_bit_default_value_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_convert_bit_default_value_test extends PHPUnit_Framework_TestCase{ + + function dataProvider(){ + return array( + array("b'",""), + array("b'01'","01"), + array("b'010111010'","010111010") + ); + } + + /** + * @dataProvider dataProvider + */ + function testConvert_bit_default_value_test($bit, $val){ + $this->assertEquals($val, PMA_convert_bit_default_value($bit)); + + } +} diff --git a/test/libraries/common/PMA_displayMaximumUploadSize_test.php b/test/libraries/common/PMA_displayMaximumUploadSize_test.php new file mode 100644 index 0000000..ad93ddb --- /dev/null +++ b/test/libraries/common/PMA_displayMaximumUploadSize_test.php @@ -0,0 +1,41 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_displayMaximumUploadSize from common.lib.php + * + * @package phpMyAdmin-test + * @version $Id: PMA_displayMaximumUploadSize_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_displayMaximumUploadSize_test extends PHPUnit_Framework_TestCase{ + + /* + * Data provider for test + */ + public function dataProvider() { + return array( + array(10, __('B'), "10"), + array(100, __('B'), "100"), + array(1024, __('B'), "1,024"), + array(102400, __('KiB'), "100"), + array(10240000, __('MiB'), "10"), + array(2147483648, __('MiB'), "2,048"), + array(21474836480, __('GiB'), "20") + ); + } + + /** + * @dataProvider dataProvider + * @return void + */ + function testMaximumUploadSize($size, $unit, $res){ + $this->assertEquals("(" . __('Max: '). $res . $unit .")", PMA_displayMaximumUploadSize($size)); + + } +} \ No newline at end of file diff --git a/test/libraries/common/PMA_display_html_checkbox_test.php b/test/libraries/common/PMA_display_html_checkbox_test.php new file mode 100644 index 0000000..c779d72 --- /dev/null +++ b/test/libraries/common/PMA_display_html_checkbox_test.php @@ -0,0 +1,55 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_display_html_checkbox from common.lib.php + * + * @package phpMyAdmin-test + * @version $Id: PMA_display_html_checkbox_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_display_html_checkbox_test extends PHPUnit_Extensions_OutputTestCase +{ + function testDisplayHtmlCheckbox() + { + $name = "test_display_html_checkbox"; + $label = "text_label_for_checkbox"; + + $this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" /><label for="' . $name . '">' . $label . '</label>'); + PMA_display_html_checkbox($name,$label,false,false); + } + + function testDisplayHtmlCheckboxChecked() + { + $name = "test_display_html_checkbox"; + $label = "text_label_for_checkbox"; + + $this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" /><label for="' . $name . '">' . $label . '</label>'); + PMA_display_html_checkbox($name,$label,true,false); + } + + function testDisplayHtmlCheckboxOnclick() + { + $name = "test_display_html_checkbox"; + $label = "text_label_for_checkbox"; + + $this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" onclick="this.form.submit();" /><label for="' . $name . '">' . $label . '</label>'); + PMA_display_html_checkbox($name,$label,false,true); + } + + function testDisplayHtmlCheckboxCheckedOnclick() + { + $name = "test_display_html_checkbox"; + $label = "text_label_for_checkbox"; + + $this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" onclick="this.form.submit();" /><label for="' . $name . '">' . $label . '</label>'); + PMA_display_html_checkbox($name,$label,true,true); + } +} + +//PMA_display_html_checkbox \ No newline at end of file diff --git a/test/libraries/common/PMA_display_html_radio_test.php b/test/libraries/common/PMA_display_html_radio_test.php new file mode 100644 index 0000000..c5f2d4b --- /dev/null +++ b/test/libraries/common/PMA_display_html_radio_test.php @@ -0,0 +1,188 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_display_html_radio from common.lib.php + * + * @package phpMyAdmin-test + * @version $Id: PMA_display_html_radio_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase +{ + function testDisplayHtmlRadioEmpty() + { + $name = "test_display_radio"; + $choices = array(); + + $this->expectOutputString(""); + PMA_display_html_radio($name,$choices); + } + + function testDisplayHtmlRadio() + { + $name = "test_display_radio"; + $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2'); + + $out = ""; + foreach ($choices as $choice_value => $choice_label) { + $html_field_id = $name . '_' . $choice_value; + $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"'; + $out .= ' />' . "\n"; + $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>'; + $out .= '<br />'; + $out .= "\n"; + } + + $this->expectOutputString($out); + PMA_display_html_radio($name,$choices); + } + + function testDisplayHtmlRadioWithChecked() + { + $name = "test_display_radio"; + $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2'); + $checked_choice = "value_2"; + + $out = ""; + foreach ($choices as $choice_value => $choice_label) { + $html_field_id = $name . '_' . $choice_value; + $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"'; + if ($choice_value == $checked_choice) { + $out .= ' checked="checked"'; + } + $out .= ' />' . "\n"; + $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>'; + $out .= '<br />'; + $out .= "\n"; + } + + $this->expectOutputString($out); + PMA_display_html_radio($name,$choices,$checked_choice); + } + + function testDisplayHtmlRadioWithCheckedWithClass() + { + $name = "test_display_radio"; + $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2'); + $checked_choice = "value_2"; + $class = "test_class"; + + $out = ""; + foreach ($choices as $choice_value => $choice_label) { + $html_field_id = $name . '_' . $choice_value; + $out .= '<div class="' . $class . '">'; + $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"'; + if ($choice_value == $checked_choice) { + $out .= ' checked="checked"'; + } + $out .= ' />' . "\n"; + $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>'; + $out .= '<br />'; + $out .= '</div>'; + $out .= "\n"; + } + + $this->expectOutputString($out); + PMA_display_html_radio($name,$choices,$checked_choice,true,false,$class); + } + + function testDisplayHtmlRadioWithoutBR() + { + $name = "test_display_radio"; + $choices = array('value_1'=>'choice_1', 'value&_<2>'=>'choice_2'); + $checked_choice = "choice_2"; + + $out = ""; + foreach ($choices as $choice_value => $choice_label) { + $html_field_id = $name . '_' . $choice_value; + $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"'; + if ($choice_value == $checked_choice) { + $out .= ' checked="checked"'; + } + $out .= ' />' . "\n"; + $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>'; + $out .= "\n"; + } + + $this->expectOutputString($out); + PMA_display_html_radio($name,$choices,$checked_choice,false); + } + + function testDisplayHtmlRadioEscapeLabelEscapeLabel() + { + $name = "test_display_radio"; + $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_<2>'); + $checked_choice = "value_2"; + + $out = ""; + foreach ($choices as $choice_value => $choice_label) { + $html_field_id = $name . '_' . $choice_value; + $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"'; + if ($choice_value == $checked_choice) { + $out .= ' checked="checked"'; + } + $out .= ' />' . "\n"; + $out .= '<label for="' . $html_field_id . '">' . htmlspecialchars($choice_label) . '</label>'; + $out .= '<br />'; + $out .= "\n"; + } + + $this->expectOutputString($out); + PMA_display_html_radio($name,$choices,$checked_choice,true,true); + } + + function testDisplayHtmlRadioEscapeLabelNotEscapeLabel() + { + $name = "test_display_radio"; + $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_<2>'); + $checked_choice = "value_2"; + + $out = ""; + foreach ($choices as $choice_value => $choice_label) { + $html_field_id = $name . '_' . $choice_value; + $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"'; + if ($choice_value == $checked_choice) { + $out .= ' checked="checked"'; + } + $out .= ' />' . "\n"; + $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>'; + $out .= '<br />'; + $out .= "\n"; + } + + $this->expectOutputString($out); + PMA_display_html_radio($name,$choices,$checked_choice,true,false); + } + + function testDisplayHtmlRadioEscapeLabelEscapeLabelWithClass() + { + $name = "test_display_radio"; + $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_<2>'); + $checked_choice = "value_2"; + $class = "test_class"; + + $out = ""; + foreach ($choices as $choice_value => $choice_label) { + $html_field_id = $name . '_' . $choice_value; + $out .= '<div class="' . $class . '">'; + $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"'; + if ($choice_value == $checked_choice) { + $out .= ' checked="checked"'; + } + $out .= ' />' . "\n"; + $out .= '<label for="' . $html_field_id . '">' . htmlspecialchars($choice_label) . '</label>'; + $out .= '<br />'; + $out .= '</div>'; + $out .= "\n"; + } + + $this->expectOutputString($out); + PMA_display_html_radio($name,$choices,$checked_choice,true,true,$class); + } +} \ No newline at end of file diff --git a/test/libraries/common/PMA_escapeMySqlWildcards_test.php b/test/libraries/common/PMA_escapeMySqlWildcards_test.php index 8a65356..c77a841 100644 --- a/test/libraries/common/PMA_escapeMySqlWildcards_test.php +++ b/test/libraries/common/PMA_escapeMySqlWildcards_test.php @@ -4,6 +4,8 @@ * Test for MySQL Wildcards escaping/unescaping * * @package phpMyAdmin-test + * @version $Id: PMA_escapeMySqlWildcards_test.php + * @group common.lib-tests */ /* diff --git a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php new file mode 100644 index 0000000..038a36e --- /dev/null +++ b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php @@ -0,0 +1,37 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_extractValueFromFormattedSize from common.lib + * + * @package phpMyAdmin-test + * @version $Id: PMA_extractValueFromFormattedSize_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_extractValueFromFormattedSize_test extends PHPUnit_Framework_TestCase{ + + function testExtractValueFromFormattedSizeNoFormat(){ + + $this->assertEquals(-1,PMA_extractValueFromFormattedSize(100)); + } + + function testExtractValueFromFormattedSizeGB(){ + + $this->assertEquals(10737418240,PMA_extractValueFromFormattedSize("10GB")); + } + + function testExtractValueFromFormattedSizeMB(){ + + $this->assertEquals(15728640,PMA_extractValueFromFormattedSize("15MB")); + } + + function testExtractValueFromFormattedSizeK(){ + + $this->assertEquals(262144,PMA_extractValueFromFormattedSize("256K")); + } +} diff --git a/test/libraries/common/PMA_foreignKeySupported_test.php b/test/libraries/common/PMA_foreignKeySupported_test.php index 8f02aa5..e0ebd2e 100644 --- a/test/libraries/common/PMA_foreignKeySupported_test.php +++ b/test/libraries/common/PMA_foreignKeySupported_test.php @@ -4,6 +4,8 @@ * Test for supporting foreign key * * @package phpMyAdmin-test + * @version $Id: PMA_foreignKeySupported_test.php + * @group common.lib-tests */ /* diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php index ae0ce62..d800e1d 100644 --- a/test/libraries/common/PMA_formatNumberByteDown_test.php +++ b/test/libraries/common/PMA_formatNumberByteDown_test.php @@ -5,6 +5,7 @@ * * @package phpMyAdmin-test * @version $Id: PMA_formatNumberByteDown_test.php + * @group common.lib-tests */ /* @@ -75,9 +76,9 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase */ public function formatByteDownDataProvider() { return array( - array(10, 2, 2, array('10', 'B')), + array(10, 2, 2, array('10', __('B'))), array(100, 2, 0, array('0', __('KiB'))), - array(100, 3, 0, array('100', 'B')), + array(100, 3, 0, array('100', __('B'))), array(100, 2, 2, array('0.10', __('KiB'))), array(1034, 3, 2, array('1.01', __('KiB'))), array(100233, 3, 3, array('97.884', __('KiB'))), diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php new file mode 100644 index 0000000..51e58a1 --- /dev/null +++ b/test/libraries/common/PMA_formatSql_test.php @@ -0,0 +1,743 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_formatSql from common.lib.php + * + * @package phpMyAdmin-test + * @version $Id: PMA_formatSql_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_formatSql_test extends PHPUnit_Framework_TestCase{ + + /** + * temporary variable for globals array + */ + protected $tmpCfg; + + /** + * temporary variable for session array + */ + protected $tmpSession; + + /** + * storing globals and session + */ + public function setUp() { + global $cfg; + $this->tmpCfg = $cfg; + } + + /** + * recovering globals and session + */ + public function tearDown() { + global $cfg; + $cfg = $this->tmpCfg; + } + + function testFormatSQLNotArray(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'html'; + $sql = "SELECT * FROM tTable;"; + $this->assertEquals("<pre>\n$sql\n</pre>",PMA_formatSql($sql)); + } + + function testFormatSQLfmTypeHtml_1(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'html'; + $cfg['MySQLManualType'] = 'viewable'; + + $sql = array ( + 'raw' => 'SELECT 1;', + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'digit_integer', + 'data' => '1', + 'pos' => 8, + ), + 2 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 3, + ); + $unparsed = "SELECT 1;"; + $expected = '<span class="syntax"><span class="inner_sql"><span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span></a> <span class="syntax_digit syntax_digit_integer">1</span> <span class="syntax_punct syntax_punct_queryend">;</span><br /><br /></span></span>'; + + $this->assertEquals($expected,PMA_formatSql($sql, $unparsed)); + } + + function testFormatSQLfmTypeHtml_2(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'html'; + $cfg['MySQLManualType'] = 'viewable'; + + $unparsed = "SELECT * from `tTable`;"; + $sql = array ( + 'raw' => $unparsed, + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'punct', + 'data' => '*', + 'pos' => 0, + ), + 2 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'from', + 'pos' => 13, + 'forbidden' => true, + ), + 3 => + array ( + 'type' => 'quote_backtick', + 'data' => '`tTable`', + 'pos' => 0, + ), + 4 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 5, + ); + $expected = '<span class="syntax"><span class="inner_sql"><span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span></a> <span class="syntax_punct">*</span> <br /><span class="syntax_alpha syntax_alpha_reservedWord">FROM</span> <span class="syntax_quote syntax_quote_backtick">`tTable`</span> <span class="syntax_punct syntax_punct_queryend">;</span><br /><br /></span></span>'; + + $this->assertEquals($expected,PMA_formatSql($sql, $unparsed)); + } + + function testFormatSQLfmTypeHtml_3(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'html'; + $cfg['MySQLManualType'] = 'viewable'; + + $unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; + $sql = array ( + 'raw' => $unparsed, + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'punct', + 'data' => '*', + 'pos' => 0, + ), + 2 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'FROM', + 'pos' => 13, + 'forbidden' => true, + ), + 3 => + array ( + 'type' => 'quote_backtick', + 'data' => '`tTable_A`', + 'pos' => 0, + ), + 4 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'A', + 'pos' => 26, + 'forbidden' => false, + ), + 5 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'INNER', + 'pos' => 32, + 'forbidden' => true, + ), + 6 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'JOIN', + 'pos' => 37, + 'forbidden' => true, + ), + 7 => + array ( + 'type' => 'quote_backtick', + 'data' => '`tTable_B`', + 'pos' => 0, + ), + 8 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'B', + 'pos' => 50, + 'forbidden' => false, + ), + 9 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'ON', + 'pos' => 53, + 'forbidden' => true, + ), + 10 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'B', + 'pos' => 55, + 'forbidden' => false, + ), + 11 => + array ( + 'type' => 'punct_qualifier', + 'data' => '.', + 'pos' => 0, + ), + 12 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'ID', + 'pos' => 58, + 'forbidden' => false, + ), + 13 => + array ( + 'type' => 'punct', + 'data' => '=', + 'pos' => 0, + ), + 14 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'A', + 'pos' => 62, + 'forbidden' => false, + ), + 15 => + array ( + 'type' => 'punct_qualifier', + 'data' => '.', + 'pos' => 0, + ), + 16 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'ID', + 'pos' => 65, + 'forbidden' => false, + ), + 17 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 18, + ); + + $expected = '<span class="syntax"><span class="inner_sql"><span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span></a> <span class="syntax_punct">*</span> <br /><span class="syntax_alpha syntax_alpha_reservedWord">FROM</span> <span class="syntax_quote syntax_quote_backtick">`tTable_A`</span> <span class="syntax_alpha syntax_alpha_identifier">A</span><br /><span class="syntax_alpha syntax_alpha_reservedWord">INNER</span> <span class="syntax_alpha syntax_alpha_reservedWord">JOIN</span> <span class="syntax_quote syntax_quote_backtick">`tTable_B`</span> <span class="syntax_alpha syntax_alpha_identifier">B</span> <span class="syntax_alpha syntax_alpha_reservedWord">ON</span> <span class="syntax_alpha syntax_alpha_identifier">B</span><span class="syntax_punct syntax_punct_qualifier">.</span><span class="syntax_alpha syntax_alpha_identifier">ID</span> <span class="syntax_punct">=</span></a> <span class="syntax_alpha syntax_alpha_identifier">A</span><span class="syntax_punct syntax_punct_qualifier">.</span><span class="syntax_alpha syntax_alpha_identifier">ID</span><span class="syntax_punct syntax_punct_queryend">;</span><br /><br /></span></span>'; + + $this->assertEquals($expected,PMA_formatSql($sql, $unparsed)); + } + + function testFormatSQLfmTypeText_1(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'text'; + $cfg['MySQLManualType'] = 'viewable'; + + $sql = array ( + 'raw' => 'SELECT 1;', + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'digit_integer', + 'data' => '1', + 'pos' => 8, + ), + 2 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 3, + ); + $unparsed = "SELECT 1;"; + $expected = '<span class="inner_sql">SELECT</a> 1 ;<br /><br /></span>'; + + $this->assertEquals($expected,PMA_formatSql($sql, $unparsed)); + } + + function testFormatSQLfmTypeText_2(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'text'; + $cfg['MySQLManualType'] = 'viewable'; + + $unparsed = "SELECT * from `tTable`;"; + $sql = array ( + 'raw' => $unparsed, + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'punct', + 'data' => '*', + 'pos' => 0, + ), + 2 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'from', + 'pos' => 13, + 'forbidden' => true, + ), + 3 => + array ( + 'type' => 'quote_backtick', + 'data' => '`tTable`', + 'pos' => 0, + ), + 4 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 5, + ); + $expected = '<span class="inner_sql">SELECT</a> * <br />FROM `tTable` ;<br /><br /></span>'; + + $this->assertEquals($expected,PMA_formatSql($sql, $unparsed)); + } + + function testFormatSQLfmTypeText_3(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'text'; + $cfg['MySQLManualType'] = 'viewable'; + + $unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; + $sql = array ( + 'raw' => $unparsed, + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'punct', + 'data' => '*', + 'pos' => 0, + ), + 2 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'FROM', + 'pos' => 13, + 'forbidden' => true, + ), + 3 => + array ( + 'type' => 'quote_backtick', + 'data' => '`tTable_A`', + 'pos' => 0, + ), + 4 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'A', + 'pos' => 26, + 'forbidden' => false, + ), + 5 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'INNER', + 'pos' => 32, + 'forbidden' => true, + ), + 6 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'JOIN', + 'pos' => 37, + 'forbidden' => true, + ), + 7 => + array ( + 'type' => 'quote_backtick', + 'data' => '`tTable_B`', + 'pos' => 0, + ), + 8 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'B', + 'pos' => 50, + 'forbidden' => false, + ), + 9 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'ON', + 'pos' => 53, + 'forbidden' => true, + ), + 10 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'B', + 'pos' => 55, + 'forbidden' => false, + ), + 11 => + array ( + 'type' => 'punct_qualifier', + 'data' => '.', + 'pos' => 0, + ), + 12 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'ID', + 'pos' => 58, + 'forbidden' => false, + ), + 13 => + array ( + 'type' => 'punct', + 'data' => '=', + 'pos' => 0, + ), + 14 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'A', + 'pos' => 62, + 'forbidden' => false, + ), + 15 => + array ( + 'type' => 'punct_qualifier', + 'data' => '.', + 'pos' => 0, + ), + 16 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'ID', + 'pos' => 65, + 'forbidden' => false, + ), + 17 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 18, + ); + $expected = '<span class="inner_sql">SELECT</a> * <br />FROM `tTable_A` A<br />INNER JOIN `tTable_B` B ON B.ID =</a> A.ID;<br /><br /></span>'; + + $this->assertEquals($expected,PMA_formatSql($sql, $unparsed)); + } + + function testFormatSQLfmTypeNone_1(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'none'; + $cfg['MySQLManualType'] = 'viewable'; + + $sql = array ( + 'raw' => 'SELECT 1;', + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'digit_integer', + 'data' => '1', + 'pos' => 8, + ), + 2 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 3, + ); + $unparsed = "SELECT 1;"; + + $expected = "<span class=\"inner_sql\"><pre>\nSELECT 1;\n</pre></span>"; + $this->assertEquals($expected,PMA_formatSql($sql, $unparsed)); + + $expected = "SELECT 1;"; + $this->assertEquals($expected,PMA_formatSql($sql)); + } + + function testFormatSQLfmTypeNone_2(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'none'; + $cfg['MySQLManualType'] = 'viewable'; + + $unparsed = "SELECT * from `tTable`;"; + $sql = array ( + 'raw' => $unparsed, + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'punct', + 'data' => '*', + 'pos' => 0, + ), + 2 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'from', + 'pos' => 13, + 'forbidden' => true, + ), + 3 => + array ( + 'type' => 'quote_backtick', + 'data' => '`tTable`', + 'pos' => 0, + ), + 4 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 5, + ); + + $expected = "<span class=\"inner_sql\"><pre>\nSELECT * from `tTable`;\n</pre></span>"; + $this->assertEquals($expected,PMA_formatSql($sql, $unparsed)); + + $expected = "SELECT * from `tTable`;"; + $this->assertEquals($expected,PMA_formatSql($sql)); + } + + function testFormatSQLfmTypeNone_3(){ + global $cfg; + $cfg['SQP']['fmtType'] = 'none'; + $cfg['MySQLManualType'] = 'viewable'; + + $unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; + $sql = array ( + 'raw' => $unparsed, + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'punct', + 'data' => '*', + 'pos' => 0, + ), + 2 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'FROM', + 'pos' => 13, + 'forbidden' => true, + ), + 3 => + array ( + 'type' => 'quote_backtick', + 'data' => '`tTable_A`', + 'pos' => 0, + ), + 4 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'A', + 'pos' => 26, + 'forbidden' => false, + ), + 5 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'INNER', + 'pos' => 32, + 'forbidden' => true, + ), + 6 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'JOIN', + 'pos' => 37, + 'forbidden' => true, + ), + 7 => + array ( + 'type' => 'quote_backtick', + 'data' => '`tTable_B`', + 'pos' => 0, + ), + 8 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'B', + 'pos' => 50, + 'forbidden' => false, + ), + 9 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'ON', + 'pos' => 53, + 'forbidden' => true, + ), + 10 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'B', + 'pos' => 55, + 'forbidden' => false, + ), + 11 => + array ( + 'type' => 'punct_qualifier', + 'data' => '.', + 'pos' => 0, + ), + 12 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'ID', + 'pos' => 58, + 'forbidden' => false, + ), + 13 => + array ( + 'type' => 'punct', + 'data' => '=', + 'pos' => 0, + ), + 14 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'A', + 'pos' => 62, + 'forbidden' => false, + ), + 15 => + array ( + 'type' => 'punct_qualifier', + 'data' => '.', + 'pos' => 0, + ), + 16 => + array ( + 'type' => 'alpha_identifier', + 'data' => 'ID', + 'pos' => 65, + 'forbidden' => false, + ), + 17 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 18, + ); + + $expected = "<span class=\"inner_sql\"><pre>\nSELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;\n</pre></span>"; + $this->assertEquals($expected,PMA_formatSql($sql, $unparsed)); + + $expected = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; + $this->assertEquals($expected,PMA_formatSql($sql)); + } + + function testFormatSQLWithoutType(){ + global $cfg; + $cfg['SQP']['fmtType'] = ''; + $cfg['MySQLManualType'] = 'viewable'; + $sql = array ( + 'raw' => 'SELECT 1;', + 0 => + array ( + 'type' => 'alpha_reservedWord', + 'data' => 'SELECT', + 'pos' => 6, + 'forbidden' => true, + ), + 1 => + array ( + 'type' => 'digit_integer', + 'data' => '1', + 'pos' => 8, + ), + 2 => + array ( + 'type' => 'punct_queryend', + 'data' => ';', + 'pos' => 0, + ), + 'len' => 3, + ); + $this->assertEmpty(PMA_formatSql($sql)); + } + + function testFormatSQLError(){ + global $SQP_errorString; + $SQP_errorString = true; + $sql = array("raw" => "& \" < >"); + $this->assertEquals("& " < >",PMA_formatSql($sql)); + $SQP_errorString = false; + } +} diff --git a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php new file mode 100644 index 0000000..3cd6810 --- /dev/null +++ b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php @@ -0,0 +1,40 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_generateHiddenMaxFileSize from common.lib.php + * + * @package phpMyAdmin-test + * @version $Id: PMA_generateHiddenMaxFileSize_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_generateHiddenMaxFileSize_test extends PHPUnit_Framework_TestCase{ + + /* + * Data provider for test + */ + public function dataProvider() { + return array( + array(10), + array("100"), + array(1024), + array("1024Mb"), + array(2147483648), + array("some_string") + ); + } + + /** + * @dataProvider dataProvider + * @return void + */ + function test_generateHiddenMaxFileSize($size){ + $this->assertEquals(PMA_generateHiddenMaxFileSize($size), + '<input type="hidden" name="MAX_FILE_SIZE" value="' .$size . '" />'); + } +} diff --git a/test/libraries/common/PMA_generate_html_dropdown_test.php b/test/libraries/common/PMA_generate_html_dropdown_test.php new file mode 100644 index 0000000..8e27c20 --- /dev/null +++ b/test/libraries/common/PMA_generate_html_dropdown_test.php @@ -0,0 +1,69 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_generate_html_dropdown_test from common.lib.php + * + * @package phpMyAdmin-test + * @version $Id: PMA_display_html_checkbox_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_generate_html_dropdown_test extends PHPUnit_Framework_TestCase +{ + function testGenerateHtmlDropdownEmpty() + { + $name = "test_dropdown_name"; + $choices = array(); + $active_choice = null; + $id = "test_<dropdown>_name"; + + $result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '"></select>'; + + $this->assertEquals($result, PMA_generate_html_dropdown($name,$choices,$active_choice,$id)); + } + + function testGenerateHtmlDropdown() + { + $name = "&test_dropdown_name"; + $choices = array("value_1" => "label_1", "value&_2\"" => "label_2"); + $active_choice = null; + $id = "test_<dropdown>_name"; + + $result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '">'; + foreach ($choices as $one_choice_value => $one_choice_label) { + $result .= '<option value="' . htmlspecialchars($one_choice_value) . '"'; + if ($one_choice_value == $active_choice) { + $result .= ' selected="selected"'; + } + $result .= '>' . htmlspecialchars($one_choice_label) . '</option>'; + } + $result .= '</select>'; + + $this->assertEquals($result, PMA_generate_html_dropdown($name,$choices,$active_choice,$id)); + } + + function testGenerateHtmlDropdownWithActive() + { + $name = "&test_dropdown_name"; + $choices = array("value_1" => "label_1", "value&_2\"" => "label_2"); + $active_choice = "value&_2\""; + $id = "test_<dropdown>_name"; + + $result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '">'; + foreach ($choices as $one_choice_value => $one_choice_label) { + $result .= '<option value="' . htmlspecialchars($one_choice_value) . '"'; + if ($one_choice_value == $active_choice) { + $result .= ' selected="selected"'; + } + $result .= '>' . htmlspecialchars($one_choice_label) . '</option>'; + } + $result .= '</select>'; + + $this->assertEquals($result, PMA_generate_html_dropdown($name,$choices,$active_choice,$id)); + } +} \ No newline at end of file diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php new file mode 100644 index 0000000..7835aca --- /dev/null +++ b/test/libraries/common/PMA_getIcon_test.php @@ -0,0 +1,74 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_getIcon() from common.lib.php + * + * @package phpMyAdmin-test + * @version $Id: PMA_getIcon_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ + + function testGetIconWithoutPropertiesIconic(){ + + $GLOBALS['cfg']['PropertiesIconic'] = false; + $GLOBALS['pmaThemeImage'] = 'theme/'; + + $this->assertEquals('<span class="nowrap"></span>', + PMA_getIcon('b_comment.png') ); + } + + function testGetIconWithPropertiesIconic(){ + + $GLOBALS['cfg']['PropertiesIconic'] = true; + $GLOBALS['pmaThemeImage'] = 'theme/'; + + $this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage'] + . 'b_comment.png" title="" alt="" class="icon" width="16" height="16" /></span>', + PMA_getIcon('b_comment.png') ); + } + + function testGetIconAlternate(){ + + $GLOBALS['cfg']['PropertiesIconic'] = true; + $GLOBALS['pmaThemeImage'] = 'theme/'; + $alternate_text = 'alt_str'; + + $this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage'] + .'b_comment.png" title="' . $alternate_text . '" alt="' . $alternate_text + . '" class="icon" width="16" height="16" /></span>', + PMA_getIcon('b_comment.png',$alternate_text) ); + } + + function testGetIconWithContainer(){ + + $GLOBALS['cfg']['PropertiesIconic'] = true; + $GLOBALS['pmaThemeImage'] = 'theme/'; + $alternate_text = 'alt_str'; + + $this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage'] + .'b_comment.png" title="' . $alternate_text . '" alt="' . $alternate_text + . '" class="icon" width="16" height="16" /></span>', + PMA_getIcon('b_comment.png',$alternate_text, true) ); + + } + + function testGetIconWithContainerAndForceText(){ + + $GLOBALS['cfg']['PropertiesIconic'] = true; + $GLOBALS['pmaThemeImage'] = 'theme/'; + $alternate_text = 'alt_str'; + + $this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage'] + .'b_comment.png" title="' . $alternate_text . '" alt="' . $alternate_text + . '" class="icon" width="16" height="16" /> ' . $alternate_text . '</span>', + PMA_getIcon('b_comment.png',$alternate_text, true, true) ); + + } +} \ No newline at end of file diff --git a/test/libraries/common/PMA_getTitleForTarget_test.php b/test/libraries/common/PMA_getTitleForTarget_test.php new file mode 100644 index 0000000..1756681 --- /dev/null +++ b/test/libraries/common/PMA_getTitleForTarget_test.php @@ -0,0 +1,43 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_getTitleForTarget from common.lib + * + * @package phpMyAdmin-test + * @version $Id: PMA_getTitleForTarget_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_getTitleForTarget_test extends PHPUnit_Framework_TestCase{ + + function dataProvider(){ + return array( + array('tbl_structure.php', __('Structure')), + array('tbl_sql.php', __('SQL'),), + array('tbl_select.php', __('Search'),), + array('tbl_change.php', __('Insert')), + array('sql.php', __('Browse')), + array('db_structure.php', __('Structure')), + array('db_sql.php', __('SQL')), + array('db_search.php', __('Search')), + array('db_operations.php', __('Operations')), + ); + } + + /** + * @dataProvider dataProvider + * @return void + */ + function testGetTitleForTarget($target, $result){ + + $this->assertEquals($result,PMA_getTitleForTarget($target)); + } + +} + +//PMA_getTitleForTarget \ No newline at end of file diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php index 6443b65..7ec0364 100644 --- a/test/libraries/common/PMA_localisedDateTimespan_test.php +++ b/test/libraries/common/PMA_localisedDateTimespan_test.php @@ -5,13 +5,13 @@ * * @package phpMyAdmin-test * @version $Id: PMA_localisedDateTimespan_test.php + * @group common.lib-tests */ /* * Include to test. */ require_once 'libraries/common.lib.php'; -require_once 'libraries/php-gettext/gettext.inc'; class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase { diff --git a/test/libraries/common/PMA_pow_test.php b/test/libraries/common/PMA_pow_test.php index c37dd0d..ff55e16 100644 --- a/test/libraries/common/PMA_pow_test.php +++ b/test/libraries/common/PMA_pow_test.php @@ -4,6 +4,8 @@ * Tests for PMA_pow() function from common.lib.php * * @package phpMyAdmin-test + * @version $Id: PMA_pow_test.php + * @group common.lib-tests */ /* diff --git a/test/libraries/common/PMA_printableBitValue_test.php b/test/libraries/common/PMA_printableBitValue_test.php index 54ad1ff..d211981 100644 --- a/test/libraries/common/PMA_printableBitValue_test.php +++ b/test/libraries/common/PMA_printableBitValue_test.php @@ -5,6 +5,7 @@ * * @package phpMyAdmin-test * @version $Id: PMA_printableBitValue_test.php + * @group common.lib-tests */ /* diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index a6ee615..f63539f 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -5,12 +5,14 @@ * * @package phpMyAdmin-test * @version $Id: PMA_quoting_slashing_test.php + * @group common.lib-tests */ /* * Include to test. */ require_once 'libraries/common.lib.php'; +require_once 'libraries/sqlparser.data.php'; class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase { @@ -88,9 +90,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase * @dataProvider backquoteDataProvider */ public function testBackquote($a, $b) { - //$this->assertEquals($a, PMA_backquote($a, false)); - //$this->assertEquals($b, PMA_backquote($a)); - $this->markTestSkipped("Fix test for PMA_backquote() "); + $this->assertEquals($a, PMA_backquote($a, false)); + $this->assertEquals($b, PMA_backquote($a)); } } ?> diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php new file mode 100644 index 0000000..7508564 --- /dev/null +++ b/test/libraries/common/PMA_showMessage_test_disabled.php @@ -0,0 +1,45 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_showMessage from common.lib + * + * @package phpMyAdmin-test + * @version $Id: PMA_showMessage_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; +include 'libraries/core.lib.php'; +include 'libraries/vendor_config.php'; +include 'libraries/config.default.php'; +include 'libraries/database_interface.lib.php'; +include 'libraries/Table.class.php'; +require 'libraries/php-gettext/gettext.inc'; + +class PMA_showMessage_test extends PHPUnit_Framework_TestCase +{ + protected $backupGlobals = FALSE; + + function testShowMessageNotAjax(){ +// global $cfg, $GLOBALS; + +// $GLOBALS['sql_query'] = "SELECT * FROM tTable"; +// $GLOBALS['table'] = 'tbl1'; +// $cfg['SQP']['fmtType'] = 'none'; +// $cfg['ShowTooltip'] = false; +// $cfg['ShowSQL'] = true; +// $cfg['MaxCharactersInDisplayedSQL'] = 1000; +// +// print_r($cfg); + + $GLOBALS['is_ajax_request'] = false; + $GLOBALS['db'] = 'db'; + $GLOBALS['table'] = 'table'; + + $this->assertEquals("",PMA_showMessage("msg")); + $this->assertTrue(true); + } +} \ No newline at end of file diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php index 6af1748..f57a2b4 100644 --- a/test/libraries/common/PMA_stringOperations_test.php +++ b/test/libraries/common/PMA_stringOperations_test.php @@ -5,6 +5,7 @@ * * @package phpMyAdmin-test * @version $Id: PMA_stringOperations_test.php + * @group common.lib-tests */ /* diff --git a/test/libraries/common/PMA_unsupportedDatatypes_test.php b/test/libraries/common/PMA_unsupportedDatatypes_test.php new file mode 100644 index 0000000..686e4ee --- /dev/null +++ b/test/libraries/common/PMA_unsupportedDatatypes_test.php @@ -0,0 +1,32 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_unsupportedDatatypes from common.lib + * + * @package phpMyAdmin-test + * @version $Id: PMA_unsupportedDatatypes_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_unsupportedDatatypes_test extends PHPUnit_Framework_TestCase +{ + + function testNotSupportedDataTypes() + { + $no_support_types = array('geometry', + 'point', + 'linestring', + 'polygon', + 'multipoint', + 'multilinestring', + 'multipolygon', + 'geometrycollection' + ); + $this->assertEquals($no_support_types, PMA_unsupportedDatatypes()); + } +} \ No newline at end of file diff --git a/test/libraries/common/PMA_whichCrlf_test.php b/test/libraries/common/PMA_whichCrlf_test.php index 6d8e25a..52d8323 100644 --- a/test/libraries/common/PMA_whichCrlf_test.php +++ b/test/libraries/common/PMA_whichCrlf_test.php @@ -5,6 +5,7 @@ * * @package phpMyAdmin-test * @version $Id: PMA_whichCrlf_test.php + * @group common.lib-tests */ /* diff --git a/themes/original/jquery/jquery-ui-1.8.override.css b/themes/original/jquery/jquery-ui-1.8.override.css new file mode 100644 index 0000000..4aee6fb --- /dev/null +++ b/themes/original/jquery/jquery-ui-1.8.override.css @@ -0,0 +1,7 @@ +/** + * Use this file to override styles set by jquery-ui-1.8.custom.css + */ + +/* Component containers +----------------------------------*/ +.ui-widget { font-size: 1em; } diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.override.css b/themes/pmahomme/jquery/jquery-ui-1.8.override.css new file mode 100644 index 0000000..4aee6fb --- /dev/null +++ b/themes/pmahomme/jquery/jquery-ui-1.8.override.css @@ -0,0 +1,7 @@ +/** + * Use this file to override styles set by jquery-ui-1.8.custom.css + */ + +/* Component containers +----------------------------------*/ +.ui-widget { font-size: 1em; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, unittesting, updated. RELEASE_3_4_3_1-6550-gfc5a9a6
by Herman van Rink 06 Jul '11

06 Jul '11

The branch, unittesting has been updated via fc5a9a6131f9bec3c7f8c91666f483b9487c1132 (commit) from d17aab53e4fd3a9f45428e86864c8a985e2a0100 (commit) - Log ----------------------------------------------------------------- commit fc5a9a6131f9bec3c7f8c91666f483b9487c1132 Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Jul 6 10:27:52 2011 +0200 Added htaccess and README to test directory ----------------------------------------------------------------------- Summary of changes: test/.htaccess | 4 ++++ test/README | 11 +++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) create mode 100644 test/.htaccess create mode 100644 test/README diff --git a/test/.htaccess b/test/.htaccess new file mode 100644 index 0000000..70a1177 --- /dev/null +++ b/test/.htaccess @@ -0,0 +1,4 @@ +# This folder does not require access over HTTP +# (the following directive denies access by default) +# For more information see: http://httpd.apache.org/docs/current/mod/mod_authz_host.html#allow +Order allow,deny diff --git a/test/README b/test/README new file mode 100644 index 0000000..a7e287a --- /dev/null +++ b/test/README @@ -0,0 +1,11 @@ +PhpMyAdmin test suite +===================== + +This directory is protected from web visitors by a .htaccess file. + +For more information on allowing http access to this directory see: +http://httpd.apache.org/docs/current/mod/mod_authz_host.html#allow + +Please visit the wiki for more information on unit testing: +https://wiki.phpmyadmin.net/pma/UnitTesting + hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-6546-g39cb55a
by Herman van Rink 05 Jul '11

05 Jul '11

The branch, master has been updated via 39cb55a0defbf2634b2bc097f96e0d559303f5f7 (commit) via 82f83dac2f6b07bef76f6c3fb795ce7c0c417af8 (commit) from 70c70db1392e703346434e65d59110a6ba321367 (commit) - Log ----------------------------------------------------------------- commit 39cb55a0defbf2634b2bc097f96e0d559303f5f7 Merge: 82f83dac2f6b07bef76f6c3fb795ce7c0c417af8 70c70db1392e703346434e65d59110a6ba321367 Author: Herman van Rink <rink(a)initfour.nl> Date: Tue Jul 5 14:46:24 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 82f83dac2f6b07bef76f6c3fb795ce7c0c417af8 Author: Herman van Rink <rink(a)initfour.nl> Date: Tue Jul 5 14:46:13 2011 +0200 Fixed XSS in unreleased RecentTable class ----------------------------------------------------------------------- Summary of changes: libraries/RecentTable.class.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index f844bbc..bfb6081 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -142,7 +142,7 @@ class PMA_RecentTable $html = '<option value="">(' . __('Recent tables') . ') ...</option>'; if (count($this->tables)) { foreach ($this->tables as $table) { - $html .= '<option value="' . $table . '">' . $table . '</option>'; + $html .= '<option value="' . htmlspecialchars($table) . '">' . htmlspecialchars($table) . '</option>'; } } else { $html .= '<option value="">' . __('There are no recent tables') . '</option>'; @@ -158,7 +158,7 @@ class PMA_RecentTable public function getHtmlSelect() { $html = '<input type="hidden" name="goto" id="LeftDefaultTabTable" value="' . - $GLOBALS['cfg']['LeftDefaultTabTable'] . '" />'; + htmlspecialchars($GLOBALS['cfg']['LeftDefaultTabTable']) . '" />'; $html .= '<select name="table" id="recentTable">'; $html .= $this->getHtmlSelectOption(); $html .= '</select>'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-6544-g70c70db
by Rouslan Placella 05 Jul '11

05 Jul '11

The branch, master has been updated via 70c70db1392e703346434e65d59110a6ba321367 (commit) from a88054dae9a969c0c9ec6477fce130b70a777749 (commit) - Log ----------------------------------------------------------------- commit 70c70db1392e703346434e65d59110a6ba321367 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Jul 5 13:00:21 2011 +0100 Fix for bug #3353856 - AJAX dialogs use wrong font-size ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/db_routines.js | 4 ++-- js/functions.js | 2 +- libraries/header_meta_style.inc.php | 7 +++++++ themes/original/jquery/jquery-ui-1.8.override.css | 7 +++++++ themes/pmahomme/jquery/jquery-ui-1.8.override.css | 7 +++++++ 6 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 themes/original/jquery/jquery-ui-1.8.override.css create mode 100644 themes/pmahomme/jquery/jquery-ui-1.8.override.css diff --git a/ChangeLog b/ChangeLog index ff4f0ae..4ae25e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog + Display direction (horizontal/vertical) no longer displayed by default + Shift/click support in database Structure + Show/hide column in table Browse +- bug #3353856 [AJAX] AJAX dialogs use wrong font-size 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/js/db_routines.js b/js/db_routines.js index 95254ca..ceb0962 100644 --- a/js/db_routines.js +++ b/js/db_routines.js @@ -308,7 +308,7 @@ $(document).ready(function() { /** * Display the dialog to the user */ - $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({ + $ajaxDialog = $('<div>'+data.message+'</div>').dialog({ width: 700, // TODO: make a better decision about the size height: 550, // of the dialog based on the size of the viewport buttons: button_options, @@ -529,7 +529,7 @@ $(document).ready(function() { /** * Display the dialog to the user */ - $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({ + $ajaxDialog = $('<div>'+data.message+'</div>').dialog({ width: 650, // TODO: make a better decision about the size // of the dialog based on the size of the viewport buttons: button_options, diff --git a/js/functions.js b/js/functions.js index e25ec98..9cdb44e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2445,7 +2445,7 @@ $(document).ready(function() { /** * Display the dialog to the user */ - var $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({ + var $ajaxDialog = $('<div>'+data.message+'</div>').dialog({ width: 500, buttons: button_options, title: data.title diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 5e5c533..e78b653 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -48,4 +48,11 @@ if ($GLOBALS['text_dir'] == 'ltr') { <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" /> <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" /> +<?php + if (is_readable($GLOBALS['pmaThemePath'] . '/jquery/jquery-ui-1.8.override.css')) { +?> + <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.override.css" /> +<?php + } +?> <meta name="robots" content="noindex,nofollow" /> diff --git a/themes/original/jquery/jquery-ui-1.8.override.css b/themes/original/jquery/jquery-ui-1.8.override.css new file mode 100644 index 0000000..4aee6fb --- /dev/null +++ b/themes/original/jquery/jquery-ui-1.8.override.css @@ -0,0 +1,7 @@ +/** + * Use this file to override styles set by jquery-ui-1.8.custom.css + */ + +/* Component containers +----------------------------------*/ +.ui-widget { font-size: 1em; } diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.override.css b/themes/pmahomme/jquery/jquery-ui-1.8.override.css new file mode 100644 index 0000000..4aee6fb --- /dev/null +++ b/themes/pmahomme/jquery/jquery-ui-1.8.override.css @@ -0,0 +1,7 @@ +/** + * Use this file to override styles set by jquery-ui-1.8.custom.css + */ + +/* Component containers +----------------------------------*/ +.ui-widget { font-size: 1em; } hooks/post-receive -- phpMyAdmin

1 0