' . "\n";
+ $return .= '- ' . $group . '
' . "\n";
// wether display db_name cuted by the group part
$cut = true;
} else {
@@ -377,10 +377,10 @@ require_once './libraries/PMA_List.class.php';
}
foreach ($dbs as $db) {
$return .= '';
+ if ($db['name'] == $selected) {
+ $return .= ' class="selected"';
+ }
+ $return .= '>';
$return .= ($cut ? $db['disp_name_cut'] : $db['disp_name'])
.' (' . $db['num_tables'] . ')';
$return .= '
' . "\n";
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 938f89b4a..b706cc5ae 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -290,7 +290,7 @@ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false)
}
}
}
- $recursive_counter++;
+ $recursive_counter--;
}
/**
@@ -2610,6 +2610,14 @@ if (get_magic_quotes_gpc()) {
PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true);
}
+/**
+ * In some cases, this one is not set
+ *
+ */
+if (! isset($_REQUEST['js_frame']) || ! is_string($_REQUEST['js_frame'])) {
+ $_REQUEST['js_frame'] = '';
+}
+
/**
* clean cookies on new install or upgrade
* when changing something with increment the cookie version
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index aa73e8211..c658dcb2d 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1166,6 +1166,30 @@ function PMA_DBI_getCompatibilities()
return $compats;
}
+/**
+ * returns warnings for last query
+ *
+ * @uses $GLOBALS['userlink']
+ * @uses PMA_DBI_fetch_result()
+ * @param resource mysql link $link mysql link resource
+ * @return array warnings
+ */
+function PMA_DBI_get_warnings($link = null)
+{
+ if (PMA_MYSQL_INT_VERSION < 40100) {
+ return array();
+ }
+
+ if (empty($link)) {
+ if (isset($GLOBALS['userlink'])) {
+ $link = $GLOBALS['userlink'];
+ } else {
+ return array();
+ }
+ }
+
+ return PMA_DBI_fetch_result('SHOW WARNINGS', null, null, $link);
+}
/**
* returns true (int > 0) if current user is superuser
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index d8149f4b0..577888e7e 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -178,22 +178,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0)
if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 40100) {
$query = PMA_convert_charset($query);
}
- $result = mysqli_query($link, $query, $method);
-
- if (mysqli_warning_count($link)) {
- /**
- * @todo check $method ?
- */
- $warning_result = mysqli_query($link, 'SHOW WARNINGS');
- if ($warning_result) {
- $warning_row = mysqli_fetch_row($warning_result);
- $GLOBALS['warning'] = sprintf("%s (%d): %s", $warning_row[0], $warning_row[1], $warning_row[2]);
- }
- } else {
- unset($GLOBALS['warning']);
- }
-
- return $result;
+ return mysqli_query($link, $query, $method);
// From the PHP manual:
// "note: returns true on success or false on failure. For SELECT,
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index ba42f2de3..388ca1397 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -1,5 +1,5 @@
'',
'[br]' => '
',
'[/a]' => '',
+ '[sup]' => '',
+ '[/sup]' => '',
);
- $sanitized_message = strtr($message, $replace_pairs);
- $sanitized_message = preg_replace(
- '/\[a@([^"@]*)@([^]"]*)\]/e',
- '\'\'',
- $sanitized_message);
+ $message = strtr($message, $replace_pairs);
- return $sanitized_message;
-}
+ $pattern = '/\[a@([^"@]*)@([^]"]*)\]/';
-/**
- * removes javascript
- *
- * @uses trim()
- * @uses strtolower()
- * @uses substr()
- * @param string uri
- */
-function PMA_sanitizeUri($uri)
-{
- $uri = trim($uri);
+ if (preg_match_all($pattern, $message, $founds, PREG_SET_ORDER)) {
+ $valid_links = array(
+ 'http', // default http:// links (and https://)
+ './Do', // ./Documentation
+ );
- if (strtolower(substr($uri, 0, 10)) === 'javascript') {
- return '';
+ foreach ($founds as $found) {
+ // only http... and ./Do... allowed
+ if (! in_array(substr($found[1], 0, 4), $valid_links)) {
+ return $message;
+ }
+ // a-z and _ allowed in target
+ if (! empty($found[2]) && preg_match('/[^a-z_]+/i', $found[2])) {
+ return $message;
+ }
+ }
+
+ $message = preg_replace($pattern, '', $message);
}
- return $uri;
+ return $message;
}
?>
diff --git a/sql.php b/sql.php
index c7e6e3c2c..cedccc60e 100644
--- a/sql.php
+++ b/sql.php
@@ -654,6 +654,10 @@ if ($num_rows < 1 || $is_affected) {
$active_page = $goto;
require './' . $goto;
} else {
+ // avoid a redirect loop when last record was deleted
+ if ('sql.php' == $cfg['DefaultTabTable']) {
+ $goto = str_replace('sql.php','tbl_structure.php',$goto);
+ }
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . str_replace('&', '&', $goto) . '&message=' . urlencode($message));
} // end else
exit();
diff --git a/tbl_replace.php b/tbl_replace.php
index 5b3c7651f..349b71a0c 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -225,7 +225,10 @@ foreach ($loop_array as $primary_key) {
// no need to add column into the valuelist
if (strlen($cur_value)) {
$query_values[] = $cur_value;
- $query_fields[] = PMA_backquote($key);
+ // first inserted row so prepare the list of fields
+ if (empty($value_sets)) {
+ $query_fields[] = PMA_backquote($key);
+ }
}
// u p d a t e
@@ -306,9 +309,7 @@ foreach ($query as $single_query) {
} else {
$result = PMA_DBI_query($single_query);
}
- if (isset($GLOBALS['warning'])) {
- $warning_message .= $GLOBALS['warning'] . '[br]';
- }
+
if (! $result) {
$message .= PMA_DBI_getError();
} else {
@@ -328,6 +329,12 @@ foreach ($query as $single_query) {
}
PMA_DBI_free_result($result);
} // end if
+
+ foreach (PMA_DBI_get_warnings() as $warning) {
+ $warning_message .= $warning['Level'] . ': #' . $warning['Code']
+ . ' ' . $warning['Message'] . '[br]';
+ }
+
unset($result);
}
unset($single_query, $query);
diff --git a/translators.html b/translators.html
index c0b489ad4..0581f99e5 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
- phpMyAdmin 2.10.1-rc1 - Official translators
+ phpMyAdmin 2.10.2-dev - Official translators
@@ -31,7 +31,7 @@
- Glossary
-phpMyAdmin 2.10.1-rc1 official translators list
+phpMyAdmin 2.10.2-dev official translators list
Here is the list of the "official translators" of
phpMyAdmin.