The branch, master has been updated
via c2260ccb41081b72d14958dff4acacf1ca941ee7 (commit)
via 93a0962864859703dca5d6603f6bfd06c029974f (commit)
from a0011c545b8656edccfabf84eb734c1abaafefd6 (commit)
- Log -----------------------------------------------------------------
commit c2260ccb41081b72d14958dff4acacf1ca941ee7
Author: Michal Čihař <mcihar(a)novell.com>
Date: Tue May 4 09:07:55 2010 +0200
Generate more compact output.
commit 93a0962864859703dca5d6603f6bfd06c029974f
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 3 15:18:39 2010 +0200
Move function to js escaping library.
-----------------------------------------------------------------------
Summary of changes:
js/messages.php | 13 -------------
libraries/js_escape.lib.php | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/js/messages.php b/js/messages.php
index 31cecf1..3d10d49 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -22,19 +22,6 @@ require_once './libraries/common.inc.php';
// But this one is needed for PMA_escapeJsString()
require_once './libraries/js_escape.lib.php';
-function PMA_printJsValue($key, $value) {
- echo $key . ' = ';
- if (is_array($value)) {
- echo '[';
- foreach ($value as $id => $val) {
- echo "'" . PMA_escapeJsString($val) . "',\n";
- }
- echo "];\n";
- } else {
- echo "'" . PMA_escapeJsString($value) . "';\n";
- }
-}
-
$js_messages['strFormEmpty'] = $GLOBALS['strFormEmpty'];
$js_messages['strNotNumber'] = $GLOBALS['strNotNumber'];
$js_messages['strClickToSelect'] = $GLOBALS['strClickToSelect'];
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
index 5167346..8bec9c0 100644
--- a/libraries/js_escape.lib.php
+++ b/libraries/js_escape.lib.php
@@ -64,4 +64,24 @@ function PMA_escapeJsString($string)
"\r" => '\r')));
}
+/**
+ * Prints an javascript assignment with proper escaping of a value
+ * and support for assigning array of strings.
+ *
+ * @param string $key Name of value to set
+ * @param mixed $value Value to set, can be either string or array of strings
+ */
+function PMA_printJsValue($key, $value) {
+ echo $key . ' = ';
+ if (is_array($value)) {
+ echo '[';
+ foreach ($value as $id => $val) {
+ echo "'" . PMA_escapeJsString($val) . "',";
+ }
+ echo "];\n";
+ } else {
+ echo "'" . PMA_escapeJsString($value) . "';\n";
+ }
+}
+
?>
hooks/post-receive
--
phpMyAdmin