[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8910-gc0482e1
by Piotr Przybylski 28 Aug '10
by Piotr Przybylski 28 Aug '10
28 Aug '10
The branch, master has been updated
via c0482e135b3a01ede5328ee8fbeb920e1345f3a2 (commit)
via a82b355fc90081194c71806f851274fa817bbed2 (commit)
via 1dba66c13f5cb4e89ae326654bfa8c350974a601 (commit)
from 9a9399e07a7b1d11e18e1dd0aa7a2668188fc03c (commit)
- Log -----------------------------------------------------------------
commit c0482e135b3a01ede5328ee8fbeb920e1345f3a2
Merge: a82b355fc90081194c71806f851274fa817bbed2 9a9399e07a7b1d11e18e1dd0aa7a2668188fc03c
Author: Crack <piotrprz(a)gmail.com>
Date: Sat Aug 28 12:12:52 2010 +0200
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit a82b355fc90081194c71806f851274fa817bbed2
Author: Crack <piotrprz(a)gmail.com>
Date: Fri Aug 27 15:57:45 2010 +0200
simplified PMA_SETUP checks
commit 1dba66c13f5cb4e89ae326654bfa8c350974a601
Author: Crack <piotrprz(a)gmail.com>
Date: Fri Aug 27 15:55:06 2010 +0200
user cannot restore a setting to its default value if it's set in config.inc.php
-----------------------------------------------------------------------
Summary of changes:
libraries/config/ConfigFile.class.php | 18 ++++++++++++------
libraries/config/FormDisplay.class.php | 6 +++---
libraries/config/FormDisplay.tpl.php | 6 +++---
libraries/config/validate.lib.php | 2 +-
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 41ffe4b..7a15a89 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -174,6 +174,8 @@ class ConfigFile
/**
* Sets config value
*
+ * @uses $GLOBALS['cfg']
+ * @uses PMA_array_read()
* @uses PMA_array_remove()
* @uses PMA_array_write()
* @param string $path
@@ -190,13 +192,17 @@ class ConfigFile
return;
}
// remove if the path isn't protected and it's empty or has a default value
- $default_value = $this->getDefault($canonical_path);
- if (!isset($this->persistKeys[$canonical_path])
- && (($value === $default_value) || (empty($value) && empty($default_value)))) {
- PMA_array_remove($path, $_SESSION[$this->id]);
- } else {
- PMA_array_write($path, $_SESSION[$this->id], $value);
+ if (!isset($this->persistKeys[$canonical_path])) {
+ $default_value = $this->getDefault($canonical_path);
+ // check $GLOBALS['cfg'] to allow overwriting options set in config.inc.php with default value
+ $current_global = PMA_array_read($canonical_path, $GLOBALS['cfg']);
+ if (($value === $default_value && (defined('PMA_SETUP') || $current_global === $default_value))
+ || (empty($value) && empty($default_value) && (defined('PMA_SETUP') || empty($current_global)))) {
+ PMA_array_remove($path, $_SESSION[$this->id]);
+ return;
+ }
}
+ PMA_array_write($path, $_SESSION[$this->id], $value);
}
/**
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 5a08f5e..fb07052 100755
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -498,7 +498,7 @@ class FormDisplay
$values = array();
$to_save = array();
- $is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
+ $is_setup_script = defined('PMA_SETUP');
if ($is_setup_script) {
$this->_loadUserprefsInfo();
}
@@ -706,7 +706,7 @@ class FormDisplay
if ($this->userprefs_keys === null) {
$this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames());
// read real config for user preferences display
- $userprefs_disallow = defined('PMA_SETUP') && PMA_SETUP
+ $userprefs_disallow = defined('PMA_SETUP')
? ConfigFile::getInstance()->get('UserprefsDisallow', array())
: $GLOBALS['cfg']['UserprefsDisallow'];
$this->userprefs_disallow = array_flip($userprefs_disallow);
@@ -767,7 +767,7 @@ class FormDisplay
}
}
}
- if (!defined('PMA_SETUP') || !PMA_SETUP) {
+ if (!defined('PMA_SETUP')) {
if (($system_path == 'MaxDbList' || $system_path == 'MaxTableList'
|| $system_path == 'QueryHistoryMax')) {
$opts['comment'] = sprintf(__('maximum %s'), $GLOBALS['cfg'][$system_path]);
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 40c59d1..8667208 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -132,7 +132,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
global $_FormDisplayGroup;
static $base_dir, $img_path;
- $is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
+ $is_setup_script = defined('PMA_SETUP');
if ($base_dir === null) {
$base_dir = $is_setup_script ? '../' : '';
$img_path = $is_setup_script
@@ -298,7 +298,7 @@ function display_group_header($header_text)
return;
}
$colspan = 2;
- if (defined('PMA_SETUP') && PMA_SETUP) {
+ if (defined('PMA_SETUP')) {
$colspan++;
}
?>
@@ -328,7 +328,7 @@ function display_group_footer()
function display_fieldset_bottom()
{
$colspan = 2;
- if (defined('PMA_SETUP') && PMA_SETUP) {
+ if (defined('PMA_SETUP')) {
$colspan++;
}
?>
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 7c35fff..59df2b8 100755
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -29,7 +29,7 @@ function PMA_config_get_validators()
if ($validators === null) {
$cf = ConfigFile::getInstance();
$validators = $cf->getDbEntry('_validators', array());
- if (!defined('PMA_SETUP') || !PMA_SETUP) {
+ if (!defined('PMA_SETUP')) {
$uvs = $cf->getDbEntry('_userValidators', array());
foreach ($uvs as $field => $uv_list) {
$uv_list = (array)$uv_list;
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8907-g9a9399e
by Marc Delisle 27 Aug '10
by Marc Delisle 27 Aug '10
27 Aug '10
The branch, master has been updated
via 9a9399e07a7b1d11e18e1dd0aa7a2668188fc03c (commit)
from 9c34a0eec92b48c39f6918693976e02c6b760a16 (commit)
- Log -----------------------------------------------------------------
commit 9a9399e07a7b1d11e18e1dd0aa7a2668188fc03c
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Aug 27 17:50:20 2010 -0400
Credits for Ninad Pundalik
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
Documentation.html | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 10451cc..0c5fc26 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -110,6 +110,7 @@ $Id$
- [relations] Dropped WYSIWYG-PDF configuration variable.
- rfe #806035, #686260 [relations] Export relations to Dia, SVG and others
+ [interface] Added charts to status tab, profiling page and query results
++ [interface] AJAXification on various pages
3.3.7.0 (not yet released)
diff --git a/Documentation.html b/Documentation.html
index 50d6dd1..2ee298b 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -4853,6 +4853,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<li>Simplified interface for export/import</li>
</ul></li>
+<li>Ninad Pundalik (Google Summer of Code 2010)
+<ul>
+ <li>AJAXifying the interface</li>
+</ul></li>
+
<li>Barrie Leslie
<ul>
<li>BLOBstreaming support with PBMS PHP extension</li>
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8906-g9c34a0e
by Marc Delisle 27 Aug '10
by Marc Delisle 27 Aug '10
27 Aug '10
The branch, master has been updated
via 9c34a0eec92b48c39f6918693976e02c6b760a16 (commit)
via cce1ef0edacfd30a3cd913d0e0688e0adb6fb706 (commit)
via 8ddfb7140dbff7556ceab8d8b293f21c8d97f79c (commit)
via f1e72d766498a64a5cc52962978585f4c3316c93 (commit)
via 43c18c50b83ed5ca5bf2e5c3ad9b4ecb3b80f0b6 (commit)
via bbb94f628f6fb46a61b9b7692dea3c8474c42627 (commit)
via 50f2a0d6eacd64096e26a9fc892bf67723838826 (commit)
via 7f9d141a8566d94cc81a7c68f64fb6be97843367 (commit)
via 9399f8af8d5fe035ef977ee9e24b800a37b19e9a (commit)
via 5a27df6ad8987766f3ad4f5b0b4a60b644f6c9d5 (commit)
via 6a2445ccf29a26ecf2294755dedca54ad258d96a (commit)
via c9253c0a0ed223ebeba21b25a16391a4acd611cf (commit)
via e1f319eef175d23474ca82455c761f8ecffca741 (commit)
via c0ee037c594683db833e0c0a6f1a298e0e108634 (commit)
via 0b2b21712e3fe54f56717c2581666f30c25cfac8 (commit)
via 6a3d0a7f58a78fbe7e8d4bceea7f649dc031fe25 (commit)
via 880e4665c3d87570188ba831cd14ec9475980fb7 (commit)
via eccad201bf005f117cc122cab7cf1d12b4730a95 (commit)
via 98d3916e910c9982dacaf3b924a8ab33cc9205bb (commit)
via ee6bcb1b1685efbb62fcd905542b4c5ecd6a1bdd (commit)
via 43f4812dbf4184fe30990ba9fa662836cff1f74b (commit)
via 95a8521f1106e18850d51287b0d997b0efa82ca9 (commit)
via 2ba0095ab5c0efd308daac9fcdfc813281d8c50b (commit)
via 0373ae671349946891dcf53e27e48b1446d25083 (commit)
via 2ca8e1eea2b8ae45fbb203173a301e9394df3fcb (commit)
via a69154b5c99f28504009d7215867c9016c41662e (commit)
via a45814796986e6a39f9bec853554df0ff2d5da57 (commit)
via 7acb4cb99d215c8c0fab7cfe27d7395dd73afee0 (commit)
via 3d1a420a6f32662567a26fb1cfa6cd938ab06715 (commit)
via b99bad8cdd6430e2dc7b4a45b28b758044bed700 (commit)
via ab16573b34a4a2cc80f3a4a99420aed5300610f5 (commit)
via a7f2cbd2ba8e85280afbe30797cef1d68b70805d (commit)
via 3ab3b35a76b6000cf8748b6e64c2adbbe8c80818 (commit)
via c897adc3a4b58a432a67460d9308ff157401d2d3 (commit)
via 94b7567ec8453ed268305094b9245f82449d99b3 (commit)
via e6f083c7030b0d19b46e9ba1807fb8c6009496cb (commit)
via b19fa7c60f7c085138617693bd862a2c00f510e1 (commit)
via 6547920e8ac7566e8d97b7a25ee74d796bf29753 (commit)
via 5996773bf72f85291b3765d0b1db64f2890d012f (commit)
via e47b2132368cce14d83e6ccf59f3f8ac9068e2be (commit)
via b66f8f7fb91e5c7956b7c3884a9f3bc09ed685bc (commit)
via 43ed78a0f887e996cdc1459428bbcc7111bed38c (commit)
via e8e87ae67556a32a43e3dd7601cd52c7d2e36e07 (commit)
via cd42d616f72b776873ef126a93cb5877521cfc3a (commit)
via a2f78a6d38f74f0cc62f2a5837e682901331c21e (commit)
via 2bec345a46d11293b93c2b06bf8009c913cde8fb (commit)
via 4190a5883aef7c3fe344bcd92c78f08825dc5904 (commit)
via fd4b33de85c7b67a2565e5b5db1ee098205dfb9e (commit)
via 9578aad8ef4deebe80c4ce24740c954ccc640634 (commit)
via 4c13428e2821446dbdbe569f7a92d6fa1ba0ceaa (commit)
via 4f8c85b31d552aba1c7a83fd2a36523c3587fe3e (commit)
via 25dbe9b039af0b301898c9ea84b1a5dbfb9e0272 (commit)
via 9391e869ac76d0811cb09eb41db83a12a78c5102 (commit)
via e646a2760c65204894cb96a7cce61469bee5b9e3 (commit)
via 13ec1423f61e613e653872f3066ca7c9032306d1 (commit)
via 405433264187a1a16f61045bb05500fffb0abca5 (commit)
via 85d42b8a5763ad548ccfd934e9d54f2fa4353409 (commit)
via c0db21c3e5cb574240507233b4b354e73c9dda18 (commit)
via 9640a580ffb9fcbdab98032dcecd5ee180fbbcbe (commit)
via 6e908dfeb255f1e02140545c46e7a68f1ed0025a (commit)
via 23c8cf44218938b1046f51994752ad5bec9cc25c (commit)
via 1bdbb9f2749d83c95231435aaccca0bb490735df (commit)
via a67fe76e5039eeec67d339e8dfa11d2eae261cc2 (commit)
via 0b18458fe758477c1787bc462a7a95a5df5e6745 (commit)
via e9731e39c745e73ff8cb0c14a16fc24d145ce611 (commit)
via f7076ab686fa39ff942dd26d9b7c5ed09a1331c0 (commit)
via 7b99e3b0e4e3963e216458afd8b13065e6ad1df5 (commit)
via e7b130baf78bf707f7473b4ce507b0eed81a13bb (commit)
via 85e2225ac787d96b7afea0615c35aaf853dd518c (commit)
via 7033154eb49ec1f295680e320e7dffd5a6acdec3 (commit)
via 4b18b4c7d60f29d89933e33fe29f0b971f511f93 (commit)
via 7da51f1a8ebf9bc9b42d1e591068d8f1e5c14fd1 (commit)
via e309386703301bc23c565f6676c008f0d1fbf8f3 (commit)
via ec38092bdee44485257f4d6d9cf53349a6748517 (commit)
via 041a5837c5f6a6107efffb2fbd894afd29bd4b1c (commit)
via c47a1a345a94277b342edf883c1e22ea1d7d0367 (commit)
via 57fa27e22eb52a77f0a905adb1b88b63d009eeb7 (commit)
via 9dd93987ca550f01e7a695581b1faed9f2d4d91e (commit)
via 98676380f96e102ad4bd137d75b98b18380ec681 (commit)
via ea959071473b029d47ed8b7a6b0b6eb65b279aff (commit)
via a40aaaa7b08714312db958c163a32fa9b96eb3e1 (commit)
via 10a9e6912c9f2011b69a67ba4b9d539c9550509b (commit)
via 98a57e22190f525e1fdcde49e9640763d87752c7 (commit)
via f0f5358ede7e58e4eb2807ae22cb09f8736ef2a0 (commit)
via 6aa731568255a46d22382017731777c08483cf33 (commit)
via 7dd8745778164a3bf44a6418b0554fc8006e355a (commit)
via fcae63bbd79939bb977fd3b3638426b88f064a79 (commit)
via 3bcffd86e9d1072841a1313c763dfb5a09ae6220 (commit)
via a1e97024343ca8006cb91f3203d40c49dd4e348a (commit)
via e0f80088aae7fe13c410461fbf6e07c5fd41d1ef (commit)
via 7d3245cbcdd189265e13072d5fce2b1c9c26151b (commit)
via f06bb69bb8575243b9f1164e0940786833caf3ec (commit)
via 35c922e70461a189351a5093026900197c132c33 (commit)
via 4eb4d318bbfbadd3df9b33dab0b72d14c9897a6c (commit)
via fe9f539ed2a5aa850c41e9f036caef75a26b662a (commit)
via dd58a5bc239b6dedb1e2ec971a0c812ec44fca4c (commit)
via a1800171063b31a971ae312051b89d7ad21ee42e (commit)
via 94a911a623f5eb2f8556ce32e0ad741d425d3a20 (commit)
via 3586dd6408be48b95b2ef0ce45d3b2bbe0b06444 (commit)
via 505884174bfcf223d111b0f24975dbb658846960 (commit)
via d5ed68aa71760193420ea33eaa3309a114571ab2 (commit)
via 70a8735c071061c1e78e5b2b42ee25942486b5ac (commit)
via e98edae53be838ed13ac524f9131c064fbb7273d (commit)
via 6230a545bfc91ed23fa2eafc689a0f72e5662bff (commit)
via cbe82879e863f542404ceaf79864bb680a2fb2dc (commit)
via ca0af7fff77a0b0006e5743aa9d550cb247f4bba (commit)
via 7d11c0aa92ae3214f672f05c5bb676a6a217e351 (commit)
via 8358b8c8d35e4e2275cfa68185f355f4c0c101c2 (commit)
via 020dac8c89c7e78473e797bcb67d2d4b933a8fda (commit)
via 8de1f2fdf7713ba365b4211c9ba9494f9e97c2f4 (commit)
via fdd8b51b005dc189f0882c8daef79bab0161cb4a (commit)
via 47142291a1983f2a541a947b50a6f1dba29f48d0 (commit)
via 4f1c348074957287ba5c6186dab52a315870b8e1 (commit)
via 224fdfd2867cedbdee4eb5cd01dba7b41d502650 (commit)
via 99eff08c0c18fd19d5f5f992230a174d040c60d0 (commit)
via e049c1d1583180183645a59de3d97db7f6302448 (commit)
via 4f3b8b96ae40c9cad48bb5d7dad3320a4d495c37 (commit)
via 6e9e3836e5c0c5e05531caf0be81dac718ec7068 (commit)
via 379d392b3fbc18f2fd908df4eb7eef9fc5915aa2 (commit)
via 034e189bcb55fc63eea484a46608e76f598ce086 (commit)
via 4767612d3c88033089ed1657b89749d8de3d247a (commit)
via 77aa8c50dda582894c1178b9bf3117e1d42a67af (commit)
via be70c9d202617dc9bf31e6f0eaaaa78c8737fed2 (commit)
via 5c1052ad9692ecb1888da2f1e230bddd8d9ab5b3 (commit)
via b1dcb9493d3b6756a090f877a79afd5f8bfdb176 (commit)
via 466d3f7ae5141c742e7fe2e574b4dd5d518b6025 (commit)
via dac68adc52cc368a8fe2922251f9c8e4cbeb3d7c (commit)
via eb0e019fa6750fc0cb696a555df832b8ee94b269 (commit)
via 5677d17722e53f4ba29462a2edec15891e3df0cd (commit)
via 7f062310c6a6b0c5c8c91c3ef129206b18e6bd45 (commit)
via fe92d38e388e8db524b79d44ccf3359491e7f5fc (commit)
via fd2e5e226d7bbc8fc91a17967e365b9438f5d375 (commit)
via e32644ea0962979b544bd6efe4b19f411cd4ac97 (commit)
via 4f6339b6a4a0c74de248331bb14e1ff608b24fb4 (commit)
via b48033fbd6b53fe48144fe7a137a013205f5ae1c (commit)
via f9d7058cd61858d35710ede475c51176eff429fa (commit)
via bcbf3271399a2e41a55813eb4f773471c59d659b (commit)
via 34c68f8aad09967f3701f7d0f9a5126c826cc7af (commit)
via ca764244a0b0ddd74a6034ef38667cf4aed92ce6 (commit)
via 57f29359780026a169634ba42bfe1861fb685124 (commit)
via 25b8d37506249a43758fcbfa23b48e159a6afe92 (commit)
via c8fcb2fa2a38580ccc3d2ef3ce288b3dccea63e7 (commit)
via f5b71f06dd9e337c9fcc3434a4ca501ec15bc5ac (commit)
via ad8d64e360f4c182ce8fcc13a9401c7529b09167 (commit)
via 7da7d49625aca60a8f2460ee1d26127ddbfcbfde (commit)
via 9a4b524db73ac767a00251c51b45c04f90c5c489 (commit)
via e2cef4bc231be49482c270b4ea45a6252f9c9e40 (commit)
via a5ae31a2204240c0c95929f8e32516474bd29c3a (commit)
via 46ea470888f344bf8fb097da0828cce7070d56c7 (commit)
via c1f8f3d77a677496734753d35cba8ec5e2b2e3ff (commit)
via a968b58d5c6d6063bf679ff218a5b0e297c50c79 (commit)
via a3dd431bdbfa14744655dd03f3d89694fecfe536 (commit)
via a87c4fc363926ab2613a28ae9a3cd840f04cbdb8 (commit)
via 6ab286d6cad89a0f9ce50820590af6072d572c93 (commit)
via ac7cab7160e52a710bb3a6c606efebfbfa652271 (commit)
via 4214d83e123e4246c5e10963f607b33f8d301d35 (commit)
via c850b8be8ba2987f395eb76948a9a29c70dda2f8 (commit)
via dcdde2f99f1fe94e3baaf41d07cea747411ca3c8 (commit)
via 217968fb92146a174a0d842b33dbb7358e7d1f03 (commit)
via a8073a1875cb2232eeb1d13533cfe7af0045e373 (commit)
via f56758e50e49a0fca98064841f0e0e710aba0314 (commit)
via dd1ec1c0191d461c3451c195ebf735d6ad6ac268 (commit)
via c3d2d0fed4a1d34739d9d999ffaccff4ecb59936 (commit)
via 9737dbc6755d98998669ec0fd118fe4322366456 (commit)
via cf15d940cd6d8f94fbe9d25c404b4f9f1372888c (commit)
via fff89f83a85bd3f3ede1126ecda0cdb86c68ad8c (commit)
via a871eba3025a822c402a84614ad197b44e68d24a (commit)
via 51dffa100facad11753902fcae91fe66cdc7541f (commit)
via 06a7736b88a9212501cdc21ffc7a522a326c095f (commit)
via a7e77314afa03120dd02b0cc35154eb1fd22cd36 (commit)
via ce79f6cdf1bb420748a993bcf729eaa6aa9c3f5f (commit)
via 1a9526a4ff9507fec88bd03de0a395cca3ce6214 (commit)
via 603b6bf47b3b8eab1e936613b6294a79fa24c0a2 (commit)
via cb4c1100749fa72dc3e0a7e7f3749187557689f3 (commit)
via e9ffc7c5d5751cf20006dd77cfceec2640733316 (commit)
via 78b39d71eaa60d3fdc7e1391c74305a008dfb0d1 (commit)
via 8f3c8838a1c41ba529d657322ad8b1c1af825152 (commit)
via f04f154c241c81cf612dbe1904caee4c4d1a6099 (commit)
via 52774d7616438ca9e86e96e56fb21ff7bc475db1 (commit)
via 8b37b825ef3c3be2ebf7503bd12980e41e6f7cf7 (commit)
via fd5e2dc3c115a3b642272f10163718bfd18d3bdb (commit)
via 266447bcd92eee17afae5ff243a747e70fbcb81a (commit)
via a8d6f9ff4c91f6effba521c2712fc908eb413af6 (commit)
via d2c6e1c5e372cba7517b1ecc376c97dc032f003a (commit)
via 0f081a843791d3d26c209b13f8b798462b44f8bf (commit)
via 2986a7b1a05ad71d5a775646e512e20e522bb6bf (commit)
via 834b36bd6a1d8c12d683932b19805bfc1c3bb8ba (commit)
via 5f255406bde5d63b67806c323f8891c3295610d2 (commit)
via 3553df0dc2fc9d9f641b6dbb29c28827cc18137f (commit)
via 96c0bf55119b21f0448b528ac5d9b2b6688b678c (commit)
via 6ede5986ad0b35b2c4f3fdffb5ef5466f09a9031 (commit)
via 42de77813c7c34f2e9255c30fb6d053ed69b5454 (commit)
via 86558dfd96e28527316f15a1c440c4b1b9367fbb (commit)
via 50dabaf4e7dc4f165d0fc607db6a278f1b8180a5 (commit)
via 049c90ee0ba89074b3d53a81d9c56b0e46415007 (commit)
via 160f4314eb518afcc1eba80da9575657584b2e34 (commit)
via 3bb4dbd0acc962969000cd2d0dab230d858dc28c (commit)
via d195582cf808d453827c5c23afa023e0817cabb2 (commit)
via bd139f2465eac695f9bab9ccae5751383ec1e17f (commit)
via d5b50587e7af9a3e506acc84d7fe4336adf0a38d (commit)
via 20fce4cdcde18adc09c7ac3035d8cb28e4b2d6cf (commit)
via d775f341a4791c108dab4839d094b4f654d97f32 (commit)
via 6276ad45a6a5ab2f14e8b33f8a0db5504bbe4e16 (commit)
via ed3e6a2925fb2fda00249b94b28c20d992f89350 (commit)
via d14abc17ca31bf9554afc5d26ceb921b4d612974 (commit)
via 8a81f9111b469dfedd34a56ec7b9b8be9919c719 (commit)
via 0e910967b09f31f0bb9ca89c1403bb578a96e4b7 (commit)
via 5ab3a60612ebf397406636503a59d6926ee63fff (commit)
via 0a417e3c2af9a2fea00005508a457d4ebf33ba3c (commit)
via 38ac78e3baa6e925e6ef023a4196ae1d323bffc9 (commit)
via bed1948d044f0e5d9125d3c905e8390d8a75b0de (commit)
from ac5cab4f6f6184484ad0f68c8afbdf06c2914b9b (commit)
- Log -----------------------------------------------------------------
commit 9c34a0eec92b48c39f6918693976e02c6b760a16
Merge: cce1ef0edacfd30a3cd913d0e0688e0adb6fb706 ac5cab4f6f6184484ad0f68c8afbdf06c2914b9b
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Aug 28 01:53:52 2010 +0530
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
commit cce1ef0edacfd30a3cd913d0e0688e0adb6fb706
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Aug 26 22:52:38 2010 +0530
Fixed the display_query undefined error by adding a check to see if it exists
commit 8ddfb7140dbff7556ceab8d8b293f21c8d97f79c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Aug 26 22:22:39 2010 +0530
Used localized string for the Inline Edit anchor being generated
commit f1e72d766498a64a5cc52962978585f4c3316c93
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Aug 26 20:20:51 2010 +0530
Removed the inline call to confirmLink() and instead attached the jQuery call to it. jQuery call attached to the proper class
commit 43c18c50b83ed5ca5bf2e5c3ad9b4ecb3b80f0b6
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Aug 26 20:19:51 2010 +0530
Incorrect resolution of merge conflict was causing the database name to not show up on the serverinfo div. Fixed it
commit bbb94f628f6fb46a61b9b7692dea3c8474c42627
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Aug 26 20:03:15 2010 +0530
Created a new js file for the tbl_structure.php page and moved jQuery scripts for it into that file
commit 50f2a0d6eacd64096e26a9fc892bf67723838826
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Aug 26 19:53:27 2010 +0530
Improved response of the Truncate table action on success
commit 7f9d141a8566d94cc81a7c68f64fb6be97843367
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 24 18:25:09 2010 +0530
Removed the blank new line at the end, which was causing issues
commit 9399f8af8d5fe035ef977ee9e24b800a37b19e9a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Aug 22 13:23:16 2010 +0530
Improved the appendInlineAnchor() function to edit the text now displayed with each anchor
commit 5a27df6ad8987766f3ad4f5b0b4a60b644f6c9d5
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Aug 22 12:59:53 2010 +0530
Missing brackets during the merge. Added them
commit 6a2445ccf29a26ecf2294755dedca54ad258d96a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Aug 22 12:59:25 2010 +0530
Fixed the error caused due to a missing index , relocated the code that sets the null class for a null element
commit c9253c0a0ed223ebeba21b25a16391a4acd611cf
Merge: e1f319eef175d23474ca82455c761f8ecffca741 7be82362080f862de054c85646fb54b3bf6402b9
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Aug 22 12:42:54 2010 +0530
Merge conflict resolved for Lori's tree merge to main
commit e1f319eef175d23474ca82455c761f8ecffca741
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Aug 19 00:45:50 2010 +0530
Trailing } left while resolving merge conflict. Removed it
commit c0ee037c594683db833e0c0a6f1a298e0e108634
Merge: 0b2b21712e3fe54f56717c2581666f30c25cfac8 b51a217c36b45194f79915992a599338b3bac9ef
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 17 18:25:03 2010 +0530
Resolved a Merge Conflict
commit 0b2b21712e3fe54f56717c2581666f30c25cfac8
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Aug 15 01:50:47 2010 +0530
Added documentation to PHP files
commit 6a3d0a7f58a78fbe7e8d4bceea7f649dc031fe25
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Aug 13 23:34:10 2010 +0530
Added documentation, fixed some minor bugs/typos
commit 880e4665c3d87570188ba831cd14ec9475980fb7
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Aug 11 00:28:28 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/sql.js
commit eccad201bf005f117cc122cab7cf1d12b4730a95
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 10 19:56:04 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/db_structure.js
commit 98d3916e910c9982dacaf3b924a8ab33cc9205bb
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 10 19:30:43 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/db_search.js
commit ee6bcb1b1685efbb62fcd905542b4c5ecd6a1bdd
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 10 19:25:56 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/db_operations.js
commit 43f4812dbf4184fe30990ba9fa662836cff1f74b
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 10 19:25:40 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/server_privileges.js
commit 95a8521f1106e18850d51287b0d997b0efa82ca9
Merge: 2ba0095ab5c0efd308daac9fcdfc813281d8c50b ba038ed6e1527d5470a5532d4198889ad80943a9
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 10 00:55:22 2010 +0530
Merge remote branch 'origin/master'
commit 2ba0095ab5c0efd308daac9fcdfc813281d8c50b
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Aug 9 00:49:11 2010 +0530
We can now edit NULL fields and set fields to NULL in inline editing.
commit 0373ae671349946891dcf53e27e48b1446d25083
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Aug 9 00:06:36 2010 +0530
Removed an alert() call which was around for testing purposes.
commit 2ca8e1eea2b8ae45fbb203173a301e9394df3fcb
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Aug 6 20:29:09 2010 +0530
Added the loading gif from the themes to the ajax notification
commit a69154b5c99f28504009d7215867c9016c41662e
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Aug 6 19:23:17 2010 +0530
Removed the appendInlineAnchor call from ajaxSuccess event as it was also fired at a successful inline edit query. Instead, created a custom event appendAnchor on #sqlqueryresults which is triggered when necessary. Also got transformations working for application/octetstream mime type.
commit a45814796986e6a39f9bec853554df0ff2d5da57
Merge: 7acb4cb99d215c8c0fab7cfe27d7395dd73afee0 d46bb6d87767ae7e9da1e4182f95ba1d885e26e9
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Aug 5 23:51:14 2010 +0530
Merge from upstream. Resolved a conflict in js/functions.js
commit 7acb4cb99d215c8c0fab7cfe27d7395dd73afee0
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Aug 4 22:58:05 2010 +0530
Finalised CSS rules for the Ajax notification division. It now centers correctly and handles not very large messages pretty well.
commit 3d1a420a6f32662567a26fb1cfa6cd938ab06715
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Aug 4 21:54:35 2010 +0530
Moved the code that appends the inline edit anchor into a function and registered it to all Ajax events that complete successfully. The anchor is now appended even after retrieving results over Ajax.
commit b99bad8cdd6430e2dc7b4a45b28b758044bed700
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 3 23:28:31 2010 +0530
Almost completed appending of newly created database to the database table. Still need to get db statistics
commit ab16573b34a4a2cc80f3a4a99420aed5300610f5
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 3 23:27:13 2010 +0530
Append a new anchor for inline edit to each row if javascript is supported instead of using the edit anchor for inline editing
commit a7f2cbd2ba8e85280afbe30797cef1d68b70805d
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 3 21:01:20 2010 +0530
Converted the PMA_sort_table into a jQuery function as there was a race condition caused due to simultaneous adding of a row and sorting of the table
commit 3ab3b35a76b6000cf8748b6e64c2adbbe8c80818
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 3 20:22:36 2010 +0530
Created a function to sort a table after a new row has been appended to it. Required for Create Table, Add User and Create Database actions
commit c897adc3a4b58a432a67460d9308ff157401d2d3
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 3 19:10:37 2010 +0530
Ajaxified Change Password action on main page
commit 94b7567ec8453ed268305094b9245f82449d99b3
Merge: e6f083c7030b0d19b46e9ba1807fb8c6009496cb 148eab912112004aab23f27138f93406d87b00f0
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Aug 3 18:25:19 2010 +0530
Merge remote branch 'origin/master'
commit e6f083c7030b0d19b46e9ba1807fb8c6009496cb
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 31 02:25:29 2010 +0530
Ajaxified Create Database action. Have to append newly created db to table yet though
commit b19fa7c60f7c085138617693bd862a2c00f510e1
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 31 02:02:16 2010 +0530
Retrieve a link instead of the dropdown fields when the number of foreign fields is more than ['ForeignKeyMaxLimit']. Could use an icon in the anchor like it is in tbl_change.php
commit 6547920e8ac7566e8d97b7a25ee74d796bf29753
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 31 01:34:47 2010 +0530
The anchor is now correctly generated for a saved relational field during inline edit with the correct where clause. Trying to fix the bug with ['ForeignKeyMaxLimit']
commit 5996773bf72f85291b3765d0b1db64f2890d012f
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 30 20:34:06 2010 +0530
Removed the duplicate table link being shown in the serverinfo div. Most probably caused due to an incorrect merge resolution
commit e47b2132368cce14d83e6ccf59f3f8ac9068e2be
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 30 20:10:10 2010 +0530
In inline edit, when getting the field name, ignore the column comments.
commit b66f8f7fb91e5c7956b7c3884a9f3bc09ed685bc
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 30 00:16:24 2010 +0530
Improved handling of text/plain mimetype fields for inline editing
commit 43ed78a0f887e996cdc1459428bbcc7111bed38c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 29 23:36:35 2010 +0530
Transformed values are returned from server for newly edited values. Handling of mimetypes other than text/plain needs to be implemented
commit e8e87ae67556a32a43e3dd7601cd52c7d2e36e07
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 29 22:53:07 2010 +0530
Resolved conflicts left over from previous merge
commit cd42d616f72b776873ef126a93cb5877521cfc3a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 29 21:26:21 2010 +0530
Removed unresolved section
commit a2f78a6d38f74f0cc62f2a5837e682901331c21e
Merge: 2bec345a46d11293b93c2b06bf8009c913cde8fb d0fc397fe1c474150883e85a791a012a7ae03380
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 29 19:17:25 2010 +0530
Resolve merge conflicts for upstream merge
commit 2bec345a46d11293b93c2b06bf8009c913cde8fb
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 29 19:07:18 2010 +0530
Trying to improve jQuery's behaviour for transformed field inline editing
commit 4190a5883aef7c3fe344bcd92c78f08825dc5904
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 28 02:58:38 2010 +0530
Improved handling of relational fields after saving inline edits. Still need to fix the anchor that is being generated, where clause is missing
commit fd4b33de85c7b67a2565e5b5db1ee098205dfb9e
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jul 26 01:21:52 2010 +0530
Added handling of enum values to inline editing
commit 9578aad8ef4deebe80c4ce24740c954ccc640634
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 25 01:04:07 2010 +0530
Sort the table of tables on db structure page after a new table's row is added.
commit 4c13428e2821446dbdbe569f7a92d6fa1ba0ceaa
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 25 00:49:32 2010 +0530
On deleting users, the classes of the rows remaining are re-adjusted so the table looks the way its supposed to
commit 4f8c85b31d552aba1c7a83fd2a36523c3587fe3e
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 25 00:34:35 2010 +0530
The user's table is now sorted after a new user is added. Moved common code for add user and copy user to a function
commit 25dbe9b039af0b301898c9ea84b1a5dbfb9e0272
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 24 00:32:50 2010 +0530
Relational values are now retrieved from the server for inline editing. However, the displaying of relational values after a successful inline edit has to be handled better. The link to the sql query is lost, and we dont know how the relational display column setting will be handled
commit 9391e869ac76d0811cb09eb41db83a12a78c5102
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 23 23:17:15 2010 +0530
The updated privileges are now wrapped with dfn tags as well.
commit e646a2760c65204894cb96a7cce61469bee5b9e3
Merge: 13ec1423f61e613e653872f3066ca7c9032306d1 049886139c62c3ed8b6573a0637ec5516857661f
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 23 21:59:15 2010 +0530
Fixed conflict due to upstream merge
commit 13ec1423f61e613e653872f3066ca7c9032306d1
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 23 00:23:38 2010 +0530
Minor bug due to which the ajax response to revoke users was failing. Fixed it
commit 405433264187a1a16f61045bb05500fffb0abca5
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 23 00:18:15 2010 +0530
Update the privileges field in the usersForm table when the user is changed
commit 85d42b8a5763ad548ccfd934e9d54f2fa4353409
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 23 00:03:12 2010 +0530
Newly copied user too is appended to the table now
commit c0db21c3e5cb574240507233b4b354e73c9dda18
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 22 23:27:26 2010 +0530
Inline edit is now saved, for normal and truncated fields. Relational, enum and transformed fields need special care
commit 9640a580ffb9fcbdab98032dcecd5ee180fbbcbe
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 22 00:12:43 2010 +0530
Drop Table and Create Table work as expected now on db_create.php too
commit 6e908dfeb255f1e02140545c46e7a68f1ed0025a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 22 00:01:16 2010 +0530
Refresh navigation on creation of new table. Bug noticed by Marc Delisle
commit 23c8cf44218938b1046f51994752ad5bec9cc25c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 22 00:00:02 2010 +0530
This page can now handle ajax requests
commit 1bdbb9f2749d83c95231435aaccca0bb490735df
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 21 23:25:23 2010 +0530
Handled the race condition caused on the loading notification div due to calls to PMA_ajaxShowMessage() in time less than the timeout. Added a .clearQueue() calls
commit a67fe76e5039eeec67d339e8dfa11d2eae261cc2
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 21 22:30:40 2010 +0530
Transformed values too are retrieved from the server now. Works equally well for vertical and horizontal tables
commit 0b18458fe758477c1787bc462a7a95a5df5e6745
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 21 00:14:12 2010 +0530
Truncated values in vertical tables are now retrieved from the server for inline edits. Also, original data is now stored in a hidden span so that it can be replaced in case of an error
commit e9731e39c745e73ff8cb0c14a16fc24d145ce611
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 21 00:12:17 2010 +0530
Added a few lines to handle inline edit requests
commit f7076ab686fa39ff942dd26d9b7c5ed09a1331c0
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 21 00:11:54 2010 +0530
Added classes and hidden input fields for inline edit
commit 7b99e3b0e4e3963e216458afd8b13065e6ad1df5
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 21 00:10:46 2010 +0530
Added a parameter for inline edit requests where truncated and transformed values are retrieved
commit e7b130baf78bf707f7473b4ce507b0eed81a13bb
Merge: 85e2225ac787d96b7afea0615c35aaf853dd518c 0c9cbf6c6ee5d83c670725a903867eeac5a0bd2b
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jul 19 21:54:37 2010 +0530
Merge remote branch 'origin/master'
commit 85e2225ac787d96b7afea0615c35aaf853dd518c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 16 20:14:25 2010 +0530
Fixed the issue in PMA_showMessage() where ['cell_align_left'] is not set in an Ajax request. Put an isset() conditional in place
commit 7033154eb49ec1f295680e320e7dffd5a6acdec3
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 16 19:59:14 2010 +0530
If the last user with a given initial is deleted, update the users overview table and remove the link
commit 4b18b4c7d60f29d89933e33fe29f0b971f511f93
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 16 19:36:12 2010 +0530
When a new user is created, the user's overview table on the top is now updated to reflect the newly added user's initial
commit 7da51f1a8ebf9bc9b42d1e591068d8f1e5c14fd1
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 16 19:10:48 2010 +0530
Empty row result set was not being handled correctly for Table Search page, fixed it
commit e309386703301bc23c565f6676c008f0d1fbf8f3
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 15 22:23:05 2010 +0530
Modified the handlers for ajax inline edit so that only the text areas are modified
commit ec38092bdee44485257f4d6d9cf53349a6748517
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 15 22:21:57 2010 +0530
Added classes to data fields that are truncated/transformed/relation keys so that they can be distinguished while handling ajax inline edit
commit 041a5837c5f6a6107efffb2fbd894afd29bd4b1c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 15 16:18:46 2010 +0530
Added an Ajax handler to the display options form
commit c47a1a345a94277b342edf883c1e22ea1d7d0367
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 15 16:01:25 2010 +0530
Started Ajaxification of Inline Editing. Simple data fields are replaced with textareas when edit button is clicked and vice versa. No provision yet for transformations and enum fields
commit 57fa27e22eb52a77f0a905adb1b88b63d009eeb7
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 15 15:48:10 2010 +0530
Added classes to the edit link and data fields that allow for inline editing
commit 9dd93987ca550f01e7a695581b1faed9f2d4d91e
Merge: 98676380f96e102ad4bd137d75b98b18380ec681 a038d59f7a0524a00682e8a7e2f3e4cda781f98a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 15 00:17:49 2010 +0530
Reverted po files changes.
commit 98676380f96e102ad4bd137d75b98b18380ec681
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 14 20:21:47 2010 +0530
Improved error handling. The ajax message was not being properly shown
for an empty result set
commit ea959071473b029d47ed8b7a6b0b6eb65b279aff
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 14 20:21:10 2010 +0530
Improved the error handling, when an empty result set is obtained.
commit a40aaaa7b08714312db958c163a32fa9b96eb3e1
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 14 19:04:52 2010 +0530
Statistics for the newly created table are now taken from the SHOW TABLE STATUS query when in an Ajax request
commit 10a9e6912c9f2011b69a67ba4b9d539c9550509b
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 14 01:36:42 2010 +0530
A newly added table will now be appended to the tablesForm if it exists.
tbl_create.php generates the necessary output for it.
Need to figure out how to calculate the size and overhead, when stats
are shown.
commit 98a57e22190f525e1fdcde49e9640763d87752c7
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 14 01:09:37 2010 +0530
A newly added table is now appended to the tablesForm on db_structure.php
commit f0f5358ede7e58e4eb2807ae22cb09f8736ef2a0
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 14 01:08:27 2010 +0530
Added an id to one of the tbody elements in tablesForm, so that jQuery
can append to the appropriate one.
commit 6aa731568255a46d22382017731777c08483cf33
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 14 00:53:19 2010 +0530
The PMA_mysqlDie() now supports Ajax requests. It now shows a JSON
response in an Ajax request.
Modified the PMA_ajaxResponse() function to handle messages which are
not instances of the PMA_Message class. Requited for PMA_mysqlDie()
commit 7dd8745778164a3bf44a6418b0554fc8006e355a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jul 13 03:28:23 2010 +0530
Added a Math.random() parameter to negate caching issues with user's list
commit fcae63bbd79939bb977fd3b3638426b88f064a79
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jul 13 03:25:53 2010 +0530
When a new user is added, his details are now appended to the user's table
commit 3bcffd86e9d1072841a1313c763dfb5a09ae6220
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jul 13 02:30:42 2010 +0530
Stupid typo. Fixed
commit a1e97024343ca8006cb91f3203d40c49dd4e348a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jul 12 23:49:27 2010 +0530
Fixed issue due to which the notifications div was visible even after clearing the message
commit e0f80088aae7fe13c410461fbf6e07c5fd41d1ef
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jul 12 23:33:56 2010 +0530
Fixed issue due to which the notifications div was visible even after clearing the message
commit 7d3245cbcdd189265e13072d5fce2b1c9c26151b
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jul 12 23:11:41 2010 +0530
Fixed the empty notice divison being generated when PMA_showMessage() was being passed a NULL query
commit f06bb69bb8575243b9f1164e0940786833caf3ec
Merge: 35c922e70461a189351a5093026900197c132c33 638fe75a8b36df3049d4cc1dec7e734c71feff6c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jul 12 22:47:17 2010 +0530
Merge remote branch 'origin/master'
commit 35c922e70461a189351a5093026900197c132c33
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jul 12 00:14:05 2010 +0530
Basic Table Search now works. Need to handle some error cases
commit 4eb4d318bbfbadd3df9b33dab0b72d14c9897a6c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 23:51:02 2010 +0530
Forgot to set the context for the recently added $(document).ready()
snippets. Added them
commit fe9f539ed2a5aa850c41e9f036caef75a26b662a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 23:36:24 2010 +0530
Removed inline coding for Drop Trigger in libraries/tbl_triggers.lib.php
commit dd58a5bc239b6dedb1e2ec971a0c812ec44fca4c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 23:14:41 2010 +0530
Removed inline calls to confirmLink() for Empty/Drop Table actions in libraries/tbl_links.inc.php
commit a1800171063b31a971ae312051b89d7ad21ee42e
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 22:33:52 2010 +0530
Moved Ajax handlers of db_structure.php to a dedicated file js/db_structure.js from js/functions.js
commit 94a911a623f5eb2f8556ce32e0ad741d425d3a20
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 22:23:57 2010 +0530
Removed inline call in libraries/display_tbl.lib.php to confirmAction()
for 'Calculate Real End' action on large InnoDB tables.
commit 3586dd6408be48b95b2ef0ce45d3b2bbe0b06444
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 03:33:04 2010 +0530
Removed inline call to confirmLink() for 'Drop Primary Key/Index'
commit 505884174bfcf223d111b0f24975dbb658846960
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 03:14:02 2010 +0530
Removed inline call to confirmLink() for 'Delete Tracking action'.
commit d5ed68aa71760193420ea33eaa3309a114571ab2
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 02:32:10 2010 +0530
Removed inline call to confirmLink() for 'Drop Procedure'
commit 70a8735c071061c1e78e5b2b42ee25942486b5ac
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 02:08:47 2010 +0530
Removed inline call to confirmLink() for 'Drop Event' action
commit e98edae53be838ed13ac524f9131c064fbb7273d
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 11 00:14:12 2010 +0530
Remove previous queries if any before inserting the latest query. We
don't want too many queries crowding up.
commit 6230a545bfc91ed23fa2eafc689a0f72e5662bff
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 10 23:45:03 2010 +0530
Cloning and removal of rows happens correctly now. All name/id
properties of the inputs are changed on the fly with javascript.
commit cbe82879e863f542404ceaf79864bb680a2fb2dc
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 10 17:14:10 2010 +0530
Hooked in Ajax submission of data. Changint the number of insertions on
the fly is still a work in progress. Insertion tables are being
cloned/deleted, however, each is not unique.
commit ca0af7fff77a0b0006e5743aa9d550cb247f4bba
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 10 17:09:36 2010 +0530
Added a string for Ajax handlers in tbl_change.php
commit 7d11c0aa92ae3214f672f05c5bb676a6a217e351
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 10 17:07:37 2010 +0530
Added ids to some HTML elements on tbl_change.php and modified the
output of tbl_replace.php for Ajax requests.
commit 8358b8c8d35e4e2275cfa68185f355f4c0c101c2
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 8 22:53:26 2010 +0530
Reverted po files changes.
commit 020dac8c89c7e78473e797bcb67d2d4b933a8fda
Merge: 8de1f2fdf7713ba365b4211c9ba9494f9e97c2f4 bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 7 18:53:41 2010 +0530
Merge remote branch 'origin/master'
commit 8de1f2fdf7713ba365b4211c9ba9494f9e97c2f4
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 7 18:36:28 2010 +0530
Revert "Trying to resolve a merge."
This reverts commit fdd8b51b005dc189f0882c8daef79bab0161cb4a.
commit fdd8b51b005dc189f0882c8daef79bab0161cb4a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 7 18:32:41 2010 +0530
Trying to resolve a merge.
commit 47142291a1983f2a541a947b50a6f1dba29f48d0
Merge: 4f1c348074957287ba5c6186dab52a315870b8e1 3e9e18aebb5d551f260e178f2f311384c2653b28
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jul 7 18:31:09 2010 +0530
Merge remote branch 'origin/master'
Conflicts:
po/af.po
po/ar.po
po/az.po
po/be.po
po/be(a)latin.po
po/bg.po
po/bn.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/el.po
po/en_GB.po
po/es.po
po/et.po
po/eu.po
po/fa.po
po/fi.po
po/fr.po
po/gl.po
po/he.po
po/hi.po
po/hr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/ka.po
po/ko.po
po/lt.po
po/lv.po
po/mk.po
po/mn.po
po/ms.po
po/nb.po
po/nl.po
po/phpmyadmin.pot
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/si.po
po/sk.po
po/sl.po
po/sq.po
po/sr.po
po/sr(a)latin.po
po/sv.po
po/ta.po
po/te.po
po/th.po
po/tr.po
po/tt.po
po/uk.po
po/ur.po
po/uz.po
po/uz(a)latin.po
po/zh_CN.po
po/zh_TW.po
commit 4f1c348074957287ba5c6186dab52a315870b8e1
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 4 01:50:11 2010 +0530
Added an id to the edit users form so that the check all/uncheck all
calls to setCheckboxes() will work.
commit 224fdfd2867cedbdee4eb5cd01dba7b41d502650
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jul 4 01:12:00 2010 +0530
Hide query box on retrieving results. Ajaxified results table sorting.
commit 99eff08c0c18fd19d5f5f992230a174d040c60d0
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 3 21:53:07 2010 +0530
Added a string for sql.js
commit e049c1d1583180183645a59de3d97db7f6302448
Merge: 4f3b8b96ae40c9cad48bb5d7dad3320a4d495c37 9e857f9f84591eedf3be50668356411eb52da0fa
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 3 21:00:08 2010 +0530
Merge remote branch 'origin/master'
Conflicts:
po/fr.po
po/sl.po
commit 4f3b8b96ae40c9cad48bb5d7dad3320a4d495c37
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 3 02:52:09 2010 +0530
If in an ajax query, we need to show the query and the time taken to process the query. Added code to get this working
commit 6e9e3836e5c0c5e05531caf0be81dac718ec7068
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jul 3 02:51:02 2010 +0530
We don't need to buffer the output in PMA_showMessage() when making an SQL query. Added a global variable which is set in sql.php during an ajax request.
commit 379d392b3fbc18f2fd908df4eb7eef9fc5915aa2
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 2 03:38:56 2010 +0530
Added a string for db_search.js
commit 034e189bcb55fc63eea484a46608e76f598ce086
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 2 03:35:30 2010 +0530
Added a basic script to retrieve db search results via ajax
commit 4767612d3c88033089ed1657b89749d8de3d247a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jul 2 03:34:44 2010 +0530
Added a division to include the search results in, suppressed some
output in an ajax request.
commit 77aa8c50dda582894c1178b9bf3117e1d42a67af
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 1 14:39:25 2010 +0530
Hopefully, the PMA_messages[] error will be resolved now. Most probably
a context issue was causing the error.
commit be70c9d202617dc9bf31e6f0eaaaa78c8737fed2
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 1 03:04:14 2010 +0530
A string had been repeated in the js_messages array, which is most
probably causing an issue.
commit 5c1052ad9692ecb1888da2f1e230bddd8d9ab5b3
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 1 02:33:31 2010 +0530
Included the sql.js file, added teh container division sqlqueryresults
when generating the results table. All cases have not been handled yet.
commit b1dcb9493d3b6756a090f877a79afd5f8bfdb176
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jul 1 02:32:17 2010 +0530
The reference to PMA_messages[] for the title option was causing issues
on the demo server.
commit 466d3f7ae5141c742e7fe2e574b4dd5d518b6025
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 21:00:45 2010 +0530
Discarded the unused PMA_ajaxOutputBuffelHandler() function.
commit dac68adc52cc368a8fe2922251f9c8e4cbeb3d7c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 01:20:09 2010 +0530
Show the SQL queries too in an Ajax response.
commit eb0e019fa6750fc0cb696a555df832b8ee94b269
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 01:18:47 2010 +0530
Rudimentary script in place for retreiving SQL query results by ajax,
and paginating the results table in place.
commit 5677d17722e53f4ba29462a2edec15891e3df0cd
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 01:16:49 2010 +0530
Include the query too if we are in an ajax request.
commit 7f062310c6a6b0c5c8c91c3ef129206b18e6bd45
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 00:38:28 2010 +0530
Fixed the bug where the initials_table division landed up at the bottom
of the page after an ajax request completed.
Also, fixed the issue due to which the edit users dialog was empty
commit fe92d38e388e8db524b79d44ccf3359491e7f5fc
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 00:37:25 2010 +0530
Fixed the bug where the initials_table division landed up at the bottom
of the page after an ajax request.
commit fd2e5e226d7bbc8fc91a17967e365b9438f5d375
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 00:33:11 2010 +0530
Removed the $.append() calls that were conflicting with document.write()
on the demo server. Instead, generating the div on the fly and not
appending it to the DOM.
commit e32644ea0962979b544bd6efe4b19f411cd4ac97
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 00:31:59 2010 +0530
In Drop Column, the row giving the details of the column is now removed
if the request completed successfully.
commit 4f6339b6a4a0c74de248331bb14e1ff608b24fb4
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 00:28:45 2010 +0530
We need to close the dialog when reloading the database after renaming
it. The code did not do this, added it.
commit b48033fbd6b53fe48144fe7a137a013205f5ae1c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 00:28:15 2010 +0530
Revert "We need to close the dialog when reloading the database after renaming"
This reverts commit f9d7058cd61858d35710ede475c51176eff429fa.
commit f9d7058cd61858d35710ede475c51176eff429fa
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 30 00:25:22 2010 +0530
We need to close the dialog when reloading the database after renaming
it. The code did not do this, added it.
commit bcbf3271399a2e41a55813eb4f773471c59d659b
Merge: 34c68f8aad09967f3701f7d0f9a5126c826cc7af 16ed06531a00ebac5bd33b40fbdb8139639f726c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 29 23:54:01 2010 +0530
Merge remote branch 'origin/master'
commit 34c68f8aad09967f3701f7d0f9a5126c826cc7af
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 29 02:25:59 2010 +0530
When dropping a table now, the entire row in the table of tables is
removed on db_structure.php.
commit ca764244a0b0ddd74a6034ef38667cf4aed92ce6
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit 57f29359780026a169634ba42bfe1861fb685124
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit 25b8d37506249a43758fcbfa23b48e159a6afe92
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit c8fcb2fa2a38580ccc3d2ef3ce288b3dccea63e7
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit f5b71f06dd9e337c9fcc3434a4ca501ec15bc5ac
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit ad8d64e360f4c182ce8fcc13a9401c7529b09167
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 28 21:21:14 2010 +0530
The ajax notification div did not hide properly. Fixed it.
commit 7da7d49625aca60a8f2460ee1d26127ddbfcbfde
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 28 21:20:30 2010 +0530
Added some CSS rules for the ajax notifications. The color and
positioning can be improved.
commit 9a4b524db73ac767a00251c51b45c04f90c5c489
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 28 01:59:52 2010 +0530
Hacked the PMA_generate_slider_effect() code to work with jQuery. Ajax
queries were failing due to the use of document.write(). Need to find a
better solution with $.append()
commit e2cef4bc231be49482c270b4ea45a6252f9c9e40
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 28 01:24:05 2010 +0530
Suppress the printing of the serverlinks and topmenucontainer divs when
in an ajax request
commit a5ae31a2204240c0c95929f8e32516474bd29c3a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 28 01:22:55 2010 +0530
Added an empty div which will be filled with the results of the SQL
query by jQuery
commit 46ea470888f344bf8fb097da0828cce7070d56c7
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 28 01:21:20 2010 +0530
Included the new js/sql.js file in all three pages
commit c1f8f3d77a677496734753d35cba8ec5e2b2e3ff
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 28 01:19:27 2010 +0530
Added a new file for executing SQL Queries with an Ajax call. Still a
basic script, will be tested and improved.
commit a968b58d5c6d6063bf679ff218a5b0e297c50c79
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jun 27 23:04:18 2010 +0530
Now shows the sql query too when renaming a database.
commit a3dd431bdbfa14744655dd03f3d89694fecfe536
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jun 27 23:03:20 2010 +0530
Modified PMA_showMessage so that it can show the sql query even in an
ajax request, by using output buffering.
Added a function to handle the output buffer for the ajax request.
Fixed a typo in PMA_ajaxResponse
commit a87c4fc363926ab2613a28ae9a3cd840f04cbdb8
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jun 27 03:27:29 2010 +0530
Removed extra calls to PMA_ajaxResponse and added a common call to it
for multiple actions. Modified the code for paginating the users table
with ajax, however it is still buggy
commit 6ab286d6cad89a0f9ce50820590af6072d572c93
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jun 27 03:25:57 2010 +0530
Completed the Ajax conversion for Edit User action.
Converted the pagination for the users table to Ajax, still a little
buggy.
commit ac7cab7160e52a710bb3a6c606efebfbfa652271
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jun 26 15:45:27 2010 +0530
Revert "Revert "Merge remote branch 'origin/master'""
This reverts commit 4214d83e123e4246c5e10963f607b33f8d301d35.
commit 4214d83e123e4246c5e10963f607b33f8d301d35
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jun 26 15:43:52 2010 +0530
Revert "Merge remote branch 'origin/master'"
This reverts commit c850b8be8ba2987f395eb76948a9a29c70dda2f8, reversing
changes made to dcdde2f99f1fe94e3baaf41d07cea747411ca3c8.
commit c850b8be8ba2987f395eb76948a9a29c70dda2f8
Merge: dcdde2f99f1fe94e3baaf41d07cea747411ca3c8 1be2d538dfae929582b9ff6b4a6bdc643609da9e
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jun 26 15:38:12 2010 +0530
Merge remote branch 'origin/master'
Conflicts:
po/tr.po
commit dcdde2f99f1fe94e3baaf41d07cea747411ca3c8
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jun 25 11:01:19 2010 +0530
Moved the jQuery script for handling Create Table action from
js/db_operations.js to js/functions.js as this action is used on
multiple pages.
commit 217968fb92146a174a0d842b33dbb7358e7d1f03
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jun 25 00:30:23 2010 +0530
Noticed a bug in the dialog close buttons. The html was not destroyed
after closing, so added a .remove() call everywhere.
commit a8073a1875cb2232eeb1d13533cfe7af0045e373
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 23 11:13:10 2010 +0530
Fixed a bug with the checkAddUser call. The function is called properly
now.
commit f56758e50e49a0fca98064841f0e0e710aba0314
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 23 11:04:45 2010 +0530
Added some messages for db_operations.js
commit dd1ec1c0191d461c3451c195ebf735d6ad6ac268
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 23 10:51:47 2010 +0530
Fixed the issue with the content frame not refreshing after the 'Reload
Database? Y/N' dialog.
When copying the database, the database is now switched with JS.
Create Table action still a work in progress
commit c3d2d0fed4a1d34739d9d999ffaccff4ecb59936
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 23 10:50:54 2010 +0530
Return the new name of the database in a rename, or the name of the
copied database, so that we can switch to the database if the user wants
to.
commit 9737dbc6755d98998669ec0fd118fe4322366456
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 22 13:10:40 2010 +0530
Localised the JavaScript messages. Hooked in checkAddUser() function to
validate the user form. Edit User ajax call is still a work in progress
commit cf15d940cd6d8f94fbe9d25c404b4f9f1372888c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 22 11:41:55 2010 +0530
Bug noticed by Marc Delisle in PMA_ajaxResponse fixed
commit fff89f83a85bd3f3ede1126ecda0cdb86c68ad8c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 22 11:40:50 2010 +0530
Added strings for js/messages.php
commit a871eba3025a822c402a84614ad197b44e68d24a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 22 11:32:45 2010 +0530
Localised strings in js/db_operations.js
commit 51dffa100facad11753902fcae91fe66cdc7541f
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 22 01:02:47 2010 +0530
Now using localized strings for all jQuery actions instead of static
English strings. Added strings to js/messages.php. Yet to figure out
how to localize buttons on jQueryUI dialogs.
commit 06a7736b88a9212501cdc21ffc7a522a326c095f
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 21 03:18:51 2010 +0530
Ajaxified Export Privileges. Added classes to Export and Edit links in
the Users table
commit a7e77314afa03120dd02b0cc35154eb1fd22cd36
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 21 03:18:21 2010 +0530
Ajaxified Export Privileges with jQueryUI dialog
commit ce79f6cdf1bb420748a993bcf729eaa6aa9c3f5f
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 21 02:57:58 2010 +0530
Improved the behaviour of Reload Privileges Ajax action. Ajaxified
the Revoke User action
commit 1a9526a4ff9507fec88bd03de0a395cca3ce6214
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 21 02:56:44 2010 +0530
Improved the behaviour for an Ajax request to Reload Privileges by using
the new PMA_ajaxResponse. Modified the response for Revoke User in an
Ajax request.
commit 603b6bf47b3b8eab1e936613b6294a79fa24c0a2
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 21 02:04:45 2010 +0530
Added the PMA_ajaxResponse function for Ajax requests that change the
database charset. Required for db_operations.php
commit cb4c1100749fa72dc3e0a7e7f3749187557689f3
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 21 02:03:16 2010 +0530
Ajaxified Rename Database, Copy Database and Change database charset
actions.
commit e9ffc7c5d5751cf20006dd77cfceec2640733316
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 21 01:51:44 2010 +0530
Added id's for copy database and change database charset forms.
Hooked in the PMA_ajaxResponse function for change/copying a database
commit 78b39d71eaa60d3fdc7e1391c74305a008dfb0d1
Merge: 8f3c8838a1c41ba529d657322ad8b1c1af825152 e070d45aa0bc7b0fcfb9b6b28e66351a06143dfb
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 21 00:06:15 2010 +0530
Merge remote branch 'origin/master'
commit 8f3c8838a1c41ba529d657322ad8b1c1af825152
Merge: f04f154c241c81cf612dbe1904caee4c4d1a6099 0963eb36edc3e902ae12899ca306b5ce057136f3
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jun 18 01:51:31 2010 +0530
Merge remote branch 'origin/master'
commit f04f154c241c81cf612dbe1904caee4c4d1a6099
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jun 18 01:44:43 2010 +0530
Improved Truncate Table, Drop Table actions and added Ajax handlers for
Drop Column and Add Primary Key actions
commit 52774d7616438ca9e86e96e56fb21ff7bc475db1
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jun 18 01:42:24 2010 +0530
Removed inline JavaScript calls to confirmLink and added ids to Drop
Column and Add Primary Key actions
commit 8b37b825ef3c3be2ebf7503bd12980e41e6f7cf7
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jun 17 18:22:35 2010 +0530
Handled submitting of Add User form. Still need to hook in
checkAddUser()
commit fd5e2dc3c115a3b642272f10163718bfd18d3bdb
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jun 17 18:21:03 2010 +0530
Fixed issues with submit of Add User form over Ajax.
Changed the id for the Add User Form to prevent conflict for the
setCheckboxes call
commit 266447bcd92eee17afae5ff243a747e70fbcb81a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jun 17 00:16:13 2010 +0530
Added a function to echo a json output for an ajax request.
commit a8d6f9ff4c91f6effba521c2712fc908eb413af6
Merge: d2c6e1c5e372cba7517b1ecc376c97dc032f003a 85c00ea45b513fa7cee9d6bb9827d9fc81602141
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 15 15:39:51 2010 +0530
Merge remote branch 'origin/master'
commit d2c6e1c5e372cba7517b1ecc376c97dc032f003a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 15 15:16:32 2010 +0530
Improved the PMA_ajaxShowMessage() function. Now, multiple messages
won't be seen at the same time
commit 0f081a843791d3d26c209b13f8b798462b44f8bf
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 15 15:06:56 2010 +0530
Removed inline JavaScript calls to confirmLink for truncate and drop
table actions
commit 2986a7b1a05ad71d5a775646e512e20e522bb6bf
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 15 14:58:48 2010 +0530
Removed inline JavaScript calls to confirmLink for renaming the
database, added an id to the form and submit button
commit 834b36bd6a1d8c12d683932b19805bfc1c3bb8ba
Merge: 5f255406bde5d63b67806c323f8891c3295610d2 3fc1f82e3ef9bf4408786335f224aad8ad4977ae
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed Jun 9 22:49:38 2010 +0530
Merge remote branch 'origin/master'
commit 5f255406bde5d63b67806c323f8891c3295610d2
Merge: 3553df0dc2fc9d9f641b6dbb29c28827cc18137f aeb14a271ab439b0f62940049aa07edf1240f46b
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Tue Jun 8 00:02:50 2010 +0530
Merge remote branch 'origin/master'
commit 3553df0dc2fc9d9f641b6dbb29c28827cc18137f
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 7 02:41:46 2010 +0530
Refactored setSelectOptions with jQuery code
commit 96c0bf55119b21f0448b528ac5d9b2b6688b678c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 7 02:13:58 2010 +0530
Refactored the setCheckboxes code with jQuery
commit 6ede5986ad0b35b2c4f3fdffb5ef5466f09a9031
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Jun 7 02:01:22 2010 +0530
Ajaxified Drop Table and Truncate Table actions.
Refactored markAllRows and unmarkAllRows with jQuery code
commit 42de77813c7c34f2e9255c30fb6d053ed69b5454
Merge: 86558dfd96e28527316f15a1c440c4b1b9367fbb f50d6694e79bb1f8268e44123e8b6935f10a365a
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun Jun 6 20:01:39 2010 +0530
Merge remote branch 'origin/master'
commit 86558dfd96e28527316f15a1c440c4b1b9367fbb
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jun 5 14:57:52 2010 +0530
Created a jQuery function PMA_confirm() which uses jQueryUI's dialogs to
do the same task as confirm(). Still a work in progress, the function
may change.
Attached the dialog and Ajax handlers to 'Drop Database' action on
db_structure.php
commit 50dabaf4e7dc4f165d0fc607db6a278f1b8180a5
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat Jun 5 14:56:08 2010 +0530
Removed the inline JavaScript confirmLinkDropDB() call and added an id
"drop_db_anchor" to the tab
commit 049c90ee0ba89074b3d53a81d9c56b0e46415007
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri Jun 4 21:27:25 2010 +0530
Edited PMA_generate_html_tab() to add the id parameter
Necessary for attaching Ajax calls with jQuery to some tab links
commit 160f4314eb518afcc1eba80da9575657584b2e34
Merge: 3bb4dbd0acc962969000cd2d0dab230d858dc28c 5dfe98a3786c7aaf55c9dd677da81bfe509c8612
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu Jun 3 22:34:52 2010 +0530
Merge remote branch 'origin/master'
commit 3bb4dbd0acc962969000cd2d0dab230d858dc28c
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun May 30 23:27:13 2010 +0530
Using $().live instead of $().click to bind event handlers
commit d195582cf808d453827c5c23afa023e0817cabb2
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat May 29 18:59:27 2010 +0530
Refactored addClass() and removeClass() to use jQuery's $.addClass() and
$.removeClass()
commit bd139f2465eac695f9bab9ccae5751383ec1e17f
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat May 29 01:44:51 2010 +0530
document.write() conflicts with jQuery.
Instead, appending Inline Edit to parent div (class="tools") with
$.append(), the recommended method.
$('body').append() is executed late, and hence, not used.
commit d5b50587e7af9a3e506acc84d7fe4336adf0a38d
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat May 29 01:40:05 2010 +0530
Revert "document.write conflicts with jQuery. Use $(body).append() instead at"
This reverts commit 20fce4cdcde18adc09c7ac3035d8cb28e4b2d6cf.
commit 20fce4cdcde18adc09c7ac3035d8cb28e4b2d6cf
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sat May 29 01:28:57 2010 +0530
document.write conflicts with jQuery. Use $(body).append() instead at
the same place to inject inline HTML with JavaScript.
commit d775f341a4791c108dab4839d094b4f654d97f32
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri May 28 13:06:51 2010 +0530
Added new js files for Ajax events on db_operations.php and
tbl_operations.php
commit 6276ad45a6a5ab2f14e8b33f8a0db5504bbe4e16
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Fri May 28 13:05:04 2010 +0530
Suppress the output if in an Ajax request
commit ed3e6a2925fb2fda00249b94b28c20d992f89350
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Thu May 27 20:27:55 2010 +0530
Used the correct method, PMA_showMessage() instead of
$message->display()
commit d14abc17ca31bf9554afc5d26ceb921b4d612974
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed May 26 18:27:21 2010 +0530
Attached Ajax event handler to Reload Privileges
commit 8a81f9111b469dfedd34a56ec7b9b8be9919c719
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed May 26 11:47:14 2010 +0530
Added PMA_ajaxInsertResponse and PMA_ajaxShowMessage.
Yet to test PMA_ajaxInsertResponse
commit 0e910967b09f31f0bb9ca89c1403bb578a96e4b7
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed May 26 11:46:08 2010 +0530
Attached jQuery event handlers to Add a New User using
jQueryUI Dialog. Work in progress, still need to
handle submission of form
commit 5ab3a60612ebf397406636503a59d6926ee63fff
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Wed May 26 11:38:58 2010 +0530
Header and Footr output is suppressed if it is an Ajax request
commit 0a417e3c2af9a2fea00005508a457d4ebf33ba3c
Merge: 38ac78e3baa6e925e6ef023a4196ae1d323bffc9 8f03bd5517039cf0051ec74e3700ac5ccfcbd433
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon May 24 18:34:47 2010 +0530
Merge branch 'master' into ajax
commit 38ac78e3baa6e925e6ef023a4196ae1d323bffc9
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon May 24 18:32:42 2010 +0530
merging changes from origin
commit bed1948d044f0e5d9125d3c905e8390d8a75b0de
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Sun May 23 01:22:01 2010 +0530
testing git setup - no major change made in code yet
only added a few comments
-----------------------------------------------------------------------
Summary of changes:
db_create.php | 81 +++
db_operations.php | 26 +-
db_search.php | 21 +-
db_sql.php | 3 +
db_structure.php | 13 +-
db_tracking.php | 21 +-
favicon.ico | Bin 18902 -> 18902 bytes
js/colorpicker/images/blank.gif | Bin 49 -> 49 bytes
js/colorpicker/images/colorpicker_background.png | Bin 1897 -> 1897 bytes
js/colorpicker/images/colorpicker_hex.png | Bin 532 -> 532 bytes
js/colorpicker/images/colorpicker_hsb_b.png | Bin 970 -> 970 bytes
js/colorpicker/images/colorpicker_hsb_h.png | Bin 1012 -> 1012 bytes
js/colorpicker/images/colorpicker_hsb_s.png | Bin 1171 -> 1171 bytes
js/colorpicker/images/colorpicker_indic.gif | Bin 86 -> 86 bytes
js/colorpicker/images/colorpicker_overlay.png | Bin 10355 -> 10355 bytes
js/colorpicker/images/colorpicker_rgb_b.png | Bin 970 -> 970 bytes
js/colorpicker/images/colorpicker_rgb_g.png | Bin 1069 -> 1069 bytes
js/colorpicker/images/colorpicker_rgb_r.png | Bin 1066 -> 1066 bytes
js/colorpicker/images/colorpicker_select.gif | Bin 78 -> 78 bytes
js/colorpicker/images/colorpicker_submit.png | Bin 984 -> 984 bytes
js/colorpicker/images/custom_background.png | Bin 1916 -> 1916 bytes
js/colorpicker/images/custom_hex.png | Bin 562 -> 562 bytes
js/colorpicker/images/custom_hsb_b.png | Bin 1097 -> 1097 bytes
js/colorpicker/images/custom_hsb_h.png | Bin 970 -> 970 bytes
js/colorpicker/images/custom_hsb_s.png | Bin 1168 -> 1168 bytes
js/colorpicker/images/custom_indic.gif | Bin 86 -> 86 bytes
js/colorpicker/images/custom_rgb_b.png | Bin 1008 -> 1008 bytes
js/colorpicker/images/custom_rgb_g.png | Bin 1069 -> 1069 bytes
js/colorpicker/images/custom_rgb_r.png | Bin 1018 -> 1018 bytes
js/colorpicker/images/custom_submit.png | Bin 997 -> 997 bytes
js/colorpicker/images/select.png | Bin 506 -> 506 bytes
js/colorpicker/images/select2.png | Bin 518 -> 518 bytes
js/colorpicker/images/slider.png | Bin 315 -> 315 bytes
js/common.js | 6 +-
js/db_operations.js | 127 ++++
js/db_search.js | 34 +
js/db_structure.js | 224 +++++++
js/functions.js | 657 ++++++++++++++++++--
js/messages.php | 40 ++
js/server_privileges.js | 373 +++++++++++-
js/sql.js | 630 +++++++++++++++++++
js/tbl_change.js | 154 +++++-
js/tbl_operations.js | 21 +
js/tbl_select.js | 32 +
js/tbl_structure.js | 133 ++++
libraries/Index.class.php | 6 +-
libraries/common.inc.php | 31 +
libraries/common.lib.php | 104 +++-
libraries/db_common.inc.php | 9 +
libraries/db_events.inc.php | 2 +-
libraries/db_info.inc.php | 5 +-
libraries/db_routines.inc.php | 6 +-
libraries/display_change_password.lib.php | 2 +-
libraries/display_create_database.lib.php | 2 +-
libraries/display_create_table.lib.php | 3 +-
libraries/display_tbl.lib.php | 77 ++-
libraries/display_tbl_links.lib.php | 11 +-
libraries/footer.inc.php | 6 +
libraries/header.inc.php | 320 +++++-----
libraries/server_links.inc.php | 191 +++---
libraries/sql_query_form.lib.php | 3 +
libraries/tbl_properties.inc.php | 2 +-
libraries/tbl_triggers.lib.php | 2 +-
libraries/tcpdf/font/dejavusans-bold.ctg.z | Bin 8509 -> 8509 bytes
libraries/tcpdf/font/dejavusans-bold.z | Bin 263826 -> 263826 bytes
libraries/tcpdf/font/dejavusans.ctg.z | Bin 8517 -> 8517 bytes
libraries/tcpdf/font/dejavusans.z | Bin 279448 -> 279448 bytes
libraries/tcpdf/font/dejavuserif-bold.ctg.z | Bin 3756 -> 3756 bytes
libraries/tcpdf/font/dejavuserif-bold.z | Bin 109155 -> 109155 bytes
libraries/tcpdf/font/dejavuserif.ctg.z | Bin 3756 -> 3756 bytes
libraries/tcpdf/font/dejavuserif.z | Bin 116258 -> 116258 bytes
main.php | 9 +-
pmd/images/2leftarrow.png | Bin 881 -> 881 bytes
pmd/images/2leftarrow_m.png | Bin 867 -> 867 bytes
pmd/images/2rightarrow.png | Bin 897 -> 897 bytes
pmd/images/2rightarrow_m.png | Bin 865 -> 865 bytes
pmd/images/ang_direct.png | Bin 795 -> 795 bytes
pmd/images/bord.png | Bin 75 -> 75 bytes
pmd/images/bottom.png | Bin 855 -> 855 bytes
pmd/images/def.png | Bin 742 -> 742 bytes
pmd/images/display_field.png | Bin 786 -> 786 bytes
pmd/images/downarrow1.png | Bin 880 -> 880 bytes
pmd/images/downarrow2.png | Bin 893 -> 893 bytes
pmd/images/downarrow2_m.png | Bin 871 -> 871 bytes
pmd/images/exec.png | Bin 854 -> 854 bytes
pmd/images/exec_small.png | Bin 197 -> 197 bytes
pmd/images/favicon.ico | Bin 1150 -> 1150 bytes
pmd/images/grid.png | Bin 803 -> 803 bytes
pmd/images/help.png | Bin 876 -> 876 bytes
pmd/images/help_relation.png | Bin 1355 -> 1355 bytes
pmd/images/pdf.png | Bin 946 -> 946 bytes
pmd/images/relation.png | Bin 324 -> 324 bytes
pmd/images/reload.png | Bin 945 -> 945 bytes
pmd/images/resize.png | Bin 140 -> 140 bytes
pmd/images/rightarrow1.png | Bin 837 -> 837 bytes
pmd/images/rightarrow2.png | Bin 878 -> 878 bytes
pmd/images/save.png | Bin 580 -> 580 bytes
pmd/images/table.png | Bin 171 -> 171 bytes
pmd/images/uparrow2_m.png | Bin 866 -> 866 bytes
pmd/styles/default/images/1.png | Bin 97 -> 97 bytes
pmd/styles/default/images/2.png | Bin 172 -> 172 bytes
pmd/styles/default/images/3.png | Bin 171 -> 171 bytes
pmd/styles/default/images/4.png | Bin 157 -> 157 bytes
pmd/styles/default/images/5.png | Bin 84 -> 84 bytes
pmd/styles/default/images/6.png | Bin 93 -> 93 bytes
pmd/styles/default/images/7.png | Bin 95 -> 95 bytes
pmd/styles/default/images/8.png | Bin 84 -> 84 bytes
pmd/styles/default/images/FieldKey_small.png | Bin 267 -> 267 bytes
pmd/styles/default/images/Field_small.png | Bin 293 -> 293 bytes
pmd/styles/default/images/Field_small_char.png | Bin 171 -> 171 bytes
pmd/styles/default/images/Field_small_date.png | Bin 154 -> 154 bytes
pmd/styles/default/images/Field_small_int.png | Bin 168 -> 168 bytes
pmd/styles/default/images/Header.png | Bin 145 -> 145 bytes
pmd/styles/default/images/Header_Linked.png | Bin 125 -> 125 bytes
pmd/styles/default/images/left_panel_butt.png | Bin 129 -> 129 bytes
pmd/styles/default/images/left_panel_tab.png | Bin 133 -> 133 bytes
pmd/styles/default/images/small_tab.png | Bin 179 -> 179 bytes
pmd/styles/default/images/top_panel.png | Bin 171 -> 171 bytes
scripts/google-javascript-compiler/compiler.jar | Bin 4337904 -> 4337904 bytes
server_databases.php | 2 +-
server_privileges.php | 192 +++++--
server_sql.php | 3 +
sql.php | 212 ++++++-
tbl_alter.php | 4 +
tbl_change.php | 9 +-
tbl_create.php | 96 +++
tbl_replace.php | 6 +
tbl_select.php | 5 +-
tbl_sql.php | 3 +
tbl_structure.php | 10 +-
themes/darkblue_orange/css/theme_right.css.php | 29 +
themes/darkblue_orange/img/ajax_clock_small.gif | Bin 1849 -> 1849 bytes
themes/darkblue_orange/img/arrow_ltr.png | Bin 277 -> 277 bytes
themes/darkblue_orange/img/arrow_rtl.png | Bin 278 -> 278 bytes
themes/darkblue_orange/img/asc_order.png | Bin 124 -> 124 bytes
themes/darkblue_orange/img/b_bookmark.png | Bin 372 -> 372 bytes
themes/darkblue_orange/img/b_browse.png | Bin 265 -> 265 bytes
themes/darkblue_orange/img/b_calendar.png | Bin 308 -> 308 bytes
themes/darkblue_orange/img/b_comment.png | Bin 552 -> 552 bytes
themes/darkblue_orange/img/b_dbstatistics.png | Bin 263 -> 263 bytes
themes/darkblue_orange/img/b_deltbl.png | Bin 364 -> 364 bytes
themes/darkblue_orange/img/b_docs.png | Bin 292 -> 292 bytes
themes/darkblue_orange/img/b_docsql.png | Bin 283 -> 283 bytes
themes/darkblue_orange/img/b_drop.png | Bin 311 -> 311 bytes
themes/darkblue_orange/img/b_edit.png | Bin 451 -> 451 bytes
themes/darkblue_orange/img/b_empty.png | Bin 298 -> 298 bytes
themes/darkblue_orange/img/b_engine.png | Bin 362 -> 362 bytes
themes/darkblue_orange/img/b_export.png | Bin 313 -> 313 bytes
themes/darkblue_orange/img/b_firstpage.png | Bin 238 -> 238 bytes
themes/darkblue_orange/img/b_ftext.png | Bin 277 -> 277 bytes
themes/darkblue_orange/img/b_help.png | Bin 229 -> 229 bytes
themes/darkblue_orange/img/b_home.png | Bin 370 -> 370 bytes
themes/darkblue_orange/img/b_import.png | Bin 310 -> 310 bytes
themes/darkblue_orange/img/b_index.png | Bin 315 -> 315 bytes
themes/darkblue_orange/img/b_info.png | Bin 234 -> 234 bytes
themes/darkblue_orange/img/b_insrow.png | Bin 283 -> 283 bytes
themes/darkblue_orange/img/b_lastpage.png | Bin 236 -> 236 bytes
themes/darkblue_orange/img/b_minus.png | Bin 183 -> 183 bytes
themes/darkblue_orange/img/b_newdb.png | Bin 408 -> 408 bytes
themes/darkblue_orange/img/b_newtbl.png | Bin 409 -> 409 bytes
themes/darkblue_orange/img/b_nextpage.png | Bin 221 -> 221 bytes
themes/darkblue_orange/img/b_pdfdoc.png | Bin 298 -> 298 bytes
themes/darkblue_orange/img/b_plus.png | Bin 185 -> 185 bytes
themes/darkblue_orange/img/b_prevpage.png | Bin 225 -> 225 bytes
themes/darkblue_orange/img/b_primary.png | Bin 416 -> 416 bytes
themes/darkblue_orange/img/b_print.png | Bin 574 -> 574 bytes
themes/darkblue_orange/img/b_props.png | Bin 294 -> 294 bytes
themes/darkblue_orange/img/b_relations.png | Bin 280 -> 280 bytes
themes/darkblue_orange/img/b_save.png | Bin 385 -> 385 bytes
themes/darkblue_orange/img/b_sbrowse.png | Bin 197 -> 197 bytes
themes/darkblue_orange/img/b_sdb.png | Bin 232 -> 232 bytes
themes/darkblue_orange/img/b_search.png | Bin 605 -> 605 bytes
themes/darkblue_orange/img/b_selboard.png | Bin 274 -> 274 bytes
themes/darkblue_orange/img/b_select.png | Bin 540 -> 540 bytes
themes/darkblue_orange/img/b_snewtbl.png | Bin 272 -> 272 bytes
themes/darkblue_orange/img/b_sql.png | Bin 322 -> 322 bytes
themes/darkblue_orange/img/b_sqldoc.png | Bin 290 -> 290 bytes
themes/darkblue_orange/img/b_sqlhelp.png | Bin 287 -> 287 bytes
themes/darkblue_orange/img/b_tblanalyse.png | Bin 296 -> 296 bytes
themes/darkblue_orange/img/b_tblexport.png | Bin 283 -> 283 bytes
themes/darkblue_orange/img/b_tblimport.png | Bin 280 -> 280 bytes
themes/darkblue_orange/img/b_tblops.png | Bin 345 -> 345 bytes
themes/darkblue_orange/img/b_tbloptimize.png | Bin 300 -> 300 bytes
themes/darkblue_orange/img/b_tipp.png | Bin 308 -> 308 bytes
themes/darkblue_orange/img/b_unique.png | Bin 281 -> 281 bytes
themes/darkblue_orange/img/b_usradd.png | Bin 523 -> 523 bytes
themes/darkblue_orange/img/b_usrcheck.png | Bin 400 -> 400 bytes
themes/darkblue_orange/img/b_usrdrop.png | Bin 438 -> 438 bytes
themes/darkblue_orange/img/b_usredit.png | Bin 493 -> 493 bytes
themes/darkblue_orange/img/b_usrlist.png | Bin 401 -> 401 bytes
themes/darkblue_orange/img/b_view.png | Bin 885 -> 885 bytes
themes/darkblue_orange/img/b_views.png | Bin 477 -> 477 bytes
themes/darkblue_orange/img/bd_browse.png | Bin 265 -> 265 bytes
themes/darkblue_orange/img/bd_deltbl.png | Bin 424 -> 424 bytes
themes/darkblue_orange/img/bd_drop.png | Bin 337 -> 337 bytes
themes/darkblue_orange/img/bd_empty.png | Bin 298 -> 298 bytes
themes/darkblue_orange/img/bd_firstpage.png | Bin 238 -> 238 bytes
themes/darkblue_orange/img/bd_ftext.png | Bin 277 -> 277 bytes
themes/darkblue_orange/img/bd_index.png | Bin 315 -> 315 bytes
themes/darkblue_orange/img/bd_insrow.png | Bin 347 -> 347 bytes
themes/darkblue_orange/img/bd_lastpage.png | Bin 236 -> 236 bytes
themes/darkblue_orange/img/bd_nextpage.png | Bin 221 -> 221 bytes
themes/darkblue_orange/img/bd_prevpage.png | Bin 225 -> 225 bytes
themes/darkblue_orange/img/bd_primary.png | Bin 389 -> 389 bytes
themes/darkblue_orange/img/bd_sbrowse.png | Bin 197 -> 197 bytes
themes/darkblue_orange/img/bd_select.png | Bin 524 -> 524 bytes
themes/darkblue_orange/img/bd_unique.png | Bin 287 -> 287 bytes
themes/darkblue_orange/img/error.ico | Bin 318 -> 318 bytes
themes/darkblue_orange/img/eye.png | Bin 750 -> 750 bytes
themes/darkblue_orange/img/item.png | Bin 206 -> 206 bytes
themes/darkblue_orange/img/item_ltr.png | Bin 173 -> 173 bytes
themes/darkblue_orange/img/item_rtl.png | Bin 173 -> 173 bytes
themes/darkblue_orange/img/logo_left.png | Bin 6854 -> 6854 bytes
themes/darkblue_orange/img/logo_right.png | Bin 5644 -> 5644 bytes
themes/darkblue_orange/img/new_data.jpg | Bin 1925 -> 1925 bytes
themes/darkblue_orange/img/new_data_hovered.jpg | Bin 1558 -> 1558 bytes
themes/darkblue_orange/img/new_data_selected.jpg | Bin 1450 -> 1450 bytes
.../img/new_data_selected_hovered.jpg | Bin 1456 -> 1456 bytes
themes/darkblue_orange/img/new_struct.jpg | Bin 1118 -> 1118 bytes
themes/darkblue_orange/img/new_struct_hovered.jpg | Bin 1643 -> 1643 bytes
themes/darkblue_orange/img/new_struct_selected.jpg | Bin 1431 -> 1431 bytes
.../img/new_struct_selected_hovered.jpg | Bin 1463 -> 1463 bytes
themes/darkblue_orange/img/php_sym.png | Bin 249 -> 249 bytes
themes/darkblue_orange/img/pma_logo2.png | Bin 1837 -> 1837 bytes
themes/darkblue_orange/img/s_asc.png | Bin 213 -> 213 bytes
themes/darkblue_orange/img/s_asci.png | Bin 254 -> 254 bytes
themes/darkblue_orange/img/s_attention.png | Bin 247 -> 247 bytes
themes/darkblue_orange/img/s_cancel.png | Bin 449 -> 449 bytes
themes/darkblue_orange/img/s_cancel2.png | Bin 234 -> 234 bytes
themes/darkblue_orange/img/s_db.png | Bin 285 -> 285 bytes
themes/darkblue_orange/img/s_desc.png | Bin 221 -> 221 bytes
themes/darkblue_orange/img/s_error.png | Bin 272 -> 272 bytes
themes/darkblue_orange/img/s_error2.png | Bin 237 -> 237 bytes
themes/darkblue_orange/img/s_fulltext.png | Bin 308 -> 308 bytes
themes/darkblue_orange/img/s_host.png | Bin 316 -> 316 bytes
themes/darkblue_orange/img/s_info.png | Bin 247 -> 247 bytes
themes/darkblue_orange/img/s_lang.png | Bin 422 -> 422 bytes
themes/darkblue_orange/img/s_loggoff.png | Bin 262 -> 262 bytes
themes/darkblue_orange/img/s_notice.png | Bin 247 -> 247 bytes
themes/darkblue_orange/img/s_okay.png | Bin 542 -> 542 bytes
themes/darkblue_orange/img/s_partialtext.png | Bin 318 -> 318 bytes
themes/darkblue_orange/img/s_passwd.png | Bin 505 -> 505 bytes
themes/darkblue_orange/img/s_process.png | Bin 362 -> 362 bytes
themes/darkblue_orange/img/s_really.png | Bin 229 -> 229 bytes
themes/darkblue_orange/img/s_reload.png | Bin 245 -> 245 bytes
themes/darkblue_orange/img/s_replication.png | Bin 447 -> 447 bytes
themes/darkblue_orange/img/s_rights.png | Bin 512 -> 512 bytes
themes/darkblue_orange/img/s_status.png | Bin 313 -> 313 bytes
themes/darkblue_orange/img/s_success.png | Bin 612 -> 612 bytes
themes/darkblue_orange/img/s_sync.png | Bin 551 -> 551 bytes
themes/darkblue_orange/img/s_tbl.png | Bin 252 -> 252 bytes
themes/darkblue_orange/img/s_theme.png | Bin 737 -> 737 bytes
themes/darkblue_orange/img/s_vars.png | Bin 306 -> 306 bytes
themes/darkblue_orange/img/s_views.png | Bin 368 -> 368 bytes
themes/darkblue_orange/img/s_warn.png | Bin 261 -> 261 bytes
themes/darkblue_orange/img/spacer.png | Bin 153 -> 153 bytes
themes/darkblue_orange/img/tbl_header.png | Bin 832 -> 832 bytes
themes/darkblue_orange/img/tbl_th.png | Bin 593 -> 593 bytes
themes/darkblue_orange/img/window-new.png | Bin 583 -> 583 bytes
.../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 180 bytes
.../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 178 bytes
.../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 120 bytes
.../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 105 bytes
.../jquery/images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 111 bytes
.../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 110 bytes
.../jquery/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 119 bytes
.../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 101 bytes
.../jquery/images/ui-icons_222222_256x240.png | Bin 4369 -> 4369 bytes
.../jquery/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 4369 bytes
.../jquery/images/ui-icons_454545_256x240.png | Bin 4369 -> 4369 bytes
.../jquery/images/ui-icons_888888_256x240.png | Bin 4369 -> 4369 bytes
.../jquery/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 4369 bytes
themes/darkblue_orange/screen.png | Bin 18697 -> 18697 bytes
themes/original/css/theme_right.css.php | 29 +
themes/original/img/ajax_clock_small.gif | Bin 1849 -> 1849 bytes
themes/original/img/arrow_ltr.png | Bin 277 -> 277 bytes
themes/original/img/arrow_rtl.png | Bin 278 -> 278 bytes
themes/original/img/asc_order.png | Bin 124 -> 124 bytes
themes/original/img/b_bookmark.png | Bin 372 -> 372 bytes
themes/original/img/b_browse.png | Bin 265 -> 265 bytes
themes/original/img/b_calendar.png | Bin 308 -> 308 bytes
themes/original/img/b_comment.png | Bin 552 -> 552 bytes
themes/original/img/b_dbstatistics.png | Bin 263 -> 263 bytes
themes/original/img/b_deltbl.png | Bin 364 -> 364 bytes
themes/original/img/b_docs.png | Bin 292 -> 292 bytes
themes/original/img/b_docsql.png | Bin 283 -> 283 bytes
themes/original/img/b_drop.png | Bin 311 -> 311 bytes
themes/original/img/b_edit.png | Bin 451 -> 451 bytes
themes/original/img/b_empty.png | Bin 298 -> 298 bytes
themes/original/img/b_engine.png | Bin 362 -> 362 bytes
themes/original/img/b_export.png | Bin 313 -> 313 bytes
themes/original/img/b_firstpage.png | Bin 238 -> 238 bytes
themes/original/img/b_ftext.png | Bin 277 -> 277 bytes
themes/original/img/b_help.png | Bin 229 -> 229 bytes
themes/original/img/b_home.png | Bin 370 -> 370 bytes
themes/original/img/b_import.png | Bin 310 -> 310 bytes
themes/original/img/b_index.png | Bin 315 -> 315 bytes
themes/original/img/b_info.png | Bin 234 -> 234 bytes
themes/original/img/b_insrow.png | Bin 283 -> 283 bytes
themes/original/img/b_lastpage.png | Bin 236 -> 236 bytes
themes/original/img/b_minus.png | Bin 183 -> 183 bytes
themes/original/img/b_newdb.png | Bin 408 -> 408 bytes
themes/original/img/b_newtbl.png | Bin 409 -> 409 bytes
themes/original/img/b_nextpage.png | Bin 221 -> 221 bytes
themes/original/img/b_pdfdoc.png | Bin 298 -> 298 bytes
themes/original/img/b_plus.png | Bin 185 -> 185 bytes
themes/original/img/b_prevpage.png | Bin 225 -> 225 bytes
themes/original/img/b_primary.png | Bin 416 -> 416 bytes
themes/original/img/b_print.png | Bin 574 -> 574 bytes
themes/original/img/b_props.png | Bin 294 -> 294 bytes
themes/original/img/b_relations.png | Bin 280 -> 280 bytes
themes/original/img/b_save.png | Bin 385 -> 385 bytes
themes/original/img/b_sbrowse.png | Bin 197 -> 197 bytes
themes/original/img/b_sdb.png | Bin 232 -> 232 bytes
themes/original/img/b_search.png | Bin 605 -> 605 bytes
themes/original/img/b_selboard.png | Bin 274 -> 274 bytes
themes/original/img/b_select.png | Bin 540 -> 540 bytes
themes/original/img/b_snewtbl.png | Bin 272 -> 272 bytes
themes/original/img/b_sql.png | Bin 322 -> 322 bytes
themes/original/img/b_sqldoc.png | Bin 290 -> 290 bytes
themes/original/img/b_sqlhelp.png | Bin 287 -> 287 bytes
themes/original/img/b_tblanalyse.png | Bin 296 -> 296 bytes
themes/original/img/b_tblexport.png | Bin 283 -> 283 bytes
themes/original/img/b_tblimport.png | Bin 280 -> 280 bytes
themes/original/img/b_tblops.png | Bin 345 -> 345 bytes
themes/original/img/b_tbloptimize.png | Bin 300 -> 300 bytes
themes/original/img/b_tipp.png | Bin 308 -> 308 bytes
themes/original/img/b_unique.png | Bin 281 -> 281 bytes
themes/original/img/b_usradd.png | Bin 523 -> 523 bytes
themes/original/img/b_usrcheck.png | Bin 400 -> 400 bytes
themes/original/img/b_usrdrop.png | Bin 438 -> 438 bytes
themes/original/img/b_usredit.png | Bin 493 -> 493 bytes
themes/original/img/b_usrlist.png | Bin 401 -> 401 bytes
themes/original/img/b_view.png | Bin 885 -> 885 bytes
themes/original/img/b_views.png | Bin 477 -> 477 bytes
themes/original/img/bd_browse.png | Bin 265 -> 265 bytes
themes/original/img/bd_deltbl.png | Bin 424 -> 424 bytes
themes/original/img/bd_drop.png | Bin 337 -> 337 bytes
themes/original/img/bd_empty.png | Bin 298 -> 298 bytes
themes/original/img/bd_firstpage.png | Bin 238 -> 238 bytes
themes/original/img/bd_ftext.png | Bin 277 -> 277 bytes
themes/original/img/bd_index.png | Bin 315 -> 315 bytes
themes/original/img/bd_insrow.png | Bin 347 -> 347 bytes
themes/original/img/bd_lastpage.png | Bin 236 -> 236 bytes
themes/original/img/bd_nextpage.png | Bin 221 -> 221 bytes
themes/original/img/bd_prevpage.png | Bin 225 -> 225 bytes
themes/original/img/bd_primary.png | Bin 389 -> 389 bytes
themes/original/img/bd_sbrowse.png | Bin 197 -> 197 bytes
themes/original/img/bd_select.png | Bin 524 -> 524 bytes
themes/original/img/bd_unique.png | Bin 287 -> 287 bytes
themes/original/img/docs_menu_bg.png | Bin 148 -> 148 bytes
themes/original/img/error.ico | Bin 318 -> 318 bytes
themes/original/img/eye.png | Bin 750 -> 750 bytes
themes/original/img/eye_grey.png | Bin 550 -> 550 bytes
themes/original/img/item.png | Bin 206 -> 206 bytes
themes/original/img/item_ltr.png | Bin 173 -> 173 bytes
themes/original/img/item_rtl.png | Bin 173 -> 173 bytes
themes/original/img/logo_left.png | Bin 6854 -> 6854 bytes
themes/original/img/logo_right.png | Bin 5658 -> 5658 bytes
themes/original/img/new_data.jpg | Bin 1925 -> 1925 bytes
themes/original/img/new_data_hovered.jpg | Bin 1558 -> 1558 bytes
themes/original/img/new_data_selected.jpg | Bin 1450 -> 1450 bytes
themes/original/img/new_data_selected_hovered.jpg | Bin 1456 -> 1456 bytes
themes/original/img/new_struct.jpg | Bin 1118 -> 1118 bytes
themes/original/img/new_struct_hovered.jpg | Bin 1643 -> 1643 bytes
themes/original/img/new_struct_selected.jpg | Bin 1431 -> 1431 bytes
.../original/img/new_struct_selected_hovered.jpg | Bin 1463 -> 1463 bytes
themes/original/img/php_sym.png | Bin 249 -> 249 bytes
themes/original/img/pma_logo2.png | Bin 1837 -> 1837 bytes
themes/original/img/s_asc.png | Bin 213 -> 213 bytes
themes/original/img/s_asci.png | Bin 254 -> 254 bytes
themes/original/img/s_attention.png | Bin 247 -> 247 bytes
themes/original/img/s_cancel.png | Bin 449 -> 449 bytes
themes/original/img/s_cancel2.png | Bin 234 -> 234 bytes
themes/original/img/s_db.png | Bin 285 -> 285 bytes
themes/original/img/s_desc.png | Bin 221 -> 221 bytes
themes/original/img/s_error.png | Bin 272 -> 272 bytes
themes/original/img/s_error2.png | Bin 237 -> 237 bytes
themes/original/img/s_fulltext.png | Bin 308 -> 308 bytes
themes/original/img/s_host.png | Bin 316 -> 316 bytes
themes/original/img/s_info.png | Bin 247 -> 247 bytes
themes/original/img/s_lang.png | Bin 422 -> 422 bytes
themes/original/img/s_loggoff.png | Bin 262 -> 262 bytes
themes/original/img/s_notice.png | Bin 247 -> 247 bytes
themes/original/img/s_okay.png | Bin 542 -> 542 bytes
themes/original/img/s_partialtext.png | Bin 318 -> 318 bytes
themes/original/img/s_passwd.png | Bin 505 -> 505 bytes
themes/original/img/s_process.png | Bin 362 -> 362 bytes
themes/original/img/s_really.png | Bin 229 -> 229 bytes
themes/original/img/s_reload.png | Bin 245 -> 245 bytes
themes/original/img/s_replication.png | Bin 447 -> 447 bytes
themes/original/img/s_rights.png | Bin 512 -> 512 bytes
themes/original/img/s_status.png | Bin 313 -> 313 bytes
themes/original/img/s_success.png | Bin 612 -> 612 bytes
themes/original/img/s_sync.png | Bin 551 -> 551 bytes
themes/original/img/s_tbl.png | Bin 252 -> 252 bytes
themes/original/img/s_theme.png | Bin 737 -> 737 bytes
themes/original/img/s_vars.png | Bin 306 -> 306 bytes
themes/original/img/s_views.png | Bin 368 -> 368 bytes
themes/original/img/s_warn.png | Bin 261 -> 261 bytes
themes/original/img/spacer.png | Bin 153 -> 153 bytes
themes/original/img/vertical_line.png | Bin 83 -> 83 bytes
themes/original/img/window-new.png | Bin 583 -> 583 bytes
.../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 180 bytes
.../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 178 bytes
.../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 120 bytes
.../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 105 bytes
.../jquery/images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 111 bytes
.../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 110 bytes
.../jquery/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 119 bytes
.../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 101 bytes
.../jquery/images/ui-icons_222222_256x240.png | Bin 4369 -> 4369 bytes
.../jquery/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 4369 bytes
.../jquery/images/ui-icons_454545_256x240.png | Bin 4369 -> 4369 bytes
.../jquery/images/ui-icons_888888_256x240.png | Bin 4369 -> 4369 bytes
.../jquery/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 4369 bytes
themes/original/screen.png | Bin 23699 -> 23699 bytes
user_password.php | 16 +-
418 files changed, 3563 insertions(+), 440 deletions(-)
mode change 100644 => 100755 CREDITS
mode change 100644 => 100755 ChangeLog
mode change 100644 => 100755 Documentation.html
mode change 100644 => 100755 INSTALL
mode change 100644 => 100755 LICENSE
mode change 100644 => 100755 README
mode change 100644 => 100755 README.VENDOR
mode change 100644 => 100755 TODO
mode change 100644 => 100755 browse_foreigners.php
mode change 100644 => 100755 bs_disp_as_mime_type.php
mode change 100644 => 100755 bs_play_media.php
mode change 100644 => 100755 changelog.php
mode change 100644 => 100755 chk_rel.php
mode change 100644 => 100755 config.sample.inc.php
mode change 100644 => 100755 contrib/README
mode change 100644 => 100755 contrib/htaccess
mode change 100644 => 100755 contrib/packaging/Fedora/phpMyAdmin-http.conf
mode change 100644 => 100755 contrib/packaging/Fedora/phpMyAdmin.spec
mode change 100644 => 100755 contrib/swekey.sample.conf
mode change 100644 => 100755 db_create.php
mode change 100644 => 100755 db_datadict.php
mode change 100644 => 100755 db_export.php
mode change 100644 => 100755 db_import.php
mode change 100644 => 100755 db_operations.php
mode change 100644 => 100755 db_printview.php
mode change 100644 => 100755 db_qbe.php
mode change 100644 => 100755 db_search.php
mode change 100644 => 100755 db_sql.php
mode change 100644 => 100755 db_structure.php
mode change 100644 => 100755 db_tracking.php
mode change 100644 => 100755 docs.css
mode change 100644 => 100755 error.php
mode change 100644 => 100755 export.php
mode change 100644 => 100755 favicon.ico
mode change 100644 => 100755 import.php
mode change 100644 => 100755 import_status.php
mode change 100644 => 100755 index.php
mode change 100644 => 100755 js/colorpicker/css/colorpicker.css
mode change 100644 => 100755 js/colorpicker/css/layout.css
mode change 100644 => 100755 js/colorpicker/images/blank.gif
mode change 100644 => 100755 js/colorpicker/images/colorpicker_background.png
mode change 100644 => 100755 js/colorpicker/images/colorpicker_hex.png
mode change 100644 => 100755 js/colorpicker/images/colorpicker_hsb_b.png
mode change 100644 => 100755 js/colorpicker/images/colorpicker_hsb_h.png
mode change 100644 => 100755 js/colorpicker/images/colorpicker_hsb_s.png
mode change 100644 => 100755 js/colorpicker/images/colorpicker_indic.gif
mode change 100644 => 100755 js/colorpicker/images/colorpicker_overlay.png
mode change 100644 => 100755 js/colorpicker/images/colorpicker_rgb_b.png
mode change 100644 => 100755 js/colorpicker/images/colorpicker_rgb_g.png
mode change 100644 => 100755 js/colorpicker/images/colorpicker_rgb_r.png
mode change 100644 => 100755 js/colorpicker/images/colorpicker_select.gif
mode change 100644 => 100755 js/colorpicker/images/colorpicker_submit.png
mode change 100644 => 100755 js/colorpicker/images/custom_background.png
mode change 100644 => 100755 js/colorpicker/images/custom_hex.png
mode change 100644 => 100755 js/colorpicker/images/custom_hsb_b.png
mode change 100644 => 100755 js/colorpicker/images/custom_hsb_h.png
mode change 100644 => 100755 js/colorpicker/images/custom_hsb_s.png
mode change 100644 => 100755 js/colorpicker/images/custom_indic.gif
mode change 100644 => 100755 js/colorpicker/images/custom_rgb_b.png
mode change 100644 => 100755 js/colorpicker/images/custom_rgb_g.png
mode change 100644 => 100755 js/colorpicker/images/custom_rgb_r.png
mode change 100644 => 100755 js/colorpicker/images/custom_submit.png
mode change 100644 => 100755 js/colorpicker/images/select.png
mode change 100644 => 100755 js/colorpicker/images/select2.png
mode change 100644 => 100755 js/colorpicker/images/slider.png
mode change 100644 => 100755 js/colorpicker/js/colorpicker.js
mode change 100644 => 100755 js/common.js
mode change 100644 => 100755 js/cross_framing_protection.js
create mode 100644 js/db_operations.js
create mode 100644 js/db_search.js
create mode 100644 js/db_structure.js
mode change 100644 => 100755 js/dom-drag.js
mode change 100644 => 100755 js/functions.js
mode change 100644 => 100755 js/indexes.js
mode change 100644 => 100755 js/jquery/jquery-1.4.2.js
mode change 100644 => 100755 js/jquery/jquery-ui-1.8.custom.js
mode change 100644 => 100755 js/jquery/jquery.json-2.2.js
mode change 100644 => 100755 js/jquery/timepicker.js
mode change 100644 => 100755 js/keyhandler.js
mode change 100644 => 100755 js/main_custom_color.js
mode change 100644 => 100755 js/messages.php
mode change 100644 => 100755 js/navigation.js
mode change 100644 => 100755 js/querywindow.js
mode change 100644 => 100755 js/replication.js
mode change 100644 => 100755 js/server_privileges.js
mode change 100644 => 100755 js/server_synchronize.js
create mode 100644 js/sql.js
mode change 100644 => 100755 js/tbl_change.js
create mode 100644 js/tbl_operations.js
mode change 100644 => 100755 js/tbl_relation.js
create mode 100644 js/tbl_select.js
create mode 100644 js/tbl_structure.js
mode change 100644 => 100755 js/update-location.js
mode change 100644 => 100755 libraries/.htaccess
mode change 100644 => 100755 libraries/Config.class.php
mode change 100644 => 100755 libraries/Error.class.php
mode change 100644 => 100755 libraries/Error_Handler.class.php
mode change 100644 => 100755 libraries/File.class.php
mode change 100644 => 100755 libraries/Index.class.php
mode change 100644 => 100755 libraries/List.class.php
mode change 100644 => 100755 libraries/List_Database.class.php
mode change 100644 => 100755 libraries/Message.class.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Autoloader.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/Exception.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/Function.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/Functions.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/DataType.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/DataValidation.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Comment.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/DocumentProperties.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/DocumentSecurity.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/HashTable.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/IComparable.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/IOFactory.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/NamedRange.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/CSV.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/Excel2007.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/Excel5.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/IReader.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/Serialized.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/ReferenceHelper.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/RichText.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/RichText/ITextElement.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/RichText/Run.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/RichText/TextElement.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Date.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Drawing.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Excel5.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/File.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Font.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLERead.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/String.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Alignment.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Border.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Borders.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Color.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Conditional.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Fill.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Font.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/NumberFormat.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Protection.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/Protection.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/Row.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/WorksheetIterator.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/CSV.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/HTML.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/IWriter.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/PDF.php
mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Serialized.php
mode change 100644 => 100755 libraries/PMA.php
mode change 100644 => 100755 libraries/Partition.class.php
mode change 100644 => 100755 libraries/StorageEngine.class.php
mode change 100644 => 100755 libraries/Table.class.php
mode change 100644 => 100755 libraries/Theme.class.php
mode change 100644 => 100755 libraries/Theme_Manager.class.php
mode change 100644 => 100755 libraries/Tracker.class.php
mode change 100644 => 100755 libraries/auth/config.auth.lib.php
mode change 100644 => 100755 libraries/auth/cookie.auth.lib.php
mode change 100644 => 100755 libraries/auth/http.auth.lib.php
mode change 100644 => 100755 libraries/auth/signon.auth.lib.php
mode change 100644 => 100755 libraries/auth/swekey/authentication.inc.php
mode change 100644 => 100755 libraries/auth/swekey/musbe-ca.crt
mode change 100644 => 100755 libraries/auth/swekey/swekey.auth.lib.php
mode change 100644 => 100755 libraries/auth/swekey/swekey.php
mode change 100644 => 100755 libraries/blobstreaming.lib.php
mode change 100644 => 100755 libraries/blowfish.php
mode change 100644 => 100755 libraries/bookmark.lib.php
mode change 100644 => 100755 libraries/charset_conversion.lib.php
mode change 100644 => 100755 libraries/check_user_privileges.lib.php
mode change 100644 => 100755 libraries/cleanup.lib.php
mode change 100644 => 100755 libraries/common.inc.php
mode change 100644 => 100755 libraries/common.lib.php
mode change 100644 => 100755 libraries/config.default.php
mode change 100644 => 100755 libraries/config/Form.class.php
mode change 100644 => 100755 libraries/config/FormDisplay.class.php
mode change 100644 => 100755 libraries/config/validate.lib.php
mode change 100644 => 100755 libraries/core.lib.php
mode change 100644 => 100755 libraries/database_interface.lib.php
mode change 100644 => 100755 libraries/db_common.inc.php
mode change 100644 => 100755 libraries/db_events.inc.php
mode change 100644 => 100755 libraries/db_info.inc.php
mode change 100644 => 100755 libraries/db_links.inc.php
mode change 100644 => 100755 libraries/db_routines.inc.php
mode change 100644 => 100755 libraries/db_structure.lib.php
mode change 100644 => 100755 libraries/db_table_exists.lib.php
mode change 100644 => 100755 libraries/dbg/setup.php
mode change 100644 => 100755 libraries/dbi/mysql.dbi.lib.php
mode change 100644 => 100755 libraries/dbi/mysqli.dbi.lib.php
mode change 100644 => 100755 libraries/display_change_password.lib.php
mode change 100644 => 100755 libraries/display_create_database.lib.php
mode change 100644 => 100755 libraries/display_create_table.lib.php
mode change 100644 => 100755 libraries/display_export.lib.php
mode change 100644 => 100755 libraries/display_import.lib.php
mode change 100644 => 100755 libraries/display_import_ajax.lib.php
mode change 100644 => 100755 libraries/display_select_lang.lib.php
mode change 100644 => 100755 libraries/display_tbl.lib.php
mode change 100644 => 100755 libraries/display_tbl_links.lib.php
mode change 100644 => 100755 libraries/engines/bdb.lib.php
mode change 100644 => 100755 libraries/engines/berkeleydb.lib.php
mode change 100644 => 100755 libraries/engines/binlog.lib.php
mode change 100644 => 100755 libraries/engines/innobase.lib.php
mode change 100644 => 100755 libraries/engines/innodb.lib.php
mode change 100644 => 100755 libraries/engines/memory.lib.php
mode change 100644 => 100755 libraries/engines/merge.lib.php
mode change 100644 => 100755 libraries/engines/mrg_myisam.lib.php
mode change 100644 => 100755 libraries/engines/myisam.lib.php
mode change 100644 => 100755 libraries/engines/ndbcluster.lib.php
mode change 100644 => 100755 libraries/engines/pbxt.lib.php
mode change 100644 => 100755 libraries/export/codegen.php
mode change 100644 => 100755 libraries/export/csv.php
mode change 100644 => 100755 libraries/export/excel.php
mode change 100644 => 100755 libraries/export/htmlword.php
mode change 100644 => 100755 libraries/export/latex.php
mode change 100644 => 100755 libraries/export/mediawiki.php
mode change 100644 => 100755 libraries/export/ods.php
mode change 100644 => 100755 libraries/export/odt.php
mode change 100644 => 100755 libraries/export/pdf.php
mode change 100644 => 100755 libraries/export/php_array.php
mode change 100644 => 100755 libraries/export/sql.php
mode change 100644 => 100755 libraries/export/texytext.php
mode change 100644 => 100755 libraries/export/xls.php
mode change 100644 => 100755 libraries/export/xlsx.php
mode change 100644 => 100755 libraries/export/xml.php
mode change 100644 => 100755 libraries/export/yaml.php
mode change 100644 => 100755 libraries/file_listing.php
mode change 100644 => 100755 libraries/footer.inc.php
mode change 100644 => 100755 libraries/grab_globals.lib.php
mode change 100644 => 100755 libraries/header.inc.php
mode change 100644 => 100755 libraries/header_http.inc.php
mode change 100644 => 100755 libraries/header_meta_style.inc.php
mode change 100644 => 100755 libraries/header_printview.inc.php
mode change 100644 => 100755 libraries/header_scripts.inc.php
mode change 100644 => 100755 libraries/iconv_wrapper.lib.php
mode change 100644 => 100755 libraries/import.lib.php
mode change 100644 => 100755 libraries/import/README
mode change 100644 => 100755 libraries/import/csv.php
mode change 100644 => 100755 libraries/import/docsql.php
mode change 100644 => 100755 libraries/import/ldi.php
mode change 100644 => 100755 libraries/import/ods.php
mode change 100644 => 100755 libraries/import/sql.php
mode change 100644 => 100755 libraries/import/upload/apc.php
mode change 100644 => 100755 libraries/import/upload/noplugin.php
mode change 100644 => 100755 libraries/import/upload/uploadprogress.php
mode change 100644 => 100755 libraries/import/xls.php
mode change 100644 => 100755 libraries/import/xlsx.php
mode change 100644 => 100755 libraries/import/xml.php
mode change 100644 => 100755 libraries/information_schema_relations.lib.php
mode change 100644 => 100755 libraries/ip_allow_deny.lib.php
mode change 100644 => 100755 libraries/js_escape.lib.php
mode change 100644 => 100755 libraries/kanji-encoding.lib.php
mode change 100644 => 100755 libraries/logging.lib.php
mode change 100644 => 100755 libraries/mime.lib.php
mode change 100644 => 100755 libraries/mult_submits.inc.php
mode change 100644 => 100755 libraries/mysql_charsets.lib.php
mode change 100644 => 100755 libraries/navigation_header.inc.php
mode change 100644 => 100755 libraries/ob.lib.php
mode change 100644 => 100755 libraries/opendocument.lib.php
mode change 100644 => 100755 libraries/parse_analyze.lib.php
mode change 100644 => 100755 libraries/php-gettext/gettext.inc
mode change 100644 => 100755 libraries/php-gettext/gettext.php
mode change 100644 => 100755 libraries/php-gettext/streams.php
mode change 100644 => 100755 libraries/plugin_interface.lib.php
mode change 100644 => 100755 libraries/relation.lib.php
mode change 100644 => 100755 libraries/relation_cleanup.lib.php
mode change 100644 => 100755 libraries/replication.inc.php
mode change 100644 => 100755 libraries/replication_gui.lib.php
mode change 100644 => 100755 libraries/sanitizing.lib.php
mode change 100644 => 100755 libraries/select_lang.lib.php
mode change 100644 => 100755 libraries/select_server.lib.php
mode change 100644 => 100755 libraries/server_common.inc.php
mode change 100644 => 100755 libraries/server_links.inc.php
mode change 100644 => 100755 libraries/server_synchronize.lib.php
mode change 100644 => 100755 libraries/session.inc.php
mode change 100644 => 100755 libraries/sql_query_form.lib.php
mode change 100644 => 100755 libraries/sqlparser.data.php
mode change 100644 => 100755 libraries/sqlparser.lib.php
mode change 100644 => 100755 libraries/sqlvalidator.class.php
mode change 100644 => 100755 libraries/sqlvalidator.lib.php
mode change 100644 => 100755 libraries/string.lib.php
mode change 100644 => 100755 libraries/string_mb.lib.php
mode change 100644 => 100755 libraries/string_native.lib.php
mode change 100644 => 100755 libraries/string_type_ctype.lib.php
mode change 100644 => 100755 libraries/string_type_native.lib.php
mode change 100644 => 100755 libraries/tbl_common.php
mode change 100644 => 100755 libraries/tbl_info.inc.php
mode change 100644 => 100755 libraries/tbl_links.inc.php
mode change 100644 => 100755 libraries/tbl_properties.inc.php
mode change 100644 => 100755 libraries/tbl_replace_fields.inc.php
mode change 100644 => 100755 libraries/tbl_triggers.lib.php
mode change 100644 => 100755 libraries/tcpdf/LICENSE.TXT
mode change 100644 => 100755 libraries/tcpdf/font/LICENSE
mode change 100644 => 100755 libraries/tcpdf/font/dejavusans-bold.ctg.z
mode change 100644 => 100755 libraries/tcpdf/font/dejavusans-bold.z
mode change 100644 => 100755 libraries/tcpdf/font/dejavusans.ctg.z
mode change 100644 => 100755 libraries/tcpdf/font/dejavusans.php
mode change 100644 => 100755 libraries/tcpdf/font/dejavusans.z
mode change 100644 => 100755 libraries/tcpdf/font/dejavusansb.php
mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif-bold.ctg.z
mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif-bold.z
mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif.ctg.z
mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif.php
mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif.z
mode change 100644 => 100755 libraries/tcpdf/font/dejavuserifb.php
mode change 100644 => 100755 libraries/tcpdf/tcpdf.php
mode change 100644 => 100755 libraries/tcpdf/unicode_data.php
mode change 100644 => 100755 libraries/transformations.lib.php
mode change 100644 => 100755 libraries/transformations/README
mode change 100644 => 100755 libraries/transformations/TEMPLATE
mode change 100644 => 100755 libraries/transformations/TEMPLATE_MIMETYPE
mode change 100644 => 100755 libraries/transformations/application_octetstream__download.inc.php
mode change 100644 => 100755 libraries/transformations/application_octetstream__hex.inc.php
mode change 100644 => 100755 libraries/transformations/global.inc.php
mode change 100644 => 100755 libraries/transformations/image_jpeg__inline.inc.php
mode change 100644 => 100755 libraries/transformations/image_jpeg__link.inc.php
mode change 100644 => 100755 libraries/transformations/image_png__inline.inc.php
mode change 100644 => 100755 libraries/transformations/text_plain__dateformat.inc.php
mode change 100644 => 100755 libraries/transformations/text_plain__external.inc.php
mode change 100644 => 100755 libraries/transformations/text_plain__formatted.inc.php
mode change 100644 => 100755 libraries/transformations/text_plain__imagelink.inc.php
mode change 100644 => 100755 libraries/transformations/text_plain__link.inc.php
mode change 100644 => 100755 libraries/transformations/text_plain__longToIpv4.inc.php
mode change 100644 => 100755 libraries/transformations/text_plain__sql.inc.php
mode change 100644 => 100755 libraries/transformations/text_plain__substr.inc.php
mode change 100644 => 100755 libraries/url_generating.lib.php
mode change 100644 => 100755 libraries/vendor_config.php
mode change 100644 => 100755 libraries/zip.lib.php
mode change 100644 => 100755 libraries/zip_extension.lib.php
mode change 100644 => 100755 license.php
mode change 100644 => 100755 main.php
mode change 100644 => 100755 navigation.php
mode change 100644 => 100755 phpdoctor.ini
mode change 100644 => 100755 phpinfo.php
mode change 100644 => 100755 phpmyadmin.css.php
mode change 100644 => 100755 pmd/images/2leftarrow.png
mode change 100644 => 100755 pmd/images/2leftarrow_m.png
mode change 100644 => 100755 pmd/images/2rightarrow.png
mode change 100644 => 100755 pmd/images/2rightarrow_m.png
mode change 100644 => 100755 pmd/images/ang_direct.png
mode change 100644 => 100755 pmd/images/bord.png
mode change 100644 => 100755 pmd/images/bottom.png
mode change 100644 => 100755 pmd/images/def.png
mode change 100644 => 100755 pmd/images/display_field.png
mode change 100644 => 100755 pmd/images/downarrow1.png
mode change 100644 => 100755 pmd/images/downarrow2.png
mode change 100644 => 100755 pmd/images/downarrow2_m.png
mode change 100644 => 100755 pmd/images/exec.png
mode change 100644 => 100755 pmd/images/exec_small.png
mode change 100644 => 100755 pmd/images/favicon.ico
mode change 100644 => 100755 pmd/images/grid.png
mode change 100644 => 100755 pmd/images/help.png
mode change 100644 => 100755 pmd/images/help_relation.png
mode change 100644 => 100755 pmd/images/pdf.png
mode change 100644 => 100755 pmd/images/relation.png
mode change 100644 => 100755 pmd/images/reload.png
mode change 100644 => 100755 pmd/images/resize.png
mode change 100644 => 100755 pmd/images/rightarrow1.png
mode change 100644 => 100755 pmd/images/rightarrow2.png
mode change 100644 => 100755 pmd/images/save.png
mode change 100644 => 100755 pmd/images/table.png
mode change 100644 => 100755 pmd/images/uparrow2_m.png
mode change 100644 => 100755 pmd/scripts/ajax.js
mode change 100644 => 100755 pmd/scripts/iecanvas.js
mode change 100644 => 100755 pmd/scripts/move.js
mode change 100644 => 100755 pmd/styles/default/images/1.png
mode change 100644 => 100755 pmd/styles/default/images/2.png
mode change 100644 => 100755 pmd/styles/default/images/3.png
mode change 100644 => 100755 pmd/styles/default/images/4.png
mode change 100644 => 100755 pmd/styles/default/images/5.png
mode change 100644 => 100755 pmd/styles/default/images/6.png
mode change 100644 => 100755 pmd/styles/default/images/7.png
mode change 100644 => 100755 pmd/styles/default/images/8.png
mode change 100644 => 100755 pmd/styles/default/images/FieldKey_small.png
mode change 100644 => 100755 pmd/styles/default/images/Field_small.png
mode change 100644 => 100755 pmd/styles/default/images/Field_small_char.png
mode change 100644 => 100755 pmd/styles/default/images/Field_small_date.png
mode change 100644 => 100755 pmd/styles/default/images/Field_small_int.png
mode change 100644 => 100755 pmd/styles/default/images/Header.png
mode change 100644 => 100755 pmd/styles/default/images/Header_Linked.png
mode change 100644 => 100755 pmd/styles/default/images/left_panel_butt.png
mode change 100644 => 100755 pmd/styles/default/images/left_panel_tab.png
mode change 100644 => 100755 pmd/styles/default/images/small_tab.png
mode change 100644 => 100755 pmd/styles/default/images/top_panel.png
mode change 100644 => 100755 pmd/styles/default/style1.css
mode change 100644 => 100755 pmd_common.php
mode change 100644 => 100755 pmd_display_field.php
mode change 100644 => 100755 pmd_general.php
mode change 100644 => 100755 pmd_help.php
mode change 100644 => 100755 pmd_pdf.php
mode change 100644 => 100755 pmd_relation_new.php
mode change 100644 => 100755 pmd_relation_upd.php
mode change 100644 => 100755 pmd_save_pos.php
mode change 100644 => 100755 po/.gitignore
mode change 100644 => 100755 print.css
mode change 100644 => 100755 querywindow.php
mode change 100644 => 100755 robots.txt
mode change 100644 => 100755 scripts/create_tables.sql
mode change 100644 => 100755 scripts/decode_bug.php
mode change 100644 => 100755 scripts/google-javascript-compiler/COPYING
mode change 100644 => 100755 scripts/google-javascript-compiler/README
mode change 100644 => 100755 scripts/google-javascript-compiler/compiler.jar
mode change 100644 => 100755 scripts/signon.php
mode change 100644 => 100755 scripts/upgrade_tables_mysql_4_1_2+.sql
mode change 100644 => 100755 server_binlog.php
mode change 100644 => 100755 server_collations.php
mode change 100644 => 100755 server_databases.php
mode change 100644 => 100755 server_engines.php
mode change 100644 => 100755 server_export.php
mode change 100644 => 100755 server_import.php
mode change 100644 => 100755 server_privileges.php
mode change 100644 => 100755 server_processlist.php
mode change 100644 => 100755 server_replication.php
mode change 100644 => 100755 server_sql.php
mode change 100644 => 100755 server_status.php
mode change 100644 => 100755 server_synchronize.php
mode change 100644 => 100755 server_variables.php
mode change 100644 => 100755 setup/config.php
mode change 100644 => 100755 setup/frames/config.inc.php
mode change 100644 => 100755 setup/frames/form.inc.php
mode change 100644 => 100755 setup/frames/index.inc.php
mode change 100644 => 100755 setup/frames/menu.inc.php
mode change 100644 => 100755 setup/frames/servers.inc.php
mode change 100644 => 100755 setup/index.php
mode change 100644 => 100755 setup/lib/.htaccess
mode change 100644 => 100755 setup/lib/common.inc.php
mode change 100644 => 100755 setup/lib/form_processing.lib.php
mode change 100644 => 100755 setup/lib/index.lib.php
mode change 100644 => 100755 setup/scripts.js
mode change 100644 => 100755 setup/styles.css
mode change 100644 => 100755 setup/validate.php
mode change 100644 => 100755 show_config_errors.php
mode change 100644 => 100755 sql.php
mode change 100644 => 100755 tbl_addfield.php
mode change 100644 => 100755 tbl_alter.php
mode change 100644 => 100755 tbl_change.php
mode change 100644 => 100755 tbl_create.php
mode change 100644 => 100755 tbl_export.php
mode change 100644 => 100755 tbl_get_field.php
mode change 100644 => 100755 tbl_import.php
mode change 100644 => 100755 tbl_indexes.php
mode change 100644 => 100755 tbl_move_copy.php
mode change 100644 => 100755 tbl_operations.php
mode change 100644 => 100755 tbl_printview.php
mode change 100644 => 100755 tbl_relation.php
mode change 100644 => 100755 tbl_replace.php
mode change 100644 => 100755 tbl_row_action.php
mode change 100644 => 100755 tbl_select.php
mode change 100644 => 100755 tbl_sql.php
mode change 100644 => 100755 tbl_structure.php
mode change 100644 => 100755 tbl_tracking.php
mode change 100644 => 100755 test/AllSeleniumTests.php
mode change 100644 => 100755 test/AllTests.php
mode change 100644 => 100755 test/Environment_test.php
mode change 100644 => 100755 test/FailTest.php
mode change 100644 => 100755 test/PMA_Message_test.php
mode change 100644 => 100755 test/PMA_STR_sub_test.php
mode change 100644 => 100755 test/PMA_blowfish_test.php
mode change 100644 => 100755 test/PMA_cache_test.php
mode change 100644 => 100755 test/PMA_escapeJsString_test.php
mode change 100644 => 100755 test/PMA_escapeMySqlWildcards_test.php
mode change 100644 => 100755 test/PMA_foreignKeySupported_test.php
mode change 100644 => 100755 test/PMA_formatNumberByteDown_test.php
mode change 100644 => 100755 test/PMA_generateCommonUrl_test.php
mode change 100644 => 100755 test/PMA_get_real_size_test.php
mode change 100644 => 100755 test/PMA_headerLocation_test.php
mode change 100644 => 100755 test/PMA_ifSetOr_test.php
mode change 100644 => 100755 test/PMA_isValid_test.php
mode change 100644 => 100755 test/PMA_localisedDateTimespan_test.php
mode change 100644 => 100755 test/PMA_pow_test.php
mode change 100644 => 100755 test/PMA_printableBitValue_test.php
mode change 100644 => 100755 test/PMA_quoting_slashing_test.php
mode change 100644 => 100755 test/PMA_sanitize_test.php
mode change 100644 => 100755 test/PMA_showHint_test.php
mode change 100644 => 100755 test/PMA_stringOperations_test.php
mode change 100644 => 100755 test/PMA_transformation_getOptions_test.php
mode change 100644 => 100755 test/PMA_whichCrlf_test.php
mode change 100644 => 100755 test/PmaSeleniumLoginTest.php
mode change 100644 => 100755 test/PmaSeleniumPrivilegesTest.php
mode change 100644 => 100755 test/PmaSeleniumTestCase.php
mode change 100644 => 100755 test/PmaSeleniumXssTest.php
mode change 100644 => 100755 test/theme.php
mode change 100644 => 100755 test/wui.php
mode change 100644 => 100755 themes.php
mode change 100644 => 100755 themes/.gitignore
mode change 100644 => 100755 themes/darkblue_orange/css/theme_right.css.php
mode change 100644 => 100755 themes/darkblue_orange/img/ajax_clock_small.gif
mode change 100644 => 100755 themes/darkblue_orange/img/arrow_ltr.png
mode change 100644 => 100755 themes/darkblue_orange/img/arrow_rtl.png
mode change 100644 => 100755 themes/darkblue_orange/img/asc_order.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_bookmark.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_browse.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_calendar.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_comment.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_dbstatistics.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_deltbl.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_docs.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_docsql.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_drop.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_edit.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_empty.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_engine.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_export.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_firstpage.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_ftext.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_help.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_home.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_import.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_index.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_info.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_insrow.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_lastpage.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_minus.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_newdb.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_newtbl.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_nextpage.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_pdfdoc.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_plus.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_prevpage.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_primary.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_print.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_props.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_relations.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_save.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_sbrowse.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_sdb.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_search.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_selboard.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_select.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_snewtbl.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_sql.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_sqldoc.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_sqlhelp.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_tblanalyse.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_tblexport.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_tblimport.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_tblops.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_tbloptimize.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_tipp.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_unique.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_usradd.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_usrcheck.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_usrdrop.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_usredit.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_usrlist.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_view.png
mode change 100644 => 100755 themes/darkblue_orange/img/b_views.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_browse.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_deltbl.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_drop.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_empty.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_firstpage.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_ftext.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_index.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_insrow.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_lastpage.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_nextpage.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_prevpage.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_primary.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_sbrowse.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_select.png
mode change 100644 => 100755 themes/darkblue_orange/img/bd_unique.png
mode change 100644 => 100755 themes/darkblue_orange/img/error.ico
mode change 100644 => 100755 themes/darkblue_orange/img/eye.png
mode change 100644 => 100755 themes/darkblue_orange/img/item.png
mode change 100644 => 100755 themes/darkblue_orange/img/item_ltr.png
mode change 100644 => 100755 themes/darkblue_orange/img/item_rtl.png
mode change 100644 => 100755 themes/darkblue_orange/img/logo_left.png
mode change 100644 => 100755 themes/darkblue_orange/img/logo_right.png
mode change 100644 => 100755 themes/darkblue_orange/img/new_data.jpg
mode change 100644 => 100755 themes/darkblue_orange/img/new_data_hovered.jpg
mode change 100644 => 100755 themes/darkblue_orange/img/new_data_selected.jpg
mode change 100644 => 100755 themes/darkblue_orange/img/new_data_selected_hovered.jpg
mode change 100644 => 100755 themes/darkblue_orange/img/new_struct.jpg
mode change 100644 => 100755 themes/darkblue_orange/img/new_struct_hovered.jpg
mode change 100644 => 100755 themes/darkblue_orange/img/new_struct_selected.jpg
mode change 100644 => 100755 themes/darkblue_orange/img/new_struct_selected_hovered.jpg
mode change 100644 => 100755 themes/darkblue_orange/img/php_sym.png
mode change 100644 => 100755 themes/darkblue_orange/img/pma_logo2.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_asc.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_asci.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_attention.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_cancel.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_cancel2.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_db.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_desc.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_error.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_error2.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_fulltext.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_host.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_info.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_lang.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_loggoff.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_notice.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_okay.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_partialtext.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_passwd.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_process.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_really.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_reload.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_replication.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_rights.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_status.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_success.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_sync.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_tbl.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_theme.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_vars.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_views.png
mode change 100644 => 100755 themes/darkblue_orange/img/s_warn.png
mode change 100644 => 100755 themes/darkblue_orange/img/spacer.png
mode change 100644 => 100755 themes/darkblue_orange/img/tbl_header.png
mode change 100644 => 100755 themes/darkblue_orange/img/tbl_th.png
mode change 100644 => 100755 themes/darkblue_orange/img/window-new.png
mode change 100644 => 100755 themes/darkblue_orange/info.inc.php
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_flat_75_ffffff_40x100.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_65_ffffff_1x400.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_75_dadada_1x400.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_222222_256x240.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_2e83ff_256x240.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_454545_256x240.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_888888_256x240.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_cd0a0a_256x240.png
mode change 100644 => 100755 themes/darkblue_orange/jquery/jquery-ui-1.8.custom.css
mode change 100644 => 100755 themes/darkblue_orange/layout.inc.php
mode change 100644 => 100755 themes/darkblue_orange/screen.png
mode change 100644 => 100755 themes/original/css/theme_left.css.php
mode change 100644 => 100755 themes/original/css/theme_print.css.php
mode change 100644 => 100755 themes/original/css/theme_right.css.php
mode change 100644 => 100755 themes/original/img/ajax_clock_small.gif
mode change 100644 => 100755 themes/original/img/arrow_ltr.png
mode change 100644 => 100755 themes/original/img/arrow_rtl.png
mode change 100644 => 100755 themes/original/img/asc_order.png
mode change 100644 => 100755 themes/original/img/b_bookmark.png
mode change 100644 => 100755 themes/original/img/b_browse.png
mode change 100644 => 100755 themes/original/img/b_calendar.png
mode change 100644 => 100755 themes/original/img/b_comment.png
mode change 100644 => 100755 themes/original/img/b_dbstatistics.png
mode change 100644 => 100755 themes/original/img/b_deltbl.png
mode change 100644 => 100755 themes/original/img/b_docs.png
mode change 100644 => 100755 themes/original/img/b_docsql.png
mode change 100644 => 100755 themes/original/img/b_drop.png
mode change 100644 => 100755 themes/original/img/b_edit.png
mode change 100644 => 100755 themes/original/img/b_empty.png
mode change 100644 => 100755 themes/original/img/b_engine.png
mode change 100644 => 100755 themes/original/img/b_export.png
mode change 100644 => 100755 themes/original/img/b_firstpage.png
mode change 100644 => 100755 themes/original/img/b_ftext.png
mode change 100644 => 100755 themes/original/img/b_help.png
mode change 100644 => 100755 themes/original/img/b_home.png
mode change 100644 => 100755 themes/original/img/b_import.png
mode change 100644 => 100755 themes/original/img/b_index.png
mode change 100644 => 100755 themes/original/img/b_info.png
mode change 100644 => 100755 themes/original/img/b_insrow.png
mode change 100644 => 100755 themes/original/img/b_lastpage.png
mode change 100644 => 100755 themes/original/img/b_minus.png
mode change 100644 => 100755 themes/original/img/b_newdb.png
mode change 100644 => 100755 themes/original/img/b_newtbl.png
mode change 100644 => 100755 themes/original/img/b_nextpage.png
mode change 100644 => 100755 themes/original/img/b_pdfdoc.png
mode change 100644 => 100755 themes/original/img/b_plus.png
mode change 100644 => 100755 themes/original/img/b_prevpage.png
mode change 100644 => 100755 themes/original/img/b_primary.png
mode change 100644 => 100755 themes/original/img/b_print.png
mode change 100644 => 100755 themes/original/img/b_props.png
mode change 100644 => 100755 themes/original/img/b_relations.png
mode change 100644 => 100755 themes/original/img/b_save.png
mode change 100644 => 100755 themes/original/img/b_sbrowse.png
mode change 100644 => 100755 themes/original/img/b_sdb.png
mode change 100644 => 100755 themes/original/img/b_search.png
mode change 100644 => 100755 themes/original/img/b_selboard.png
mode change 100644 => 100755 themes/original/img/b_select.png
mode change 100644 => 100755 themes/original/img/b_snewtbl.png
mode change 100644 => 100755 themes/original/img/b_sql.png
mode change 100644 => 100755 themes/original/img/b_sqldoc.png
mode change 100644 => 100755 themes/original/img/b_sqlhelp.png
mode change 100644 => 100755 themes/original/img/b_tblanalyse.png
mode change 100644 => 100755 themes/original/img/b_tblexport.png
mode change 100644 => 100755 themes/original/img/b_tblimport.png
mode change 100644 => 100755 themes/original/img/b_tblops.png
mode change 100644 => 100755 themes/original/img/b_tbloptimize.png
mode change 100644 => 100755 themes/original/img/b_tipp.png
mode change 100644 => 100755 themes/original/img/b_unique.png
mode change 100644 => 100755 themes/original/img/b_usradd.png
mode change 100644 => 100755 themes/original/img/b_usrcheck.png
mode change 100644 => 100755 themes/original/img/b_usrdrop.png
mode change 100644 => 100755 themes/original/img/b_usredit.png
mode change 100644 => 100755 themes/original/img/b_usrlist.png
mode change 100644 => 100755 themes/original/img/b_view.png
mode change 100644 => 100755 themes/original/img/b_views.png
mode change 100644 => 100755 themes/original/img/bd_browse.png
mode change 100644 => 100755 themes/original/img/bd_deltbl.png
mode change 100644 => 100755 themes/original/img/bd_drop.png
mode change 100644 => 100755 themes/original/img/bd_empty.png
mode change 100644 => 100755 themes/original/img/bd_firstpage.png
mode change 100644 => 100755 themes/original/img/bd_ftext.png
mode change 100644 => 100755 themes/original/img/bd_index.png
mode change 100644 => 100755 themes/original/img/bd_insrow.png
mode change 100644 => 100755 themes/original/img/bd_lastpage.png
mode change 100644 => 100755 themes/original/img/bd_nextpage.png
mode change 100644 => 100755 themes/original/img/bd_prevpage.png
mode change 100644 => 100755 themes/original/img/bd_primary.png
mode change 100644 => 100755 themes/original/img/bd_sbrowse.png
mode change 100644 => 100755 themes/original/img/bd_select.png
mode change 100644 => 100755 themes/original/img/bd_unique.png
mode change 100644 => 100755 themes/original/img/docs_menu_bg.png
mode change 100644 => 100755 themes/original/img/error.ico
mode change 100644 => 100755 themes/original/img/eye.png
mode change 100644 => 100755 themes/original/img/eye_grey.png
mode change 100644 => 100755 themes/original/img/item.png
mode change 100644 => 100755 themes/original/img/item_ltr.png
mode change 100644 => 100755 themes/original/img/item_rtl.png
mode change 100644 => 100755 themes/original/img/logo_left.png
mode change 100644 => 100755 themes/original/img/logo_right.png
mode change 100644 => 100755 themes/original/img/new_data.jpg
mode change 100644 => 100755 themes/original/img/new_data_hovered.jpg
mode change 100644 => 100755 themes/original/img/new_data_selected.jpg
mode change 100644 => 100755 themes/original/img/new_data_selected_hovered.jpg
mode change 100644 => 100755 themes/original/img/new_struct.jpg
mode change 100644 => 100755 themes/original/img/new_struct_hovered.jpg
mode change 100644 => 100755 themes/original/img/new_struct_selected.jpg
mode change 100644 => 100755 themes/original/img/new_struct_selected_hovered.jpg
mode change 100644 => 100755 themes/original/img/php_sym.png
mode change 100644 => 100755 themes/original/img/pma_logo2.png
mode change 100644 => 100755 themes/original/img/s_asc.png
mode change 100644 => 100755 themes/original/img/s_asci.png
mode change 100644 => 100755 themes/original/img/s_attention.png
mode change 100644 => 100755 themes/original/img/s_cancel.png
mode change 100644 => 100755 themes/original/img/s_cancel2.png
mode change 100644 => 100755 themes/original/img/s_db.png
mode change 100644 => 100755 themes/original/img/s_desc.png
mode change 100644 => 100755 themes/original/img/s_error.png
mode change 100644 => 100755 themes/original/img/s_error2.png
mode change 100644 => 100755 themes/original/img/s_fulltext.png
mode change 100644 => 100755 themes/original/img/s_host.png
mode change 100644 => 100755 themes/original/img/s_info.png
mode change 100644 => 100755 themes/original/img/s_lang.png
mode change 100644 => 100755 themes/original/img/s_loggoff.png
mode change 100644 => 100755 themes/original/img/s_notice.png
mode change 100644 => 100755 themes/original/img/s_okay.png
mode change 100644 => 100755 themes/original/img/s_partialtext.png
mode change 100644 => 100755 themes/original/img/s_passwd.png
mode change 100644 => 100755 themes/original/img/s_process.png
mode change 100644 => 100755 themes/original/img/s_really.png
mode change 100644 => 100755 themes/original/img/s_reload.png
mode change 100644 => 100755 themes/original/img/s_replication.png
mode change 100644 => 100755 themes/original/img/s_rights.png
mode change 100644 => 100755 themes/original/img/s_status.png
mode change 100644 => 100755 themes/original/img/s_success.png
mode change 100644 => 100755 themes/original/img/s_sync.png
mode change 100644 => 100755 themes/original/img/s_tbl.png
mode change 100644 => 100755 themes/original/i
mg/s_theme.png
mode change 100644 => 100755 themes/original/img/s_vars.png
mode change 100644 => 100755 themes/original/img/s_views.png
mode change 100644 => 100755 themes/original/img/s_warn.png
mode change 100644 => 100755 themes/original/img/spacer.png
mode change 100644 => 100755 themes/original/img/vertical_line.png
mode change 100644 => 100755 themes/original/img/window-new.png
mode change 100644 => 100755 themes/original/info.inc.php
mode change 100644 => 100755 themes/original/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
mode change 100644 => 100755 themes/original/jquery/images/ui-bg_flat_75_ffffff_40x100.png
mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png
mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png
mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
mode change 100644 => 100755 themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
mode change 100644 => 100755 themes/original/jquery/images/ui-icons_222222_256x240.png
mode change 100644 => 100755 themes/original/jquery/images/ui-icons_2e83ff_256x240.png
mode change 100644 => 100755 themes/original/jquery/images/ui-icons_454545_256x240.png
mode change 100644 => 100755 themes/original/jquery/images/ui-icons_888888_256x240.png
mode change 100644 => 100755 themes/original/jquery/images/ui-icons_cd0a0a_256x240.png
mode change 100644 => 100755 themes/original/jquery/jquery-ui-1.8.custom.css
mode change 100644 => 100755 themes/original/layout.inc.php
mode change 100644 => 100755 themes/original/screen.png
mode change 100644 => 100755 transformation_overview.php
mode change 100644 => 100755 transformation_wrapper.php
mode change 100644 => 100755 translators.html
mode change 100644 => 100755 user_password.php
mode change 100644 => 100755 view_create.php
mode change 100644 => 100755 view_operations.php
mode change 100644 => 100755 webapp.php
diff --git a/CREDITS b/CREDITS
old mode 100644
new mode 100755
diff --git a/ChangeLog b/ChangeLog
old mode 100644
new mode 100755
diff --git a/Documentation.html b/Documentation.html
old mode 100644
new mode 100755
diff --git a/INSTALL b/INSTALL
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/README b/README
old mode 100644
new mode 100755
diff --git a/README.VENDOR b/README.VENDOR
old mode 100644
new mode 100755
diff --git a/TODO b/TODO
old mode 100644
new mode 100755
diff --git a/browse_foreigners.php b/browse_foreigners.php
old mode 100644
new mode 100755
diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php
old mode 100644
new mode 100755
diff --git a/bs_play_media.php b/bs_play_media.php
old mode 100644
new mode 100755
diff --git a/changelog.php b/changelog.php
old mode 100644
new mode 100755
diff --git a/chk_rel.php b/chk_rel.php
old mode 100644
new mode 100755
diff --git a/config.sample.inc.php b/config.sample.inc.php
old mode 100644
new mode 100755
diff --git a/contrib/README b/contrib/README
old mode 100644
new mode 100755
diff --git a/contrib/htaccess b/contrib/htaccess
old mode 100644
new mode 100755
diff --git a/contrib/packaging/Fedora/phpMyAdmin-http.conf b/contrib/packaging/Fedora/phpMyAdmin-http.conf
old mode 100644
new mode 100755
diff --git a/contrib/packaging/Fedora/phpMyAdmin.spec b/contrib/packaging/Fedora/phpMyAdmin.spec
old mode 100644
new mode 100755
diff --git a/contrib/swekey.sample.conf b/contrib/swekey.sample.conf
old mode 100644
new mode 100755
diff --git a/db_create.php b/db_create.php
old mode 100644
new mode 100755
index 50e4cf6..64a8acb
--- a/db_create.php
+++ b/db_create.php
@@ -9,6 +9,9 @@
* Gets some core libraries
*/
require_once './libraries/common.inc.php';
+$GLOBALS['js_include'][] = 'functions.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+
require_once './libraries/mysql_charsets.lib.php';
PMA_checkParameters(array('new_db'));
@@ -38,6 +41,14 @@ if (! $result) {
// avoid displaying the not-created db name in header or navi panel
$GLOBALS['db'] = '';
$GLOBALS['table'] = '';
+
+ /**
+ * If in an Ajax request, just display the message with {@link PMA_ajaxResponse}
+ */
+ if($GLOBALS['is_ajax_request'] == true) {
+ PMA_ajaxResponse($message, FALSE);
+ }
+
require_once './libraries/header.inc.php';
require_once './main.php';
} else {
@@ -45,6 +56,76 @@ if (! $result) {
$message->addParam($new_db);
$GLOBALS['db'] = $new_db;
+ /**
+ * If in an Ajax request, build the output and send it
+ */
+ if($GLOBALS['is_ajax_request'] == true) {
+
+ /**
+ * String containing the SQL Query formatted in pretty HTML
+ * @global array $GLOBALS['extra_data']
+ * @name $extra_data
+ */
+ $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query, 'success');
+
+ //Construct the html for the new database, so that it can be appended to the list of databases on server_databases.php
+
+ /**
+ * Build the array to be passed to {@link PMA_generate_common_url} to generate the links
+ * @global array $GLOBALS['db_url_params']
+ * @name $db_url_params
+ */
+ $db_url_params['db'] = $new_db;
+
+ $is_superuser = PMA_isSuperuser();
+
+ /**
+ * String that will contain the output HTML
+ * @name $new_db_string
+ */
+ $new_db_string = '<tr>';
+
+ /**
+ * Is user allowed to drop the database?
+ */
+ if ($is_superuser || $cfg['AllowUserDropDatabase']) {
+ $new_db_string .= '<td class="tool">';
+ $new_db_string .= '<input type="checkbox" title="'. $new_db .'" value="' . $new_db . '" name="selected_dbs[]" />';
+ $new_db_string .='</td>';
+ }
+
+ /**
+ * Link to the database's page
+ */
+ $new_db_string .= '<td class="name">';
+ $new_db_string .= '<a target="_parent" title="Jump to database" href="index.php' . PMA_generate_common_url($db_url_params) . '">';
+ $new_db_string .= $new_db . '</a>';
+ $new_db_string .= '</td>';
+
+ /**
+ * If the user has privileges, let him check privileges for the DB
+ */
+ if($is_superuser) {
+
+ $db_url_params['checkprivs'] = $new_db;
+
+ $new_db_string .= '<td class="tool">';
+ $new_db_string .= '<a title="Check privileges for database" href="server_privileges.php' . PMA_generate_common_url($db_url_params) . '">';
+ $new_db_string .= ($cfg['PropertiesIconic']
+ ? '<img class="icon" src="' . $pmaThemeImage . 's_rights.png" width="16" height="16" alt=" ' . __('Check Privileges') . '" /> '
+ : __('Check Privileges')) . '</a>';
+ $new_db_string .= '</td>';
+ }
+
+ $new_db_string .= '</tr>';
+
+ /** @todo Statistics for newly created DB! */
+
+ $extra_data['new_db_string'] = $new_db_string;
+
+ PMA_ajaxResponse($message, true, $extra_data);
+ }
+
require_once './libraries/header.inc.php';
require_once './' . $cfg['DefaultTabDatabase'];
}
diff --git a/db_datadict.php b/db_datadict.php
old mode 100644
new mode 100755
diff --git a/db_export.php b/db_export.php
old mode 100644
new mode 100755
diff --git a/db_import.php b/db_import.php
old mode 100644
new mode 100755
diff --git a/db_operations.php b/db_operations.php
old mode 100644
new mode 100755
index cdeac3a..535ee31
--- a/db_operations.php
+++ b/db_operations.php
@@ -18,6 +18,14 @@
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
+// add blobstreaming library functions
+require_once "./libraries/blobstreaming.lib.php";
+
+// add a javascript file for jQuery functions to handle Ajax actions
+// also add jQueryUI
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'db_operations.js';
+
/**
* Rename/move or copy database
*/
@@ -254,6 +262,16 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
$message = PMA_Message::error();
}
}
+
+ /**
+ * Database has been successfully renamed/moved. If in an Ajax request,
+ * generate the output with {@link PMA_ajaxResponse} and exit
+ */
+ if( $GLOBALS['is_ajax_request'] == true) {
+ $extra_data['newname'] = $newname;
+ $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+ PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+ };
}
@@ -326,7 +344,7 @@ if (!$is_information_schema) {
* rename database
*/
?>
- <form method="post" action="db_operations.php"
+ <form id="rename_db_form" method="post" action="db_operations.php"
onsubmit="return emptyFormElements(this, 'newname')">
<?php
if (isset($db_collation)) {
@@ -361,7 +379,7 @@ if (!$is_information_schema) {
echo ')'; ?>
</fieldset>
<fieldset class="tblFooters">
- <input type="submit" value="<?php echo __('Go'); ?>" onclick="return confirmLink(this, 'CREATE DATABASE ... <?php echo __('and then'); ?> DROP DATABASE <?php echo PMA_jsFormat($db); ?>')" />
+ <input id="rename_db_input" type="submit" value="<?php echo __('Go'); ?>" />
</fieldset>
</form>
<?php
@@ -404,7 +422,7 @@ echo __('Remove database');
* Copy database
*/
?>
- <form method="post" action="db_operations.php"
+ <form id="copy_db_form" method="post" action="db_operations.php"
onsubmit="return emptyFormElements(this, 'newname')">
<?php
if (isset($db_collation)) {
@@ -474,7 +492,7 @@ echo __('Remove database');
/**
* Change database charset
*/
- echo '<form method="post" action="./db_operations.php">' . "\n"
+ echo '<form id="change_db_charset_form" method="post" action="./db_operations.php">' . "\n"
. PMA_generate_common_hidden_inputs($db, $table)
. '<fieldset>' . "\n"
. ' <legend>';
diff --git a/db_printview.php b/db_printview.php
old mode 100644
new mode 100755
diff --git a/db_qbe.php b/db_qbe.php
old mode 100644
new mode 100755
diff --git a/db_search.php b/db_search.php
old mode 100644
new mode 100755
index 854cba8..6c87f61
--- a/db_search.php
+++ b/db_search.php
@@ -37,6 +37,9 @@
*/
require_once './libraries/common.inc.php';
+$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js';
+$GLOBALS['js_include'][] = 'db_search.js';
+
/**
* Gets some core libraries and send headers
*/
@@ -108,11 +111,14 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) {
}
/**
- * Displays top links
+ * Displays top links if we are not in an Ajax request
*/
$sub_part = '';
-require './libraries/db_info.inc.php';
+if( $GLOBALS['is_ajax_request'] != true) {
+ require './libraries/db_info.inc.php';
+ echo '<div id="searchresults">';
+}
/**
* 1. Main search form has been submitted
@@ -269,13 +275,22 @@ if (isset($_REQUEST['submit_search'])) {
}
} // end 1.
+/**
+ * If we are in an Ajax request, we need to exit after displaying all the HTML
+ */
+if($GLOBALS['is_ajax_request'] == true) {
+ exit;
+}
+else {
+ echo '</div>';//end searchresults div
+}
/**
* 2. Displays the main search form
*/
?>
<a name="db_search"></a>
-<form method="post" action="db_search.php" name="db_search">
+<form id="db_search_form" method="post" action="db_search.php" name="db_search">
<?php echo PMA_generate_common_hidden_inputs($GLOBALS['db']); ?>
<fieldset>
<legend><?php echo __('Search in database'); ?></legend>
diff --git a/db_sql.php b/db_sql.php
old mode 100644
new mode 100755
index 50db7bd..2020dea
--- a/db_sql.php
+++ b/db_sql.php
@@ -13,6 +13,9 @@ require_once './libraries/common.inc.php';
/**
* Runs common work
*/
+$GLOBALS['js_include'][] = 'functions.js';
+$GLOBALS['js_include'][] = 'sql.js';
+
require './libraries/db_common.inc.php';
require_once './libraries/sql_query_form.lib.php';
diff --git a/db_structure.php b/db_structure.php
old mode 100644
new mode 100755
index 9e11821..44d732a
--- a/db_structure.php
+++ b/db_structure.php
@@ -11,6 +11,7 @@
require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'db_structure.js';
/**
* Prepares the tables list if the user where not redirected to this script
@@ -294,13 +295,12 @@ foreach ($tables as $keyname => $each_table) {
if (! $db_is_information_schema) {
if (! empty($each_table['TABLE_ROWS'])) {
- $empty_table = '<a href="sql.php?' . $tbl_url_query
+ $empty_table = '<a class="truncate_table_anchor" href="sql.php?' . $tbl_url_query
. '&sql_query=';
$empty_table .= urlencode('TRUNCATE ' . PMA_backquote($each_table['TABLE_NAME']))
. '&zero_rows='
. urlencode(sprintf(__('Table %s has been emptied'), htmlspecialchars($each_table['TABLE_NAME'])))
- . '" onclick="return confirmLink(this, \'TRUNCATE ';
- $empty_table .= PMA_jsFormat($each_table['TABLE_NAME']) . '\')">' . $titles['Empty'] . '</a>';
+ .'">' . $titles['Empty'] . '</a>';
} else {
$empty_table = $titles['NoEmpty'];
}
@@ -384,11 +384,10 @@ foreach ($tables as $keyname => $each_table) {
<?php echo $titles['Insert']; ?></a></td>
<td align="center"><?php echo $empty_table; ?></td>
<td align="center">
- <a href="sql.php?<?php echo $tbl_url_query;
+ <a class="drop_table_anchor" href="sql.php?<?php echo $tbl_url_query;
?>&reload=1&purge=1&sql_query=<?php
echo urlencode($drop_query); ?>&zero_rows=<?php
- echo urlencode($drop_message); ?>"
- onclick="return confirmLink(this, '<?php echo PMA_jsFormat($drop_query, false); ?>')">
+ echo urlencode($drop_message); ?>" >
<?php echo $titles['Drop']; ?></a></td>
<?php } // end if (! $db_is_information_schema)
@@ -453,7 +452,7 @@ if ($is_show_stats) {
}
?>
</tbody>
-<tbody>
+<tbody id="tbl_summary_row">
<tr><th></th>
<th align="center" nowrap="nowrap">
<?php
diff --git a/db_tracking.php b/db_tracking.php
old mode 100644
new mode 100755
index 1c8c5ce..62f8554
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -9,7 +9,15 @@
*/
require_once './libraries/common.inc.php';
-require './libraries/db_common.inc.php';
+//Get some js files needed for Ajax requests
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+
+/**
+ * If we are not in an Ajax request, then do the common work and show the links etc.
+ */
+if($GLOBALS['is_ajax_request'] != true) {
+ require './libraries/db_common.inc.php';
+}
$url_query .= '&goto=tbl_tracking.php&back=db_tracking.php';
// Get the database structure
@@ -20,6 +28,15 @@ require './libraries/db_info.inc.php';
// (here, do not use $_REQUEST['db] as it can be crafted)
if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {
PMA_Tracker::deleteTracking($GLOBALS['db'], $_REQUEST['table']);
+
+ /**
+ * If in an Ajax request, generate the success message and use
+ * {@link PMA_ajaxResponse()} to send the output
+ */
+ if($GLOBALS['is_ajax_request'] == true) {
+ $message = PMA_Message::success();
+ PMA_ajaxResponse($message, true);
+ }
}
// Get tracked data about the database
@@ -112,7 +129,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) {
<td><?php echo $version_data['date_created'];?></td>
<td><?php echo $version_data['date_updated'];?></td>
<td><?php echo $version_status;?></td>
- <td><a href="<?php echo $delete_link;?>" onclick="return confirmLink(this, '<?php echo PMA_jsFormat(__('Delete tracking data for this table'), false); ?>')"><?php echo $drop_image_or_text; ?></a></td>
+ <td><a class="drop_tracking_anchor" href="<?php echo $delete_link;?>" ><?php echo $drop_image_or_text; ?></a></td>
<td> <a href="<?php echo $tmp_link; ?>"><?php echo __('Versions');?></a>
| <a href="<?php echo $tmp_link; ?>&report=true&version=<?php echo $version_data['version'];?>"><?php echo __('Tracking report');?></a>
| <a href="<?php echo $tmp_link; ?>&snapshot=true&version=<?php echo $version_data['version'];?>"><?php echo __('Structure snapshot');?></a></td>
diff --git a/docs.css b/docs.css
old mode 100644
new mode 100755
diff --git a/error.php b/error.php
old mode 100644
new mode 100755
diff --git a/export.php b/export.php
old mode 100644
new mode 100755
diff --git a/favicon.ico b/favicon.ico
old mode 100644
new mode 100755
diff --git a/import.php b/import.php
old mode 100644
new mode 100755
diff --git a/import_status.php b/import_status.php
old mode 100644
new mode 100755
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
diff --git a/js/colorpicker/css/colorpicker.css b/js/colorpicker/css/colorpicker.css
old mode 100644
new mode 100755
diff --git a/js/colorpicker/css/layout.css b/js/colorpicker/css/layout.css
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/blank.gif b/js/colorpicker/images/blank.gif
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_background.png b/js/colorpicker/images/colorpicker_background.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_hex.png b/js/colorpicker/images/colorpicker_hex.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_hsb_b.png b/js/colorpicker/images/colorpicker_hsb_b.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_hsb_h.png b/js/colorpicker/images/colorpicker_hsb_h.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_hsb_s.png b/js/colorpicker/images/colorpicker_hsb_s.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_indic.gif b/js/colorpicker/images/colorpicker_indic.gif
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_overlay.png b/js/colorpicker/images/colorpicker_overlay.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_rgb_b.png b/js/colorpicker/images/colorpicker_rgb_b.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_rgb_g.png b/js/colorpicker/images/colorpicker_rgb_g.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_rgb_r.png b/js/colorpicker/images/colorpicker_rgb_r.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_select.gif b/js/colorpicker/images/colorpicker_select.gif
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/colorpicker_submit.png b/js/colorpicker/images/colorpicker_submit.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_background.png b/js/colorpicker/images/custom_background.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_hex.png b/js/colorpicker/images/custom_hex.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_hsb_b.png b/js/colorpicker/images/custom_hsb_b.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_hsb_h.png b/js/colorpicker/images/custom_hsb_h.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_hsb_s.png b/js/colorpicker/images/custom_hsb_s.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_indic.gif b/js/colorpicker/images/custom_indic.gif
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_rgb_b.png b/js/colorpicker/images/custom_rgb_b.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_rgb_g.png b/js/colorpicker/images/custom_rgb_g.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_rgb_r.png b/js/colorpicker/images/custom_rgb_r.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/custom_submit.png b/js/colorpicker/images/custom_submit.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/select.png b/js/colorpicker/images/select.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/select2.png b/js/colorpicker/images/select2.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/images/slider.png b/js/colorpicker/images/slider.png
old mode 100644
new mode 100755
diff --git a/js/colorpicker/js/colorpicker.js b/js/colorpicker/js/colorpicker.js
old mode 100644
new mode 100755
diff --git a/js/common.js b/js/common.js
old mode 100644
new mode 100755
index 8ba7bcd..f0eea25
--- a/js/common.js
+++ b/js/common.js
@@ -205,7 +205,7 @@ function refreshNavigation() {
function addClass(element, classname)
{
if (element != null) {
- element.className += ' ' + classname;
+ $("#"+element).addClass(classname);
//alert('set class: ' + classname + ', now: ' + element.className);
}
}
@@ -216,9 +216,7 @@ function addClass(element, classname)
function removeClass(element, classname)
{
if (element != null) {
- element.className = element.className.replace(' ' + classname, '');
- // if there is no other class anem there is no leading space
- element.className = element.className.replace(classname, '');
+ $("#"+element).removeClass(classname);
//alert('removed class: ' + classname + ', now: ' + element.className);
}
}
diff --git a/js/cross_framing_protection.js b/js/cross_framing_protection.js
old mode 100644
new mode 100755
diff --git a/js/db_operations.js b/js/db_operations.js
new file mode 100644
index 0000000..8bdeea2
--- /dev/null
+++ b/js/db_operations.js
@@ -0,0 +1,127 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @fileoverview function used in server privilege pages
+ * @name Database Operations
+ *
+ * @requires jQuery
+ * @requires jQueryUI
+ * @requires js/functions.js
+ *
+ * @version $Id$
+ */
+
+/**
+ * Ajax event handlers here for db_operations.php
+ *
+ * Actions Ajaxified here:
+ * Rename Database
+ * Copy Database
+ * Change charset
+ */
+
+$(document).ready(function() {
+
+ /**
+ * Ajax event handlers for 'Rename Database'
+ *
+ * @uses $.PMA_confirm()
+ * @uses PMA_ajaxShowUser()
+ */
+ $("#rename_db_form").live('submit', function(event) {
+ event.preventDefault();
+
+ var question = 'CREATE DATABASE ... and then DROP DATABASE ' + window.parent.db;
+ $(this).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ /**
+ * @var button_options Object containing options for jQueryUI dialog buttons
+ */
+ var button_options = {};
+ button_options[PMA_messages['strYes']] = function() {
+ $(this).dialog("close").remove();
+ window.parent.refreshMain();
+ window.parent.refreshNavigation();
+ };
+ button_options[PMA_messages['strNo']] = function() { $(this).dialog("close").remove(); }
+
+ $(this).PMA_confirm(question, $(this).attr('action'), function(url) {
+ PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases']);
+
+ $.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function(data) {
+ if(data.success == true) {
+
+ PMA_ajaxShowMessage(data.message);
+
+ window.parent.db = data.newname;
+
+ $("#topmenucontainer")
+ .next('div')
+ .remove()
+ .end()
+ .after(data.sql_query);
+
+ //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
+ var notice_class = $("#topmenucontainer").next("div").find('.notice');
+ if($(notice_class).text() == '') {
+ $(notice_class).remove();
+ }
+
+ $("<span>" + PMA_messages['strReloadDatabase'] + "?</span>").dialog({
+ buttons: button_options
+ }) //end dialog options
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.get()
+ })
+ }); // end Rename Database
+
+ /**
+ * Ajax Event Handler for 'Copy Database'
+ *
+ * @uses PMA_ajaxShowMessage()
+ */
+ $("#copy_db_form").live('submit', function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']);
+ $(this).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ $.get($(this).attr('action'), $(this).serialize(), function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ if( $("#checkbox_switch").is(":checked")) {
+ window.parent.db = data.newname;
+ window.parent.refreshMain();
+ }
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.get
+ }) // end copy database
+
+ /**
+ * Ajax Event handler for 'Change Charset' of the database
+ *
+ * @uses PMA_ajaxShowMessage()
+ */
+ $("#change_db_charset_form").live('submit', function(event) {
+ event.preventDefault();
+
+ $(this).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ PMA_ajaxShowMessage(PMA_messages['strChangingCharset']);
+
+ $.get($(this).attr('action'), $(this).serialize() + "&submitcollation=" + $(this).find("input[name=submitcollation]").attr('value'), function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.get()
+ }) // end change charset
+
+}, 'top.frame_content');
\ No newline at end of file
diff --git a/js/db_search.js b/js/db_search.js
new file mode 100644
index 0000000..8a0474f
--- /dev/null
+++ b/js/db_search.js
@@ -0,0 +1,34 @@
+/**
+ * @fileoverview JavaScript functions used on Database Search page
+ * @name Database Search
+ *
+ * @requires jQuery
+ * @requires js/functions.js
+ */
+
+/**
+ * AJAX script for the Database Search page.
+ *
+ * Actions ajaxified here:
+ * Retrieve result of SQL query
+ */
+
+$(document).ready(function() {
+
+ /**
+ * Ajax Event handler for retrieving the result of an SQL Query
+ *
+ * @uses PMA_ajaxShowMessage()
+ */
+ $("#db_search_form").live('submit', function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage(PMA_messages['strSearching']);
+
+ $(this).append('<input type="hidden" name="ajax_request" value="true"');
+
+ $.get($(this).attr('action'), $(this).serialize() + "&submit_search=" + $("#buttonGo").val(), function(data) {
+ $("#searchresults").html(data);
+ }) // end $.get()
+ })
+}, 'top.frame_content'); // end $(document).ready()
\ No newline at end of file
diff --git a/js/db_structure.js b/js/db_structure.js
new file mode 100644
index 0000000..8e658fb
--- /dev/null
+++ b/js/db_structure.js
@@ -0,0 +1,224 @@
+/**
+ * @fileoverview functions used on the database structure page
+ * @name Database Structure
+ *
+ * @requires jQuery
+ * @requires jQueryUI
+ * @required js/functions.js
+ */
+
+/**
+ * AJAX scripts for db_structure.php
+ *
+ * Actions ajaxified here:
+ * Drop Database
+ * Truncate Table
+ * Drop Table
+ *
+ */
+$(document).ready(function() {
+
+ /**
+ * Ajax Event handler for 'Truncate Table'
+ *
+ * @uses $.PMA_confirm()
+ * @uses PMA_ajaxShowMessage()
+ */
+ $(".truncate_table_anchor").live('click', function(event) {
+ event.preventDefault();
+
+ //extract current table name and build the question string
+ /**
+ * @var curr_table_name String containing the name of the table to be truncated
+ */
+ var curr_table_name = $(this).parents('tr').children('th').children('a').text();
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = 'TRUNCATE ' + curr_table_name;
+ /**
+ * @var this_anchor Object referring to the anchor clicked
+ */
+ var this_anchor = $(this);
+
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+
+ $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ //Remove the action's href and class, so as to disable further attempts to truncate the table
+ // @todo: How to replace the icon with the disabled version?
+ $(this_anchor)
+ .removeAttr('href')
+ .removeClass('.truncate_table_anchor');
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }) // end $.get()
+ }) //end $.PMA_confirm()
+ }); //end of Truncate Table Ajax action
+
+ /**
+ * Ajax Event handler for 'Drop Table'
+ *
+ * @uses $.PMA_confirm()
+ * @uses PMA_ajaxShowMessage()
+ */
+ $(".drop_table_anchor").live('click', function(event) {
+ event.preventDefault();
+
+ //extract current table name and build the question string
+ /**
+ * @var curr_row Object containing reference to the current row
+ */
+ var curr_row = $(this).parents('tr');
+ /**
+ * @var curr_table_name String containing the name of the table to be truncated
+ */
+ var curr_table_name = $(curr_row).children('th').children('a').text();
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = 'DROP TABLE ' + curr_table_name;
+
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+
+ $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ //need to find a better solution here. The icon should be replaced
+ $(curr_row).hide("medium").remove();
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }); // end $.get()
+ }); // end $.PMA_confirm()
+ }); //end of Drop Table Ajax action
+
+ /**
+ * Ajax Event handler for 'Drop Event'
+ *
+ * @uses $.PMA_confirm()
+ * @uses PMA_ajaxShowMessage()
+ */
+ $('.drop_event_anchor').live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var curr_event_row Object reference to current event's row
+ */
+ var curr_event_row = $(this).parents('tr');
+ /**
+ * @var curr_event_name String containing the name of {@link curr_event_row}
+ */
+ var curr_event_name = $(curr_event_row).children('td:first').text();
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = 'DROP EVENT ' + curr_event_name;
+
+ $(this).PMA_confirm(question, $(this).attr('href') , function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strDroppingEvent']);
+
+ $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $(curr_event_row).hide("medium").remove();
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }) // end $.get()
+ }) // end $.PMA_confirm()
+ }) //end Drop Event
+
+ /**
+ * Ajax Event handler for 'Drop Procedure'
+ *
+ * @uses $.PMA_confirm()
+ * @uses PMA_ajaxShowMessage()
+ */
+ $('.drop_procedure_anchor').live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var curr_proc_row Object containing reference to the current procedure's row
+ */
+ var curr_proc_row = $(this).parents('tr');
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = $(curr_proc_row).children('.drop_procedure_sql').val();
+
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strDroppingProcedure']);
+
+ $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $(curr_event_row).hide("medium").remove();
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }) // end $.get()
+ }) // end $.PMA_confirm()
+ }) //end Drop Procedure
+
+ $('.drop_tracking_anchor').live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var curr_tracking_row Object containing reference to the current tracked table's row
+ */
+ var curr_tracking_row = $(this).parents('tr');
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = PMA_messages['strDeleteTrackingData'];
+
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strDeletingTrackingData']);
+
+ $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $(curr_tracking_row).hide("medium").remove();
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }) // end $.get()
+ }) // end $.PMA_confirm()
+ }) //end Drop Tracking
+
+ //Calculate Real End for InnoDB
+ /**
+ * Ajax Event handler for calculatig the real end for a InnoDB table
+ *
+ * @uses $.PMA_confirm
+ */
+ $('#real_end_input').live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = PMA_messages['strOperationTakesLongTime'];
+
+ $(this).PMA_confirm(question, '', function() {
+ return true;
+ })
+ return false;
+ }) //end Calculate Real End for InnoDB
+
+}, 'top.frame_content'); // end $(document).ready()
\ No newline at end of file
diff --git a/js/dom-drag.js b/js/dom-drag.js
old mode 100644
new mode 100755
diff --git a/js/functions.js b/js/functions.js
old mode 100644
new mode 100755
index f76d630..e8893c7
--- a/js/functions.js
+++ b/js/functions.js
@@ -16,6 +16,12 @@ var sql_box_locked = false;
var only_once_elements = new Array();
/**
+ * @var ajax_message_init boolean boolean that stores status of
+ * notification for PMA_ajaxShowNotification
+ */
+var ajax_message_init = false;
+
+/**
* selects the content of a given object, f.e. a textarea
*
* @param object element element of which the content will be selected
@@ -99,6 +105,9 @@ function confirmLink(theLink, theSqlQuery)
* @param object the message to display
*
* @return boolean whether to run the query or not
+ *
+ * @todo used only by libraries/display_tbl.lib.php. figure out how it is used
+ * and replace with a jQuery equivalent
*/
function confirmAction(theMessage)
{
@@ -876,7 +885,7 @@ function PMA_markRowsInit() {
}
if (event.shiftKey == true && table.lastClicked != undefined) {
- if (event.preventDefault) { event.preventDefault(); } else { event.returnValue = false; }
+ if (event.preventDefault) {event.preventDefault();} else {event.returnValue = false;}
i = table.lastClicked;
if (i < this.rowIndex) {
@@ -926,26 +935,9 @@ $(document).ready(PMA_markRowsInit);
* @param container DOM element
*/
function markAllRows( container_id ) {
- var rows = document.getElementById(container_id).getElementsByTagName('tr');
- var unique_id;
- var checkbox;
-
- for ( var i = 0; i < rows.length; i++ ) {
-
- checkbox = rows[i].getElementsByTagName( 'input' )[0];
-
- if ( checkbox && checkbox.type == 'checkbox' ) {
- unique_id = checkbox.name + checkbox.value;
- if ( checkbox.disabled == false ) {
- checkbox.checked = true;
- if ( typeof(marked_row[unique_id]) == 'undefined' || !marked_row[unique_id] ) {
- rows[i].className += ' marked';
- marked_row[unique_id] = true;
- }
- }
- }
- }
-
+
+ $("#"+container_id).find("input:checkbox:enabled").attr('checked', 'checked')
+ .parents("tr").addClass("marked");
return true;
}
@@ -956,22 +948,9 @@ function markAllRows( container_id ) {
* @param container DOM element
*/
function unMarkAllRows( container_id ) {
- var rows = document.getElementById(container_id).getElementsByTagName('tr');
- var unique_id;
- var checkbox;
-
- for ( var i = 0; i < rows.length; i++ ) {
-
- checkbox = rows[i].getElementsByTagName( 'input' )[0];
-
- if ( checkbox && checkbox.type == 'checkbox' ) {
- unique_id = checkbox.name + checkbox.value;
- checkbox.checked = false;
- rows[i].className = rows[i].className.replace(' marked', '');
- marked_row[unique_id] = false;
- }
- }
-
+
+ $("#"+container_id).find("input:checkbox:enabled").removeAttr('checked')
+ .parents("tr").removeClass("marked");
return true;
}
@@ -1231,12 +1210,12 @@ function setVerticalPointer(theRow, theColNum, theAction, theDefaultClass1, theD
* @return boolean always true
*/
function setCheckboxes( container_id, state ) {
- var checkboxes = document.getElementById(container_id).getElementsByTagName('input');
- for ( var i = 0; i < checkboxes.length; i++ ) {
- if ( checkboxes[i].type == 'checkbox' ) {
- checkboxes[i].checked = state;
- }
+ if(state) {
+ $("#"+container_id).find("input:checkbox").attr('checked', 'checked');
+ }
+ else {
+ $("#"+container_id).find("input:checkbox").removeAttr('checked');
}
return true;
@@ -1297,13 +1276,13 @@ function setCheckboxColumn(theCheckbox){
*/
function setSelectOptions(the_form, the_select, do_check)
{
- var selectObject = document.forms[the_form].elements[the_select];
- var selectCount = selectObject.length;
-
- for (var i = 0; i < selectCount; i++) {
- selectObject.options[i].selected = do_check;
- } // end for
+ if( do_check ) {
+ $("form[name='"+ the_form +"']").find("select[name='"+the_select+"']").find("option").attr('selected', 'selected');
+ }
+ else {
+ $("form[name='"+ the_form +"']").find("select[name="+the_select+"]").find("option").removeAttr('selected');
+ }
return true;
} // end of the 'setSelectOptions()' function
@@ -1664,6 +1643,46 @@ function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_heigh
}
/**
+ * popups a request for changing MIME types for files in the BLOB repository
+ *
+ * @param var db database name
+ * @param var table table name
+ * @param var reference BLOB repository reference
+ * @param var current_mime_type current MIME type associated with BLOB repository reference
+ */
+function requestMIMETypeChange(db, table, reference, current_mime_type)
+{
+ // no mime type specified, set to default (nothing)
+ if (undefined == current_mime_type)
+ current_mime_type = "";
+
+ // prompt user for new mime type
+ var new_mime_type = prompt("Enter custom MIME type", current_mime_type);
+
+ // if new mime_type is specified and is not the same as the previous type, request for mime type change
+ if (new_mime_type && new_mime_type != current_mime_type)
+ changeMIMEType(db, table, reference, new_mime_type);
+}
+
+/**
+ * changes MIME types for files in the BLOB repository
+ *
+ * @param var db database name
+ * @param var table table name
+ * @param var reference BLOB repository reference
+ * @param var mime_type new MIME type to be associated with BLOB repository reference
+ */
+function changeMIMEType(db, table, reference, mime_type)
+{
+ // specify url and parameters for jQuery POST
+ var mime_chg_url = 'bs_change_mime_type.php';
+ var params = {bs_db: db, bs_table: table, bs_reference: reference, bs_new_mime_type: mime_type};
+
+ // jQuery POST
+ jQuery.post(mime_chg_url, params);
+}
+
+/**
* Jquery Coding for inline editing SQL_QUERY
*/
$(document).ready(function(){
@@ -1742,6 +1761,103 @@ $(document).ready(function(){
});
/**
+ * Function to process the plain HTML response from an Ajax request. Inserts
+ * the various HTML divisions from the response at the proper locations. The
+ * array relates the divisions to be inserted to their placeholders.
+ *
+ * @param var divisions_map an associative array of id names
+ *
+ * <code>
+ * PMA_ajaxInsertResponse({'resultsTable':'resultsTable_response',
+ * 'profilingData':'profilingData_response'});
+ * </code>
+ *
+ */
+
+function PMA_ajaxInsertResponse(divisions_map) {
+ $.each(divisions_map, function(key, value) {
+ var content_div = '#'+value;
+ var target_div = '#'+key;
+ var content = $(content_div).html();
+
+ //replace content of target_div with that from the response
+ $(target_div).html(content);
+ });
+};
+
+/**
+ * Show a message on the top of the page for an Ajax request
+ *
+ * @param var message string containing the message to be shown.
+ * optional, defaults to 'Loading...'
+ * @param var timeout number of milliseconds for the message to be visible
+ * optional, defaults to 5000
+ */
+
+function PMA_ajaxShowMessage(message, timeout) {
+
+ //Handle the case when a empty data.message is passed. We don't want the empty message
+ if(message == '') {
+ return true;
+ }
+
+ /**
+ * @var msg String containing the message that has to be displayed
+ * @default PMA_messages['strLoading']
+ */
+ if(!message) {
+ var msg = PMA_messages['strLoading'];
+ }
+ else {
+ var msg = message;
+ }
+
+ /**
+ * @var timeout Number of milliseconds for which {@link msg} will be visible
+ * @default 5000 ms
+ */
+ if(!timeout) {
+ var to = 5000;
+ }
+ else {
+ var to = timeout;
+ }
+
+ if( !ajax_message_init) {
+ //For the first time this function is called, append a new div
+ $(function(){
+ $('<div id="loading_parent"></div>')
+ .insertBefore("#serverinfo");
+
+ $('<span id="loading" class="ajax_notification"></span>')
+ .appendTo("#loading_parent")
+ .html(msg)
+ .slideDown('medium')
+ .delay(to)
+ .slideUp('medium', function(){
+ $(this)
+ .html("") //Clear the message
+ .hide();
+ });
+ }, 'top.frame_content');
+ ajax_message_init = true;
+ }
+ else {
+ //Otherwise, just show the div again after inserting the message
+ $("#loading")
+ .clearQueue()
+ .html(msg)
+ .slideDown('medium')
+ .delay(to)
+ .slideUp('medium', function() {
+ $(this)
+ .html("")
+ .hide();
+ })
+ }
+}
+
+/**
* Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected
*/
function toggle_enum_notice(selectElement) {
@@ -1756,6 +1872,451 @@ function toggle_enum_notice(selectElement) {
}
/**
+ * jQuery function that uses jQueryUI's dialogs to confirm with user. Does not
+ * return a jQuery object yet and hence cannot be chained
+ *
+ * @param string question
+ * @param string url URL to be passed to the callbackFn to make
+ * an Ajax call to
+ * @param function callbackFn callback to execute after user clicks on OK
+ */
+
+jQuery.fn.PMA_confirm = function(question, url, callbackFn) {
+ if (PMA_messages['strDoYouReally'] == '') {
+ return true;
+ }
+
+ /**
+ * @var button_options Object that stores the options passed to jQueryUI
+ * dialog
+ */
+ var button_options = {};
+ button_options[PMA_messages['strOK']] = function(){
+ $(this).dialog("close").remove();
+
+ if($.isFunction(callbackFn)) {
+ callbackFn.call(this, url);
+ }
+ };
+ button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
+
+ $('<div id="confirm_dialog"></div>')
+ .prepend(question)
+ .dialog({buttons: button_options});
+};
+
+/**
+ * jQuery function to sort a table's body after a new row has been appended to it.
+ * Also fixes the even/odd classes of the table rows at the end.
+ *
+ * @param string text_selector string to select the sortKey's text
+ *
+ * @return jQuery Object for chaining purposes
+ */
+jQuery.fn.PMA_sort_table = function(text_selector) {
+ return this.each(function() {
+
+ /**
+ * @var table_body Object referring to the table's <tbody> element
+ */
+ var table_body = $(this);
+ /**
+ * @var rows Object referring to the collection of rows in {@link table_body}
+ */
+ var rows = $(this).find('tr').get();
+
+ //get the text of the field that we will sort by
+ $.each(rows, function(index, row) {
+ row.sortKey = $.trim($(row).find(text_selector).text().toLowerCase());
+ })
+
+ //get the sorted order
+ rows.sort(function(a,b) {
+ if(a.sortKey < b.sortKey) {
+ return -1;
+ }
+ if(a.sortKey > b.sortKey) {
+ return 1;
+ }
+ return 0;
+ })
+
+ //pull out each row from the table and then append it according to it's order
+ $.each(rows, function(index, row) {
+ $(table_body).append(row);
+ row.sortKey = null;
+ })
+
+ //Re-check the classes of each row
+ $(this).find('tr:odd')
+ .removeClass('even').addClass('odd')
+ .end()
+ .find('tr:even')
+ .removeClass('odd').addClass('even');
+ })
+}
+
+/**
+ * jQuery coding for 'Create Table'. Used on db_operations.php,
+ * db_structure.php and db_tracking.php (i.e., wherever
+ * libraries/display_create_table.lib.php is used)
+ *
+ * Attach Ajax Event handlers for Create Table
+ */
+$(document).ready(function() {
+
+ /**
+ * Attach event handler to the submit action of the create table minimal form
+ * and retrieve the full table form and display it in a dialog
+ *
+ * @uses PMA_ajaxShowMessage()
+ */
+ $("#create_table_form_minimal").live('submit', function(event) {
+ event.preventDefault();
+
+ /* @todo Validate this form! */
+
+ /**
+ * @var button_options Object that stores the options passed to jQueryUI
+ * dialog
+ */
+ var button_options = {};
+ button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}
+
+ PMA_ajaxShowMessage();
+ $(this).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ $.get($(this).attr('action'), $(this).serialize(), function(data) {
+ $('<div id="create_table_dialog"></div>')
+ .append(data)
+ .dialog({
+ title: top.frame_content.PMA_messages['strCreateTable'],
+ width: 900,
+ buttons : button_options
+ }); // end dialog options
+ }) // end $.get()
+
+ });
+
+ /**
+ * Attach event handler for submission of create table form
+ *
+ * @uses PMA_ajaxShowMessage()
+ * @uses $.PMA_sort_table()
+ * @uses window.parent.refreshNavigation()
+ */
+ $("#create_table_form").find("input[name=submit_num_fields], input[name=do_save_data]").live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var the_form object referring to the create table form
+ */
+ var the_form = $("#create_table_form");
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $(the_form).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ if($(this).attr('name') == 'submit_num_fields') {
+ //User wants to add more fields to the table
+ $.post($(the_form).attr('action'), $(the_form).serialize() + "&submit_num_fields=" + $(this).val(), function(data) {
+ $("#create_table_dialog").html(data);
+ }) //end $.post()
+ }
+ else if($(this).attr('name') == 'do_save_data') {
+ //User wants to submit the form
+ $.post($(the_form).attr('action'), $(the_form).serialize() + "&do_save_data=" + $(this).val(), function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $("#create_table_dialog").dialog("close").remove();
+
+ /**
+ * @var tables_table Object referring to the <tbody> element that holds the list of tables
+ */
+ var tables_table = $("#tablesForm").find("tbody").not("#tbl_summary_row");
+
+ /**
+ * @var curr_last_row Object referring to the last <tr> element in {@link tables_table}
+ */
+ var curr_last_row = $(tables_table).find('tr:last');
+ /**
+ * @var curr_last_row_index_string String containing the index of {@link curr_last_row}
+ */
+ var curr_last_row_index_string = $(curr_last_row).find('input:checkbox').attr('id').match(/\d+/)[0];
+ /**
+ * @var curr_last_row_index Index of {@link curr_last_row}
+ */
+ var curr_last_row_index = parseFloat(curr_last_row_index_string);
+ /**
+ * @var new_last_row_index Index of the new row to be appended to {@link tables_table}
+ */
+ var new_last_row_index = curr_last_row_index + 1;
+ /**
+ * @var new_last_row_id String containing the id of the row to be appended to {@link tables_table}
+ */
+ var new_last_row_id = 'checkbox_tbl_' + new_last_row_index;
+
+ //append to table
+ $(data.new_table_string)
+ .find('input:checkbox')
+ .val(new_last_row_id)
+ .end()
+ .appendTo(tables_table);
+
+ //Sort the table
+ $(tables_table).PMA_sort_table('th');
+
+ //Refresh navigation frame as a new table has been added
+ window.parent.refreshNavigation();
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.post()
+ } // end elseif()
+ }) // end create table form submit button actions
+
+}, 'top.frame_content'); //end $(document).ready for 'Create Table'
+
+/**
+ * Attach event handlers for Empty Table and Drop Table. Used wherever libraries/
+ * tbl_links.inc.php is used.
+ */
+$(document).ready(function() {
+
+ /**
+ * Attach Ajax event handlers for Empty Table
+ *
+ * @uses PMA_ajaxShowMessage()
+ * @uses $.PMA_confirm()
+ */
+ $("#empty_table_anchor").live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = 'TRUNCATE TABLE ' + window.parent.table;
+
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $("#topmenucontainer")
+ .next('div')
+ .remove()
+ .end()
+ .after(data.sql_query);
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.get
+ }) // end $.PMA_confirm()
+ }) // end Empty Table
+
+ /**
+ * Attach Ajax event handler for Drop Table
+ *
+ * @uses PMA_ajaxShowMessage()
+ * @uses $.PMA_confirm()
+ * @uses window.parent.refreshNavigation()
+ */
+ $("#drop_table_anchor").live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = 'DROP TABLE/VIEW ' + window.parent.table;
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $("#topmenucontainer")
+ .next('div')
+ .remove()
+ .end()
+ .after(data.sql_query);
+ window.parent.table = '';
+ window.parent.refreshNavigation();
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.get
+ }) // end $.PMA_confirm()
+ }) // end $().live()
+}, 'top.frame_content'); //end $(document).ready() for libraries/tbl_links.inc.php
+
+/**
+ * Attach Ajax event handlers for Drop Trigger. Used on tbl_structure.php
+ */
+$(document).ready(function() {
+
+ $(".drop_trigger_anchor").live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var curr_row Object reference to the current trigger's <tr>
+ */
+ var curr_row = $(this).parents('tr');
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = 'DROP TRIGGER IF EXISTS `' + $(curr_row).children('td:first').text() + '`';
+
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $("#topmenucontainer")
+ .next('div')
+ .remove()
+ .end()
+ .after(data.sql_query);
+ $(curr_row).hide("medium").remove();
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.get()
+ }) // end $.PMA_confirm()
+ }) // end $().live()
+}, 'top.frame_content'); //end $(document).ready() for Drop Trigger
+
+/**
+ * Attach Ajax event handlers for Drop Database. Moved here from db_structure.js
+ * as it was also required on db_create.php
+ *
+ * @uses $.PMA_confirm()
+ * @uses PMA_ajaxShowMessage()
+ * @uses window.parent.refreshNavigation()
+ * @uses window.parent.refreshMain()
+ */
+$(document).ready(function() {
+ $("#drop_db_anchor").live('click', function(event) {
+ event.preventDefault();
+
+ //context is top.frame_content, so we need to use window.parent.db to access the db var
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\n' + 'DROP DATABASE ' + window.parent.db;
+
+ $(this).PMA_confirm(question, $(this).attr('href') ,function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) {
+ //Database deleted successfully, refresh both the frames
+ window.parent.refreshNavigation();
+ window.parent.refreshMain();
+ }) // end $.get()
+ }); // end $.PMA_confirm()
+ }); //end of Drop Database Ajax action
+}) // end of $(document).ready() for Drop Database
+
+/**
+ * Attach Ajax event handlers for 'Create Database'. Used wherever libraries/
+ * display_create_database.lib.php is used, ie main.php and server_databases.php
+ *
+ * @uses PMA_ajaxShowMessage()
+ */
+$(document).ready(function() {
+
+ $('#create_database_form').live('submit', function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $(this).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ $.post($(this).attr('action'), $(this).serialize(), function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+
+ //Append database's row to table
+ $("#tabledatabases")
+ .find('tbody')
+ .append(data.new_db_string)
+ .PMA_sort_table('.name')
+ .find('#db_summary_row')
+ .appendTo('#tabledatabases tbody')
+ .removeClass('odd even');
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.post()
+ }) // end $().live()
+}) // end $(document).ready() for Create Database
+
+/**
+ * Attach Ajax event handlers for 'Change Password' on main.php
+ */
+$(document).ready(function() {
+
+ /**
+ * Attach Ajax event handler on the change password anchor
+ */
+ $('#change_password_anchor').live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var button_options Object containing options to be passed to jQueryUI's dialog
+ */
+ var button_options = {};
+
+ button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}
+
+ $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
+ $('<div id="change_password_dialog></div>')
+ .dialog({
+ title: top.frame_content.PMA_messages['strChangePassword'],
+ width: 600,
+ buttons : button_options
+ })
+ .append(data);
+ }) // end $.get()
+ }) // end handler for change password anchor
+
+ /**
+ * Attach Ajax event handler for Change Password form submission
+ *
+ * @uses PMA_ajaxShowMessage()
+ */
+ $("#change_password_form").find('input[name=change_pw]').live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var the_form Object referring to the change password form
+ */
+ var the_form = $("#change_password_form");
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $(the_form).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ $.post($(the_form).attr('action'), $(the_form).serialize(), function(data) {
+ if(data.success == true) {
+
+ PMA_ajaxShowMessage(data.message);
+
+ $("#topmenucontainer").after(data.sql_query);
+
+ $("#change_password_dialog").hide().remove();
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.post()
+ }) // end handler for Change Password form submission
+}) // end $(document).ready() for Change Password
+
+/**
* Toggle the hiding/showing of the "Open in ENUM/SET editor" message when
* the page loads and when the selected data type changes
*/
diff --git a/js/indexes.js b/js/indexes.js
old mode 100644
new mode 100755
diff --git a/js/jquery/jquery-1.4.2.js b/js/jquery/jquery-1.4.2.js
old mode 100644
new mode 100755
diff --git a/js/jquery/jquery-ui-1.8.custom.js b/js/jquery/jquery-ui-1.8.custom.js
old mode 100644
new mode 100755
diff --git a/js/jquery/jquery.json-2.2.js b/js/jquery/jquery.json-2.2.js
old mode 100644
new mode 100755
diff --git a/js/jquery/timepicker.js b/js/jquery/timepicker.js
old mode 100644
new mode 100755
diff --git a/js/keyhandler.js b/js/keyhandler.js
old mode 100644
new mode 100755
diff --git a/js/main_custom_color.js b/js/main_custom_color.js
old mode 100644
new mode 100755
diff --git a/js/messages.php b/js/messages.php
old mode 100644
new mode 100755
index 94e1e67..8806b07
--- a/js/messages.php
+++ b/js/messages.php
@@ -29,6 +29,12 @@ $js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled
/* For confirmations */
$js_messages['strDoYouReally'] = __('Do you really want to ');
$js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a complete database!');
+$js_messages['strDroppingEvent'] = __('Dropping Event');
+$js_messages['strDroppingProcedure'] = __('Dropping Procedure');
+$js_messages['strDeleteTrackingData'] = __('Delete tracking data for this table');
+$js_messages['strDeletingTrackingData'] = __('Deleting tracking data');
+$js_messages['strDroppingPrimaryKeyIndex'] = __('Dropping Primary Key/Index');
+$js_messages['strOperationTakesLongTime'] = __('This operation could take a long time. Proceed anyway?');
/* For blobstreaming */
$js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to DISABLE a BLOB Repository!');
@@ -43,11 +49,44 @@ $js_messages['strHostEmpty'] = __('The host name is empty!');
$js_messages['strUserEmpty'] = __('The user name is empty!');
$js_messages['strPasswordEmpty'] = __('The password is empty!');
$js_messages['strPasswordNotSame'] = __('The passwords aren\'t the same!');
+$js_messages['strAddNewUser'] = __('Add a New User');
+$js_messages['strCreateUser'] = __('Create User');
+$js_messages['strReloadingPrivileges'] = __('Reloading Privileges');
+$js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users');
+$js_messages['strClose'] = __('Close');
/* For inline query editing */
$js_messages['strGo'] = __('Go');
$js_messages['strCancel'] = __('Cancel');
+/* For Ajax Notifications */
+$js_messages['strLoading'] = __('Loading');
+$js_messages['strProcessingRequest'] = __('Processing Request');
+$js_messages['strErrorProcessingRequest'] = __('Error in Processing Request');
+$js_messages['strDroppingColumn'] = __('Dropping Column');
+$js_messages['strAddingPrimaryKey'] = __('Adding Primary Key');
+$js_messages['strOK'] = __('OK');
+
+/* For db_operations.js */
+$js_messages['strRenamingDatabases'] = __('Renaming Databases');
+$js_messages['strReloadDatabase'] = __('Reload Database');
+$js_messages['strCopyingDatabase'] = __('Copying Database');
+$js_messages['strChangingCharset'] = __('Changing Charset');
+$js_messages['strTableMustHaveAtleastOneColumn'] = __('Table must have atleast 1 column');
+$js_messages['strCreateTable'] = __('Create Table');
+$js_messages['strYes'] = __('Yes');
+$js_messages['strNo'] = __('No');
+
+/* For db_search.js */
+$js_messages['strSearching'] = __('Searching');
+
+/* For sql.js */
+$js_messages['strToggleQueryBox'] = __('Toggle Query Box Visibility');
+$js_messages['strInlineEdit'] = __('Inline Edit');
+
+/* For tbl_change.js */
+$js_messages['strIgnore'] = __('Ignore');
+
/* Designer */
$js_messages['strModifications'] = __('Modifications have been saved');
$js_messages['strRelationDeleted'] = __('Relation deleted');
@@ -65,6 +104,7 @@ $js_messages['strChangeDisplay'] = __('Choose column to display');
/* password generation */
$js_messages['strGeneratePassword'] = __('Generate password');
$js_messages['strGenerate'] = __('Generate');
+$js_messages['strChangePassword'] = __('Change Password');
/* navigation tabs */
$js_messages['strMore'] = __('More');
diff --git a/js/navigation.js b/js/navigation.js
old mode 100644
new mode 100755
diff --git a/js/querywindow.js b/js/querywindow.js
old mode 100644
new mode 100755
diff --git a/js/replication.js b/js/replication.js
old mode 100644
new mode 100755
diff --git a/js/server_privileges.js b/js/server_privileges.js
old mode 100644
new mode 100755
index 3495e03..e59ec62
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -1,6 +1,11 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * function used in server privilege pages
+ * @fileoverview functions used in server privilege pages
+ * @name Server Privileges
+ *
+ * @requires jQuery
+ * @requires jQueryUI
+ * @requires js/functions.js
*
* @version $Id$
*/
@@ -8,8 +13,8 @@
/**
* Validates the password field in a form
*
- * @uses PMA_messages['strPasswordEmpty']
- * @uses PMA_messages['strPasswordNotSame']
+ * @see PMA_messages['strPasswordEmpty']
+ * @see PMA_messages['strPasswordNotSame']
* @param object the form
* @return boolean whether the field value is valid or not
*/
@@ -93,3 +98,365 @@ function suggestPassword(passwd_form) {
passwd_form.text_pma_pw2.value = passwd.value;
return true;
}
+
+/**
+ * When a new user is created and retrieved over Ajax, append the user's row to
+ * the user's table
+ *
+ * @param new_user_string the html for the new user's row
+ * @param new_user_initial the first alphabet of the user's name
+ * @param new_user_initial_string html to replace the initial for pagination
+ */
+function appendNewUser(new_user_string, new_user_initial, new_user_initial_string) {
+ //Append the newly retrived user to the table now
+
+ //Calculate the index for the new row
+ var curr_last_row = $("#usersForm").find('tbody').find('tr:last');
+ var curr_last_row_index_string = $(curr_last_row).find('input:checkbox').attr('id').match(/\d+/)[0];
+ var curr_last_row_index = parseFloat(curr_last_row_index_string);
+ var new_last_row_index = curr_last_row_index + 1;
+ var new_last_row_id = 'checkbox_sel_users_' + new_last_row_index;
+
+ //Append to the table and set the id/names correctly
+ $(new_user_string)
+ .insertAfter($(curr_last_row))
+ .find('input:checkbox')
+ .attr('id', new_last_row_id)
+ .val(function() {
+ //the insert messes up the &27; part. let's fix it
+ return $(this).val().replace(/&/,'&');
+ })
+ .end()
+ .find('label')
+ .attr('for', new_last_row_id)
+ .end();
+
+ //Let us sort the table alphabetically
+ $("#usersForm").find('tbody').PMA_sort_table('label');
+
+ $("#initials_table").find('td:contains('+new_user_initial+')')
+ .html(new_user_initial_string);
+};
+
+/**#@+
+ * @namespace jQuery
+ */
+
+/**
+ * AJAX scripts for server_privileges page.
+ *
+ * Actions ajaxified here:
+ * Add a new user
+ * Revoke a user
+ * Edit privileges
+ * Export privileges
+ * Paginate table of users
+ * Flush privileges
+ *
+ * @memberOf jQuery
+ * @name document.ready
+ */
+
+$(document).ready(function() {
+ /** @lends jQuery */
+
+ /**
+ * AJAX event handler for 'Add a New User'
+ *
+ * @see PMA_ajaxShowMessage()
+ * @see appendNewUser()
+ * @memberOf jQuery
+ * @name add_user_click
+ *
+ */
+ $("#fieldset_add_user a").live("click", function(event) {
+ /** @lends jQuery */
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+
+ /**
+ * @var button_options Object containing options for jQueryUI dialog buttons
+ */
+ var button_options = {};
+ button_options[PMA_messages['strCreateUser']] = function() {
+
+ /**
+ * @var the_form stores reference to current form
+ */
+ var the_form = $(this).find("#addUsersForm");
+
+ if( ! checkAddUser($(the_form).get(0)) ) {
+ PMA_ajaxShowMessage(PMA_messages['strFormEmpty']);
+ return false;
+ }
+
+ //We also need to post the value of the submit button in order to get this to work correctly
+ $.post($(the_form).attr('action'), $(the_form).serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) {
+ if(data.success == true) {
+ $("#add_user_dialog").dialog("close").remove();
+ PMA_ajaxShowMessage(data.message);
+ $("#topmenucontainer")
+ .next('div')
+ .remove()
+ .end()
+ .after(data.sql_query);
+
+ //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
+ var notice_class = $("#topmenucontainer").next("div").find('.notice');
+ if($(notice_class).text() == '') {
+ $(notice_class).remove();
+ }
+
+ appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string);
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000");
+ }
+ })
+ };
+ button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
+
+ $.get($(this).attr("href"), {'ajax_request':true}, function(data) {
+ $('<div id="add_user_dialog"></div>')
+ .prepend(data)
+ .find("#fieldset_add_user_footer").hide() //showing the "Go" and "Create User" buttons together will confuse the user
+ .end()
+ .find("#addUsersForm").append('<input type="hidden" name="ajax_request" value="true" />')
+ .end()
+ .dialog({
+ title: top.frame_content.PMA_messages['strAddNewUser'],
+ width: 800,
+ modal: true,
+ buttons: button_options
+ }); //dialog options end
+ }); // end $.get()
+
+ });//end of Add New User AJAX event handler
+
+
+ /**
+ * Ajax event handler for 'Reload Privileges' anchor
+ *
+ * @see PMA_ajaxShowMessage()
+ * @memberOf jQuery
+ * @name reload_privileges_click
+ */
+ $("#reload_privileges_anchor").live("click", function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage(PMA_messages['strReloadingPrivileges']);
+
+ $.get($(this).attr("href"), {'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }); //end $.get()
+
+ }); //end of Reload Privileges Ajax event handler
+
+ /**
+ * AJAX handler for 'Revoke User'
+ *
+ * @see PMA_ajaxShowMessage()
+ * @memberOf jQuery
+ * @name revoke_user_click
+ */
+ $("#fieldset_delete_user_footer #buttonGo").live('click', function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage(PMA_messages['strRemovingSelectedUsers']);
+
+ $.post($("#usersForm").attr('action'), $("#usersForm").serialize() + "&delete=" + $(this).attr('value') + "&ajax_request=true", function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+
+ //Remove the revoked user from the users list
+ $("#usersForm").find("input:checkbox:checked").parents("tr").slideUp("medium", function() {
+ var this_user_initial = $(this).find('input:checkbox').val().charAt(0).toUpperCase();
+ $(this).remove();
+
+ //If this is the last user with this_user_initial, remove the link from #initials_table
+ if($("#tableuserrights").find('input:checkbox[value^=' + this_user_initial + ']').length == 0) {
+ $("#initials_table").find('td > a:contains(' + this_user_initial + ')').parent('td').html(this_user_initial);
+ }
+
+ //Re-check the classes of each row
+ $("#usersForm")
+ .find('tbody').find('tr:odd')
+ .removeClass('even').addClass('odd')
+ .end()
+ .find('tr:even')
+ .removeClass('odd').addClass('even');
+ })
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.post()
+ }) // end Revoke User
+
+ /**
+ * AJAX handler for 'Edit User'
+ *
+ * @see PMA_ajaxShowMessage()
+ *
+ */
+
+ /**
+ * Step 1: Load Edit User Dialog
+ * @memberOf jQuery
+ * @name edit_user_click
+ */
+ $(".edit_user_anchor").live('click', function(event) {
+ /** @lends jQuery */
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+
+ $(this).parents('tr').addClass('current_row');
+
+ /**
+ * @var button_options Object containing options for jQueryUI dialog buttons
+ */
+ var button_options = {};
+ button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
+
+ $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true}, function(data) {
+ $('<div id="edit_user_dialog"></div>')
+ .append(data)
+ .dialog({
+ width: 900,
+ buttons: button_options
+ })
+ }) // end $.get()
+ })
+
+ /**
+ * Step 2: Submit the Edit User Dialog
+ *
+ * @see PMA_ajaxShowMessage()
+ * @memberOf jQuery
+ * @name edit_user_submit
+ */
+ $("#edit_user_dialog").find("form").live('submit', function(event) {
+ /** @lends jQuery */
+ event.preventDefault();
+
+ PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+
+ $(this).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ /**
+ * @var curr_submit_name name of the current button being submitted
+ */
+ var curr_submit_name = $(this).find('.tblFooters').find('input:submit').attr('name');
+
+ /**
+ * @var curr_submit_value value of the current button being submitted
+ */
+ var curr_submit_value = $(this).find('.tblFooters').find('input:submit').val();
+
+ $.post($(this).attr('action'), $(this).serialize() + '&' + curr_submit_name + '=' + curr_submit_value, function(data) {
+ if(data.success == true) {
+
+ PMA_ajaxShowMessage(data.message);
+
+ //Close the jQueryUI dialog
+ $("#edit_user_dialog").dialog("close").remove();
+
+ if(data.sql_query) {
+ $("#topmenucontainer")
+ .next('div')
+ .remove()
+ .end()
+ .after(data.sql_query);
+ var notice_class = $("#topmenucontainer").next("div").find('.notice');
+ if($(notice_class).text() == '') {
+ $(notice_class).remove();
+ }
+ } //Show SQL Query that was executed
+
+ //Append new user if necessary
+ if(data.new_user_string) {
+ appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string);
+ }
+
+ //Change privileges if they were edited
+ if(data.new_privileges) {
+ $("#usersForm")
+ .find('.current_row')
+ .find('tt')
+ .html(data.new_privileges);
+ }
+
+ $("#usersForm")
+ .find('.current_row')
+ .removeClass('current_row');
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ });
+ })
+ //end Edit user
+
+ /**
+ * AJAX handler for 'Export Privileges'
+ *
+ * @see PMA_ajaxShowMessage()
+ * @memberOf jQuery
+ * @name export_user_click
+ */
+ $(".export_user_anchor").live('click', function(event) {
+ /** @lends jQuery */
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+
+ /**
+ * @var button_options Object containing options for jQueryUI dialog buttons
+ */
+ var button_options = {};
+ button_options[PMA_messages['strClose']] = function() {$(this).dialog("close").remove();}
+
+ $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
+ $('<div id="export_dialog"></div>')
+ .prepend(data)
+ .dialog({
+ width : 500,
+ buttons: button_options
+ });
+ }) //end $.get
+ }) //end export privileges
+
+ /**
+ * AJAX handler to Paginate the Users Table
+ *
+ * @see PMA_ajaxShowMessage()
+ * @name paginate_users_table_click
+ * @memberOf jQuery
+ */
+ $("#initials_table").find("a").live('click', function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+
+ $.get($(this).attr('href'), {'ajax_request' : true, 'random': Math.random()}, function(data) {
+ $("#usersForm")
+ .hide("medium")
+ .siblings("#initials_table")
+ .after(data)
+ .show("medium")
+ .end()
+ .remove();
+ $("#initials_table").siblings("h2").not(":first").remove();
+ }) // end $.get
+ })// end of the paginate users table
+
+}, 'top.frame_content'); //end $(document).ready()
+
+/**#@- */
\ No newline at end of file
diff --git a/js/server_synchronize.js b/js/server_synchronize.js
old mode 100644
new mode 100755
diff --git a/js/sql.js b/js/sql.js
new file mode 100644
index 0000000..a2000ac
--- /dev/null
+++ b/js/sql.js
@@ -0,0 +1,630 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @fileoverview functions used wherever an sql query form is used
+ *
+ * @requires jQuery
+ * @requires js/functions.js
+ *
+ * @version $Id$
+ */
+
+/**
+ * Get the field name for the current field. Required to construct the query
+ * for inline editing
+ *
+ * @param this_field_obj jQuery object that points to the current field's tr
+ * @param disp_mode string
+ */
+function getFieldName(this_field_obj, disp_mode) {
+
+ if(disp_mode == 'vertical') {
+ var field_name = $(this_field_obj).siblings('th').find('a').text();
+ }
+ else {
+ var this_field_index = $(this_field_obj).index();
+ if(window.parent.text_dir == 'ltr') {
+ // 4 columns to account for the checkbox, edit, delete and appended inline edit anchors
+ var field_name = $(this_field_obj).parents('table').find('thead').find('th:nth('+ (this_field_index-4 )+') a').text();
+ }
+ else {
+ var field_name = $(this_field_obj).parents('table').find('thead').find('th:nth('+ this_field_index+') a').text();
+ }
+ }
+
+ field_name = $.trim(field_name);
+
+ return field_name;
+}
+
+/**
+ * The function that iterates over each row in the table_results and appends a
+ * new inline edit anchor to each table row.
+ *
+ * @param disp_mode string
+ */
+function appendInlineAnchor(disp_mode) {
+ if(disp_mode == 'vertical') {
+ var cloned_row = $('.edit_row_anchor').removeClass('edit_row_anchor').parent('tr').clone();
+
+ var img_object = $(cloned_row).find('img:first').attr('title', PMA_messages['strInlineEdit']);
+
+ $(cloned_row).find('td').addClass('edit_row_anchor')
+ .find('a').attr('href', '#')
+ .find('div')
+ .text(PMA_messages['strInlineEdit'])
+ .prepend(img_object);
+
+ $(cloned_row).insertBefore($('.where_clause').parent('tr'));
+
+ $("#table_results").find('tr:first').find('th')
+ .attr('rowspan', '4');
+ }
+ else {
+ $('.edit_row_anchor').each(function() {
+
+ $(this).removeClass('edit_row_anchor');
+
+ var cloned_anchor = $(this).clone();
+
+ var img_object = $(cloned_anchor).find('img').attr('title', PMA_messages['strInlineEdit']);
+
+ $(cloned_anchor).addClass('edit_row_anchor')
+ .find('a').attr('href', '#')
+ .find('div')
+ .text(PMA_messages['strInlineEdit'])
+ .prepend(img_object);
+
+ $(this).siblings('.where_clause')
+ .before(cloned_anchor);
+ });
+
+ $('#rowsDeleteForm').find('thead').find('th').each(function() {
+ if($(this).attr('colspan') == 3) {
+ $(this).attr('colspan', '4')
+ }
+ })
+ }
+}
+
+/**#@+
+ * @namespace jQuery
+ */
+
+/**
+ * @description <p>Ajax scripts for sql and browse pages</p>
+ *
+ * Actions ajaxified here:
+ * <ul>
+ * <li>Retrieve results of an SQL query</li>
+ * <li>Paginate the results table</li>
+ * <li>Sort the results table</li>
+ * <li>Change table according to display options</li>
+ * <li>Inline editing of data</li>
+ * </ul>
+ *
+ * @name document.ready
+ * @memberOf jQuery
+ */
+$(document).ready(function() {
+
+
+ /**
+ * current value of the direction in which the table is displayed
+ * @type String
+ * @fieldOf jQuery
+ * @name disp_mode
+ */
+ var disp_mode = $("#top_direction_dropdown").val();
+
+ /**
+ * Update value of {@link jQuery.disp_mode} everytime the direction dropdown changes value
+ * @memberOf jQuery
+ * @name direction_dropdown_change
+ */
+ $("#top_direction_dropdown, #bottom_direction_dropdown").live('change', function(event) {
+ disp_mode = $(this).val();
+ })
+
+ /**
+ * Attach the {@link appendInlineAnchor} function to a custom event, which
+ * will be triggered manually everytime the table of results is reloaded
+ * @memberOf jQuery
+ * @name sqlqueryresults_live
+ */
+ $("#sqlqueryresults").live('appendAnchor',function() {
+ appendInlineAnchor(disp_mode);
+ })
+
+ /**
+ * Trigger the appendAnchor event to prepare the first table for inline edit
+ *
+ * @memberOf jQuery
+ * @name sqlqueryresults_trigger
+ */
+ $("#sqlqueryresults").trigger('appendAnchor');
+
+ /**
+ * Append the Toggle Query Box message to the query input form
+ *
+ * @memberOf jQuery
+ * @name appendToggleSpan
+ */
+ $('<span id="togglequerybox"></span>')
+ .html(PMA_messages['strToggleQueryBox'])
+ .appendTo("#sqlqueryform");
+
+ // Attach the toggling of the query box visibility to a click
+ $("#togglequerybox").live('click', function() {
+ $(this).siblings().slideToggle("medium");
+ })
+
+ /**
+ * Ajax Event handler for 'SQL Query Submit'
+ *
+ * @see PMA_ajaxShowMessage()
+ * @memberOf jQuery
+ * @name sqlqueryform_submit
+ */
+ $("#sqlqueryform").live('submit', function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+
+ $(this).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ $.post($(this).attr('action'), $(this).serialize() , function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ }
+ else if (data.success == false ) {
+ PMA_ajaxShowMessage(data.error);
+ }
+ else {
+ $("#sqlqueryresults").html(data);
+ $("#sqlqueryresults").trigger('appendAnchor');
+ if($("#togglequerybox").siblings(":visible").length > 0) {
+ $("#togglequerybox").trigger('click');
+ }
+ }
+ }) // end $.post()
+ }) // end SQL Query submit
+
+ /**
+ * Ajax Event handlers for Paginating the results table
+ */
+
+ /**
+ * Paginate when we click any of the navigation buttons
+ * @memberOf jQuery
+ * @name paginate_nav_button_click
+ * @uses PMA_ajaxShowMessage()
+ */
+ $("input[name=navig]").live('click', function(event) {
+ /** @lends jQuery */
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+
+ /**
+ * @var the_form Object referring to the form element that paginates the results table
+ */
+ var the_form = $(this).parent("form");
+
+ $(the_form).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ $.post($(the_form).attr('action'), $(the_form).serialize(), function(data) {
+ $("#sqlqueryresults").html(data);
+ $("#sqlqueryresults").trigger('appendAnchor');
+ }) // end $.post()
+ })// end Paginate results table
+
+ /**
+ * Paginate results with Page Selector dropdown
+ * @memberOf jQuery
+ * @name paginate_dropdown_change
+ */
+ $("#pageselector").live('change', function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+
+ $.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) {
+ $("#sqlqueryresults").html(data);
+ $("#sqlqueryresults").trigger('appendAnchor');
+ }) // end $.get()
+ })// end Paginate results with Page Selector
+
+ /**
+ * Ajax Event handler for sorting the results table
+ * @memberOf jQuery
+ * @name table_results_sort_click
+ */
+ $("#table_results").find("a[title=Sort]").live('click', function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+
+ $.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) {
+ $("#sqlqueryresults").html(data);
+ $("#sqlqueryresults").trigger('appendAnchor');
+ }) // end $.get()
+ })//end Sort results table
+
+ /**
+ * Ajax Event handler for the display options
+ * @memberOf jQuery
+ * @name displayOptionsForm_submit
+ */
+ $("#displayOptionsForm").live('submit', function(event) {
+ event.preventDefault();
+
+ $.post($(this).attr('action'), $(this).serialize() + '&ajax_request=true' , function(data) {
+ $("#sqlqueryresults").html(data);
+ $("#sqlqueryresults").trigger('appendAnchor');
+ }) // end $.post()
+ })
+ //end displayOptionsForm handler
+
+ /**
+ * Ajax Event handlers for Inline Editing
+ */
+
+ /**
+ * On click, replace the current field with an input/textarea
+ * @memberOf jQuery
+ * @name inline_edit_start
+ * @see PMA_ajaxShowMessage()
+ * @see getFieldName()
+ */
+ $(".edit_row_anchor").live('click', function(event) {
+ /** @lends jQuery */
+ event.preventDefault();
+
+ $(this).removeClass('edit_row_anchor').addClass('edit_row_anchor_active');
+
+ // Initialize some variables
+ if(disp_mode == 'vertical') {
+ /**
+ * @var this_row_index Index of the current <td> in the parent <tr>
+ * Current <td> is the inline edit anchor.
+ */
+ var this_row_index = $(this).index();
+ /**
+ * @var input_siblings Object referring to all inline editable events from same row
+ */
+ var input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')');
+ /**
+ * @var where_clause String containing the WHERE clause to select this row
+ */
+ var where_clause = $(this).parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val();
+ }
+ else {
+ var input_siblings = $(this).parent('tr').find('.data_inline_edit');
+ var where_clause = $(this).parent('tr').find('.where_clause').val();
+ }
+
+ $(input_siblings).each(function() {
+ /** @lends jQuery */
+ /**
+ * @var data_value Current value of this field
+ */
+ var data_value = $(this).html();
+
+ // We need to retrieve the value from the server for truncated/relation fields
+ // Find the field name
+
+ /**
+ * @var this_field Object referring to this field (<td>)
+ */
+ var this_field = $(this);
+ /**
+ * @var field_name String containing the name of this field.
+ * @see getFieldName()
+ */
+ var field_name = getFieldName($(this), disp_mode);
+
+ // In each input sibling, wrap the current value in a textarea
+ // and store the current value in a hidden span
+ if($(this).is(':not(.truncated, .transformed, .relation, .enum, .null)')) {
+ // handle non-truncated, non-transformed, non-relation values
+ // We don't need to get any more data, just wrap the value
+ $(this).html('<textarea>'+data_value+'</textarea>')
+ .append('<span class="original_data">'+data_value+'</span>');
+ $(".original_data").hide();
+ }
+ else if($(this).is('.truncated, .transformed')) {
+ /** @lends jQuery */
+ //handle truncated/transformed values values
+
+ /**
+ * @var sql_query String containing the SQL query used to retrieve value of truncated/transformed data
+ */
+ var sql_query = 'SELECT ' + field_name + ' FROM ' + window.parent.table + ' WHERE ' + where_clause;
+
+ // Make the Ajax call and get the data, wrap it and insert it
+ $.post('sql.php', {
+ 'token' : window.parent.token,
+ 'db' : window.parent.db,
+ 'ajax_request' : true,
+ 'sql_query' : sql_query,
+ 'inline_edit' : true
+ }, function(data) {
+ if(data.success == true) {
+ $(this_field).html('<textarea>'+data.value+'</textarea>')
+ .append('<span class="original_data">'+data_value+'</span>');
+ $(".original_data").hide();
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }) // end $.post()
+ }
+ else if($(this).is('.relation')) {
+ /** @lends jQuery */
+ //handle relations
+
+ /**
+ * @var curr_value String containing the current value of this relational field
+ */
+ var curr_value = $(this).find('a').text();
+
+ /**
+ * @var post_params Object containing parameters for the POST request
+ */
+ var post_params = {
+ 'ajax_request' : true,
+ 'get_relational_values' : true,
+ 'db' : window.parent.db,
+ 'table' : window.parent.table,
+ 'column' : field_name,
+ 'token' : window.parent.token,
+ 'curr_value' : curr_value
+ }
+
+ $.post('sql.php', post_params, function(data) {
+ $(this_field).html(data.dropdown)
+ .append('<span class="original_data">'+data_value+'</span>');
+ $(".original_data").hide();
+ }) // end $.post()
+ }
+ else if($(this).is('.enum')) {
+ /** @lends jQuery */
+ //handle enum fields
+ /**
+ * @var curr_value String containing the current value of this relational field
+ */
+ var curr_value = $(this).text();
+
+ /**
+ * @var post_params Object containing parameters for the POST request
+ */
+ var post_params = {
+ 'ajax_request' : true,
+ 'get_enum_values' : true,
+ 'db' : window.parent.db,
+ 'table' : window.parent.table,
+ 'column' : field_name,
+ 'token' : window.parent.token,
+ 'curr_value' : curr_value
+ }
+
+ $.post('sql.php', post_params, function(data) {
+ $(this_field).html(data.dropdown)
+ .append('<span class="original_data">'+data_value+'</span>');
+ $(".original_data").hide();
+ }) // end $.post()
+ }
+ else if($(this).is('.null')) {
+ //handle null fields
+ $(this_field).html('<textarea></textarea>')
+ .append('<span class="original_data">NULL</span>');
+ $(".original_data").hide();
+ }
+ })
+ }) // End On click, replace the current field with an input/textarea
+
+ /**
+ * After editing, clicking again should post data
+ *
+ * @memberOf jQuery
+ * @name inline_edit_save
+ * @see PMA_ajaxShowMessage()
+ * @see getFieldName()
+ */
+ $(".edit_row_anchor_active").live('click', function(event) {
+ /** @lends jQuery */
+ event.preventDefault();
+
+ /**
+ * @var this_row Object referring to current row that is being edited
+ */
+ var this_row = $(this);
+
+ // Initialize variables
+ if(disp_mode == 'vertical') {
+ /**
+ * @var this_row_index Index of the current <td> in the parent <tr>
+ * Current <td> is the inline edit anchor.
+ */
+ var this_row_index = $(this).index();
+ /**
+ * @var input_siblings Object referring to all inline editable events from same row
+ */
+ var input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')');
+ /**
+ * @var where_clause String containing the WHERE clause to select this row
+ */
+ var where_clause = $(this).parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val();
+ }
+ else {
+ var input_siblings = $(this).parent('tr').find('.data_inline_edit');
+ var where_clause = $(this).parent('tr').find('.where_clause').val();
+ }
+
+ /**
+ * @var nonunique Boolean, whether this row is unique or not
+ */
+ if($(this).is('.nonunique')) {
+ var nonunique = 0;
+ }
+ else {
+ var nonunique = 1;
+ }
+
+ // Collect values of all fields to submit, we don't know which changed
+ /**
+ * @var params_to_submit Array containing the name/value pairs of all fields
+ */
+ var params_to_submit = {};
+ /**
+ * @var relation_fields Array containing the name/value pairs of relational fields
+ */
+ var relation_fields = {};
+ /**
+ * @var transform_fields Array containing the name/value pairs for transformed fields
+ */
+ var transform_fields = {};
+ /**
+ * @var transformation_fields Boolean, if there are any transformed fields in this row
+ */
+ var transformation_fields = false;
+
+ $(input_siblings).each(function() {
+ /** @lends jQuery */
+ /**
+ * @var this_field Object referring to this field (<td>)
+ */
+ var this_field = $(this);
+ /**
+ * @var field_name String containing the name of this field.
+ * @see getFieldName()
+ */
+ var field_name = getFieldName($(this), disp_mode);
+
+ /**
+ * @var this_field_params Array temporary storage for the name/value of current field
+ */
+ var this_field_params = {};
+
+ if($(this).is('.transformed')) {
+ transformation_fields = true;
+ }
+
+ if($(this).is(":not(.relation, .enum)")) {
+ this_field_params[field_name] = $(this).find('textarea').val();
+ if($(this).is('.transformed')) {
+ $.extend(transform_fields, this_field_params);
+ }
+ }
+ else {
+ this_field_params[field_name] = $(this).find('select').val();
+
+ if($(this).is('.relation')) {
+ $.extend(relation_fields, this_field_params);
+ }
+ }
+
+ $.extend(params_to_submit, this_field_params);
+ })
+
+ /**
+ * @var sql_query String containing the SQL query to update this row
+ */
+ var sql_query = 'UPDATE ' + window.parent.table + ' SET ';
+
+ $.each(params_to_submit, function(key, value) {
+ if(value.length == 0) {
+ value = 'NULL'
+ }
+ sql_query += ' ' + key + "='" + value + "' , ";
+ })
+ //Remove the last ',' appended in the above loop
+ sql_query = sql_query.replace(/,\s$/, '');
+ sql_query += ' WHERE ' + where_clause;
+
+ /**
+ * @var rel_fields_list String, url encoded representation of {@link relations_fields}
+ */
+ var rel_fields_list = $.param(relation_fields);
+
+ /**
+ * @var transform_fields_list String, url encoded representation of {@link transform_fields}
+ */
+ var transform_fields_list = $.param(transform_fields);
+
+ // Make the Ajax post after setting all parameters
+ /**
+ * @var post_params Object containing parameters for the POST request
+ */
+ var post_params = {'ajax_request' : true,
+ 'sql_query' : sql_query,
+ 'disp_direction' : disp_mode,
+ 'token' : window.parent.token,
+ 'db' : window.parent.db,
+ 'table' : window.parent.table,
+ 'clause_is_unique' : nonunique,
+ 'where_clause' : where_clause,
+ 'rel_fields_list' : rel_fields_list,
+ 'do_transformations' : transformation_fields,
+ 'transform_fields_list' : transform_fields_list,
+ 'goto' : 'sql.php'
+ };
+
+ $.post('tbl_replace.php', post_params, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $(this_row).removeClass('edit_row_anchor_active').addClass('edit_row_anchor');
+
+ $(input_siblings).each(function() {
+ // Inline edit post has been successful.
+ if($(this).is(':not(.relation, .enum)')) {
+ /**
+ * @var new_html String containing value of the data field after edit
+ */
+ var new_html = $(this).find('textarea').val();
+
+ if($(this).is('.transformed')) {
+ var field_name = getFieldName($(this), disp_mode);
+ var this_field = $(this);
+
+ $.each(data.transformations, function(key, value) {
+ if(key == field_name) {
+ if($(this_field).is('.text_plain, .application_octetstream')) {
+ new_html = value;
+ return false;
+ }
+ else {
+ var new_value = $(this_field).find('textarea').val();
+ new_html = $(value).append(new_value);
+ return false;
+ }
+ }
+ })
+ }
+ }
+ else {
+ var new_html = $(this).find('select').val();
+ if($(this).is('.relation')) {
+ var field_name = getFieldName($(this), disp_mode);
+ var this_field = $(this);
+
+ $.each(data.relations, function(key, value) {
+ if(key == field_name) {
+ var new_value = $(this_field).find('select').val();
+ new_html = $(value).append(new_value);
+ return false;
+ }
+ })
+ }
+ }
+ $(this).html(new_html);
+ })
+ }
+ else {
+ PMA_ajaxShowMessage(data.error);
+ };
+ }) // end $.post()
+ }) // End After editing, clicking again should post data
+}, 'top.frame_content') // end $(document).ready()
+
+/**#@- */
diff --git a/js/tbl_change.js b/js/tbl_change.js
old mode 100644
new mode 100755
index 36c4303..a092171
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -1,6 +1,10 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * function used in table data manipulation pages
+ * @fileoverview function used in table data manipulation pages
+ *
+ * @requires jQuery
+ * @requires jQueryUI
+ * @requires js/functions.js
*
* @version $Id$
*/
@@ -247,3 +251,151 @@ function unNullify(urlField, multi_edit)
return true;
} // end of the 'unNullify()' function
+
+/**
+ * Ajax handlers for Change Table page
+ *
+ * Actions Ajaxified here:
+ * Submit Data to be inserted into the table
+ * Restart insertion with 'N' rows.
+ */
+$(document).ready(function() {
+
+ /**
+ * Submission of data to be inserted into table
+ *
+ * @uses PMA_ajaxShowMessage()
+ */
+ $("#insertForm").live('submit', function(event) {
+
+ /**
+ * @var the_form Object referring to the insertion form
+ */
+ var the_form = $(this);
+ event.preventDefault();
+
+ PMA_ajaxShowMessage();
+ $(the_form).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ $.post($(the_form).attr('action'), $(the_form).serialize(), function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+
+ $("#topmenucontainer")
+ .next('div')
+ .remove()
+ .end()
+ .after(data.sql_query);
+
+ //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
+ var notice_class = $("#topmenucontainer").next("div").find('.notice');
+ if($(notice_class).text() == '') {
+ $(notice_class).remove();
+ }
+
+ //Clear the data in the forms
+ $(the_form).find('input:reset').trigger('click');
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000");
+ }
+ })
+ }) // end submission of data to be inserted into table
+
+ /**
+ * Restart Insertion form
+ */
+ $("#insert_rows").live('change', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var curr_rows Number of current insert rows already on page
+ */
+ var curr_rows = $(".insertRowTable").length;
+ /**
+ * @var target_rows Number of rows the user wants
+ */
+ var target_rows = $("#insert_rows").val();
+
+ if(curr_rows < target_rows ) {
+ while( curr_rows < target_rows ) {
+
+ /**
+ * @var last_row Object referring to the last row
+ */
+ var last_row = $("#insertForm").find(".insertRowTable:last");
+
+ //Clone the insert tables
+ $(last_row)
+ .clone()
+ .insertBefore("#insertForm > fieldset")
+ .find('input[name*=multi_edit],select[name*=multi_edit]')
+ .each(function() {
+
+ /**
+ * Extract the index from the name attribute for all input/select fields and increment it
+ * name is of format funcs[multi_edit][10][<long random string of alphanum chars>]
+ */
+
+ /**
+ * @var this_name String containing name of the input/select elements
+ */
+ var this_name = $(this).attr('name');
+ /** split {@link this_name} at [10], so we have the parts that can be concatenated later */
+ var name_parts = this_name.split(/\[\d+\]/);
+ /** extract the [10] from {@link name_parts} */
+ var old_row_index_string = this_name.match(/\[\d+\]/)[0];
+ /** extract 10 - had to split into two steps to accomodate double digits */
+ var old_row_index = parseInt(old_row_index_string.match(/\d+/)[0]);
+
+ /** calculate next index i.e. 11 */
+ var new_row_index = old_row_index + 1;
+ /** generate the new name i.e. funcs[multi_edit][11][foobarbaz] */
+ var new_name = name_parts[0] + '[' + new_row_index + ']' + name_parts[1];
+
+ $(this).attr('name', new_name);
+ });
+
+ //Insert/Clone the ignore checkboxes
+ if(curr_rows == 1 ) {
+ $('<input id="insert_ignore_check_1" type="checkbox" name="insert_ignore_check_1" checked="checked" />')
+ .insertBefore(".insertRowTable:last")
+ .after('<label for="insert_ignore_check_1">' + PMA_messages['strIgnore'] + '</label>');
+ }
+ else {
+
+ /**
+ * @var last_checkbox Object reference to the last checkbox in #insertForm
+ */
+ var last_checkbox = $("#insertForm").children('input:checkbox:last');
+
+ /** name of {@link last_checkbox} */
+ var last_checkbox_name = $(last_checkbox).attr('name');
+ /** index of {@link last_checkbox} */
+ var last_checkbox_index = parseInt(last_checkbox_name.match(/\d+/));
+ /** name of new {@link last_checkbox} */
+ var new_name = last_checkbox_name.replace(/\d+/,last_checkbox_index+1);
+
+ $(last_checkbox)
+ .clone()
+ .attr({'id':new_name, 'name': new_name})
+ .add('label[for^=insert_ignore_check]:last')
+ .clone()
+ .attr('for', new_name)
+ .before('<br />')
+ .insertBefore(".insertRowTable:last");
+ }
+ curr_rows++;
+ }
+ }
+ else if( curr_rows > target_rows) {
+ while(curr_rows > target_rows) {
+ $("input[id^=insert_ignore_check]:last")
+ .nextUntil("fieldset")
+ .andSelf()
+ .remove();
+ curr_rows--;
+ }
+ }
+ })
+}, 'top.frame_content'); //end $(document).ready()
\ No newline at end of file
diff --git a/js/tbl_operations.js b/js/tbl_operations.js
new file mode 100644
index 0000000..c74cc60
--- /dev/null
+++ b/js/tbl_operations.js
@@ -0,0 +1,21 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * function used in server privilege pages
+ *
+ * @version $Id$
+ */
+
+/**
+ * Add all AJAX scripts for tbl_operations.php page here.
+ *
+ * Alter table order - #div_table_order form
+ * Move Table - #div_table_rename form
+ * Table Options - #div_table_options form
+ * Copy Table - #div_table_copy form
+ * Table Maintenance - #div_table_maintenance (need to id each anchor)
+ * Check
+ * Repair
+ * Analyze
+ * Flush
+ * Optimize
+ */
\ No newline at end of file
diff --git a/js/tbl_relation.js b/js/tbl_relation.js
old mode 100644
new mode 100755
diff --git a/js/tbl_select.js b/js/tbl_select.js
new file mode 100644
index 0000000..88796bc
--- /dev/null
+++ b/js/tbl_select.js
@@ -0,0 +1,32 @@
+/**
+ * @fileoverview JavaScript functions used on tbl_select.php
+ *
+ * @requires jQuery
+ * @requires js/functions.js
+ */
+
+/**
+ * Ajax event handlers for this page
+ *
+ * Actions ajaxified here:
+ * Table Search
+ */
+$(document).ready(function() {
+
+ /**
+ * Ajax event handler for Table Search
+ *
+ * @uses PMA_ajaxShowMessage()
+ */
+ $("#tbl_search_form").live('submit', function(event) {
+ event.preventDefault();
+
+ PMA_ajaxShowMessage(PMA_messages['strSearching']);
+
+ $(this).append('<input type="hidden" name="ajax_request" value="true" />');
+
+ $.post($(this).attr('action'), $(this).serialize(), function(data) {
+ $("#searchresults").html(data);
+ })
+ })
+}, 'top.frame_content'); // end $(document).ready()
\ No newline at end of file
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
new file mode 100644
index 0000000..693442e
--- /dev/null
+++ b/js/tbl_structure.js
@@ -0,0 +1,133 @@
+/**
+ * @fileoverview functions used on the table structure page
+ * @name Table Structure
+ *
+ * @requires jQuery
+ * @requires jQueryUI
+ * @required js/functions.js
+ */
+
+/**
+ * AJAX scripts for tbl_structure.php
+ *
+ * Actions ajaxified here:
+ * Drop Column
+ * Add Primary Key
+ * Drop Primary Key/Index
+ *
+ */
+$(document).ready(function() {
+
+ /**
+ * Attach Event Handler for 'Drop Column'
+ *
+ * @uses $.PMA_confirm()
+ * @uses PMA_ajaxShowMessage()
+ */
+ $(".drop_column_anchor").live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var curr_table_name String containing the name of the current table
+ */
+ var curr_table_name = window.parent.table;
+ /**
+ * @var curr_row Object reference to the currently selected row (i.e. field in the table)
+ */
+ var curr_row = $(this).parents('tr');
+ /**
+ * @var curr_column_name String containing name of the field referred to by {@link curr_row}
+ */
+ var curr_column_name = $(curr_row).children('th').children('label').text();
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` DROP `' + curr_column_name + '`';
+
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strDroppingColumn']);
+
+ $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $(curr_row).hide("medium").remove();
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }) // end $.get()
+ }); // end $.PMA_confirm()
+ }) ; //end of Drop Column Anchor action
+
+ /**
+ * Ajax Event handler for 'Add Primary Key'
+ *
+ * @uses $.PMA_confirm()
+ * @uses PMA_ajaxShowMessage()
+ */
+ $(".action_primary a").live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var curr_table_name String containing the name of the current table
+ */
+ var curr_table_name = window.parent.table;
+ /**
+ * @var curr_column_name String containing name of the field referred to by {@link curr_row}
+ */
+ var curr_column_name = $(this).parents('tr').children('th').children('label').text();
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` ADD PRIMARY KEY(`' + curr_column_name + '`)';
+
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strAddingPrimaryKey']);
+
+ $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $(this).remove();
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }) // end $.get()
+ }) // end $.PMA_confirm()
+ })//end Add Primary Key
+
+ /**
+
* Ajax Event handler for 'Drop Primary Key/Index'
+ *
+ * @uses $.PMA_confirm()
+ * @uses PMA_ajaxShowMessage()
+ */
+ $('.drop_primary_key_index_anchor').live('click', function(event) {
+ event.preventDefault();
+
+ /**
+ * @var curr_row Object containing reference to the current field's row
+ */
+ var curr_row = $(this).parents('tr');
+
+ var question = $(curr_row).children('.drop_primary_key_index_msg').val();
+
+ $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
+
+ PMA_ajaxShowMessage(PMA_messages['strDroppingPrimaryKeyIndex']);
+
+ $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxShowMessage(data.message);
+ $(curr_row).hide("medium").remove();
+ }
+ else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }) // end $.get()
+ }) // end $.PMA_confirm()
+ }) //end Drop Primary Key/Index
+
+}) // end $(document).ready()
\ No newline at end of file
diff --git a/js/update-location.js b/js/update-location.js
old mode 100644
new mode 100755
diff --git a/libraries/.htaccess b/libraries/.htaccess
old mode 100644
new mode 100755
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Error.class.php b/libraries/Error.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
old mode 100644
new mode 100755
diff --git a/libraries/File.class.php b/libraries/File.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
old mode 100644
new mode 100755
index f203389..81ef590
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -477,10 +477,12 @@ class PMA_Index
}
$r .= '<td ' . $row_span . '>'
- . ' <a href="sql.php' . PMA_generate_common_url($this_params)
- . '" onclick="return confirmLink(this, \'' . $js_msg . '\')">'
+ . ' <a class="drop_primary_key_index_anchor" href="sql.php' . PMA_generate_common_url($this_params)
+ . '" >'
. PMA_getIcon('b_drop.png', __('Drop')) . '</a>'
. '</td>' . "\n";
+
+ $r .= '<input type="hidden" class="drop_primary_key_index_msg" value="' . $js_msg . '" />';
}
$r .= '<th ' . $row_span . '>' . htmlspecialchars($index->getName()) . '</th>';
diff --git a/libraries/List.class.php b/libraries/List.class.php
old mode 100644
new mode 100755
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Message.class.php b/libraries/Message.class.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel.php b/libraries/PHPExcel/PHPExcel.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Autoloader.php b/libraries/PHPExcel/PHPExcel/Autoloader.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation.php b/libraries/PHPExcel/PHPExcel/Calculation.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Exception.php b/libraries/PHPExcel/PHPExcel/Calculation/Exception.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php b/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Function.php b/libraries/PHPExcel/PHPExcel/Calculation/Function.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Functions.php b/libraries/PHPExcel/PHPExcel/Calculation/Functions.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt b/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell.php b/libraries/PHPExcel/PHPExcel/Cell.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataType.php b/libraries/PHPExcel/PHPExcel/Cell/DataType.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php b/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php b/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Comment.php b/libraries/PHPExcel/PHPExcel/Comment.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/DocumentProperties.php b/libraries/PHPExcel/PHPExcel/DocumentProperties.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/DocumentSecurity.php b/libraries/PHPExcel/PHPExcel/DocumentSecurity.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/HashTable.php b/libraries/PHPExcel/PHPExcel/HashTable.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/IComparable.php b/libraries/PHPExcel/PHPExcel/IComparable.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/IOFactory.php b/libraries/PHPExcel/PHPExcel/IOFactory.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/NamedRange.php b/libraries/PHPExcel/PHPExcel/NamedRange.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/CSV.php b/libraries/PHPExcel/PHPExcel/Reader/CSV.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php b/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReader.php b/libraries/PHPExcel/PHPExcel/Reader/IReader.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Reader/Serialized.php b/libraries/PHPExcel/PHPExcel/Reader/Serialized.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/ReferenceHelper.php b/libraries/PHPExcel/PHPExcel/ReferenceHelper.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/RichText.php b/libraries/PHPExcel/PHPExcel/RichText.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php b/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/RichText/Run.php b/libraries/PHPExcel/PHPExcel/RichText/Run.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/RichText/TextElement.php b/libraries/PHPExcel/PHPExcel/RichText/TextElement.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Date.php b/libraries/PHPExcel/PHPExcel/Shared/Date.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Drawing.php b/libraries/PHPExcel/PHPExcel/Shared/Drawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher.php b/libraries/PHPExcel/PHPExcel/Shared/Escher.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Excel5.php b/libraries/PHPExcel/PHPExcel/Shared/Excel5.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/File.php b/libraries/PHPExcel/PHPExcel/Shared/File.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/Font.php b/libraries/PHPExcel/PHPExcel/Shared/Font.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT b/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE.php b/libraries/PHPExcel/PHPExcel/Shared/OLE.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLERead.php b/libraries/PHPExcel/PHPExcel/Shared/OLERead.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php b/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/String.php b/libraries/PHPExcel/PHPExcel/Shared/String.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php b/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php b/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style.php b/libraries/PHPExcel/PHPExcel/Style.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Alignment.php b/libraries/PHPExcel/PHPExcel/Style/Alignment.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Border.php b/libraries/PHPExcel/PHPExcel/Style/Border.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Borders.php b/libraries/PHPExcel/PHPExcel/Style/Borders.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Color.php b/libraries/PHPExcel/PHPExcel/Style/Color.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Conditional.php b/libraries/PHPExcel/PHPExcel/Style/Conditional.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Fill.php b/libraries/PHPExcel/PHPExcel/Style/Fill.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Font.php b/libraries/PHPExcel/PHPExcel/Style/Font.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php b/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Style/Protection.php b/libraries/PHPExcel/PHPExcel/Style/Protection.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet.php b/libraries/PHPExcel/PHPExcel/Worksheet.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php b/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Row.php b/libraries/PHPExcel/PHPExcel/Worksheet/Row.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php b/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/WorksheetIterator.php b/libraries/PHPExcel/PHPExcel/WorksheetIterator.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/CSV.php b/libraries/PHPExcel/PHPExcel/Writer/CSV.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/HTML.php b/libraries/PHPExcel/PHPExcel/Writer/HTML.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/IWriter.php b/libraries/PHPExcel/PHPExcel/Writer/IWriter.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/PDF.php b/libraries/PHPExcel/PHPExcel/Writer/PDF.php
old mode 100644
new mode 100755
diff --git a/libraries/PHPExcel/PHPExcel/Writer/Serialized.php b/libraries/PHPExcel/PHPExcel/Writer/Serialized.php
old mode 100644
new mode 100755
diff --git a/libraries/PMA.php b/libraries/PMA.php
old mode 100644
new mode 100755
diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php
old mode 100644
new mode 100755
diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
old mode 100644
new mode 100755
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/swekey/authentication.inc.php b/libraries/auth/swekey/authentication.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/swekey/musbe-ca.crt b/libraries/auth/swekey/musbe-ca.crt
old mode 100644
new mode 100755
diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php
old mode 100644
new mode 100755
diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/blowfish.php b/libraries/blowfish.php
old mode 100644
new mode 100755
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
old mode 100644
new mode 100755
index ab22f17..b01a6ee
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -540,6 +540,10 @@ $GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js';
$GLOBALS['js_include'][] = 'update-location.js';
/**
+ * Add common jQuery functions script here if necessary.
+ */
+
+/**
* JavaScript events that will be registered
* @global array $js_events
*/
@@ -967,6 +971,33 @@ $GLOBALS['PMA_Config']->set('default_server', '');
/* Tell tracker that it can actually work */
PMA_Tracker::enable();
+/**
+ * @global boolean $GLOBALS['is_ajax_request']
+ * @todo should this be moved to the variables init section above?
+ *
+ * Check if the current request is an AJAX request, and set is_ajax_request
+ * accordingly. Suppress headers, footers and unnecessary output if set to
+ * true
+ */
+if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
+ $GLOBALS['is_ajax_request'] = true;
+} else {
+ $GLOBALS['is_ajax_request'] = false;
+}
+
+/**
+ * @global boolean $GLOBALS['inline_edit']
+ *
+ * Set to true if this is a request made during an inline edit process. This
+ * request is made to retrieve the non-truncated/transformed values.
+ */
+if(isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) {
+ $GLOBALS['inline_edit'] = true;
+}
+else {
+ $GLOBALS['inline_edit'] = false;
+}
+
if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) {
/**
* include subform target page
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
old mode 100644
new mode 100755
index dd7f40a..665298b
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -662,11 +662,16 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
$error_msg_output .= '</fieldset>' . "\n\n";
}
- echo $error_msg_output;
- /**
- * display footer and exit
- */
-
+ /**
+ * If in an Ajax request, don't just echo and exit. Use PMA_ajaxResponse()
+ */
+ if($GLOBALS['is_ajax_request'] == true) {
+ PMA_ajaxResponse($error_msg_output, false);
+ }
+ echo $error_msg_output;
+ /**
+ * display footer and exit
+ */
require './libraries/footer.inc.php';
} else {
echo $error_msg_output;
@@ -937,6 +942,15 @@ if (!$jsonly)
*/
function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false)
{
+ /*
+ * PMA_ajaxResponse uses this function to collect the string of HTML generated
+ * for showing the message. Use output buffering to collect it and return it
+ * in a string. In some special cases on sql.php, buffering has to be disabled
+ * and hence we check with $GLOBALS['buffer_message']
+ */
+ if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) {
+ ob_start();
+ }
global $cfg;
if (null === $sql_query) {
@@ -975,7 +989,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
}
unset($tbl_status);
- echo '<div align="' . $GLOBALS['cell_align_left'] . '">' . "\n";
+ // In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence,
+ // check for it's presence before using it
+ echo '<div align="' . ( isset($GLOBALS['cell_align_left']) ? $GLOBALS['cell_align_left'] : '' ) . '">' . "\n";
if ($message instanceof PMA_Message) {
if (isset($GLOBALS['special_message'])) {
@@ -1211,9 +1227,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
}
// see in js/functions.js the jQuery code attached to id inline_edit
+ // document.write conflicts with jQuery, hence used $().append()
$inline_edit = "<script type=\"text/javascript\">\n" .
"//<![CDATA[\n" .
- "document.write('[<a href=\"#\" title=\"" .
+ "$('.tools').append('[<a href=\"#\" title=\"" .
PMA_escapeJsString(__('Inline edit of this query')) .
"\" id=\"inline_edit\">" .
PMA_escapeJsString(__('Inline')) .
@@ -1224,6 +1241,15 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
echo '</div>';
}
echo '</div><br />' . "\n";
+
+ // If we are in an Ajax request, we have most probably been called in
+ // PMA_ajaxResponse(). Hence, collect the buffer contents and return it
+ // to PMA_ajaxResponse(), which will encode it for JSON.
+ if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) {
+ $buffer_contents = ob_get_contents();
+ ob_end_clean();
+ return $buffer_contents;
+ }
} // end of the 'PMA_showMessage()' function
/**
@@ -1595,6 +1621,7 @@ function PMA_generate_html_tab($tab, $url_params = array())
'args' => '',
'warning' => '',
'fragment' => '',
+ 'id' => '',
);
$tab = array_merge($defaults, $tab);
@@ -1657,14 +1684,17 @@ function PMA_generate_html_tab($tab, $url_params = array())
E_USER_NOTICE);
}
+ //Set the id for the tab, if set in the params
+ $id_string = ( empty($tab['id']) ? '' : ' id="'.$tab['id'].'" ' );
$out = '<li' . ($tab['class'] == 'active' ? ' class="active"' : '') . '>';
if (!empty($tab['link'])) {
$out .= '<a class="tab' . htmlentities($tab['class']) . '"'
+ .$id_string
.' href="' . $tab['link'] . '" ' . $tab['attr'] . '>'
. $tab['text'] . '</a>';
} else {
- $out .= '<span class="tab' . htmlentities($tab['class']) . '">'
+ $out .= '<span class="tab' . htmlentities($tab['class']) . '"'.$id_string.'>'
. $tab['text'] . '</span>';
}
@@ -2170,8 +2200,7 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
$pageNowPlusRange = ($pageNow + $range);
$gotopage = $prompt
- . ' <select name="pos" onchange="goToUrl(this, \''
- . $url . '\');">' . "\n";
+ . ' <select id="pageselector" name="pos" >' . "\n";
if ($nbTotalPage < $showAll) {
$pages = range(1, $nbTotalPage);
} else {
@@ -2483,10 +2512,17 @@ function PMA_generate_slider_effect($id, $message)
echo '<div id="' . $id . '">';
return;
}
+ /**
+ * Bad hack on the next line. document.write() conflicts with jQuery, hence,
+ * opening the <div> with PHP itself instead of JavaScript.
+ *
+ * @todo find a better solution that uses $.append(), the recommended method
+ * maybe by using an additional param, the id of the div to append to
+ */
?>
+<div id="<?php echo $id; ?>" <?php echo $GLOBALS['cfg']['InitialSlidersState'] == 'closed' ? ' style="display: none; overflow:auto;"' : ''; ?>>
<script type="text/javascript">
// <![CDATA[
- document.write('<div id="<?php echo $id; ?>" <?php echo $GLOBALS['cfg']['InitialSlidersState'] == 'closed' ? ' style="display: none; overflow:auto;"' : ''; ?>>');
function PMA_set_status_label_<?php echo $id; ?>() {
if ($('#<?php echo $id; ?>').css('display') == 'none') {
@@ -2856,6 +2892,52 @@ function PMA_expandUserString($string, $escape = NULL, $updates = array()) {
}
/**
+ * function that generates a json output for an ajax request and ends script
+ * execution
+ *
+ * @param boolean success whether the ajax request was successfull
+ * @param string message string containing the html of the message
+ * @param array extra_data optional - any other data as part of the json request
+ *
+ * @uses header()
+ * @uses json_encode()
+ */
+function PMA_ajaxResponse($message, $success = true, $extra_data = array())
+{
+ $response = array();
+ if( $success == true ) {
+ $response['success'] = true;
+ if ($message instanceof PMA_Message) {
+ $response['message'] = $message->getDisplay();
+ }
+ else {
+ $response['message'] = $message;
+ }
+ }
+ else {
+ $response['success'] = false;
+ if($message instanceof PMA_Message) {
+ $response['error'] = $message->getDisplay();
+ }
+ else {
+ $response['error'] = $message;
+ }
+ }
+
+ // If extra_data has been provided, append it to the response array
+ if( count($extra_data) > 0 ) {
+ $response = array_merge($response, $extra_data);
+ }
+
+ // Set the Content-Type header to JSON so that jQuery parses the response correctly
+ if(!isset($GLOBALS['is_header_sent'])) {
+ header("Content-Type: application/json");
+ }
+ echo json_encode($response);
+ exit;
+}
+
+/**
* Display the form used to browse anywhere on the local server for the file to import
*/
function PMA_browseUploadFile($max_upload_size) {
diff --git a/libraries/config.default.php b/libraries/config.default.php
old mode 100644
new mode 100755
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
old mode 100644
new mode 100755
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
old mode 100644
new mode 100755
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
old mode 100644
new mode 100755
index ea019cb..4682122
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -63,6 +63,15 @@ if (isset($submitcollation) && !empty($db_collation)) {
$result = PMA_DBI_query($sql_query);
$message = PMA_Message::success();
unset($db_charset, $db_collation);
+
+ /**
+ * If we are in an Ajax request, let us stop the execution here. Necessary for
+ * db charset change action on db_operations.php. If this causes a bug on
+ * other pages, we might have to move this to a different location.
+ */
+ if( $GLOBALS['is_ajax_request'] == true) {
+ PMA_ajaxResponse($message, $message->isSuccess());
+ };
}
require_once './libraries/header.inc.php';
diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php
old mode 100644
new mode 100755
index a72c7eb..8204770
--- a/libraries/db_events.inc.php
+++ b/libraries/db_events.inc.php
@@ -50,7 +50,7 @@ if ($events) {
($ct%2 == 0) ? 'even' : 'odd',
$event['EVENT_NAME'],
! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ',
- '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>',
+ '<a class="drop_event_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" >' . $titles['Drop'] . '</a>',
$event['EVENT_TYPE']);
$ct++;
}
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
old mode 100644
new mode 100755
index c51b247..d8610f2
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -270,6 +270,9 @@ unset($each_table, $tbl_group_sql, $db_info_result);
/**
* Displays top menu links
+ * If in an Ajax request, we do not need to show this
*/
-require './libraries/db_links.inc.php';
+if($GLOBALS['is_ajax_request'] != true) {
+ require './libraries/db_links.inc.php';
+}
?>
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php
old mode 100644
new mode 100755
index 8af2197..d523e2d
--- a/libraries/db_routines.inc.php
+++ b/libraries/db_routines.inc.php
@@ -75,13 +75,15 @@ if ($routines) {
<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <input type="hidden" class="drop_procedure_sql" value="%s" />
</tr>',
($ct%2 == 0) ? 'even' : 'odd',
$routine['ROUTINE_NAME'],
! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ',
- '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDropProc) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDropProc, false) . '\')">' . $titles['Drop'] . '</a>',
+ '<a class="drop_procedure_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDropProc) . '" >' . $titles['Drop'] . '</a>',
$routine['ROUTINE_TYPE'],
- $routine['DTD_IDENTIFIER']);
+ $routine['DTD_IDENTIFIER'],
+ $sqlDropProc);
$ct++;
}
echo '</table>';
diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php
old mode 100644
new mode 100755
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
old mode 100644
new mode 100755
index 43a61f6..e7bdad2
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -19,7 +19,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
// Displays the form
?>
-<form method="post" action="<?php echo $GLOBALS['PMA_PHP_SELF']; ?>" name="chgPassword" onsubmit="return checkPassword(this)">
+<form method="post" id="change_password_form" action="<?php echo $GLOBALS['PMA_PHP_SELF']; ?>" name="chgPassword" onsubmit="return checkPassword(this)">
<?php echo PMA_generate_common_hidden_inputs();
if (strpos($GLOBALS['PMA_PHP_SELF'], 'server_privileges') !== false) {
echo '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
old mode 100644
new mode 100755
index f348f3c..e6caec5
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -17,7 +17,7 @@ require_once './libraries/check_user_privileges.lib.php';
if ($is_create_db_priv) {
// The user is allowed to create a db
?>
- <form method="post" action="db_create.php"><strong>
+ <form method="post" action="db_create.php" id="create_database_form" ><strong>
<?php echo '<label for="text_create_db">' . __('Create new database') . '</label> ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
<?php echo PMA_generate_common_hidden_inputs('', '', 5); ?>
<input type="hidden" name="reload" value="1" />
diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
old mode 100644
new mode 100755
index 57a5606..962632c
--- a/libraries/display_create_table.lib.php
+++ b/libraries/display_create_table.lib.php
@@ -36,8 +36,7 @@ require_once './libraries/check_user_privileges.lib.php';
$is_create_table_priv = true;
?>
-<form method="post" action="tbl_create.php"
- onsubmit="return (emptyFormElements(this, 'table') && checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', __('Table must have at least one column.')); ?>', 1))">
+<form id="create_table_form_minimal" method="post" action="tbl_create.php">
<fieldset>
<legend>
<?php
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
old mode 100644
new mode 100755
index 0deed6e..26144e0
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -339,9 +339,9 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
// prepare some options for the End button
if ($is_innodb && $unlim_num_rows > $GLOBALS['cfg']['MaxExactCount']) {
- $input_for_real_end = '<input type="hidden" name="find_real_end" value="1" />';
+ $input_for_real_end = '<input id="real_end_input" type="hidden" name="find_real_end" value="1" />';
// no backquote around this message
- $onclick = ' onclick="return confirmAction(\'' . PMA_jsFormat(__('This operation could take a long time. Proceed anyway?'), false) . '\')"';
+ $onclick = '';
} else {
$input_for_real_end = $onclick = '';
}
@@ -1031,6 +1031,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$vertical_display['delete'] = array();
$vertical_display['data'] = array();
$vertical_display['row_delete'] = array();
+ // name of the class added to all inline editable elements
+ $data_inline_edit_class = 'data_inline_edit';
// Correction University of Virginia 19991216 in the while below
// Previous code assumed that all tables have keys, specifically that
@@ -1074,7 +1076,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
// pointer code part
echo ' <tr class="' . $class . '">' . "\n";
- $class = '';
+ $class = $data_inline_edit_class;
}
@@ -1113,6 +1115,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$edit_url = 'tbl_change.php' . PMA_generate_common_url($_url_params);
$edit_str = PMA_getIcon('b_edit.png', __('Edit'), true);
+
+ // Class definitions required for inline editing jQuery scripts
+ $edit_anchor_class = "edit_row_anchor";
+ if( $clause_is_unique == 0) {
+ $edit_anchor_class .= ' nonunique';
+ }
} // end if (1.2.1)
if (isset($GLOBALS['cfg']['Bookmark']['table']) && isset($GLOBALS['cfg']['Bookmark']['db']) && $table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db'] && isset($row[1]) && isset($row[0])) {
@@ -1195,6 +1203,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
for ($i = 0; $i < $fields_cnt; ++$i) {
$meta = $fields_meta[$i];
$pointer = $i;
+ $is_field_truncated = false;
+ //If this column's value is null, add the null class to it, needed
+ //for inline editing
+ if(is_null($row[$i])) {
+ $class .= ' null';
+ }
+
// See if this column should get highlight because it's used in the
// where-query.
if (isset($highlight_columns) && (isset($highlight_columns[$meta->name]) || isset($highlight_columns[PMA_backquote($meta->name)]))) {
@@ -1268,7 +1283,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$nowrap = ' nowrap';
$where_comparison = ' = ' . $row[$i];
- $vertical_display['data'][$row_no][$i] = '<td align="right"' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options);
+ $vertical_display['data'][$row_no][$i] = '<td align="right"' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated);
} else {
$vertical_display['data'][$row_no][$i] = ' <td align="right"' . $mouse_events . ' class="' . $class . ' nowrap' . ($condition_field ? ' condition' : '') . '"> </td>' . "\n";
}
@@ -1279,6 +1294,10 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// PMA_mysql_fetch_fields returns BLOB in place of
// TEXT fields type so we have to ensure it's really a BLOB
$field_flags = PMA_DBI_field_flags($dt_result, $i);
+
+ // reset $class from $data_inline_edit_class to '' as we can't edit binary data
+ $class = '';
+
if (stristr($field_flags, 'BINARY')) {
if (!isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = ' <td align="right"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n";
@@ -1302,6 +1321,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// if a transform function for blob is set, none of these replacements will be made
if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') {
$row[$i] = PMA_substr($row[$i], 0, $GLOBALS['cfg']['LimitChars']) . '...';
+ $is_field_truncated = true;
}
// displays all space characters, 4 space
// characters for tabulations and <cr>/<lf>
@@ -1324,6 +1344,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// (unless it's a link-type transformation)
if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P' && !strpos($transform_function, 'link') === true) {
$row[$i] = PMA_substr($row[$i], 0, $GLOBALS['cfg']['LimitChars']) . '...';
+ $is_field_truncated = true;
}
// displays special characters from binaries
@@ -1356,7 +1377,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// do not wrap if date field type
$nowrap = ((preg_match('@DATE|TIME@i', $meta->type) || $bool_nowrap) ? ' nowrap' : '');
$where_comparison = ' = \'' . PMA_sqlAddslashes($row[$i]) . '\'';
- $vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options);
+ $vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated);
} else {
$vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"> </td>' . "\n";
@@ -1397,6 +1418,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$vertical_display['edit'][$row_no] = '';
$vertical_display['delete'][$row_no] = '';
$vertical_display['row_delete'][$row_no] = '';
+ $vertical_display['where_clause'][$row_no] = '';
}
$column_style_vertical = '';
@@ -1420,7 +1442,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
}
if (isset($edit_url)) {
- $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $class . '" ' . $column_style_vertical . '>' . "\n"
+ $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, array(), false)
. $bookmark_go
. ' </td>' . "\n";
@@ -1436,6 +1458,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
unset($vertical_display['delete'][$row_no]);
}
+ if( !empty($where_clause) ) {
+ $vertical_display['where_clause'][$row_no] = '<input type="hidden" class="where_clause" value ="' . $where_clause . '" />';
+ }
+ else {
+ unset($vertical_display['where_clause'][$row_no]);
+ }
+
echo (($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') ? "\n" : '');
$row_no++;
} // end while
@@ -1515,6 +1544,22 @@ function PMA_displayVerticalTable()
echo '</tr>' . "\n";
} // end if
+ // Generates the 'where_clause' hidden input field for inline ajax edit if required
+ if ( is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 ) ) {
+ echo '<tr>' . "\n";
+
+ $foo_counter = 0;
+ foreach ($vertical_display['where_clause'] as $val) {
+ if (($foo_counter != 0) && ($_SESSION['tmp_user_values']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['tmp_user_values']['repeat_cells'])) {
+ echo '<th></th>' . "\n";
+ }
+
+ echo $val;
+ $foo_counter++;
+ } // end while
+ echo '</tr>' . "\n";
+ } // end if
+
// Displays data
foreach ($vertical_display['desc'] AS $key => $val) {
@@ -2288,12 +2333,28 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
* @param string $default_function
* @param string $nowrap
* @param string $where_comparison
+ * @param bool $is_field_truncated
* @return string formatted data
*/
-function PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $data, $transform_function, $default_function, $nowrap, $where_comparison, $transform_options) {
+function PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $data, $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated ) {
+
+ // Define classes to be added to this data field based on the type of data
+ $enum_class = '';
+ if(strpos($meta->flags, 'enum') !== false) {
+ $enum_class = ' enum';
+ }
+
+ $mime_type_class = '';
+ if(isset($meta->mimetype)) {
+ $mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype);
+ }
// continue the <td> tag started before calling this function:
- $result = $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . $nowrap . '">';
+ $result = $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . $nowrap
+ . ' ' . ($is_field_truncated ? ' truncated' : '')
+ . ($transform_function != $default_function ? ' transformed' : '')
+ . (isset($map[$meta->name]) ? ' relation' : '')
+ . $enum_class . $mime_type_class . '">';
if (isset($analyzed_sql[0]['select_expr']) && is_array($analyzed_sql[0]['select_expr'])) {
foreach ($analyzed_sql[0]['select_expr'] AS $select_expr_position => $select_expr) {
diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php
old mode 100644
new mode 100755
index 442d53f..a8511fe
--- a/libraries/display_tbl_links.lib.php
+++ b/libraries/display_tbl_links.lib.php
@@ -26,7 +26,7 @@ if ($doWriteModifyAt == 'left') {
. ' </td>' . "\n";
}
if (!empty($edit_url)) {
- echo ' <td align="center">' . "\n"
+ echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, '', FALSE)
. $bookmark_go
. ' </td>' . "\n";
@@ -43,7 +43,7 @@ if ($doWriteModifyAt == 'left') {
. ' </td>' . "\n";
}
if (!empty($edit_url)) {
- echo ' <td align="center">' . "\n"
+ echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, '', FALSE)
. $bookmark_go
. ' </td>' . "\n";
@@ -56,4 +56,11 @@ if ($doWriteModifyAt == 'left') {
. ' </td>' . "\n";
}
}
+/*
+ * Where clause for selecting this row uniquely is provided as a hidden input.
+ * Used by jQuery scripts for handling inline editing
+ */
+if( !empty($where_clause)) {
+ echo '<input type="hidden" class="where_clause" value ="' . $where_clause . '" />';
+}
?>
diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
old mode 100644
new mode 100755
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
old mode 100644
new mode 100755
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
old mode 100644
new mode 100755
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
old mode 100644
new mode 100755
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
old mode 100644
new mode 100755
diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php
old mode 100644
new mode 100755
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
old mode 100644
new mode 100755
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
old mode 100644
new mode 100755
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
old mode 100644
new mode 100755
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
old mode 100644
new mode 100755
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
old mode 100644
new mode 100755
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
old mode 100644
new mode 100755
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
old mode 100644
new mode 100755
diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php
old mode 100644
new mode 100755
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
old mode 100644
new mode 100755
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
old mode 100644
new mode 100755
diff --git a/libraries/file_listing.php b/libraries/file_listing.php
old mode 100644
new mode 100755
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
old mode 100644
new mode 100755
index dfa7ab9..781154d
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -229,10 +229,16 @@ if (! empty($GLOBALS['cfg']['DBG']['php'])
*/
}
+/**
+ * If we are in an AJAX request, we do not need to generate the closing tags for
+ * body and html.
+ */
+if (! $GLOBALS['is_ajax_request']) {
?>
</body>
</html>
<?php
+}
/**
* Stops the script execution
*/
diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
old mode 100644
new mode 100755
index ea159a3..448f1c0
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -13,177 +13,173 @@ if (! defined('PHPMYADMIN')) {
*/
require_once './libraries/common.inc.php';
-if (empty($GLOBALS['is_header_sent'])) {
-
- /**
- * Gets a core script and starts output buffering work
- */
- require_once './libraries/ob.lib.php';
- PMA_outBufferPre();
-
- // if database storage for user preferences is transient, offer to load
- // exported settings from localStorage (detection will be done in JavaScript)
- $userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session'
- && !isset($_SESSION['userprefs_autoload']);
- if ($userprefs_offer_import) {
- $GLOBALS['js_include'][] = 'config.js';
- }
-
- // For re-usability, moved http-headers and stylesheets
- // to a seperate file. It can now be included by header.inc.php,
- // querywindow.php.
-
- require_once './libraries/header_http.inc.php';
- require_once './libraries/header_meta_style.inc.php';
- require_once './libraries/header_scripts.inc.php';
- ?>
- <meta name="OBGZip" content="<?php echo ($GLOBALS['cfg']['OBGzip'] ? 'true' : 'false'); ?>" />
- <?php /* remove vertical scroll bar bug in ie */ ?>
- <!--[if IE 6]>
- <style type="text/css">
- /* <![CDATA[ */
- html {
- overflow-y: scroll;
- }
- /* ]]> */
- </style>
- <![endif]-->
-</head>
-
-<body>
- <?php
-
- // Include possible custom headers
- if (file_exists(CUSTOM_HEADER_FILE)) {
- require CUSTOM_HEADER_FILE;
- }
-
-
- // message of "Cookies required" displayed for auth_type http or config
- // note: here, the decoration won't work because without cookies,
- // our standard CSS is not operational
- if (empty($_COOKIE)) {
- PMA_Message::notice(__('Cookies must be enabled past this point.'))->display();
- }
-
- // offer to load user preferences from localStorage
- if ($userprefs_offer_import) {
- require_once './libraries/user_preferences.lib.php';
- PMA_userprefs_autoload_header();
- }
-
- if (!defined('PMA_DISPLAY_HEADING')) {
- define('PMA_DISPLAY_HEADING', 1);
- }
-
- /**
- * Display heading if needed. Design can be set in css file.
- */
-
- if (PMA_DISPLAY_HEADING && $GLOBALS['server'] > 0) {
- $server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
- ? $GLOBALS['cfg']['Server']['verbose']
- : $GLOBALS['cfg']['Server']['host'] . (empty($GLOBALS['cfg']['Server']['port'])
- ? ''
- : ':' . $GLOBALS['cfg']['Server']['port']
- )
- );
- $item = '<a href="%1$s?%2$s" class="item">';
- if ($GLOBALS['cfg']['NavigationBarIconic']) {
- $separator = ' <span class="separator"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'item_ltr.png" width="5" height="9" alt="-" /></span>' . "\n";
- $item .= ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . '%5$s" width="16" height="16" alt="" /> ' . "\n";
- } else {
- $separator = ' <span class="separator"> - </span>' . "\n";
+
+/**
+ * If this is an Ajax request, we do not need to generate all this output.
+ */
+if (!$GLOBALS['is_ajax_request']) {
+
+ if (empty($GLOBALS['is_header_sent'])) {
+
+ /**
+ * Gets a core script and starts output buffering work
+ */
+ require_once './libraries/ob.lib.php';
+ PMA_outBufferPre();
+
+ // if database storage for user preferences is transient, offer to load
+ // exported settings from localStorage (detection will be done in JavaScript)
+ $userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session'
+ && !isset($_SESSION['userprefs_autoload']);
+ if ($userprefs_offer_import) {
+ $GLOBALS['js_include'][] = 'config.js';
}
- if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
- $item .= '%4$s: ';
+ // For re-usability, moved http-headers and stylesheets
+ // to a seperate file. It can now be included by header.inc.php,
+ // querywindow.php.
+
+ require_once './libraries/header_http.inc.php';
+ require_once './libraries/header_meta_style.inc.php';
+ require_once './libraries/header_scripts.inc.php';
+ ?>
+ <meta name="OBGZip" content="<?php echo ($GLOBALS['cfg']['OBGzip'] ? 'true' : 'false'); ?>" />
+ <?php /* remove vertical scroll bar bug in ie */ ?>
+ <!--[if IE 6]>
+ <style type="text/css">
+ /* <![CDATA[ */
+ html {
+ overflow-y: scroll;
}
- $item .= '%3$s</a>' . "\n";
-
- echo '<div id="serverinfo">' . "\n";
- printf($item,
- $GLOBALS['cfg']['DefaultTabServer'],
- PMA_generate_common_url(),
- htmlspecialchars($server_info),
- __('Server'),
- 's_host.png');
-
- if (strlen($GLOBALS['db'])) {
-
- echo $separator;
- printf($item,
- $GLOBALS['cfg']['DefaultTabDatabase'],
- PMA_generate_common_url($GLOBALS['db']),
- htmlspecialchars($GLOBALS['db']),
- __('Database'),
- 's_db.png');
-
- if (isset($GLOBALS['action']) && $GLOBALS['action'] == 'tbl_create.php') {
- /* We're creating a new table */
- echo $separator;
- printf($item,
- $action,
- PMA_generate_common_url($GLOBALS['db']),
- __('New table'),
- '',
- 's_tbl.png');
- // if the table is being dropped, $_REQUEST['purge'] is set
- // (it always contains "1")
- // so do not display the table name in upper div
- } elseif (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) {
- require_once './libraries/tbl_info.inc.php';
-
- echo $separator;
- printf($item,
- $GLOBALS['cfg']['DefaultTabTable'],
- PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']),
- str_replace(' ', ' ', htmlspecialchars($GLOBALS['table'])),
- (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')),
- (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png');
-
- /**
- * Displays table comment
- * @uses $show_comment from libraries/tbl_info.inc.php
- * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php
- */
- if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) {
- if (strstr($show_comment, '; InnoDB free')) {
- $show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment);
- }
- echo '<span class="table_comment" id="span_table_comment">'
- .'"' . htmlspecialchars($show_comment)
- .'"</span>' . "\n";
- } // end if
+ /* ]]> */
+ </style>
+ <![endif]-->
+ </head>
+
+ <body>
+ <?php
+
+ // Include possible custom headers
+ if (file_exists(CUSTOM_HEADER_FILE)) {
+ require CUSTOM_HEADER_FILE;
+ }
+
+
+ // message of "Cookies required" displayed for auth_type http or config
+ // note: here, the decoration won't work because without cookies,
+ // our standard CSS is not operational
+ if (empty($_COOKIE)) {
+ PMA_Message::notice(__('Cookies must be enabled past this point.'))->display();
+ }
+
+ // offer to load user preferences from localStorage
+ if ($userprefs_offer_import) {
+ require_once './libraries/user_preferences.lib.php';
+ PMA_userprefs_autoload_header();
+ }
+
+ if (!defined('PMA_DISPLAY_HEADING')) {
+ define('PMA_DISPLAY_HEADING', 1);
+ }
+
+ /**
+ * Display heading if needed. Design can be set in css file.
+ */
+
+ if (PMA_DISPLAY_HEADING && $GLOBALS['server'] > 0) {
+ $server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
+ ? $GLOBALS['cfg']['Server']['verbose']
+ : $GLOBALS['cfg']['Server']['host'] . (empty($GLOBALS['cfg']['Server']['port'])
+ ? ''
+ : ':' . $GLOBALS['cfg']['Server']['port']
+ )
+ );
+ $item = '<a href="%1$s?%2$s" class="item">';
+ if ($GLOBALS['cfg']['NavigationBarIconic']) {
+ $separator = ' <span class="separator"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'item_ltr.png" width="5" height="9" alt="-" /></span>' . "\n";
+ $item .= ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . '%5$s" width="16" height="16" alt="" /> ' . "\n";
} else {
- // no table selected, display database comment if present
- /**
- * Settings for relations stuff
- */
- $cfgRelation = PMA_getRelationsParam();
-
- // Get additional information about tables for tooltip is done
- // in libraries/db_info.inc.php only once
- if ($cfgRelation['commwork']) {
- $comment = PMA_getDbComment($GLOBALS['db']);
+ $separator = ' <span class="separator"> - </span>' . "\n";
+ }
+
+ if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
+ $item .= '%4$s: ';
+ }
+ $item .= '%3$s</a>' . "\n";
+
+ echo '<div id="serverinfo">' . "\n";
+ printf($item,
+ $GLOBALS['cfg']['DefaultTabServer'],
+ PMA_generate_common_url(),
+ htmlspecialchars($server_info),
+
__('Server'),
+ 's_host.png');
+
+ if (strlen($GLOBALS['db'])) {
+
+ echo $separator;
+ printf($item,
+ $GLOBALS['cfg']['DefaultTabDatabase'],
+ PMA_generate_common_url($GLOBALS['db']),
+ $GLOBALS['db'],
+ '',
+ 's_tbl.png');
+ // if the table is being dropped, $_REQUEST['purge'] is set
+ // (it always contains "1")
+ // so do not display the table name in upper div
+ } elseif (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) {
+ require_once './libraries/tbl_info.inc.php';
+
+ echo $separator;
+ printf($item,
+ $GLOBALS['cfg']['DefaultTabTable'],
+ PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']),
+ str_replace(' ', ' ', htmlspecialchars($GLOBALS['table'])),
+ (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')),
+ (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png');
+
/**
* Displays table comment
+ * @uses $show_comment from libraries/tbl_info.inc.php
+ * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php
*/
- if (! empty($comment)) {
- echo '<span class="table_comment"'
- . ' id="span_table_comment">"'
- . htmlspecialchars($comment)
- . '"</span>' . "\n";
+ if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) {
+ if (strstr($show_comment, '; InnoDB free')) {
+ $show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment);
+ }
+ echo '<span class="table_comment" id="span_table_comment">'
+ .'"' . htmlspecialchars($show_comment)
+ .'"</span>' . "\n";
} // end if
+ } else {
+ // no table selected, display database comment if present
+ /**
+ * Settings for relations stuff
+ */
+ require_once './libraries/relation.lib.php';
+ $cfgRelation = PMA_getRelationsParam();
+
+ // Get additional information about tables for tooltip is done
+ // in libraries/db_info.inc.php only once
+ if ($cfgRelation['commwork']) {
+ $comment = PMA_getDbComment($GLOBALS['db']);
+ /**
+ * Displays table comment
+ */
+ if (! empty($comment)) {
+ echo '<span class="table_comment"'
+ . ' id="span_table_comment">"'
+ . htmlspecialchars($comment)
+ . '"</span>' . "\n";
+ } // end if
+ }
}
}
+ echo '</div>';
}
- echo '</div>';
-
- }
- /**
- * Sets a variable to remember headers have been sent
- */
- $GLOBALS['is_header_sent'] = true;
-}
+ /**
+ * Sets a variable to remember headers have been sent
+ */
+ $GLOBALS['is_header_sent'] = true;
+} //end if(!$GLOBALS['is_ajax_request'])
?>
diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/import/README b/libraries/import/README
old mode 100644
new mode 100755
diff --git a/libraries/import/csv.php b/libraries/import/csv.php
old mode 100644
new mode 100755
diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php
old mode 100644
new mode 100755
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
old mode 100644
new mode 100755
diff --git a/libraries/import/ods.php b/libraries/import/ods.php
old mode 100644
new mode 100755
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
old mode 100644
new mode 100755
diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php
old mode 100644
new mode 100755
diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php
old mode 100644
new mode 100755
diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php
old mode 100644
new mode 100755
diff --git a/libraries/import/xls.php b/libraries/import/xls.php
old mode 100644
new mode 100755
diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php
old mode 100644
new mode 100755
diff --git a/libraries/import/xml.php b/libraries/import/xml.php
old mode 100644
new mode 100755
diff --git a/libraries/information_schema_relations.lib.php b/libraries/information_schema_relations.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/php-gettext/gettext.inc b/libraries/php-gettext/gettext.inc
old mode 100644
new mode 100755
diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php
old mode 100644
new mode 100755
diff --git a/libraries/php-gettext/streams.php b/libraries/php-gettext/streams.php
old mode 100644
new mode 100755
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
old mode 100644
new mode 100755
index 5cd7a67..8196269
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -16,98 +16,101 @@ require_once './libraries/server_common.inc.php';
PMA_checkParameters(array('is_superuser', 'url_query'), TRUE, FALSE);
-/**
- * Counts amount of navigation tabs
- */
-$server_links_count_tabs = 0;
-
-
-/**
- * Put something in $sub_part
- */
-if (!isset($sub_part)) {
- $sub_part = '';
-}
-
-
-/**
- * Displays tab links
- */
-$tabs = array();
-
-$tabs['databases']['icon'] = 's_db.png';
-$tabs['databases']['link'] = 'server_databases.php';
-$tabs['databases']['text'] = __('Databases');
-
-$tabs['sql']['icon'] = 'b_sql.png';
-$tabs['sql']['link'] = 'server_sql.php';
-$tabs['sql']['text'] = __('SQL');
-
-$tabs['status']['icon'] = 's_status.png';
-$tabs['status']['link'] = 'server_status.php';
-$tabs['status']['text'] = __('Status');
-
-if (! empty($binary_logs)) {
- $tabs['binlog']['icon'] = 's_tbl.png';
- $tabs['binlog']['link'] = 'server_binlog.php';
- $tabs['binlog']['text'] = __('Binary log');
-}
-$tabs['process']['icon'] = 's_process.png';
-$tabs['process']['link'] = 'server_processlist.php';
-$tabs['process']['text'] = __('Processes');
-
-if ($is_superuser) {
- $tabs['rights']['icon'] = 's_rights.png';
- $tabs['rights']['link'] = 'server_privileges.php';
- $tabs['rights']['text'] = __('Privileges');
-}
-
-$tabs['export']['icon'] = 'b_export.png';
-$tabs['export']['link'] = 'server_export.php';
-$tabs['export']['text'] = __('Export');
-
-$tabs['import']['icon'] = 'b_import.png';
-$tabs['import']['link'] = 'server_import.php';
-$tabs['import']['text'] = __('Import');
-
-$tabs['vars']['icon'] = 's_vars.png';
-$tabs['vars']['link'] = 'server_variables.php';
-$tabs['vars']['text'] = __('Variables');
-
-$tabs['charset']['icon'] = 's_asci.png';
-$tabs['charset']['link'] = 'server_collations.php';
-$tabs['charset']['text'] = __('Charsets');
-
-$tabs['engine']['icon'] = 'b_engine.png';
-$tabs['engine']['link'] = 'server_engines.php';
-$tabs['engine']['text'] = __('Engines');
-
-if ($is_superuser) {
- $tabs['replication']['icon'] = 's_replication.png';
- $tabs['replication']['link'] = 'server_replication.php';
- $tabs['replication']['text'] = __('Replication');
-}
-
-$tabs['synchronize']['icon'] = 's_sync.png';
-$tabs['synchronize']['link'] = 'server_synchronize.php';
-$tabs['synchronize']['text'] = __('Synchronize');
-
-$tabs['settings']['icon'] = 'b_tblops.png';
-$tabs['settings']['link'] = 'prefs_manage.php';
-$tabs['settings']['text'] = __('Settings');
-$tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']),
- array('prefs_forms.php', 'prefs_manage.php'));
-
-echo PMA_generate_html_tabs($tabs, array());
-unset($tabs);
-
-
-/**
- * Displays a message
- */
-if (!empty($message)) {
- PMA_showMessage($message);
- unset($message);
-}
-
+// Don't print all these links if in an Ajax request
+if (!$GLOBALS['is_ajax_request']) {
+ /**
+ * Counts amount of navigation tabs
+ */
+ $server_links_count_tabs = 0;
+
+
+ /**
+ * Put something in $sub_part
+ */
+ if (!isset($sub_part)) {
+ $sub_part = '';
+ }
+
+
+ /**
+ * Displays tab links
+ */
+ $tabs = array();
+
+ $tabs['databases']['icon'] = 's_db.png';
+ $tabs['databases']['link'] = 'server_databases.php';
+ $tabs['databases']['text'] = __('Databases');
+
+ $tabs['sql']['icon'] = 'b_sql.png';
+ $tabs['sql']['link'] = 'server_sql.php';
+ $tabs['sql']['text'] = __('SQL');
+
+ $tabs['status']['icon'] = 's_status.png';
+ $tabs['status']['link'] = 'server_status.php';
+ $tabs['status']['text'] = __('Status');
+
+ if (! empty($binary_logs)) {
+ $tabs['binlog']['icon'] = 's_tbl.png';
+ $tabs['binlog']['link'] = 'server_binlog.php';
+ $tabs['binlog']['text'] = __('Binary log');
+ }
+ $tabs['process']['icon'] = 's_process.png';
+ $tabs['process']['link'] = 'server_processlist.php';
+ $tabs['process']['text'] = __('Processes');
+
+ if ($is_superuser) {
+ $tabs['rights']['icon'] = 's_rights.png';
+ $tabs['rights']['link'] = 'server_privileges.php';
+ $tabs['rights']['text'] = __('Privileges');
+ }
+
+ $tabs['export']['icon'] = 'b_export.png';
+ $tabs['export']['link'] = 'server_export.php';
+ $tabs['export']['text'] = __('Export');
+
+ $tabs['import']['icon'] = 'b_import.png';
+ $tabs['import']['link'] = 'server_import.php';
+ $tabs['import']['text'] = __('Import');
+
+ $tabs['vars']['icon'] = 's_vars.png';
+ $tabs['vars']['link'] = 'server_variables.php';
+ $tabs['vars']['text'] = __('Variables');
+
+ $tabs['charset']['icon'] = 's_asci.png';
+ $tabs['charset']['link'] = 'server_collations.php';
+ $tabs['charset']['text'] = __('Charsets');
+
+ $tabs['engine']['icon'] = 'b_engine.png';
+ $tabs['engine']['link'] = 'server_engines.php';
+ $tabs['engine']['text'] = __('Engines');
+
+ if ($is_superuser) {
+ $tabs['replication']['icon'] = 's_replication.png';
+ $tabs['replication']['link'] = 'server_replication.php';
+ $tabs['replication']['text'] = __('Replication');
+ }
+
+ $tabs['synchronize']['icon'] = 's_sync.png';
+ $tabs['synchronize']['link'] = 'server_synchronize.php';
+ $tabs['synchronize']['text'] = __('Synchronize');
+
+ $tabs['settings']['icon'] = 'b_tblops.png';
+ $tabs['settings']['link'] = 'prefs_manage.php';
+ $tabs['settings']['text'] = __('Settings');
+ $tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']),
+ array('prefs_forms.php', 'prefs_manage.php'));
+
+ echo PMA_generate_html_tabs($tabs, array());
+ unset($tabs);
+
+
+
+ /**
+ * Displays a message
+ */
+ if (!empty($message)) {
+ PMA_showMessage($message);
+ unset($message);
+ }
+}// end if($GLOBALS['is_ajax_request'] == true)
?>
diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
old mode 100644
new mode 100755
index d938699..8ac7c1c
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -171,6 +171,9 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
</script>
<?php
}
+
+ // print an empty div, which will be later filled with the sql query results by ajax
+ echo '<div id="sqlqueryresults"></div>';
}
/**
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
old mode 100644
new mode 100755
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
old mode 100644
new mode 100755
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php
old mode 100644
new mode 100755
diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
old mode 100644
new mode 100755
index 845f752..8a7b9ea
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -610,7 +610,7 @@ document.onkeydown = onKeyDownArrowsHandler;
}
?>
-<form method="post" action="<?php echo $action; ?>">
+<form id="create_table_form" method="post" action="<?php echo $action; ?>">
<?php
echo PMA_generate_common_hidden_inputs($_form_params);
unset($_form_params);
diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php
old mode 100644
new mode 100755
index da2ee1d..43ba18e
--- a/libraries/tbl_triggers.lib.php
+++ b/libraries/tbl_triggers.lib.php
@@ -41,7 +41,7 @@ if ($triggers) {
($ct%2 == 0) ? 'even' : 'odd',
$trigger['name'],
PMA_linkOrButton('tbl_sql.php?' . $url_query . '&sql_query=' . urlencode($drop_and_create) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Change']),
- '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($trigger['drop']) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($trigger['drop'], false) . '\')">' . $titles['Drop'] . '</a>',
+ '<a class="drop_trigger_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($trigger['drop']) . '" >' . $titles['Drop'] . '</a>',
$trigger['action_timing'],
$trigger['event_manipulation']);
$ct++;
diff --git a/libraries/tcpdf/LICENSE.TXT b/libraries/tcpdf/LICENSE.TXT
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/LICENSE b/libraries/tcpdf/font/LICENSE
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavusans-bold.ctg.z b/libraries/tcpdf/font/dejavusans-bold.ctg.z
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavusans-bold.z b/libraries/tcpdf/font/dejavusans-bold.z
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavusans.ctg.z b/libraries/tcpdf/font/dejavusans.ctg.z
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavusans.php b/libraries/tcpdf/font/dejavusans.php
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavusans.z b/libraries/tcpdf/font/dejavusans.z
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavusansb.php b/libraries/tcpdf/font/dejavusansb.php
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavuserif-bold.ctg.z b/libraries/tcpdf/font/dejavuserif-bold.ctg.z
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavuserif-bold.z b/libraries/tcpdf/font/dejavuserif-bold.z
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavuserif.ctg.z b/libraries/tcpdf/font/dejavuserif.ctg.z
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavuserif.php b/libraries/tcpdf/font/dejavuserif.php
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavuserif.z b/libraries/tcpdf/font/dejavuserif.z
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/font/dejavuserifb.php b/libraries/tcpdf/font/dejavuserifb.php
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php
old mode 100644
new mode 100755
diff --git a/libraries/tcpdf/unicode_data.php b/libraries/tcpdf/unicode_data.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/README b/libraries/transformations/README
old mode 100644
new mode 100755
diff --git a/libraries/transformations/TEMPLATE b/libraries/transformations/TEMPLATE
old mode 100644
new mode 100755
diff --git a/libraries/transformations/TEMPLATE_MIMETYPE b/libraries/transformations/TEMPLATE_MIMETYPE
old mode 100644
new mode 100755
diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/text_plain__longToIpv4.inc.php b/libraries/transformations/text_plain__longToIpv4.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/text_plain__sql.inc.php b/libraries/transformations/text_plain__sql.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php
old mode 100644
new mode 100755
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
old mode 100644
new mode 100755
diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php
old mode 100644
new mode 100755
diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php
old mode 100644
new mode 100755
diff --git a/license.php b/license.php
old mode 100644
new mode 100755
diff --git a/main.php b/main.php
old mode 100644
new mode 100755
index 3feefe5..627b1de
--- a/main.php
+++ b/main.php
@@ -13,6 +13,7 @@ require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js';
$GLOBALS['js_include'][] = 'main_custom_color.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
// Handles some variables that may have been sent by the calling script
$GLOBALS['db'] = '';
@@ -87,7 +88,7 @@ if ($server > 0
if ($cfg['Server']['auth_type'] != 'config') {
if ($cfg['ShowChgPassword']) {
PMA_printListItem(__('Change password'), 'li_change_password',
- './user_password.php?' . $common_url_query);
+ './user_password.php?' . $common_url_query, null, null, 'change_password_anchor');
}
} // end if
echo ' <li id="li_select_mysql_collation">';
@@ -345,8 +346,9 @@ if ($cfg['SuhosinDisableWarning'] == false && @ini_get('suhosin.request.max_valu
* @param string $url make item as link with $url as target
* @param string $mysql_help_page display a link to MySQL's manual
* @param string $target special target for $url
+ * @param string $a_id id for the anchor, used for jQuery to hook in functions
*/
-function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null)
+function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null)
{
echo '<li id="' . $id . '">';
if (null !== $url) {
@@ -354,6 +356,9 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu
if (null !== $target) {
echo ' target="' . $target . '"';
}
+ if (null != $a_id) {
+ echo ' id="' . $a_id .'"';
+ }
echo '>';
}
diff --git a/navigation.php b/navigation.php
old mode 100644
new mode 100755
diff --git a/phpdoctor.ini b/phpdoctor.ini
old mode 100644
new mode 100755
diff --git a/phpinfo.php b/phpinfo.php
old mode 100644
new mode 100755
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
old mode 100644
new mode 100755
diff --git a/pmd/images/2leftarrow.png b/pmd/images/2leftarrow.png
old mode 100644
new mode 100755
diff --git a/pmd/images/2leftarrow_m.png b/pmd/images/2leftarrow_m.png
old mode 100644
new mode 100755
diff --git a/pmd/images/2rightarrow.png b/pmd/images/2rightarrow.png
old mode 100644
new mode 100755
diff --git a/pmd/images/2rightarrow_m.png b/pmd/images/2rightarrow_m.png
old mode 100644
new mode 100755
diff --git a/pmd/images/ang_direct.png b/pmd/images/ang_direct.png
old mode 100644
new mode 100755
diff --git a/pmd/images/bord.png b/pmd/images/bord.png
old mode 100644
new mode 100755
diff --git a/pmd/images/bottom.png b/pmd/images/bottom.png
old mode 100644
new mode 100755
diff --git a/pmd/images/def.png b/pmd/images/def.png
old mode 100644
new mode 100755
diff --git a/pmd/images/display_field.png b/pmd/images/display_field.png
old mode 100644
new mode 100755
diff --git a/pmd/images/downarrow1.png b/pmd/images/downarrow1.png
old mode 100644
new mode 100755
diff --git a/pmd/images/downarrow2.png b/pmd/images/downarrow2.png
old mode 100644
new mode 100755
diff --git a/pmd/images/downarrow2_m.png b/pmd/images/downarrow2_m.png
old mode 100644
new mode 100755
diff --git a/pmd/images/exec.png b/pmd/images/exec.png
old mode 100644
new mode 100755
diff --git a/pmd/images/exec_small.png b/pmd/images/exec_small.png
old mode 100644
new mode 100755
diff --git a/pmd/images/favicon.ico b/pmd/images/favicon.ico
old mode 100644
new mode 100755
diff --git a/pmd/images/grid.png b/pmd/images/grid.png
old mode 100644
new mode 100755
diff --git a/pmd/images/help.png b/pmd/images/help.png
old mode 100644
new mode 100755
diff --git a/pmd/images/help_relation.png b/pmd/images/help_relation.png
old mode 100644
new mode 100755
diff --git a/pmd/images/pdf.png b/pmd/images/pdf.png
old mode 100644
new mode 100755
diff --git a/pmd/images/relation.png b/pmd/images/relation.png
old mode 100644
new mode 100755
diff --git a/pmd/images/reload.png b/pmd/images/reload.png
old mode 100644
new mode 100755
diff --git a/pmd/images/resize.png b/pmd/images/resize.png
old mode 100644
new mode 100755
diff --git a/pmd/images/rightarrow1.png b/pmd/images/rightarrow1.png
old mode 100644
new mode 100755
diff --git a/pmd/images/rightarrow2.png b/pmd/images/rightarrow2.png
old mode 100644
new mode 100755
diff --git a/pmd/images/save.png b/pmd/images/save.png
old mode 100644
new mode 100755
diff --git a/pmd/images/table.png b/pmd/images/table.png
old mode 100644
new mode 100755
diff --git a/pmd/images/uparrow2_m.png b/pmd/images/uparrow2_m.png
old mode 100644
new mode 100755
diff --git a/pmd/scripts/ajax.js b/pmd/scripts/ajax.js
old mode 100644
new mode 100755
diff --git a/pmd/scripts/iecanvas.js b/pmd/scripts/iecanvas.js
old mode 100644
new mode 100755
diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/1.png b/pmd/styles/default/images/1.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/2.png b/pmd/styles/default/images/2.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/3.png b/pmd/styles/default/images/3.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/4.png b/pmd/styles/default/images/4.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/5.png b/pmd/styles/default/images/5.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/6.png b/pmd/styles/default/images/6.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/7.png b/pmd/styles/default/images/7.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/8.png b/pmd/styles/default/images/8.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/FieldKey_small.png b/pmd/styles/default/images/FieldKey_small.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/Field_small.png b/pmd/styles/default/images/Field_small.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/Field_small_char.png b/pmd/styles/default/images/Field_small_char.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/Field_small_date.png b/pmd/styles/default/images/Field_small_date.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/Field_small_int.png b/pmd/styles/default/images/Field_small_int.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/Header.png b/pmd/styles/default/images/Header.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/Header_Linked.png b/pmd/styles/default/images/Header_Linked.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/left_panel_butt.png b/pmd/styles/default/images/left_panel_butt.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/left_panel_tab.png b/pmd/styles/default/images/left_panel_tab.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/small_tab.png b/pmd/styles/default/images/small_tab.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/images/top_panel.png b/pmd/styles/default/images/top_panel.png
old mode 100644
new mode 100755
diff --git a/pmd/styles/default/style1.css b/pmd/styles/default/style1.css
old mode 100644
new mode 100755
diff --git a/pmd_common.php b/pmd_common.php
old mode 100644
new mode 100755
diff --git a/pmd_display_field.php b/pmd_display_field.php
old mode 100644
new mode 100755
diff --git a/pmd_general.php b/pmd_general.php
old mode 100644
new mode 100755
diff --git a/pmd_help.php b/pmd_help.php
old mode 100644
new mode 100755
diff --git a/pmd_pdf.php b/pmd_pdf.php
old mode 100644
new mode 100755
diff --git a/pmd_relation_new.php b/pmd_relation_new.php
old mode 100644
new mode 100755
diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
old mode 100644
new mode 100755
diff --git a/pmd_save_pos.php b/pmd_save_pos.php
old mode 100644
new mode 100755
diff --git a/po/.gitignore b/po/.gitignore
old mode 100644
new mode 100755
diff --git a/print.css b/print.css
old mode 100644
new mode 100755
diff --git a/querywindow.php b/querywindow.php
old mode 100644
new mode 100755
diff --git a/robots.txt b/robots.txt
old mode 100644
new mode 100755
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
old mode 100644
new mode 100755
diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php
old mode 100644
new mode 100755
diff --git a/scripts/google-javascript-compiler/COPYING b/scripts/google-javascript-compiler/COPYING
old mode 100644
new mode 100755
diff --git a/scripts/google-javascript-compiler/README b/scripts/google-javascript-compiler/README
old mode 100644
new mode 100755
diff --git a/scripts/google-javascript-compiler/compiler.jar b/scripts/google-javascript-compiler/compiler.jar
old mode 100644
new mode 100755
diff --git a/scripts/signon.php b/scripts/signon.php
old mode 100644
new mode 100755
diff --git a/scripts/upgrade_tables_mysql_4_1_2+.sql b/scripts/upgrade_tables_mysql_4_1_2+.sql
old mode 100644
new mode 100755
diff --git a/server_binlog.php b/server_binlog.php
old mode 100644
new mode 100755
diff --git a/server_collations.php b/server_collations.php
old mode 100644
new mode 100755
diff --git a/server_databases.php b/server_databases.php
old mode 100644
new mode 100755
index d054aca..8ce1f8e
--- a/server_databases.php
+++ b/server_databases.php
@@ -309,7 +309,7 @@ if ($databases_count > 0) {
} // end foreach ($databases as $key => $current)
unset($current, $odd_row);
- echo '<tr>' . "\n";
+ echo '<tr id="db_summary_row">' . "\n";
if ($is_superuser || $cfg['AllowUserDropDatabase']) {
echo ' <th></th>' . "\n";
}
diff --git a/server_engines.php b/server_engines.php
old mode 100644
new mode 100755
diff --git a/server_export.php b/server_export.php
old mode 100644
new mode 100755
diff --git a/server_import.php b/server_import.php
old mode 100644
new mode 100755
diff --git a/server_privileges.php b/server_privileges.php
old mode 100644
new mode 100755
index 33483d2..567a44c
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -14,6 +14,9 @@ require_once './libraries/common.inc.php';
* Does the common work
*/
$GLOBALS['js_include'][] = 'server_privileges.js';
+$GLOBALS['js_include'][] = 'functions.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+
$GLOBALS['js_include'][] = 'password_generation.js';
require './libraries/server_common.inc.php';
@@ -564,10 +567,10 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE)
? __('Database-specific privileges')
: __('Table-specific privileges'))) . "\n"
. ' (<a href="server_privileges.php?'
- . $GLOBALS['url_query'] . '&checkall=1" onclick="setCheckboxes(\'usersForm\', true); return false;">'
+ . $GLOBALS['url_query'] . '&checkall=1" onclick="setCheckboxes(\'addUsersForm\', true); return false;">'
. __('Check All') . '</a> /' . "\n"
. ' <a href="server_privileges.php?'
- . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'usersForm\', false); return false;">'
+ . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm\', false); return false;">'
. __('Uncheck All') . '</a>)' . "\n"
. ' </legend>' . "\n"
. ' <p><small><i>' . __(' Note: MySQL privilege names are expressed in English ') . '</i></small></p>' . "\n"
@@ -971,10 +974,17 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
$message = PMA_Message::rawError(PMA_DBI_getError());
break;
}
- // this is needed in case tracking is on:
- $GLOBALS['db'] = $username;
- $GLOBALS['reload'] = TRUE;
- PMA_reloadNavigation();
+
+
+ /**
+ * If we are not in an Ajax request, we can't reload navigation now
+ */
+ if($GLOBALS['is_ajax_request'] != true) {
+ // this is needed in case tracking is on:
+ $GLOBALS['db'] = $username;
+ $GLOBALS['reload'] = TRUE;
+ PMA_reloadNavigation();
+ }
$q = 'GRANT ALL PRIVILEGES ON '
. PMA_backquote(PMA_sqlAddslashes($username)) . '.* TO \''
@@ -1267,7 +1277,10 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[
if (isset($_REQUEST['drop_users_db'])) {
$queries[] = 'DROP DATABASE IF EXISTS ' . PMA_backquote($this_user) . ';';
$GLOBALS['reload'] = TRUE;
- PMA_reloadNavigation();
+
+ if($GLOBALS['is_ajax_request'] != true) {
+ PMA_reloadNavigation();
+ }
}
}
if (empty($_REQUEST['change_copy'])) {
@@ -1331,27 +1344,10 @@ if (isset($_REQUEST['flush_privileges'])) {
$message = PMA_Message::success(__('The privileges were reloaded successfully.'));
}
-
-/**
- * Displays the links
- */
-if (isset($viewing_mode) && $viewing_mode == 'db') {
- $db = $checkprivs;
- $url_query .= '&goto=db_operations.php';
-
- // Gets the database structure
- $sub_part = '_structure';
- require './libraries/db_info.inc.php';
- echo "\n";
-} else {
- require './libraries/server_links.inc.php';
-}
-
-
/**
* defines some standard links
*/
-$link_edit = '<a href="server_privileges.php?' . $GLOBALS['url_query']
+$link_edit = '<a class="edit_user_anchor" href="server_privileges.php?' . $GLOBALS['url_query']
. '&username=%s'
. '&hostname=%s'
. '&dbname=%s'
@@ -1368,7 +1364,7 @@ $link_revoke = '<a href="server_privileges.php?' . $GLOBALS['url_query']
. PMA_getIcon('b_usrdrop.png', __('Revoke'))
. '</a>';
-$link_export = '<a href="server_privileges.php?' . $GLOBALS['url_query']
+$link_export = '<a class="export_user_anchor" href="server_privileges.php?' . $GLOBALS['url_query']
. '&username=%s'
. '&hostname=%s'
. '&initial=%s'
@@ -1377,6 +1373,89 @@ $link_export = '<a href="server_privileges.php?' . $GLOBALS['url_query']
. '</a>';
/**
+ * If we are in an Ajax request for Create User/Edit User/Revoke User/Flush Privileges,
+ * show $message and exit.
+ */
+if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && !isset($_REQUEST['adduser']) && !isset($_REQUEST['initial']) && !isset($_REQUEST['showall']) && !isset($_REQUEST['edit_user_dialog'])) {
+
+ if(isset($sql_query)) {
+ $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+ }
+
+ if(isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
+ /**
+ * generate html on the fly for the new user that was just created.
+ */
+ $new_user_string = '<tr>'."\n"
+ .'<td> <input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_" value="' . htmlspecialchars($username) . '&#27;' . htmlspecialchars($hostname) . '" /> </td>'."\n"
+ .'<td><label for="checkbox_sel_users_">' . (empty($username) ? '<span style="color: #FF0000">' . __('Any') . '</span>' : htmlspecialchars($username) ) . '</label></td>' . "\n"
+ .'<td>' . htmlspecialchars($hostname) . '</td>' . "\n";
+ $new_user_string .= '<td>';
+
+ if(!empty($password) || isset($pma_pw)) {
+ $new_user_string .= __('Yes');
+ }
+ else {
+ $new_user_string .= '<span style="color: #FF0000">' . __('No') . '</span>';
+ };
+
+ $new_user_string .= '</td>'."\n";
+ $new_user_string .= '<td><tt>' . join(', ', PMA_extractPrivInfo('', true)) . '</tt></td>'; //Fill in privileges here
+ $new_user_string .= '<td>';
+
+ if((isset($Grant_priv) && $Grant_priv == 'Y')) {
+ $new_user_string .= __('Yes');
+ }
+ else {
+ $new_user_string .= __('No');
+ }
+
+ $new_user_string .='</td>';
+
+ $new_user_string .= '<td>'.sprintf($link_edit, urlencode($username), urlencode($host), '', '' ).'</td>'."\n";
+ $new_user_string .= '<td>'.sprintf($link_export, urlencode($username), urlencode($hostname), (isset($initial) ? $initial : '')).'</td>'."\n";
+
+ $new_user_string .= '</tr>';
+
+ $extra_data['new_user_string'] = $new_user_string;
+
+ /**
+ * Generate the string for this alphabet's initial, to update the user
+ * pagination
+ */
+ $new_user_initial = strtoupper(substr($username, 0, 1));
+ $new_user_initial_string = '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&initial=' . $new_user_initial
+ .'>' . $new_user_initial . '</a>';
+ $extra_data['new_user_initial'] = $new_user_initial;
+ $extra_data['new_user_initial_string'] = $new_user_initial_string;
+ }
+
+ if(isset($update_privs)) {
+ $new_privileges = join(', ', PMA_extractPrivInfo('', true));
+
+ $extra_data['new_privileges'] = $new_privileges;
+ }
+
+ PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+}
+
+/**
+ * Displays the links
+ */
+if (isset($viewing_mode) && $viewing_mode == 'db') {
+ $db = $checkprivs;
+ $url_query .= '&goto=db_operations.php';
+
+ // Gets the database structure
+ $sub_part = '_structure';
+ require './libraries/db_info.inc.php';
+ echo "\n";
+} else {
+ require './libraries/server_links.inc.php';
+}
+
+
+/**
* Displays the page
*/
@@ -1390,6 +1469,9 @@ if (isset($_REQUEST['export'])) {
}
echo '</textarea>';
unset($username, $hostname, $grants, $one_grant);
+ if( $GLOBALS['is_ajax_request']) {
+ exit;
+ }
}
if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs))) {
@@ -1479,36 +1561,40 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
/**
* Displays the initials
+ * In an Ajax request, we don't need to show this
*/
- // initialize to FALSE the letters A-Z
- for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) {
- if (! isset($array_initials[chr($letter_counter + 64)])) {
- $array_initials[chr($letter_counter + 64)] = FALSE;
+ if( $GLOBALS['is_ajax_request'] != true ) {
+
+ // initialize to FALSE the letters A-Z
+ for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) {
+ if (! isset($array_initials[chr($letter_counter + 64)])) {
+ $array_initials[chr($letter_counter + 64)] = FALSE;
+ }
}
- }
- $initials = PMA_DBI_try_query('SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user` ORDER BY `User` ASC', null, PMA_DBI_QUERY_STORE);
- while (list($tmp_initial) = PMA_DBI_fetch_row($initials)) {
- $array_initials[$tmp_initial] = TRUE;
- }
+ $initials = PMA_DBI_try_query('SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user` ORDER BY `User` ASC', null, PMA_DBI_QUERY_STORE);
+ while (list($tmp_initial) = PMA_DBI_fetch_row($initials)) {
+ $array_initials[$tmp_initial] = TRUE;
+ }
- // Display the initials, which can be any characters, not
- // just letters. For letters A-Z, we add the non-used letters
- // as greyed out.
+ // Display the initials, which can be any characters, not
+ // just letters. For letters A-Z, we add the non-used letters
+ // as greyed out.
- uksort($array_initials, "strnatcasecmp");
+ uksort($array_initials, "strnatcasecmp");
- echo '<table cellspacing="5"><tr>';
- foreach ($array_initials as $tmp_initial => $initial_was_found) {
- if ($initial_was_found) {
- echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&initial=' . urlencode($tmp_initial) . '">' . $tmp_initial . '</a></td>' . "\n";
- } else {
- echo '<td>' . $tmp_initial . '</td>';
+ echo '<table id="initials_table" cellspacing="5"><tr>';
+ foreach ($array_initials as $tmp_initial => $initial_was_found) {
+ if ($initial_was_found) {
+ echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&initial=' . urlencode($tmp_initial) . '">' . $tmp_initial . '</a></td>' . "\n";
+ } else {
+ echo '<td>' . $tmp_initial . '</td>';
+ }
}
+ echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1">[' . __('Show all') . ']</a></td>' . "\n";
+ echo '</tr></table>';
}
- echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1">[' . __('Show all') . ']</a></td>' . "\n";
- echo '</tr></table>';
/**
* Display the user overview
@@ -1629,8 +1715,13 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
. ' ' . __('Add a new User') . '</a>' . "\n"
. ' </fieldset>' . "\n";
} // end if (display overview)
+
+ if( $GLOBALS['is_ajax_request'] ) {
+ exit;
+ }
+
$flushnote = new PMA_Message(__('Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.'), PMA_Message::NOTICE);
- $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&flush_privileges=1">', false);
+ $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&flush_privileges=1" id="reload_privileges_anchor">', false);
$flushnote->addParam('</a>', false);
$flushnote->display();
}
@@ -1682,7 +1773,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
//require './libraries/footer.inc.php';
}
- echo '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n";
+ echo '<form name="usersForm" id="addUsersForm" action="server_privileges.php" method="post">' . "\n";
$_params = array(
'username' => $username,
'hostname' => $hostname,
@@ -2017,12 +2108,13 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
}
}
} elseif (isset($_REQUEST['adduser'])) {
+
// Add a new user
$GLOBALS['url_query'] .= '&adduser=1';
echo '<h2>' . "\n"
. PMA_getIcon('b_usradd.png') . __('Add a new User') . "\n"
. '</h2>' . "\n"
- . '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post" onsubmit="return checkAddUser(this);">' . "\n"
+ . '<form name="usersForm" id="addUsersForm" action="server_privileges.php" method="post">' . "\n"
. PMA_generate_common_hidden_inputs('', '');
PMA_displayLoginInformationFields('new');
echo '<fieldset id="fieldset_add_user_database">' . "\n"
diff --git a/server_processlist.php b/server_processlist.php
old mode 100644
new mode 100755
diff --git a/server_replication.php b/server_replication.php
old mode 100644
new mode 100755
diff --git a/server_sql.php b/server_sql.php
old mode 100644
new mode 100755
index 6a4fc68..243d0bf
--- a/server_sql.php
+++ b/server_sql.php
@@ -13,6 +13,9 @@ require_once './libraries/common.inc.php';
/**
* Does the common work
*/
+$GLOBALS['js_include'][] = 'functions.js';
+$GLOBALS['js_include'][] = 'sql.js';
+
require_once './libraries/server_common.inc.php';
require_once './libraries/sql_query_form.lib.php';
diff --git a/server_status.php b/server_status.php
old mode 100644
new mode 100755
diff --git a/server_synchronize.php b/server_synchronize.php
old mode 100644
new mode 100755
diff --git a/server_variables.php b/server_variables.php
old mode 100644
new mode 100755
diff --git a/setup/config.php b/setup/config.php
old mode 100644
new mode 100755
diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php
old mode 100644
new mode 100755
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
old mode 100644
new mode 100755
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
old mode 100644
new mode 100755
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
old mode 100644
new mode 100755
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
old mode 100644
new mode 100755
diff --git a/setup/index.php b/setup/index.php
old mode 100644
new mode 100755
diff --git a/setup/lib/.htaccess b/setup/lib/.htaccess
old mode 100644
new mode 100755
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
old mode 100644
new mode 100755
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
old mode 100644
new mode 100755
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
old mode 100644
new mode 100755
diff --git a/setup/scripts.js b/setup/scripts.js
old mode 100644
new mode 100755
diff --git a/setup/styles.css b/setup/styles.css
old mode 100644
new mode 100755
diff --git a/setup/validate.php b/setup/validate.php
old mode 100644
new mode 100755
diff --git a/show_config_errors.php b/show_config_errors.php
old mode 100644
new mode 100755
diff --git a/sql.php b/sql.php
old mode 100644
new mode 100755
index 9a370d8..1a2853f
--- a/sql.php
+++ b/sql.php
@@ -10,6 +10,7 @@
* Gets some core libraries
*/
require_once './libraries/common.inc.php';
+require_once './libraries/Table.class.php';
require_once './libraries/check_user_privileges.lib.php';
require_once './libraries/bookmark.lib.php';
@@ -48,6 +49,73 @@ if (isset($fields['dbase'])) {
$db = $fields['dbase'];
}
+/**
+ * During inline edit, if we have a relational field, show the dropdown for it
+ *
+ * Logic taken from libraries/display_tbl_lib.php
+ *
+ * This doesn't seem to be the right place to do this, but I can't think of any
+ * better place either.
+ */
+if(isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_values'] == true) {
+ require_once 'libraries/relation.lib.php';
+
+ $column = $_REQUEST['column'];
+ $foreigners = PMA_getForeigners($db, $table, $column);
+
+ $foreignData = PMA_getForeignData($foreigners, $column, false, '', '');
+
+ $dropdown = PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']);
+
+ if( $dropdown == '<option value=""> </option>'."\n" ) {
+ //Handle the case when number of values is more than $cfg['ForeignKeyMaxLimit']
+ $_url_params = array(
+ 'db' => $db,
+ 'table' => $table,
+ 'field' => $column
+ );
+
+ $dropdown = '<a href="browse_foreigners.php' . PMA_generate_common_url($_url_params) . '"'
+ . ' target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes,resizable=yes\'); return false"'
+ .'>Search Foreign Data</a>';
+ }
+ else {
+ $dropdown = '<select>' . $dropdown . '</select>';
+ }
+
+ $extra_data['dropdown'] = $dropdown;
+ PMA_ajaxResponse(NULL, true, $extra_data);
+}
+
+/**
+ * Just like above, find possible values for enum fields during inline edit.
+ *
+ * Logic taken from libraries/display_tbl_lib.php
+ */
+if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) {
+ $field_info_query = 'SHOW FIELDS FROM `' . $db . '`.`' . $table . '` LIKE \'' . $_REQUEST['column'] . '\' ;';
+
+ $field_info_result = PMA_DBI_fetch_result($field_info_query, null, null, null, PMA_DBI_QUERY_STORE);
+
+ $search = array('enum', '(', ')', "'");
+
+ $values = explode(',', str_replace($search, '', $field_info_result[0]['Type']));
+
+ $dropdown = '';
+ foreach($values as $value) {
+ $dropdown .= '<option value="' . htmlspecialchars($value) . '"';
+ if($value == $_REQUEST['curr_value']) {
+ $dropdown .= ' selected="selected"';
+ }
+ $dropdown .= '>' . $value . '</option>';
+ }
+
+ $dropdown = '<select>' . $dropdown . '</select>';
+
+ $extra_data['dropdown'] = $dropdown;
+ PMA_ajaxResponse(NULL, true, $extra_data);
+}
+
// Default to browse if no query set and we have table
// (needed for browsing from DefaultTabTable)
if (empty($sql_query) && strlen($table) && strlen($db)) {
@@ -310,6 +378,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
}
$active_page = $goto;
$message = htmlspecialchars(PMA_Message::rawError($error));
+
+ if( $GLOBALS['is_ajax_request'] == true) {
+ PMA_ajaxResponse($message, false);
+ }
+
/**
* Go to target path.
*/
@@ -318,7 +391,10 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
/**
* HTML header.
*/
- require_once './libraries/header.inc.php';
+
+ if($GLOBALS['is_ajax_request'] != true) {
+ require_once './libraries/header.inc.php';
+ }
$full_err_url = (preg_match('@^(db|tbl)_@', $err_url))
? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query)
: $err_url;
@@ -524,6 +600,86 @@ if (0 == $num_rows || $is_affected) {
$message->addMessage($_querytime);
$message->addMessage(')');
}
+
+ if( $GLOBALS['is_ajax_request'] == true) {
+
+ /**
+ * If we are in inline editing, we need to process the relational and
+ * transformed fields, if they were edited. After that, output the correct
+ * link/transformed value and exit
+ *
+ * Logic taken from libraries/display_tbl.lib.php
+ */
+
+ if(isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') {
+ //handle relations work here for updated row.
+ require_once './libraries/relation.lib.php';
+
+ $map = PMA_getForeigners($db, $table, '', 'both');
+
+ $rel_fields = array();
+ parse_str($_REQUEST['rel_fields_list'], $rel_fields);
+
+ foreach( $rel_fields as $rel_field => $rel_field_value) {
+
+ $where_comparison = '=' . $rel_field_value;
+ $_url_params = array(
+ 'db' => $map[$rel_field]['foreign_db'],
+ 'table' => $map[$rel_field]['foreign_table'],
+ 'pos' => '0',
+ 'sql_query' => 'SELECT * FROM '
+ . PMA_backquote($map[$rel_field]['foreign_db']) . '.' . PMA_backquote($map[$rel_field]['foreign_table'])
+ . ' WHERE ' . PMA_backquote($map[$rel_field]['foreign_field'])
+ . $where_comparison
+ );
+
+ $extra_data['relations'][$rel_field] = '<a href="sql.php' . PMA_generate_common_url($_url_params) . '">';
+ $extra_data['relations'][$rel_field] .= '</a>';
+ }
+ }
+
+ if(isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) {
+ require_once './libraries/transformations.lib.php';
+ //if some posted fields need to be transformed, generate them here.
+ $mime_map = PMA_getMIME($db, $table);
+
+ $edited_values = array();
+ parse_str($_REQUEST['transform_fields_list'], $edited_values);
+
+ foreach($mime_map as $transformation) {
+ $include_file = $transformation['transformation'];
+ $column_name = $transformation['column_name'];
+ $column_data = $edited_values[$column_name];
+
+ $_url_params = array(
+ 'db' => $db,
+ 'table' => $table,
+ 'where_clause' => $_REQUEST['where_clause'],
+ 'transform_key' => $column_name,
+ );
+
+ if (file_exists('./libraries/transformations/' . $include_file)) {
+ $transformfunction_name = str_replace('.inc.php', '', $transformation['transformation']);
+
+ require_once './libraries/transformations/' . $include_file;
+
+ if (function_exists('PMA_transformation_' . $transformfunction_name)) {
+ $transform_function = 'PMA_transformation_' . $transformfunction_name;
+ $transform_options = PMA_transformation_getOptions((isset($transformation['transformation_options']) ? $transformation['transformation_options'] : ''));
+ $transform_options['wrapper_link'] = PMA_generate_common_url($_url_params);
+ }
+ }
+
+ $extra_data['transformations'][$column_name] = $transform_function($column_data, $transform_options);
+ }
+ }
+
+ if(isset($GLOBALS['display_query'])) {
+ $extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']);
+ }
+
+ PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+ }
if ($is_gotofile) {
$goto = PMA_securePath($goto);
@@ -565,6 +721,15 @@ if (0 == $num_rows || $is_affected) {
// At least one row is returned -> displays a table with results
else {
+ //If we are retrieving the full value of a truncated field or the original
+ // value of a transformed field, show it here and exit
+ if( $GLOBALS['inline_edit'] == true) {
+ $row = PMA_DBI_fetch_row($result);
+ $extra_data = array();
+ $extra_data['value'] = $row[0];
+ PMA_ajaxResponse(NULL, true, $extra_data);
+ }
+
// Displays the headers
if (isset($show_query)) {
unset($show_query);
@@ -572,18 +737,30 @@ else {
if (isset($printview) && $printview == '1') {
require_once './libraries/header_printview.inc.php';
} else {
+
+ $GLOBALS['js_include'][] = 'functions.js';
+ $GLOBALS['js_include'][] = 'sql.js';
+
unset($message);
- if (strlen($table)) {
- require './libraries/tbl_common.php';
- $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php';
- require './libraries/tbl_info.inc.php';
- require './libraries/tbl_links.inc.php';
- } elseif (strlen($db)) {
- require './libraries/db_common.inc.php';
- require './libraries/db_info.inc.php';
- } else {
- require './libraries/server_common.inc.php';
- require './libraries/server_links.inc.php';
+
+ if( $GLOBALS['is_ajax_request'] != true) {
+ if (strlen($table)) {
+ require './libraries/tbl_common.php';
+ $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php';
+ require './libraries/tbl_info.inc.php';
+ require './libraries/tbl_links.inc.php';
+ } elseif (strlen($db)) {
+ require './libraries/db_common.inc.php';
+ require './libraries/db_info.inc.php';
+ } else {
+ require './libraries/server_common.inc.php';
+ require './libraries/server_links.inc.php';
+ }
+ }
+ else {
+ //we don't need to buffer the output in PMA_showMessage here.
+ //set a global variable and check against it in the function
+ $GLOBALS['buffer_message'] = false;
}
}
@@ -596,12 +773,17 @@ else {
$fields_meta = PMA_DBI_get_fields_meta($result);
$fields_cnt = count($fields_meta);
}
+
+ if( $GLOBALS['is_ajax_request'] != true ) {
+ //begin the sqlqueryresults div here. container div
+ echo '<div id="sqlqueryresults">';
+ }
// Display previous update query (from tbl_replace)
if (isset($disp_query) && $cfg['ShowSQL'] == true) {
PMA_showMessage($disp_message, $disp_query, 'success');
}
-
+
if (isset($profiling_results)) {
PMA_profilingResults($profiling_results, true);
}
@@ -698,6 +880,10 @@ window.onload = function()
</script>
<?php
} // end print case
+
+ if( $GLOBALS['is_ajax_request'] != true) {
+ echo '</div>'; // end sqlqueryresults div
+ }
} // end rows returned
/**
diff --git a/tbl_addfield.php b/tbl_addfield.php
old mode 100644
new mode 100755
diff --git a/tbl_alter.php b/tbl_alter.php
old mode 100644
new mode 100755
index 4c00acd..ba8c048
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -131,6 +131,10 @@ if (isset($_REQUEST['do_save_data'])) {
}
}
+ if( $GLOBALS['is_ajax_request'] == true) {
+ PMA_ajaxResponse($message, $message->isSuccess());
+ }
+
$active_page = 'tbl_structure.php';
require './tbl_structure.php';
} else {
diff --git a/tbl_change.php b/tbl_change.php
old mode 100644
new mode 100755
index 8ec78f5..eb38d6c
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -107,6 +107,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) {
/**
* used in ./libraries/header.inc.php to load JavaScript library file
*/
+$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
@@ -238,7 +239,7 @@ if (isset($clause_is_unique)) {
?>
<!-- Insert/Edit form -->
-<form method="post" action="tbl_replace.php" name="insertForm" <?php if ($is_upload) { echo ' enctype="multipart/form-data"'; } ?>>
+<form id="insertForm" method="post" action="tbl_replace.php" name="insertForm" <?php if ($is_upload) { echo ' enctype="multipart/form-data"'; } ?>>
<?php
echo PMA_generate_common_hidden_inputs($_form_params);
@@ -295,7 +296,7 @@ foreach ($rows as $row_id => $vrow) {
echo '<label for="insert_ignore_check_' . $row_id . '">' . __('Ignore') . '</label><br />' . "\n";
}
?>
- <table>
+ <table class="insertRowTable">
<thead>
<tr>
<th><?php echo __('Column'); ?></th>
@@ -1081,7 +1082,7 @@ if (isset($where_clause)) {
if ($insert_mode) {
?>
<!-- Restart insertion form -->
-<form method="post" action="tbl_replace.php" name="restartForm" >
+<form id="restartForm" method="post" action="tbl_replace.php" name="restartForm" >
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="goto" value="<?php echo htmlspecialchars($GLOBALS['goto']); ?>" />
<input type="hidden" name="err_url" value="<?php echo htmlspecialchars($err_url); ?>" />
@@ -1092,7 +1093,7 @@ if ($insert_mode) {
echo '<input type="hidden" name="where_clause[' . $key_id . ']" value="' . htmlspecialchars(trim($where_clause)) . '" />'. "\n";
}
}
- $tmp = '<select name="insert_rows" id="insert_rows" onchange="this.form.submit();" >' . "\n";
+ $tmp = '<select name="insert_rows" id="insert_rows">' . "\n";
$option_values = array(1,2,5,10,15,20,30,40);
foreach ($option_values as $value) {
$tmp .= '<option value="' . $value . '"';
diff --git a/tbl_create.php b/tbl_create.php
old mode 100644
new mode 100755
index 4f6b56f..0d15822
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -241,6 +241,102 @@ if (isset($_REQUEST['do_save_data'])) {
$message = PMA_Message::success(__('Table %1$s has been created.'));
$message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table));
+ if($GLOBALS['is_ajax_request'] == true) {
+
+ /**
+ * construct the html for the newly created table's row to be appended
+ * to the list of tables.
+ *
+ * Logic taken from db_structure.php
+ */
+
+ $tbl_url_params = array();
+ $tbl_url_params['db'] = $db;
+ $tbl_url_params['table'] = $table;
+ $is_show_stats = $cfg['ShowStats'];
+
+ $tbl_stats_result = PMA_DBI_query('SHOW TABLE STATUS FROM '
+ . PMA_backquote($db) . ' LIKE \'' . addslashes($table) . '\';');
+ $tbl_stats = PMA_DBI_fetch_assoc($tbl_stats_result);
+ PMA_DBI_free_result($tbl_stats_result);
+ unset($tbl_stats_result);
+
+ if ($is_show_stats) {
+ $sum_size = (double) 0;
+ $overhead_size = (double) 0;
+ $overhead_check = '';
+
+ $tblsize = doubleval($tbl_stats['Data_length']) + doubleval($tbl_stats['Index_length']);
+ $sum_size += $tblsize;
+ list($formatted_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0);
+ if (isset($tbl_stats['Data_free']) && $tbl_stats['Data_free'] > 0) {
+ list($formatted_overhead, $overhead_unit) = PMA_formatByteDown($tbl_stats['Data_free'], 3, ($tbl_stats['Data_free'] > 0) ? 1 : 0);
+ $overhead_size += $tbl_stats['Data_free'];
+ }
+
+ if (isset($formatted_overhead)) {
+ $overhead = $formatted_overhead . ' ' . $overhead_unit;
+ unset($formatted_overhead);
+ } else {
+ $overhead = '-';
+ }
+ }
+
+ $new_table_string = '<tr>' . "\n";
+ $new_table_string .= '<td align="center"> <input type="checkbox" id="checkbox_tbl_" name="selected_tbl[]" value="'.htmlspecialchars($table).'" /> </td>' . "\n";
+
+ $new_table_string .= '<th>';
+ $new_table_string .= '<a href="sql.php' . PMA_generate_common_url($tbl_url_params) . '">'. $table . '</a>';
+
+ if (PMA_Tracker::isActive()) {
+ $truename = str_replace(' ', ' ', htmlspecialchars($table));
+ if (PMA_Tracker::isTracked($db, $truename)) {
+ $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye.png" alt="' . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>';
+ } elseif (PMA_Tracker::getVersion($db, $truename) > 0) {
+ $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye_grey.png" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>';
+ }
+ unset($truename);
+ }
+ $new_table_string .= '</th>' . "\n";
+
+ $new_table_string .= '<td> <img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_browse.png" alt="' . __('Browse') . '" title="' . __('Browse') . '" /> </td>' . "\n";
+
+ $new_table_string .= '<td> <a href="tbl_structure.php' . PMA_generate_common_url($tbl_url_params) . '"> ';
+ $new_table_string .= '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_props.png" alt="' . __('Structure') . '" title="' . __('Structure') . '" />';
+ $new_table_string .= '</a> </td>' . "\n";
+
+ $new_table_string .= '<td> <img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_select.png" alt="' . __('Search') . '" title="' . __('Search') . '" /> </td>' . "\n";
+
+ $new_table_string .= '<td> <a href="tbl_change.php' . PMA_generate_common_url($tbl_url_params) . '"> ';
+ $new_table_string .= '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_insrow.png" alt="' . __('Insert') . '" title="' . __('Insert') . '" />';
+ $new_table_string .= '</a> </td>' . "\n";
+
+ $new_table_string .= '<td> <img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_empty.png" alt="' . __('Empty') . '" title="' . __('Empty') . '" /> </td>' . "\n";
+
+ $new_table_string .= '<td> <a class="drop_table_anchor" href="sql.php' . PMA_generate_common_url($tbl_url_params) . '&sql_query=';
+ $new_table_string .= urlencode('DROP TABLE ' . PMA_backquote($table));
+ $new_table_string .= '">';
+ $new_table_string .= '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_drop.png" alt="' . __('Drop') . '" title="' . __('Drop') . '" />';
+ $new_table_string .= '</a> </td>' . "\n";
+
+ $new_table_string .= '<td class="value">' . $tbl_stats['Rows'] . '</td>' . "\n";
+
+ $new_table_string .= '<td nowrap="nowrap">' . $tbl_stats['Engine'] . '</td>' . "\n";
+
+ $new_table_string .= '<td> <dfn title="' . PMA_getCollationDescr($tbl_stats['Collation']) . '">'. $tbl_stats['Collation'] .'</dfn></td>' . "\n";
+
+ if($is_show_stats) {
+ $new_table_string .= '<td class="value"> <a href="tbl_structure.php' . PMA_generate_common_url($tbl_url_params) . '#show
usage" >' . $formatted_size . ' ' . $unit . '</a> </td>' . "\n" ;
+ $new_table_string .= '<td class="value">' . $overhead . '</td>' . "\n" ;
+ }
+
+ $new_table_string .= '</tr>' . "\n";
+
+ $extra_data['new_table_string'] = $new_table_string;
+
+ PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+ }
+
$display_query = $sql_query;
$sql_query = '';
diff --git a/tbl_export.php b/tbl_export.php
old mode 100644
new mode 100755
diff --git a/tbl_get_field.php b/tbl_get_field.php
old mode 100644
new mode 100755
diff --git a/tbl_import.php b/tbl_import.php
old mode 100644
new mode 100755
diff --git a/tbl_indexes.php b/tbl_indexes.php
old mode 100644
new mode 100755
diff --git a/tbl_move_copy.php b/tbl_move_copy.php
old mode 100644
new mode 100755
diff --git a/tbl_operations.php b/tbl_operations.php
old mode 100644
new mode 100755
diff --git a/tbl_printview.php b/tbl_printview.php
old mode 100644
new mode 100755
diff --git a/tbl_relation.php b/tbl_relation.php
old mode 100644
new mode 100755
diff --git a/tbl_replace.php b/tbl_replace.php
old mode 100644
new mode 100755
index e372bd0..7a6ff26
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -415,6 +415,12 @@ if (! empty($error_messages)) {
}
unset($error_messages, $warning_messages, $total_affected_rows, $last_messages, $last_message);
+if($GLOBALS['is_ajax_request'] == true) {
+
+ $extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']);
+ PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+}
+
if (isset($return_to_sql_query)) {
$disp_query = $GLOBALS['sql_query'];
$disp_message = $message;
diff --git a/tbl_row_action.php b/tbl_row_action.php
old mode 100644
new mode 100755
diff --git a/tbl_select.php b/tbl_select.php
old mode 100644
new mode 100755
index d47baf7..1542dba
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -16,7 +16,7 @@
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
-$GLOBALS['js_include'][] = 'tbl_change.js';
+$GLOBALS['js_include'][] = 'tbl_select.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
if ($GLOBALS['cfg']['PropertiesIconic'] == true) {
@@ -118,7 +118,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
}
// ]]>
</script>
-<form method="post" action="tbl_select.php" name="insertForm">
+<form method="post" action="tbl_select.php" name="insertForm" id="tbl_search_form">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
<input type="hidden" name="back" value="tbl_select.php" />
@@ -323,6 +323,7 @@ $(function() {
<input type="submit" name="submit" value="<?php echo __('Go'); ?>" />
</fieldset>
</form>
+<div id="searchresults"></div>
<?php
require './libraries/footer.inc.php';
}
diff --git a/tbl_sql.php b/tbl_sql.php
old mode 100644
new mode 100755
index aa0af4d..70fafc1
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -13,6 +13,9 @@ require_once './libraries/common.inc.php';
/**
* Runs common work
*/
+$GLOBALS['js_include'][] = 'functions.js';
+$GLOBALS['js_include'][] = 'sql.js';
+
require './libraries/tbl_common.php';
$url_query .= '&goto=tbl_sql.php&back=tbl_sql.php';
diff --git a/tbl_structure.php b/tbl_structure.php
old mode 100644
new mode 100755
index e1b29f9..c8e59d8
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -13,6 +13,7 @@ require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'tbl_structure.js';
/**
* handle multiple field commands if required
@@ -392,8 +393,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
<?php echo $titles['Change']; ?></a>
</td>
<td align="center" class="drop">
- <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&dropped_column=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>"
- onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP <?php echo PMA_jsFormat($row['Field']); ?>')">
+ <a class="drop_column_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&cpurge=1&purgekey=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" >
<?php echo $titles['Drop']; ?></a>
</td>
<td align="center" class="primary">
@@ -404,8 +404,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
} else {
echo "\n";
?>
- <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>"
- onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table) . ($primary ? ' DROP PRIMARY KEY,' : ''); ?> ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')">
+ <a class="add_primary_key_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>" >
<?php echo $titles['Primary']; ?></a>
<?php $primary_enabled = true;
}
@@ -480,8 +479,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
<?php
if(isset($primary_enabled)) {
if($primary_enabled) { ?>
- <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>"
- onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table) . ($primary ? ' DROP PRIMARY KEY,' : ''); ?> ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')">
+ <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['Primary']; ?>
</a>
<?php
diff --git a/tbl_tracking.php b/tbl_tracking.php
old mode 100644
new mode 100755
diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php
old mode 100644
new mode 100755
diff --git a/test/AllTests.php b/test/AllTests.php
old mode 100644
new mode 100755
diff --git a/test/Environment_test.php b/test/Environment_test.php
old mode 100644
new mode 100755
diff --git a/test/FailTest.php b/test/FailTest.php
old mode 100644
new mode 100755
diff --git a/test/PMA_Message_test.php b/test/PMA_Message_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_STR_sub_test.php b/test/PMA_STR_sub_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_blowfish_test.php b/test/PMA_blowfish_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_cache_test.php b/test/PMA_cache_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_escapeJsString_test.php b/test/PMA_escapeJsString_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_escapeMySqlWildcards_test.php b/test/PMA_escapeMySqlWildcards_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_foreignKeySupported_test.php b/test/PMA_foreignKeySupported_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_formatNumberByteDown_test.php b/test/PMA_formatNumberByteDown_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_generateCommonUrl_test.php b/test/PMA_generateCommonUrl_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_get_real_size_test.php b/test/PMA_get_real_size_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_headerLocation_test.php b/test/PMA_headerLocation_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_ifSetOr_test.php b/test/PMA_ifSetOr_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_isValid_test.php b/test/PMA_isValid_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_localisedDateTimespan_test.php b/test/PMA_localisedDateTimespan_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_pow_test.php b/test/PMA_pow_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_printableBitValue_test.php b/test/PMA_printableBitValue_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_quoting_slashing_test.php b/test/PMA_quoting_slashing_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_sanitize_test.php b/test/PMA_sanitize_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_showHint_test.php b/test/PMA_showHint_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_stringOperations_test.php b/test/PMA_stringOperations_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_transformation_getOptions_test.php b/test/PMA_transformation_getOptions_test.php
old mode 100644
new mode 100755
diff --git a/test/PMA_whichCrlf_test.php b/test/PMA_whichCrlf_test.php
old mode 100644
new mode 100755
diff --git a/test/PmaSeleniumLoginTest.php b/test/PmaSeleniumLoginTest.php
old mode 100644
new mode 100755
diff --git a/test/PmaSeleniumPrivilegesTest.php b/test/PmaSeleniumPrivilegesTest.php
old mode 100644
new mode 100755
diff --git a/test/PmaSeleniumTestCase.php b/test/PmaSeleniumTestCase.php
old mode 100644
new mode 100755
diff --git a/test/PmaSeleniumXssTest.php b/test/PmaSeleniumXssTest.php
old mode 100644
new mode 100755
diff --git a/test/theme.php b/test/theme.php
old mode 100644
new mode 100755
diff --git a/test/wui.php b/test/wui.php
old mode 100644
new mode 100755
diff --git a/themes.php b/themes.php
old mode 100644
new mode 100755
diff --git a/themes/.gitignore b/themes/.gitignore
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
old mode 100644
new mode 100755
index 73f1c37..7062089
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1413,6 +1413,35 @@ table#serverconnection_trg_local {
{background:#F00;}
/**
+ * Ajax notification styling
+ */
+ .ajax_notification {
+ top: 0px;
+ position: fixed;
+ margin-top: 0;
+ margin-right: auto;
+ margin-bottom: 0;
+ margin-left: auto;
+ padding: 3px 5px;
+ min-width: 70px;
+ max-width: 350px;
+ background-color: #FF9900;
+ z-index: 1100;
+ text-align: center;
+ display: block;
+ left: 0;
+ right: 0;
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif);
+ background-repeat: no-repeat;
+ background-position: 2%;
+ }
+
+ #loading_parent {
+ position: relative;
+ width: 100%;
+ }
+
+ /**
* Export and Import styles
*/
.exportoptions h3, .importoptions h3 {
diff --git a/themes/darkblue_orange/img/ajax_clock_small.gif b/themes/darkblue_orange/img/ajax_clock_small.gif
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/arrow_ltr.png b/themes/darkblue_orange/img/arrow_ltr.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/arrow_rtl.png b/themes/darkblue_orange/img/arrow_rtl.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/asc_order.png b/themes/darkblue_orange/img/asc_order.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_bookmark.png b/themes/darkblue_orange/img/b_bookmark.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_browse.png b/themes/darkblue_orange/img/b_browse.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_calendar.png b/themes/darkblue_orange/img/b_calendar.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_comment.png b/themes/darkblue_orange/img/b_comment.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_dbstatistics.png b/themes/darkblue_orange/img/b_dbstatistics.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_deltbl.png b/themes/darkblue_orange/img/b_deltbl.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_docs.png b/themes/darkblue_orange/img/b_docs.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_docsql.png b/themes/darkblue_orange/img/b_docsql.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_drop.png b/themes/darkblue_orange/img/b_drop.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_edit.png b/themes/darkblue_orange/img/b_edit.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_empty.png b/themes/darkblue_orange/img/b_empty.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_engine.png b/themes/darkblue_orange/img/b_engine.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_export.png b/themes/darkblue_orange/img/b_export.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_firstpage.png b/themes/darkblue_orange/img/b_firstpage.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_ftext.png b/themes/darkblue_orange/img/b_ftext.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_help.png b/themes/darkblue_orange/img/b_help.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_home.png b/themes/darkblue_orange/img/b_home.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_import.png b/themes/darkblue_orange/img/b_import.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_index.png b/themes/darkblue_orange/img/b_index.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_info.png b/themes/darkblue_orange/img/b_info.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_insrow.png b/themes/darkblue_orange/img/b_insrow.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_lastpage.png b/themes/darkblue_orange/img/b_lastpage.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_minus.png b/themes/darkblue_orange/img/b_minus.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_newdb.png b/themes/darkblue_orange/img/b_newdb.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_newtbl.png b/themes/darkblue_orange/img/b_newtbl.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_nextpage.png b/themes/darkblue_orange/img/b_nextpage.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_pdfdoc.png b/themes/darkblue_orange/img/b_pdfdoc.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_plus.png b/themes/darkblue_orange/img/b_plus.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_prevpage.png b/themes/darkblue_orange/img/b_prevpage.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_primary.png b/themes/darkblue_orange/img/b_primary.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_print.png b/themes/darkblue_orange/img/b_print.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_props.png b/themes/darkblue_orange/img/b_props.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_relations.png b/themes/darkblue_orange/img/b_relations.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_save.png b/themes/darkblue_orange/img/b_save.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_sbrowse.png b/themes/darkblue_orange/img/b_sbrowse.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_sdb.png b/themes/darkblue_orange/img/b_sdb.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_search.png b/themes/darkblue_orange/img/b_search.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_selboard.png b/themes/darkblue_orange/img/b_selboard.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_select.png b/themes/darkblue_orange/img/b_select.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_snewtbl.png b/themes/darkblue_orange/img/b_snewtbl.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_sql.png b/themes/darkblue_orange/img/b_sql.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_sqldoc.png b/themes/darkblue_orange/img/b_sqldoc.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_sqlhelp.png b/themes/darkblue_orange/img/b_sqlhelp.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_tblanalyse.png b/themes/darkblue_orange/img/b_tblanalyse.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_tblexport.png b/themes/darkblue_orange/img/b_tblexport.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_tblimport.png b/themes/darkblue_orange/img/b_tblimport.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_tblops.png b/themes/darkblue_orange/img/b_tblops.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_tbloptimize.png b/themes/darkblue_orange/img/b_tbloptimize.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_tipp.png b/themes/darkblue_orange/img/b_tipp.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_unique.png b/themes/darkblue_orange/img/b_unique.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_usradd.png b/themes/darkblue_orange/img/b_usradd.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_usrcheck.png b/themes/darkblue_orange/img/b_usrcheck.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_usrdrop.png b/themes/darkblue_orange/img/b_usrdrop.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_usredit.png b/themes/darkblue_orange/img/b_usredit.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_usrlist.png b/themes/darkblue_orange/img/b_usrlist.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_view.png b/themes/darkblue_orange/img/b_view.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/b_views.png b/themes/darkblue_orange/img/b_views.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_browse.png b/themes/darkblue_orange/img/bd_browse.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_deltbl.png b/themes/darkblue_orange/img/bd_deltbl.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_drop.png b/themes/darkblue_orange/img/bd_drop.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_empty.png b/themes/darkblue_orange/img/bd_empty.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_firstpage.png b/themes/darkblue_orange/img/bd_firstpage.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_ftext.png b/themes/darkblue_orange/img/bd_ftext.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_index.png b/themes/darkblue_orange/img/bd_index.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_insrow.png b/themes/darkblue_orange/img/bd_insrow.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_lastpage.png b/themes/darkblue_orange/img/bd_lastpage.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_nextpage.png b/themes/darkblue_orange/img/bd_nextpage.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_prevpage.png b/themes/darkblue_orange/img/bd_prevpage.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_primary.png b/themes/darkblue_orange/img/bd_primary.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_sbrowse.png b/themes/darkblue_orange/img/bd_sbrowse.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_select.png b/themes/darkblue_orange/img/bd_select.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/bd_unique.png b/themes/darkblue_orange/img/bd_unique.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/error.ico b/themes/darkblue_orange/img/error.ico
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/eye.png b/themes/darkblue_orange/img/eye.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/item.png b/themes/darkblue_orange/img/item.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/item_ltr.png b/themes/darkblue_orange/img/item_ltr.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/item_rtl.png b/themes/darkblue_orange/img/item_rtl.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/logo_left.png b/themes/darkblue_orange/img/logo_left.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/logo_right.png b/themes/darkblue_orange/img/logo_right.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/new_data.jpg b/themes/darkblue_orange/img/new_data.jpg
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/new_data_hovered.jpg b/themes/darkblue_orange/img/new_data_hovered.jpg
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/new_data_selected.jpg b/themes/darkblue_orange/img/new_data_selected.jpg
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/new_data_selected_hovered.jpg b/themes/darkblue_orange/img/new_data_selected_hovered.jpg
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/new_struct.jpg b/themes/darkblue_orange/img/new_struct.jpg
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/new_struct_hovered.jpg b/themes/darkblue_orange/img/new_struct_hovered.jpg
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/new_struct_selected.jpg b/themes/darkblue_orange/img/new_struct_selected.jpg
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/new_struct_selected_hovered.jpg b/themes/darkblue_orange/img/new_struct_selected_hovered.jpg
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/php_sym.png b/themes/darkblue_orange/img/php_sym.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/pma_logo2.png b/themes/darkblue_orange/img/pma_logo2.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_asc.png b/themes/darkblue_orange/img/s_asc.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_asci.png b/themes/darkblue_orange/img/s_asci.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_attention.png b/themes/darkblue_orange/img/s_attention.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_cancel.png b/themes/darkblue_orange/img/s_cancel.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_cancel2.png b/themes/darkblue_orange/img/s_cancel2.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_db.png b/themes/darkblue_orange/img/s_db.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_desc.png b/themes/darkblue_orange/img/s_desc.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_error.png b/themes/darkblue_orange/img/s_error.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_error2.png b/themes/darkblue_orange/img/s_error2.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_fulltext.png b/themes/darkblue_orange/img/s_fulltext.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_host.png b/themes/darkblue_orange/img/s_host.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_info.png b/themes/darkblue_orange/img/s_info.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_lang.png b/themes/darkblue_orange/img/s_lang.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_loggoff.png b/themes/darkblue_orange/img/s_loggoff.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_notice.png b/themes/darkblue_orange/img/s_notice.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_okay.png b/themes/darkblue_orange/img/s_okay.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_partialtext.png b/themes/darkblue_orange/img/s_partialtext.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_passwd.png b/themes/darkblue_orange/img/s_passwd.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_process.png b/themes/darkblue_orange/img/s_process.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_really.png b/themes/darkblue_orange/img/s_really.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_reload.png b/themes/darkblue_orange/img/s_reload.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_replication.png b/themes/darkblue_orange/img/s_replication.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_rights.png b/themes/darkblue_orange/img/s_rights.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_status.png b/themes/darkblue_orange/img/s_status.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_success.png b/themes/darkblue_orange/img/s_success.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_sync.png b/themes/darkblue_orange/img/s_sync.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_tbl.png b/themes/darkblue_orange/img/s_tbl.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_theme.png b/themes/darkblue_orange/img/s_theme.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_vars.png b/themes/darkblue_orange/img/s_vars.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_views.png b/themes/darkblue_orange/img/s_views.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/s_warn.png b/themes/darkblue_orange/img/s_warn.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/spacer.png b/themes/darkblue_orange/img/spacer.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/tbl_header.png b/themes/darkblue_orange/img/tbl_header.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/tbl_th.png b/themes/darkblue_orange/img/tbl_th.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/img/window-new.png b/themes/darkblue_orange/img/window-new.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/darkblue_orange/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/themes/darkblue_orange/jquery/images/ui-bg_flat_75_ffffff_40x100.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_65_ffffff_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_75_dadada_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_75_dadada_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/themes/darkblue_orange/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-icons_222222_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_222222_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-icons_2e83ff_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_2e83ff_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-icons_454545_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_454545_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-icons_888888_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_888888_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/images/ui-icons_cd0a0a_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_cd0a0a_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/jquery/jquery-ui-1.8.custom.css b/themes/darkblue_orange/jquery/jquery-ui-1.8.custom.css
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php
old mode 100644
new mode 100755
diff --git a/themes/darkblue_orange/screen.png b/themes/darkblue_orange/screen.png
old mode 100644
new mode 100755
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
old mode 100644
new mode 100755
diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php
old mode 100644
new mode 100755
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
old mode 100644
new mode 100755
index 1d6da61..15cf293
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1348,6 +1348,35 @@ table#serverconnection_trg_local {
{background:#F00;}
/**
+ * Ajax notification styling
+ */
+ .ajax_notification {
+ top: 0px; /** The notification needs to be shown on the top of the page */
+ position: fixed;
+ margin-top: 0;
+ margin-right: auto;
+ margin-bottom: 0;
+ margin-left: auto;
+ padding: 3px 5px; /** Keep a little space on the sides of the text */
+ min-width: 70px;
+ max-width: 350px; /** This value might have to be changed */
+ background-color: #FFD700;
+ z-index: 1100; /** If this is not kept at a high z-index, the jQueryUI modal dialogs (z-index:1000) might hide this */
+ text-align: center;
+ display: block;
+ left: 0;
+ right: 0;
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif);
+ background-repeat: no-repeat;
+ background-position: 2%;
+ }
+
+ #loading_parent {
+ /** Need this parent to properly center the notification division */
+ position: relative;
+ width: 100%;
+ }
+/**
* Export and Import styles
*/
diff --git a/themes/original/img/ajax_clock_small.gif b/themes/original/img/ajax_clock_small.gif
old mode 100644
new mode 100755
diff --git a/themes/original/img/arrow_ltr.png b/themes/original/img/arrow_ltr.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/arrow_rtl.png b/themes/original/img/arrow_rtl.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/asc_order.png b/themes/original/img/asc_order.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_bookmark.png b/themes/original/img/b_bookmark.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_browse.png b/themes/original/img/b_browse.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_calendar.png b/themes/original/img/b_calendar.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_comment.png b/themes/original/img/b_comment.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_dbstatistics.png b/themes/original/img/b_dbstatistics.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_deltbl.png b/themes/original/img/b_deltbl.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_docs.png b/themes/original/img/b_docs.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_docsql.png b/themes/original/img/b_docsql.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_drop.png b/themes/original/img/b_drop.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_edit.png b/themes/original/img/b_edit.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_empty.png b/themes/original/img/b_empty.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_engine.png b/themes/original/img/b_engine.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_export.png b/themes/original/img/b_export.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_firstpage.png b/themes/original/img/b_firstpage.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_ftext.png b/themes/original/img/b_ftext.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_help.png b/themes/original/img/b_help.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_home.png b/themes/original/img/b_home.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_import.png b/themes/original/img/b_import.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_index.png b/themes/original/img/b_index.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_info.png b/themes/original/img/b_info.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_insrow.png b/themes/original/img/b_insrow.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_lastpage.png b/themes/original/img/b_lastpage.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_minus.png b/themes/original/img/b_minus.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_newdb.png b/themes/original/img/b_newdb.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_newtbl.png b/themes/original/img/b_newtbl.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_nextpage.png b/themes/original/img/b_nextpage.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_pdfdoc.png b/themes/original/img/b_pdfdoc.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_plus.png b/themes/original/img/b_plus.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_prevpage.png b/themes/original/img/b_prevpage.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_primary.png b/themes/original/img/b_primary.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_print.png b/themes/original/img/b_print.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_props.png b/themes/original/img/b_props.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_relations.png b/themes/original/img/b_relations.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_save.png b/themes/original/img/b_save.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_sbrowse.png b/themes/original/img/b_sbrowse.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_sdb.png b/themes/original/img/b_sdb.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_search.png b/themes/original/img/b_search.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_selboard.png b/themes/original/img/b_selboard.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_select.png b/themes/original/img/b_select.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_snewtbl.png b/themes/original/img/b_snewtbl.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_sql.png b/themes/original/img/b_sql.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_sqldoc.png b/themes/original/img/b_sqldoc.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_sqlhelp.png b/themes/original/img/b_sqlhelp.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_tblanalyse.png b/themes/original/img/b_tblanalyse.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_tblexport.png b/themes/original/img/b_tblexport.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_tblimport.png b/themes/original/img/b_tblimport.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_tblops.png b/themes/original/img/b_tblops.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_tbloptimize.png b/themes/original/img/b_tbloptimize.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_tipp.png b/themes/original/img/b_tipp.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_unique.png b/themes/original/img/b_unique.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_usradd.png b/themes/original/img/b_usradd.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_usrcheck.png b/themes/original/img/b_usrcheck.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_usrdrop.png b/themes/original/img/b_usrdrop.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_usredit.png b/themes/original/img/b_usredit.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_usrlist.png b/themes/original/img/b_usrlist.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_view.png b/themes/original/img/b_view.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/b_views.png b/themes/original/img/b_views.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_browse.png b/themes/original/img/bd_browse.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_deltbl.png b/themes/original/img/bd_deltbl.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_drop.png b/themes/original/img/bd_drop.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_empty.png b/themes/original/img/bd_empty.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_firstpage.png b/themes/original/img/bd_firstpage.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_ftext.png b/themes/original/img/bd_ftext.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_index.png b/themes/original/img/bd_index.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_insrow.png b/themes/original/img/bd_insrow.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_lastpage.png b/themes/original/img/bd_lastpage.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_nextpage.png b/themes/original/img/bd_nextpage.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_prevpage.png b/themes/original/img/bd_prevpage.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_primary.png b/themes/original/img/bd_primary.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_sbrowse.png b/themes/original/img/bd_sbrowse.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_select.png b/themes/original/img/bd_select.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/bd_unique.png b/themes/original/img/bd_unique.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/docs_menu_bg.png b/themes/original/img/docs_menu_bg.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/error.ico b/themes/original/img/error.ico
old mode 100644
new mode 100755
diff --git a/themes/original/img/eye.png b/themes/original/img/eye.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/eye_grey.png b/themes/original/img/eye_grey.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/item.png b/themes/original/img/item.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/item_ltr.png b/themes/original/img/item_ltr.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/item_rtl.png b/themes/original/img/item_rtl.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/logo_left.png b/themes/original/img/logo_left.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/logo_right.png b/themes/original/img/logo_right.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/new_data.jpg b/themes/original/img/new_data.jpg
old mode 100644
new mode 100755
diff --git a/themes/original/img/new_data_hovered.jpg b/themes/original/img/new_data_hovered.jpg
old mode 100644
new mode 100755
diff --git a/themes/original/img/new_data_selected.jpg b/themes/original/img/new_data_selected.jpg
old mode 100644
new mode 100755
diff --git a/themes/original/img/new_data_selected_hovered.jpg b/themes/original/img/new_data_selected_hovered.jpg
old mode 100644
new mode 100755
diff --git a/themes/original/img/new_struct.jpg b/themes/original/img/new_struct.jpg
old mode 100644
new mode 100755
diff --git a/themes/original/img/new_struct_hovered.jpg b/themes/original/img/new_struct_hovered.jpg
old mode 100644
new mode 100755
diff --git a/themes/original/img/new_struct_selected.jpg b/themes/original/img/new_struct_selected.jpg
old mode 100644
new mode 100755
diff --git a/themes/original/img/new_struct_selected_hovered.jpg b/themes/original/img/new_struct_selected_hovered.jpg
old mode 100644
new mode 100755
diff --git a/themes/original/img/php_sym.png b/themes/original/img/php_sym.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/pma_logo2.png b/themes/original/img/pma_logo2.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_asc.png b/themes/original/img/s_asc.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_asci.png b/themes/original/img/s_asci.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_attention.png b/themes/original/img/s_attention.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_cancel.png b/themes/original/img/s_cancel.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_cancel2.png b/themes/original/img/s_cancel2.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_db.png b/themes/original/img/s_db.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_desc.png b/themes/original/img/s_desc.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_error.png b/themes/original/img/s_error.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_error2.png b/themes/original/img/s_error2.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_fulltext.png b/themes/original/img/s_fulltext.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_host.png b/themes/original/img/s_host.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_info.png b/themes/original/img/s_info.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_lang.png b/themes/original/img/s_lang.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_loggoff.png b/themes/original/img/s_loggoff.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_notice.png b/themes/original/img/s_notice.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_okay.png b/themes/original/img/s_okay.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_partialtext.png b/themes/original/img/s_partialtext.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_passwd.png b/themes/original/img/s_passwd.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_process.png b/themes/original/img/s_process.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_really.png b/themes/original/img/s_really.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_reload.png b/themes/original/img/s_reload.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_replication.png b/themes/original/img/s_replication.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_rights.png b/themes/original/img/s_rights.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_status.png b/themes/original/img/s_status.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_success.png b/themes/original/img/s_success.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_sync.png b/themes/original/img/s_sync.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_tbl.png b/themes/original/img/s_tbl.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_theme.png b/themes/original/img/s_theme.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_vars.png b/themes/original/img/s_vars.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_views.png b/themes/original/img/s_views.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/s_warn.png b/themes/original/img/s_warn.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/spacer.png b/themes/original/img/spacer.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/vertical_line.png b/themes/original/img/vertical_line.png
old mode 100644
new mode 100755
diff --git a/themes/original/img/window-new.png b/themes/original/img/window-new.png
old mode 100644
new mode 100755
diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/original/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/themes/original/jquery/images/ui-bg_flat_75_ffffff_40x100.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png b/themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-icons_222222_256x240.png b/themes/original/jquery/images/ui-icons_222222_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-icons_2e83ff_256x240.png b/themes/original/jquery/images/ui-icons_2e83ff_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-icons_454545_256x240.png b/themes/original/jquery/images/ui-icons_454545_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-icons_888888_256x240.png b/themes/original/jquery/images/ui-icons_888888_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/images/ui-icons_cd0a0a_256x240.png b/themes/original/jquery/images/ui-icons_cd0a0a_256x240.png
old mode 100644
new mode 100755
diff --git a/themes/original/jquery/jquery-ui-1.8.custom.css b/themes/original/jquery/jquery-ui-1.8.custom.css
old mode 100644
new mode 100755
diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php
old mode 100644
new mode 100755
diff --git a/themes/original/screen.png b/themes/original/screen.png
old mode 100644
new mode 100755
diff --git a/transformation_overview.php b/transformation_overview.php
old mode 100644
new mode 100755
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
old mode 100644
new mode 100755
diff --git a/translators.html b/translators.html
old mode 100644
new mode 100755
diff --git a/user_password.php b/user_password.php
old mode 100644
new mode 100755
index cd84b79..58f9cfc
--- a/user_password.php
+++ b/user_password.php
@@ -71,6 +71,13 @@ if (isset($_REQUEST['nopass'])) {
$password = $_REQUEST['pma_pw'];
}
+ if($GLOBALS['is_ajax_request'] == true && $_error == true) {
+ /**
+ * If in an Ajax request, we don't need to show the rest of the page
+ */
+ PMA_ajaxResponse($message, false);
+ }
+
if (! $_error) {
// Defines the url to return to in case of error in the sql statement
@@ -101,10 +108,17 @@ if (isset($_REQUEST['nopass'])) {
$_url_params['old_usr'] = 'relog';
}
+ $message = PMA_Message::success(__('The profile has been updated.'));
+
+ if($GLOBALS['is_ajax_request'] == true) {
+ $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query, 'success');
+ PMA_ajaxResponse($message, true, $extra_data);
+ }
+
// Displays the page
require_once './libraries/header.inc.php';
echo '<h1>' . __('Change password') . '</h1>' . "\n\n";
- PMA_showMessage(__('The profile has been updated.'), $sql_query, 'success');
+ PMA_showMessage($message, $sql_query, 'success');
?>
<a href="index.php<?php echo PMA_generate_common_url($_url_params); ?>" target="_parent">
<strong><?php echo __('Back'); ?></strong></a>
diff --git a/view_create.php b/view_create.php
old mode 100644
new mode 100755
diff --git a/view_operations.php b/view_operations.php
old mode 100644
new mode 100755
diff --git a/webapp.php b/webapp.php
old mode 100644
new mode 100755
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8695-gac5cab4
by Michal Čihař 27 Aug '10
by Michal Čihař 27 Aug '10
27 Aug '10
The branch, master has been updated
via ac5cab4f6f6184484ad0f68c8afbdf06c2914b9b (commit)
from c9d4d52fffea791508e4ed3aac52f399d985a9ed (commit)
- Log -----------------------------------------------------------------
commit ac5cab4f6f6184484ad0f68c8afbdf06c2914b9b
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Aug 27 16:16:54 2010 +0200
These should be translatable as well.
-----------------------------------------------------------------------
Summary of changes:
libraries/display_export.lib.php | 9 +---
po/af.po | 49 ++++++++++++----------
po/ar.po | 57 +++++++++++++++-----------
po/az.po | 49 ++++++++++++----------
po/be.po | 57 +++++++++++++++-----------
po/be(a)latin.po | 57 +++++++++++++++-----------
po/bg.po | 57 +++++++++++++++-----------
po/bn.po | 57 +++++++++++++++-----------
po/bs.po | 49 ++++++++++++----------
po/ca.po | 57 +++++++++++++++-----------
po/cs.po | 84 +++++++++++++++++---------------------
po/cy.po | 57 +++++++++++++++-----------
po/da.po | 57 +++++++++++++++-----------
po/de.po | 57 +++++++++++++++-----------
po/el.po | 57 +++++++++++++++-----------
po/en_GB.po | 57 +++++++++++++++-----------
po/es.po | 57 +++++++++++++++-----------
po/et.po | 57 +++++++++++++++-----------
po/eu.po | 49 ++++++++++++----------
po/fa.po | 49 ++++++++++++----------
po/fi.po | 57 +++++++++++++++-----------
po/fr.po | 57 +++++++++++++++-----------
po/gl.po | 57 +++++++++++++++-----------
po/he.po | 49 ++++++++++++----------
po/hi.po | 42 +++++++++---------
po/hr.po | 57 +++++++++++++++-----------
po/hu.po | 57 +++++++++++++++-----------
po/id.po | 49 ++++++++++++----------
po/it.po | 57 +++++++++++++++-----------
po/ja.po | 57 +++++++++++++++-----------
po/ka.po | 57 +++++++++++++++-----------
po/ko.po | 57 +++++++++++++++-----------
po/lt.po | 57 +++++++++++++++-----------
po/lv.po | 49 ++++++++++++----------
po/mk.po | 49 ++++++++++++----------
po/mn.po | 57 +++++++++++++++-----------
po/ms.po | 49 ++++++++++++----------
po/nb.po | 57 +++++++++++++++-----------
po/nl.po | 67 +++++++++++++++---------------
po/phpmyadmin.pot | 42 +++++++++---------
po/pl.po | 57 +++++++++++++++-----------
po/pt.po | 56 ++++++++++++++-----------
po/pt_BR.po | 57 +++++++++++++++-----------
po/ro.po | 57 +++++++++++++++-----------
po/ru.po | 57 +++++++++++++++-----------
po/si.po | 57 +++++++++++++++-----------
po/sk.po | 57 +++++++++++++++-----------
po/sl.po | 57 +++++++++++++++-----------
po/sq.po | 49 ++++++++++++----------
po/sr.po | 57 +++++++++++++++-----------
po/sr(a)latin.po | 57 +++++++++++++++-----------
po/sv.po | 57 +++++++++++++++-----------
po/ta.po | 42 +++++++++---------
po/te.po | 42 +++++++++---------
po/th.po | 49 ++++++++++++----------
po/tr.po | 64 ++++++++++++++++-------------
po/tt.po | 57 +++++++++++++++-----------
po/ug.po | 57 +++++++++++++++-----------
po/uk.po | 42 +++++++++---------
po/ur.po | 42 +++++++++---------
po/uz.po | 57 +++++++++++++++-----------
po/uz(a)latin.po | 57 +++++++++++++++-----------
po/zh_CN.po | 57 +++++++++++++++-----------
po/zh_TW.po | 57 +++++++++++++++-----------
64 files changed, 1932 insertions(+), 1525 deletions(-)
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 911fa08..367808b 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -226,14 +226,11 @@ if(isset($_GET['sql_query'])) {
<?php
echo __('File name template:');
$trans = new PMA_Message;
- $trans->addMessage('@SERVER@ will become the');
- $trans->addString(__('server name'));
+ $trans->addMessage(__('@SERVER@ will become the server name'));
if ($export_type == 'database' || $export_type == 'table') {
- $trans->addMessage(', @DATABASE@ will become the');
- $trans->addString(__('database name'));
+ $trans->addMessage(__(', @DATABASE@ will become the database name'));
if ($export_type == 'table') {
- $trans->addMessage(', @TABLE@ will become the');
- $trans->addString(__('table name'));
+ $trans->addMessage(__(', @TABLE@ will become the table name'));
}
}
diff --git a/po/af.po b/po/af.po
index fdf2d4d..ed92c4e 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-30 23:04+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: afrikaans <af(a)li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Soek"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1808,7 +1808,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2512,7 +2512,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Omring tabel en veldname met backquotes"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4349,20 +4349,19 @@ msgstr "Stoor as leer (file)"
msgid "File name template:"
msgstr ""
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "Gebruiker naam"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4370,55 +4369,55 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Karakterstel van die leer:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr ""
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Geen"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"ge-zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"ge-gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"ge-bzip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formaat"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9359,6 +9358,10 @@ msgstr ""
msgid "Rename view to"
msgstr "Hernoem tabel na"
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "Gebruiker naam"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Verander PDF Bladsye"
diff --git a/po/ar.po b/po/ar.po
index 4cc6f0f..078e7df 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-05-29 14:16+0200\n"
"Last-Translator: Ahmed <aa.mahdawy.10(a)gmail.com>\n"
"Language-Team: arabic <ar(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "ابحث"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1809,7 +1809,7 @@ msgstr ""
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2524,7 +2524,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "حماية أسماء الجداول و الحقول ب \"`\" "
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4364,19 +4364,19 @@ msgstr "حفظ كملف"
msgid "File name template:"
msgstr "قالب اسم الملف"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "اسم الخادم"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "اسم قاعدة البيانات"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "اسم الجدول"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4384,57 +4384,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "شيفرة أحرف الملف:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "الضغط"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "لا شيء"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"مضغوط\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipped\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "صيغة"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9421,6 +9421,15 @@ msgstr ""
msgid "Rename view to"
msgstr ""
+#~ msgid "server name"
+#~ msgstr "اسم الخادم"
+
+#~ msgid "database name"
+#~ msgstr "اسم قاعدة البيانات"
+
+#~ msgid "table name"
+#~ msgstr "اسم الجدول"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "عدل صفحات PDF"
diff --git a/po/az.po b/po/az.po
index 8a175e9..6c62975 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: azerbaijani <az(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Axtarış"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1819,7 +1819,7 @@ msgstr "Gönderildi"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2538,7 +2538,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Cedvel ve sahe adlarını tek dırnaq arasına al"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4398,20 +4398,19 @@ msgstr "Fayl olaraq qeyd et"
msgid "File name template:"
msgstr "Fayl adı nomenklaturası"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "İstifadeçi adı"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4419,57 +4418,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Faylın Charset-i:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Sıxışdırma"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Heç biri"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zip\"lenmiş"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip\"lenmiş"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzip\"lenmiş"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9522,6 +9521,10 @@ msgstr ""
msgid "Rename view to"
msgstr "Cedveli yeniden adlandır"
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "İstifadeçi adı"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF Sehifelerini Deyişdir"
diff --git a/po/be.po b/po/be.po
index 4a04e47..858c139 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: belarusian_cyrillic <be(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Пошук"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1858,7 +1858,7 @@ msgstr "Адпраўлена"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2580,7 +2580,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Зваротнае двукосьсе ў імёнах табліц і палёў"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Рэжым сумяшчальнасьці SQL"
@@ -4475,19 +4475,19 @@ msgstr "Захаваць як файл"
msgid "File name template:"
msgstr "Шаблён назвы файла"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "імя сэрвэра"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "імя базы дадзеных"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "імя табліцы"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4502,57 +4502,57 @@ msgstr ""
"выкарыстоўваць радкі фарматаваньня часу. Апроч гэтага, будуць праведзеныя "
"наступныя зьмены: %3$s. Астатні тэкст застанецца як ёсьць."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Кадыроўка файла:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Сьціск"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Няма"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "архіваваны ў zip"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "архіваваны ў gzip"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "сьціскаць у bzip"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Фармат"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "Вэрсія кліента MySQL"
@@ -9886,6 +9886,15 @@ msgstr "Назва прагляду"
msgid "Rename view to"
msgstr "Перайменаваць табліцу ў"
+#~ msgid "server name"
+#~ msgstr "імя сэрвэра"
+
+#~ msgid "database name"
+#~ msgstr "імя базы дадзеных"
+
+#~ msgid "table name"
+#~ msgstr "імя табліцы"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Рэдагаваць PDF-старонкі"
diff --git a/po/be(a)latin.po b/po/be(a)latin.po
index de0edd4..0f4003a 100644
--- a/po/be(a)latin.po
+++ b/po/be(a)latin.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-30 23:09+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: belarusian_latin <be@latin@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Pošuk"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1858,7 +1858,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2573,7 +2573,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Zvarotnaje dvukośsie ŭ imionach tablic i paloŭ"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Režym sumiaščalnaści SQL"
@@ -4439,19 +4439,19 @@ msgstr "Zachavać jak fajł"
msgid "File name template:"
msgstr "Šablon nazvy fajła"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "imia servera"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "imia bazy dadzienych"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "imia tablicy"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4466,57 +4466,57 @@ msgstr ""
"možna vykarystoŭvać radki farmatavańnia času. Aproč hetaha, buduć "
"praviedzienyja nastupnyja źmieny: %3$s. Astatni tekst zastaniecca jak jość."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Kadyroŭka fajła:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Ścisk"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Nijakaja"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "archivavany ŭ zip"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "archivavany ŭ gzip"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "ściskać u bzip"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Farmat"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9832,6 +9832,15 @@ msgstr "Nazva prahladu"
msgid "Rename view to"
msgstr ""
+#~ msgid "server name"
+#~ msgstr "imia servera"
+
+#~ msgid "database name"
+#~ msgstr "imia bazy dadzienych"
+
+#~ msgid "table name"
+#~ msgstr "imia tablicy"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Redagavać PDF-staronki"
diff --git a/po/bg.po b/po/bg.po
index eb61517..27e50f1 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-06-11 17:28+0200\n"
"Last-Translator: <stanprog(a)stanprog.com>\n"
"Language-Team: bulgarian <bg(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Търсене"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1831,7 +1831,7 @@ msgstr "Изпратени"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2553,7 +2553,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Използване на обратни кавички около имена на таблици и полета"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Режим на съвместимост на SQL"
@@ -4419,19 +4419,19 @@ msgstr "Изпращане"
msgid "File name template:"
msgstr "Шаблон на файловото име"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "име на сървъра"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "име на базата от данни"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "име на таблицата"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4439,57 +4439,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Набор от знаци на файла:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Компресия"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Няма"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zip-нато\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip-нато\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzip-нато\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Формат"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "Версия на клиента за MySQL"
@@ -9602,6 +9602,15 @@ msgstr "Име на ИЗГЛЕД-а"
msgid "Rename view to"
msgstr "Преименуване на изгледа на"
+#~ msgid "server name"
+#~ msgstr "име на сървъра"
+
+#~ msgid "database name"
+#~ msgstr "име на базата от данни"
+
+#~ msgid "table name"
+#~ msgstr "име на таблицата"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Редактиране на PDF Страници"
diff --git a/po/bn.po b/po/bn.po
index a7a3728..52d7d2e 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: bangla <bn(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "খুঁজুন"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1838,7 +1838,7 @@ msgstr "bn"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2559,7 +2559,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Enclose table and field names with backquotes"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL compatibility mode"
@@ -4442,19 +4442,19 @@ msgstr "ফাইল হিসেবে সেভ করুন"
msgid "File name template:"
msgstr "ফাইল নাম এর টেমপ্লেট"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "সার্ভার এর নাম"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "ডাটাবেজ এর নাম"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "টেবিল এর নাম"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4469,57 +4469,57 @@ msgstr ""
"formatting strings. Additionally the following transformations will happen: "
"%3$s. Other text will be kept as is."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "ফাইল এর অক্ষরসমূহঃ"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "সংকোচন"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "কোনটিই নয়"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipped\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipped\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "ফরমেট"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "MySQL client version"
@@ -9773,6 +9773,15 @@ msgstr ""
msgid "Rename view to"
msgstr "টেবিল রিনেম করুন"
+#~ msgid "server name"
+#~ msgstr "সার্ভার এর নাম"
+
+#~ msgid "database name"
+#~ msgstr "ডাটাবেজ এর নাম"
+
+#~ msgid "table name"
+#~ msgstr "টেবিল এর নাম"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "পিডিএফ পাতাগুলো সম্পাদনা কর"
diff --git a/po/bs.po b/po/bs.po
index cb28947..fb61dfb 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: bosnian <bs(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Pretraživanje"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1822,7 +1822,7 @@ msgstr "Poslato"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2537,7 +2537,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Koristi ' za ograničavanje imena polja"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4393,20 +4393,19 @@ msgstr "Sačuvaj kao datoteku"
msgid "File name template:"
msgstr "Šablon imena datoteke"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "Ime korisnika"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4414,57 +4413,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Karakter set datoteke:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Kompresija"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "nema"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipovano\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip-ovano\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzip-ovano\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9508,6 +9507,10 @@ msgstr ""
msgid "Rename view to"
msgstr "Promjeni ime tabele u "
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "Ime korisnika"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Izmena PDF strana"
diff --git a/po/ca.po b/po/ca.po
index 1c9d271..225036a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:13+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: catalan <ca(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Cerca"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1852,7 +1852,7 @@ msgstr "Enviat"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2599,7 +2599,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Usa "backquotes" amb taules i noms de camps"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Modus de compatibilitat SQL"
@@ -4640,19 +4640,19 @@ msgstr "Desa com a arxiu"
msgid "File name template:"
msgstr "Nom d'arxiu de plantilla"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "nom de servidor"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "nom de base de dades"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "nom de taula"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4667,57 +4667,57 @@ msgstr ""
"cadenes de formateig de temps. A més, es faràn aquestes transformacions: "
"%3$s. Altre text es deixarà sense variació."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Joc de caràcters de l'arxiu:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Compresió"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Res"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"comprimit amb zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"comprimit amb gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"comprimit amb bzip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10165,6 +10165,15 @@ msgstr "Nom de VISTA"
msgid "Rename view to"
msgstr "Reanomena les taules a"
+#~ msgid "server name"
+#~ msgstr "nom de servidor"
+
+#~ msgid "database name"
+#~ msgstr "nom de base de dades"
+
+#~ msgid "table name"
+#~ msgstr "nom de taula"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Edita pàgines PDF"
diff --git a/po/cs.po b/po/cs.po
index c887de5..d4d17c9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-27 13:41+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
@@ -57,7 +57,7 @@ msgstr "Vyhledávání"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1660,7 +1660,6 @@ msgid "Could not open file: %s"
msgstr "Chyba při otevírání souboru: %s"
#: libraries/chart.lib.php:41
-#| msgid "Show statistics"
msgid "Query statistics"
msgstr "Statistika dotazu"
@@ -1669,7 +1668,6 @@ msgid "Query execution time comparison (in microseconds)"
msgstr "Porovnání běhu dotazu (v mikrosekundách)"
#: libraries/chart.lib.php:84
-#| msgid "Query results operations"
msgid "Query results"
msgstr "Výsledky dotazu"
@@ -1758,7 +1756,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2454,7 +2452,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Použít zpětné uvozovky u jmen tabulek a polí"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Režim kompatibility SQL"
@@ -3248,18 +3246,14 @@ msgid "Protect binary columns"
msgstr "Chránit binární pole"
#: libraries/config/messages.inc.php:329
-#| msgid ""
-#| "Enable if you want DB-based query history (requires pmadb). If disabled, "
-#| "this utilizes JS-routines to display query history (lost by window close)."
msgid ""
"Enable if you want DB-based query history (requires phpMyAdmin configuration "
"storage). If disabled, this utilizes JS-routines to display query history "
"(lost by window close)."
msgstr ""
"Povolte pokud chcete histori dotazů založenou na databázi (vyžaduje úložiště "
-"nastavení phpMyAdmina). Pokud toto zakážete, využijí se k zobrazení "
-"historie Java Scriptové rutiny (se zavřením okna ztratíte předchozí "
-"historii)."
+"nastavení phpMyAdmina). Pokud toto zakážete, využijí se k zobrazení historie "
+"Java Scriptové rutiny (se zavřením okna ztratíte předchozí historii)."
#: libraries/config/messages.inc.php:330
msgid "Permanent query history"
@@ -3933,8 +3927,7 @@ msgstr "Navrhnout jméno nové databáze"
#: libraries/config/messages.inc.php:470
msgid "A warning is displayed on the main page if Suhosin is detected"
msgstr ""
-"Na hlavní stránce je zobrazeno varování pokud je detekování rozšíření "
-"Suhosin"
+"Na hlavní stránce je zobrazeno varování pokud je detekování rozšíření Suhosin"
#: libraries/config/messages.inc.php:471
msgid "Suhosin warning"
@@ -3957,7 +3950,6 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:475
-#| msgid "CHAR textarea rows"
msgid "Textarea rows"
msgstr "Řádků v textové oblasti"
@@ -4357,19 +4349,19 @@ msgstr "Uložit do souboru"
msgid "File name template:"
msgstr "Šablona pro jméno souboru:"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "jméno serveru"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "jméno databáze"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "jméno tabulky"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4381,47 +4373,47 @@ msgstr ""
"následující nahrazení: %3$s. Jakýkoliv jiný text zůstane zachován beze "
"změny. Více podrobností je ve %4$sFAQ%5$s."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr "použít i pro budoucí exporty"
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Znaková sada souboru:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr "Komprese:"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Žádná"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr "„zazipováno“"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr "„zagzipováno“"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr "„zabzipováno“"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr "Formát:"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr "Parametry pro výstupní formát:"
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr "Převod znakové sady:"
@@ -4645,7 +4637,6 @@ msgid "Print view (with full texts)"
msgstr "Náhled pro tisk (s kompletními texty)"
#: libraries/display_tbl.lib.php:2189 tbl_chart.php:82
-#| msgid "Display PDF schema"
msgid "Display chart"
msgstr "Zobrazit graf"
@@ -8977,20 +8968,16 @@ msgid "Restart insertion with %s rows"
msgstr "Začít znovu vkládání s %s řádky"
#: tbl_chart.php:57
-#| msgid "The privileges were reloaded successfully."
msgid "Chart generated successfully."
msgstr "Graf byl úspěšně vytvořen"
#: tbl_chart.php:60
-#| msgid ""
-#| "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ "
-#| "3.11[/a]"
msgid ""
"The result of this query can't be used for a chart. See [a@./Documentation."
"html#faq6_29@Documentation]FAQ 6.29[/a]"
msgstr ""
-"Výsledek tohoto dotazu nelze použít pro graf. Více informací nalezne ve "
-"[a@./Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]"
+"Výsledek tohoto dotazu nelze použít pro graf. Více informací nalezne ve [a@./"
+"Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]"
#: tbl_chart.php:91
msgid "Width"
@@ -9021,7 +9008,6 @@ msgid "Legend margins"
msgstr "Okraje popisu"
#: tbl_chart.php:135
-#| msgid "Mar"
msgid "Bar"
msgstr "Sloupec"
@@ -9034,17 +9020,14 @@ msgid "Radar"
msgstr "Síť"
#: tbl_chart.php:139
-#| msgid "PiB"
msgid "Pie"
msgstr "Koláč"
#: tbl_chart.php:145
-#| msgid "Query type"
msgid "Bar type"
msgstr "Typ sloupců"
#: tbl_chart.php:147
-#| msgid "Packed"
msgid "Stacked"
msgstr "Skládané"
@@ -9577,6 +9560,15 @@ msgstr "Jméno pohledu"
msgid "Rename view to"
msgstr "Přejmenovat pohled na"
+#~ msgid "server name"
+#~ msgstr "jméno serveru"
+
+#~ msgid "database name"
+#~ msgstr "jméno databáze"
+
+#~ msgid "table name"
+#~ msgstr "jméno tabulky"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Upravit PDF stránky"
diff --git a/po/cy.po b/po/cy.po
index 5474aaa..0bbc157 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-06-07 20:23+0200\n"
"Last-Translator: <ardavies(a)tiscali.co.uk>\n"
"Language-Team: Welsh <cy(a)li.org>\n"
@@ -57,7 +57,7 @@ msgstr "Chwilio"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1761,7 +1761,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2471,7 +2471,7 @@ msgid "Enclose table and column names with backquotes"
msgstr ""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Modd cytunedd SQL"
@@ -4318,19 +4318,19 @@ msgstr "Cadw fel ffeil"
msgid "File name template:"
msgstr "Templed enw ffeil"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "enw gweinydd"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "enw cronfa ddata"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "enw tabl"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4338,57 +4338,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Set nodau'r ffeil:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Cywasgiad"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Dim"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zip-iwyd\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip-iwyd\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzip-iwyd\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Fformat"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9235,6 +9235,15 @@ msgstr "Enw VIEW"
msgid "Rename view to"
msgstr "Ailenwch golwg i"
+#~ msgid "server name"
+#~ msgstr "enw gweinydd"
+
+#~ msgid "database name"
+#~ msgstr "enw cronfa ddata"
+
+#~ msgid "table name"
+#~ msgstr "enw tabl"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Golygwch Dudalennau PDF"
diff --git a/po/da.po b/po/da.po
index 305a9f6..4d9665e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-21 14:55+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: danish <da(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Søg"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1840,7 +1840,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2553,7 +2553,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Brug \"backquotes\" omkring tabeller og felters navne"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL-kompatibilitetsmodus"
@@ -4404,19 +4404,19 @@ msgstr "Send (download)"
msgid "File name template:"
msgstr "Skabelon for filnavn"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "servernavn"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "databasenavn"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "tabelnavn"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4431,57 +4431,57 @@ msgstr ""
"strenge. Ydermere vil følgende transformationer foregå: %3$s. Anden tekst "
"vil blive bevaret som det er."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Tegnsæt for filen:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Komprimering"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Ingen"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zippet\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipped\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9713,6 +9713,15 @@ msgstr "VIEW navn"
msgid "Rename view to"
msgstr ""
+#~ msgid "server name"
+#~ msgstr "servernavn"
+
+#~ msgid "database name"
+#~ msgstr "databasenavn"
+
+#~ msgid "table name"
+#~ ms
gstr "tabelnavn"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Redigér PDF-sider"
diff --git a/po/de.po b/po/de.po
index 820f5f6..747b178 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-31 21:09+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: german <de(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Suche"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1799,7 +1799,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2547,7 +2547,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Tabellen- und Feldnamen in einfachen Anführungszeichen "
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL-Kompatibilitätsmodus"
@@ -4585,19 +4585,19 @@ msgstr "Senden"
msgid "File name template:"
msgstr "Dateinamenskonvention"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "Server-Name"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "Datenbank-Name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "Tabellen-Name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4612,57 +4612,57 @@ msgstr ""
"für Datum und Uhrzeit verwenden. Darüber hinaus werden folgende Umformungen "
"durchgeführt: %3$s. Der übrige Text bleibt unberührt."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Zeichencodierung der Datei:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Kompression"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "keine"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "Zip-komprimiert"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "GZip-komprimiert"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "BZip-komprimiert"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Encoding conversion"
msgid "Encoding Conversion:"
@@ -10107,6 +10107,15 @@ msgstr "VIEW Name"
msgid "Rename view to"
msgstr "View umbenennen in"
+#~ msgid "server name"
+#~ msgstr "Server-Name"
+
+#~ msgid "database name"
+#~ msgstr "Datenbank-Name"
+
+#~ msgid "table name"
+#~ msgstr "Tabellen-Name"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF-Seiten bearbeiten"
diff --git a/po/el.po b/po/el.po
index 53beb9f..bb65f2b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-30 23:16+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: greek <el(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Αναζήτηση"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1828,7 +1828,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2575,7 +2575,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Χρήση ανάποδων εισαγωγικών στα ονόματα των Πινάκων και των Πεδίων"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Κατάσταση συμβατότητας SQL"
@@ -4612,19 +4612,19 @@ msgstr "Αποστολή"
msgid "File name template:"
msgstr "Μορφή ονόματος αρχείου"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "όνομα διακομιστή"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "όνομα βάσης δεδομένων"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "όνομα πίνακα"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4640,54 +4640,54 @@ msgstr ""
"και οι ακόλουθες μετατροπές: %3$s. Το υπόλοιπο κείμενο θα παραμείνει όπως "
"είναι."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Σύνολο χαρακτήρων του αρχείου:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Συμπίεση"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Καμία"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
msgid "zipped"
msgstr "συμπίεση «zip»"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
msgid "gzipped"
msgstr "συμπίεση «gzip»"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
msgid "bzipped"
msgstr "συμπίεση «bzip»"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Μορφοποίηση"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "Μηχανή επανακωδικοποίησης"
@@ -10174,6 +10174,15 @@ msgstr "ΠΡΟΒΟΛΗ ονόματος"
msgid "Rename view to"
msgstr "Μετονομασία πίνακα σε"
+#~ msgid "server name"
+#~ msgstr "όνομα διακομιστή"
+
+#~ msgid "database name"
+#~ msgstr "όνομα βάσης δεδομένων"
+
+#~ msgid "table name"
+#~ msgstr "όνομα πίνακα"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Αλλαγή σελίδων PDF"
diff --git a/po/en_GB.po b/po/en_GB.po
index 3ccba2f..70a863f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-24 14:12+0200\n"
"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n"
"Language-Team: english-gb <en_GB(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Search"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1752,7 +1752,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2449,7 +2449,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Enclose table and column names with backquotes"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL compatibility mode"
@@ -4365,19 +4365,19 @@ msgstr "Save output to a file"
msgid "File name template:"
msgstr "File name template:"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "server name"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4388,47 +4388,47 @@ msgstr ""
"formatting strings. Additionally the following transformations will happen: "
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr "use this for future exports"
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Character set of the file:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr "Compression:"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "None"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr "zipped"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr "gzipped"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr "bzipped"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr "Format:"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr "Format-Specific Options:"
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr "Encoding Conversion:"
@@ -9634,6 +9634,15 @@ msgstr "VIEW name"
msgid "Rename view to"
msgstr "Rename view to"
+#~ msgid "server name"
+#~ msgstr "server name"
+
+#~ msgid "database name"
+#~ msgstr "database name"
+
+#~ msgid "table name"
+#~ msgstr "table name"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Edit PDF Pages"
diff --git a/po/es.po b/po/es.po
index bcb453d..5b7823d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 11:23+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: spanish <es(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Buscar"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1869,7 +1869,7 @@ msgstr "es"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2610,7 +2610,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Usar \"backquotes\" con tablas y nombres de campo"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Modalidad compatible con SQL"
@@ -4605,19 +4605,19 @@ msgstr "Enviar (genera un archivo descargable)"
msgid "File name template:"
msgstr "Plantilla del nombre del archivo"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "nombre del servidor"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "nombre de la base de datos"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "nombre de la tabla"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4633,57 +4633,57 @@ msgstr ""
"sucederán las siguientes transformaciones: %3$s. El texto restante se "
"mantendrá como está."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Juego de caracteres del archivo:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Compresión"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Ninguna"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"comprimido con zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"Comprimido con gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"Comprimido con bzip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formato"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10136,6 +10136,15 @@ msgstr "(VIEW) VER nombre"
msgid "Rename view to"
msgstr "Cambiar el nombre de la tabla a"
+#~ msgid "server name"
+#~ msgstr "nombre del servidor"
+
+#~ msgid "database name"
+#~ msgstr "nombre de la base de datos"
+
+#~ msgid "table name"
+#~ msgstr "nombre de la tabla"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Editar las páginas PDF"
diff --git a/po/et.po b/po/et.po
index ebc9703..eaaa420 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: estonian <et(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Otsi"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1838,7 +1838,7 @@ msgstr "Saadetud"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2559,7 +2559,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Kasutage tagurpidi kaldkriipse tabelites või tabelinimedes"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL ühilduvus viis"
@@ -4444,19 +4444,19 @@ msgstr "Salvesta failina"
msgid "File name template:"
msgstr "Faili nime template"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "serveri nimi"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "andmebaasi nimi"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "tabeli nimi"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4471,57 +4471,57 @@ msgstr ""
"sama aja(time) formaati. Lisaks tulevad ka järgnevad muudatused: %3$s. "
"Ülejäänud teks jääb nii nagu ta on."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Faili tähetabel:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Pakkimine"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Pole"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipitud\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipitud\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipitud\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formaat"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "MySQL kliendi versioon"
@@ -9760,6 +9760,15 @@ msgstr ""
msgid "Rename view to"
msgstr "Nimeta tabel ümber"
+#~ msgid "server name"
+#~ msgstr "serveri nimi"
+
+#~ msgid "database name"
+#~ msgstr "andmebaasi nimi"
+
+#~ msgid "table name"
+#~ msgstr "tabeli nimi"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Muuda PDF lehti"
diff --git a/po/eu.po b/po/eu.po
index d79abf6..65c2343 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-21 14:53+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: basque <eu(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Bilatu"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1824,7 +1824,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2542,7 +2542,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "\"Backquotes\" erabili taula eta eremuen izenekin "
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4397,20 +4397,19 @@ msgstr "Bidali"
msgid "File name template:"
msgstr "Txantiloi-fitxategiaren izena"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "Erabiltzaile-izena"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4418,57 +4417,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Fitxategiaren karaktereen kodeketa:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Trinkotzea"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Batez"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipatuta\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip-ez trinkotuta\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"Bzip-ez trinkotua\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formatoa"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9539,6 +9538,10 @@ msgstr ""
msgid "Rename view to"
msgstr "Taula berrizendatu izen honetara: "
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "Erabiltzaile-izena"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Editatu PDF Orriak"
diff --git a/po/fa.po b/po/fa.po
index d4ca49b..5bac5c1 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-05-19 03:54+0200\n"
"Last-Translator: <ahmad_usa2007(a)yahoo.com>\n"
"Language-Team: persian <fa(a)li.org>\n"
@@ -51,7 +51,7 @@ msgstr "جستجو"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1797,7 +1797,7 @@ msgstr ""
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2511,7 +2511,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "قراردادن نام جدولها و ستونها بين علامت نقلقول (\" ' \")"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4345,20 +4345,19 @@ msgstr "ذخيره به صورت پرونده"
msgid "File name template:"
msgstr ""
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "نام كاربر"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4366,57 +4365,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "مجموعه كاراكترهاي پرونده:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "فشردهسازي"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "خير"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipped\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipped\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "قالب"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9335,6 +9334,10 @@ msgstr ""
msgid "Rename view to"
msgstr "بازناميدن جدول به"
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "نام كاربر"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "ويرايش صفحات PDF"
diff --git a/po/fi.po b/po/fi.po
index b66f35d..49a5648 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-04-30 18:08+0200\n"
"Last-Translator: <kajouni(a)gmail.com>\n"
"Language-Team: finnish <fi(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Etsi"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1848,7 +1848,7 @@ msgstr "Lähetetty"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2593,7 +2593,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Pane taulujen ja sarakkeiden nimet lainausmerkkeihin"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL-yhteensopiva tila"
@@ -4625,19 +4625,19 @@ msgstr "Tallenna tiedostoon"
msgid "File name template:"
msgstr "Tiedostonimen pohja"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "palvelimen nimi"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "tietokannan nimi"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "taulun nimi"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4652,57 +4652,57 @@ msgstr ""
"ajanmuodostostusmerkkijonoja voi käyttää. Lisäksi tapahtuu seuraavat "
"muutokset: %3$s. Muu teksti pysyy alkuperäisenä."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Tiedoston merkistö:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Pakkaus"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Ei mitään"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zip-pakattu\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip-pakkaus\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzip-pakkaus\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Muoto"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10142,6 +10142,15 @@ msgstr "VIEW-arvon nimi"
msgid "Rename view to"
msgstr "Nimeä taulu uudelleen"
+#~ msgid "server name"
+#~ msgstr "palvelimen nimi"
+
+#~ msgid "database name"
+#~ msgstr "tietokannan nimi"
+
+#~ msgid "table name"
+#~ msgstr "taulun nimi"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Muokkaa PDF-sivuja"
diff --git a/po/fr.po b/po/fr.po
index d227d25..130bc47 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-21 20:02+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Rechercher"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1776,7 +1776,7 @@ msgstr "fr"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2522,7 +2522,7 @@ msgid "Enclose table and column names with backquotes"
msgstr ""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Mode de compatibilité SQL"
@@ -4549,19 +4549,19 @@ msgstr "Diriger la sortie vers un fichier"
msgid "File name template:"
msgstr "Modèle de nom de fichier:"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "nom de serveur"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "nom de base de données"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "nom de table"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4573,47 +4573,47 @@ msgstr ""
"vont se produire: %3$s. Tout autre texte sera conservé tel quel. Se référer "
"au %4$sFAQ%5$s pour les détails."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr "utiliser ceci pour les futures exportations"
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Jeu de caractères du fichier: "
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr "Compression:"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Aucune"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr "«zippé »"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr " «gzippé »"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr " «bzippé »"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr "Format:"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr "Options spécifiques au format:"
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr "Conversion de l'encodage:"
@@ -9949,6 +9949,15 @@ msgstr "Nom de la vue"
msgid "Rename view to"
msgstr "Changer le nom de la vue pour"
+#~ msgid "server name"
+#~ msgstr "nom de serveur"
+
+#~ msgid "database name"
+#~ msgstr "nom de base de données"
+
+#~ msgid "table name"
+#~ msgstr "nom de table"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Préparer le schéma en PDF"
diff --git a/po/gl.po b/po/gl.po
index cf5095a..13c93b9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-21 14:50+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: galician <gl(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Procurar"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1856,7 +1856,7 @@ msgstr "Enviado"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2608,7 +2608,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Protexer os nomes das táboas e dos campos con \" ` \""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Modo de compatiblidade SQL"
@@ -4664,19 +4664,19 @@ msgstr "Enviar <i>(gravar nun ficheiro)</i><br />"
msgid "File name template:"
msgstr "Modelo para o nome de ficheiro"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "nome do servidor"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "nome da base de datos"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "nome da táboa"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4691,57 +4691,57 @@ msgstr ""
"utilizar cadeas de formato de hora. Produciranse transformacións en "
"consecuencia: %3$s. O resto do texto ficará como está."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Conxunto de caracteres do ficheiro:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Compresión"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Ningunha"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "comprimido no formato \"zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "comprimido no formato \"gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "comprimido no formato \"bzip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formato"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10188,6 +10188,15 @@ msgstr "Nome da VISTA"
msgid "Rename view to"
msgstr "Mudar o nome da táboa para"
+#~ msgid "server name"
+#~ msgstr "nome do servidor"
+
+#~ msgid "database name"
+#~ msgstr "nome da base de datos"
+
+#~ msgid "table name"
+#~ msgstr "nome da táboa"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Editar as páxinas PDF"
diff --git a/po/he.po b/po/he.po
index f0665f0..30fb4cb 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:15+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: hebrew <he(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "חיפוש"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1806,7 +1806,7 @@ msgstr "נשלח"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2524,7 +2524,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "צירוף תוי ציטוט (backquotes) אל שמות טבלאות ושדות"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4383,20 +4383,19 @@ msgstr "שמירה כקובץ"
msgid "File name template:"
msgstr "תבנית שם קובץ"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "שם משתמש"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4404,57 +4403,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "חבילת הקידוד של הקובץ:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "דחיסה"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "ללא"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipped\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipped\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "תבנית"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9424,6 +9423,10 @@ msgstr ""
msgid "Rename view to"
msgstr "שינוי שם טבלה אל"
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "שם משתמש"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "עריכת דפי PDG"
diff --git a/po/hi.po b/po/hi.po
index 9bfbf75..8bc3708 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-05-21 05:48+0200\n"
"Last-Translator: <u4663530(a)anu.edu.au>\n"
"Language-Team: hindi <hi(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "खोजें"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1755,7 +1755,7 @@ msgstr "इंग्लिश"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2455,7 +2455,7 @@ msgid "Enclose table and column names with backquotes"
msgstr " टेबल और फील्ड के नाम को backquotes से Enclose करें"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4289,19 +4289,19 @@ msgstr "फाईल मे सेव करें"
msgid "File name template:"
msgstr ""
-#: libraries/display_export.lib.php:230
-msgid "server name"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4309,47 +4309,47 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr ""
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr ""
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr ""
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr ""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr ""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr ""
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
diff --git a/po/hr.po b/po/hr.po
index bf14cf4..3ff3daf 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-21 14:54+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: croatian <hr(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Traži"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1854,7 +1854,7 @@ msgstr "Poslano"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2575,7 +2575,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Unesi nazive tablica i polja sa stražnjim navodnicima"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Način rada SQL kompatibilnosti"
@@ -4460,19 +4460,19 @@ msgstr "Spremi kao datoteku"
msgid "File name template:"
msgstr "Predložak naziva datoteka"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "naziv poslužitelja"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "naziv baze podataka"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "naziv tablice"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4487,57 +4487,57 @@ msgstr ""
"naredbe oblikovanja vremena. Dodatno se mogu dogoditi sljedeća "
"preoblikovanja: \"%3$s\". Ostatak teksta bit će zadržan u izvornom obliku."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Tablica znakova za datoteku:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Kompresija"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "bez kompresije"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipano\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipano\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipano\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Oblikovanje"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "MySQL verzija klijenta"
@@ -9848,6 +9848,15 @@ msgstr "Naziv prikaza"
msgid "Rename view to"
msgstr "Preimenuj tablicu u"
+#~ msgid "server name"
+#~ msgstr "naziv poslužitelja"
+
+#~ msgid "database name"
+#~ msgstr "naziv baze podataka"
+
+#~ msgid "table name"
+#~ msgstr "naziv tablice"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Uredi PDF stranice"
diff --git a/po/hu.po b/po/hu.po
index 78fd36c..b7de7f0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:22+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: hungarian <hu(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Keresés"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1857,7 +1857,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2607,7 +2607,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Idézőjelek használata a tábla- és mezőneveknél"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL kompatibilitási mód"
@@ -4656,19 +4656,19 @@ msgstr "Mentés fájlként"
msgid "File name template:"
msgstr "Fájlnévsablon"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "szerver neve"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "adatbázis neve"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "tábla neve"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4683,57 +4683,57 @@ msgstr ""
"vagyis időformázó karakterláncokat használhat. A következő átalakításokra "
"kerül továbbá sor: %3$s. Más szöveg eredeti állapotában kerül megtartásra."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "A fájl karakterkészlete:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Tömörítés"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Nincs"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zip tömörítés\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip tömörítés\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"b
zipped\""
msgid "bzipped"
msgstr "\"bzip tömörítés\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formátum"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10157,6 +10157,15 @@ msgstr "NÉZET neve"
msgid "Rename view to"
msgstr "Tábla átnevezése"
+#~ msgid "server name"
+#~ msgstr "szerver neve"
+
+#~ msgid "database name"
+#~ msgstr "adatbázis neve"
+
+#~ msgid "table name"
+#~ msgstr "tábla neve"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF oldalak szerkesztése"
diff --git a/po/id.po b/po/id.po
index 90a9b62..aa49cd8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-06-16 01:45+0200\n"
"Last-Translator: <jack.hakim(a)yahoo.com>\n"
"Language-Team: indonesian <id(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Cari"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1817,7 +1817,7 @@ msgstr "id"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2538,7 +2538,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Nama tabel dan nama field dalam tanda kutip biasa"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4408,20 +4408,19 @@ msgstr "Kirimkan ke"
msgid "File name template:"
msgstr "Konvensi nama file"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "Nama pengguna"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4429,57 +4428,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Penyusunan karakter dalam file:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Kompresi"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "tanpa"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "Dikompress dengan Zip"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "Dikompress dengan GZip"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"Dikompress dengan BZip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9611,6 +9610,10 @@ msgstr "Nama VIEW"
msgid "Rename view to"
msgstr "Ubah nama tabel menjadi "
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "Nama pengguna"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Ubah halaman PDF"
diff --git a/po/it.po b/po/it.po
index 5a6f2d6..66eedb6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-22 19:39+0200\n"
"Last-Translator: <rebeluca(a)gmail.com>\n"
"Language-Team: italian <it(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Cerca"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1771,7 +1771,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2498,7 +2498,7 @@ msgid "Enclose table and column names with backquotes"
msgstr ""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Modo di compatibilità SQL"
@@ -4406,19 +4406,19 @@ msgstr "Salva con nome..."
msgid "File name template:"
msgstr "Nome file template"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "nome server"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "nome database"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "nome tabella"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4433,57 +4433,57 @@ msgstr ""
"usare stringhe di formattazione per le date/tempi. Verranno anche aggiunte "
"le seguenti trasformazioni: %3$s. Il testo rimanente resterà invariato."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Set di caratteri del file:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Compressione"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Nessuno"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"compresso con zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"compresso con gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"compresso con bzip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formato"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Use light version"
msgid "Encoding Conversion:"
@@ -9853,6 +9853,15 @@ msgstr "Nome VISTA"
msgid "Rename view to"
msgstr "Rinomina la tabella in"
+#~ msgid "server name"
+#~ msgstr "nome server"
+
+#~ msgid "database name"
+#~ msgstr "nome database"
+
+#~ msgid "table name"
+#~ msgstr "nome tabella"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Modifica pagine PDF"
diff --git a/po/ja.po b/po/ja.po
index e9b8107..2d045f3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 11:22+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: japanese <jp(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "検索"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1830,7 +1830,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2543,7 +2543,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "テーブル名やフィールド名を逆クォートで囲む"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL互換モード"
@@ -4407,19 +4407,19 @@ msgstr "ファイルに保存する"
msgid "File name template:"
msgstr "ファイル名のテンプレート"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "サーバ名"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "データベース名"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "テーブル名"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4434,57 +4434,57 @@ msgstr ""
"式文字列を利用できます。また、次の変換も行われます。%3$s それ以外のテキストは"
"修正されません"
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "ファイルの文字セット:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "圧縮"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "なし"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zip 形式\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip 形式\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzip 形式\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "フォーマット"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "encoding conversion"
msgid "Encoding Conversion:"
@@ -9720,6 +9720,15 @@ msgstr "VIEW の名前"
msgid "Rename view to"
msgstr ""
+#~ msgid "server name"
+#~ msgstr "サーバ名"
+
+#~ msgid "database name"
+#~ msgstr "データベース名"
+
+#~ msgid "table name"
+#~ msgstr "テーブル名"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF ページを編集する"
diff --git a/po/ka.po b/po/ka.po
index bf3330d..014f59a 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: georgian <ka(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "ძებნა"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1850,7 +1850,7 @@ msgstr "ka"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2594,7 +2594,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Enclose table and field names with backquotes"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL compatibility mode"
@@ -4609,19 +4609,19 @@ msgstr "ფაილის სახის შენახვა"
msgid "File name template:"
msgstr "File name template"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "სერვერის სახელი"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "მონაცემთა ბაზა"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "ცხრილის სახელი"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4636,57 +4636,57 @@ msgstr ""
"formatting strings. Additionally the following transformations will happen: "
"%3$s. Other text will be kept as is."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "სიმბოლოთა ნაკრები ფაილისთვის:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "შეკუმშვა"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "არაა"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zip-ით შეკუმშული\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip-ით დაარქივებული\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzip-ით დაარქივებული\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "ფორმატი"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10055,6 +10055,15 @@ msgstr "VIEW name"
msgid "Rename view to"
msgstr "Rename table to"
+#~ msgid "server name"
+#~ msgstr "სერვერის სახელი"
+
+#~ msgid "database name"
+#~ msgstr "მონაცემთა ბაზა"
+
+#~ msgid "table name"
+#~ msgstr "ცხრილის სახელი"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF გვერდების რედაქტირება"
diff --git a/po/ko.po b/po/ko.po
index 41e0694..ca34a74 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-06-16 18:18+0200\n"
"Last-Translator: <cihar(a)nvyu.net>\n"
"Language-Team: korean <ko(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "검색"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1753,7 +1753,7 @@ msgstr "ko"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2466,7 +2466,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "테이블, 필드명에 백쿼터(`) 사용"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4324,19 +4324,19 @@ msgstr "파일로 저장"
msgid "File name template:"
msgstr "파일명 템플릿"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "서버명"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "데이터베이스명"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "테이블명"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4344,57 +4344,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "파일 문자셋:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "압축"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "없음"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "zip 압축"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "gz 압축"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bz 압축\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9335,6 +9335,15 @@ msgstr ""
msgid "Rename view to"
msgstr "테이블 이름 바꾸기"
+#~ msgid "server name"
+#~ msgstr "서버명"
+
+#~ msgid "database name"
+#~ msgstr "데이터베이스명"
+
+#~ msgid "table name"
+#~ msgstr "테이블명"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF 페이지 편집"
diff --git a/po/lt.po b/po/lt.po
index 261d7c5..21f4949 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-23 12:05+0200\n"
"Last-Translator: Kęstutis <forkik(a)gmail.com>\n"
"Language-Team: lithuanian <lt(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Paieška"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1808,7 +1808,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2530,7 +2530,7 @@ msgid "Enclose table and column names with backquotes"
msgstr ""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL suderinamumo režimas"
@@ -4444,19 +4444,19 @@ msgstr "Išsaugoti į failą"
msgid "File name template:"
msgstr "Failo pavadinimo šablonas:"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "serverio vardas"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "duomenų bazės vardas"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "lentelės vardas"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4467,47 +4467,47 @@ msgstr ""
"keisti laiko formatavimą. Taip pat pakeičiamos šios eilutės: %3$s. Kitas "
"tekstas bus paliktas kaip yra. Žiūrėti %4$sDUK%5$s smulkesnei informacijai."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr "naudoti šitai ateities eksportams"
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Simbolių koduotė faile:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr "Glaudinti:"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Ne"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr "zip"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr "gzip"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr "bzip"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr "Formatas:"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr "Formato specifiniai nustatymai:"
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr "Koduotės konvertavimas:"
@@ -9663,6 +9663,15 @@ msgstr "VIEW vardas"
msgid "Rename view to"
msgstr "Pervadinti lentelę į"
+#~ msgid "server name"
+#~ msgstr "serverio vardas"
+
+#~ msgid "database name"
+#~ msgstr "duomenų bazės vardas"
+
+#~ msgid "table name"
+#~ msgstr "lentelės vardas"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Redaguoti PDF puslapius"
diff --git a/po/lv.po b/po/lv.po
index db5127f..feb18ff 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:16+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: latvian <lv(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Meklēt"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1825,7 +1825,7 @@ msgstr "Nosūtīts"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2541,7 +2541,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Lietot apostrofa simbolu [`] tabulu un lauku nosaukumiem"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4398,20 +4398,19 @@ msgstr "Saglabāt kā failu"
msgid "File name template:"
msgstr "Faila nosaukuma šablons"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "Lietotājvārds"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4419,57 +4418,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Tabulas kodējums:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Kompresija"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Nav"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "Arhivēts ar zip"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "Arhivēts ar gzip"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "Arhivēts ar bzip"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formats"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9547,6 +9546,10 @@ msgstr ""
msgid "Rename view to"
msgstr "Pārsaukt tabulu uz"
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "Lietotājvārds"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Labot PDF lapas"
diff --git a/po/mk.po b/po/mk.po
index d04a0b2..67e4786 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:16+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: macedonian_cyrillic <mk(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Пребарување"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1828,7 +1828,7 @@ msgstr "Пратено"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2548,7 +2548,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Името на полето стави го во '"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4414,20 +4414,19 @@ msgstr "Сочувај како податотека"
msgid "File name template:"
msgstr "Шаблон на име на податотека"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "Назив на корисник"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4435,57 +4434,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Кодна страна на податотеката:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Компресија"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "нема"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Формат"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9612,6 +9611,10 @@ msgstr ""
msgid "Rename view to"
msgstr "Промени го името на табелата во "
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "Назив на корисник"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Уредување на PDF страница"
diff --git a/po/mn.po b/po/mn.po
index 64d7c0e..0b02beb 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: mongolian <mn(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Хайх"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1810,7 +1810,7 @@ msgstr ""
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2523,7 +2523,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Хүснэгт ба талбарын нэрийг буруу хашилтаар хаах"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL нийцтэй горим"
@@ -4373,19 +4373,19 @@ msgstr "Илгээх"
msgid "File name template:"
msgstr "Файлын нэрийн загвар"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "сервэрийн нэр"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "өгөгдлийн сангийн нэр"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "хүснэгтийн нэр"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4400,57 +4400,57 @@ msgstr ""
"тогтнолын тэмдэгтийг хэрэглэж болно. Нэмэлтээр дараах хувиргалт байх болно: "
"%3$s. Бусад бичвэрүүд үүн шиг хадгалагдана."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Файлын кодлол:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Шахалт"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Байхгүй"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "zip-ээр шахах"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "gzip-ээр шахах"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "bzip-ээр шахагдсан"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Тогтнол"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9565,6 +9565,15 @@ msgstr ""
msgid "Rename view to"
msgstr ""
+#~ msgid "server name"
+#~ msgstr "сервэрийн нэр"
+
+#~ msgid "database name"
+#~ msgstr "өгөгдлийн сангийн нэр"
+
+#~ msgid "table name"
+#~ msgstr "хүснэгтийн нэр"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF-хуудаснуудыг засах"
diff --git a/po/ms.po b/po/ms.po
index d6f3e58..dc1b367 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: malay <ms(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Cari"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1810,7 +1810,7 @@ msgstr "Hantar"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2520,7 +2520,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Sertakan nama jadual dan medan dengan backquotes"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4361,20 +4361,19 @@ msgstr "Simpan sebagai fail"
msgid "File name template:"
msgstr "Percubaan Gagal"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "Kata Pengenalan"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4382,57 +4381,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Fail bagi set Aksara:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Mampatan"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Tiada"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipped\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"digzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "bzipped"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9390,6 +9389,10 @@ msgstr ""
msgid "Rename view to"
msgstr "Tukarnama jadual ke"
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "Kata Pengenalan"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Ubah Halaman PDF"
diff --git a/po/nb.po b/po/nb.po
index 89ceaa7..7261c4b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 08:43+0200\n"
"Last-Translator: <sven.erik.andersen(a)gmail.com>\n"
"Language-Team: norwegian <no(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Søk"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1774,7 +1774,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2500,7 +2500,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Bruk venstre anførselstegn med tabell og kolonnenavn"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL kompatibilitetsmodus"
@@ -4484,19 +4484,19 @@ msgstr "Lagre som fil"
msgid "File name template:"
msgstr "Filnavnsmal"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "tjenernavn"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "databasenavn"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "tabellnavn"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4511,57 +4511,57 @@ msgstr ""
"tidformateringsstrenger. I tillegg vil følgende transformasjoner skje: %3$s. "
"All annen tekst beholdes som den er."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Filens tegnsett:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Kompresjon"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Ingen"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "Komprimert (zip)"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "Komprimert (gz)"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "Komprimert (bz2)"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Encoding conversion"
msgid "Encoding Conversion:"
@@ -9860,6 +9860,15 @@ msgstr "VIEW navn"
msgid "Rename view to"
msgstr "Endre tabellens navn"
+#~ msgid "server name"
+#~ msgstr "tjenernavn"
+
+#~ msgid "database name"
+#~ msgstr "databasenavn"
+
+#~ msgid "table name"
+#~ msgstr "tabellnavn"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Rediger PDF-sider"
diff --git a/po/nl.po b/po/nl.po
index a7f8071..772ac11 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-27 12:34+0200\n"
"Last-Translator: Herman van Rink <rink(a)initfour.nl>\n"
"Language-Team: dutch <nl(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Zoeken"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -406,7 +406,6 @@ msgstr "Laatst gecontroleerd"
#: db_printview.php:220 db_structure.php:465
#, php-format
-#| msgid "%s table(s)"
msgid "%s table"
msgid_plural "%s tables"
msgstr[0] "%s tabel"
@@ -480,7 +479,6 @@ msgid "Add/Delete criteria rows"
msgstr "Toevoegen/Verwijderen Criteria Rij"
#: db_qbe.php:592
-#| msgid "Add/Delete Field Columns"
msgid "Add/Delete columns"
msgstr "Toevoegen/Verwijderen kolommen"
@@ -1472,7 +1470,6 @@ msgstr "Fout"
#: libraries/Message.class.php:281
#, php-format
-#| msgid "%1$d row(s) affected."
msgid "%1$d row affected."
msgid_plural "%1$d rows affected."
msgstr[0] "%1$d rij bijgewerkt."
@@ -1480,7 +1477,6 @@ msgstr[1] "%1$d rij(en) bijgewerkt."
#: libraries/Message.class.php:300
#, php-format
-#| msgid "%1$d row(s) deleted."
msgid "%1$d row deleted."
msgid_plural "%1$d rows deleted."
msgstr[0] "%1$d rij verwijderd."
@@ -1488,7 +1484,6 @@ msgstr[1] "%1$d rij(en) verwijderd."
#: libraries/Message.class.php:319
#, php-format
-#| msgid "%1$d row(s) inserted."
msgid "%1$d row inserted."
msgid_plural "%1$d rows inserted."
msgstr[0] "%1$d rij toegevoegd."
@@ -1821,7 +1816,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2569,7 +2564,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Gebruik backticks (`) bij tabellen- en veldnamen"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL-compatibiliteits mode"
@@ -4516,7 +4511,6 @@ msgid "No Privileges"
msgstr "Geen rechten"
#: libraries/display_create_table.lib.php:40
-#| msgid "Table must have at least one field."
msgid "Table must have at least one column."
msgstr "Tabel moet minimaal één veld hebben."
@@ -4621,19 +4615,19 @@ msgstr "Opslaan als bestand"
msgid "File name template:"
msgstr "Bestandsnaam template"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "servernaam"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "databasenaam"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "tabelnaam"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4648,58 +4642,58 @@ msgstr ""
"gebruik van opmaakcodes is dan ook toegestaan. Daarnaast worden de volgende "
"vertalingen toegepast: %3$s. Overige tekst zal gelijk blijven."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Karakter set van het bestand:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Compressie"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Geen"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"Gezipt\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"ge-gzipt\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"ge-bzipt\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Opmaak"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
# Is er een betere vertaling voor 'encoding' ?
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Encoding conversion"
msgid "Encoding Conversion:"
@@ -4812,7 +4806,6 @@ msgid "%d is not valid row number."
msgstr "%d is geen geldig rij-nummer."
#: libraries/display_tbl.lib.php:308
-#| msgid "row(s) starting from record #"
msgid "row(s) starting from row #"
msgstr "rij(en) beginnend bij"
@@ -6160,8 +6153,7 @@ msgstr ""
#: libraries/relation.lib.php:150
msgid "Re-login to phpMyAdmin to load the updated configuration file."
msgstr ""
-"Log opnieuw in op phpMyAdmin om het bijgewerkte configuratiebestand te "
-"laden."
+"Log opnieuw in op phpMyAdmin om het bijgewerkte configuratiebestand te laden."
#: libraries/relation.lib.php:1164
msgid "no description"
@@ -10171,6 +10163,15 @@ msgstr "VIEW-naam"
msgid "Rename view to"
msgstr "Hernoem view naar"
+#~ msgid "server name"
+#~ msgstr "servernaam"
+
+#~ msgid "database name"
+#~ msgstr "databasenaam"
+
+#~ msgid "table name"
+#~ msgstr "tabelnaam"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF Pagina's aanpassen"
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index 79ec7fa..9a74966 100644
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1707,7 +1707,7 @@ msgstr ""
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2385,7 +2385,7 @@ msgid "Enclose table and column names with backquotes"
msgstr ""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4156,19 +4156,19 @@ msgstr ""
msgid "File name template:"
msgstr ""
-#: libraries/display_export.lib.php:230
-msgid "server name"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "datab
ase name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, possible-php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4176,47 +4176,47 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr ""
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr ""
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr ""
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr ""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr ""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr ""
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index bf9f9d0..8005822 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:29+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: polish <pl(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Szukaj"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1858,7 +1858,7 @@ msgstr "Wysłane"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2598,7 +2598,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Użyj cudzysłowów z nazwami tabel i pól"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Tryb zgodności SQL"
@@ -4528,19 +4528,19 @@ msgstr "Zapisz jako plik"
msgid "File name template:"
msgstr "Szablon nazwy"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "nazwa serwera"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "nazwa bazy danych"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "nazwa tabeli"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4555,57 +4555,57 @@ msgstr ""
"jej napisów formatujących. Dodatkowo zostaną zastosowane następujące "
"przekształcenia: %3$s. Pozostały tekst będzie niezmieniony."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Kodowanie pliku:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Typ kompresji"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Brak"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\".zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\".gz\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\".bz2\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -9973,6 +9973,15 @@ msgstr "Nazwa perspektywy"
msgid "Rename view to"
msgstr "Zmień nazwę tabeli na"
+#~ msgid "server name"
+#~ msgstr "nazwa serwera"
+
+#~ msgid "database name"
+#~ msgstr "nazwa bazy danych"
+
+#~ msgid "table name"
+#~ msgstr "nazwa tabeli"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Edytuj strony PDF"
diff --git a/po/pt.po b/po/pt.po
index 490b1c7..2bc0769 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:23+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: portuguese <pt(a)li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Pesquisar"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1826,7 +1826,7 @@ msgstr "pt"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2541,7 +2541,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Usar apóstrofes com os nomes das tabelas e campos"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4406,21 +4406,19 @@ msgstr "envia"
msgid "File name template:"
msgstr "Nome do ficheiro modelo"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "Nome do Utilizador"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-#, fuzzy
-msgid "database name"
-msgstr "Base de Dados"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4428,57 +4426,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Configurar o Mapa de Caracteres do ficheiro:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Compressão"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Nenhum"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"Compressão zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"Compressão gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"Compressão bzip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formato"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9494,6 +9492,14 @@ msgstr ""
msgid "Rename view to"
msgstr "Renomeia a tabela para "
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "Nome do Utilizador"
+
+#, fuzzy
+#~ msgid "database name"
+#~ msgstr "Base de Dados"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Editar páginas PDF"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8180e75..307d034 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-13 23:58+0200\n"
"Last-Translator: William Bachion <william(a)bachiondesign.com>\n"
"Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Procurar"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1847,7 +1847,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2569,7 +2569,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Usar aspas simples nos nomes de tabelas e campos"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Modo de compatibilidade SQL"
@@ -4462,19 +4462,19 @@ msgstr "Enviado"
msgid "File name template:"
msgstr "Nome do arquivo do modelo"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "nome do servidor"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "nome do Banco de Dados"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "nome da tabela"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4489,57 +4489,57 @@ msgstr ""
"strings de formatação de tempo. Adicionalmente a seguinte transformação "
"ocorrerá: %3$s. Outros textos serão mantidos como são."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Conjunto de caracteres do arquivo"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Compressão"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Nenhum"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"compactado com zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"compactado com gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"compactado com bzip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formato"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "Versão do cliente MySQL"
@@ -9813,6 +9813,15 @@ msgstr "Nome da VISÃO"
msgid "Rename view to"
msgstr "Renomear a tabela para "
+#~ msgid "server name"
+#~ msgstr "nome do servidor"
+
+#~ msgid "database name"
+#~ msgstr "nome do Banco de Dados"
+
+#~ msgid "table name"
+#~ msgstr "nome da tabela"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Editar Páginas PDF"
diff --git a/po/ro.po b/po/ro.po
index d521d80..596c288 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:28+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: romanian <ro(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Caută"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1862,7 +1862,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2585,7 +2585,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Utilizati apostroful pentru numele tabelelor și a campurilor"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Regim de compatibilitate SQL"
@@ -4473,19 +4473,19 @@ msgstr "Trimite"
msgid "File name template:"
msgstr "Șablon nume fișier"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "nume server"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "nume bază de date"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "nume tabel"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4500,57 +4500,57 @@ msgstr ""
"formatting strings. Additionally the following transformations will happen: "
"%3$s. Other text will be kept as is."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Setul de caractere al fișierului:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Compresie"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Nici unul(a)"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "„arhivat”"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "cu „gzip”"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "cu „bzip2”"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "Versiunea clientului MySQL"
@@ -9855,6 +9855,15 @@ msgstr "Denumire VIZIUNE"
msgid "Rename view to"
msgstr "Redenumire tabel la"
+#~ msgid "server name"
+#~ msgstr "nume server"
+
+#~ msgid "database name"
+#~ msgstr "nume bază de date"
+
+#~ msgid "table name"
+#~ msgstr "nume tabel"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Editează paginile PDF"
diff --git a/po/ru.po b/po/ru.po
index 4997cf7..1ad3c8c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:27+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: russian <ru(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Поиск"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1857,7 +1857,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2607,7 +2607,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Заключить названия таблиц и полей в косые кавычки"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Режим совместимости SQL"
@@ -4665,19 +4665,19 @@ msgstr "Сохранить как файл"
msgid "File name template:"
msgstr "Шаблон имени файла"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "имя сервера"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "имя базы данных"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "имя таблицы"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4692,57 +4692,57 @@ msgstr ""
"вставка текущей даты и времени. Дополнительно могут быть использованы "
"следующие подстановки: %3$s. Остальной текст останется без изменений."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Кодировка файла:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Упаковать"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Нет"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "zip"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "gzip"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "bzip"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Формат"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10209,6 +10209,15 @@ msgstr "VIEW название"
msgid "Rename view to"
msgstr "Переименовать таблицу в"
+#~ msgid "server name"
+#~ msgstr "имя сервера"
+
+#~ msgid "database name"
+#~ msgstr "имя базы данных"
+
+#~ msgid "table name"
+#~ msgstr "имя таблицы"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Редактирование PDF-страниц"
diff --git a/po/si.po b/po/si.po
index e1f1a68..f452ed5 100644
--- a/po/si.po
+++ b/po/si.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:26+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: sinhala <si(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "සෙවීම"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1838,7 +1838,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2559,7 +2559,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Enclose table and field names with backquotes"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL compatibility mode"
@@ -4440,19 +4440,19 @@ msgstr "ගොනුවක් ලෙස තෝරන්න"
msgid "File name template:"
msgstr "ෆයිල් නම් ටෙම්ප්ලේටය"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "සර්වරයේ නම"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "දත්තගබඩාවේ නම"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "වගුවේ නම"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4467,57 +4467,57 @@ msgstr ""
"formatting strings. Additionally the following transformations will happen: "
"%3$s. Other text will be kept as is."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "ගොනුවේ අක්ෂර කට්ටලය:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Compression"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "කිසිවක් නැත"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"සිප්ගත කරන ලද\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipp ගත කරන ලදි\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipp ගතකරන ලදි\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "ආකෘතිය"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "MySQL සේවාදායකයාගේ සංස්කරණය"
@@ -9745,6 +9745,15 @@ msgstr ""
msgid "Rename view to"
msgstr "වගුව බවට නම වෙනස් කරන්න"
+#~ msgid "server name"
+#~ msgstr "සර්වරයේ නම"
+
+#~ msgid "database name"
+#~ msgstr "දත්තගබඩාවේ නම"
+
+#~ msgid "table name"
+#~ msgstr "වගුවේ නම"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF පිටු සංස්කරණය කරන්න"
diff --git a/po/sk.po b/po/sk.po
index 0da9c08..9fd0baa 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:26+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: slovak <sk(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Hľadať"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1845,7 +1845,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2568,7 +2568,7 @@ msgid "Enclose table and column names with backquotes"
msgstr " Použiť opačný apostrof pri názvoch tabuliek a polí "
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Režim kompatibility SQL"
@@ -4448,19 +4448,19 @@ msgstr "Pošli"
msgid "File name template:"
msgstr "Vzor pre názov súboru"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "meno servera"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "meno databázy"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "meno tabuľky"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4475,57 +4475,57 @@ msgstr ""
"reťazec pre formátovanie dátumu a času. Naviac budú vykonané tieto "
"nahradenia: %3$s. Ostatný text bude zachovaný."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Znaková sada súboru:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Kompresia"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Žiadny"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zozipované\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip-ované\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formát"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "Verzia MySQL klienta"
@@ -9787,6 +9787,15 @@ msgstr ""
msgid "Rename view to"
msgstr "Premenovať tabuľku na"
+#~ msgid "server name"
+#~ msgstr "meno servera"
+
+#~ msgid "database name"
+#~ msgstr "meno databázy"
+
+#~ msgid "table name"
+#~ msgstr "meno tabuľky"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Upraviť PDF Stránky"
diff --git a/po/sl.po b/po/sl.po
index 527fc55..39a07e0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-26 21:44+0200\n"
"Last-Translator: Domen <dbc334(a)gmail.com>\n"
"Language-Team: slovenian <sl(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Iskanje"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1768,7 +1768,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2469,7 +2469,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Obdaj imena tabel in stolpcev z enojnimi poševnimi narekovaji"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Združljivostni način SQL"
@@ -4392,19 +4392,19 @@ msgstr "Shrani izhod v datoteko"
msgid "File name template:"
msgstr "Predloga imena datoteke:"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "ime strežnika"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "ime zbirke podatkov"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "ime tabele"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4416,47 +4416,47 @@ msgstr ""
"Ostalo besedilo bo ostalo takšno, kot je. Oglejte si %4$sFAQ%5$s za "
"podrobnosti."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr "uporabi to za prihodnje izvoze"
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Nabor znakov datoteke:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr "Stiskanje:"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Brez"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr "zipano"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr "gzipano"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr "bzipano"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr "Oblika:"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr "Možnosti odvisne od oblike:"
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr "Pretvorba kodiranja:"
@@ -9690,6 +9690,15 @@ msgstr "Ime VIEW"
msgid "Rename view to"
msgstr "Preimenuj pogled v"
+#~ msgid "server name"
+#~ msgstr "ime strežnika"
+
+#~ msgid "database name"
+#~ msgstr "ime zbirke podatkov"
+
+#~ msgid "table name"
+#~ msgstr "ime tabele"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Uredi PDF strani"
diff --git a/po/sq.po b/po/sq.po
index 1908483..11bfa95 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-21 14:51+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: albanian <sq(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Kërko"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1823,7 +1823,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2539,7 +2539,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Përdor backquotes me emrat e tabelave dhe fushave"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4394,20 +4394,19 @@ msgstr "Ruaje me emër..."
msgid "File name template:"
msgstr "Emri i file template"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "Emri i përdoruesit"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4415,57 +4414,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Familja gërmave të file:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Kompresim"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Asnjë lloj"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"kompresuar me zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"kompresuar me gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"kompresuar me bzip2\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Formati"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9543,6 +9542,10 @@ msgstr ""
msgid "Rename view to"
msgstr "Riemërto tabelën në"
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "Emri i përdoruesit"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Ndrysho faqet PDF"
diff --git a/po/sr.po b/po/sr.po
index b457a58..6e5e887 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-30 23:47+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: serbian_cyrillic <sr(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Претраживање"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1846,7 +1846,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2567,7 +2567,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Користи ' за ограничавање имена поља"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Мод SQL компатибилности"
@@ -4455,19 +4455,19 @@ msgstr "Сачувај као датотеку"
msgid "File name template:"
msgstr "Шаблон имена датотеке"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "назив сервера"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "назив базе"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "назив табеле"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4482,57 +4482,57 @@ msgstr ""
"користите стрингове за форматирање времена. Такође ће се десити и следеће "
"трансформације: %3$s. Преостали текст ће остати како јесте."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Карактер сет датотеке:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Компресија"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "нема"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"зиповано\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"гзип-овано\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"бзип-овано\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Формат"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "Верзија MySQL клијента"
@@ -9777,6 +9777,15 @@ msgstr "назив за VIEW"
msgid "Rename view to"
msgstr "Промени име табеле у "
+#~ msgid "server name"
+#~ msgstr "назив сервера"
+
+#~ msgid "database name"
+#~ msgstr "назив базе"
+
+#~ msgid "table name"
+#~ msgstr "назив табеле"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Уређивање PDF страна"
diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po
index 542e45e..28da6c2 100644
--- a/po/sr(a)latin.po
+++ b/po/sr(a)latin.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:27+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: serbian_latin <sr@latin@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Pretraživanje"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1846,7 +1846,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2567,7 +2567,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Koristi ' za ograničavanje imena polja"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "Mod SQL kompatibilnosti"
@@ -4453,19 +4453,19 @@ msgstr "Sačuvaj kao datoteku"
msgid "File name template:"
msgstr "Šablon imena datoteke"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "naziv servera"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "naziv baze"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "naziv tabele"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4480,57 +4480,57 @@ msgstr ""
"koristite stringove za formatiranje vremena. Takođe će se desiti i sledeće "
"transformacije: %3$s. Preostali tekst će ostati kako jeste."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Karakter set datoteke:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Kompresija"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "nema"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipovano\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzip-ovano\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzip-ovano\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "Verzija MySQL klijenta"
@@ -9776,6 +9776,15 @@ msgstr "naziv za VIEW"
msgid "Rename view to"
msgstr "Promeni ime tabele u "
+#~ msgid "server name"
+#~ msgstr "naziv servera"
+
+#~ msgid "database name"
+#~ msgstr "naziv baze"
+
+#~ msgid "table name"
+#~ msgstr "naziv tabele"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Uređivanje PDF strana"
diff --git a/po/sv.po b/po/sv.po
index af93c09..5fc6dc8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-21 14:48+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: swedish <sv(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Sök"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1852,7 +1852,7 @@ msgstr "Skickade"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2600,7 +2600,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Använd bakåtcitat runt tabell- och fältnamn"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL-kompatibilitet"
@@ -4616,19 +4616,19 @@ msgstr "Spara som fil"
msgid "File name template:"
msgstr "Mall för filnamn"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "servernamn"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "databasnamn"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "tabellnamn"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4643,57 +4643,57 @@ msgstr ""
"tidsformatering. Dessutom kommer följande omvandlingar att ske: %3$s. Övrig "
"text behålls som den är."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Filens teckenuppsättning:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Komprimering"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Inget"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zippad\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzippad\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzippad\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10082,6 +10082,15 @@ msgstr "Namn på vy"
msgid "Rename view to"
msgstr "Döp om tabellen till"
+#~ msgid "server name"
+#~ msgstr "servernamn"
+
+#~ msgid "database name"
+#~ msgstr "databasnamn"
+
+#~ msgid "table name"
+#~ msgstr "tabellnamn"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "Redigera PDF-sidor"
diff --git a/po/ta.po b/po/ta.po
index 1174107..310830b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-04-16 10:43+0200\n"
"Last-Translator: Sutharshan <sutharshan02(a)gmail.com>\n"
"Language-Team: Tamil <ta(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1755,7 +1755,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2435,7 +2435,7 @@ msgid "Enclose table and column names with backquotes"
msgstr ""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export
.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4216,19 +4216,19 @@ msgstr ""
msgid "File name template:"
msgstr ""
-#: libraries/display_export.lib.php:230
-msgid "server name"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4236,47 +4236,47 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr ""
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr ""
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr ""
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr ""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr ""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr ""
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
diff --git a/po/te.po b/po/te.po
index 4ea185f..cb85ec2 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-05-26 14:20+0200\n"
"Last-Translator: <veeven(a)gmail.com>\n"
"Language-Team: Telugu <te(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "శోధించు"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1789,7 +1789,7 @@ msgstr ""
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2473,7 +2473,7 @@ msgid "Enclose table and column names with backquotes"
msgstr ""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4282,19 +4282,19 @@ msgstr ""
msgid "File name template:"
msgstr ""
-#: libraries/display_export.lib.php:230
-msgid "server name"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4302,47 +4302,47 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr ""
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr ""
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr ""
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr ""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr ""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr ""
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
diff --git a/po/th.po b/po/th.po
index e5bd1ec..2296b30 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:19+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: thai <th(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "ค้นหา"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1805,7 +1805,7 @@ msgstr "ถูกส่ง"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2521,7 +2521,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "ใส่ 'backqoute' ให้กับชื่อตารางและฟิลด์"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4377,20 +4377,19 @@ msgstr "ส่งมาเป็นไฟล์"
msgid "File name template:"
msgstr "รูปแบบของชื่อไฟล์"
-#: libraries/display_export.lib.php:230
-#, fuzzy
-msgid "server name"
-msgstr "ชื่อผู้ใช้"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4398,57 +4397,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "ชุดอักขระของไฟล์ (character set):"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "บีบอัดข้อมูล"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "ไม่มี"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"ถูกบีบอัดอยู่ (zip)\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipped\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "รูปแบบ"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9420,6 +9419,10 @@ msgstr ""
msgid "Rename view to"
msgstr "เปลี่ยนชื่อตารางเป็น"
+#, fuzzy
+#~ msgid "server name"
+#~ msgstr "ชื่อผู้ใช้"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "แก้ไขหน้า PDF"
diff --git a/po/tr.po b/po/tr.po
index 66797c2..b03821e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-27 13:11+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Ara"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1755,7 +1755,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2455,7 +2455,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Tablo ve sütun adlarını ters tırnaklarla kapattır"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL uyumluluk kipi"
@@ -3543,9 +3543,6 @@ msgid "Connect without password"
msgstr "Parolasız bağlan"
#: libraries/config/messages.inc.php:389
-#| msgid ""
-#| "You can use MySQL wildcard characters (% and _), escape them if you want "
-#| "to use their literal instances, i.e. use 'my\\_db' and not 'my_db'"
msgid ""
"You can use MySQL wildcard characters (% and _), escape them if you want to "
"use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not "
@@ -3554,8 +3551,8 @@ msgid ""
"alphabetical order."
msgstr ""
"MySQL joker karakterleri (% ve _) kullanabilirsiniz, eğer bunların aslına "
-"uygun örneklerini kullanmak istiyorsanız bundan kaçının, örn. "
-"[kbd]'my\\_db'[/kbd] kullanın ve [kbd]'my_db'[/kbd] kullanmayın. Bu seçeneği "
+"uygun örneklerini kullanmak istiyorsanız bundan kaçının, örn. [kbd]'my"
+"\\_db'[/kbd] kullanın ve [kbd]'my_db'[/kbd] kullanmayın. Bu seçeneği "
"kullanarak veritabanı listesini sıralayabilirsiniz, sadece adlarını sıralı "
"girin ve geri kalanını alfabetik sırada göstermek için sonunda [kbd]*[/kbd] "
"kullanın."
@@ -4418,19 +4415,19 @@ msgstr "Çıktıyı dosyaya kaydet"
msgid "File name template:"
msgstr "Dosya adı şablonu:"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "sunucu adı"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "veritabanı adı"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "tablo adı"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4442,47 +4439,47 @@ msgstr ""
"meydana gelecektir: %3$s. Diğer metin olduğu gibi tutulacak. Ayrıntılar için "
"%4$sSSS%5$s'a bakın."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr "ilerdeki dışa aktarımlar için bunu kullan"
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Dosyanın karakter grubu:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr "Sıkıştırma:"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Hiçbiri"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr "zip olarak"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr "gzip olarak"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr "bzip olarak"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr "Biçim:"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr "Biçim-Belirli Seçenekler:"
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr "Kodlama Dönüştürme:"
@@ -9761,6 +9758,15 @@ msgstr "GÖRÜNÜM adı"
msgid "Rename view to"
msgstr "Görünümü yeniden şuna adlandır"
+#~ msgid "server name"
+#~ msgstr "sunucu adı"
+
+#~ msgid "database name"
+#~ msgstr "veritabanı adı"
+
+#~ msgid "table name"
+#~ msgstr "tablo adı"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF Sayfalarını düzenle"
diff --git a/po/tt.po b/po/tt.po
index 0ccd5e4..e17de23 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:25+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: tatarish <tt(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Ezläw"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1823,7 +1823,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2544,7 +2544,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Tüşämä/alan isemnären kirequote eçenä salası"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL, kileşterü ısulı"
@@ -4422,19 +4422,19 @@ msgstr "Biremgä saqlıysı"
msgid "File name template:"
msgstr "Birem adınıñ tözeleşe"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "server adı"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "biremlek adı"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "tüşämä adı"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4442,57 +4442,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Şul biremneñ bilgelämäse:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Qısu"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Buş"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"ziple\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gziple\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bziple\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Tözeleş"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "MySQL belän totaştırğıç söreme"
@@ -9602,6 +9602,15 @@ msgstr ""
msgid "Rename view to"
msgstr "Tüşämä adın üzgärtü"
+#~ msgid "server name"
+#~ msgstr "server adı"
+
+#~ msgid "database name"
+#~ msgstr "biremlek adı"
+
+#~ msgid "table name"
+#~ msgstr "tüşämä adı"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF-Bitlär Üzgärtü"
diff --git a/po/ug.po b/po/ug.po
index 5598eba..77db4ad 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-26 11:59+0200\n"
"Last-Translator: <gheni(a)yahoo.cn>\n"
"Language-Team: Uyghur <ug(a)li.org>\n"
@@ -56,7 +56,7 @@ msgstr "ئىزدەش"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1737,7 +1737,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2429,7 +2429,7 @@ msgid "Enclose table and column names with backquotes"
msgstr ""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQLئۆز ئىچىگە ئالغان شەكلى"
@@ -4251,19 +4251,19 @@ msgstr "ھۆججەتنى باشقا ساقلاش"
msgid "File name template:"
msgstr "ھۆججەت ئېتى ئەندىزىسى"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "مۇلازىمىتىر ئىسمى"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "ساندان ئىسمى"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "سانلىق مەلۇمات جەدىۋېلى ئىسمى"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4271,57 +4271,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "ھۆججەتنىڭ ھەرىپ-بەلگە توپلىمى"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "پىرىسلاش"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "يوق"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "zipپىرىسلاش"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "gzipپىرىسلاش"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "bzip پىرىسلاش"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "فورماتلاش"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
@@ -9162,6 +9162,15 @@ msgstr ""
msgid "Rename view to"
msgstr ""
+#~ msgid "server name"
+#~ msgstr "مۇلازىمىتىر ئىسمى"
+
+#~ msgid "database name"
+#~ msgstr "ساندان ئىسمى"
+
+#~ msgid "table name"
+#~ msgstr "سانلىق مەلۇمات جەدىۋېلى ئىسمى"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF بېتىنى تەھرىرلەش"
diff --git a/po/uk.po b/po/uk.po
index 6b21598..f31d5e0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-27 23:41+0200\n"
"Last-Translator: Olexiy Zagorskyi <zalex_ua(a)i.ua>\n"
"Language-Team: ukrainian <uk(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Шукати"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1800,7 +1800,7 @@ msgstr ""
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2508,7 +2508,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Зворотні лапки в назвах таблиць і полів"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4346,19 +4346,19 @@ msgstr "Відіслати"
msgid "File name template:"
msgstr "Шаблон назви файлу"
-#: libraries/display_export.lib.php:230
-msgid "server name"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4366,57 +4366,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Кодування файлу:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Стискання"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Немає"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "запакувати в \"zip\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "запакувати в \"gzip\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "запакувати в \"bzip\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Формат"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
diff --git a/po/ur.po b/po/ur.po
index d5459a4..ea353db 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-05-14 12:35+0200\n"
"Last-Translator: <monymirza(a)gmail.com>\n"
"Language-Team: Urdu <ur(a)li.org>\n"
@@ -57,7 +57,7 @@ msgstr "تلاش"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1745,7 +1745,7 @@ msgstr "en"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2431,7 +2431,7 @@ msgid "Enclose table and column names with backquotes"
msgstr ""
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr ""
@@ -4232,19 +4232,19 @@ msgstr ""
msgid "File name template:"
msgstr ""
-#: libraries/display_export.lib.php:230
-msgid "server name"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4252,47 +4252,47 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr ""
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
msgid "Compression:"
msgstr ""
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr ""
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
msgid "zipped"
msgstr ""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
msgid "gzipped"
msgstr ""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
msgid "Format:"
msgstr ""
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
msgid "Encoding Conversion:"
msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 32e7e93..9aebda5 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:31+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: uzbek_cyrillic <uz(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Қидириш"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1857,7 +1857,7 @@ msgstr "Юборилди"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2611,7 +2611,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Жадвал ва майдон номларини тескари қўштирноққа олиш"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL билан мослик режими"
@@ -4664,19 +4664,19 @@ msgstr "Файл каби сақлаш"
msgid "File name template:"
msgstr "Файл номи шаблони"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "сервер номи"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "маълумотлар базаси номи"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "жадвал номи"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4691,57 +4691,57 @@ msgstr ""
"вақт ва санани қўйиш мумкин. Қўшимча равишда қуйидагилар ишлатилиши мумкин: "
"%3$s. Матннинг бошқа қисмлари ўзгаришсиз қолади."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Файл кодировкаси: "
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Сиқиш"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Йўқ"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "zip"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "gzip"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "bzip ёрдамида сиқилган"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Формат"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10207,6 +10207,15 @@ msgstr "Ном кўриниши"
msgid "Rename view to"
msgstr "Кўриниш номини ўзгартириш"
+#~ msgid "server name"
+#~ msgstr "сервер номи"
+
+#~ msgid "database name"
+#~ msgstr "маълумотлар базаси номи"
+
+#~ msgid "table name"
+#~ msgstr "жадвал номи"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF-саҳифаларни таҳрирлаш"
diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po
index 4fde522..6b723cc 100644
--- a/po/uz(a)latin.po
+++ b/po/uz(a)latin.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-07-22 02:30+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: uzbek_latin <uz@latin@li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Qidirish"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1864,7 +1864,7 @@ msgstr "Yuborildi"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2619,7 +2619,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "Jadval va maydon nomlarini teskari qo‘shtirnoqqa olish"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL bilan moslik rejimi"
@@ -4684,19 +4684,19 @@ msgstr "Fayl kabi saqlash"
msgid "File name template:"
msgstr "Fayl nomi shabloni"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "server nomi"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "ma`lumotlar bazasi nomi"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "jadval nomi"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4711,57 +4711,57 @@ msgstr ""
"hozirgi vaqt va sanani qo‘yish mumkin. Qo‘shimcha ravishda quyidagilar "
"ishlatilishi mumkin: %3$s. Matnning boshqa qismlari o‘zgarishsiz qoladi."
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "Fayl kodirovkasi: "
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "Siqish"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "Yo‘q"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "zip"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "gzip"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "bzip yordamida siqilgan"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "Format"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding Conversion:"
@@ -10273,6 +10273,15 @@ msgstr "Nom ko‘rinishi"
msgid "Rename view to"
msgstr "Ko‘rinish nomini o‘zgartirish"
+#~ msgid "server name"
+#~ msgstr "server nomi"
+
+#~ msgid "database name"
+#~ msgstr "ma`lumotlar bazasi nomi"
+
+#~ msgid "table name"
+#~ msgstr "jadval nomi"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF-sahifalarni tahrirlash"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4214b2c..21873dd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-08-10 08:13+0200\n"
"Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n"
"Language-Team: chinese_simplified <zh_CN(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "搜索"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1736,7 +1736,7 @@ msgstr "zh"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2453,7 +2453,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "给数据表名及字段名加上反引号"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL 兼容模式"
@@ -4385,19 +4385,19 @@ msgstr "另存为文件"
msgid "File name template:"
msgstr "文件名模板"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "服务器名"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "数据库名"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "数据表名"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, fuzzy, php-format
#| msgid ""
#| "This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4411,57 +4411,57 @@ msgstr ""
"这个值是使用 %1$sstrftime%2$s 来解析的，所以你能用时间格式的字符串。另外，下"
"列内容也将被转换：%3$s。其他文本将保持原样。"
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "文件的字符集："
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "压缩"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "无"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "zip 压缩"
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "gzip 压缩"
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "bzip 压缩"
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "格式"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
#| msgid "Encoding conversion"
msgid "Encoding Conversion:"
@@ -9555,6 +9555,15 @@ msgstr "视图名"
msgid "Rename view to"
msgstr "将视图改名为"
+#~ msgid "server name"
+#~ msgstr "服务器名"
+
+#~ msgid "database name"
+#~ msgstr "数据库名"
+
+#~ msgid "table name"
+#~ msgstr "数据表名"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "编辑 PDF 页"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6b3106b..2851863 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-27 11:35+0200\n"
+"POT-Creation-Date: 2010-08-27 16:16+0200\n"
"PO-Revision-Date: 2010-03-12 09:15+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: chinese_traditional <zh_TW(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "搜索"
#: libraries/common.lib.php:2236 libraries/core.lib.php:544
#: libraries/display_change_password.lib.php:72
#: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:355 libraries/display_import.lib.php:267
+#: libraries/display_export.lib.php:352 libraries/display_import.lib.php:267
#: libraries/display_tbl.lib.php:530 libraries/display_tbl.lib.php:612
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:371
#: libraries/schema/User_Schema.class.php:126
@@ -1812,7 +1812,7 @@ msgstr "zh"
#: libraries/common.lib.php:424 libraries/common.lib.php:426
#: libraries/common.lib.php:428 libraries/common.lib.php:444
#: libraries/common.lib.php:446 libraries/config/FormDisplay.tpl.php:169
-#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:242
+#: libraries/dbg/setup.php:24 libraries/display_export.lib.php:239
#: libraries/engines/pbms.lib.php:72 libraries/engines/pbxt.lib.php:106
#: libraries/relation.lib.php:79 libraries/sql_query_form.lib.php:421
#: libraries/sql_query_form.lib.php:424 main.php:209
@@ -2532,7 +2532,7 @@ msgid "Enclose table and column names with backquotes"
msgstr "在資料表及欄位使用引號"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
-#: libraries/display_export.lib.php:354
+#: libraries/display_export.lib.php:351
msgid "SQL compatibility mode"
msgstr "SQL 兼容模式"
@@ -4402,19 +4402,19 @@ msgstr "下載儲存"
msgid "File name template:"
msgstr "檔案名稱樣式"
-#: libraries/display_export.lib.php:230
-msgid "server name"
-msgstr "伺服器名稱"
+#: libraries/display_export.lib.php:229
+msgid "@SERVER@ will become the server name"
+msgstr ""
-#: libraries/display_export.lib.php:233
-msgid "database name"
-msgstr "資料庫名稱"
+#: libraries/display_export.lib.php:231
+msgid ", @DATABASE@ will become the database name"
+msgstr ""
-#: libraries/display_export.lib.php:236
-msgid "table name"
-msgstr "資料表名稱"
+#: libraries/display_export.lib.php:233
+msgid ", @TABLE@ will become the table name"
+msgstr ""
-#: libraries/display_export.lib.php:240
+#: libraries/display_export.lib.php:237
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
@@ -4422,57 +4422,57 @@ msgid ""
"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
-#: libraries/display_export.lib.php:278
+#: libraries/display_export.lib.php:275
msgid "use this for future exports"
msgstr ""
-#: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188
+#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
msgid "Character set of the file:"
msgstr "文字編碼檔案:"
-#: libraries/display_export.lib.php:312
+#: libraries/display_export.lib.php:309
#, fuzzy
#| msgid "Compression"
msgid "Compression:"
msgstr "壓縮"
-#: libraries/display_export.lib.php:314 libraries/display_tbl.lib.php:528
+#: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528
#: libraries/export/sql.php:916 libraries/tbl_properties.inc.php:578
#: server_privileges.php:1871 server_processlist.php:74
msgid "None"
msgstr "不適用"
-#: libraries/display_export.lib.php:316
+#: libraries/display_export.lib.php:313
#, fuzzy
#| msgid "\"zipped\""
msgid "zipped"
msgstr "\"zipped\""
-#: libraries/display_export.lib.php:318
+#: libraries/display_export.lib.php:315
#, fuzzy
#| msgid "\"gzipped\""
msgid "gzipped"
msgstr "\"gzipped\""
-#: libraries/display_export.lib.php:320
+#: libraries/display_export.lib.php:317
#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244
+#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
#: libraries/export/codegen.php:37
#, fuzzy
#| msgid "Format"
msgid "Format:"
msgstr "格式"
-#: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250
+#: libraries/display_export.lib.php:336 libraries/display_import.lib.php:250
msgid "Format-Specific Options:"
msgstr ""
-#: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
#, fuzzy
msgid "Encoding Conversion:"
msgstr "MySQL 客戶端版本"
@@ -9508,6 +9508,15 @@ msgstr ""
msgid "Rename view to"
msgstr "將資料表改名為"
+#~ msgid "server name"
+#~ msgstr "伺服器名稱"
+
+#~ msgid "database name"
+#~ msgstr "資料庫名稱"
+
+#~ msgid "table name"
+#~ msgstr "資料表名稱"
+
#~ msgid "Edit PDF Pages"
#~ msgstr "編輯 PDF 頁碼"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8694-gc9d4d52
by Marc Delisle 27 Aug '10
by Marc Delisle 27 Aug '10
27 Aug '10
The branch, master has been updated
via c9d4d52fffea791508e4ed3aac52f399d985a9ed (commit)
from 53cf7b59522c7dd857e3c1de6740561dff0487c6 (commit)
- Log -----------------------------------------------------------------
commit c9d4d52fffea791508e4ed3aac52f399d985a9ed
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Aug 27 10:03:52 2010 -0400
correct template variable
-----------------------------------------------------------------------
Summary of changes:
libraries/display_export.lib.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index ad52bac..911fa08 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -229,7 +229,7 @@ if(isset($_GET['sql_query'])) {
$trans->addMessage('@SERVER@ will become the');
$trans->addString(__('server name'));
if ($export_type == 'database' || $export_type == 'table') {
- $trans->addMessage(', @DB@ will become the');
+ $trans->addMessage(', @DATABASE@ will become the');
$trans->addString(__('database name'));
if ($export_type == 'table') {
$trans->addMessage(', @TABLE@ will become the');
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8693-g53cf7b5
by Michal Čihař 27 Aug '10
by Michal Čihař 27 Aug '10
27 Aug '10
The branch, master has been updated
via 53cf7b59522c7dd857e3c1de6740561dff0487c6 (commit)
via ba7ecff67b2c863a73bdcd09a9b37124ceefae76 (commit)
via 844f47eff3117127e57f5e8a493cce09994fecaf (commit)
via 2af04462860621b9b35cd1843bb5a0647afbf11e (commit)
via 9ee6e1da7a0c6f36cf1051ff3557d90d3591b070 (commit)
via 0da5a9430568399af8860a37f7b10d824f0d6a9c (commit)
via b77223b0e18cb717e0ba77d726e0de768124b5b0 (commit)
via 5dfa4a9b54cba18b5587f1a68a7e386a9e79c0a7 (commit)
from 6b52f492c153535ae05e6258d6f7b9e2648c9cf3 (commit)
- Log -----------------------------------------------------------------
commit 53cf7b59522c7dd857e3c1de6740561dff0487c6
Merge: 6b52f492c153535ae05e6258d6f7b9e2648c9cf3 ba7ecff67b2c863a73bdcd09a9b37124ceefae76
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Aug 27 13:41:38 2010 +0200
Merge remote branch 'pootle/master'
commit ba7ecff67b2c863a73bdcd09a9b37124ceefae76
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 27 13:41:23 2010 +0200
Translation update done using Pootle.
commit 844f47eff3117127e57f5e8a493cce09994fecaf
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 27 13:40:50 2010 +0200
Translation update done using Pootle.
commit 2af04462860621b9b35cd1843bb5a0647afbf11e
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 27 13:39:54 2010 +0200
Translation update done using Pootle.
commit 9ee6e1da7a0c6f36cf1051ff3557d90d3591b070
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 27 13:39:12 2010 +0200
Translation update done using Pootle.
commit 0da5a9430568399af8860a37f7b10d824f0d6a9c
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 27 13:38:42 2010 +0200
Translation update done using Pootle.
commit b77223b0e18cb717e0ba77d726e0de768124b5b0
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 27 13:38:14 2010 +0200
Translation update done using Pootle.
commit 5dfa4a9b54cba18b5587f1a68a7e386a9e79c0a7
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 27 13:37:28 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index d76085f..c887de5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-08-27 11:35+0200\n"
-"PO-Revision-Date: 2010-08-27 12:02+0200\n"
+"PO-Revision-Date: 2010-08-27 13:41+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"Language: cs\n"
@@ -3248,7 +3248,6 @@ msgid "Protect binary columns"
msgstr "Chránit binární pole"
#: libraries/config/messages.inc.php:329
-#, fuzzy
#| msgid ""
#| "Enable if you want DB-based query history (requires pmadb). If disabled, "
#| "this utilizes JS-routines to display query history (lost by window close)."
@@ -3257,9 +3256,10 @@ msgid ""
"storage). If disabled, this utilizes JS-routines to display query history "
"(lost by window close)."
msgstr ""
-"Povolte pokud chcete histori dotazů založenou na databázi (vyžaduje pmadb). "
-"Pokud toto zakážete, využijí se k zobrazení historie Java Scriptové rutiny "
-"(se zavřením okna ztratíte předchozí historii)."
+"Povolte pokud chcete histori dotazů založenou na databázi (vyžaduje úložiště "
+"nastavení phpMyAdmina). Pokud toto zakážete, využijí se k zobrazení "
+"historie Java Scriptové rutiny (se zavřením okna ztratíte předchozí "
+"historii)."
#: libraries/config/messages.inc.php:330
msgid "Permanent query history"
@@ -3794,6 +3794,7 @@ msgid ""
"Defines whether or not type fields should be initially displayed in edit/"
"insert mode"
msgstr ""
+"Určiuje jestli mají být zobrazeny typy polí při úpravě a vkládání záznamů"
#: libraries/config/messages.inc.php:440
msgid "Show field types"
@@ -3900,6 +3901,7 @@ msgid ""
"[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be "
"installed"
msgstr ""
+"[strong]Varování:[/strong] vyžaduje rozšíření PHP SOAP nebo PEAR modul SOAP"
#: libraries/config/messages.inc.php:465
msgid "Enable SQL Validator"
@@ -3931,6 +3933,8 @@ msgstr "Navrhnout jméno nové databáze"
#: libraries/config/messages.inc.php:470
msgid "A warning is displayed on the main page if Suhosin is detected"
msgstr ""
+"Na hlavní stránce je zobrazeno varování pokud je detekování rozšíření "
+"Suhosin"
#: libraries/config/messages.inc.php:471
msgid "Suhosin warning"
@@ -4471,6 +4475,8 @@ msgid ""
"A compressed file's name must end in <b>.[format].[compression]</b>. "
"Example: <b>.sql.zip</b>"
msgstr ""
+"Jméno komprimovaného souboru musí končit na <b>.[formát].[komprese]</b>. "
+"Například: <b>.sql.zip</b>"
#: libraries/display_import.lib.php:178
msgid "File uploads are not allowed on this server."
@@ -8971,13 +8977,11 @@ msgid "Restart insertion with %s rows"
msgstr "Začít znovu vkládání s %s řádky"
#: tbl_chart.php:57
-#, fuzzy
#| msgid "The privileges were reloaded successfully."
msgid "Chart generated successfully."
-msgstr "Oprávnění byla načtena úspěšně."
+msgstr "Graf byl úspěšně vytvořen"
#: tbl_chart.php:60
-#, fuzzy
#| msgid ""
#| "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ "
#| "3.11[/a]"
@@ -8985,8 +8989,8 @@ msgid ""
"The result of this query can't be used for a chart. See [a@./Documentation."
"html#faq6_29@Documentation]FAQ 6.29[/a]"
msgstr ""
-"Počet nemusí být přesný, viz [a@./Documentation.html#faq3_11@Documentation]"
-"FAQ 3.11[/a]"
+"Výsledek tohoto dotazu nelze použít pro graf. Více informací nalezne ve "
+"[a@./Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]"
#: tbl_chart.php:91
msgid "Width"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8685-g6b52f49
by Michal Čihař 27 Aug '10
by Michal Čihař 27 Aug '10
27 Aug '10
The branch, master has been updated
via 6b52f492c153535ae05e6258d6f7b9e2648c9cf3 (commit)
via 4b26844532cfe8c9fd4eb2da83d20efbc79a7b9f (commit)
via a316631d14a84c806e56877674f558d9f4522682 (commit)
via c7de190527f1b2ccc4dded2a38176d4c5dbb8507 (commit)
via a67d3950ae67eba7de98e042093a58930c2988b4 (commit)
via ded02ad124a1a7b9a45de215f35d811754861c5a (commit)
via f7c3855b6f0d309d48d7bebe5bb84de13eae4e15 (commit)
via 70d45df6813b30a27cbde7419bf6cc0775addc2d (commit)
via c421023fffb84cc4bc933afbbf3f716bdedebde9 (commit)
via d530991db0faf0ea3cc29f1682ee91eeb47f3aa5 (commit)
via a520e90c4e2408483c38a8bda32827586501a49e (commit)
via fd644b7690e39391b252b3346400e0086e79c6fc (commit)
via 72556423a0e673386733a54e14e64019a3881bc0 (commit)
via 747199aa9f555cc6f84e7baa03fe24a82e6e1bcb (commit)
via dcbe829b88b82757ce3db28ed7eaada3052189cf (commit)
via c4a7da229012414386f5321500aa3bcf1f50c72f (commit)
via 4fe4b78fc144b492df08978042c6f4f10bb1497f (commit)
via 6754d754a50a98d3db33bb029a29e9740cf0a926 (commit)
via 5a93303bccae025159e74b09f32839be8735338c (commit)
via f7c01a34c4feef9760310b2f62f5c347d0c967b6 (commit)
via e1a1cf53ae187f97669b20a6f57d09d1976c76eb (commit)
via 0c15f525e17e8ec125a01a09cc2268be5bab08ce (commit)
via d45f4429661cee06a8ef8213d95f95181480a652 (commit)
via 99ac6b1dd8db453ff852d6445219feef9ea90a68 (commit)
via 9c85a41f2eba5ab61e750b9e03aec01b945e0844 (commit)
via db64f68fb3e7d540fa2300d9c20b6c1fe71f99b6 (commit)
from e5042e313bfaf3377e5beacff34c2d3c9d9d18cd (commit)
- Log -----------------------------------------------------------------
commit 6b52f492c153535ae05e6258d6f7b9e2648c9cf3
Merge: 72556423a0e673386733a54e14e64019a3881bc0 4b26844532cfe8c9fd4eb2da83d20efbc79a7b9f
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Aug 27 13:20:04 2010 +0200
Merge remote branch 'pootle/master'
commit 4b26844532cfe8c9fd4eb2da83d20efbc79a7b9f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 13:11:20 2010 +0200
Translation update done using Pootle.
commit a316631d14a84c806e56877674f558d9f4522682
Merge: c7de190527f1b2ccc4dded2a38176d4c5dbb8507 e5042e313bfaf3377e5beacff34c2d3c9d9d18cd
Author: Pootle server <pootle(a)cihar.com>
Date: Fri Aug 27 12:40:11 2010 +0200
Merge remote branch 'origin/master'
commit c7de190527f1b2ccc4dded2a38176d4c5dbb8507
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:34:49 2010 +0200
Translation update done using Pootle.
commit a67d3950ae67eba7de98e042093a58930c2988b4
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:33:07 2010 +0200
Translation update done using Pootle.
commit ded02ad124a1a7b9a45de215f35d811754861c5a
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:31:12 2010 +0200
Translation update done using Pootle.
commit f7c3855b6f0d309d48d7bebe5bb84de13eae4e15
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:26:40 2010 +0200
Translation update done using Pootle.
commit 70d45df6813b30a27cbde7419bf6cc0775addc2d
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:15:52 2010 +0200
Translation update done using Pootle.
commit c421023fffb84cc4bc933afbbf3f716bdedebde9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 12:14:26 2010 +0200
Translation update done using Pootle.
commit d530991db0faf0ea3cc29f1682ee91eeb47f3aa5
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 12:14:14 2010 +0200
Translation update done using Pootle.
commit a520e90c4e2408483c38a8bda32827586501a49e
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:11:36 2010 +0200
Translation update done using Pootle.
commit fd644b7690e39391b252b3346400e0086e79c6fc
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:11:08 2010 +0200
Translation update done using Pootle.
commit 72556423a0e673386733a54e14e64019a3881bc0
Merge: e5042e313bfaf3377e5beacff34c2d3c9d9d18cd 747199aa9f555cc6f84e7baa03fe24a82e6e1bcb
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Aug 27 12:04:58 2010 +0200
Merge remote branch 'pootle/master'
commit 747199aa9f555cc6f84e7baa03fe24a82e6e1bcb
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:03:17 2010 +0200
Translation update done using Pootle.
commit dcbe829b88b82757ce3db28ed7eaada3052189cf
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:02:39 2010 +0200
Translation update done using Pootle.
commit c4a7da229012414386f5321500aa3bcf1f50c72f
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:02:04 2010 +0200
Translation update done using Pootle.
commit 4fe4b78fc144b492df08978042c6f4f10bb1497f
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:01:25 2010 +0200
Translation update done using Pootle.
commit 6754d754a50a98d3db33bb029a29e9740cf0a926
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 12:00:23 2010 +0200
Translation update done using Pootle.
commit 5a93303bccae025159e74b09f32839be8735338c
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 11:59:11 2010 +0200
Translation update done using Pootle.
commit f7c01a34c4feef9760310b2f62f5c347d0c967b6
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 11:57:07 2010 +0200
Translation update done using Pootle.
commit e1a1cf53ae187f97669b20a6f57d09d1976c76eb
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 11:56:02 2010 +0200
Translation update done using Pootle.
commit 0c15f525e17e8ec125a01a09cc2268be5bab08ce
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 11:55:28 2010 +0200
Translation update done using Pootle.
commit d45f4429661cee06a8ef8213d95f95181480a652
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 11:55:07 2010 +0200
Translation update done using Pootle.
commit 99ac6b1dd8db453ff852d6445219feef9ea90a68
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 11:54:02 2010 +0200
Translation update done using Pootle.
commit 9c85a41f2eba5ab61e750b9e03aec01b945e0844
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 11:53:54 2010 +0200
Translation update done using Pootle.
commit db64f68fb3e7d540fa2300d9c20b6c1fe71f99b6
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 11:48:21 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/nl.po | 49 +++++++++++++++++++++++--------------------------
po/tr.po | 10 ++++++----
2 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/po/nl.po b/po/nl.po
index a048268..a7f8071 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-08-27 11:35+0200\n"
-"PO-Revision-Date: 2010-08-27 11:17+0200\n"
+"PO-Revision-Date: 2010-08-27 12:34+0200\n"
"Last-Translator: Herman van Rink <rink(a)initfour.nl>\n"
"Language-Team: dutch <nl(a)li.org>\n"
"Language: nl\n"
@@ -405,12 +405,12 @@ msgid "Last check"
msgstr "Laatst gecontroleerd"
#: db_printview.php:220 db_structure.php:465
-#, fuzzy, php-format
+#, php-format
#| msgid "%s table(s)"
msgid "%s table"
msgid_plural "%s tables"
-msgstr[0] "%s tabel(len)"
-msgstr[1] "%s tabel(len)"
+msgstr[0] "%s tabel"
+msgstr[1] "%s tabellen"
#: db_qbe.php:25 import.php:452 libraries/Message.class.php:190
#: libraries/display_tbl.lib.php:1939 libraries/sql_query_form.lib.php:136
@@ -480,10 +480,9 @@ msgid "Add/Delete criteria rows"
msgstr "Toevoegen/Verwijderen Criteria Rij"
#: db_qbe.php:592
-#, fuzzy
#| msgid "Add/Delete Field Columns"
msgid "Add/Delete columns"
-msgstr "Toevoegen/Verwijderen Veld Kolommen"
+msgstr "Toevoegen/Verwijderen kolommen"
#: db_qbe.php:605 db_qbe.php:630
msgid "Update Query"
@@ -1472,28 +1471,28 @@ msgid "Error"
msgstr "Fout"
#: libraries/Message.class.php:281
-#, fuzzy, php-format
+#, php-format
#| msgid "%1$d row(s) affected."
msgid "%1$d row affected."
msgid_plural "%1$d rows affected."
-msgstr[0] "%1$d rij(en) bijgewerkt."
+msgstr[0] "%1$d rij bijgewerkt."
msgstr[1] "%1$d rij(en) bijgewerkt."
#: libraries/Message.class.php:300
-#, fuzzy, php-format
+#, php-format
#| msgid "%1$d row(s) deleted."
msgid "%1$d row deleted."
msgid_plural "%1$d rows deleted."
-msgstr[0] "%1$d rij(en) verwijderd."
+msgstr[0] "%1$d rij verwijderd."
msgstr[1] "%1$d rij(en) verwijderd."
#: libraries/Message.class.php:319
-#, fuzzy, php-format
+#, php-format
#| msgid "%1$d row(s) inserted."
msgid "%1$d row inserted."
msgid_plural "%1$d rows inserted."
-msgstr[0] "%1$d rij(en) toegevoegd."
-msgstr[1] "%1$d rij(en) toegevoegd."
+msgstr[0] "%1$d rij toegevoegd."
+msgstr[1] "%1$d rijen toegevoegd."
#: libraries/StorageEngine.class.php:194
msgid ""
@@ -4517,10 +4516,9 @@ msgid "No Privileges"
msgstr "Geen rechten"
#: libraries/display_create_table.lib.php:40
-#, fuzzy
#| msgid "Table must have at least one field."
msgid "Table must have at least one column."
-msgstr "Tabel moet minimaal een veld hebben."
+msgstr "Tabel moet minimaal één veld hebben."
#: libraries/display_create_table.lib.php:47
#, php-format
@@ -4814,10 +4812,9 @@ msgid "%d is not valid row number."
msgstr "%d is geen geldig rij-nummer."
#: libraries/display_tbl.lib.php:308
-#, fuzzy
#| msgid "row(s) starting from record #"
msgid "row(s) starting from row #"
-msgstr "rijen beginnend bij"
+msgstr "rij(en) beginnend bij"
#: libraries/display_tbl.lib.php:314
msgid "horizontal"
@@ -5374,7 +5371,7 @@ msgid ""
"will be deleted, otherwise they are renamed and given the next highest "
"number."
msgstr ""
-"Dit is het aantal transcatie logbestanden (pbxt/system/xlog*.xt) welke het "
+"Dit is het aantal transactie logbestanden (pbxt/system/xlog*.xt) welke het "
"systeem zal bijhouden. Wanneer het aantal logbestanden hier overheenkomt "
"zullen oude bestanden worden verwijderd, anders worden oude logbestanden "
"hernoemd met een opgehoogd volgnummer"
@@ -6138,7 +6135,7 @@ msgstr ""
#: libraries/relation.lib.php:145
msgid "Quick steps to setup advanced features:"
-msgstr "Snelle stappen om geavanceerde functies in te stellen:"
+msgstr "Snelle stappen voor het instellen van geavanceerde functies:"
#: libraries/relation.lib.php:147
msgid ""
@@ -6156,14 +6153,15 @@ msgid ""
"Enable advanced features in configuration file (<code>config.inc.php</"
"code>), for example by starting from <code>config.sample.inc.php</code>."
msgstr ""
-"Schakel geavanceerde functionaliteit in het configuratiebestand "
-"(<code>config.inc.php</code>) in, bijvoorbeeld door gebruik te maken van "
+"Schakel geavanceerde functionaliteit in, in het configuratie bestand "
+"(<code>config.inc.php</code>), als voorbeeld kunt u gebruik maken van "
"<code>config.sample.inc.php</code>."
#: libraries/relation.lib.php:150
msgid "Re-login to phpMyAdmin to load the updated configuration file."
msgstr ""
-"Log opnieuw in op phpMyAdmin om het bijgewerkte configuratiebestand te laden."
+"Log opnieuw in op phpMyAdmin om het bijgewerkte configuratiebestand te "
+"laden."
#: libraries/relation.lib.php:1164
msgid "no description"
@@ -7134,7 +7132,7 @@ msgid ""
msgstr ""
"Javascript wordt niet door uw browser ondersteund of de ondersteuning ervoor "
"is uitgeschakeld. Bepaalde functionaliteit van phpMyAdmin zal niet "
-"beschikbaar zijn. Zo zal bijvoorbeeld het navigatievenster zich niet "
+"beschikbaar zijn. Zo zal bijvoorbeeld het navigatieframe zich niet "
"automatisch vernieuwen."
#: main.php:325
@@ -7270,7 +7268,6 @@ msgstr ""
# Verleden tijd: "is aangemaakt" => "werd aangemaakt", ookal bestaat het nog steeds.
# Wat doet "%1$s" hier?
#: pmd_pdf.php:60
-#, fuzzy
msgid "Page has been created"
msgstr "De pagina werd aangemaakt."
@@ -8087,7 +8084,7 @@ msgstr "Stop volledig"
#: server_replication.php:324
msgid "Reset slave"
-msgstr ""
+msgstr "Reset slave"
#: server_replication.php:325
#, php-format
@@ -9504,7 +9501,7 @@ msgstr "Voeg toe als nieuwe rij"
#: tbl_change.php:1027
msgid "Insert as new row and ignore errors"
-msgstr ""
+msgstr "Voeg toe als nieuwe rij en negeer foutmeldingen"
#: tbl_change.php:1028
#, fuzzy
diff --git a/po/tr.po b/po/tr.po
index 8cf6590..66797c2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-08-27 11:35+0200\n"
-"PO-Revision-Date: 2010-08-27 11:24+0200\n"
+"PO-Revision-Date: 2010-08-27 13:11+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
"Language: tr\n"
@@ -3543,7 +3543,6 @@ msgid "Connect without password"
msgstr "Parolasız bağlan"
#: libraries/config/messages.inc.php:389
-#, fuzzy
#| msgid ""
#| "You can use MySQL wildcard characters (% and _), escape them if you want "
#| "to use their literal instances, i.e. use 'my\\_db' and not 'my_db'"
@@ -3555,8 +3554,11 @@ msgid ""
"alphabetical order."
msgstr ""
"MySQL joker karakterleri (% ve _) kullanabilirsiniz, eğer bunların aslına "
-"uygun örneklerini kullanmak istiyorsanız bundan kaçının, örn. 'my\\_db' "
-"kullanın ve 'my_db' kullanmayın"
+"uygun örneklerini kullanmak istiyorsanız bundan kaçının, örn. "
+"[kbd]'my\\_db'[/kbd] kullanın ve [kbd]'my_db'[/kbd] kullanmayın. Bu seçeneği "
+"kullanarak veritabanı listesini sıralayabilirsiniz, sadece adlarını sıralı "
+"girin ve geri kalanını alfabetik sırada göstermek için sonunda [kbd]*[/kbd] "
+"kullanın."
#: libraries/config/messages.inc.php:390
msgid "Show only listed databases"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8659-ge5042e3
by Michal Čihař 27 Aug '10
by Michal Čihař 27 Aug '10
27 Aug '10
The branch, master has been updated
via e5042e313bfaf3377e5beacff34c2d3c9d9d18cd (commit)
from fb3174687d9132713daf2ce9e5a0430b50d2cb7a (commit)
- Log -----------------------------------------------------------------
commit e5042e313bfaf3377e5beacff34c2d3c9d9d18cd
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Aug 27 12:02:49 2010 +0200
Czech translation update.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 64 +++++++++++++++++++++++++++----------------------------------
1 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index f917f1a..d76085f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-08-27 11:35+0200\n"
-"PO-Revision-Date: 2010-08-27 10:29+0200\n"
+"PO-Revision-Date: 2010-08-27 12:02+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"Language: cs\n"
@@ -1660,32 +1660,30 @@ msgid "Could not open file: %s"
msgstr "Chyba při otevírání souboru: %s"
#: libraries/chart.lib.php:41
-#, fuzzy
#| msgid "Show statistics"
msgid "Query statistics"
-msgstr "Zobrazit statistiky"
+msgstr "Statistika dotazu"
#: libraries/chart.lib.php:64
msgid "Query execution time comparison (in microseconds)"
-msgstr ""
+msgstr "Porovnání běhu dotazu (v mikrosekundách)"
#: libraries/chart.lib.php:84
-#, fuzzy
#| msgid "Query results operations"
msgid "Query results"
-msgstr "Operace s výsledky dotazu"
+msgstr "Výsledky dotazu"
#: libraries/chart.lib.php:110
msgid "No data found for the chart."
-msgstr ""
+msgstr "Nebyla nalezena žádná data pro graf."
#: libraries/chart.lib.php:250
msgid "GD extension is needed for charts."
-msgstr ""
+msgstr "Pro grafy je potřebné rozšíření GD."
#: libraries/chart.lib.php:253
msgid "JSON encoder is needed for chart tooltips."
-msgstr ""
+msgstr "Enkodér pro JSON je potřeba pro tooltipy grafu."
#: libraries/common.inc.php:567
msgid ""
@@ -3885,7 +3883,7 @@ msgstr "Přeskočit zamčené tabulky"
#: libraries/config/messages.inc.php:461
msgid "Requires SQL Validator to be enabled"
-msgstr ""
+msgstr "Vyžaduje povolené ověřování SQL"
#: libraries/config/messages.inc.php:463
#: libraries/display_change_password.lib.php:40
@@ -3905,7 +3903,7 @@ msgstr ""
#: libraries/config/messages.inc.php:465
msgid "Enable SQL Validator"
-msgstr ""
+msgstr "Povolit ověřování SQL"
#: libraries/config/messages.inc.php:466
msgid ""
@@ -3946,7 +3944,7 @@ msgstr ""
#: libraries/config/messages.inc.php:473
msgid "Textarea columns"
-msgstr ""
+msgstr "Sloupců v textové oblasti"
#: libraries/config/messages.inc.php:474
msgid ""
@@ -3955,10 +3953,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:475
-#, fuzzy
#| msgid "CHAR textarea rows"
msgid "Textarea rows"
-msgstr "Řádky pro textové oblasti CHAR"
+msgstr "Řádků v textové oblasti"
#: libraries/config/messages.inc.php:476
msgid "Title of browser window when a database is selected"
@@ -4642,10 +4639,9 @@ msgid "Print view (with full texts)"
msgstr "Náhled pro tisk (s kompletními texty)"
#: libraries/display_tbl.lib.php:2189 tbl_chart.php:82
-#, fuzzy
#| msgid "Display PDF schema"
msgid "Display chart"
-msgstr "Zobrazit jako schéma v PDF"
+msgstr "Zobrazit graf"
#: libraries/display_tbl.lib.php:2324
msgid "Link not found"
@@ -8994,71 +8990,67 @@ msgstr ""
#: tbl_chart.php:91
msgid "Width"
-msgstr ""
+msgstr "Šířka"
#: tbl_chart.php:95
msgid "Height"
-msgstr ""
+msgstr "Výška"
#: tbl_chart.php:99
msgid "Title"
-msgstr ""
+msgstr "Název"
#: tbl_chart.php:104
msgid "X Axis label"
-msgstr ""
+msgstr "Popis osy X"
#: tbl_chart.php:108
msgid "Y Axis label"
-msgstr ""
+msgstr "Popis osy Y"
#: tbl_chart.php:113
msgid "Area margins"
-msgstr ""
+msgstr "Okraje oblasti"
#: tbl_chart.php:123
msgid "Legend margins"
-msgstr ""
+msgstr "Okraje popisu"
#: tbl_chart.php:135
-#, fuzzy
#| msgid "Mar"
msgid "Bar"
-msgstr "bře"
+msgstr "Sloupec"
#: tbl_chart.php:136
msgid "Line"
-msgstr ""
+msgstr "Čára"
#: tbl_chart.php:137
msgid "Radar"
-msgstr ""
+msgstr "Síť"
#: tbl_chart.php:139
-#, fuzzy
#| msgid "PiB"
msgid "Pie"
-msgstr "PiB"
+msgstr "Koláč"
#: tbl_chart.php:145
-#, fuzzy
#| msgid "Query type"
msgid "Bar type"
-msgstr "Typ dotazu"
+msgstr "Typ sloupců"
#: tbl_chart.php:147
-#, fuzzy
#| msgid "Packed"
msgid "Stacked"
-msgstr "Zabaleno"
+msgstr "Skládané"
#: tbl_chart.php:148
msgid "Multi"
-msgstr ""
+msgstr "Vícenásobné"
#: tbl_chart.php:153
msgid "Continuous image"
-msgstr ""
+msgstr "Souvislý obrázek"
#: tbl_chart.php:156
msgid ""
@@ -9079,7 +9071,7 @@ msgstr ""
#: tbl_chart.php:182
msgid "Redraw"
-msgstr ""
+msgstr "Znovu vykreslit"
#: tbl_create.php:55
#, php-format
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8657-g49094a5
by Michal Čihař 27 Aug '10
by Michal Čihař 27 Aug '10
27 Aug '10
The branch, master has been updated
via 49094a5980bd7961713471abba392661e9a33319 (commit)
via e4a896a80c5cc557a722046d8e9c2efd239f7c46 (commit)
via 93563bb2b6d054eb17fd65c01402d4384274219d (commit)
via 87a7f02f7485290d94985057ba12e33d337afc39 (commit)
via 8d29a9eaa91ff3b16991bd6b5da2e0eae8f3c829 (commit)
via fe61704402ebfba11a30dac7824fe85d58e57e6c (commit)
via b8a00c89311d34dcd0a6b2ffd3820cddd6052973 (commit)
via b0b1551c420c49d11f435b11f19ca552fa1d32d1 (commit)
via 2cfec45e4fc1d062720cef6ef236ce46da2cef09 (commit)
via fa39ff5117c6a76f1b18ff79e505ca74a38f2b96 (commit)
from e0eaac2e144d1e738510839b93e5d9b0e9c020e8 (commit)
- Log -----------------------------------------------------------------
commit 49094a5980bd7961713471abba392661e9a33319
Merge: e0eaac2e144d1e738510839b93e5d9b0e9c020e8 e4a896a80c5cc557a722046d8e9c2efd239f7c46
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Aug 27 11:30:57 2010 +0200
Merge remote branch 'pootle/master'
commit e4a896a80c5cc557a722046d8e9c2efd239f7c46
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 11:24:03 2010 +0200
Translation update done using Pootle.
commit 93563bb2b6d054eb17fd65c01402d4384274219d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 11:23:49 2010 +0200
Translation update done using Pootle.
commit 87a7f02f7485290d94985057ba12e33d337afc39
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 11:22:16 2010 +0200
Translation update done using Pootle.
commit 8d29a9eaa91ff3b16991bd6b5da2e0eae8f3c829
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 11:21:46 2010 +0200
Translation update done using Pootle.
commit fe61704402ebfba11a30dac7824fe85d58e57e6c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 11:20:06 2010 +0200
Translation update done using Pootle.
commit b8a00c89311d34dcd0a6b2ffd3820cddd6052973
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 11:19:56 2010 +0200
Translation update done using Pootle.
commit b0b1551c420c49d11f435b11f19ca552fa1d32d1
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 11:17:33 2010 +0200
Translation update done using Pootle.
commit 2cfec45e4fc1d062720cef6ef236ce46da2cef09
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 11:16:33 2010 +0200
Translation update done using Pootle.
commit fa39ff5117c6a76f1b18ff79e505ca74a38f2b96
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri Aug 27 10:58:00 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/nl.po | 152 ++------------------------------------------------------------
po/tr.po | 25 ++++-------
2 files changed, 13 insertions(+), 164 deletions(-)
diff --git a/po/nl.po b/po/nl.po
index 6d5485c..5c7f11d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-08-25 09:51+0200\n"
-"PO-Revision-Date: 2010-05-31 01:06+0200\n"
-"Last-Translator: Bjorn <inbox(a)bjornroesbeke.be>\n"
+"PO-Revision-Date: 2010-08-27 11:17+0200\n"
+"Last-Translator: Herman van Rink <rink(a)initfour.nl>\n"
"Language-Team: dutch <nl(a)li.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:36 browse_foreigners.php:57
#: libraries/display_tbl.lib.php:415 server_privileges.php:1510
@@ -10029,9 +10029,8 @@ msgid "VIEW name"
msgstr "VIEW-naam"
#: view_operations.php:91
-#, fuzzy
msgid "Rename view to"
-msgstr "Tabel hernoemen naar"
+msgstr "Hernoem view naar"
#~ msgid "Edit PDF Pages"
#~ msgstr "PDF Pagina's aanpassen"
@@ -10068,146 +10067,3 @@ msgstr "Tabel hernoemen naar"
#~ msgid "yes"
#~ msgstr "ja"
-
-#, fuzzy
-#~| msgid "Remove CRLF characters within fields"
-#~ msgid "Remove carriage return/line field characters within columns"
-#~ msgstr "Verwijder CRLF tekens uit veld-waarden"
-
-#, fuzzy
-#~| msgid "Add AUTO_INCREMENT value"
-#~ msgid "<code>AUTO_INCREMENT</code>"
-#~ msgstr "Voeg AUTO_INCREMENT waarde toe"
-
-#, fuzzy
-#~| msgid "Dump %s row(s) starting at record # %s"
-#~ msgid "Dump %s row(s) starting at row # %s"
-#~ msgstr "%s rijen aan het dumpen, start bij rij %s."
-
-#~ msgid "remember template"
-#~ msgstr "Onthoud template"
-
-#~ msgid "Imported file compression will be automatically detected from: %s"
-#~ msgstr "Gecomprimeerde bestanden worden automatisch herkend: %s"
-
-#~ msgid "Add into comments"
-#~ msgstr "Voeg toe in commentaar"
-
-#~ msgid "Export Structure Schemas (recommended)"
-#~ msgstr "Exporteer structuurschema's (recommended)"
-
-#~ msgid "Export functions"
-#~ msgstr "Exporteer functies"
-
-#~ msgid "Export procedures"
-#~ msgstr "Exporteer procedures"
-
-#~ msgid "Export triggers"
-#~ msgstr "Exporteer triggers"
-
-#~ msgid "Export views"
-#~ msgstr "Exporteer views"
-
-#~ msgid "Invalid column (%s) specified!"
-#~ msgstr "Ongeldige kolom (%s) opgegeven!"
-
-#~ msgid "Actions"
-#~ msgstr "Acties"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Custom color"
-#~ msgstr "Aangepaste kleur"
-
-#, fuzzy
-#~| msgid "Table name"
-#~ msgid "Table removal"
-#~ msgstr "Tabelnaam"
-
-#~ msgid "BLOB Repository"
-#~ msgstr "BLOB Bewaarplaats"
-
-#, fuzzy
-#~| msgid "Enabled"
-#~ msgctxt "BLOB repository"
-#~ msgid "Enabled"
-#~ msgstr "Ingeschakeld"
-
-#~ msgid "Disable"
-#~ msgstr "Uitschakelen"
-
-#~ msgid "Damaged"
-#~ msgstr "Beschadigd"
-
-#~ msgctxt "BLOB repository"
-#~ msgid "Repair"
-#~ msgstr "Herstel"
-
-#, fuzzy
-#~| msgid "Disabled"
-#~ msgctxt "BLOB repository"
-#~ msgid "Disabled"
-#~ msgstr "Uitgeschakeld"
-
-#~ msgid "Enable"
-#~ msgstr "Inschakelen"
-
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~ "extension. Please check your PHP configuration."
-#~ msgstr ""
-#~ "Kan de [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a]-extensie "
-#~ "niet laden. Controleer de PHP configuratie."
-
-#~ msgid ""
-#~ "Couldn't load the iconv or recode extension needed for charset "
-#~ "conversion. Either configure PHP to enable these extensions or disable "
-#~ "charset conversion in phpMyAdmin."
-#~ msgstr ""
-#~ "Kan de iconv of recode extensies niet laden, welke nodig zijn voor de "
-#~ "karakterset conversie, configureer PHP om deze extensies toe te laten of "
-#~ "schakel karakterset conversie uit in phpMyAdmin"
-
-#~ msgid ""
-#~ "Couldn't use the iconv, libiconv, or recode_string functions, although "
-#~ "the necessary extensions appear to be loaded. Check your PHP "
-#~ "configuration."
-#~ msgstr ""
-#~ "Kan iconv, libiconv en recode_string functies niet gebruiken hoewel de "
-#~ "extensies geladen geladen lijken te zijn. Controleer de PHP configuratie."
-
-#~ msgid "Allow character set conversion"
-#~ msgstr "Karakterset converteringen toestaan"
-
-#~ msgid "Default character set used for conversions"
-#~ msgstr "Standaard karakterset gebruikt voor converteringen"
-
-#~ msgid "Default character set"
-#~ msgstr "Standaard karakterset"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Nieuw veld toevoegen"
-
-#~ msgid "Field"
-#~ msgstr "Veld"
-
-#~ msgid "Records"
-#~ msgstr "Records"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Velden beëindigd door"
-
-#~ msgid "Fields"
-#~ msgstr "Velden"
-
-#~ msgid "Add %s field(s)"
-#~ msgstr "Voeg %s veld(en) toe"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Veld %s is vervallen"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Zie image/jpeg: inline"
diff --git a/po/tr.po b/po/tr.po
index 88b77aa..33551b8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-08-25 09:51+0200\n"
-"PO-Revision-Date: 2010-08-27 09:39+0200\n"
+"PO-Revision-Date: 2010-08-27 11:24+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
"Language: tr\n"
@@ -3243,7 +3243,6 @@ msgid "Protect binary columns"
msgstr "Binari sütunlarını koru"
#: libraries/config/messages.inc.php:329
-#, fuzzy
#| msgid ""
#| "Enable if you want DB-based query history (requires pmadb). If disabled, "
#| "this utilizes JS-routines to display query history (lost by window close)."
@@ -3252,9 +3251,9 @@ msgid ""
"storage). If disabled, this utilizes JS-routines to display query history "
"(lost by window close)."
msgstr ""
-"Eğer VT-tabanlı sorgu geçmişi isterseniz etkinleştirin (pmadb gerektirir). "
+"Eğer VT-tabanlı sorgu geçmişi istiyorsanız etkinleştirin (pmadb gerektirir). "
"Eğer etkisizleştirilirse, sorgu geçmişini görüntülemek için bu JS-"
-"programından yararlanır (pencere kapatıldığında bilgi kaybolur)."
+"programlarından yararlanır (pencere kapatıldığında bilgi kaybolur)."
#: libraries/config/messages.inc.php:330
msgid "Permanent query history"
@@ -3281,22 +3280,19 @@ msgid "Query window height (in pixels)"
msgstr "Sorgu penceresi yüksekliği (piksel olarak)"
#: libraries/config/messages.inc.php:337
-#, fuzzy
#| msgid "Query window"
msgid "Query window height"
-msgstr "Sorgu penceresi"
+msgstr "Sorgu penceresi yüksekliği"
#: libraries/config/messages.inc.php:338
-#, fuzzy
#| msgid "Query window height (in pixels)"
msgid "Query window width (in pixels)"
-msgstr "Sorgu penceresi yüksekliği (piksel olarak)"
+msgstr "Sorgu penceresi genişliği (piksel olarak)"
#: libraries/config/messages.inc.php:339
-#, fuzzy
#| msgid "Query window"
msgid "Query window width"
-msgstr "Sorgu penceresi"
+msgstr "Sorgu penceresi genişliği"
#: libraries/config/messages.inc.php:340
msgid "Select which functions will be used for character set conversion"
@@ -3312,10 +3308,9 @@ msgstr ""
"Her X hücrede başlığı tekrarla, [kbd]0[/kbd] bu özelliği devre dışı bırakır"
#: libraries/config/messages.inc.php:343
-#, fuzzy
#| msgid "Metadata Headers"
msgid "Repeat headers"
-msgstr "Üstveri Üstbilgileri"
+msgstr "Başlıkları tekrarla"
#: libraries/config/messages.inc.php:344
msgid "Show help button instead of Documentation text"
@@ -3338,20 +3333,18 @@ msgid "Leave blank if not used"
msgstr "Eğer kullanılmayacaksa boş bırakın"
#: libraries/config/messages.inc.php:350
-#, fuzzy
#| msgid "Host authentication order"
msgid "Host authorization order"
-msgstr "Anamakine kimlik denetimi düzeni"
+msgstr "Anamakine izin düzeni"
#: libraries/config/messages.inc.php:351
msgid "Leave blank for defaults"
msgstr "Varsayılan için boş bırakın"
#: libraries/config/messages.inc.php:352
-#, fuzzy
#| msgid "Host authentication rules"
msgid "Host authorization rules"
-msgstr "Anamakine kimlik denetimi kuralları"
+msgstr "Anamakine izin kuralları"
#: libraries/config/messages.inc.php:353
msgid "Allow logins without a password"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8647-ge0eaac2
by Herman van Rink 27 Aug '10
by Herman van Rink 27 Aug '10
27 Aug '10
The branch, master has been updated
via e0eaac2e144d1e738510839b93e5d9b0e9c020e8 (commit)
via 51c9c1763ea70c36e0d22cc865b48f5186da1fbc (commit)
via 0ea410c3e4fe6093723f65860f643cc096d78af2 (commit)
via 58f8ebc23c2982a299773b3c2c15f144b089c27a (commit)
via dcf470e6d752b80ffaf3d641eb0000e47f341d05 (commit)
via e141acf5c6bec609cfcd72c9ac131942d59f8d2e (commit)
via e076ec85e174038c7ffe17f701342e52f4413afe (commit)
via 6fb5591f4edd26058056718c83305ad12501ae8e (commit)
via d8edf38d0d66d2b30d7e8d56f85334c326527a31 (commit)
via b477c4cb1a0ccbe75bd748470d590d7805b48e5d (commit)
via b81a22e41f5027e85361997dc8d9936d86957f7f (commit)
via b32e5879fd10bb7e650442e2e4af54f2ecc72c4c (commit)
via 4d8d81f4e5191a19baa540c68003d99a0f7289b3 (commit)
via 6c9f949613e766719a2a8bfd3a9919cd102f452a (commit)
via 62b443c0691fa119958f6ac09ee6c6694ba54f3f (commit)
via 0b90202b8ffb79b8246bb987248311757080f7aa (commit)
via eb3f96ac51c78ec51827a2636c1757d8707377fa (commit)
via d6185d7ace9d1e7fdba08568f3ded0e2b16462d3 (commit)
via 59f220eb1307fd881ba43e809e0a729432d83d86 (commit)
via 47f67613a2066b69bdf03ff8e43a857f59e8e230 (commit)
via 68f4a8daf70a832f2f7d87c379250d6816895c0a (commit)
via 55089f12dbd9493a92bab79e2d11a956368ad61f (commit)
via fe77ca741c4ae9e89fdfd373c10b3cc36e068dc8 (commit)
via 1c1d555002ec8b85ff134a8d9b572c9b4c8e51f7 (commit)
via 0b620df9129c11087bde584b6f6f9e00b90e0f66 (commit)
via 57614902eb7e7db60025a196ca79fa4170e22141 (commit)
via 88b9e72597030218d781381ff3970efa30d65fbf (commit)
via 4577d63b4d85e6f8c9700bf4fb80d3d9e865995a (commit)
via b0888714b6ab232d7b0dfc24b38d0da9875eed70 (commit)
via aecac3a6913aa6c93458f8df9edaf7cd4a055980 (commit)
via c6ce98be18ae87c655721ef4559fbb42d3afdce2 (commit)
via 34ec78abb5e222fc2fcf7bee31fd7cd73e0b7366 (commit)
via 4f62c6c2ea45583539f3d191ad9bcf072b684d10 (commit)
via 8b7e8257b34f5ae9ad60030d4d9f1d10f338b174 (commit)
via 039e30450c7c81739b293b8138cabba2c25f5606 (commit)
via 53c071941a7523ae35f8fdacb6ee9acdbda1aebc (commit)
via 0604e81526cfd591b0ced14823a8a00c522ff66a (commit)
via 3afe966b5196c0cc04d3d52ad61392a82949b0a1 (commit)
via b7daf5d98571d9ec39c001f1b8065fcd490f4a8c (commit)
via afe5f63c4bb5f34355a465ee8f85f620ad01d959 (commit)
via 25a59f23d5d97e0d9459feba97eb63959c7b4f76 (commit)
via e3736762aeecf47c4c4a062af49c5f5edc61448f (commit)
via bcbd662f4856e3d7c413d182d2cf017c556daf64 (commit)
via 557eb2096bedb5f46f49d10b8e3349f7273d4fe3 (commit)
via 2f78d2d147ae22563e1c0d44e9f0a60155efee0e (commit)
via c40e145597f1dddf04a99f3f776c1e83637b3653 (commit)
via 979aa9a7ed7b4179d41de6998d6e8b4183611d22 (commit)
via 3df1126c8539d410c0bc376a04c94401dbc109ed (commit)
via 6b806f20477abf750fe071f89cb74c1d9a095f53 (commit)
via e5c8b5a8945810af7178901056b7330f92191e8e (commit)
via 08e048b3077c6d68e424372a7fc6f6958030ff55 (commit)
via 7eedd0387db12235f529b11158683dca6c4b6522 (commit)
via cd1cbce4efe567a05cd9c002987005b8ecc4b6c1 (commit)
via 48f2caccae987a242912d4f17e87ebe3043c70f2 (commit)
via 45e740e96b8f0b042d7974d2abc617095f7cb4eb (commit)
via f53b1a52941fa839c76356a6de80c0fd11e97519 (commit)
via 881bd0909febd4feab6144b8547e7881808afba4 (commit)
via dfe34ad8d4860899c7415c94be5a0db9653860ad (commit)
via 933238bcfb258a2f3b7276e804a13b1c4cd27c62 (commit)
via 4d6fd853d341fcacd3bbdb878cba821a514cd5de (commit)
via c530e97fb7a7cc28eebd410c39c11c0786b6eea8 (commit)
via 2e421895edf8cb8557ec2c12158c96a8e2ab6d73 (commit)
via e22cd9aab4dfcb3714aae10b949f8819f4e4e248 (commit)
via 31622c3f83cb75bca67a171ac31bddb3290a798b (commit)
via 09a7a4c9126d0a4175c047c44eab437347889218 (commit)
via d387343ee00115b046572ab2757dce044364503d (commit)
via 7958e84fffcc464e4a92512e37609c3340a9485b (commit)
via 45fd079c9cf51f25fbcd8fd874255a54e861dbe7 (commit)
via c1ed3e22915d91bfa613058e42a8f70fdd0a6e59 (commit)
via c9a785cf038b081219f7493d946f65298d5e3f45 (commit)
via 14ab690286cfe339ac661883228c59601be01bc1 (commit)
via c342ad07e0e9c8ee1552ced4360ff2dbd07213f5 (commit)
via f1e30fea1ee1c61819e1083a54ce3ce07915e559 (commit)
via c2e7aef7bae96b1155cef26f9cdcf6505591b897 (commit)
via 278ee6e2cabe1c38d3568cf8d342913f00393324 (commit)
via 1cae244e8987ff294eed39cf4cd8ac8f3e08897c (commit)
via eeead429908320594f2262c1071a99f02fb5aace (commit)
via c5b49bb839f472487073d8b6508436aa4e0cff42 (commit)
via 12d875dadc8539b6a7d2934d912878d723814e5c (commit)
via 9970ce91da7655537ff442e98e987612f5bd39d0 (commit)
via 8eb93f5a68bf81c2475dca4477d7e5e9e3a4964f (commit)
via f9d20c8c7a82de57b965464782fb254244e7dec2 (commit)
via 13c2a8cd24b333e31f6a3d9a688c1c61c851b479 (commit)
via c152e0dd3e5776fe5ae6fe7f0543d07e48822aa7 (commit)
via d1708970d6e5f407adf2a18a8dfe6c5720773efe (commit)
via 7074f1b90ee7e9afe694caa6b9550679fbf52ad5 (commit)
via f1b5ab52ef7f16fe66f0deede1c99964c10c25e8 (commit)
via fc21678fa4d499085afa0fe333cf770cddd25a99 (commit)
via d814efcfb634d8ddb25d5089d84583c4424bba1a (commit)
via 473b9b38dcc8200b7efb9a52c8f24aa00d171ec6 (commit)
via 9e25d0536d7d6e52f915d3cabde7bbde814f9e9e (commit)
via 1f378cef7fed5565f722913dbed8ec7721a793fa (commit)
via 7dd6900cfed526341e2004a3419b2f6974df5b04 (commit)
via 61e00e523e7a36570bf05cacfae53dc33621f5e8 (commit)
via 1cff6bd9283d6a9f3e1a3bf219ecf218ffe510fb (commit)
via 79485cd126fb4111d129aaedc0ea1ec55ff59640 (commit)
from 49ff70a30e1d185276b4862218ba3eb253708745 (commit)
- Log -----------------------------------------------------------------
commit e0eaac2e144d1e738510839b93e5d9b0e9c020e8
Merge: 49ff70a30e1d185276b4862218ba3eb253708745 51c9c1763ea70c36e0d22cc865b48f5186da1fbc
Author: Herman van Rink <rink(a)initfour.nl>
Date: Fri Aug 27 11:09:49 2010 +0200
Merge branch 'gsoc2010-blinky'
commit 51c9c1763ea70c36e0d22cc865b48f5186da1fbc
Author: Herman van Rink <rink(a)initfour.nl>
Date: Thu Aug 26 17:01:12 2010 +0200
Code cleanup, mostly added extra spaces
commit 0ea410c3e4fe6093723f65860f643cc096d78af2
Author: Herman van Rink <rink(a)initfour.nl>
Date: Thu Aug 26 10:01:08 2010 +0200
updated changelog
commit 58f8ebc23c2982a299773b3c2c15f144b089c27a
Merge: dcf470e6d752b80ffaf3d641eb0000e47f341d05 53b394181424dd08ee2d4431a47b49d9b6fd43c2
Author: Herman van Rink <rink(a)initfour.nl>
Date: Thu Aug 26 09:54:42 2010 +0200
Merge branch 'master' into gsoc2010-blinky
commit dcf470e6d752b80ffaf3d641eb0000e47f341d05
Author: Herman van Rink <rink(a)initfour.nl>
Date: Wed Aug 25 17:44:27 2010 +0200
duplicated icon from themes/original/img/b_chart.png
commit e141acf5c6bec609cfcd72c9ac131942d59f8d2e
Author: Herman van Rink <rink(a)initfour.nl>
Date: Thu Aug 19 11:03:58 2010 +0200
Changed text to tooltip, and elaborated.
commit e076ec85e174038c7ffe17f701342e52f4413afe
Author: Herman van Rink <rink(a)initfour.nl>
Date: Wed Aug 25 16:10:27 2010 +0200
Add vim mode lines
commit 6fb5591f4edd26058056718c83305ad12501ae8e
Author: Herman van Rink <rink(a)initfour.nl>
Date: Wed Aug 25 15:49:05 2010 +0200
Add CDATA to script code
commit d8edf38d0d66d2b30d7e8d56f85334c326527a31
Author: Herman van Rink <rink(a)initfour.nl>
Date: Wed Aug 25 15:43:42 2010 +0200
Add some htmlspecialchars for XSS prevention
commit b477c4cb1a0ccbe75bd748470d590d7805b48e5d
Merge: b81a22e41f5027e85361997dc8d9936d86957f7f b32e5879fd10bb7e650442e2e4af54f2ecc72c4c
Author: Herman van Rink <rink(a)initfour.nl>
Date: Wed Aug 25 16:59:54 2010 +0200
Merge branch 'blinky/master' into gsoc2010-blinky
Conflicts:
Documentation.html - renumbered 6.28 to 6.29
commit b81a22e41f5027e85361997dc8d9936d86957f7f
Merge: 0aba4e12f02f92c07204d8063f98cf1904686464 1cff6bd9283d6a9f3e1a3bf219ecf218ffe510fb
Author: Herman van Rink <rink(a)initfour.nl>
Date: Wed Aug 25 16:30:12 2010 +0200
Merge remote branch 'blinky/master' into gsoc2010-blinky
commit b32e5879fd10bb7e650442e2e4af54f2ecc72c4c
Merge: 4d8d81f4e5191a19baa540c68003d99a0f7289b3 b51a217c36b45194f79915992a599338b3bac9ef
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Mon Aug 16 01:01:30 2010 +0300
Merge commit 'origin/master' into local
commit 4d8d81f4e5191a19baa540c68003d99a0f7289b3
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Sun Aug 15 22:15:12 2010 +0300
added documentation link
commit 6c9f949613e766719a2a8bfd3a9919cd102f452a
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Sun Aug 15 15:10:32 2010 +0300
added entry in the faq
commit 62b443c0691fa119958f6ac09ee6c6694ba54f3f
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Aug 13 19:54:22 2010 +0300
chenaged comments in the JS files
commit 0b90202b8ffb79b8246bb987248311757080f7aa
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Aug 13 14:50:21 2010 +0300
fixed an issue when a serie name was not set, thus generating a warning
commit eb3f96ac51c78ec51827a2636c1757d8707377fa
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Aug 13 14:34:07 2010 +0300
changed comments to comply with phpdoc and added some new comments. Moved color settings to more appropriate places.
commit d6185d7ace9d1e7fdba08568f3ded0e2b16462d3
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Aug 13 12:17:26 2010 +0300
removed leftovers from never-used flash chart implmenetation
commit 59f220eb1307fd881ba43e809e0a729432d83d86
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Aug 6 13:22:04 2010 +0300
added check for json encoder, cleaned up error handling a bit
commit 47f67613a2066b69bdf03ff8e43a857f59e8e230
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Aug 5 16:47:28 2010 +0300
fixed a notice which was generated on non supported query result format
commit 68f4a8daf70a832f2f7d87c379250d6816895c0a
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 29 20:26:16 2010 +0300
removed OFC implementation, since we are not going to use it.
commit 55089f12dbd9493a92bab79e2d11a956368ad61f
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 29 20:22:55 2010 +0300
getting title shadow back. Will see how it looks on the demo server.
commit fe77ca741c4ae9e89fdfd373c10b3cc36e068dc8
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 29 20:22:03 2010 +0300
fixing built-in functions so that they work with modified imagemap.
commit 1c1d555002ec8b85ff134a8d9b572c9b4c8e51f7
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 29 20:12:10 2010 +0300
fixed a bug if a chart was drawn for a query result of one row
commit 0b620df9129c11087bde584b6f6f9e00b90e0f66
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 29 19:15:08 2010 +0300
enable warning report to the chart.
commit 57614902eb7e7db60025a196ca79fa4170e22141
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 29 19:06:11 2010 +0300
image map enchancements.
commit 88b9e72597030218d781381ff3970efa30d65fbf
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 29 16:18:57 2010 +0300
fixed not translated strings, thanks Herman
commit 4577d63b4d85e6f8c9700bf4fb80d3d9e865995a
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 29 16:18:35 2010 +0300
commented the render function, thanks Herman
commit b0888714b6ab232d7b0dfc24b38d0da9875eed70
Merge: aecac3a6913aa6c93458f8df9edaf7cd4a055980 d0fc397fe1c474150883e85a791a012a7ae03380
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 29 14:14:26 2010 +0300
Merge commit 'origin/master' into local
Conflicts:
server_status.php
commit aecac3a6913aa6c93458f8df9edaf7cd4a055980
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 28 16:28:58 2010 +0300
trying to fix the title bug on the demo server
commit c6ce98be18ae87c655721ef4559fbb42d3afdce2
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 28 12:26:40 2010 +0300
moved setting defaults to the correct place.
commit 34ec78abb5e222fc2fcf7bee31fd7cd73e0b7366
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 28 11:27:32 2010 +0300
turned of shadow in the title
commit 4f62c6c2ea45583539f3d191ad9bcf072b684d10
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 28 11:02:17 2010 +0300
added font size setting
commit 8b7e8257b34f5ae9ad60030d4d9f1d10f338b174
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 27 18:32:47 2010 +0300
bugfix for changed format
commit 039e30450c7c81739b293b8138cabba2c25f5606
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 27 18:28:19 2010 +0300
added setting for continuous image
commit 53c071941a7523ae35f8fdacb6ee9acdbda1aebc
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 27 18:26:50 2010 +0300
forgot to swap label names
commit 0604e81526cfd591b0ced14823a8a00c522ff66a
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 27 18:11:01 2010 +0300
bugfix and a query result format changes according to the latest wiki article about charts.
commit 3afe966b5196c0cc04d3d52ad61392a82949b0a1
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 27 12:52:46 2010 +0300
added query results chart when results have only one column.
commit b7daf5d98571d9ec39c001f1b8065fcd490f4a8c
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jul 23 16:53:46 2010 +0300
removed overlib dependancy. Written simple tooltip.
commit afe5f63c4bb5f34355a465ee8f85f620ad01d959
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jul 23 13:54:19 2010 +0300
fixed radar chart tooltip text.
commit 25a59f23d5d97e0d9459feba97eb63959c7b4f76
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jul 23 13:19:30 2010 +0300
chart is rendered in parts. Fixes the issue with browsers which have limited size on base64 images.
commit e3736762aeecf47c4c4a062af49c5f5edc61448f
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 22 14:30:02 2010 +0300
cleaned JS for tooltips
commit bcbd662f4856e3d7c413d182d2cf017c556daf64
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 21 19:35:15 2010 +0300
added tooltip JS includes for other chart places.
commit 557eb2096bedb5f46f49d10b8e3349f7273d4fe3
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 21 19:32:17 2010 +0300
added tooltips for radar charts.
commit 2f78d2d147ae22563e1c0d44e9f0a60155efee0e
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 20 23:29:13 2010 +0300
tooltip on the pie working. Now only on the query results chart.
commit c40e145597f1dddf04a99f3f776c1e83637b3653
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 20 20:29:19 2010 +0300
added JS tooltips to the bar and line charts. Other types generate warnings for now.
commit 979aa9a7ed7b4179d41de6998d6e8b4183611d22
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jul 9 17:34:28 2010 +0300
graceful error handling
commit 3df1126c8539d410c0bc376a04c94401dbc109ed
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jul 9 16:29:14 2010 +0300
fixed custom axis lables on the multi chart.
commit 6b806f20477abf750fe071f89cb74c1d9a095f53
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jul 9 16:27:25 2010 +0300
Chart title has been put to the settings array.
commit e5c8b5a8945810af7178901056b7330f92191e8e
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jul 9 16:17:16 2010 +0300
default labels are returned to the settings form.
commit 08e048b3077c6d68e424372a7fc6f6958030ff55
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jul 9 16:16:22 2010 +0300
fixed chart error handler.
commit 7eedd0387db12235f529b11158683dca6c4b6522
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jul 9 16:08:53 2010 +0300
Fixed a case where a notice was generated when the first point was added to the data set.
commit cd1cbce4efe567a05cd9c002987005b8ecc4b6c1
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 8 20:29:27 2010 +0300
data overflow fix
commit 48f2caccae987a242912d4f17e87ebe3043c70f2
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 8 20:26:40 2010 +0300
error handling
commit 45e740e96b8f0b042d7974d2abc617095f7cb4eb
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 8 19:52:38 2010 +0300
fixed option hendling
commit f53b1a52941fa839c76356a6de80c0fd11e97519
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 8 14:19:16 2010 +0300
added radar chart type to the query results charts.
commit 881bd0909febd4feab6144b8547e7881808afba4
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 8 13:47:29 2010 +0300
added value skip option to the radar chart in pChar.class
commit dfe34ad8d4860899c7415c94be5a0db9653860ad
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 8 12:40:03 2010 +0300
added chart type PIE to the query results charts
commit 933238bcfb258a2f3b7276e804a13b1c4cd27c62
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jul 8 11:24:49 2010 +0300
fixed a bug where GD function was used before the check if GD is available.
commit 4d6fd853d341fcacd3bbdb878cba821a514cd5de
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 7 17:41:45 2010 +0300
Added multi bar chart. Added margin options.
commit c530e97fb7a7cc28eebd410c39c11c0786b6eea8
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 7 16:57:30 2010 +0300
decreased the size of the points in the line chart
commit 2e421895edf8cb8557ec2c12158c96a8e2ab6d73
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 7 16:57:06 2010 +0300
using background color setting now
commit e22cd9aab4dfcb3714aae10b949f8819f4e4e248
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 7 16:37:09 2010 +0300
Restructured code. This allows more chart types and removes some code duplication. Added line charts.
commit 31622c3f83cb75bca67a171ac31bddb3290a798b
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 7 16:34:02 2010 +0300
added getPieLegendBoxSize($Data) method
commit 09a7a4c9126d0a4175c047c44eab437347889218
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 7 13:51:30 2010 +0300
added error messaged
commit d387343ee00115b046572ab2757dce044364503d
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jul 7 09:29:29 2010 +0300
removed debug info
added check for gd library
commit 7958e84fffcc464e4a92512e37609c3340a9485b
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 6 23:26:36 2010 +0300
debug on the demo server
commit 45fd079c9cf51f25fbcd8fd874255a54e861dbe7
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 6 22:23:34 2010 +0300
debug on the demo server
commit c1ed3e22915d91bfa613058e42a8f70fdd0a6e59
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 6 21:23:03 2010 +0300
debug on the demo server
commit c9a785cf038b081219f7493d946f65298d5e3f45
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 6 19:22:41 2010 +0300
debug on the demo server
commit 14ab690286cfe339ac661883228c59601be01bc1
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 6 18:23:05 2010 +0300
debug on the demo server
commit c342ad07e0e9c8ee1552ced4360ff2dbd07213f5
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 6 17:30:32 2010 +0300
debug on the demo server
commit f1e30fea1ee1c61819e1083a54ce3ce07915e559
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jul 6 17:02:48 2010 +0300
debug on the demo server
commit c2e7aef7bae96b1155cef26f9cdcf6505591b897
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jun 23 14:06:57 2010 +0300
added configurable settings for title and labels
commit 278ee6e2cabe1c38d3568cf8d342913f00393324
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jun 23 13:32:23 2010 +0300
added curly braces where needed
commit 1cae244e8987ff294eed39cf4cd8ac8f3e08897c
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Wed Jun 23 13:30:20 2010 +0300
fixed case error
commit eeead429908320594f2262c1071a99f02fb5aace
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jun 22 15:25:06 2010 +0300
Moved settings to an array. Form fields to choose settings for query result chart.
commit c5b49bb839f472487073d8b6508436aa4e0cff42
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jun 22 14:24:23 2010 +0300
added stacked bar chart
commit 12d875dadc8539b6a7d2934d912878d723814e5c
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Mon Jun 21 17:35:42 2010 +0300
early code to show a chart for query results
commit 9970ce91da7655537ff442e98e987612f5bd39d0
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Mon Jun 21 17:34:50 2010 +0300
restructured the code to be more OOP friendly
commit 8eb93f5a68bf81c2475dca4477d7e5e9e3a4964f
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jun 17 20:54:32 2010 +0300
Increased default size.
commit f9d20c8c7a82de57b965464782fb254244e7dec2
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jun 17 19:04:59 2010 +0300
added chart button. Will be used later to draw a chart of the query results.
commit 13c2a8cd24b333e31f6a3d9a688c1c61c851b479
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jun 17 17:39:32 2010 +0300
fixed default sizes and colors. Fixed some var names.
commit c152e0dd3e5776fe5ae6fe7f0543d07e48822aa7
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jun 17 17:14:04 2010 +0300
modified status chart size.
commit d1708970d6e5f407adf2a18a8dfe6c5720773efe
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jun 17 17:10:19 2010 +0300
moved chart dependant code to the chart lib.
commit 7074f1b90ee7e9afe694caa6b9550679fbf52ad5
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jun 17 16:01:56 2010 +0300
color changes to make them more distinguishable
commit f1b5ab52ef7f16fe66f0deede1c99964c10c25e8
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jun 17 16:01:09 2010 +0300
added first pChart charts.
commit fc21678fa4d499085afa0fe333cf770cddd25a99
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Thu Jun 17 16:00:08 2010 +0300
moved flash file to appropriate directory
commit d814efcfb634d8ddb25d5089d84583c4424bba1a
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jun 15 20:13:34 2010 +0300
added the chart in the profiling window
commit 473b9b38dcc8200b7efb9a52c8f24aa00d171ec6
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Tue Jun 15 20:13:12 2010 +0300
fixed the layout of the chart in the server status page
commit 9e25d0536d7d6e52f915d3cabde7bbde814f9e9e
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Mon Jun 14 23:36:52 2010 +0300
implementation of the pie chart using OFC
commit 1f378cef7fed5565f722913dbed8ec7721a793fa
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Mon Jun 14 23:36:22 2010 +0300
added OFC php wrapper together with SWF file to PMA
commit 7dd6900cfed526341e2004a3419b2f6974df5b04
Merge: 61e00e523e7a36570bf05cacfae53dc33621f5e8 662f3d4da33363f77051a847488d41f40cf33655
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jun 4 16:29:15 2010 +0200
Merge commit 'origin/master' into local
commit 61e00e523e7a36570bf05cacfae53dc33621f5e8
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Fri Jun 4 16:19:55 2010 +0200
file placeholder creation. Will build on top of these.
commit 1cff6bd9283d6a9f3e1a3bf219ecf218ffe510fb
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Mon May 24 22:15:00 2010 +0200
Revert initial commit
commit 79485cd126fb4111d129aaedc0ea1ec55ff59640
Author: Martynas Mickevicius <mmartynas(a)gmail.com>
Date: Mon May 24 21:55:44 2010 +0200
test commit
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
Documentation.html | 5 +
js/pMap.js | 164 ++
libraries/chart.lib.php | 257 ++
libraries/chart/pChart/fonts/tahoma.ttf | Bin 0 -> 383804 bytes
libraries/chart/pChart/pCache.class | 119 +
libraries/chart/pChart/pChart.class | 3626 +++++++++++++++++++++++++++
libraries/chart/pChart/pData.class | 260 ++
libraries/chart/pma_chart.php | 184 ++
libraries/chart/pma_pchart_chart.php | 399 +++
libraries/chart/pma_pchart_multi.php | 118 +
libraries/chart/pma_pchart_multi_bar.php | 38 +
libraries/chart/pma_pchart_multi_line.php | 39 +
libraries/chart/pma_pchart_multi_radar.php | 100 +
libraries/chart/pma_pchart_pie.php | 101 +
libraries/chart/pma_pchart_single.php | 57 +
libraries/chart/pma_pchart_single_bar.php | 35 +
libraries/chart/pma_pchart_single_line.php | 35 +
libraries/chart/pma_pchart_single_radar.php | 88 +
libraries/chart/pma_pchart_stacked_bar.php | 36 +
libraries/common.lib.php | 14 +-
libraries/display_tbl.lib.php | 6 +
server_status.php | 14 +
sql.php | 3 +-
tbl_chart.php | 192 ++
themes/darkblue_orange/img/b_chart.png | Bin 0 -> 3118 bytes
themes/original/img/b_chart.png | Bin 0 -> 3118 bytes
27 files changed, 5889 insertions(+), 2 deletions(-)
create mode 100644 js/pMap.js
create mode 100644 libraries/chart.lib.php
create mode 100644 libraries/chart/pChart/fonts/tahoma.ttf
create mode 100644 libraries/chart/pChart/pCache.class
create mode 100644 libraries/chart/pChart/pChart.class
create mode 100644 libraries/chart/pChart/pData.class
create mode 100644 libraries/chart/pma_chart.php
create mode 100644 libraries/chart/pma_pchart_chart.php
create mode 100644 libraries/chart/pma_pchart_multi.php
create mode 100644 libraries/chart/pma_pchart_multi_bar.php
create mode 100644 libraries/chart/pma_pchart_multi_line.php
create mode 100644 libraries/chart/pma_pchart_multi_radar.php
create mode 100644 libraries/chart/pma_pchart_pie.php
create mode 100644 libraries/chart/pma_pchart_single.php
create mode 100644 libraries/chart/pma_pchart_single_bar.php
create mode 100644 libraries/chart/pma_pchart_single_line.php
create mode 100644 libraries/chart/pma_pchart_single_radar.php
create mode 100644 libraries/chart/pma_pchart_stacked_bar.php
create mode 100644 tbl_chart.php
create mode 100644 themes/darkblue_orange/img/b_chart.png
create mode 100644 themes/original/img/b_chart.png
diff --git a/ChangeLog b/ChangeLog
index eb47035..10451cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,7 @@ $Id$
- rfe #2973909 Users preferences
- [relations] Dropped WYSIWYG-PDF configuration variable.
- rfe #806035, #686260 [relations] Export relations to Dia, SVG and others
++ [interface] Added charts to status tab, profiling page and query results
3.3.7.0 (not yet released)
diff --git a/Documentation.html b/Documentation.html
index 96f0bee..50d6dd1 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4340,6 +4340,11 @@ chmod o+rwx tmp
other.
</p>
+<h4 id="faq6_29">
+ <a href="#faq6_29">6.28 Why can't I get a chart from my query result table?</a></h4>
+
+<p> Not every table can be put to the chart. Only tables with one, two or three columns can be visualised as a chart. Moreover the table must be in a special format for chart script to understand it. Currently supported formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Devel:Charts#Data_formats_for_query_results_…">wiki</a>.</p>
+
<h3 id="faqproject">phpMyAdmin project</h3>
<h4 id="faq7_1">
diff --git a/js/pMap.js b/js/pMap.js
new file mode 100644
index 0000000..b63221c
--- /dev/null
+++ b/js/pMap.js
@@ -0,0 +1,164 @@
+/**
+ * Holds the definition and the creation of the imageMap object
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ * responsible for showing tooltips above the image chart
+ */
+var imageMap = {
+ 'mouseMoved': function(event, cont) {
+ // return if no imageMap set
+ // this can happen if server has no json
+ if (!this.imageMap) {
+ return;
+ }
+
+ // get mouse coordinated relative to image
+ var mouseX = event.pageX - cont.offsetLeft;
+ var mouseY = event.pageY - cont.offsetTop;
+
+ //console.log("X: " + mouseX + ", Y: " + mouseY);
+
+ /* Check if we are flying over a map zone
+ * Lets use the following method to check if a given
+ * point is in any convex polygon.
+ * http://www.programmingforums.org/post168124-3.html
+ */
+ var found = false;
+ for (var key = 0; key < this.imageMap.length; key++)
+ {
+ var seriesName = this.imageMap[key]['n'];
+ var seriesValue = this.imageMap[key]['v'];
+
+ var signSum = 0;
+ for (var i = 0; i < this.imageMap[key]['p'].length; i++)
+ {
+ var index1;
+ var index2;
+
+ if (i == this.imageMap[key]['p'].length - 1)
+ {
+ index1 = i;
+ index2 = 0;
+ }
+ else
+ {
+ index1 = i;
+ index2 = i+1;
+ }
+ var result = this.getDeterminant(
+ this.imageMap[key]['p'][index1][0],
+ this.imageMap[key]['p'][index1][1],
+ this.imageMap[key]['p'][index2][0],
+ this.imageMap[key]['p'][index2][1],
+ mouseX,
+ mouseY
+ );
+ if (result > 0) { signSum += 1; } else { signSum += -1; }
+ }
+
+ if (Math.abs(signSum) == this.imageMap[key]['p'].length)
+ {
+ found = true;
+ if (this.currentKey != key)
+ {
+ this.tooltip.show();
+ this.tooltip.title(seriesName);
+ this.tooltip.text(seriesValue);
+ this.currentKey = key;
+ }
+ this.tooltip.move(mouseX + 20, mouseY + 20);
+ }
+ }
+ if (!found && this.currentKey != -1 )
+ {
+ this.tooltip.hide();
+ this.currentKey = -1;
+ }
+ },
+
+ 'getDeterminant': function (X1, Y1, X2, Y2, X3, Y3) {
+ return (X2*Y3 - X3*Y2) - (X1*Y3 - X3*Y1) + (X1*Y2 - X2*Y1);
+ },
+
+ 'loadImageMap': function(map) {
+ this.imageMap = JSON.parse(map);
+ for (key in this.imageMap)
+ {
+ // FIXME
+ // without this loop image map does not work
+ // on IE8 in the status page
+ }
+ },
+
+ 'init': function() {
+ this.tooltip.init();
+
+ $("div#chart").bind('mousemove',function(e) {
+ imageMap.mouseMoved(e, this);
+ });
+
+ this.tooltip.attach("div#chart");
+
+ this.currentKey = -1;
+ },
+
+ 'tooltip': {
+ 'init': function () {
+ this.el = $('<div></div>');
+ this.el.css('position', 'absolute');
+ this.el.css('font-family', 'tahoma');
+ this.el.css('background-color', '#373737');
+ this.el.css('color', '#BEBEBE');
+ this.el.css('padding', '3px');
+
+ var title = $('<p></p>');
+ title.attr('id', 'title');
+ title.css('margin', '0px');
+ title.css('padding', '3px');
+ title.css('background-color', '#606060');
+ title.css('text-align', 'center');
+ title.html('Title');
+ this.el.append(title);
+
+ var text = $('<p></p>');
+ text.attr('id', 'text');
+ text.css('margin', '0');
+ text.html('Text');
+ this.el.append(text);
+
+ this.hide();
+ },
+
+ 'attach': function (element) {
+ $(element).prepend(this.el);
+ },
+
+ 'move': function (x, y) {
+ this.el.css('margin-left', x);
+ this.el.css('margin-top', y);
+ },
+
+ 'hide': function () {
+ this.el.css('display', 'none');
+ },
+
+ 'show': function () {
+ this.el.css('display', 'block');
+ },
+
+ 'title': function (title) {
+ this.el.find("p#title").html(title);
+ },
+
+ 'text': function (text) {
+ this.el.find("p#text").html(text.replace(/;/g, "<br />"));
+ }
+ }
+};
+
+$(document).ready(function() {
+ imageMap.init();
+});
diff --git a/libraries/chart.lib.php b/libraries/chart.lib.php
new file mode 100644
index 0000000..045da94
--- /dev/null
+++ b/libraries/chart.lib.php
@@ -0,0 +1,257 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Chart functions used to generate various types of charts.
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+define('ERR_NO_GD', 0);
+define('ERR_NO_JSON', 1);
+
+require_once './libraries/chart/pma_pchart_pie.php';
+require_once './libraries/chart/pma_pchart_single_bar.php';
+require_once './libraries/chart/pma_pchart_multi_bar.php';
+require_once './libraries/chart/pma_pchart_stacked_bar.php';
+require_once './libraries/chart/pma_pchart_single_line.php';
+require_once './libraries/chart/pma_pchart_multi_line.php';
+require_once './libraries/chart/pma_pchart_single_radar.php';
+require_once './libraries/chart/pma_pchart_multi_radar.php';
+
+/**
+ * Formats a chart for the status page.
+ * @param array $data data for the status chart
+ * @return string HTML and JS code for the chart
+ */
+function PMA_chart_status($data)
+{
+ // format keys which will be shown in the chart
+ $chartData = array();
+ foreach($data as $dataKey => $dataValue) {
+ $key = ucwords(str_replace(array('Com_', '_'), array('', ' '), $dataKey));
+ $value = (int)$dataValue;
+ $chartData[$key] = $value;
+ }
+
+ $chart = new PMA_pChart_Pie(
+ $chartData,
+ array('titleText' => __('Query statistics'))
+ );
+ $chartCode = $chart->toString();
+ PMA_handle_chart_err($chart->getErrors());
+ echo $chartCode;
+}
+
+/**
+ * Formats a chart for the profiling page.
+ * @param array $data data for the status chart
+ * @return string HTML and JS code for the chart
+ */
+function PMA_chart_profiling($data)
+{
+ $chartData = array();
+ foreach($data as $dataValue) {
+ $value = (int)($dataValue['Duration'] * 1000000);
+ $key = ucwords($dataValue['Status']);
+ $chartData[$key] = $value;
+ }
+
+ $chart = new PMA_pChart_Pie(
+ $chartData,
+ array('titleText' => __('Query execution time comparison (in microseconds)'))
+ );
+ $chartCode = $chart->toString();
+ PMA_handle_chart_err($chart->getErrors());
+ echo $chartCode;
+}
+
+/**
+ * Formats a chart for the query results page.
+ * @param array $data data for the status chart
+ * @param array $chartSettings settings used to generate the chart
+ * @return string HTML and JS code for the chart
+ */
+function PMA_chart_results($data, &$chartSettings)
+{
+ $chartData = array();
+ $chart = null;
+
+ // set default title if not already set
+ if (empty($chartSettings['titleText'])) {
+ $chartSettings['titleText'] = __('Query results');
+ }
+
+ // set default type if not already set
+ if (empty($chartSettings['type'])) {
+ $chartSettings['type'] = 'bar';
+ }
+
+ // set default type if not already set
+ if (empty($chartSettings['continuous'])) {
+ $chartSettings['continuous'] = 'off';
+ }
+
+ // set default bar type if needed
+ if ($chartSettings['type'] == 'bar' && empty($chartSettings['barType'])) {
+ $chartSettings['barType'] = 'stacked';
+ }
+
+ // default for legend
+ $chartSettings['legend'] = false;
+
+ // default for muti series
+ $chartSettings['multi'] = false;
+
+ if (!isset($data[0])) {
+ // empty data
+ return __('No data found for the chart.');
+ }
+
+ if (count($data[0]) == 1 || count($data[0]) == 2) {
+ // One or two columns in every row.
+ // This data is suitable for a simple bar chart.
+
+ if ($chartSettings['type'] == 'pie') {
+ // loop through the rows, data for pie chart has to be formated
+ // in a different way then in other charts.
+ foreach ($data as $rowKey => $row) {
+ $values = array_values($row);
+
+ if (count($row) == 1) {
+ $chartData[$rowKey] = $values[0];
+ }
+ else {
+ $chartData[$values[1]] = $values[0];
+ }
+ }
+
+ $chartSettings['legend'] = true;
+ $chart = new PMA_pChart_pie($chartData, $chartSettings);
+ }
+ else {
+ // loop through the rows
+ foreach ($data as $rowKey => $row) {
+
+ // loop through the columns in the row
+ foreach ($row as $valueKey => $value) {
+ $chartData[$valueKey][] = $value;
+ }
+
+ // if only one column, we need to add
+ // placeholder data for x axis
+ if (count($row) == 1) {
+ $chartData[''][] = $rowKey;
+ }
+ }
+
+ switch ($chartSettings['type']) {
+ case 'bar':
+ default:
+ $chart = new PMA_pChart_single_bar($chartData, $chartSettings);
+ break;
+ case 'line':
+ $chart = new PMA_pChart_single_line($chartData, $chartSettings);
+ break;
+ case 'radar':
+ $chart = new PMA_pChart_single_radar($chartData, $chartSettings);
+ break;
+ }
+ }
+ }
+ else if (count($data[0]) == 3) {
+ // Three columns (x axis, y axis, series) in every row.
+ // This data is suitable for a stacked bar chart.
+ $chartSettings['multi'] = true;
+
+ $keys = array_keys($data[0]);
+ $yAxisKey = $keys[0];
+ $xAxisKey = $keys[1];
+ $seriesKey = $keys[2];
+
+ // get all the series labels
+ $seriesLabels = array();
+ foreach ($data as $row) {
+ $seriesLabels[] = $row[$seriesKey];
+ }
+ $seriesLabels = array_unique($seriesLabels);
+
+ // loop through the rows
+ $currentXLabel = $data[0][$xAxisKey];
+ foreach ($data as $row) {
+
+ // save the label
+ // use the same value as the key and the value to get rid of duplicate results
+ $chartData[$xAxisKey][$row[$xAxisKey]] = $row[$xAxisKey];
+
+ // make sure to set value to every serie
+ $currentSeriesLabel = (string)$row[$seriesKey];
+ foreach ($seriesLabels as $seriesLabelsValue) {
+ if ($currentSeriesLabel == $seriesLabelsValue) {
+ // the value os for this serie
+ $chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = (int)$row[$yAxisKey];
+ }
+ else if (!isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) {
+ // if the value for this serie is not set, set it to 0
+ $chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = 0;
+ }
+ }
+ }
+
+ $chartSettings['legend'] = true;
+
+ // determine the chart type
+ switch ($chartSettings['type']) {
+ case 'bar':
+ default:
+
+ // determine the bar chart type
+ switch ($chartSettings['barType']) {
+ case 'stacked':
+ default:
+ $chart = new PMA_pChart_stacked_bar($chartData, $chartSettings);
+ break;
+ case 'multi':
+ $chart = new PMA_pChart_multi_bar($chartData, $chartSettings);
+ break;
+ }
+ break;
+
+ case 'line':
+ $chart = new PMA_pChart_multi_line($chartData, $chartSettings);
+ break;
+ case 'radar':
+ $chart = new PMA_pChart_multi_radar($chartData, $chartSettings);
+ break;
+ }
+ }
+ else {
+ // unknown data format
+ return '';
+ }
+
+ $chartCode = $chart->toString();
+ $chartSettings = $chart->getSettings();
+ $chartErrors = $chart->getErrors();
+ PMA_handle_chart_err($chartErrors);
+
+ return $chartCode;
+}
+
+/**
+ * Simple handler of chart errors.
+ * @param array $errors all occured errors
+ */
+function PMA_handle_chart_err($errors)
+{
+ if (in_array(ERR_NO_GD, $errors)) {
+ PMA_warnMissingExtension('GD', false, __('GD extension is needed for charts.'));
+ }
+ else if (in_array(ERR_NO_JSON, $errors)) {
+ PMA_warnMissingExtension('JSON', false, __('JSON encoder is needed for chart tooltips.'));
+ }
+}
+
+?>
diff --git a/libraries/chart/pChart/fonts/tahoma.ttf b/libraries/chart/pChart/fonts/tahoma.ttf
new file mode 100644
index 0000000..59b14a2
Binary files /dev/null and b/libraries/chart/pChart/fonts/tahoma.ttf differ
diff --git a/libraries/chart/pChart/pCache.class b/libraries/chart/pChart/pCache.class
new file mode 100644
index 0000000..2bcd6b0
--- /dev/null
+++ b/libraries/chart/pChart/pCache.class
@@ -0,0 +1,119 @@
+<?php
+ /*
+ pCache - Faster renderding using data cache
+ Copyright (C) 2008 Jean-Damien POGOLOTTI
+ Version 1.1.2 last updated on 06/17/08
+
+ http://pchart.sourceforge.net
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 1,2,3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Class initialisation :
+ pCache($CacheFolder="Cache/")
+ Cache management :
+ IsInCache($Data)
+ GetFromCache($ID,$Data)
+ WriteToCache($ID,$Data,$Picture)
+ DeleteFromCache($ID,$Data)
+ ClearCache()
+ Inner functions :
+ GetHash($ID,$Data)
+ */
+
+ /* pCache class definition */
+ class pCache
+ {
+ var $HashKey = "";
+ var $CacheFolder = "Cache/";
+
+ /* Create the pCache object */
+ function pCache($CacheFolder="Cache/")
+ {
+ $this->CacheFolder = $CacheFolder;
+ }
+
+ /* This function is clearing the cache folder */
+ function ClearCache()
+ {
+ if ($handle = opendir($this->CacheFolder))
+ {
+ while (false !== ($file = readdir($handle)))
+ {
+ if ( $file != "." && $file != ".." )
+ unlink($this->CacheFolder.$file);
+ }
+ closedir($handle);
+ }
+ }
+
+ /* This function is checking if we have an offline version of this chart */
+ function IsInCache($ID,$Data,$Hash="")
+ {
+ if ( $Hash == "" )
+ $Hash = $this->GetHash($ID,$Data);
+
+ if ( file_exists($this->CacheFolder.$Hash) )
+ return(TRUE);
+ else
+ return(FALSE);
+ }
+
+ /* This function is making a copy of drawn chart in the cache folder */
+ function WriteToCache($ID,$Data,$Picture)
+ {
+ $Hash = $this->GetHash($ID,$Data);
+ $FileName = $this->CacheFolder.$Hash;
+
+ imagepng($Picture->Picture,$FileName);
+ }
+
+ /* This function is removing any cached copy of this chart */
+ function DeleteFromCache($ID,$Data)
+ {
+ $Hash = $this->GetHash($ID,$Data);
+ $FileName = $this->CacheFolder.$Hash;
+
+ if ( file_exists($FileName ) )
+ unlink($FileName);
+ }
+
+ /* This function is retrieving the cached picture if applicable */
+ function GetFromCache($ID,$Data)
+ {
+ $Hash = $this->GetHash($ID,$Data);
+ if ( $this->IsInCache("","",$Hash ) )
+ {
+ $FileName = $this->CacheFolder.$Hash;
+
+ header('Content-type: image/png');
+ @readfile($FileName);
+ exit();
+ }
+ }
+
+ /* This function is building the graph unique hash key */
+ function GetHash($ID,$Data)
+ {
+ $mKey = "$ID";
+ foreach($Data as $key => $Values)
+ {
+ $tKey = "";
+ foreach($Values as $Serie => $Value)
+ $tKey = $tKey.$Serie.$Value;
+ $mKey = $mKey.md5($tKey);
+ }
+ return(md5($mKey));
+ }
+ }
+?>
\ No newline at end of file
diff --git a/libraries/chart/pChart/pChart.class b/libraries/chart/pChart/pChart.class
new file mode 100644
index 0000000..2b5a077
--- /dev/null
+++ b/libraries/chart/pChart/pChart.class
@@ -0,0 +1,3626 @@
+<?php
+ /*
+ pChart - a PHP class to build charts!
+ Copyright (C) 2008 Jean-Damien POGOLOTTI
+ Version 1.27d last updated on 09/30/08
+
+ http://pchart.sourceforge.net
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 1,2,3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Class initialisation :
+ pChart($XSize,$YSize)
+ Draw methods :
+ drawBackground($R,$G,$B)
+ drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B)
+ drawFilledRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B,$DrawBorder=TRUE,$Alpha=100)
+ drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
+ drawFilledRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
+ drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
+ drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
+ drawEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
+ drawFilledEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
+ drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction=FALSE)
+ drawDottedLine($X1,$Y1,$X2,$Y2,$DotSize,$R,$G,$B)
+ drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
+ drawFromPNG($FileName,$X,$Y,$Alpha=100)
+ drawFromGIF($FileName,$X,$Y,$Alpha=100)
+ drawFromJPG($FileName,$X,$Y,$Alpha=100)
+ Graph setup methods :
+ addBorder($Width=3,$R=0,$G=0,$B=0)
+ clearScale()
+ clearShadow()
+ createColorGradientPalette($R1,$G1,$B1,$R2,$G2,$B2,$Shades)
+ drawGraphArea($R,$G,$B,$Stripe=FALSE)
+ drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
+ drawRightScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1)
+ drawXYScale($Data,$DataDescription,$YSerieName,$XSerieName,$R,$G,$B,$WithMargin=0,$Angle=0,$Decimals=1)
+ drawGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100)
+ drawLegend($XPos,$YPos,$DataDescription,$R,$G,$B,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=FALSE)
+ drawPieLegend($XPos,$YPos,$Data,$DataDescription,$R,$G,$B)
+ drawTitle($XPos,$YPos,$Value,$R,$G,$B,$XPos2=-1,$YPos2=-1,$Shadow=FALSE)
+ drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnRight=FALSE,$TickWidth=4,$FreeText=NULL)
+ drawArea($Data,$Serie1,$Serie2,$R,$G,$B,$Alpha = 50)
+ drawRadarAxis($Data,$DataDescription,$Mosaic=TRUE,$BorderOffset=10,$A_R=60,$A_G=60,$A_B=60,$S_R=200,$S_G=200,$S_B=200,$MaxValue=-1)
+ drawGraphAreaGradient($R,$G,$B,$Decay,$Target=TARGET_GRAPHAREA)
+ drawTextBox($X1,$Y1,$X2,$Y2,$Text,$Angle=0,$R=255,$G=255,$B=255,$Align=ALIGN_LEFT,$Shadow=TRUE,$BgR=-1,$BgG=-1,$BgB=-1,$Alpha=100)
+ getLegendBoxSize($DataDescription)
+ loadColorPalette($FileName,$Delimiter=",")
+ reportWarnings($Interface="CLI")
+ setGraphArea($X1,$Y1,$X2,$Y2)
+ setLabel($Data,$DataDescription,$SerieName,$ValueName,$Caption,$R=210,$G=210,$B=210)
+ setColorPalette($ID,$R,$G,$B)
+ setCurrency($Currency)
+ setDateFormat($Format)
+ setFontProperties($FontName,$FontSize)
+ setLineStyle($Width=1,$DotSize=0)
+ setFixedScale($VMin,$VMax,$Divisions=5,$VXMin=0,$VXMin=0,$XDivisions=5)
+ setShadowProperties($XDistance=1,$YDistance=1,$R=60,$G=60,$B=60,$Alpha)
+ writeValues($Data,$DataDescription,$Series)
+ Graphs methods :
+ drawPlotGraph($Data,$DataDescription,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=FALSE)
+ drawXYPlotGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1)
+ drawLineGraph($Data,$DataDescription,$SerieName="")
+ drawXYGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0)
+ drawFilledLineGraph($Data,$DataDescription,$Alpha=100,$AroundZero=FALSE)
+ drawCubicCurve($Data,$DataDescription,$Accuracy=.1,$SerieName="")
+ drawFilledCubicCurve($Data,$DataDescription,$Accuracy=.1,$Alpha=100,$AroundZero=FALSE)
+ drawOverlayBarGraph($Data,$DataDescription,$Alpha=50)
+ drawBarGraph($Data,$DataDescription,$Shadow=FALSE)
+ drawStackedBarGraph($Data,$DataDescription,$Alpha=50,$Contiguous=FALSE)
+ drawLimitsGraph($Data,$DataDescription,$R=0,$G=0,$B=0)
+ drawRadar($Data,$DataDescription,$BorderOffset=10,$MaxValue=-1)
+ drawFilledRadar($Data,$DataDescription,$Alpha=50,$BorderOffset=10,$MaxValue=-1)
+ drawBasicPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$R=255,$G=255,$B=255,$Decimals=0)
+ drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals = 0)
+ drawFlatPieGraphWithShadow($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals = 0)
+ drawPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$EnhanceColors=TRUE,$Skew=60,$SpliceHeight=20,$SpliceDistance=0,$Decimals=0)
+ Other methods :
+ setImageMap($Mode=TRUE,$GraphID="MyGraph")
+ getImageMap()
+ getSavedImageMap($MapName,$Flush=TRUE)
+ Render($FileName)
+ Stroke()
+ */
+
+ /* Declare some script wide constants */
+ define("SCALE_NORMAL",1);
+ define("SCALE_ADDALL",2);
+ define("SCALE_START0",3);
+ define("SCALE_ADDALLSTART0",4);
+ define("PIE_PERCENTAGE", 1);
+ define("PIE_LABELS",2);
+ define("PIE_NOLABEL",3);
+ define("PIE_PERCENTAGE_LABEL", 4);
+ define("TARGET_GRAPHAREA",1);
+ define("TARGET_BACKGROUND",2);
+ define("ALIGN_TOP_LEFT",1);
+ define("ALIGN_TOP_CENTER",2);
+ define("ALIGN_TOP_RIGHT",3);
+ define("ALIGN_LEFT",4);
+ define("ALIGN_CENTER",5);
+ define("ALIGN_RIGHT",6);
+ define("ALIGN_BOTTOM_LEFT",7);
+ define("ALIGN_BOTTOM_CENTER",8);
+ define("ALIGN_BOTTOM_RIGHT",9);
+
+ /* pChart class definition */
+ class pChart
+ {
+ /* Palettes definition */
+ var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46),
+ "1"=>array("R"=>224,"G"=>100,"B"=>46),
+ "2"=>array("R"=>224,"G"=>214,"B"=>46),
+ "3"=>array("R"=>46,"G"=>151,"B"=>224),
+ "4"=>array("R"=>176,"G"=>46,"B"=>224),
+ "5"=>array("R"=>224,"G"=>46,"B"=>117),
+ "6"=>array("R"=>92,"G"=>224,"B"=>46),
+ "7"=>array("R"=>224,"G"=>176,"B"=>46));
+
+ /* Some static vars used in the class */
+ var $XSize = NULL;
+ var $YSize = NULL;
+ var $Picture = NULL;
+ var $ImageMap = NULL;
+
+ /* Error management */
+ var $ErrorReporting = FALSE;
+ var $ErrorInterface = "CLI";
+ var $Errors = NULL;
+ var $ErrorFontName = "Fonts/pf_arma_five.ttf";
+ var $ErrorFontSize = 6;
+
+ /* vars related to the graphing area */
+ var $GArea_X1 = NULL;
+ var $GArea_Y1 = NULL;
+ var $GArea_X2 = NULL;
+ var $GArea_Y2 = NULL;
+ var $GAreaXOffset = NULL;
+ var $VMax = NULL;
+ var $VMin = NULL;
+ var $VXMax = NULL;
+ var $VXMin = NULL;
+ var $Divisions = NULL;
+ var $XDivisions = NULL;
+ var $DivisionHeight = NULL;
+ var $XDivisionHeight = NULL;
+ var $DivisionCount = NULL;
+ var $XDivisionCount = NULL;
+ var $DivisionRatio = NULL;
+ var $XDivisionRatio = NULL;
+ var $DivisionWidth = NULL;
+ var $DataCount = NULL;
+ var $Currency = "\$";
+
+ /* Text format related vars */
+ var $FontName = NULL;
+ var $FontSize = NULL;
+ var $DateFormat = "d/m/Y";
+
+ /* Lines format related vars */
+ var $LineWidth = 1;
+ var $LineDotSize = 0;
+
+ /* Layer related vars */
+ var $Layers = NULL;
+
+ /* Set antialias quality : 0 is maximum, 100 minimum*/
+ var $AntialiasQuality = 0;
+
+ /* Shadow settings */
+ var $ShadowActive = FALSE;
+ var $ShadowXDistance = 1;
+ var $ShadowYDistance = 1;
+ var $ShadowRColor = 60;
+ var $ShadowGColor = 60;
+ var $ShadowBColor = 60;
+ var $ShadowAlpha = 50;
+ var $ShadowBlur = 0;
+
+ /* Image Map settings */
+ var $BuildMap = FALSE;
+ var $MapFunction = NULL;
+ var $tmpFolder = "tmp/";
+ var $MapID = NULL;
+
+ /* This function create the background picture */
+ function pChart($XSize,$YSize)
+ {
+ $this->XSize = $XSize;
+ $this->YSize = $YSize;
+ $this->Picture = imagecreatetruecolor($XSize,$YSize);
+ $C_White =$this->AllocateColor($this->Picture,255,255,255);
+ imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
+ imagecolortransparent($this->Picture,$C_White);
+ $this->setFontProperties("tahoma.ttf",8);
+ }
+
+ /* Set if warnings should be reported */
+ function reportWarnings($Interface="CLI")
+ {
+ $this->ErrorReporting = TRUE;
+ $this->ErrorInterface = $Interface;
+ }
+
+ /* Set the font properties */
+ function setFontProperties($FontName,$FontSize)
+ {
+ $this->FontName = $FontName;
+ $this->FontSize = $FontSize;
+ }
+
+ /* Set the shadow properties */
+ function setShadowProperties($XDistance=1,$YDistance=1,$R=60,$G=60,$B=60,$Alpha=50,$Blur=0)
+ {
+ $this->ShadowActive = TRUE;
+ $this->ShadowXDistance = $XDistance;
+ $this->ShadowYDistance = $YDistance;
+ $this->ShadowRColor = $R;
+ $this->ShadowGColor = $G;
+ $this->ShadowBColor = $B;
+ $this->ShadowAlpha = $Alpha;
+ $this->ShadowBlur = $Blur;
+ }
+
+ /* Remove shadow option */
+ function clearShadow()
+ {
+ $this->ShadowActive = FALSE;
+ }
+
+ /* Set Palette color */
+ function setColorPalette($ID,$R,$G,$B)
+ {
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $this->Palette[$ID]["R"] = $R;
+ $this->Palette[$ID]["G"] = $G;
+ $this->Palette[$ID]["B"] = $B;
+ }
+
+ /* Create a color palette shading from one color to another */
+ function createColorGradientPalette($R1,$G1,$B1,$R2,$G2,$B2,$Shades)
+ {
+ $RFactor = ($R2-$R1)/$Shades;
+ $GFactor = ($G2-$G1)/$Shades;
+ $BFactor = ($B2-$B1)/$Shades;
+
+ for($i=0;$i<=$Shades-1;$i++)
+ {
+ $this->Palette[$i]["R"] = $R1+$RFactor*$i;
+ $this->Palette[$i]["G"] = $G1+$GFactor*$i;
+ $this->Palette[$i]["B"] = $B1+$BFactor*$i;
+ }
+ }
+
+ /* Load Color Palette from file */
+ function loadColorPalette($FileName,$Delimiter=",")
+ {
+ $handle = @fopen($FileName,"r");
+ $ColorID = 0;
+ if ($handle)
+ {
+ while (!feof($handle))
+ {
+ $buffer = fgets($handle, 4096);
+ $buffer = str_replace(chr(10),"",$buffer);
+ $buffer = str_replace(chr(13),"",$buffer);
+ $Values = split($Delimiter,$buffer);
+ if ( count($Values) == 3 )
+ {
+ $this->Palette[$ColorID]["R"] = $Values[0];
+ $this->Palette[$ColorID]["G"] = $Values[1];
+ $this->Palette[$ColorID]["B"] = $Values[2];
+ $ColorID++;
+ }
+ }
+ }
+ }
+
+ /* Set line style */
+ function setLineStyle($Width=1,$DotSize=0)
+ {
+ $this->LineWidth = $Width;
+ $this->LineDotSize = $DotSize;
+ }
+
+ /* Set currency symbol */
+ function setCurrency($Currency)
+ {
+ $this->Currency = $Currency;
+ }
+
+ /* Set the graph area location */
+ function setGraphArea($X1,$Y1,$X2,$Y2)
+ {
+ $this->GArea_X1 = $X1;
+ $this->GArea_Y1 = $Y1;
+ $this->GArea_X2 = $X2;
+ $this->GArea_Y2 = $Y2;
+ }
+
+ /* Prepare the graph area */
+ function drawGraphArea($R,$G,$B,$Stripe=FALSE)
+ {
+ $this->drawFilledRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B,FALSE);
+ $this->drawRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R-40,$G-40,$B-40);
+
+ if ( $Stripe )
+ {
+ $R2 = $R-15; if ( $R2 < 0 ) { $R2 = 0; }
+ $G2 = $R-15; if ( $G2 < 0 ) { $G2 = 0; }
+ $B2 = $R-15; if ( $B2 < 0 ) { $B2 = 0; }
+
+ $LineColor =$this->AllocateColor($this->Picture,$R2,$G2,$B2);
+ $SkewWidth = $this->GArea_Y2-$this->GArea_Y1-1;
+
+ for($i=$this->GArea_X1-$SkewWidth;$i<=$this->GArea_X2;$i=$i+4)
+ {
+ $X1 = $i; $Y1 = $this->GArea_Y2;
+ $X2 = $i+$SkewWidth; $Y2 = $this->GArea_Y1;
+
+
+ if ( $X1 < $this->GArea_X1 )
+ { $X1 = $this->GArea_X1; $Y1 = $this->GArea_Y1 + $X2 - $this->GArea_X1 + 1; }
+
+ if ( $X2 >= $this->GArea_X2 )
+ { $Y2 = $this->GArea_Y1 + $X2 - $this->GArea_X2 +1; $X2 = $this->GArea_X2 - 1; }
+// * Fixed in 1.27 * { $X2 = $this->GArea_X2 - 1; $Y2 = $this->GArea_Y2 - ($this->GArea_X2 - $X1); }
+
+ imageline($this->Picture,$X1,$Y1,$X2,$Y2+1,$LineColor);
+ }
+ }
+ }
+
+ /* Allow you to clear the scale : used if drawing multiple charts */
+ function clearScale()
+ {
+ $this->VMin = NULL;
+ $this->VMax = NULL;
+ $this->VXMin = NULL;
+ $this->VXMax = NULL;
+ $this->Divisions = NULL;
+ $this->XDivisions = NULL; }
+
+ /* Allow you to fix the scale, use this to bypass the automatic scaling */
+ function setFixedScale($VMin,$VMax,$Divisions=5,$VXMin=0,$VXMax=0,$XDivisions=5)
+ {
+ $this->VMin = $VMin;
+ $this->VMax = $VMax;
+ $this->Divisions = $Divisions;
+
+ if ( !$VXMin == 0 )
+ {
+ $this->VXMin = $VXMin;
+ $this->VXMax = $VXMax;
+ $this->XDivisions = $XDivisions;
+ }
+ }
+
+ /* Wrapper to the drawScale() function allowing a second scale to be drawn */
+ function drawRightScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1)
+ {
+ $this->drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks,$Angle,$Decimals,$WithMargin,$SkipLabels,TRUE);
+ }
+
+ /* Compute and draw the scale */
+ function drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateData("drawScale",$Data);
+
+ $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
+
+ $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
+ $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
+
+ if ( $this->VMin == NULL && $this->VMax == NULL)
+ {
+ if (isset($DataDescription["Values"][0]))
+ {
+ $this->VMin = $Data[0][$DataDescription["Values"][0]];
+ $this->VMax = $Data[0][$DataDescription["Values"][0]];
+ }
+ else { $this->VMin = 2147483647; $this->VMax = -2147483647; }
+
+ /* Compute Min and Max values */
+ if ( $ScaleMode == SCALE_NORMAL || $ScaleMode == SCALE_START0 )
+ {
+ if ( $ScaleMode == SCALE_START0 ) { $this->VMin = 0; }
+
+ foreach ( $Data as $Key => $Values )
+ {
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ if (isset($Data[$Key][$ColName]))
+ {
+ $Value = $Data[$Key][$ColName];
+
+ if ( is_numeric($Value) )
+ {
+ if ( $this->VMax < $Value) { $this->VMax = $Value; }
+ if ( $this->VMin > $Value) { $this->VMin = $Value; }
+ }
+ }
+ }
+ }
+ }
+ elseif ( $ScaleMode == SCALE_ADDALL || $ScaleMode == SCALE_ADDALLSTART0 ) /* Experimental */
+ {
+ if ( $ScaleMode == SCALE_ADDALLSTART0 ) { $this->VMin = 0; }
+
+ foreach ( $Data as $Key => $Values )
+ {
+ $Sum = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ if (isset($Data[$Key][$ColName]))
+ {
+ $Value = $Data[$Key][$ColName];
+ if ( is_numeric($Value) )
+ $Sum += $Value;
+ }
+ }
+ if ( $this->VMax < $Sum) { $this->VMax = $Sum; }
+ if ( $this->VMin > $Sum) { $this->VMin = $Sum; }
+ }
+ }
+
+ if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) )
+ $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
+
+ /* If all values are the same */
+ if ( $this->VMax == $this->VMin )
+ {
+ if ( $this->VMax >= 0 ) { $this->VMax++; }
+ else { $this->VMin--; }
+ }
+
+ $DataRange = $this->VMax - $this->VMin;
+ if ( $DataRange == 0 ) { $DataRange = .1; }
+
+ /* Compute automatic scaling */
+ $ScaleOk = FALSE; $Factor = 1;
+ $MinDivHeight = 25; $MaxDivs = ($this->GArea_Y2 - $this->GArea_Y1) / $MinDivHeight;
+
+ if ( $this->VMin == 0 && $this->VMax == 0 )
+ { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
+ elseif ($MaxDivs > 1)
+ {
+ while(!$ScaleOk)
+ {
+ $Scale1 = ( $this->VMax - $this->VMin ) / $Factor;
+ $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2;
+ $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4;
+
+ if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;}
+ if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;}
+ if (!$ScaleOk)
+ {
+ if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
+ if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
+ }
+ }
+
+ if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor)
+ {
+ $GridID = floor ( $this->VMax / $Scale / $Factor) + 1;
+ $this->VMax = $GridID * $Scale * $Factor;
+ $Divisions++;
+ }
+
+ if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor)
+ {
+ $GridID = floor( $this->VMin / $Scale / $Factor);
+ $this->VMin = $GridID * $Scale * $Factor;
+ $Divisions++;
+ }
+ }
+ else /* Can occurs for small graphs */
+ $Scale = 1;
+
+ if ( !isset($Divisions) )
+ $Divisions = 2;
+
+ if ($Scale == 1 && $Divisions%2 == 1)
+ $Divisions--;
+ }
+ else
+ $Divisions = $this->Divisions;
+
+ $this->DivisionCount = $Divisions;
+
+ $DataRange = $this->VMax - $this->VMin;
+ if ( $DataRange == 0 ) { $DataRange = .1; }
+
+ $this->DivisionHeight = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $Divisions;
+ $this->DivisionRatio = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $DataRange;
+
+ $this->GAreaXOffset = 0;
+ if ( count($Data) > 1 )
+ {
+ if ( $WithMargin == FALSE )
+ $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data)-1);
+ else
+ {
+ $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data));
+ $this->GAreaXOffset = $this->DivisionWidth / 2;
+ }
+ }
+ else
+ {
+ $this->DivisionWidth = $this->GArea_X2 - $this->GArea_X1;
+ $this->GAreaXOffset = $this->DivisionWidth / 2;
+ }
+
+ $this->DataCount = count($Data);
+
+ if ( $DrawTicks == FALSE )
+ return(0);
+
+ $YPos = $this->GArea_Y2; $XMin = NULL;
+ for($i=1;$i<=$Divisions+1;$i++)
+ {
+ if ( $RightScale )
+ $this->drawLine($this->GArea_X2,$YPos,$this->GArea_X2+5,$YPos,$R,$G,$B);
+ else
+ $this->drawLine($this->GArea_X1,$YPos,$this->GArea_X1-5,$YPos,$R,$G,$B);
+
+ $Value = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
+ $Value = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
+ if ( $DataDescription["Format"]["Y"] == "number" )
+ $Value = $Value.$DataDescription["Unit"]["Y"];
+ if ( $DataDescription["Format"]["Y"] == "time" )
+ $Value = $this->ToTime($Value);
+ if ( $DataDescription["Format"]["Y"] == "date" )
+ $Value = $this->ToDate($Value);
+ if ( $DataDescription["Format"]["Y"] == "metric" )
+ $Value = $this->ToMetric($Value);
+ if ( $DataDescription["Format"]["Y"] == "currency" )
+ $Value = $this->ToCurrency($Value);
+
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
+ $TextWidth = $Position[2]-$Position[0];
+
+ if ( $RightScale )
+ {
+ imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X2+10,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
+ if ( $XMin < $this->GArea_X2+15+$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X2+15+$TextWidth; }
+ }
+ else
+ {
+ imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1-10-$TextWidth,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
+ if ( $XMin > $this->GArea_X1-10-$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X1-10-$TextWidth; }
+ }
+
+ $YPos = $YPos - $this->DivisionHeight;
+ }
+
+ /* Write the Y Axis caption if set */
+ if ( isset($DataDescription["Axis"]["Y"]) )
+ {
+ $Position = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]);
+ $TextHeight = abs($Position[1])+abs($Position[3]);
+ $TextTop = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextHeight/2);
+
+ if ( $RightScale )
+ imagettftext($this->Picture,$this->FontSize,90,$XMin+$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
+ else
+ imagettftext($this->Picture,$this->FontSize,90,$XMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
+ }
+
+ /* Horizontal Axis */
+ $XPos = $this->GArea_X1 + $this->GAreaXOffset;
+ $ID = 1; $YMax = NULL;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( $ID % $SkipLabels == 0 )
+ {
+ $this->drawLine(floor($XPos),$this->GArea_Y2,floor($XPos),$this->GArea_Y2+5,$R,$G,$B);
+ $Value = $Data[$Key][$DataDescription["Position"]];
+ if ( $DataDescription["Format"]["X"] == "number" )
+ $Value = $Value.$DataDescription["Unit"]["X"];
+ if ( $DataDescription["Format"]["X"] == "time" )
+ $Value = $this->ToTime($Value);
+ if ( $DataDescription["Format"]["X"] == "date" )
+ $Value = $this->ToDate($Value);
+ if ( $DataDescription["Format"]["X"] == "metric" )
+ $Value = $this->ToMetric($Value);
+ if ( $DataDescription["Format"]["X"] == "currency" )
+ $Value = $this->ToCurrency($Value);
+
+ $Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value);
+ $TextWidth = abs($Position[2])+abs($Position[0]);
+ $TextHeight = abs($Position[1])+abs($Position[3]);
+
+ if ( $Angle == 0 )
+ {
+ $YPos = $this->GArea_Y2+18;
+ imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value);
+ }
+ else
+ {
+ $YPos = $this->GArea_Y2+10+$TextHeight;
+ if ( $Angle <= 90 )
+ imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
+ else
+ imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)+$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
+ }
+ if ( $YMax < $YPos || $YMax == NULL ) { $YMax = $YPos; }
+ }
+
+ $XPos = $XPos + $this->DivisionWidth;
+ $ID++;
+ }
+
+ /* Write the X Axis caption if set */
+ if ( isset($DataDescription["Axis"]["X"]) )
+ {
+ $Position = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["X"]);
+ $TextWidth = abs($Position[2])+abs($Position[0]);
+ $TextLeft = (($this->GArea_X2 - $this->GArea_X1) / 2) + $this->GArea_X1 + ($TextWidth/2);
+ imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$YMax+$this->FontSize+5,$C_TextColor,$this->FontName,$DataDescription["Axis"]["X"]);
+ }
+ }
+
+ /* Compute and draw the scale for X/Y charts */
+ function drawXYScale($Data,$DataDescription,$YSerieName,$XSerieName,$R,$G,$B,$WithMargin=0,$Angle=0,$Decimals=1)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateData("drawScale",$Data);
+
+ $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
+
+ $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
+ $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
+
+ /* Process Y scale */
+ if ( $this->VMin == NULL && $this->VMax == NULL)
+ {
+ $this->VMin = $Data[0][$YSerieName];
+ $this->VMax = $Data[0][$YSerieName];
+
+ foreach ( $Data as $Key => $Values )
+ {
+ if (isset($Data[$Key][$YSerieName]))
+ {
+ $Value = $Data[$Key][$YSerieName];
+ if ( $this->VMax < $Value) { $this->VMax = $Value; }
+ if ( $this->VMin > $Value) { $this->VMin = $Value; }
+ }
+ }
+
+ if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) )
+ $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
+
+ $DataRange = $this->VMax - $this->VMin;
+ if ( $DataRange == 0 ) { $DataRange = .1; }
+
+ /* Compute automatic scaling */
+ $ScaleOk = FALSE; $Factor = 1;
+ $MinDivHeight = 25; $MaxDivs = ($this->GArea_Y2 - $this->GArea_Y1) / $MinDivHeight;
+
+ if ( $this->VMin == 0 && $this->VMax == 0 )
+ { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
+ elseif ($MaxDivs > 1)
+ {
+ while(!$ScaleOk)
+ {
+ $Scale1 = ( $this->VMax - $this->VMin ) / $Factor;
+ $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2;
+ $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4;
+
+ if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;}
+ if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;}
+ if (!$ScaleOk)
+ {
+ if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
+ if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
+ }
+ }
+
+ if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor)
+ {
+ $GridID = floor ( $this->VMax / $Scale / $Factor) + 1;
+ $this->VMax = $GridID * $Scale * $Factor;
+ $Divisions++;
+ }
+
+ if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor)
+ {
+ $GridID = floor( $this->VMin / $Scale / $Factor);
+ $this->VMin = $GridID * $Scale * $Factor;
+ $Divisions++;
+ }
+ }
+ else /* Can occurs for small graphs */
+ $Scale = 1;
+
+ if ( !isset($Divisions) )
+ $Divisions = 2;
+
+ if ( $this->isRealInt(($this->VMax-$this->VMin)/($Divisions-1)))
+ $Divisions--;
+ elseif ( $this->isRealInt(($this->VMax-$this->VMin)/($Divisions+1)))
+ $Divisions++;
+ }
+ else
+ $Divisions = $this->Divisions;
+
+ $this->DivisionCount = $Divisions;
+
+ $DataRange = $this->VMax - $this->VMin;
+ if ( $DataRange == 0 ) { $DataRange = .1; }
+
+ $this->DivisionHeight = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $Divisions;
+ $this->DivisionRatio = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $DataRange;
+
+ $YPos = $this->GArea_Y2; $XMin = NULL;
+ for($i=1;$i<=$Divisions+1;$i++)
+ {
+ $this->drawLine($this->GArea_X1,$YPos,$this->GArea_X1-5,$YPos,$R,$G,$B);
+ $Value = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
+ $Value = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
+ if ( $DataDescription["Format"]["Y"] == "number" )
+ $Value = $Value.$DataDescription["Unit"]["Y"];
+ if ( $DataDescription["Format"]["Y"] == "time" )
+ $Value = $this->ToTime($Value);
+ if ( $DataDescription["Format"]["Y"] == "date" )
+ $Value = $this->ToDate($Value);
+ if ( $DataDescription["Format"]["Y"] == "metric" )
+ $Value = $this->ToMetric($Value);
+ if ( $DataDescription["Format"]["Y"] == "currency" )
+ $Value = $this->ToCurrency($Value);
+
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
+ $TextWidth = $Position[2]-$Position[0];
+ imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1-10-$TextWidth,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
+
+ if ( $XMin > $this->GArea_X1-10-$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X1-10-$TextWidth; }
+
+ $YPos = $YPos - $this->DivisionHeight;
+ }
+
+ /* Process X scale */
+ if ( $this->VXMin == NULL && $this->VXMax == NULL)
+ {
+ $this->VXMin = $Data[0][$XSerieName];
+ $this->VXMax = $Data[0][$XSerieName];
+
+ foreach ( $Data as $Key => $Values )
+ {
+ if (isset($Data[$Key][$XSerieName]))
+ {
+ $Value = $Data[$Key][$XSerieName];
+ if ( $this->VXMax < $Value) { $this->VXMax = $Value; }
+ if ( $this->VXMin > $Value) { $this->VXMin = $Value; }
+ }
+ }
+
+ if ( $this->VXMax > preg_replace('/\.[0-9]+/','',$this->VXMax) )
+ $this->VXMax = preg_replace('/\.[0-9]+/','',$this->VXMax)+1;
+
+ $DataRange = $this->VMax - $this->VMin;
+ if ( $DataRange == 0 ) { $DataRange = .1; }
+
+ /* Compute automatic scaling */
+ $ScaleOk = FALSE; $Factor = 1;
+ $MinDivWidth = 25; $MaxDivs = ($this->GArea_X2 - $this->GArea_X1) / $MinDivWidth;
+
+ if ( $this->VXMin == 0 && $this->VXMax == 0 )
+ { $this->VXMin = 0; $this->VXMax = 2; $Scale = 1; $XDivisions = 2;}
+ elseif ($MaxDivs > 1)
+ {
+ while(!$ScaleOk)
+ {
+ $Scale1 = ( $this->VXMax - $this->VXMin ) / $Factor;
+ $Scale2 = ( $this->VXMax - $this->VXMin ) / $Factor / 2;
+ $Scale4 = ( $this->VXMax - $this->VXMin ) / $Factor / 4;
+
+ if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $XDivisions = floor($Scale1); $Scale = 1;}
+ if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $XDivisions = floor($Scale2); $Scale = 2;}
+ if (!$ScaleOk)
+ {
+ if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
+ if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
+ }
+ }
+
+ if ( floor($this->VXMax / $Scale / $Factor) != $this->VXMax / $Scale / $Factor)
+ {
+ $GridID = floor ( $this->VXMax / $Scale / $Factor) + 1;
+ $this->VXMax = $GridID * $Scale * $Factor;
+ $XDivisions++;
+ }
+
+ if ( floor($this->VXMin / $Scale / $Factor) != $this->VXMin / $Scale / $Factor)
+ {
+ $GridID = floor( $this->VXMin / $Scale / $Factor);
+ $this->VXMin = $GridID * $Scale * $Factor;
+ $XDivisions++;
+ }
+ }
+ else /* Can occurs for small graphs */
+ $Scale = 1;
+
+ if ( !isset($XDivisions) )
+ $XDivisions = 2;
+
+ if ( $this->isRealInt(($this->VXMax-$this->VXMin)/($XDivisions-1)))
+ $XDivisions--;
+ elseif ( $this->isRealInt(($this->VXMax-$this->VXMin)/($XDivisions+1)))
+ $XDivisions++;
+ }
+ else
+ $XDivisions = $this->XDivisions;
+
+ $this->XDivisionCount = $Divisions;
+ $this->DataCount = $Divisions + 2;
+
+ $XDataRange = $this->VXMax - $this->VXMin;
+ if ( $XDataRange == 0 ) { $XDataRange = .1; }
+
+ $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / $XDivisions;
+ $this->XDivisionRatio = ( $this->GArea_X2 - $this->GArea_X1 ) / $XDataRange;
+
+ $XPos = $this->GArea_X1; $YMax = NULL;
+ for($i=1;$i<=$XDivisions+1;$i++)
+ {
+ $this->drawLine($XPos,$this->GArea_Y2,$XPos,$this->GArea_Y2+5,$R,$G,$B);
+
+ $Value = $this->VXMin + ($i-1) * (( $this->VXMax - $this->VXMin ) / $XDivisions);
+ $Value = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
+ if ( $DataDescription["Format"]["Y"] == "number" )
+ $Value = $Value.$DataDescription["Unit"]["Y"];
+ if ( $DataDescription["Format"]["Y"] == "time" )
+ $Value = $this->ToTime($Value);
+ if ( $DataDescription["Format"]["Y"] == "date" )
+ $Value = $this->ToDate($Value);
+ if ( $DataDescription["Format"]["Y"] == "metric" )
+ $Value = $this->ToMetric($Value);
+ if ( $DataDescription["Format"]["Y"] == "currency" )
+ $Value = $this->ToCurrency($Value);
+
+ $Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value);
+ $TextWidth = abs($Position[2])+abs($Position[0]);
+ $TextHeight = abs($Position[1])+abs($Position[3]);
+
+ if ( $Angle == 0 )
+ {
+ $YPos = $this->GArea_Y2+18;
+ imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value);
+ }
+ else
+ {
+ $YPos = $this->GArea_Y2+10+$TextHeight;
+ if ( $Angle <= 90 )
+ imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
+ else
+ imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)+$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
+ }
+
+ if ( $YMax < $YPos || $YMax == NULL ) { $YMax = $YPos; }
+
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+
+ /* Write the Y Axis caption if set */
+ if ( isset($DataDescription["Axis"]["Y"]) )
+ {
+ $Position = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]);
+ $TextHeight = abs($Position[1])+abs($Position[3]);
+ $TextTop = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextHeight/2);
+ imagettftext($this->Picture,$this->FontSize,90,$XMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
+ }
+
+ /* Write the X Axis caption if set */
+ if ( isset($DataDescription["Axis"]["X"]) )
+ {
+ $Position = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["X"]);
+ $TextWidth = abs($Position[2])+abs($Position[0]);
+ $TextLeft = (($this->GArea_X2 - $this->GArea_X1) / 2) + $this->GArea_X1 + ($TextWidth/2);
+ imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$YMax+$this->FontSize+5,$C_TextColor,$this->FontName,$DataDescription["Axis"]["X"]);
+ }
+ }
+
+ /* Compute and draw the scale */
+ function drawGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100)
+ {
+ /* Draw mosaic */
+ if ( $Mosaic )
+ {
+ $LayerWidth = $this->GArea_X2-$this->GArea_X1;
+ $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
+
+ $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
+ $C_White =$this->AllocateColor($this->Layers[0],255,255,255);
+ imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
+ imagecolortransparent($this->Layers[0],$C_White);
+
+ $C_Rectangle =$this->AllocateColor($this->Layers[0],250,250,250);
+
+ $YPos = $LayerHeight; //$this->GArea_Y2-1;
+ $LastY = $YPos;
+ for($i=0;$i<=$this->DivisionCount;$i++)
+ {
+ $LastY = $YPos;
+ $YPos = $YPos - $this->DivisionHeight;
+
+ if ( $YPos <= 0 ) { $YPos = 1; }
+
+ if ( $i % 2 == 0 )
+ {
+ imagefilledrectangle($this->Layers[0],1,$YPos,$LayerWidth-1,$LastY,$C_Rectangle);
+ }
+ }
+ imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
+ imagedestroy($this->Layers[0]);
+ }
+
+ /* Horizontal lines */
+ $YPos = $this->GArea_Y2 - $this->DivisionHeight;
+ for($i=1;$i<=$this->DivisionCount;$i++)
+ {
+ if ( $YPos > $this->GArea_Y1 && $YPos < $this->GArea_Y2 )
+ $this->drawDottedLine($this->GArea_X1,$YPos,$this->GArea_X2,$YPos,$LineWidth,$R,$G,$B);
+
+ $YPos = $YPos - $this->DivisionHeight;
+ }
+
+ /* Vertical lines */
+ if ( $this->GAreaXOffset == 0 )
+ { $XPos = $this->GArea_X1 + $this->DivisionWidth + $this->GAreaXOffset; $ColCount = $this->DataCount-2; }
+ else
+ { $XPos = $this->GArea_X1 + $this->GAreaXOffset; $ColCount = floor( ($this->GArea_X2 - $this->GArea_X1) / $this->DivisionWidth ); }
+
+ for($i=1;$i<=$ColCount;$i++)
+ {
+ if ( $XPos > $this->GArea_X1 && $XPos < $this->GArea_X2 )
+ $this->drawDottedLine(floor($XPos),$this->GArea_Y1,floor($XPos),$this->GArea_Y2,$LineWidth,$R,$G,$B);
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+ }
+
+ /* retrieve the legends size */
+ function getLegendBoxSize($DataDescription)
+ {
+ if ( !isset($DataDescription["Description"]) )
+ return(-1);
+
+ /* <-10->[8]<-4->Text<-10-> */
+ $MaxWidth = 0; $MaxHeight = 8;
+ foreach($DataDescription["Description"] as $Key => $Value)
+ {
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
+ $TextWidth = $Position[2]-$Position[0];
+ $TextHeight = $Position[1]-$Position[7];
+ if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
+ $MaxHeight = $MaxHeight + $TextHeight + 4;
+ }
+ $MaxHeight = $MaxHeight - 3;
+ $MaxWidth = $MaxWidth + 32;
+
+ return(array($MaxWidth,$MaxHeight));
+ }
+
+ function getPieLegendBoxSize($Data)
+ {
+ $MaxWidth = 0; $MaxHeight = 8;
+ foreach($Data as $Value)
+ {
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value['Keys']);
+ $TextWidth = $Position[2]-$Position[0];
+ $TextHeight = $Position[1]-$Position[7];
+ if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
+ $MaxHeight = $MaxHeight + $TextHeight + 4;
+ }
+ $MaxHeight = $MaxHeight - 3;
+ $MaxWidth = $MaxWidth + 32;
+
+ return(array($MaxWidth,$MaxHeight));
+ }
+
+ /* Draw the data legends */
+ function drawLegend($XPos,$YPos,$DataDescription,$R,$G,$B,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=TRUE)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawLegend",$DataDescription);
+
+ if ( !isset($DataDescription["Description"]) )
+ return(-1);
+
+ $C_TextColor =$this->AllocateColor($this->Picture,$Rt,$Gt,$Bt);
+
+ /* <-10->[8]<-4->Text<-10-> */
+ $MaxWidth = 0; $MaxHeight = 8;
+ foreach($DataDescription["Description"] as $Key => $Value)
+ {
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
+ $TextWidth = $Position[2]-$Position[0];
+ $TextHeight = $Position[1]-$Position[7];
+ if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
+ $MaxHeight = $MaxHeight + $TextHeight + 4;
+ }
+ $MaxHeight = $MaxHeight - 5;
+ $MaxWidth = $MaxWidth + 32;
+
+ if ( $Rs == -1 || $Gs == -1 || $Bs == -1 )
+ { $Rs = $R-30; $Gs = $G-30; $Bs = $B-30; }
+
+ if ( $Border )
+ {
+ $this->drawFilledRoundedRectangle($XPos+1,$YPos+1,$XPos+$MaxWidth+1,$YPos+$MaxHeight+1,5,$Rs,$Gs,$Bs);
+ $this->drawFilledRoundedRectangle($XPos,$YPos,$XPos+$MaxWidth,$YPos+$MaxHeight,5,$R,$G,$B);
+ }
+
+ $YOffset = 4 + $this->FontSize; $ID = 0;
+ foreach($DataDescription["Description"] as $Key => $Value)
+ {
+ $this->drawFilledRoundedRectangle($XPos+10,$YPos+$YOffset-4,$XPos+14,$YPos+$YOffset-4,2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
+ imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value);
+
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
+ $TextHeight = $Position[1]-$Position[7];
+
+ $YOffset = $YOffset + $TextHeight + 4;
+ $ID++;
+ }
+ }
+
+ /* Draw the data legends */
+ function drawPieLegend($XPos,$YPos,$Data,$DataDescription,$R,$G,$B)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawPieLegend",$DataDescription,FALSE);
+ $this->validateData("drawPieLegend",$Data);
+
+ if ( !isset($DataDescription["Position"]) )
+ return(-1);
+
+ $C_TextColor =$this->AllocateColor($this->Picture,0,0,0);
+
+ /* <-10->[8]<-4->Text<-10-> */
+ $MaxWidth = 0; $MaxHeight = 8;
+ foreach($Data as $Key => $Value)
+ {
+ $Value2 = $Value[$DataDescription["Position"]];
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value2);
+ $TextWidth = $Position[2]-$Position[0];
+ $TextHeight = $Position[1]-$Position[7];
+ if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
+
+ $MaxHeight = $MaxHeight + $TextHeight + 4;
+ }
+ $MaxHeight = $MaxHeight - 3;
+ $MaxWidth = $MaxWidth + 32;
+
+ $this->drawFilledRoundedRectangle($XPos+1,$YPos+1,$XPos+$MaxWidth+1,$YPos+$MaxHeight+1,5,$R-30,$G-30,$B-30);
+ $this->drawFilledRoundedRectangle($XPos,$YPos,$XPos+$MaxWidth,$YPos+$MaxHeight,5,$R,$G,$B);
+
+ $YOffset = 4 + $this->FontSize; $ID = 0;
+ foreach($Data as $Key => $Value)
+ {
+ $Value2 = $Value[$DataDescription["Position"]];
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value2);
+ $TextHeight = $Position[1]-$Position[7];
+ $this->drawFilledRectangle($XPos+10,$YPos+$YOffset-6,$XPos+14,$YPos+$YOffset-2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
+
+ imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value2);
+ $YOffset = $YOffset + $TextHeight + 4;
+ $ID++;
+ }
+ }
+
+ /* Draw the graph title */
+ function drawTitle($XPos,$YPos,$Value,$R,$G,$B,$XPos2=-1,$YPos2=-1,$Shadow=FALSE)
+ {
+ $C_TextColor = $this->AllocateColor($this->Picture,$R,$G,$B);
+
+ if ( $XPos2 != -1 )
+ {
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
+ $TextWidth = $Position[2]-$Position[0];
+ $XPos = floor(( $XPos2 - $XPos - $TextWidth ) / 2 ) + $XPos;
+ }
+
+ if ( $YPos2 != -1 )
+ {
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
+ $TextHeight = $Position[5]-$Position[3];
+ $YPos = floor(( $YPos2 - $YPos - $TextHeight ) / 2 ) + $YPos;
+ }
+
+ if ( $Shadow )
+ {
+ $C_ShadowColor = $this->AllocateColor($this->Picture,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor);
+ imagettftext($this->Picture,$this->FontSize,0,$XPos+$this->ShadowXDistance,$YPos+$this->ShadowYDistance,$C_ShadowColor,$this->FontName,$Value);
+ }
+
+ imagettftext($this->Picture,$this->FontSize,0,$XPos,$YPos,$C_TextColor,$this->FontName,$Value);
+ }
+
+ /* Draw a text box with text align & alpha properties */
+ function drawTextBox($X1,$Y1,$X2,$Y2,$Text,$Angle=0,$R=255,$G=255,$B=255,$Align=ALIGN_LEFT,$Shadow=TRUE,$BgR=-1,$BgG=-1,$BgB=-1,$Alpha=100)
+ {
+ $Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Text);
+ $TextWidth = $Position[2]-$Position[0];
+ $TextHeight = $Position[5]-$Position[3];
+ $AreaWidth = $X2 - $X1;
+ $AreaHeight = $Y2 - $Y1;
+
+ if ( $BgR != -1 && $BgG != -1 && $BgB != -1 )
+ $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$BgR,$BgG,$BgB,FALSE,$Alpha);
+
+ if ( $Align == ALIGN_TOP_LEFT ) { $X = $X1+1; $Y = $Y1+$this->FontSize+1; }
+ if ( $Align == ALIGN_TOP_CENTER ) { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y1+$this->FontSize+1; }
+ if ( $Align == ALIGN_TOP_RIGHT ) { $X = $X2-$TextWidth-1; $Y = $Y1+$this->FontSize+1; }
+ if ( $Align == ALIGN_LEFT ) { $X = $X1+1; $Y = $Y1+($AreaHeight/2)-($TextHeight/2); }
+ if ( $Align == ALIGN_CENTER ) { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y1+($AreaHeight/2)-($TextHeight/2); }
+ if ( $Align == ALIGN_RIGHT ) { $X = $X2-$TextWidth-1; $Y = $Y1+($AreaHeight/2)-($TextHeight/2); }
+ if ( $Align == ALIGN_BOTTOM_LEFT ) { $X = $X1+1; $Y = $Y2-1; }
+ if ( $Align == ALIGN_BOTTOM_CENTER ) { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y2-1; }
+ if ( $Align == ALIGN_BOTTOM_RIGHT ) { $X = $X2-$TextWidth-1; $Y = $Y2-1; }
+
+ $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
+ $C_ShadowColor =$this->AllocateColor($this->Picture,0,0,0);
+ if ( $Shadow )
+ imagettftext($this->Picture,$this->FontSize,$Angle,$X+1,$Y+1,$C_ShadowColor,$this->FontName,$Text);
+
+ imagettftext($this->Picture,$this->FontSize,$Angle,$X,$Y,$C_TextColor,$this->FontName,$Text);
+ }
+
+ /* Compute and draw the scale */
+ function drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnRight=FALSE,$TickWidth=4,$FreeText=NULL)
+ {
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
+ $Y = $this->GArea_Y2 - ($Value - $this->VMin) * $this->DivisionRatio;
+
+ if ( $Y <= $this->GArea_Y1 || $Y >= $this->GArea_Y2 )
+ return(-1);
+
+ if ( $TickWidth == 0 )
+ $this->drawLine($this->GArea_X1,$Y,$this->GArea_X2,$Y,$R,$G,$B);
+ else
+ $this->drawDottedLine($this->GArea_X1,$Y,$this->GArea_X2,$Y,$TickWidth,$R,$G,$B);
+
+ if ( $ShowLabel )
+ {
+ if ( $FreeText == NULL )
+ { $Label = $Value; } else { $Label = $FreeText; }
+
+ if ( $ShowOnRight )
+ imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X2+2,$Y+($this->FontSize/2),$C_TextColor,$this->FontName,$Label);
+ else
+ imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1+2,$Y-($this->FontSize/2),$C_TextColor,$this->FontName,$Label);
+ }
+ }
+
+ /* This function put a label on a specific point */
+ function setLabel($Data,$DataDescription,$SerieName,$ValueName,$Caption,$R=210,$G=210,$B=210)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("setLabel",$DataDescription);
+ $this->validateData("setLabel",$Data);
+ $ShadowFactor = 100;
+ $C_Label =$this->AllocateColor($this->Picture,$R,$G,$B);
+ $C_Shadow =$this->AllocateColor($this->Picture,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
+ $C_TextColor =$this->AllocateColor($this->Picture,0,0,0);
+
+ $Cp = 0; $Found = FALSE;
+ foreach ( $Data as $Key => $Value )
+ {
+ if ( $Data[$Key][$DataDescription["Position"]] == $ValueName )
+ { $NumericalValue = $Data[$Key][$SerieName]; $Found = TRUE; }
+ if ( !$Found )
+ $Cp++;
+ }
+
+ $XPos = $this->GArea_X1 + $this->GAreaXOffset + ( $this->DivisionWidth * $Cp ) + 2;
+ $YPos = $this->GArea_Y2 - ($NumericalValue - $this->VMin) * $this->DivisionRatio;
+
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
+ $TextHeight = $Position[3] - $Position[5];
+ $TextWidth = $Position[2]-$Position[0] + 2;
+ $TextOffset = floor($TextHeight/2);
+
+ // Shadow
+ $Poly = array($XPos+1,$YPos+1,$XPos + 9,$YPos - $TextOffset,$XPos + 8,$YPos + $TextOffset + 2);
+ imagefilledpolygon($this->Picture,$Poly,3,$C_Shadow);
+ $this->drawLine($XPos,$YPos+1,$XPos + 9,$YPos - $TextOffset - .2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
+ $this->drawLine($XPos,$YPos+1,$XPos + 9,$YPos + $TextOffset + 2.2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
+ $this->drawFilledRectangle($XPos + 9,$YPos - $TextOffset-.2,$XPos + 13 + $TextWidth,$YPos + $TextOffset + 2.2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
+
+ // Label background
+ $Poly = array($XPos,$YPos,$XPos + 8,$YPos - $TextOffset - 1,$XPos + 8,$YPos + $TextOffset + 1);
+ imagefilledpolygon($this->Picture,$Poly,3,$C_Label);
+ $this->drawLine($XPos-1,$YPos,$XPos + 8,$YPos - $TextOffset - 1.2,$R,$G,$B);
+ $this->drawLine($XPos-1,$YPos,$XPos + 8,$YPos + $TextOffset + 1.2,$R,$G,$B);
+ $this->drawFilledRectangle($XPos + 8,$YPos - $TextOffset - 1.2,$XPos + 12 + $TextWidth,$YPos + $TextOffset + 1.2,$R,$G,$B);
+
+ imagettftext($this->Picture,$this->FontSize,0,$XPos + 10,$YPos + $TextOffset,$C_TextColor,$this->FontName,$Caption);
+ }
+
+ /* This function draw a plot graph */
+ function drawPlotGraph($Data,$DataDescription,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=FALSE)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawPlotGraph",$DataDescription);
+ $this->validateData("drawPlotGraph",$Data);
+
+ $GraphID = 0;
+ $Ro = $R2; $Go = $G2; $Bo = $B2;
+
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $R = $this->Palette[$ColorID]["R"];
+ $G = $this->Palette[$ColorID]["G"];
+ $B = $this->Palette[$ColorID]["B"];
+ $R2 = $Ro; $G2 = $Go; $B2 = $Bo;
+
+ if ( isset($DataDescription["Symbol"][$ColName]) )
+ {
+ $Is_Alpha = ((ord ( file_get_contents ($DataDescription["Symbol"][$ColName], false, null, 25, 1)) & 6) & 4) == 4;
+
+ $Infos = getimagesize($DataDescription["Symbol"][$ColName]);
+ $ImageWidth = $Infos[0];
+ $ImageHeight = $Infos[1];
+ $Symbol = imagecreatefromgif($DataDescription["Symbol"][$ColName]);
+ }
+
+ $XPos = $this->GArea_X1 + $this->GAreaXOffset;
+ $Hsize = round($BigRadius/2);
+ $R3 = -1; $G3 = -1; $B3 = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ $Value = $Data[$Key][$ColName];
+ $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
+
+ /* Save point into the image map if option activated */
+ if ( $this->BuildMap )
+ $this->addToImageMap($XPos-$Hsize,$YPos-$Hsize,$XPos+1+$Hsize,$YPos+$Hsize+1,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Plot");
+
+ if ( is_numeric($Value) )
+ {
+ if ( !isset($DataDescription["Symbol"][$ColName]) )
+ {
+
+ if ( $Shadow )
+ {
+ if ( $R3 !=-1 && $G3 !=-1 && $B3 !=-1 )
+ $this->drawFilledCircle($XPos+2,$YPos+2,$BigRadius,$R3,$G3,$B3);
+ else
+ {
+ $R3 = $this->Palette[$ColorID]["R"]-20; if ( $R3 < 0 ) { $R3 = 0; }
+ $G3 = $this->Palette[$ColorID]["G"]-20; if ( $G3 < 0 ) { $G3 = 0; }
+ $B3 = $this->Palette[$ColorID]["B"]-20; if ( $B3 < 0 ) { $B3 = 0; }
+ $this->drawFilledCircle($XPos+2,$YPos+2,$BigRadius,$R3,$G3,$B3);
+ }
+ }
+
+ $this->drawFilledCircle($XPos+1,$YPos+1,$BigRadius,$R,$G,$B);
+
+ if ( $SmallRadius != 0 )
+ {
+ if ( $R2 !=-1 && $G2 !=-1 && $B2 !=-1 )
+ $this->drawFilledCircle($XPos+1,$YPos+1,$SmallRadius,$R2,$G2,$B2);
+ else
+ {
+ $R2 = $this->Palette[$ColorID]["R"]-15; if ( $R2 < 0 ) { $R2 = 0; }
+ $G2 = $this->Palette[$ColorID]["G"]-15; if ( $G2 < 0 ) { $G2 = 0; }
+ $B2 = $this->Palette[$ColorID]["B"]-15; if ( $B2 < 0 ) { $B2 = 0; }
+
+ $this->drawFilledCircle($XPos+1,$YPos+1,$SmallRadius,$R2,$G2,$B2);
+ }
+ }
+ }
+ else
+ {
+ imagecopymerge($this->Picture,$Symbol,$XPos+1-$ImageWidth/2,$YPos+1-$ImageHeight/2,0,0,$ImageWidth,$ImageHeight,100);
+ }
+ }
+
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+ $GraphID++;
+ }
+ }
+
+ /* This function draw a plot graph in an X/Y space */
+ function drawXYPlotGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=TRUE)
+ {
+ $R = $this->Palette[$PaletteID]["R"];
+ $G = $this->Palette[$PaletteID]["G"];
+ $B = $this->Palette[$PaletteID]["B"];
+ $R3 = -1; $G3 = -1; $B3 = -1;
+
+ $YLast = -1; $XLast = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$YSerieName]) && isset($Data[$Key][$XSerieName]) )
+ {
+ $X = $Data[$Key][$XSerieName];
+ $Y = $Data[$Key][$YSerieName];
+
+ $Y = $this->GArea_Y2 - (($Y-$this->VMin) * $this->DivisionRatio);
+ $X = $this->GArea_X1 + (($X-$this->VXMin) * $this->XDivisionRatio);
+
+
+ if ( $Shadow )
+ {
+ if ( $R3 !=-1 && $G3 !=-1 && $B3 !=-1 )
+ $this->drawFilledCircle($X+2,$Y+2,$BigRadius,$R3,$G3,$B3);
+ else
+ {
+ $R3 = $this->Palette[$PaletteID]["R"]-20; if ( $R < 0 ) { $R = 0; }
+ $G3 = $this->Palette[$PaletteID]["G"]-20; if ( $G < 0 ) { $G = 0; }
+ $B3 = $this->Palette[$PaletteID]["B"]-20; if ( $B < 0 ) { $B = 0; }
+ $this->drawFilledCircle($X+2,$Y+2,$BigRadius,$R3,$G3,$B3);
+ }
+ }
+
+ $this->drawFilledCircle($X+1,$Y+1,$BigRadius,$R,$G,$B);
+
+ if ( $R2 !=-1 && $G2 !=-1 && $B2 !=-1 )
+ $this->drawFilledCircle($X+1,$Y+1,$SmallRadius,$R2,$G2,$B2);
+ else
+ {
+ $R2 = $this->Palette[$PaletteID]["R"]+20; if ( $R > 255 ) { $R = 255; }
+ $G2 = $this->Palette[$PaletteID]["G"]+20; if ( $G > 255 ) { $G = 255; }
+ $B2 = $this->Palette[$PaletteID]["B"]+20; if ( $B > 255 ) { $B = 255; }
+ $this->drawFilledCircle($X+1,$Y+1,$SmallRadius,$R2,$G2,$B2);
+ }
+ }
+ }
+
+ }
+
+ /* This function draw an area between two series */
+ function drawArea($Data,$Serie1,$Serie2,$R,$G,$B,$Alpha = 50)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateData("drawArea",$Data);
+
+ $LayerWidth = $this->GArea_X2-$this->GArea_X1;
+ $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
+
+ $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
+ $C_White =$this->AllocateColor($this->Layers[0],255,255,255);
+ imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
+ imagecolortransparent($this->Layers[0],$C_White);
+
+ $C_Graph =$this->AllocateColor($this->Layers[0],$R,$G,$B);
+
+ $XPos = $this->GAreaXOffset;
+ $LastXPos = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ $Value1 = $Data[$Key][$Serie1];
+ $Value2 = $Data[$Key][$Serie2];
+ $YPos1 = $LayerHeight - (($Value1-$this->VMin) * $this->DivisionRatio);
+ $YPos2 = $LayerHeight - (($Value2-$this->VMin) * $this->DivisionRatio);
+
+ if ( $LastXPos != -1 )
+ {
+ $Points = "";
+ $Points[] = $LastXPos; $Points[] = $LastYPos1;
+ $Points[] = $LastXPos; $Points[] = $LastYPos2;
+ $Points[] = $XPos; $Points[] = $YPos2;
+ $Points[] = $XPos; $Points[] = $YPos1;
+
+ imagefilledpolygon($this->Layers[0],$Points,4,$C_Graph);
+ }
+
+ $LastYPos1 = $YPos1;
+ $LastYPos2 = $YPos2;
+ $LastXPos = $XPos;
+
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+
+ imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
+ imagedestroy($this->Layers[0]);
+ }
+
+
+ /* This function write the values of the specified series */
+ function writeValues($Data,$DataDescription,$Series)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("writeValues",$DataDescription);
+ $this->validateData("writeValues",$Data);
+
+ if ( !is_array($Series) ) { $Series = array($Series); }
+
+ foreach($Series as $Key => $Serie)
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $Serie ) { $ColorID = $ID; }; $ID++; }
+
+ $XPos = $this->GArea_X1 + $this->GAreaXOffset;
+ $XLast = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$Serie]) && is_numeric($Data[$Key][$Serie]))
+ {
+ $Value = $Data[$Key][$Serie];
+ $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
+
+ $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$Value);
+ $Width = $Positions[2] - $Positions[6]; $XOffset = $XPos - ($Width/2);
+ $Height = $Positions[3] - $Positions[7]; $YOffset = $YPos - 4;
+
+ $C_TextColor =$this->AllocateColor($this->Picture,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ imagettftext($this->Picture,$this->FontSize,0,$XOffset,$YOffset,$C_TextColor,$this->FontName,$Value);
+ }
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+
+ }
+ }
+
+ /* This function draw a line graph */
+ function drawLineGraph($Data,$DataDescription,$SerieName="")
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawLineGraph",$DataDescription);
+ $this->validateData("drawLineGraph",$Data);
+
+ $GraphID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ if ( $SerieName == "" || $SerieName == $ColName )
+ {
+ $XPos = $this->GArea_X1 + $this->GAreaXOffset;
+ $XLast = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ {
+ $Value = $Data[$Key][$ColName];
+ $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
+
+ /* Save point into the image map if option activated */
+ if ( $this->BuildMap )
+ $this->addToImageMap($XPos-3,$YPos-3,$XPos+3,$YPos+3,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Line");
+
+ if (!is_numeric($Value)) { $XLast = -1; }
+ if ( $XLast != -1 )
+ $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
+
+ $XLast = $XPos;
+ $YLast = $YPos;
+ if (!is_numeric($Value)) { $XLast = -1; }
+ }
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+ $GraphID++;
+ }
+ }
+ }
+
+ /* This function draw a line graph */
+ function drawXYGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0)
+ {
+ $YLast = -1; $XLast = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$YSerieName]) && isset($Data[$Key][$XSerieName]) )
+ {
+ $X = $Data[$Key][$XSerieName];
+ $Y = $Data[$Key][$YSerieName];
+
+ $Y = $this->GArea_Y2 - (($Y-$this->VMin) * $this->DivisionRatio);
+ $X = $this->GArea_X1 + (($X-$this->VXMin) * $this->XDivisionRatio);
+
+ if ($XLast != -1 && $YLast != -1)
+ {
+ $this->drawLine($XLast,$YLast,$X,$Y,$this->Palette[$PaletteID]["R"],$this->Palette[$PaletteID]["G"],$this->Palette[$PaletteID]["B"],TRUE);
+ }
+
+ $XLast = $X;
+ $YLast = $Y;
+ }
+ }
+ }
+
+ /* This function draw a cubic curve */
+ function drawCubicCurve($Data,$DataDescription,$Accuracy=.1,$SerieName="")
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawCubicCurve",$DataDescription);
+ $this->validateData("drawCubicCurve",$Data);
+
+ $GraphID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ if ( $SerieName == "" || $SerieName == $ColName )
+ {
+ $XIn = ""; $Yin = ""; $Yt = ""; $U = "";
+ $XIn[0] = 0; $YIn[0] = 0;
+
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $Index = 1;
+ $XLast = -1; $Missing = "";
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]) )
+ {
+ $Value = $Data[$Key][$ColName];
+ $XIn[$Index] = $Index;
+ $YIn[$Index] = $Value;
+ if ( !is_numeric($Value) ) { $Missing[$Index] = TRUE; }
+ $Index++;
+ }
+ }
+ $Index--;
+
+ $Yt[0] = 0;
+ $Yt[1] = 0;
+ $U[1] = 0;
+ for($i=2;$i<=$Index-1;$i++)
+ {
+ $Sig = ($XIn[$i] - $XIn[$i-1]) / ($XIn[$i+1] - $XIn[$i-1]);
+ $p = $Sig * $Yt[$i-1] + 2;
+ $Yt[$i] = ($Sig - 1) / $p;
+ $U[$i] = ($YIn[$i+1] - $YIn[$i]) / ($XIn[$i+1] - $XIn[$i]) - ($YIn[$i] - $YIn[$i-1]) / ($XIn[$i] - $XIn[$i-1]);
+ $U[$i] = (6 * $U[$i] / ($XIn[$i+1] - $XIn[$i-1]) - $Sig * $U[$i-1]) / $p;
+ }
+
+ $qn = 0;
+ $un = 0;
+ $Yt[$Index] = ($un - $qn * $U[$Index-1]) / ($qn * $Yt[$Index-1] + 1);
+
+ for($k=$Index-1;$k>=1;$k--)
+ $Yt[$k] = $Yt[$k] * $Yt[$k+1] + $U[$k];
+
+ $XPos = $this->GArea_X1 + $this->GAreaXOffset;
+ for($X=1;$X<=$Index;$X=$X+$Accuracy)
+ {
+ $klo = 1;
+ $khi = $Index;
+ $k = $khi - $klo;
+ while($k > 1)
+ {
+ $k = $khi - $klo;
+ If ( $XIn[$k] >= $X )
+ $khi = $k;
+ else
+ $klo = $k;
+ }
+ $klo = $khi - 1;
+
+ $h = $XIn[$khi] - $XIn[$klo];
+ $a = ($XIn[$khi] - $X) / $h;
+ $b = ($X - $XIn[$klo]) / $h;
+ $Value = $a * $YIn[$klo] + $b * $YIn[$khi] + (($a*$a*$a - $a) * $Yt[$klo] + ($b*$b*$b - $b) * $Yt[$khi]) * ($h*$h) / 6;
+
+ $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
+
+ if ( $XLast != -1 && !isset($Missing[floor($X)]) && !isset($Missing[floor($X+1)]) )
+ $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
+
+ $XLast = $XPos;
+ $YLast = $YPos;
+ $XPos = $XPos + $this->DivisionWidth * $Accuracy;
+ }
+
+ // Add potentialy missing values
+ $XPos = $XPos - $this->DivisionWidth * $Accuracy;
+ if ( $XPos < ($this->GArea_X2 - $this->GAreaXOffset) )
+ {
+ $YPos = $this->GArea_Y2 - (($YIn[$Index]-$this->VMin) * $this->DivisionRatio);
+ $this->drawLine($XLast,$YLast,$this->GArea_X2-$this->GAreaXOffset,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
+ }
+
+ $GraphID++;
+ }
+ }
+ }
+
+ /* This function draw a filled cubic curve */
+ function drawFilledCubicCurve($Data,$DataDescription,$Accuracy=.1,$Alpha=100,$AroundZero=FALSE)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawFilledCubicCurve",$DataDescription);
+ $this->validateData("drawFilledCubicCurve",$Data);
+
+ $LayerWidth = $this->GArea_X2-$this->GArea_X1;
+ $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
+ $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio);
+ if ( $YZero > $LayerHeight ) { $YZero = $LayerHeight; }
+
+ $GraphID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $XIn = ""; $Yin = ""; $Yt = ""; $U = "";
+ $XIn[0] = 0; $YIn[0] = 0;
+
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $Index = 1;
+ $XLast = -1; $Missing = "";
+ foreach ( $Data as $Key => $Values )
+ {
+ $Value = $Data[$Key][$ColName];
+ $XIn[$Index] = $Index;
+ $YIn[$Index] = $Value;
+ if ( !is_numeric($Value) ) { $Missing[$Index] = TRUE; }
+ $Index++;
+ }
+ $Index--;
+
+ $Yt[0] = 0;
+ $Yt[1] = 0;
+ $U[1] = 0;
+ for($i=2;$i<=$Index-1;$i++)
+ {
+ $Sig = ($XIn[$i] - $XIn[$i-1]) / ($XIn[$i+1] - $XIn[$i-1]);
+ $p = $Sig * $Yt[$i-1] + 2;
+ $Yt[$i] = ($Sig - 1) / $p;
+ $U[$i] = ($YIn[$i+1] - $YIn[$i]) / ($XIn[$i+1] - $XIn[$i]) - ($YIn[$i] - $YIn[$i-1]) / ($XIn[$i] - $XIn[$i-1]);
+ $U[$i] = (6 * $U[$i] / ($XIn[$i+1] - $XIn[$i-1]) - $Sig * $U[$i-1]) / $p;
+ }
+
+ $qn = 0;
+ $un = 0;
+ $Yt[$Index] = ($un - $qn * $U[$Index-1]) / ($qn * $Yt[$Index-1] + 1);
+
+ for($k=$Index-1;$k>=1;$k--)
+ $Yt[$k] = $Yt[$k] * $Yt[$k+1] + $U[$k];
+
+ $Points = "";
+ $Points[] = $this->GAreaXOffset;
+ $Points[] = $LayerHeight;
+
+ $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
+ $C_White =$this->AllocateColor($this->Layers[0],255,255,255);
+ imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
+ imagecolortransparent($this->Layers[0],$C_White);
+
+ $YLast = NULL;
+ $XPos = $this->GAreaXOffset; $PointsCount = 2;
+ for($X=1;$X<=$Index;$X=$X+$Accuracy)
+ {
+ $klo = 1;
+ $khi = $Index;
+ $k = $khi - $klo;
+ while($k > 1)
+ {
+ $k = $khi - $klo;
+ If ( $XIn[$k] >= $X )
+ $khi = $k;
+ else
+ $klo = $k;
+ }
+ $klo = $khi - 1;
+
+ $h = $XIn[$khi] - $XIn[$klo];
+ $a = ($XIn[$khi] - $X) / $h;
+ $b = ($X - $XIn[$klo]) / $h;
+ $Value = $a * $YIn[$klo] + $b * $YIn[$khi] + (($a*$a*$a - $a) * $Yt[$klo] + ($b*$b*$b - $b) * $Yt[$khi]) * ($h*$h) / 6;
+
+ $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio);
+
+ if ( $YLast != NULL && $AroundZero && !isset($Missing[floor($X)]) && !isset($Missing[floor($X+1)]))
+ {
+ $aPoints = "";
+ $aPoints[] = $XLast;
+ $aPoints[] = $YLast;
+ $aPoints[] = $XPos;
+ $aPoints[] = $YPos;
+ $aPoints[] = $XPos;
+ $aPoints[] = $YZero;
+ $aPoints[] = $XLast;
+ $aPoints[] = $YZero;
+
+ $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ imagefilledpolygon($this->Layers[0],$aPoints,4,$C_Graph);
+ }
+
+ if ( !isset($Missing[floor($X)]) || $YLast == NULL )
+ {
+ $PointsCount++;
+ $Points[] = $XPos;
+ $Points[] = $YPos;
+ }
+ else
+ {
+ $PointsCount++; $Points[] = $XLast; $Points[] = $LayerHeight;
+ }
+
+ $YLast = $YPos; $XLast = $XPos;
+ $XPos = $XPos + $this->DivisionWidth * $Accuracy;
+ }
+
+ // Add potentialy missing values
+ $XPos = $XPos - $this->DivisionWidth * $Accuracy;
+ if ( $XPos < ($LayerWidth-$this->GAreaXOffset) )
+ {
+ $YPos = $LayerHeight - (($YIn[$Index]-$this->VMin) * $this->DivisionRatio);
+
+ if ( $YLast != NULL && $AroundZero )
+ {
+ $aPoints = "";
+ $aPoints[] = $XLast;
+ $aPoints[] = $YLast;
+ $aPoints[] = $LayerWidth-$this->GAreaXOffset;
+ $aPoints[] = $YPos;
+ $aPoints[] = $LayerWidth-$this->GAreaXOffset;
+ $aPoints[] = $YZero;
+ $aPoints[] = $XLast;
+ $aPoints[] = $YZero;
+
+ $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ imagefilledpolygon($this->Layers[0],$aPoints,4,$C_Graph);
+ }
+
+ if ( $YIn[$klo] != "" && $YIn[$khi] != "" || $YLast == NULL )
+ {
+ $PointsCount++;
+ $Points[] = $LayerWidth-$this->GAreaXOffset;
+ $Points[] = $YPos;
+ }
+ }
+
+ $Points[] = $LayerWidth-$this->GAreaXOffset;
+ $Points[] = $LayerHeight;
+
+ if ( !$AroundZero )
+ {
+ $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ imagefilledpolygon($this->Layers[0],$Points,$PointsCount,$C_Graph);
+ }
+
+ imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
+ imagedestroy($this->Layers[0]);
+
+ $this->drawCubicCurve($Data,$DataDescription,$Accuracy,$ColName);
+
+ $GraphID++;
+ }
+ }
+
+ /* This function draw a filled line graph */
+ function drawFilledLineGraph($Data,$DataDescription,$Alpha=100,$AroundZero=FALSE)
+ {
+ $Empty = -2147483647;
+
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawFilledLineGraph",$DataDescription);
+ $this->validateData("drawFilledLineGraph",$Data);
+
+ $LayerWidth = $this->GArea_X2-$this->GArea_X1;
+ $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
+
+ $GraphID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $aPoints = "";
+ $aPoints[] = $this->GAreaXOffset;
+ $aPoints[] = $LayerHeight;
+
+ $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
+ $C_White = $this->AllocateColor($this->Layers[0],255,255,255);
+ imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
+ imagecolortransparent($this->Layers[0],$C_White);
+
+ $XPos = $this->GAreaXOffset;
+ $XLast = -1; $PointsCount = 2;
+ $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio);
+ if ( $YZero > $LayerHeight ) { $YZero = $LayerHeight; }
+
+ $YLast = $Empty;
+ foreach ( $Data as $Key => $Values )
+ {
+ $Value = $Data[$Key][$ColName];
+ $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio);
+
+ /* Save point into the image map if option activated */
+ if ( $this->BuildMap )
+ $this->addToImageMap($XPos-3,$YPos-3,$XPos+3,$YPos+3,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"FLine");
+
+ if ( !is_numeric($Value) )
+ {
+ $PointsCount++;
+ $aPoints[] = $XLast;
+ $aPoints[] = $LayerHeight;
+
+ $YLast = $Empty;
+ }
+ else
+ {
+ $PointsCount++;
+ if ( $YLast <> $Empty )
+ { $aPoints[] = $XPos; $aPoints[] = $YPos; }
+ else
+ { $PointsCount++; $aPoints[] = $XPos; $aPoints[] = $LayerHeight; $aPoints[] = $XPos; $aPoints[] = $YPos; }
+
+ if ($YLast <> $Empty && $AroundZero)
+ {
+ $Points = "";
+ $Points[] = $XLast; $Points[] = $YLast;
+ $Points[] = $XPos;
+ $Points[] = $YPos;
+ $Points[] = $XPos;
+ $Points[] = $YZero;
+ $Points[] = $XLast;
+ $Points[] = $YZero;
+
+ $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ imagefilledpolygon($this->Layers[0],$Points,4,$C_Graph);
+ }
+ $YLast = $YPos;
+ }
+
+ $XLast = $XPos;
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+ $aPoints[] = $LayerWidth - $this->GAreaXOffset;
+ $aPoints[] = $LayerHeight;
+
+ if ( $AroundZero == FALSE )
+ {
+ $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ imagefilledpolygon($this->Layers[0],$aPoints,$PointsCount,$C_Graph);
+ }
+
+ imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
+ imagedestroy($this->Layers[0]);
+ $GraphID++;
+ $this->drawLineGraph($Data,$DataDescription,$ColName);
+ }
+ }
+
+ /* This function draw a bar graph */
+ function drawOverlayBarGraph($Data,$DataDescription,$Alpha=50)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawOverlayBarGraph",$DataDescription);
+ $this->validateData("drawOverlayBarGraph",$Data);
+
+ $LayerWidth = $this->GArea_X2-$this->GArea_X1;
+ $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
+
+ $GraphID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $this->Layers[$GraphID] = imagecreatetruecolor($LayerWidth,$LayerHeight);
+ $C_White = $this->AllocateColor($this->Layers[$GraphID],255,255,255);
+ $C_Graph = $this->AllocateColor($this->Layers[$GraphID],$this->Palette[$GraphID]["R"],$this->Palette[$GraphID]["G"],$this->Palette[$GraphID]["B"]);
+ imagefilledrectangle($this->Layers[$GraphID],0,0,$LayerWidth,$LayerHeight,$C_White);
+ imagecolortransparent($this->Layers[$GraphID],$C_White);
+
+ $XWidth = $this->DivisionWidth / 4;
+ $XPos = $this->GAreaXOffset;
+ $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio);
+ $XLast = -1; $PointsCount = 2;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]) )
+ {
+ $Value = $Data[$Key][$ColName];
+ if ( is_numeric($Value) )
+ {
+ $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio);
+
+ imagefilledrectangle($this->Layers[$GraphID],$XPos-$XWidth,$YPos,$XPos+$XWidth,$YZero,$C_Graph);
+
+ $X1 = floor($XPos - $XWidth + $this->GArea_X1); $Y1 = floor($YPos+$this->GArea_Y1) + .2;
+ $X2 = floor($XPos + $XWidth + $this->GArea_X1); $Y2 = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
+ if ( $X1 <= $this->GArea_X1 ) { $X1 = $this->GArea_X1 + 1; }
+ if ( $X2 >= $this->GArea_X2 ) { $X2 = $this->GArea_X2 - 1; }
+
+ /* Save point into the image map if option activated */
+ if ( $this->BuildMap )
+ $this->addToImageMap($X1,min($Y1,$Y2),$X2,max($Y1,$Y2),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"oBar");
+
+ $this->drawLine($X1,$Y1,$X2,$Y1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
+ }
+ }
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+
+ $GraphID++;
+ }
+
+ for($i=0;$i<=($GraphID-1);$i++)
+ {
+ imagecopymerge($this->Picture,$this->Layers[$i],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
+ imagedestroy($this->Layers[$i]);
+ }
+ }
+
+ /* This function draw a bar graph */
+ function drawBarGraph($Data,$DataDescription,$Shadow=FALSE,$Alpha=100)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawBarGraph",$DataDescription);
+ $this->validateData("drawBarGraph",$Data);
+
+ $GraphID = 0;
+ $Series = count($DataDescription["Values"]);
+ $SeriesWidth = $this->DivisionWidth / ($Series+1);
+ $SerieXOffset = $this->DivisionWidth / 2 - $SeriesWidth / 2;
+
+ $YZero = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
+ if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; }
+
+ $SerieID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $XPos = $this->GArea_X1 + $this->GAreaXOffset - $SerieXOffset + $SeriesWidth * $SerieID;
+ $XLast = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ {
+ if ( is_numeric($Data[$Key][$ColName]) )
+ {
+ $Value = $Data[$Key][$ColName];
+ $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
+
+ /* Save point into the image map if option activated */
+ if ( $this->BuildMap )
+ {
+ $this->addToImageMap($XPos+1,min($YZero,$YPos),$XPos+$SeriesWidth-1,max($YZero,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
+ }
+
+ if ( $Shadow && $Alpha == 100 )
+ $this->drawRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,25,25,25,TRUE,$Alpha);
+
+ $this->drawFilledRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
+ }
+ }
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+ $SerieID++;
+ }
+ }
+
+ /* This function draw a stacked bar graph */
+ function drawStackedBarGraph($Data,$DataDescription,$Alpha=50,$Contiguous=FALSE)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawBarGraph",$DataDescription);
+ $this->validateData("drawBarGraph",$Data);
+
+ $GraphID = 0;
+ $Series = count($DataDescription["Values"]);
+ if ( $Contiguous )
+ $SeriesWidth = $this->DivisionWidth;
+ else
+ $SeriesWidth = $this->DivisionWidth * .8;
+
+ $YZero = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
+ if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; }
+
+ $SerieID = 0; $LastValue = "";
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $XPos = $this->GArea_X1 + $this->GAreaXOffset - $SeriesWidth / 2;
+ $XLast = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ {
+ if ( is_numeric($Data[$Key][$ColName]) )
+ {
+ $Value = $Data[$Key][$ColName];
+
+ if ( isset($LastValue[$Key]) )
+ {
+ $YPos = $this->GArea_Y2 - ((($Value+$LastValue[$Key])-$this->VMin) * $this->DivisionRatio);
+ $YBottom = $this->GArea_Y2 - (($LastValue[$Key]-$this->VMin) * $this->DivisionRatio);
+ $LastValue[$Key] += $Value;
+ }
+ else
+ {
+ $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
+ $YBottom = $YZero;
+ $LastValue[$Key] = $Value;
+ }
+
+ /* Save point into the image map if option activated */
+ if ( $this->BuildMap )
+ $this->addToImageMap($XPos+1,min($YBottom,$YPos),$XPos+$SeriesWidth-1,max($YBottom,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"sBar");
+
+ $this->drawFilledRectangle($XPos+1,$YBottom,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
+ }
+ }
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+ $SerieID++;
+ }
+ }
+
+ /* This function draw a limits bar graphs */
+ function drawLimitsGraph($Data,$DataDescription,$R=0,$G=0,$B=0)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawLimitsGraph",$DataDescription);
+ $this->validateData("drawLimitsGraph",$Data);
+
+ $XWidth = $this->DivisionWidth / 4;
+ $XPos = $this->GArea_X1 + $this->GAreaXOffset;
+
+ foreach ( $Data as $Key => $Values )
+ {
+ $Min = $Data[$Key][$DataDescription["Values"][0]];
+ $Max = $Data[$Key][$DataDescription["Values"][0]];
+ $GraphID = 0; $MaxID = 0; $MinID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ if ( isset($Data[$Key][$ColName]) )
+ {
+ if ( $Data[$Key][$ColName] > $Max && is_numeric($Data[$Key][$ColName]))
+ { $Max = $Data[$Key][$ColName]; $MaxID = $GraphID; }
+ }
+ if ( isset($Data[$Key][$ColName]) && is_numeric($Data[$Key][$ColName]))
+ {
+ if ( $Data[$Key][$ColName] < $Min )
+ { $Min = $Data[$Key][$ColName]; $MinID = $GraphID; }
+ $GraphID++;
+ }
+ }
+
+ $YPos = $this->GArea_Y2 - (($Max-$this->VMin) * $this->DivisionRatio);
+ $X1 = floor($XPos - $XWidth); $Y1 = floor($YPos) - .2;
+ $X2 = floor($XPos + $XWidth);
+ if ( $X1 <= $this->GArea_X1 ) { $X1 = $this->GArea_X1 + 1; }
+ if ( $X2 >= $this->GArea_X2 ) { $X2 = $this->GArea_X2 - 1; }
+
+ $YPos = $this->GArea_Y2 - (($Min-$this->VMin) * $this->DivisionRatio);
+ $Y2 = floor($YPos) + .2;
+
+ $this->drawLine(floor($XPos)-.2,$Y1+1,floor($XPos)-.2,$Y2-1,$R,$G,$B,TRUE);
+ $this->drawLine(floor($XPos)+.2,$Y1+1,floor($XPos)+.2,$Y2-1,$R,$G,$B,TRUE);
+ $this->drawLine($X1,$Y1,$X2,$Y1,$this->Palette[$MaxID]["R"],$this->Palette[$MaxID]["G"],$this->Palette[$MaxID]["B"],FALSE);
+ $this->drawLine($X1,$Y2,$X2,$Y2,$this->Palette[$MinID]["R"],$this->Palette[$MinID]["G"],$this->Palette[$MinID]["B"],FALSE);
+
+ $XPos = $XPos + $this->DivisionWidth;
+ }
+ }
+
+ /* This function draw radar axis centered on the graph area */
+ function drawRadarAxis($Data,$DataDescription,$Mosaic=TRUE,$BorderOffset=10,$A_R=60,$A_G=60,$A_B=60,$S_R=200,$S_G=200,$S_B=200,$MaxValue=-1,$valueMod=1)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawRadarAxis",$DataDescription);
+ $this->validateData("drawRadarAxis",$Data);
+
+ $C_TextColor = $this->AllocateColor($this->Picture,$A_R,$A_G,$A_B);
+
+ /* Draw radar axis */
+ $Points = count($Data);
+ $Radius = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset;
+ $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2 + $this->GArea_X1;
+ $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 + $this->GArea_Y1;
+
+ /* Search for the max value */
+ if ( $MaxValue == -1 )
+ {
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ if ( $Data[$Key][$ColName] > $MaxValue ) { $MaxValue = $Data[$Key][$ColName]; }
+ }
+ }
+ }
+
+ /* Draw the mosaic */
+ if ( $Mosaic )
+ {
+ $RadiusScale = $Radius / $MaxValue;
+ for ( $t=1; $t<=$MaxValue-1; $t++)
+ {
+ $TRadius = $RadiusScale * $t;
+ $LastX1 = -1;
+
+ for ( $i=0; $i<=$Points; $i++)
+ {
+ $Angle = -90 + $i * 360/$Points;
+ $X1 = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter;
+ $Y1 = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter;
+ $X2 = cos($Angle * 3.1418 / 180 ) * ($TRadius+$RadiusScale) + $XCenter;
+ $Y2 = sin($Angle * 3.1418 / 180 ) * ($TRadius+$RadiusScale) + $YCenter;
+
+ if ( $t % 2 == 1 && $LastX1 != -1)
+ {
+ $Plots = "";
+ $Plots[] = $X1; $Plots[] = $Y1;
+ $Plots[] = $X2; $Plots[] = $Y2;
+ $Plots[] = $LastX2; $Plots[] = $LastY2;
+ $Plots[] = $LastX1; $Plots[] = $LastY1;
+
+ $C_Graph = $this->AllocateColor($this->Picture,250,250,250);
+ imagefilledpolygon($this->Picture,$Plots,(count($Plots)+1)/2,$C_Graph);
+ }
+
+ $LastX1 = $X1; $LastY1= $Y1;
+ $LastX2 = $X2; $LastY2= $Y2;
+ }
+ }
+ }
+
+
+ /* Draw the spider web */
+ for ( $t=1; $t<=$MaxValue; $t++)
+ {
+ $TRadius = ( $Radius / $MaxValue ) * $t;
+ $LastX = -1;
+
+ for ( $i=0; $i<=$Points; $i++)
+ {
+ $Angle = -90 + $i * 360/$Points;
+ $X = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter;
+ $Y = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter;
+
+ if ( $LastX != -1 )
+ $this->drawDottedLine($LastX,$LastY,$X,$Y,4,$S_R,$S_G,$S_B);
+
+ $LastX = $X; $LastY= $Y;
+ }
+ }
+
+ /* Draw the axis */
+ for ( $i=0; $i<=$Points; $i++)
+ {
+ $Angle = -90 + $i * 360/$Points;
+ $X = cos($Angle * 3.1418 / 180 ) * $Radius + $XCenter;
+ $Y = sin($Angle * 3.1418 / 180 ) * $Radius + $YCenter;
+
+ $this->drawLine($XCenter,$YCenter,$X,$Y,$A_R,$A_G,$A_B);
+
+ $XOffset = 0; $YOffset = 0;
+ if (isset($Data[$i][$DataDescription["Position"]]))
+ {
+ $Label = $Data[$i][$DataDescription["Position"]];
+
+ $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$Label);
+ $Width = $Positions[2] - $Positions[6];
+ $Height = $Positions[3] - $Positions[7];
+
+ if ( $Angle >= 0 && $Angle <= 90 )
+ $YOffset = $Height;
+
+ if ( $Angle > 90 && $Angle <= 180 )
+ { $YOffset = $Height; $XOffset = -$Width; }
+
+ if ( $Angle > 180 && $Angle <= 270 )
+ { $XOffset = -$Width; }
+
+ imagettftext($this->Picture,$this->FontSize,0,$X+$XOffset,$Y+$YOffset,$C_TextColor,$this->FontName,$Label);
+
+ if ( $this->BuildMap )
+ {
+ $vecX = $X - $XCenter;
+ $vecY = $Y - $YCenter;
+
+ // get a perpendicular vector
+ $vecXtemp = $vecX;
+ $vecX = -$vecY;
+ $vecY = $vecXtemp;
+
+ // normalization
+ $vecLength = sqrt($vecX * $vecX + $vecY * $vecY);
+ $vecX = $vecX / $vecLength;
+ $vecY = $vecY / $vecLength;
+
+ $tooltipValue = '';
+ foreach ($DataDescription['Description'] as $key => $value) {
+ $tooltipValue .= $value.' : '.sprintf("%.2f", $Data[$i][$key]).';';
+ }
+
+ $offset = 10;
+ $poly = array(
+ array($X+$vecX*-$offset,$Y+$vecY*-$offset),
+ array($X+$vecX*+$offset,$Y+$vecY*+$offset),
+ array($XCenter+$vecX*+$offset,$YCenter+$vecY*+$offset),
+ array($XCenter+$vecX*-$offset,$YCenter+$vecY*-$offset),
+ );
+ $this->addPolyToImageMap($poly,$Label,$tooltipValue,'Radar');
+ }
+ }
+ }
+
+ /* Write the values */
+ for ( $t=1; $t<=$MaxValue; $t++)
+ {
+ if ($t % $valueMod != 0)
+ { continue; }
+
+ $TRadius = ( $Radius / $MaxValue ) * $t;
+
+ $Angle = -90 + 360 / $Points;
+ $X1 = $XCenter;
+ $Y1 = $YCenter - $TRadius;
+ $X2 = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter;
+ $Y2 = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter;
+
+ $XPos = floor(($X2-$X1)/2) + $X1;
+ $YPos = floor(($Y2-$Y1)/2) + $Y1;
+
+ $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$t);
+ $X = $XPos - ( $X+$Positions[2] - $X+$Positions[6] ) / 2;
+ $Y = $YPos + $this->FontSize;
+
+ $this->drawFilledRoundedRectangle($X+$Positions[6]-2,$Y+$Positions[7]-1,$X+$Positions[2]+4,$Y+$Positions[3]+1,2,240,240,240);
+ $this->drawRoundedRectangle($X+$Positions[6]-2,$Y+$Positions[7]-1,$X+$Positions[2]+4,$Y+$Positions[3]+1,2,220,220,220);
+ imagettftext($this->Picture,$this->FontSize,0,$X,$Y,$C_TextColor,$this->FontName,$t);
+ }
+ }
+
+ /* This function draw a radar graph centered on the graph area */
+ function drawRadar($Data,$DataDescription,$BorderOffset=10,$MaxValue=-1)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawRadar",$DataDescription);
+ $this->validateData("drawRadar",$Data);
+
+ $Points = count($Data);
+ $Radius = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset;
+ $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2 + $this->GArea_X1;
+ $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 + $this->GArea_Y1;
+
+ /* Search for the max value */
+ if ( $MaxValue == -1 )
+ {
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ if ( $Data[$Key][$ColName] > $MaxValue ) { $MaxValue = $Data[$Key][$ColName]; }
+ }
+ }
+ }
+
+ $GraphID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $Angle = -90;
+ $XLast = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ {
+ $Value = $Data[$Key][$ColName];
+ $Strength = ( $Radius / $MaxValue ) * $Value;
+
+ $XPos = cos($Angle * 3.1418 / 180 ) * $Strength + $XCenter;
+ $YPos = sin($Angle * 3.1418 / 180 ) * $Strength + $YCenter;
+
+ if ( $XLast != -1 )
+ $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+
+ if ( $XLast == -1 )
+ { $FirstX = $XPos; $FirstY = $YPos; }
+
+ $Angle = $Angle + (360/$Points);
+ $XLast = $XPos;
+ $YLast = $YPos;
+ }
+ }
+ $this->drawLine($XPos,$YPos,$FirstX,$FirstY,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ $GraphID++;
+ }
+ }
+
+ /* This function draw a radar graph centered on the graph area */
+ function drawFilledRadar($Data,$DataDescription,$Alpha=50,$BorderOffset=10,$MaxValue=-1)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawFilledRadar",$DataDescription);
+ $this->validateData("drawFilledRadar",$Data);
+
+ $Points = count($Data);
+ $LayerWidth = $this->GArea_X2-$this->GArea_X1;
+ $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
+ $Radius = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset;
+ $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2;
+ $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2;
+
+ /* Search for the max value */
+ if ( $MaxValue == -1 )
+ {
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ if ( $Data[$Key][$ColName] > $MaxValue && is_numeric($Data[$Key][$ColName])) { $MaxValue = $Data[$Key][$ColName]; }
+ }
+ }
+ }
+
+ $GraphID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $Angle = -90;
+ $XLast = -1;
+ $Plots = "";
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ {
+ $Value = $Data[$Key][$ColName];
+ if ( !is_numeric($Value) ) { $Value = 0; }
+ $Strength = ( $Radius / $MaxValue ) * $Value;
+
+ $XPos = cos($Angle * 3.1418 / 180 ) * $Strength + $XCenter;
+ $YPos = sin($Angle * 3.1418 / 180 ) * $Strength + $YCenter;
+
+ $Plots[] = $XPos;
+ $Plots[] = $YPos;
+
+ $Angle = $Angle + (360/$Points);
+ $XLast = $XPos;
+ $YLast = $YPos;
+ }
+ }
+
+ if (isset($Plots[0]))
+ {
+ $Plots[] = $Plots[0];
+ $Plots[] = $Plots[1];
+
+ $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
+ $C_White = $this->AllocateColor($this->Layers[0],255,255,255);
+ imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
+ imagecolortransparent($this->Layers[0],$C_White);
+
+ $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ imagefilledpolygon($this->Layers[0],$Plots,(count($Plots)+1)/2,$C_Graph);
+
+ imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
+ imagedestroy($this->Layers[0]);
+
+ for($i=0;$i<=count($Plots)-4;$i=$i+2)
+ $this->drawLine($Plots[$i]+$this->GArea_X1,$Plots[$i+1]+$this->GArea_Y1,$Plots[$i+2]+$this->GArea_X1,$Plots[$i+3]+$this->GArea_Y1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ }
+
+ $GraphID++;
+ }
+ }
+
+ /* This function draw a flat pie chart */
+ function drawBasicPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$R=255,$G=255,$B=255,$Decimals=0)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawBasicPieGraph",$DataDescription,FALSE);
+ $this->validateData("drawBasicPieGraph",$Data);
+
+ /* Determine pie sum */
+ $Series = 0; $PieSum = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ if ( $ColName != $DataDescription["Position"] )
+ {
+ $Series++;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ $PieSum = $PieSum + $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]];
+ }
+ }
+ }
+
+ /* Validate serie */
+ if ( $Series != 1 )
+ RaiseFatal("Pie chart can only accept one serie of data.");
+
+ $SpliceRatio = 360 / $PieSum;
+ $SplicePercent = 100 / $PieSum;
+
+ /* Calculate all polygons */
+ $Angle = 0; $TopPlots = "";
+ foreach($iValues as $Key => $Value)
+ {
+ $TopPlots[$Key][] = $XPos;
+ $TopPlots[$Key][] = $YPos;
+
+ /* Process labels position & size */
+ $Caption = "";
+ if ( !($DrawLabels == PIE_NOLABEL) )
+ {
+ $TAngle = $Angle+($Value*$SpliceRatio/2);
+ if ($DrawLabels == PIE_PERCENTAGE)
+ $Caption = (round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
+ elseif ($DrawLabels == PIE_LABELS)
+ $Caption = $iLabels[$Key];
+ elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
+ $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
+ elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
+ $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
+
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
+ $TextWidth = $Position[2]-$Position[0];
+ $TextHeight = abs($Position[1])+abs($Position[3]);
+
+ $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $XPos;
+
+ if ( $TAngle > 0 && $TAngle < 180 )
+ $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $YPos + 4;
+ else
+ $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+4) + $YPos - ($TextHeight/2);
+
+ if ( $TAngle > 90 && $TAngle < 270 )
+ $TX = $TX - $TextWidth;
+
+ $C_TextColor = $this->AllocateColor($this->Picture,70,70,70);
+ imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
+ }
+
+ /* Process pie slices */
+ for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
+ {
+ $TopX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos;
+ $TopY = sin($iAngle * 3.1418 / 180 ) * $Radius + $YPos;
+
+ $TopPlots[$Key][] = $TopX;
+ $TopPlots[$Key][] = $TopY;
+ }
+
+ $TopPlots[$Key][] = $XPos;
+ $TopPlots[$Key][] = $YPos;
+
+ $Angle = $iAngle;
+ }
+ $PolyPlots = $TopPlots;
+
+ /* Set array values type to float --- PHP Bug with imagefilledpolygon casting to integer */
+ foreach ($TopPlots as $Key => $Value)
+ { foreach ($TopPlots[$Key] as $Key2 => $Value2) { settype($TopPlots[$Key][$Key2],"float"); } }
+
+ /* Draw Top polygons */
+ foreach ($PolyPlots as $Key => $Value)
+ {
+ $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
+ imagefilledpolygon($this->Picture,$PolyPlots[$Key],(count($PolyPlots[$Key])+1)/2,$C_GraphLo);
+ }
+
+ $this->drawCircle($XPos-.5,$YPos-.5,$Radius,$R,$G,$B);
+ $this->drawCircle($XPos-.5,$YPos-.5,$Radius+.5,$R,$G,$B);
+
+ /* Draw Top polygons */
+ foreach ($TopPlots as $Key => $Value)
+ {
+ for($j=0;$j<=count($TopPlots[$Key])-4;$j=$j+2)
+ $this->drawLine($TopPlots[$Key][$j],$TopPlots[$Key][$j+1],$TopPlots[$Key][$j+2],$TopPlots[$Key][$j+3],$R,$G,$B);
+ }
+ }
+
+ function drawFlatPieGraphWithShadow($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals=0)
+ {
+ $this->drawFlatPieGraph($Data,$DataDescription,$XPos+$this->ShadowXDistance,$YPos+$this->ShadowYDistance,$Radius,PIE_NOLABEL,$SpliceDistance,$Decimals,TRUE);
+ $this->drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius,$DrawLabels,$SpliceDistance,$Decimals,FALSE);
+ }
+
+ /* This function draw a flat pie chart */
+ function drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals=0,$AllBlack=FALSE)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawFlatPieGraph",$DataDescription,FALSE);
+ $this->validateData("drawFlatPieGraph",$Data);
+
+ $ShadowStatus = $this->ShadowActive ; $this->ShadowActive = FALSE;
+
+ /* Determine pie sum */
+ $Series = 0; $PieSum = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ if ( $ColName != $DataDescription["Position"] )
+ {
+ $Series++;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ $PieSum = $PieSum + $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]];
+ }
+ }
+ }
+
+ /* Validate serie */
+ if ( $Series != 1 )
+ {
+ RaiseFatal("Pie chart can only accept one serie of data.");
+ return(0);
+ }
+
+ $SpliceRatio = 360 / $PieSum;
+ $SplicePercent = 100 / $PieSum;
+
+ /* Calculate all polygons */
+ $Angle = 0; $TopPlots = "";
+ foreach($iValues as $Key => $Value)
+ {
+ $XOffset = cos(($Angle+($Value/2*$SpliceRatio)) * 3.1418 / 180 ) * $SpliceDistance;
+ $YOffset = sin(($Angle+($Value/2*$SpliceRatio)) * 3.1418 / 180 ) * $SpliceDistance;
+
+ $TopPlots[$Key][] = round($XPos + $XOffset);
+ $TopPlots[$Key][] = round($YPos + $YOffset);
+
+ if ( $AllBlack )
+ { $Rc = $this->ShadowRColor; $Gc = $this->ShadowGColor; $Bc = $this->ShadowBColor; }
+ else
+ { $Rc = $this->Palette[$Key]["R"]; $Gc = $this->Palette[$Key]["G"]; $Bc = $this->Palette[$Key]["B"]; }
+
+ $XLineLast = ""; $YLineLast = "";
+
+ /* Process labels position & size */
+ $Caption = "";
+ if ( !($DrawLabels == PIE_NOLABEL) )
+ {
+ $TAngle = $Angle+($Value*$SpliceRatio/2);
+ if ($DrawLabels == PIE_PERCENTAGE)
+ $Caption = (round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
+ elseif ($DrawLabels == PIE_LABELS)
+ $Caption = $iLabels[$Key];
+ elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
+ $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
+ elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
+ $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
+
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
+ $TextWidth = $Position[2]-$Position[0];
+ $TextHeight = abs($Position[1])+abs($Position[3]);
+
+ $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius+10+$SpliceDistance) + $XPos;
+
+ if ( $TAngle > 0 && $TAngle < 180 )
+ $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+10+$SpliceDistance) + $YPos + 4;
+ else
+ $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+$SpliceDistance+4) + $YPos - ($TextHeight/2);
+
+ if ( $TAngle > 90 && $TAngle < 270 )
+ $TX = $TX - $TextWidth;
+
+ $C_TextColor = $this->AllocateColor($this->Picture,70,70,70);
+ imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
+ }
+
+ /* Process pie slices */
+ if ( !$AllBlack )
+ $LineColor = $this->AllocateColor($this->Picture,$Rc,$Gc,$Bc);
+ else
+ $LineColor = $this->AllocateColor($this->Picture,$Rc,$Gc,$Bc);
+
+ $XLineLast = ""; $YLineLast = "";
+ for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
+ {
+ $PosX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos + $XOffset;
+ $PosY = sin($iAngle * 3.1418 / 180 ) * $Radius + $YPos + $YOffset;
+
+ $TopPlots[$Key][] = round($PosX); $TopPlots[$Key][] = round($PosY);
+
+ if ( $iAngle == $Angle || $iAngle == $Angle+$Value*$SpliceRatio || $iAngle +.5 > $Angle+$Value*$SpliceRatio)
+ $this->drawLine($XPos+$XOffset,$YPos+$YOffset,$PosX,$PosY,$Rc,$Gc,$Bc);
+
+ if ( $XLineLast != "" )
+ $this->drawLine($XLineLast,$YLineLast,$PosX,$PosY,$Rc,$Gc,$Bc);
+
+ $XLineLast = $PosX; $YLineLast = $PosY;
+ }
+
+ $TopPlots[$Key][] = round($XPos + $XOffset); $TopPlots[$Key][] = round($YPos + $YOffset);
+
+ $Angle = $iAngle;
+ }
+ $PolyPlots = $TopPlots;
+
+ /* Draw Top polygons */
+ foreach ($PolyPlots as $Key => $Value)
+ {
+ if ( !$AllBlack )
+ $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
+ else
+ $C_GraphLo = $this->AllocateColor($this->Picture,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor);
+
+ imagefilledpolygon($this->Picture,$PolyPlots[$Key],(count($PolyPlots[$Key])+1)/2,$C_GraphLo);
+ }
+ $this->ShadowActive = $ShadowStatus;
+ }
+
+ /* This function draw a pseudo-3D pie chart */
+ function drawPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$EnhanceColors=TRUE,$Skew=60,$SpliceHeight=20,$SpliceDistance=0,$Decimals=0)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawPieGraph",$DataDescription,FALSE);
+ $this->validateData("drawPieGraph",$Data);
+
+ /* Determine pie sum */
+ $Series = 0; $PieSum = 0; $rPieSum = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ if ( $ColName != $DataDescription["Position"] )
+ {
+ $Series++;
+ foreach ( $Data as $Key => $Values )
+ if ( isset($Data[$Key][$ColName]))
+ {
+ if ( $Data[$Key][$ColName] == 0 )
+ { $iValues[] = 0; $rValues[] = 0; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; }
+ // Removed : $PieSum++; $rValues[] = 1;
+ else
+ { $PieSum += $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; $rValues[] = $Data[$Key][$ColName]; $rPieSum += $Data[$Key][$ColName];}
+ }
+ }
+ }
+
+ /* Validate serie */
+ if ( $Series != 1 )
+ RaiseFatal("Pie chart can only accept one serie of data.");
+
+ $SpliceDistanceRatio = $SpliceDistance;
+ $SkewHeight = ($Radius * $Skew) / 100;
+ $SpliceRatio = (360 - $SpliceDistanceRatio * count($iValues) ) / $PieSum;
+ $SplicePercent = 100 / $PieSum;
+ $rSplicePercent = 100 / $rPieSum;
+
+ /* Calculate all polygons */
+ $Angle = 0; $CDev = 5;
+ $TopPlots = ""; $BotPlots = "";
+ $aTopPlots = ""; $aBotPlots = "";
+ foreach($iValues as $Key => $Value)
+ {
+ $XCenterPos = cos(($Angle-$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $XPos;
+ $YCenterPos = sin(($Angle-$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $YPos;
+ $XCenterPos2 = cos(($Angle+$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $XPos;
+ $YCenterPos2 = sin(($Angle+$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $YPos;
+
+ $TopPlots[$Key][] = round($XCenterPos); $BotPlots[$Key][] = round($XCenterPos);
+ $TopPlots[$Key][] = round($YCenterPos); $BotPlots[$Key][] = round($YCenterPos + $SpliceHeight);
+ $aTopPlots[$Key][] = $XCenterPos; $aBotPlots[$Key][] = $XCenterPos;
+ $aTopPlots[$Key][] = $YCenterPos; $aBotPlots[$Key][] = $YCenterPos + $SpliceHeight;
+
+ /* Process labels position & size */
+ $Caption = "";
+ if ( !($DrawLabels == PIE_NOLABEL) )
+ {
+ $TAngle = $Angle+($Value*$SpliceRatio/2);
+ if ($DrawLabels == PIE_PERCENTAGE)
+ $Caption = (round($rValues[$Key] * pow(10,$Decimals) * $rSplicePercent)/pow(10,$Decimals))."%";
+ elseif ($DrawLabels == PIE_LABELS)
+ $Caption = $iLabels[$Key];
+ elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
+ $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
+
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
+ $TextWidth = $Position[2]-$Position[0];
+ $TextHeight = abs($Position[1])+abs($Position[3]);
+
+ $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius + 10)+ $XPos;
+
+ if ( $TAngle > 0 && $TAngle < 180 )
+ $TY = sin(($TAngle) * 3.1418 / 180 ) * ($SkewHeight + 10) + $YPos + $SpliceHeight + 4;
+ else
+ $TY = sin(($TAngle) * 3.1418 / 180 ) * ($SkewHeight + 4) + $YPos - ($TextHeight/2);
+
+ if ( $TAngle > 90 && $TAngle < 270 )
+ $TX = $TX - $TextWidth;
+
+ $C_TextColor = $this->AllocateColor($this->Picture,70,70,70);
+ imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
+ }
+
+ /* Process pie slices */
+ for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
+ {
+ $TopX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos;
+ $TopY = sin($iAngle * 3.1418 / 180 ) * $SkewHeight + $YPos;
+
+ $TopPlots[$Key][] = round($TopX); $BotPlots[$Key][] = round($TopX);
+ $TopPlots[$Key][] = round($TopY); $BotPlots[$Key][] = round($TopY + $SpliceHeight);
+ $aTopPlots[$Key][] = $TopX; $aBotPlots[$Key][] = $TopX;
+ $aTopPlots[$Key][] = $TopY; $aBotPlots[$Key][] = $TopY + $SpliceHeight;
+ }
+
+ $TopPlots[$Key][] = round($XCenterPos2); $BotPlots[$Key][] = round($XCenterPos2);
+ $TopPlots[$Key][] = round($YCenterPos2); $BotPlots[$Key][] = round($YCenterPos2 + $SpliceHeight);
+ $aTopPlots[$Key][] = $XCenterPos2; $aBotPlots[$Key][] = $XCenterPos2;
+ $aTopPlots[$Key][] = $YCenterPos2; $aBotPlots[$Key][] = $YCenterPos2 + $SpliceHeight;
+
+ $Angle = $iAngle + $SpliceDistanceRatio;
+ }
+
+ /* Draw Bottom polygons */
+ foreach($iValues as $Key => $Value)
+ {
+ $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"],-20);
+ imagefilledpolygon($this->Picture,$BotPlots[$Key],(count($BotPlots[$Key])+1)/2,$C_GraphLo);
+
+ if ( $EnhanceColors ) { $En = -10; } else { $En = 0; }
+
+ for($j=0;$j<=count($aBotPlots[$Key])-4;$j=$j+2)
+ $this->drawLine($aBotPlots[$Key][$j],$aBotPlots[$Key][$j+1],$aBotPlots[$Key][$j+2],$aBotPlots[$Key][$j+3],$this->Palette[$Key]["R"]+$En,$this->Palette[$Key]["G"]+$En,$this->Palette[$Key]["B"]+$En);
+ }
+
+ /* Draw pie layers */
+ if ( $EnhanceColors ) { $ColorRatio = 30 / $SpliceHeight; } else { $ColorRatio = 25 / $SpliceHeight; }
+ for($i=$SpliceHeight-1;$i>=1;$i--)
+ {
+ foreach($iValues as $Key => $Value)
+ {
+ $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"],-10);
+ $Plots = ""; $Plot = 0;
+ foreach($TopPlots[$Key] as $Key2 => $Value2)
+ {
+ $Plot++;
+ if ( $Plot % 2 == 1 )
+ $Plots[] = $Value2;
+ else
+ $Plots[] = $Value2+$i;
+ }
+ imagefilledpolygon($this->Picture,$Plots,(count($Plots)+1)/2,$C_GraphLo);
+
+ $Index = count($Plots);
+ if ($EnhanceColors ) {$ColorFactor = -20 + ($SpliceHeight - $i) * $ColorRatio; } else { $ColorFactor = 0; }
+
+ $this->drawAntialiasPixel($Plots[0],$Plots[1],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor);
+ $this->drawAntialiasPixel($Plots[2],$Plots[3],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor);
+ $this->drawAntialiasPixel($Plots[$Index-4],$Plots[$Index-3],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor);
+ }
+ }
+
+ if ( $this->BuildMap )
+ {
+ // Add points to Image Map.
+ foreach ($TopPlots as $key => $PointArr)
+ {
+ $serieName = $Data[$key][$DataDescription['Values'][1]];
+ $serieValue = $Data[$key][$DataDescription['Values'][0]];
+
+ // last point of the arc
+ $lastX = $PointArr[count($PointArr)-4];
+ $lastY = $PointArr[count($PointArr)-3];
+
+ // the point at the middle
+ $middleX = $PointArr[0];
+ $middleY = $PointArr[1];
+
+ // first point in the arc
+ $firstX = $PointArr[2];
+ $firstY = $PointArr[3];
+
+ // point on the first third of the arc
+ $firstThird = count($PointArr)/3;
+ $firstThirdX = $PointArr[$firstThird + ($firstThird % 2)];
+ $firstThirdY = $PointArr[$firstThird + ($firstThird % 2)+1];
+
+ // point on the second third of the arc
+ $secondThird = count($PointArr)/3*2;
+ $secondThirdX = $PointArr[$secondThird + ($secondThird % 2)];
+ $secondThirdY = $PointArr[$secondThird + ($secondThird % 2)+1];
+
+ // Will create three polygons for every piece of the pie. In such way
+ // no polygon will be concave. JS only works with convex polygons.
+ $poly = array(
+ array($middleX,$middleY),
+ array($firstX,$firstY),
+ array($firstThirdX,$firstThirdY),
+ );
+ $this->addPolyToImageMap($poly,$serieName,$serieValue,"Pie");
+
+ $poly = array(
+ array($middleX,$middleY),
+ array($firstThirdX,$firstThirdY),
+ array($secondThirdX,$secondThirdY),
+ );
+ $this->addPolyToImageMap($poly,$serieName,$serieValue,"Pie");
+
+ $poly = array(
+ array($middleX,$middleY),
+ array($secondThirdX,$secondThirdY),
+ array($lastX,$lastY),
+ );
+ $this->addPolyToImageMap($poly,$serieName,$serieValue,"Pie");
+ }
+ }
+
+ /* Draw Top polygons */
+ for($Key=count($iValues)-1;$Key>=0;$Key--)
+ {
+ $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
+ imagefilledpolygon($this->Picture,$TopPlots[$Key],(count($TopPlots[$Key])+1)/2,$C_GraphLo);
+
+ if ( $EnhanceColors ) { $En = 10; } else { $En = 0; }
+ for($j=0;$j<=count($aTopPlots[$Key])-4;$j=$j+2)
+ $this->drawLine($aTopPlots[$Key][$j],$aTopPlots[$Key][$j+1],$aTopPlots[$Key][$j+2],$aTopPlots[$Key][$j+3],$this->Palette[$Key]["R"]+$En,$this->Palette[$Key]["G"]+$En,$this->Palette[$Key]["B"]+$En);
+ }
+ }
+
+ /* This function can be used to set the background color */
+ function drawBackground($R,$G,$B)
+ {
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B);
+ imagefilledrectangle($this->Picture,0,0,$this->XSize,$this->YSize,$C_Background);
+ }
+
+ /* This function can be used to set the background color */
+ function drawGraphAreaGradient($R,$G,$B,$Decay,$Target=TARGET_GRAPHAREA)
+ {
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ if ( $Target == TARGET_GRAPHAREA ) { $X1 = $this->GArea_X1+1; $X2 = $this->GArea_X2-1; $Y1 = $this->GArea_Y1+1; $Y2 = $this->GArea_Y2; }
+ if ( $Target == TARGET_BACKGROUND ) { $X1 = 0; $X2 = $this->XSize; $Y1 = 0; $Y2 = $this->YSize; }
+
+ /* Positive gradient */
+ if ( $Decay > 0 )
+ {
+ $YStep = ($Y2 - $Y1 - 2) / $Decay;
+ for($i=0;$i<=$Decay;$i++)
+ {
+ $R-=1;$G-=1;$B-=1;
+ $Yi1 = $Y1 + ( $i * $YStep );
+ $Yi2 = ceil( $Yi1 + ( $i * $YStep ) + $YStep );
+ if ( $Yi2 >= $Yi2 ) { $Yi2 = $Y2-1; }
+
+ $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B);
+ imagefilledrectangle($this->Picture,$X1,$Yi1,$X2,$Yi2,$C_Background);
+ }
+ }
+
+ /* Negative gradient */
+ if ( $Decay < 0 )
+ {
+ $YStep = ($Y2 - $Y1 - 2) / -$Decay;
+ $Yi1 = $Y1; $Yi2 = $Y1+$YStep;
+ for($i=-$Decay;$i>=0;$i--)
+ {
+ $R+=1;$G+=1;$B+=1;
+ $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B);
+ imagefilledrectangle($this->Picture,$X1,$Yi1,$X2,$Yi2,$C_Background);
+
+ $Yi1+= $YStep;
+ $Yi2+= $YStep;
+ if ( $Yi2 >= $Yi2 ) { $Yi2 = $Y2-1; }
+ }
+ }
+ }
+
+ /* This function create a rectangle with antialias */
+ function drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B)
+ {
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
+
+ $X1=$X1-.2;$Y1=$Y1-.2;
+ $X2=$X2+.2;$Y2=$Y2+.2;
+ $this->drawLine($X1,$Y1,$X2,$Y1,$R,$G,$B);
+ $this->drawLine($X2,$Y1,$X2,$Y2,$R,$G,$B);
+ $this->drawLine($X2,$Y2,$X1,$Y2,$R,$G,$B);
+ $this->drawLine($X1,$Y2,$X1,$Y1,$R,$G,$B);
+ }
+
+ /* This function create a filled rectangle with antialias */
+ function drawFilledRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B,$DrawBorder=TRUE,$Alpha=100,$NoFallBack=FALSE)
+ {
+ if ( $X2 < $X1 ) { list($X1, $X2) = array($X2, $X1); }
+ if ( $Y2 < $Y1 ) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ if ( $Alpha == 100 )
+ {
+ /* Process shadows */
+ if ( $this->ShadowActive && !$NoFallBack )
+ {
+ $this->drawFilledRectangle($X1+$this->ShadowXDistance,$Y1+$this->ShadowYDistance,$X2+$this->ShadowXDistance,$Y2+$this->ShadowYDistance,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha,TRUE);
+ if ( $this->ShadowBlur != 0 )
+ {
+ $AlphaDecay = ($this->ShadowAlpha / $this->ShadowBlur);
+
+ for($i=1; $i<=$this->ShadowBlur; $i++)
+ $this->drawFilledRectangle($X1+$this->ShadowXDistance-$i/2,$Y1+$this->ShadowYDistance-$i/2,$X2+$this->ShadowXDistance-$i/2,$Y2+$this->ShadowYDistance-$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
+ for($i=1; $i<=$this->ShadowBlur; $i++)
+ $this->drawFilledRectangle($X1+$this->ShadowXDistance+$i/2,$Y1+$this->ShadowYDistance+$i/2,$X2+$this->ShadowXDistance+$i/2,$Y2+$this->ShadowYDistance+$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
+ }
+ }
+
+ $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
+ imagefilledrectangle($this->Picture,round($X1),round($Y1),round($X2),round($Y2),$C_Rectangle);
+ }
+ else
+ {
+ $LayerWidth = abs($X2-$X1)+2;
+ $LayerHeight = abs($Y2-$Y1)+2;
+
+ $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
+ $C_White = $this->AllocateColor($this->Layers[0],255,255,255);
+ imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
+ imagecolortransparent($this->Layers[0],$C_White);
+
+ $C_Rectangle = $this->AllocateColor($this->Layers[0],$R,$G,$B);
+ imagefilledrectangle($this->Layers[0],round(1),round(1),round($LayerWidth-1),round($LayerHeight-1),$C_Rectangle);
+
+ imagecopymerge($this->Picture,$this->Layers[0],round(min($X1,$X2)-1),round(min($Y1,$Y2)-1),0,0,$LayerWidth,$LayerHeight,$Alpha);
+ imagedestroy($this->Layers[0]);
+ }
+
+ if ( $DrawBorder )
+ {
+ $ShadowSettings = $this->ShadowActive; $this->ShadowActive = FALSE;
+ $this->drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B);
+ $this->ShadowActive = $ShadowSettings;
+ }
+ }
+
+ /* This function create a rectangle with rounded corners and antialias */
+ function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
+ {
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
+
+ $Step = 90 / ((3.1418 * $Radius)/2);
+
+ for($i=0;$i<=90;$i=$i+$Step)
+ {
+ $X = cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius;
+ $Y = sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius;
+ $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
+
+ $X = cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius;
+ $Y = sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius;
+ $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
+
+ $X = cos(($i)*3.1418/180) * $Radius + $X2 - $Radius;
+ $Y = sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius;
+ $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
+
+ $X = cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius;
+ $Y = sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius;
+ $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
+ }
+
+ $X1=$X1-.2;$Y1=$Y1-.2;
+ $X2=$X2+.2;$Y2=$Y2+.2;
+ $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$R,$G,$B);
+ $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$R,$G,$B);
+ $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$R,$G,$B);
+ $this->drawLine($X1,$Y2-$Radius,$X1,$Y1+$Radius,$R,$G,$B);
+ }
+
+ /* This function create a filled rectangle with rounded corners and antialias */
+ function drawFilledRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
+ {
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
+
+ $Step = 90 / ((3.1418 * $Radius)/2);
+
+ for($i=0;$i<=90;$i=$i+$Step)
+ {
+ $Xi1 = cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius;
+ $Yi1 = sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius;
+
+ $Xi2 = cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius;
+ $Yi2 = sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius;
+
+ $Xi3 = cos(($i)*3.1418/180) * $Radius + $X2 - $Radius;
+ $Yi3 = sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius;
+
+ $Xi4 = cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius;
+ $Yi4 = sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius;
+
+ imageline($this->Picture,$Xi1,$Yi1,$X1+$Radius,$Yi1,$C_Rectangle);
+ imageline($this->Picture,$X2-$Radius,$Yi2,$Xi2,$Yi2,$C_Rectangle);
+ imageline($this->Picture,$X2-$Radius,$Yi3,$Xi3,$Yi3,$C_Rectangle);
+ imageline($this->Picture,$Xi4,$Yi4,$X1+$Radius,$Yi4,$C_Rectangle);
+
+ $this->drawAntialiasPixel($Xi1,$Yi1,$R,$G,$B);
+ $this->drawAntialiasPixel($Xi2,$Yi2,$R,$G,$B);
+ $this->drawAntialiasPixel($Xi3,$Yi3,$R,$G,$B);
+ $this->drawAntialiasPixel($Xi4,$Yi4,$R,$G,$B);
+ }
+
+ imagefilledrectangle($this->Picture,$X1,$Y1+$Radius,$X2,$Y2-$Radius,$C_Rectangle);
+ imagefilledrectangle($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y2,$C_Rectangle);
+
+ $X1=$X1-.2;$Y1=$Y1-.2;
+ $X2=$X2+.2;$Y2=$Y2+.2;
+ $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$R,$G,$B);
+ $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$R,$G,$B);
+ $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$R,$G,$B);
+ $this->drawLine($X1,$Y2-$Radius,$X1,$Y1+$Radius,$R,$G,$B);
+ }
+
+ /* This function create a circle with antialias */
+ function drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
+ {
+ if ( $Width == 0 ) { $Width = $Height; }
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $C_Circle = $this->AllocateColor($this->Picture,$R,$G,$B);
+ $Step = 360 / (2 * 3.1418 * max($Width,$Height));
+
+ for($i=0;$i<=360;$i=$i+$Step)
+ {
+ $X = cos($i*3.1418/180) * $Height + $Xc;
+ $Y = sin($i*3.1418/180) * $Width + $Yc;
+ $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
+ }
+ }
+
+ /* This function create a filled circle/ellipse with antialias */
+ function drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
+ {
+ if ( $Width == 0 ) { $Width = $Height; }
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $C_Circle = $this->AllocateColor($this->Picture,$R,$G,$B);
+ $Step = 360 / (2 * 3.1418 * max($Width,$Height));
+
+ for($i=90;$i<=270;$i=$i+$Step)
+ {
+ $X1 = cos($i*3.1418/180) * $Height + $Xc;
+ $Y1 = sin($i*3.1418/180) * $Width + $Yc;
+ $X2 = cos((180-$i)*3.1418/180) * $Height + $Xc;
+ $Y2 = sin((180-$i)*3.1418/180) * $Width + $Yc;
+
+ $this->drawAntialiasPixel($X1-1,$Y1-1,$R,$G,$B);
+ $this->drawAntialiasPixel($X2-1,$Y2-1,$R,$G,$B);
+
+ if ( ($Y1-1) > $Yc - max($Width,$Height) )
+ imageline($this->Picture,$X1,$Y1-1,$X2-1,$Y2-1,$C_Circle);
+ }
+ }
+
+ /* This function will draw a filled ellipse */
+ function drawEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
+ { $this->drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width); }
+
+ /* This function will draw an ellipse */
+ function drawFilledEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
+ { $this->drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width); }
+
+ /* This function create a line with antialias */
+ function drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction=FALSE)
+ {
+ if ( $this->LineDotSize > 1 ) { $this->drawDottedLine($X1,$Y1,$X2,$Y2,$this->LineDotSize,$R,$G,$B,$GraphFunction); return(0); }
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));
+ if ( $Distance == 0 )
+ return(-1);
+ $XStep = ($X2-$X1) / $Distance;
+ $YStep = ($Y2-$Y1) / $Distance;
+
+ for($i=0;$i<=$Distance;$i++)
+ {
+ $X = $i * $XStep + $X1;
+ $Y = $i * $YStep + $Y1;
+
+ if ( ($X >= $this->GArea_X1 && $X <= $this->GArea_X2 && $Y >= $this->GArea_Y1 && $Y <= $this->GArea_Y2) || !$GraphFunction )
+ {
+ if ( $this->LineWidth == 1 )
+ $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
+ else
+ {
+ $StartOffset = -($this->LineWidth/2); $EndOffset = ($this->LineWidth/2);
+ for($j=$StartOffset;$j<=$EndOffset;$j++)
+ $this->drawAntialiasPixel($X+$j,$Y+$j,$R,$G,$B);
+ }
+ }
+ }
+ }
+
+ /* This function create a line with antialias */
+ function drawDottedLine($X1,$Y1,$X2,$Y2,$DotSize,$R,$G,$B,$GraphFunction=FALSE)
+ {
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));
+
+ $XStep = ($X2-$X1) / $Distance;
+ $YStep = ($Y2-$Y1) / $Distance;
+
+ $DotIndex = 0;
+ for($i=0;$i<=$Distance;$i++)
+ {
+ $X = $i * $XStep + $X1;
+ $Y = $i * $YStep + $Y1;
+
+ if ( $DotIndex <= $DotSize)
+ {
+ if ( ($X >= $this->GArea_X1 && $X <= $this->GArea_X2 && $Y >= $this->GArea_Y1 && $Y <= $this->GArea_Y2) || !$GraphFunction )
+ {
+ if ( $this->LineWidth == 1 )
+ $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
+ else
+ {
+ $StartOffset = -($this->LineWidth/2); $EndOffset = ($this->LineWidth/2);
+ for($j=$StartOffset;$j<=$EndOffset;$j++)
+ $this->drawAntialiasPixel($X+$j,$Y+$j,$R,$G,$B);
+ }
+ }
+ }
+
+ $DotIndex++;
+ if ( $DotIndex == $DotSize * 2 )
+ $DotIndex = 0;
+ }
+ }
+
+ /* Load a PNG file and draw it over the chart */
+ function drawFromPNG($FileName,$X,$Y,$Alpha=100)
+ { $this->drawFromPicture(1,$FileName,$X,$Y,$Alpha); }
+
+ /* Load a GIF file and draw it over the chart */
+ function drawFromGIF($FileName,$X,$Y,$Alpha=100)
+ { $this->drawFromPicture(2,$FileName,$X,$Y,$Alpha); }
+
+ /* Load a JPEG file and draw it over the chart */
+ function drawFromJPG($FileName,$X,$Y,$Alpha=100)
+ { $this->drawFromPicture(3,$FileName,$X,$Y,$Alpha); }
+
+ /* Generic loader function for external pictures */
+ function drawFromPicture($PicType,$FileName,$X,$Y,$Alpha=100)
+ {
+ if ( file_exists($FileName))
+ {
+ $Infos = getimagesize($FileName);
+ $Width = $Infos[0];
+ $Height = $Infos[1];
+ if ( $PicType == 1 ) { $Raster = imagecreatefrompng($FileName); }
+ if ( $PicType == 2 ) { $Raster = imagecreatefromgif($FileName); }
+ if ( $PicType == 3 ) { $Raster = imagecreatefromjpeg($FileName); }
+
+ imagecopymerge($this->Picture,$Raster,$X,$Y,0,0,$Width,$Height,$Alpha);
+ imagedestroy($Raster);
+ }
+ }
+
+ /* Draw an alpha pixel */
+ function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
+ {
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
+ return(-1);
+
+ $RGB2 = imagecolorat($this->Picture, $X, $Y);
+ $R2 = ($RGB2 >> 16) & 0xFF;
+ $G2 = ($RGB2 >> 8) & 0xFF;
+ $B2 = $RGB2 & 0xFF;
+
+ $iAlpha = (100 - $Alpha)/100;
+ $Alpha = $Alpha / 100;
+
+ $Ra = floor($R*$Alpha+$R2*$iAlpha);
+ $Ga = floor($G*$Alpha+$G2*$iAlpha);
+ $Ba = floor($B*$Alpha+$B2*$iAlpha);
+
+ $C_Aliased = $this->AllocateColor($this->Picture,$Ra,$Ga,$Ba);
+ imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
+ }
+
+ /* Color helper */
+ function AllocateColor($Picture,$R,$G,$B,$Factor=0)
+ {
+ $R = $R + $Factor;
+ $G = $G + $Factor;
+ $B = $B + $Factor;
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ return(imagecolorallocate($Picture,$R,$G,$B));
+ }
+
+ /* Add a border to the picture */
+ function addBorder($Size=3,$R=0,$G=0,$B=0)
+ {
+ $Width = $this->XSize+2*$Size;
+ $Height = $this->YSize+2*$Size;
+
+ $Resampled = imagecreatetruecolor($Width,$Height);
+ $C_Background = $this->AllocateColor($Resampled,$R,$G,$B);
+ imagefilledrectangle($Resampled,0,0,$Width,$Height,$C_Background);
+
+ imagecopy($Resampled,$this->Picture,$Size,$Size,0,0,$this->XSize,$this->YSize);
+ imagedestroy($this->Picture);
+
+ $this->XSize = $Width;
+ $this->YSize = $Height;
+
+ $this->Picture = imagecreatetruecolor($this->XSize,$this->YSize);
+ $C_White = $this->AllocateColor($this->Picture,255,255,255);
+ imagefilledrectangle($this->Picture,0,0,$this->XSize,$this->YSize,$C_White);
+ imagecolortransparent($this->Picture,$C_White);
+ imagecopy($this->Picture,$Resampled,0,0,0,0,$this->XSize,$this->YSize);
+ }
+
+ /* Render the current picture to a file */
+ function Render($FileName)
+ {
+ if ( $this->ErrorReporting )
+ $this->printErrors($this->ErrorInterface);
+
+ /* Save image map if requested */
+ if ( $this->BuildMap )
+ $this->SaveImageMap();
+
+ imagepng($this->Picture,$FileName);
+ }
+
+ /* Render the current picture to STDOUT */
+ function Stroke()
+ {
+ if ( $this->ErrorReporting )
+ $this->printErrors("GD");
+
+ /* Save image map if requested */
+ if ( $this->BuildMap )
+ $this->SaveImageMap();
+
+ header('Content-type: image/png');
+ imagepng($this->Picture);
+ }
+
+ /* Private functions for internal processing */
+ function drawAntialiasPixel($X,$Y,$R,$G,$B,$Alpha=100,$NoFallBack=FALSE)
+ {
+ /* Process shadows */
+ if ( $this->ShadowActive && !$NoFallBack )
+ {
+ $this->drawAntialiasPixel($X+$this->ShadowXDistance,$Y+$this->ShadowYDistance,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha,TRUE);
+ if ( $this->ShadowBlur != 0 )
+ {
+ $AlphaDecay = ($this->ShadowAlpha / $this->ShadowBlur);
+
+ for($i=1; $i<=$this->ShadowBlur; $i++)
+ $this->drawAntialiasPixel($X+$this->ShadowXDistance-$i/2,$Y+$this->ShadowYDistance-$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
+ for($i=1; $i<=$this->ShadowBlur; $i++)
+ $this->drawAntialiasPixel($X+$this->ShadowXDistance+$i/2,$Y+$this->ShadowYDistance+$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
+ }
+ }
+
+ if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+ if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+ if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+ $Plot = "";
+ $Xi = floor($X);
+ $Yi = floor($Y);
+
+ if ( $Xi == $X && $Yi == $Y)
+ {
+ if ( $Alpha == 100 )
+ {
+ $C_Aliased = $this->AllocateColor($this->Picture,$R,$G,$B);
+ imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
+ }
+ else
+ $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
+ }
+ else
+ {
+ $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
+ if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
+
+ $Alpha2 = ((($X - floor($X)) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
+ if ( $Alpha2 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi,$Alpha2,$R,$G,$B); }
+
+ $Alpha3 = (((1 - ($X - floor($X))) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
+ if ( $Alpha3 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi+1,$Alpha3,$R,$G,$B); }
+
+ $Alpha4 = ((($X - floor($X)) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
+ if ( $Alpha4 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi+1,$Alpha4,$R,$G,$B); }
+ }
+ }
+
+ /* Validate data contained in the description array */
+ function validateDataDescription($FunctionName,&$DataDescription,$DescriptionRequired=TRUE)
+ {
+ if (!isset($DataDescription["Position"]))
+ {
+ $this->Errors[] = "[Warning] ".$FunctionName." - Y Labels are not set.";
+ $DataDescription["Position"] = "Name";
+ }
+
+ if ( $DescriptionRequired )
+ {
+ if (!isset($DataDescription["Description"]))
+ {
+ $this->Errors[] = "[Warning] ".$FunctionName." - Series descriptions are not set.";
+ foreach($DataDescription["Values"] as $key => $Value)
+ {
+ $DataDescription["Description"][$Value] = $Value;
+ }
+ }
+
+ if (count($DataDescription["Description"]) < count($DataDescription["Values"]))
+ {
+ $this->Errors[] = "[Warning] ".$FunctionName." - Some series descriptions are not set.";
+ foreach($DataDescription["Values"] as $key => $Value)
+ {
+ if ( !isset($DataDescription["Description"][$Value]))
+ $DataDescription["Description"][$Value] = $Value;
+ }
+ }
+ }
+ }
+
+ /* Validate data contained in the data array */
+ function validateData($FunctionName,&$Data)
+ {
+ $DataSummary = array();
+
+ foreach($Data as $key => $Values)
+ {
+ foreach($Values as $key2 => $Value)
+ {
+ if (!isset($DataSummary[$key2]))
+ $DataSummary[$key2] = 1;
+ else
+ $DataSummary[$key2]++;
+ }
+ }
+
+ if ( max($DataSummary) == 0 )
+ $this->Errors[] = "[Warning] ".$FunctionName." - No data set.";
+
+ foreach($DataSummary as $key => $Value)
+ {
+ if ($Value < max($DataSummary))
+ {
+ $this->Errors[] = "[Warning] ".$FunctionName." - Missing data in serie ".$key.".";
+ }
+ }
+ }
+
+ /* Print all error messages on the CLI or graphically */
+ function printErrors($Mode="CLI")
+ {
+ if (count($this->Errors) == 0)
+ return(0);
+
+ if ( $Mode == "CLI" )
+ {
+ foreach($this->Errors as $key => $Value)
+ echo $Value."\r\n";
+ }
+ elseif ( $Mode == "GD" )
+ {
+ $this->setLineStyle($Width=1);
+ $MaxWidth = 0;
+ foreach($this->Errors as $key => $Value)
+ {
+ $Position = imageftbbox($this->ErrorFontSize,0,$this->ErrorFontName,$Value);
+ $TextWidth = $Position[2]-$Position[0];
+ if ( $TextWidth > $MaxWidth ) { $MaxWidth = $TextWidth; }
+ }
+ $this->drawFilledRoundedRectangle($this->XSize-($MaxWidth+20),$this->YSize-(20+(($this->ErrorFontSize+4)*count($this->Errors))),$this->XSize-10,$this->YSize-10,6,233,185,185);
+ $this->drawRoundedRectangle($this->XSize-($MaxWidth+20),$this->YSize-(20+(($this->ErrorFontSize+4)*count($this->Errors))),$this->XSize-10,$this->YSize-10,6,193,145,145);
+
+ $C_TextColor = $this->AllocateColor($this->Picture,133,85,85);
+ $YPos = $this->YSize - (18 + (count($this->Errors)-1) * ($this->ErrorFontSize + 4));
+ foreach($this->Errors as $key => $Value)
+ {
+ imagettftext($this->Picture,$this->ErrorFontSize,0,$this->XSize-($MaxWidth+15),$YPos,$C_TextColor,$this->ErrorFontName,$Value);
+ $YPos = $YPos + ($this->ErrorFontSize + 4);
+ }
+ }
+ }
+
+ /* Activate the image map creation process */
+ function setImageMap($Mode=TRUE,$GraphID="MyGraph")
+ {
+ $this->BuildMap = $Mode;
+ $this->MapID = $GraphID;
+ }
+
+ /* Add a box into the image map */
+ function addToImageMap($X1,$Y1,$X2,$Y2,$SerieName,$Value,$CallerFunction)
+ {
+ $poly = array(array($X1,$Y1),array($X2,$Y1),array($X2,$Y2),array($X1,$Y2));
+ $this->addPolyToImageMap($poly,$SerieName,$Value,$CallerFunction);
+ }
+
+ function addPolyToImageMap($poly,$SerieName,$Value,$CallerFunction)
+ {
+ if ( $this->MapFunction == NULL || $this->MapFunction == $CallerFunction)
+ {
+ $this->ImageMap[] = array(
+ 'n' => (string)$SerieName,
+ 'v' => (string)$Value,
+ 'p' => $poly,
+ );
+ $this->MapFunction = $CallerFunction;
+ }
+ }
+
+ /* Draw image map to the current chart image */
+ function debugImageMap()
+ {
+ foreach ($this->ImageMap as $polygon)
+ {
+ $points = array();
+ foreach ($polygon['p'] as $point)
+ {
+ $points[] = $point[0];
+ $points[] = $point[1];
+ }
+
+ $color = $this->AllocateColor($this->Picture,rand(0,255),rand(0,255),rand(0,255));
+ imagefilledpolygon($this->Picture,$points,(count($points)+1)/2,$color);
+ }
+
+ }
+
+ /* Get the current image map */
+ function getImageMap()
+ {
+ return $this->ImageMap;
+ }
+
+ /* Load and cleanup the image map from disk */
+ function getSavedImageMap($MapName,$Flush=TRUE)
+ {
+ /* Strip HTML query strings */
+ $Values = $this->tmpFolder.$MapName;
+ $Value = split("\?",$Values);
+ $FileName = $Value[0];
+
+ if ( file_exists($FileName) )
+ {
+ $Handle = fopen($FileName, "r");
+ $MapContent = fread($Handle, filesize($FileName));
+ fclose($Handle);
+ echo $MapContent;
+
+ if ( $Flush )
+ unlink($FileName);
+
+ exit();
+ }
+ else
+ {
+ header("HTTP/1.0 404 Not Found");
+ exit();
+ }
+ }
+
+ /* Save the image map to the disk */
+ function SaveImageMap()
+ {
+ if ( !$this->BuildMap ) { return(-1); }
+
+ if ( $this->ImageMap == NULL )
+ {
+ $this->Errors[] = "[Warning] SaveImageMap - Image map is empty.";
+ return(-1);
+ }
+
+ $Handle = fopen($this->tmpFolder.$this->MapID, 'w');
+ if ( !$Handle )
+ {
+ $this->Errors[] = "[Warning] SaveImageMap - Cannot save the image map.";
+ return(-1);
+ }
+ else
+ {
+ fwrite($Handle, serialize($this->getImageMap()));
+ }
+ fclose ($Handle);
+ }
+
+ /* Convert seconds to a time format string */
+ function ToTime($Value)
+ {
+ $Hour = floor($Value/3600);
+ $Minute = floor(($Value - $Hour*3600)/60);
+ $Second = floor($Value - $Hour*3600 - $Minute*60);
+
+ if (strlen($Hour) == 1 ) { $Hour = "0".$Hour; }
+ if (strlen($Minute) == 1 ) { $Minute = "0".$Minute; }
+ if (strlen($Second) == 1 ) { $Second = "0".$Second; }
+
+ return($Hour.":".$Minute.":".$Second);
+ }
+
+ /* Convert to metric system */
+ function ToMetric($Value)
+ {
+ $Go = floor($Value/1000000000);
+ $Mo = floor(($Value - $Go*1000000000)/1000000);
+ $Ko = floor(($Value - $Go*1000000000 - $Mo*1000000)/1000);
+ $o = floor($Value - $Go*1000000000 - $Mo*1000000 - $Ko*1000);
+
+ if ($Go != 0) { return($Go.".".$Mo."g"); }
+ if ($Mo != 0) { return($Mo.".".$ko."m"); }
+ if ($Ko != 0) { return($Ko.".".$o)."k"; }
+ return($o);
+ }
+
+ /* Convert to curency */
+ function ToCurrency($Value)
+ {
+ $Go = floor($Value/1000000000);
+ $Mo = floor(($Value - $Go*1000000000)/1000000);
+ $Ko = floor(($Value - $Go*1000000000 - $Mo*1000000)/1000);
+ $o = floor($Value - $Go*1000000000 - $Mo*1000000 - $Ko*1000);
+
+ if ( strlen($o) == 1 ) { $o = "00".$o; }
+ if ( strlen($o) == 2 ) { $o = "0".$o; }
+
+ $ResultString = $o;
+ if ( $Ko != 0 ) { $ResultString = $Ko.".".$ResultString; }
+ if ( $Mo != 0 ) { $ResultString = $Mo.".".$ResultString; }
+ if ( $Go != 0 ) { $ResultString = $Go.".".$ResultString; }
+
+ $ResultString = $this->Currency.$ResultString;
+ return($ResultString);
+ }
+
+ /* Set date format for axis labels */
+ function setDateFormat($Format)
+ {
+ $this->DateFormat = $Format;
+ }
+
+ /* Convert TS to a date format string */
+ function ToDate($Value)
+ {
+ return(date($this->DateFormat,$Value));
+ }
+
+ /* Check if a number is a full integer (for scaling) */
+ function isRealInt($Value)
+ {
+ if ($Value == floor($Value))
+ return(TRUE);
+ return(FALSE);
+ }
+ }
+
+ function RaiseFatal($Message)
+ {
+ echo "[FATAL] ".$Message."\r\n";
+ exit();
+ }
+?>
\ No newline at end of file
diff --git a/libraries/chart/pChart/pData.class b/libraries/chart/pChart/pData.class
new file mode 100644
index 0000000..1c4a301
--- /dev/null
+++ b/libraries/chart/pChart/pData.class
@@ -0,0 +1,260 @@
+<?php
+ /*
+ pData - Simplifying data population for pChart
+ Copyright (C) 2008 Jean-Damien POGOLOTTI
+ Version 1.13 last updated on 08/17/08
+
+ http://pchart.sourceforge.net
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 1,2,3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Class initialisation :
+ pData()
+ Data populating methods :
+ ImportFromCSV($FileName,$Delimiter=",",$DataColumns=-1,$HasHeader=FALSE,$DataName=-1)
+ AddPoint($Value,$Serie="Serie1",$Description="")
+ Series manipulation methods :
+ AddSerie($SerieName="Serie1")
+ AddAllSeries()
+ RemoveSerie($SerieName="Serie1")
+ SetAbsciseLabelSerie($SerieName = "Name")
+ SetSerieName($Name,$SerieName="Serie1")
+ + SetSerieSymbol($Name,$Symbol)
+ SetXAxisName($Name="X Axis")
+ SetYAxisName($Name="Y Axis")
+ SetXAxisFormat($Format="number")
+ SetYAxisFormat($Format="number")
+ SetXAxisUnit($Unit="")
+ SetYAxisUnit($Unit="")
+ removeSerieName($SerieName)
+ removeAllSeries()
+ Data retrieval methods :
+ GetData()
+ GetDataDescription()
+ */
+
+ /* pData class definition */
+ class pData
+ {
+ var $Data;
+ var $DataDescription;
+
+ function pData()
+ {
+ $this->Data = array();
+ $this->DataDescription = "";
+ $this->DataDescription["Position"] = "Name";
+ $this->DataDescription["Format"]["X"] = "number";
+ $this->DataDescription["Format"]["Y"] = "number";
+ $this->DataDescription["Unit"]["X"] = NULL;
+ $this->DataDescription["Unit"]["Y"] = NULL;
+ }
+
+ function ImportFromCSV($FileName,$Delimiter=",",$DataColumns=-1,$HasHeader=FALSE,$DataName=-1)
+ {
+ $handle = @fopen($FileName,"r");
+ if ($handle)
+ {
+ $HeaderParsed = FALSE;
+ while (!feof($handle))
+ {
+ $buffer = fgets($handle, 4096);
+ $buffer = str_replace(chr(10),"",$buffer);
+ $buffer = str_replace(chr(13),"",$buffer);
+ $Values = split($Delimiter,$buffer);
+
+ if ( $buffer != "" )
+ {
+ if ( $HasHeader == TRUE && $HeaderParsed == FALSE )
+ {
+ if ( $DataColumns == -1 )
+ {
+ $ID = 1;
+ foreach($Values as $key => $Value)
+ { $this->SetSerieName($Value,"Serie".$ID); $ID++; }
+ }
+ else
+ {
+ $SerieName = "";
+
+ foreach($DataColumns as $key => $Value)
+ $this->SetSerieName($Values[$Value],"Serie".$Value);
+ }
+ $HeaderParsed = TRUE;
+ }
+ else
+ {
+ if ( $DataColumns == -1 )
+ {
+ $ID = 1;
+ foreach($Values as $key => $Value)
+ { $this->AddPoint(intval($Value),"Serie".$ID); $ID++; }
+ }
+ else
+ {
+ $SerieName = "";
+ if ( $DataName != -1 )
+ $SerieName = $Values[$DataName];
+
+ foreach($DataColumns as $key => $Value)
+ $this->AddPoint($Values[$Value],"Serie".$Value,$SerieName);
+ }
+ }
+ }
+ }
+ fclose($handle);
+ }
+ }
+
+ function AddPoint($Value,$Serie="Serie1",$Description="")
+ {
+ if (is_array($Value) && count($Value) == 1)
+ $Value = array_pop($Value);
+
+ $ID = 0;
+ for($i=0;$i<=count($this->Data);$i++)
+ { if(isset($this->Data[$i][$Serie])) { $ID = $i+1; } }
+
+ if ( count($Value) == 1 )
+ {
+ $this->Data[$ID][$Serie] = $Value;
+ if ( $Description != "" )
+ $this->Data[$ID]["Name"] = $Description;
+ elseif (!isset($this->Data[$ID]["Name"]))
+ $this->Data[$ID]["Name"] = $ID;
+ }
+ else
+ {
+ foreach($Value as $key => $Val)
+ {
+ $this->Data[$ID][$Serie] = $Val;
+ if (!isset($this->Data[$ID]["Name"]))
+ $this->Data[$ID]["Name"] = $ID;
+ $ID++;
+ }
+ }
+ }
+
+ function AddSerie($SerieName="Serie1")
+ {
+ if ( !isset($this->DataDescription["Values"]) )
+ {
+ $this->DataDescription["Values"][] = $SerieName;
+ }
+ else
+ {
+ $Found = FALSE;
+ foreach($this->DataDescription["Values"] as $key => $Value )
+ if ( $Value == $SerieName ) { $Found = TRUE; }
+
+ if ( !$Found )
+ $this->DataDescription["Values"][] = $SerieName;
+ }
+ }
+
+ function AddAllSeries()
+ {
+ unset($this->DataDescription["Values"]);
+
+ if ( isset($this->Data[0]) )
+ {
+ foreach($this->Data[0] as $Key => $Value)
+ {
+ if ( $Key != "Name" )
+ $this->DataDescription["Values"][] = $Key;
+ }
+ }
+ }
+
+ function RemoveSerie($SerieName="Serie1")
+ {
+ if ( !isset($this->DataDescription["Values"]) )
+ return(0);
+
+ $Found = FALSE;
+ foreach($this->DataDescription["Values"] as $key => $Value )
+ {
+ if ( $Value == $SerieName )
+ unset($this->DataDescription["Values"][$key]);
+ }
+ }
+
+ function SetAbsciseLabelSerie($SerieName = "Name")
+ {
+ $this->DataDescription["Position"] = $SerieName;
+ }
+
+ function SetSerieName($Name,$SerieName="Serie1")
+ {
+ $this->DataDescription["Description"][$SerieName] = $Name;
+ }
+
+ function SetXAxisName($Name="X Axis")
+ {
+ $this->DataDescription["Axis"]["X"] = $Name;
+ }
+
+ function SetYAxisName($Name="Y Axis")
+ {
+ $this->DataDescription["Axis"]["Y"] = $Name;
+ }
+
+ function SetXAxisFormat($Format="number")
+ {
+ $this->DataDescription["Format"]["X"] = $Format;
+ }
+
+ function SetYAxisFormat($Format="number")
+ {
+ $this->DataDescription["Format"]["Y"] = $Format;
+ }
+
+ function SetXAxisUnit($Unit="")
+ {
+ $this->DataDescription["Unit"]["X"] = $Unit;
+ }
+
+ function SetYAxisUnit($Unit="")
+ {
+ $this->DataDescription["Unit"]["Y"] = $Unit;
+ }
+
+ function SetSerieSymbol($Name,$Symbol)
+ {
+ $this->DataDescription["Symbol"][$Name] = $Symbol;
+ }
+
+ function removeSerieName($SerieName)
+ {
+ if ( isset($this->DataDescription["Description"][$SerieName]) )
+ unset($this->DataDescription["Description"][$SerieName]);
+ }
+
+ function removeAllSeries()
+ {
+ foreach($this->DataDescription["Values"] as $Key => $Value)
+ unset($this->DataDescription["Values"][$Key]);
+ }
+
+ function GetData()
+ {
+ return($this->Data);
+ }
+
+ function GetDataDescription()
+ {
+ return($this->DataDescription);
+ }
+ }
+?>
\ No newline at end of file
diff --git a/libraries/chart/pma_chart.php b/libraries/chart/pma_chart.php
new file mode 100644
index 0000000..ae483c8
--- /dev/null
+++ b/libraries/chart/pma_chart.php
@@ -0,0 +1,184 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the base class that all charts inherit from and some widely used
+ * constants.
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+define('RED', 0);
+define('GREEN', 1);
+define('BLUE', 2);
+
+/**
+ * The base class that all charts inherit from.
+ * @abstract
+ * @package phpMyAdmin
+ */
+abstract class PMA_chart
+{
+ /**
+ * @var array All the default settigs values are here.
+ */
+ protected $settings = array(
+
+ // Default title for every chart.
+ 'titleText' => 'Chart',
+
+ // The style of the chart title.
+ 'titleColor' => '#FAFAFA',
+
+ // Colors for the different slices in the pie chart.
+ 'colors' => array(
+ '#BCE02E',
+ '#E0642E',
+ '#E0D62E',
+ '#2E97E0',
+ '#B02EE0',
+ '#E02E75',
+ '#5CE02E',
+ '#E0B02E',
+ '#000000',
+ '#0022E0',
+ '#726CB1',
+ '#481A36',
+ '#BAC658',
+ '#127224',
+ '#825119',
+ '#238C74',
+ '#4C489B',
+ '#87C9BF',
+ ),
+
+ // Chart background color.
+ 'bgColor' => '#84AD83',
+
+ // The width of the chart.
+ 'width' => 520,
+
+ // The height of the chart.
+ 'height' => 325,
+
+ // Default X Axis label. If empty, label will be taken from the data.
+ 'xLabel' => '',
+
+ // Default Y Axis label. If empty, label will be taken from the data.
+ 'yLabel' => '',
+ );
+
+ /**
+ * @var array Options that the user has specified
+ */
+ private $userSpecifiedSettings = null;
+
+ /**
+ * @var array Error codes will be stored here
+ */
+ protected $errors = array();
+
+ /**
+ * Store user specified options
+ * @param array $options users specified options
+ */
+ function __construct($options = null)
+ {
+ $this->userSpecifiedSettings = $options;
+ }
+
+ /**
+ * All the variable initialization has to be done here.
+ */
+ protected function init()
+ {
+ $this->handleOptions();
+ }
+
+ /**
+ * A function which handles passed parameters. Useful if desired
+ * chart needs to be a little bit different from the default one.
+ */
+ private function handleOptions()
+ {
+ if (is_null($this->userSpecifiedSettings)) {
+ return;
+ }
+
+ $this->settings = array_merge($this->settings, $this->userSpecifiedSettings);
+ }
+
+ protected function getTitleText()
+ {
+ return $this->settings['titleText'];
+ }
+
+ protected function getTitleColor($component)
+ {
+ return $this->hexStrToDecComp($this->settings['titleColor'], $component);
+ }
+
+ protected function getColors()
+ {
+ return $this->settings['colors'];
+ }
+
+ protected function getWidth()
+ {
+ return $this->settings['width'];
+ }
+
+ protected function getHeight()
+ {
+ return $this->settings['height'];
+ }
+
+ protected function getBgColor($component)
+ {
+ return $this->hexStrToDecComp($this->settings['bgColor'], $component);
+ }
+
+ protected function setXLabel($label)
+ {
+ $this->settings['xLabel'] = $label;
+ }
+
+ protected function getXLabel()
+ {
+ return $this->settings['xLabel'];
+ }
+
+ protected function setYLabel($label)
+ {
+ $this->settings['yLabel'] = $label;
+ }
+
+ protected function getYLabel()
+ {
+ return $this->settings['yLabel'];
+ }
+
+ public function getSettings()
+ {
+ return $this->settings;
+ }
+
+ public function getErrors()
+ {
+ return $this->errors;
+ }
+
+ /**
+ * Get one the dec color component from the hex color string
+ * @param string $colorString color string, i.e. #5F22A99
+ * @param int $component color component to get, i.e. 0 gets red.
+ */
+ protected function hexStrToDecComp($colorString, $component)
+ {
+ return hexdec(substr($colorString, ($component * 2) + 1, 2));
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_chart.php b/libraries/chart/pma_pchart_chart.php
new file mode 100644
index 0000000..b8e5375
--- /dev/null
+++ b/libraries/chart/pma_pchart_chart.php
@@ -0,0 +1,399 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the base class that all charts using pChart inherit from and some
+ * widely used constants
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+define('TOP', 0);
+define('RIGHT', 1);
+define('BOTTOM', 2);
+define('LEFT', 3);
+
+require_once 'pma_chart.php';
+
+require_once 'pChart/pData.class';
+require_once 'pChart/pChart.class';
+
+/**
+ * Base class for every chart implemented using pChart.
+ * @abstract
+ * @package phpMyAdmin
+ */
+abstract class PMA_pChart_chart extends PMA_chart
+{
+ /**
+ * @var String title text
+ */
+ protected $titleText;
+
+ /**
+ * @var array data for the chart
+ */
+ protected $data;
+
+ /**
+ * @var object pData object that holds the description of the data
+ */
+ protected $dataSet;
+
+ /**
+ * @var object pChart object that holds the chart
+ */
+ protected $chart;
+
+ /**
+ * @var array holds base64 encoded chart image parts
+ */
+ protected $partsEncoded = array();
+
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($options);
+
+ $this->data = $data;
+
+ $this->settings['fontPath'] = './libraries/chart/pChart/fonts/';
+
+ $this->settings['scale'] = SCALE_ADDALLSTART0;
+
+ $this->settings['labelHeight'] = 20;
+
+ $this->settings['fontSize'] = 8;
+
+ $this->settings['continuous'] = 'off';
+
+ // as in CSS (top, right, bottom, left)
+ $this->setAreaMargins(array(20, 20, 40, 60));
+
+ // when graph area gradient is used, this is the color of the graph
+ // area border
+ $this->settings['graphAreaColor'] = '#D5D9DD';
+
+ // the background color of the graph area
+ $this->settings['graphAreaGradientColor'] = '#A3CBA7';
+
+ // the color of the grid lines in the graph area
+ $this->settings['gridColor'] = '#E6E6E6';
+
+ // the color of the scale and the labels
+ $this->settings['scaleColor'] = '#D5D9DD';
+
+ $this->settings['titleBgColor'] = '#000000';
+ }
+
+ protected function init()
+ {
+ parent::init();
+
+ // create pChart object
+ $this->chart = new pChart($this->getWidth(), $this->getHeight());
+
+ // create pData object
+ $this->dataSet = new pData;
+
+ $this->chart->reportWarnings('GD');
+ $this->chart->ErrorFontName = $this->getFontPath().'tahoma.ttf';
+
+ // initialize colors
+ foreach ($this->getColors() as $key => $color) {
+ $this->chart->setColorPalette(
+ $key,
+ hexdec(substr($color, 1, 2)),
+ hexdec(substr($color, 3, 2)),
+ hexdec(substr($color, 5, 2))
+ );
+ }
+
+ $this->chart->setFontProperties($this->getFontPath().'tahoma.ttf', $this->getFontSize());
+
+ $this->chart->setImageMap(true, 'mapid');
+ }
+
+ /**
+ * data is put to the $dataSet object according to what type chart is
+ * @abstract
+ */
+ abstract protected function prepareDataSet();
+
+ /**
+ * all components of the chart are drawn
+ */
+ protected function prepareChart()
+ {
+ $this->drawBackground();
+ $this->drawChart();
+ }
+
+ /**
+ * draws the background
+ */
+ protected function drawBackground()
+ {
+ $this->drawCommon();
+ $this->drawTitle();
+ $this->setGraphAreaDimensions();
+ $this->drawGraphArea();
+ }
+
+ /**
+ * draws the part of the background which is common to most of the charts
+ */
+ protected function drawCommon()
+ {
+ $this->chart->drawGraphAreaGradient(
+ $this->getBgColor(RED),
+ $this->getBgColor(GREEN),
+ $this->getBgColor(BLUE),
+ 50,TARGET_BACKGROUND);
+ $this->chart->addBorder(2);
+ }
+
+ /**
+ * draws the chart title
+ */
+ protected function drawTitle()
+ {
+ // Draw the title
+ $this->chart->drawTextBox(
+ 0,
+ 0,
+ $this->getWidth(),
+ $this->getLabelHeight(),
+ $this->getTitleText(),
+ 0,
+ $this->getTitleColor(RED),
+ $this->getTitleColor(GREEN),
+ $this->getTitleColor(BLUE),
+ ALIGN_CENTER,
+ True,
+ $this->getTitleBgColor(RED),
+ $this->getTitleBgColor(GREEN),
+ $this->getTitleBgColor(BLUE),
+ 30
+ );
+ }
+
+ /**
+ * calculates and sets the dimensions that will be used for the actual graph
+ */
+ protected function setGraphAreaDimensions()
+ {
+ $this->chart->setGraphArea(
+ $this->getAreaMargin(LEFT),
+ $this->getLabelHeight() + $this->getAreaMargin(TOP),
+ $this->getWidth() - $this->getAreaMargin(RIGHT),
+ $this->getHeight() - $this->getAreaMargin(BOTTOM)
+ );
+ }
+
+ /**
+ * draws graph area (the area where all bars, lines, points will be seen)
+ */
+ protected function drawGraphArea()
+ {
+ $this->chart->drawGraphArea(
+ $this->getGraphAreaColor(RED),
+ $this->getGraphAreaColor(GREEN),
+ $this->getGraphAreaColor(BLUE),
+ FALSE
+ );
+ $this->chart->drawScale(
+ $this->dataSet->GetData(),
+ $this->dataSet->GetDataDescription(),
+ $this->getScale(),
+ $this->getScaleColor(RED),
+ $this->getScaleColor(GREEN),
+ $this->getScaleColor(BLUE),
+ TRUE,0,2,TRUE
+ );
+ $this->chart->drawGraphAreaGradient(
+ $this->getGraphAreaGradientColor(RED),
+ $this->getGraphAreaGradientColor(GREEN),
+ $this->getGraphAreaGradientColor(BLUE),
+ 50
+ );
+ $this->chart->drawGrid(
+ 4,
+ TRUE,
+ $this->getGridColor(RED),
+ $this->getGridColor(GREEN),
+ $this->getGridColor(BLUE),
+ 20
+ );
+ }
+
+ /**
+ * draws the chart
+ * @abstract
+ */
+ protected abstract function drawChart();
+
+ /**
+ * Renders the chart, base 64 encodes the output and puts it into
+ * array partsEncoded.
+ *
+ * Parameter can be used to slice the chart vertically into parts. This
+ * solves an issue where some browsers (IE8) accept base64 images only up
+ * to some length.
+ *
+ * @param integer $parts number of parts to render.
+ * Default value 1 means that all the
+ * chart will be in one piece.
+ */
+ protected function render($parts = 1)
+ {
+ $fullWidth = 0;
+
+ for ($i = 0; $i < $parts; $i++) {
+
+ // slicing is vertical so part height is the full height
+ $partHeight = $this->chart->YSize;
+
+ // there will be some rounding erros, will compensate later
+ $partWidth = round($this->chart->XSize / $parts);
+ $fullWidth += $partWidth;
+ $partX = $partWidth * $i;
+
+ if ($i == $parts - 1) {
+ // if this is the last part, compensate for the rounding errors
+ $partWidth += $this->chart->XSize - $fullWidth;
+ }
+
+ // get a part from the full chart image
+ $part = imagecreatetruecolor($partWidth, $partHeight);
+ imagecopy($part, $this->chart->Picture, 0, 0, $partX, 0, $partWidth, $partHeight);
+
+ // render part and save it to variable
+ ob_start();
+ imagepng($part, NULL, 9, PNG_ALL_FILTERS);
+ $output = ob_get_contents();
+ ob_end_clean();
+
+ // base64 encode the current part
+ $partEncoded = base64_encode($output);
+ $this->partsEncoded[$i] = $partEncoded;
+ }
+ }
+
+ /**
+ * get the HTML and JS code for the configured chart
+ * @return string HTML and JS code for the chart
+ */
+ public function toString()
+ {
+ if (!function_exists('gd_info')) {
+ array_push($this->errors, ERR_NO_GD);
+ return '';
+ }
+
+ $this->init();
+ $this->prepareDataSet();
+ $this->prepareChart();
+
+ //$this->chart->debugImageMap();
+ //$this->chart->printErrors('GD');
+
+ // check if a user wanted a chart in one part
+ if ($this->isContinuous()) {
+ $this->render(1);
+ }
+ else {
+ $this->render(20);
+ }
+
+ $returnData = '<div id="chart">';
+ foreach ($this->partsEncoded as $part) {
+ $returnData .= '<img src="data:image/png;base64,'.$part.'" />';
+ }
+ $returnData .= '</div>';
+
+ // add tooltips only if json is available
+ if (function_exists('json_encode')) {
+ $returnData .= '
+ <script type="text/javascript">
+ //<![CDATA[
+ imageMap.loadImageMap(\''.json_encode($this->getImageMap()).'\');
+ //]]>
+ </script>
+ ';
+ }
+ else {
+ array_push($this->errors, ERR_NO_JSON);
+ }
+
+ return $returnData;
+ }
+
+ protected function getLabelHeight()
+ {
+ return $this->settings['labelHeight'];
+ }
+
+ protected function setAreaMargins($areaMargins)
+ {
+ $this->settings['areaMargins'] = $areaMargins;
+ }
+
+ protected function getAreaMargin($side)
+ {
+ return $this->settings['areaMargins'][$side];
+ }
+
+ protected function getFontPath()
+ {
+ return $this->settings['fontPath'];
+ }
+
+ protected function getScale()
+ {
+ return $this->settings['scale'];
+ }
+
+ protected function getFontSize()
+ {
+ return $this->settings['fontSize'];
+ }
+
+ protected function isContinuous()
+ {
+ return $this->settings['continuous'] == 'on';
+ }
+
+ protected function getImageMap()
+ {
+ return $this->chart->getImageMap();
+ }
+
+ protected function getGraphAreaColor($component)
+ {
+ return $this->hexStrToDecComp($this->settings['graphAreaColor'], $component);
+ }
+
+ protected function getGraphAreaGradientColor($component)
+ {
+ return $this->hexStrToDecComp($this->settings['graphAreaGradientColor'], $component);
+ }
+
+ protected function getGridColor($component)
+ {
+ return $this->hexStrToDecComp($this->settings['gridColor'], $component);
+ }
+
+ protected function getScaleColor($component)
+ {
+ return $this->hexStrToDecComp($this->settings['scaleColor'], $component);
+ }
+
+ protected function getTitleBgColor($component)
+ {
+ return $this->hexStrToDecComp($this->settings['titleBgColor'], $component);
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_multi.php b/libraries/chart/pma_pchart_multi.php
new file mode 100644
index 0000000..685b746
--- /dev/null
+++ b/libraries/chart/pma_pchart_multi.php
@@ -0,0 +1,118 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_chart.php';
+
+/**
+ * Base class for every chart that uses multiple series.
+ * All of these charts will require legend box.
+ * @abstract
+ * @package phpMyAdmin
+ */
+abstract class PMA_pChart_multi extends PMA_pChart_chart
+{
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($data, $options);
+
+ // as in CSS (top, right, bottom, left)
+ $this->setLegendMargins(array(20, 10, 0, 0));
+ }
+
+ /**
+ * data set preparation for multi serie graphs
+ */
+ protected function prepareDataSet()
+ {
+ $values = array_values($this->data);
+ $keys = array_keys($this->data);
+
+ // Dataset definition
+ $this->dataSet->AddPoint($values[0], "Keys");
+
+ $i = 0;
+ foreach ($values[1] as $seriesName => $seriesData) {
+ $this->dataSet->AddPoint($seriesData, "Values".$i);
+ $this->dataSet->SetSerieName($seriesName, "Values".$i);
+ $i++;
+ }
+ $this->dataSet->AddAllSeries();
+
+ $this->dataSet->RemoveSerie("Keys");
+ $this->dataSet->SetAbsciseLabelSerie("Keys");
+
+ $xLabel = $this->getXLabel();
+ if (empty($xLabel)) {
+ $this->setXLabel($keys[0]);
+ }
+ $yLabel = $this->getYLabel();
+ if (empty($yLabel)) {
+ $this->setYLabel($keys[1]);
+ }
+
+ $this->dataSet->SetXAxisName($this->getXLabel());
+ $this->dataSet->SetYAxisName($this->getYLabel());
+ }
+
+ /**
+ * set graph area dimensions with respect to legend box size
+ */
+ protected function setGraphAreaDimensions()
+ {
+ $this->chart->setGraphArea(
+ $this->getAreaMargin(LEFT),
+ $this->getLabelHeight() + $this->getAreaMargin(TOP),
+ $this->getWidth() - $this->getAreaMargin(RIGHT) - $this->getLegendBoxWidth() - $this->getLegendMargin(LEFT) - $this->getLegendMargin(RIGHT),
+ $this->getHeight() - $this->getAreaMargin(BOTTOM)
+ );
+ }
+
+ /**
+ * multi serie charts need a legend. draw it
+ */
+ protected function drawChart()
+ {
+ $this->drawLegend();
+ }
+
+ /**
+ * draws a legend
+ */
+ protected function drawLegend()
+ {
+ // Draw the legend
+ $this->chart->drawLegend(
+ $this->getWidth() - $this->getLegendMargin(RIGHT) - $this->getLegendBoxWidth(),
+ $this->getLabelHeight() + $this->getLegendMargin(TOP),
+ $this->dataSet->GetDataDescription(),
+ 250,250,250,50,50,50
+ );
+ }
+
+ protected function setLegendMargins($legendMargins)
+ {
+ if (!isset($this->settings['legendMargins'])) {
+ $this->settings['legendMargins'] = $legendMargins;
+ }
+ }
+
+ protected function getLegendMargin($side)
+ {
+ return $this->settings['legendMargins'][$side];
+ }
+
+ protected function getLegendBoxWidth()
+ {
+ $legendSize = $this->chart->getLegendBoxSize($this->dataSet->GetDataDescription());
+ return $legendSize[0];
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_multi_bar.php b/libraries/chart/pma_pchart_multi_bar.php
new file mode 100644
index 0000000..6c3969b
--- /dev/null
+++ b/libraries/chart/pma_pchart_multi_bar.php
@@ -0,0 +1,38 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_multi.php';
+
+/**
+ * implements multi bar chart
+ * @package phpMyAdmin
+ */
+class PMA_pChart_multi_bar extends PMA_pChart_multi
+{
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($data, $options);
+
+ $this->settings['scale'] = SCALE_NORMAL;
+ }
+
+ /**
+ * draws multi bar graph
+ */
+ protected function drawChart()
+ {
+ parent::drawChart();
+
+ // Draw the bar chart
+ $this->chart->drawBarGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 70);
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_multi_line.php b/libraries/chart/pma_pchart_multi_line.php
new file mode 100644
index 0000000..892c011
--- /dev/null
+++ b/libraries/chart/pma_pchart_multi_line.php
@@ -0,0 +1,39 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_multi.php';
+
+/**
+ * implements multi line chart
+ * @package phpMyAdmin
+ */
+class PMA_pChart_multi_line extends PMA_pChart_multi
+{
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($data, $options);
+
+ $this->settings['scale'] = SCALE_NORMAL;
+ }
+
+ /**
+ * draws multi line chart
+ */
+ protected function drawChart()
+ {
+ parent::drawChart();
+
+ // Draw the bar chart
+ $this->chart->drawLineGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription());
+ $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, TRUE);
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_multi_radar.php b/libraries/chart/pma_pchart_multi_radar.php
new file mode 100644
index 0000000..2224acc
--- /dev/null
+++ b/libraries/chart/pma_pchart_multi_radar.php
@@ -0,0 +1,100 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_multi.php';
+
+/**
+ * implements multi radar chart
+ * @package phpMyAdmin
+ */
+class PMA_pChart_multi_radar extends PMA_pChart_multi
+{
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($data, $options);
+
+ $this->normalizeValues();
+ }
+
+ /**
+ * Get the largest value from the data and normalize all the other values.
+ */
+ private function normalizeValues()
+ {
+ $maxValue = 0;
+ $keys = array_keys($this->data);
+ $valueKey = $keys[1];
+
+ // get the max value
+ foreach ($this->data[$valueKey] as $values) {
+ if (max($values) > $maxValue) {
+ $maxValue = max($values);
+ }
+ }
+
+ // normalize all the values according to the max value
+ foreach ($this->data[$valueKey] as &$values) {
+ foreach ($values as &$value) {
+ $value = $value / $maxValue * 10;
+ }
+ }
+ }
+
+ /**
+ * graph area for the radar chart does not include grid lines
+ */
+ protected function drawGraphArea()
+ {
+ $this->chart->drawGraphArea(
+ $this->getGraphAreaColor(RED),
+ $this->getGraphAreaColor(GREEN),
+ $this->getGraphAreaColor(BLUE),
+ FALSE
+ );
+ $this->chart->drawGraphAreaGradient(
+ $this->getGraphAreaGradientColor(RED),
+ $this->getGraphAreaGradientColor(GREEN),
+ $this->getGraphAreaGradientColor(BLUE),
+ 50
+ );
+ }
+
+ /**
+ * draw multi radar chart
+ */
+ protected function drawChart()
+ {
+ parent::drawChart();
+
+ // when drawing radar graph we can specify the border from the top of
+ // graph area. We want border to be dynamic, so that either the top
+ // or the side of the radar is some distance away from the top or the
+ // side of the graph area.
+ $areaWidth = $this->chart->GArea_X2 - $this->chart->GArea_X1;
+ $areaHeight = $this->chart->GArea_Y2 - $this->chart->GArea_Y1;
+
+ if ($areaHeight > $areaWidth) {
+ $borderOffset = ($areaHeight - $areaWidth) / 2;
+ }
+ else {
+ $borderOffset = 0;
+ }
+
+ // the least ammount that radar is away from the graph area side.
+ $borderOffset += 40;
+
+ // Draw the radar chart
+ $this->chart->drawRadarAxis($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), TRUE, $borderOffset,
+ 120, 120, 120, 230, 230, 230, -1, 2);
+ $this->chart->drawFilledRadar($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 50, $borderOffset);
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_pie.php b/libraries/chart/pma_pchart_pie.php
new file mode 100644
index 0000000..5bf77fc
--- /dev/null
+++ b/libraries/chart/pma_pchart_pie.php
@@ -0,0 +1,101 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_multi.php';
+
+/**
+ * implements pie chart
+ * @package phpMyAdmin
+ */
+class PMA_pChart_Pie extends PMA_pChart_multi
+{
+ public function __construct($data, $options = null)
+ {
+ // limit data size, no more than 18 pie slices
+ $data = array_slice($data, 0, 18, true);
+ parent::__construct($data, $options);
+
+ $this->setAreaMargins(array(20, 10, 20, 20));
+ }
+
+ /**
+ * prepare data set for the pie chart
+ */
+ protected function prepareDataSet()
+ {
+ // Dataset definition
+ $this->dataSet->AddPoint(array_values($this->data), "Values");
+ $this->dataSet->AddPoint(array_keys($this->data), "Keys");
+ $this->dataSet->AddAllSeries();
+ $this->dataSet->SetAbsciseLabelSerie("Keys");
+ }
+
+ /**
+ * graph area for the pie chart does not include grid lines
+ */
+ protected function drawGraphArea()
+ {
+ $this->chart->drawGraphArea(
+ $this->getGraphAreaColor(RED),
+ $this->getGraphAreaColor(GREEN),
+ $this->getGraphAreaColor(BLUE),
+ FALSE
+ );
+ $this->chart->drawGraphAreaGradient(
+ $this->getGraphAreaGradientColor(RED),
+ $this->getGraphAreaGradientColor(GREEN),
+ $this->getGraphAreaGradientColor(BLUE),
+ 50
+ );
+ }
+
+ /**
+ * draw the pie chart
+ */
+ protected function drawChart()
+ {
+ parent::drawChart();
+
+ // draw pie chart in the middle of graph area
+ $middleX = ($this->chart->GArea_X1 + $this->chart->GArea_X2) / 2;
+ $middleY = ($this->chart->GArea_Y1 + $this->chart->GArea_Y2) / 2;
+
+ $this->chart->drawPieGraph(
+ $this->dataSet->GetData(),
+ $this->dataSet->GetDataDescription(),
+ $middleX,
+ // pie graph is skewed. Upper part is shorter than the
+ // lower part. This is why we set an offset to the
+ // Y middle coordiantes.
+ $middleY - 15,
+ 120, PIE_PERCENTAGE, FALSE, 60, 30, 10, 1);
+ }
+
+ /**
+ * draw legend for the pie chart
+ */
+ protected function drawLegend()
+ {
+ $this->chart->drawPieLegend(
+ $this->getWidth() - $this->getLegendMargin(RIGHT) - $this->getLegendBoxWidth(),
+ $this->getLabelHeight() + $this->getLegendMargin(TOP),
+ $this->dataSet->GetData(),
+ $this->dataSet->GetDataDescription(),
+ 250, 250, 250);
+ }
+
+ protected function getLegendBoxWidth()
+ {
+ $legendSize = $this->chart->getPieLegendBoxSize($this->dataSet->GetData());
+ return $legendSize[0];
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_single.php b/libraries/chart/pma_pchart_single.php
new file mode 100644
index 0000000..04fef80
--- /dev/null
+++ b/libraries/chart/pma_pchart_single.php
@@ -0,0 +1,57 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_chart.php';
+
+/**
+ * Base class for every chart that uses only one series.
+ * @abstract
+ * @package phpMyAdmin
+ */
+abstract class PMA_pChart_single extends PMA_pChart_chart
+{
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($data, $options);
+ }
+
+ /**
+ * data set preparation for single serie charts
+ */
+ protected function prepareDataSet()
+ {
+ $values = array_values($this->data);
+ $keys = array_keys($this->data);
+
+ // Dataset definition
+ $this->dataSet->AddPoint($values[0], "Values");
+ $this->dataSet->AddPoint($values[1], "Keys");
+
+ //$this->dataSet->AddAllSeries();
+ $this->dataSet->AddSerie("Values");
+
+ $this->dataSet->SetAbsciseLabelSerie("Keys");
+
+ $yLabel = $this->getYLabel();
+ if (empty($yLabel)) {
+ $this->setYLabel($keys[0]);
+ }
+ $xLabel = $this->getXLabel();
+ if (empty($xLabel)) {
+ $this->setXLabel($keys[1]);
+ }
+
+ $this->dataSet->SetXAxisName($this->getXLabel());
+ $this->dataSet->SetYAxisName($this->getYLabel());
+ $this->dataSet->SetSerieName($this->getYLabel(), "Values");
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_single_bar.php b/libraries/chart/pma_pchart_single_bar.php
new file mode 100644
index 0000000..821df63
--- /dev/null
+++ b/libraries/chart/pma_pchart_single_bar.php
@@ -0,0 +1,35 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_single.php';
+
+/**
+ * implements single bar chart
+ * @package phpMyAdmin
+ */
+class PMA_pChart_single_bar extends PMA_pChart_single
+{
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($data, $options);
+ }
+
+ /**
+ * draws single bar chart
+ */
+ protected function drawChart()
+ {
+ // Draw the bar chart
+ // use stacked bar graph function, because it gives bars with alpha
+ $this->chart->drawStackedBarGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 70);
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_single_line.php b/libraries/chart/pma_pchart_single_line.php
new file mode 100644
index 0000000..a0ac742
--- /dev/null
+++ b/libraries/chart/pma_pchart_single_line.php
@@ -0,0 +1,35 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_single.php';
+
+/**
+ * implements single line chart
+ * @package phpMyAdmin
+ */
+class PMA_pChart_single_line extends PMA_pChart_single
+{
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($data, $options);
+ }
+
+ /**
+ * draws single line chart
+ */
+ protected function drawChart()
+ {
+ // Draw the line chart
+ $this->chart->drawLineGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription());
+ $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, TRUE);
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_single_radar.php b/libraries/chart/pma_pchart_single_radar.php
new file mode 100644
index 0000000..1b31cd0
--- /dev/null
+++ b/libraries/chart/pma_pchart_single_radar.php
@@ -0,0 +1,88 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_single.php';
+
+/**
+ * implements single radar chart
+ * @package phpMyAdmin
+ */
+class PMA_pChart_single_radar extends PMA_pChart_single
+{
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($data, $options);
+
+ $this->normalizeValues();
+ }
+
+ /**
+ * Get the largest value from the data and normalize all the other values.
+ */
+ private function normalizeValues()
+ {
+ $maxValue = 0;
+ $keys = array_keys($this->data);
+ $valueKey = $keys[0];
+ $maxValue = max($this->data[$valueKey]);
+
+ foreach ($this->data[$valueKey] as &$value) {
+ $value = $value / $maxValue * 10;
+ }
+ }
+
+ /**
+ * graph area for the radar chart does not include grid lines
+ */
+ protected function drawGraphArea()
+ {
+ $this->chart->drawGraphArea(
+ $this->getGraphAreaColor(RED),
+ $this->getGraphAreaColor(GREEN),
+ $this->getGraphAreaColor(BLUE),
+ FALSE
+ );
+ $this->chart->drawGraphAreaGradient(
+ $this->getGraphAreaGradientColor(RED),
+ $this->getGraphAreaGradientColor(GREEN),
+ $this->getGraphAreaGradientColor(BLUE),
+ 50
+ );
+ }
+
+ /**
+ * draws the radar chart
+ */
+ protected function drawChart()
+ {
+ // when drawing radar graph we can specify the border from the top of
+ // graph area. We want border to be dynamic, so that either the top
+ // or the side of the radar is some distance away from the top or the
+ // side of the graph area.
+ $areaWidth = $this->chart->GArea_X2 - $this->chart->GArea_X1;
+ $areaHeight = $this->chart->GArea_Y2 - $this->chart->GArea_Y1;
+
+ if ($areaHeight > $areaWidth) {
+ $borderOffset = ($areaHeight - $areaWidth) / 2;
+ }
+ else {
+ $borderOffset = 0;
+ }
+
+ // the least ammount that radar is away from the graph area side.
+ $borderOffset += 40;
+
+ $this->chart->drawRadarAxis($this->dataSet->GetData(), $this->dataSet->GetDataDescription(),
+ TRUE, $borderOffset, 120, 120, 120, 230, 230, 230, -1, 2);
+ $this->chart->drawFilledRadar($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 50, $borderOffset);
+ }
+}
+
+?>
diff --git a/libraries/chart/pma_pchart_stacked_bar.php b/libraries/chart/pma_pchart_stacked_bar.php
new file mode 100644
index 0000000..4a633f0
--- /dev/null
+++ b/libraries/chart/pma_pchart_stacked_bar.php
@@ -0,0 +1,36 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @author Martynas Mickevicius <mmartynas(a)gmail.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ *
+ */
+require_once 'pma_pchart_multi.php';
+
+/**
+ * implements stacked bar chart
+ * @package phpMyAdmin
+ */
+class PMA_pChart_stacked_bar extends PMA_pChart_multi
+{
+ public function __construct($data, $options = null)
+ {
+ parent::__construct($data, $options);
+ }
+
+ /**
+ * draws stacked bar chart
+ */
+ protected function drawChart()
+ {
+ parent::drawChart();
+
+ // Draw the bar chart
+ $this->chart->drawStackedBarGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 70);
+ }
+}
+
+?>
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 741d8cb..dd7f40a 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1280,12 +1280,14 @@ function PMA_profilingCheckbox($sql_query)
* Displays the results of SHOW PROFILE
*
* @param array the results
+ * @param boolean show chart
* @access public
*
*/
-function PMA_profilingResults($profiling_results)
+function PMA_profilingResults($profiling_results, $show_chart = false)
{
echo '<fieldset><legend>' . __('Profiling') . '</legend>' . "\n";
+ echo '<div style="float: left;">';
echo '<table>' . "\n";
echo ' <tr>' . "\n";
echo ' <th>' . __('Status') . '</th>' . "\n";
@@ -1297,7 +1299,17 @@ function PMA_profilingResults($profiling_results)
echo '<td>' . $one_result['Status'] . '</td>' . "\n";
echo '<td>' . $one_result['Duration'] . '</td>' . "\n";
}
+
echo '</table>' . "\n";
+ echo '</div>';
+
+ if ($show_chart) {
+ require_once './libraries/chart.lib.php';
+ echo '<div style="float: left;">';
+ PMA_chart_profiling($profiling_results);
+ echo '</div>';
+ }
+
echo '</fieldset>' . "\n";
}
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 747c5b5..0deed6e 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2182,6 +2182,12 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
'tbl_export.php' . PMA_generate_common_url($_url_params),
PMA_getIcon('b_tblexport.png', __('Export'), false, true),
'', true, true, '') . "\n";
+
+ // show chart
+ echo PMA_linkOrButton(
+ 'tbl_chart.php' . PMA_generate_common_url($_url_params),
+ PMA_getIcon('b_chart.png', __('Display chart'), false, true),
+ '', true, true, '') . "\n";
}
// CREATE VIEW
diff --git a/server_status.php b/server_status.php
index bcbfe06..520bb51 100644
--- a/server_status.php
+++ b/server_status.php
@@ -16,6 +16,8 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) {
}
require_once './libraries/common.inc.php';
+$GLOBALS['js_include'][] = 'pMap.js';
+
/**
* Does the common work
*/
@@ -34,6 +36,11 @@ require './libraries/replication.inc.php';
require_once './libraries/replication_gui.lib.php';
/**
+ * Chart generation
+ */
+require_once './libraries/chart.lib.php';
+
+/**
* Messages are built using the message name
*/
$strShowStatusBinlog_cache_disk_useDescr = __('The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.');
@@ -692,6 +699,13 @@ foreach ($used_queries as $name => $value) {
?>
</tbody>
</table>
+ <div class="clearfloat"></div>
+</div>
+
+<div>
+ <?php
+ echo PMA_chart_status($used_queries);
+ ?>
</div>
<div id="serverstatussection">
diff --git a/sql.php b/sql.php
index 12c6ac5..9a370d8 100644
--- a/sql.php
+++ b/sql.php
@@ -14,6 +14,7 @@ require_once './libraries/check_user_privileges.lib.php';
require_once './libraries/bookmark.lib.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'pMap.js';
/**
* Defines the url to return to in case of error in a sql statement
@@ -602,7 +603,7 @@ else {
}
if (isset($profiling_results)) {
- PMA_profilingResults($profiling_results);
+ PMA_profilingResults($profiling_results, true);
}
// Displays the results in a table
diff --git a/tbl_chart.php b/tbl_chart.php
new file mode 100644
index 0000000..0e9ed40
--- /dev/null
+++ b/tbl_chart.php
@@ -0,0 +1,192 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * handles creation of the chart
+ *
+ * @version $Id$
+ * @package phpMyAdmin
+ */
+
+/**
+ * do not import request variable into global scope
+ * @ignore
+ */
+if (! defined('PMA_NO_VARIABLES_IMPORT')) {
+ define('PMA_NO_VARIABLES_IMPORT', true);
+}
+
+/**
+ *
+ */
+require_once './libraries/common.inc.php';
+
+$GLOBALS['js_include'][] = 'pMap.js';
+
+/**
+ * Runs common work
+ */
+require './libraries/db_common.inc.php';
+$url_params['goto'] = $cfg['DefaultTabDatabase'];
+$url_params['back'] = 'sql.php';
+
+/*
+ * Import chart functions
+ */
+require_once './libraries/chart.lib.php';
+
+/*
+ * Execute the query and return the result
+ */
+$data = array();
+
+$result = PMA_DBI_try_query($sql_query);
+while ($row = PMA_DBI_fetch_assoc($result)) {
+ $data[] = $row;
+}
+
+// get settings if any posted
+$chartSettings = array();
+if (PMA_isValid($_REQUEST['chartSettings'], 'array')) {
+ $chartSettings = $_REQUEST['chartSettings'];
+}
+
+// get the chart and settings after chart generation
+$chart = PMA_chart_results($data, $chartSettings);
+
+if (!empty($chart)) {
+ $message = PMA_Message::success(__('Chart generated successfully.'));
+}
+else {
+ $message = PMA_Message::error(__('The result of this query can\'t be used for a chart. See [a@./Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]'));
+}
+
+/**
+ * Displays top menu links
+ * We use db links because a chart is not necessarily on a single table
+ */
+$num_tables = 0;
+require_once './libraries/db_links.inc.php';
+
+$url_params['db'] = $GLOBALS['db'];
+$url_params['reload'] = 1;
+
+/**
+ * Displays the page
+ */
+?>
+<!-- Display Chart options -->
+<div id="div_view_options">
+<form method="post" action="tbl_chart.php">
+<?php echo PMA_generate_common_hidden_inputs($url_params); ?>
+<fieldset>
+ <legend><?php echo __('Display chart'); ?></legend>
+
+ <div style="float: right">
+ <?php echo $chart; ?>
+ </div>
+
+ <input type="hidden" name="sql_query" id="sql_query" value="<?php echo htmlspecialchars($sql_query); ?>" />
+
+ <table>
+ <tr><td><label for="width"><?php echo __("Width"); ?></label></td>
+ <td><input type="text" name="chartSettings[width]" id="width" value="<?php echo (isset($chartSettings['width']) ? htmlspecialchars($chartSettings['width']) : ''); ?>" /></td>
+ </tr>
+
+ <tr><td><label for="height"><?php echo __("Height"); ?></label></td>
+ <td><input type="text" name="chartSettings[height]" id="height" value="<?php echo (isset($chartSettings['height']) ? htmlspecialchars($chartSettings['height']) : ''); ?>" /></td>
+ </tr>
+
+ <tr><td><label for="titleText"><?php echo __("Title"); ?></label></td>
+ <td><input type="text" name="chartSettings[titleText]" id="titleText" value="<?php echo (isset($chartSettings['titleText']) ? htmlspecialchars($chartSettings['titleText']) : ''); ?>" /></td>
+ </tr>
+
+ <?php if ($chartSettings['type'] != 'pie' && $chartSettings['type'] != 'radar') { ?>
+ <tr><td><label for="xLabel"><?php echo __("X Axis label"); ?></label></td>
+ <td><input type="text" name="chartSettings[xLabel]" id="xLabel" value="<?php echo (isset($chartSettings['xLabel']) ? htmlspecialchars($chartSettings['xLabel']) : ''); ?>" /></td>
+ </tr>
+
+ <tr><td><label for="yLabel"><?php echo __("Y Axis label"); ?></label></td>
+ <td><input type="text" name="chartSettings[yLabel]" id="yLabel" value="<?php echo (isset($chartSettings['yLabel']) ? htmlspecialchars($chartSettings['yLabel']) : ''); ?>" /></td>
+ </tr>
+ <?php } ?>
+
+ <tr><td><label for="areaMargins"><?php echo __("Area margins"); ?></label></td>
+ <td>
+ <input type="text" name="chartSettings[areaMargins][]" size="2" value="<?php echo (isset($chartSettings['areaMargins'][0]) ? htmlspecialchars($chartSettings['areaMargins'][0]) : ''); ?>" />
+ <input type="text" name="chartSettings[areaMargins][]" size="2" value="<?php echo (isset($chartSettings['areaMargins'][1]) ? htmlspecialchars($chartSettings['areaMargins'][1]) : ''); ?>" />
+ <input type="text" name="chartSettings[areaMargins][]" size="2" value="<?php echo (isset($chartSettings['areaMargins'][2]) ? htmlspecialchars($chartSettings['areaMargins'][2]) : ''); ?>" />
+ <input type="text" name="chartSettings[areaMargins][]" size="2" value="<?php echo (isset($chartSettings['areaMargins'][3]) ? htmlspecialchars($chartSettings['areaMargins'][3]) : ''); ?>" />
+ </td>
+ </tr>
+
+ <?php if ($chartSettings['legend'] == true) { ?>
+ <tr><td><label for="legendMargins"><?php echo __("Legend margins"); ?></label></td>
+ <td>
+ <input type="text" name="chartSettings[legendMargins][]" size="2" value="<?php echo htmlspecialchars($chartSettings['legendMargins'][0]); ?>" />
+ <input type="text" name="chartSettings[legendMargins][]" size="2" value="<?php echo htmlspecialchars($chartSettings['legendMargins'][1]); ?>" />
+ <input type="text" name="chartSettings[legendMargins][]" size="2" value="<?php echo htmlspecialchars($chartSettings['legendMargins'][2]); ?>" />
+ <input type="text" name="chartSettings[legendMargins][]" size="2" value="<?php echo htmlspecialchars($chartSettings['legendMargins'][3]); ?>" />
+ </td>
+ </tr>
+ <?php } ?>
+
+ <tr><td><label for="type"><?php echo __("Type"); ?></label></td>
+ <td>
+ <input type="radio" name="chartSettings[type]" value="bar" <?php echo ($chartSettings['type'] == 'bar' ? 'checked' : ''); ?>><?php echo __('Bar'); ?>
+ <input type="radio" name="chartSettings[type]" value="line" <?php echo ($chartSettings['type'] == 'line' ? 'checked' : ''); ?>><?php echo __('Line'); ?>
+ <input type="radio" name="chartSettings[type]" value="radar" <?php echo ($chartSettings['type'] == 'radar' ? 'checked' : ''); ?>><?php echo __('Radar'); ?>
+ <?php if ($chartSettings['multi'] == false) { ?>
+ <input type="radio" name="chartSettings[type]" value="pie" <?php echo ($chartSettings['type'] == 'pie' ? 'checked' : ''); ?>><?php echo __('Pie'); ?>
+ <?php } ?>
+ </td>
+ </tr>
+
+ <?php if ($chartSettings['type'] == 'bar' && isset($chartSettings['multi']) && $chartSettings['multi'] == true) { ?>
+ <tr><td><label for="barType"><?php echo __("Bar type"); ?></label></td>
+ <td>
+ <input type="radio" name="chartSettings[barType]" value="stacked" <?php echo ($chartSettings['barType'] == 'stacked' ? 'checked' : ''); ?>><?php echo __('Stacked'); ?>
+ <input type="radio" name="chartSettings[barType]" value="multi" <?php echo ($chartSettings['barType'] == 'multi' ? 'checked' : ''); ?>><?php echo __('Multi'); ?>
+ </td>
+ </tr>
+ <?php } ?>
+
+ <tr><td><label for="continuous"><?php echo __("Continuous image"); ?></label></td>
+ <td>
+ <input type="checkbox" name="chartSettings[continuous]" id="continuous" <?php echo ($chartSettings['continuous'] == 'on' ? 'checked="checked"' : ''); ?>>
+ <?php echo PMA_showHint(PMA_sanitize(__('For compatibility reasons the chart image is segmented by default, select this to draw the whole chart in one image.'))) ?>
+ </td>
+ </tr>
+
+ <tr><td><label for="fontSize"><?php echo __("Font size"); ?></label></td>
+ <td><input type="text" name="chartSettings[fontSize]" id="fontSize" value="<?php echo (isset($chartSettings['fontSize']) ? htmlspecialchars($chartSettings['fontSize']) : ''); ?>" /></td>
+ </tr>
+
+ <?php if ($chartSettings['type'] == 'radar') { ?>
+ <tr><td colspan="2">
+ <p>
+ <?php echo __('When drawing a radar chart all values are normalized to a range [0..10].'); ?>
+ </p>
+ </td></tr>
+ <?php } ?>
+
+ <tr><td colspan="2">
+ <p>
+ <?php echo __('Note that not every result table can be put to the chart. See <a href="./Documentation.html#faq6_29" target="Documentation">FAQ 6.29</a>'); ?>
+ </p>
+ </td></tr>
+
+ </table>
+
+</fieldset>
+<fieldset class="tblFooters">
+ <input type="submit" name="displayChart" value="<?php echo __('Redraw'); ?>" />
+</fieldset>
+</form>
+</div>
+<?php
+/**
+ * Displays the footer
+ */
+require_once './libraries/footer.inc.php';
+
+?>
diff --git a/themes/darkblue_orange/img/b_chart.png b/themes/darkblue_orange/img/b_chart.png
new file mode 100644
index 0000000..388ec30
Binary files /dev/null and b/themes/darkblue_orange/img/b_chart.png differ
diff --git a/themes/original/img/b_chart.png b/themes/original/img/b_chart.png
new file mode 100644
index 0000000..388ec30
Binary files /dev/null and b/themes/original/img/b_chart.png differ
hooks/post-receive
--
phpMyAdmin
1
0