Merge branch 'master' into designer
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
This commit is contained in:
Bimal Yashodha
commit
b2f80eb97a
12
import.php
12
import.php
@ -31,15 +31,17 @@ if (isset($_REQUEST['simulate_dml'])) {
|
||||
// If it's a refresh console bookmarks request
|
||||
if (isset($_REQUEST['console_bookmark_refresh'])) {
|
||||
$response = PMA_Response::getInstance();
|
||||
$response->addJSON('console_message_bookmark', PMA_Console::getBookmarkContent());
|
||||
$response->addJSON(
|
||||
'console_message_bookmark', PMA_Console::getBookmarkContent()
|
||||
);
|
||||
exit;
|
||||
}
|
||||
// If it's a console bookmark add request
|
||||
if (isset($_REQUEST['console_bookmark_add'])) {
|
||||
$response = PMA_Response::getInstance();
|
||||
if(isset($_REQUEST['label']) && isset($_REQUEST['db'])
|
||||
&& isset($_REQUEST['bookmark_query']) && isset($_REQUEST['shared']))
|
||||
{
|
||||
if (isset($_REQUEST['label']) && isset($_REQUEST['db'])
|
||||
&& isset($_REQUEST['bookmark_query']) && isset($_REQUEST['shared'])
|
||||
) {
|
||||
$cfgBookmark = PMA_Bookmark_getParams();
|
||||
$bookmarkFields = array(
|
||||
'bkm_database' => $_REQUEST['db'],
|
||||
@ -48,7 +50,7 @@ if (isset($_REQUEST['console_bookmark_add'])) {
|
||||
'bkm_label' => $_REQUEST['label']
|
||||
);
|
||||
$isShared = ($_REQUEST['shared'] == 'true' ? true : false);
|
||||
if(PMA_Bookmark_save($bookmarkFields, $isShared)) {
|
||||
if (PMA_Bookmark_save($bookmarkFields, $isShared)) {
|
||||
$response->addJSON('message', __('Succeeded'));
|
||||
$response->addJSON('data', $bookmarkFields);
|
||||
$response->addJSON('isShared', $isShared);
|
||||
|
||||
@ -260,16 +260,21 @@ class PMA_Console
|
||||
$output .= '<div class="mid_layer"></div>';
|
||||
$output .= '<div class="card add">';
|
||||
$output .= '<div class="toolbar">'
|
||||
. '<div class="switch_button"><span>' . __('Add bookmark')
|
||||
. '</span></div>';
|
||||
. '<div class="switch_button"><span>'
|
||||
. __('Add bookmark')
|
||||
. '</span></div>';
|
||||
$output .= '</div><div class="content add_bookmark">'
|
||||
. '<div class="options">'
|
||||
. '<label>'. __('Label') . ': <input type="text" name="label"></label> '
|
||||
. '<label>'. __('Target database') . ': <input type="text" name="targetdb"></label> '
|
||||
. '<label><input type="checkbox" name="shared">'. __('Share this bookmark') . '</label>'
|
||||
. '<button type="submit" name="submit">Ok</button>'
|
||||
. '</div>' // .options
|
||||
. '<div class="query_input"><span class="bookmark_add_input"></span></div>';
|
||||
. '<div class="options">'
|
||||
. '<label>' . __('Label')
|
||||
. ': <input type="text" name="label"></label> '
|
||||
. '<label>' . __('Target database')
|
||||
. ': <input type="text" name="targetdb"></label> '
|
||||
. '<label><input type="checkbox" name="shared">'
|
||||
. __('Share this bookmark') . '</label>'
|
||||
. '<button type="submit" name="submit">Ok</button>'
|
||||
. '</div>' // .options
|
||||
. '<div class="query_input">'
|
||||
. '<span class="bookmark_add_input"></span></div>';
|
||||
$output .= '</div>';
|
||||
$output .= '</div>'; // Add bookmark card
|
||||
$output .= '</div>'; // Bookmarks card
|
||||
|
||||
@ -218,9 +218,10 @@ function PMA_Bookmark_save($bkm_fields, $all_users = false)
|
||||
|
||||
$cfgBookmark = PMA_Bookmark_getParams();
|
||||
|
||||
if (! (isset($bkm_fields['bkm_sql_query']) && isset($bkm_fields['bkm_label'])
|
||||
&& strlen($bkm_fields['bkm_sql_query']) > 0 && strlen($bkm_fields['bkm_label']) > 0) )
|
||||
{
|
||||
if (!(isset($bkm_fields['bkm_sql_query']) && isset($bkm_fields['bkm_label'])
|
||||
&& strlen($bkm_fields['bkm_sql_query']) > 0
|
||||
&& strlen($bkm_fields['bkm_label']) > 0)
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@ -439,7 +439,7 @@ class PMA_DBI_Drizzle implements PMA_DBI_Extension
|
||||
|
||||
// array of DrizzleColumn
|
||||
$columns = $result->getColumns();
|
||||
// columns in a standarized format
|
||||
// columns in a standardized format
|
||||
$std_columns = array();
|
||||
|
||||
foreach ($columns as $k => $column) {
|
||||
|
||||
@ -32,7 +32,7 @@ class PMA_DBI_Mysql implements PMA_DBI_Extension
|
||||
* @param string $user mysql user name
|
||||
* @param string $password mysql user password
|
||||
* @param int $client_flags client flags of connection
|
||||
* @param bool $persistent whether to use peristent connection
|
||||
* @param bool $persistent whether to use persistent connection
|
||||
*
|
||||
* @return mixed false on error or a mysql connection resource on success
|
||||
*/
|
||||
@ -66,7 +66,7 @@ class PMA_DBI_Mysql implements PMA_DBI_Extension
|
||||
* @param mysqli $link mysqli object
|
||||
* @param string $query multi query statement to execute
|
||||
*
|
||||
* @return boolean false always false since mysql extention not support
|
||||
* @return boolean false always false since mysql extension not support
|
||||
* for multi query executions
|
||||
*/
|
||||
public function realMultiQuery($link, $query)
|
||||
|
||||
@ -84,7 +84,7 @@ class PMA_DBI_Mysqli implements PMA_DBI_Extension
|
||||
* @param int $server_port server port
|
||||
* @param string $server_socket server socket
|
||||
* @param int $client_flags client flags of connection
|
||||
* @param bool $persistent whether to use peristent connection
|
||||
* @param bool $persistent whether to use persistent connection
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
@ -520,7 +520,7 @@ class PMA_DBI_Mysqli implements PMA_DBI_Extension
|
||||
$fields[$k]->_flags = $field->flags;
|
||||
$fields[$k]->flags = $this->fieldFlags($result, $k);
|
||||
|
||||
// Enhance the field objects for mysql-extension compatibilty
|
||||
// Enhance the field objects for mysql-extension compatibility
|
||||
//$flags = explode(' ', $fields[$k]->flags);
|
||||
//array_unshift($flags, 'dummy');
|
||||
$fields[$k]->multiple_key
|
||||
|
||||
@ -60,7 +60,7 @@ class PMA_Drizzle extends Drizzle
|
||||
const BUFFER_ROW = 2;
|
||||
|
||||
/**
|
||||
* Creates a new database conection using TCP
|
||||
* Creates a new database connection using TCP
|
||||
*
|
||||
* @param string $host Drizzle host
|
||||
* @param integer $port Drizzle port
|
||||
@ -202,7 +202,7 @@ class PMA_DrizzleCon
|
||||
class PMA_DrizzleResult
|
||||
{
|
||||
/**
|
||||
* Instamce of DrizzleResult class
|
||||
* Instance of DrizzleResult class
|
||||
* @var DrizzleResult
|
||||
*/
|
||||
private $_dresult;
|
||||
|
||||
@ -35,7 +35,7 @@ function PMA_getHtmlForEditOrDeletePages($db, $operation)
|
||||
}
|
||||
$html .= ': </label>';
|
||||
$html .= '<select name="selected_page" id="selected_page">';
|
||||
$html .= '<option value="0">-- ' . __('Select page').' --</option>';
|
||||
$html .= '<option value="0">-- ' . __('Select page') . ' --</option>';
|
||||
if ($cfgRelation['pdfwork']) {
|
||||
$pages = PMA_getPageIdsAndNames($db);
|
||||
foreach ($pages as $nr => $desc) {
|
||||
|
||||
@ -135,11 +135,11 @@ abstract class PMA_GIS_Geometry
|
||||
*/
|
||||
protected function setMinMax($point_set, $min_max)
|
||||
{
|
||||
// Seperate each point
|
||||
// Separate each point
|
||||
$points = explode(",", $point_set);
|
||||
|
||||
foreach ($points as $point) {
|
||||
// Extract cordinates of the point
|
||||
// Extract coordinates of the point
|
||||
$cordinates = explode(" ", $point);
|
||||
|
||||
$x = (float) $cordinates[0];
|
||||
@ -189,7 +189,7 @@ abstract class PMA_GIS_Geometry
|
||||
/**
|
||||
* Extracts points, scales and returns them as an array.
|
||||
*
|
||||
* @param string $point_set string of comma sperated points
|
||||
* @param string $point_set string of comma separated points
|
||||
* @param array $scale_data data related to scaling
|
||||
* @param boolean $linear if true, as a 1D array, else as a 2D array
|
||||
*
|
||||
@ -200,11 +200,11 @@ abstract class PMA_GIS_Geometry
|
||||
{
|
||||
$points_arr = array();
|
||||
|
||||
// Seperate each point
|
||||
// Separate each point
|
||||
$points = explode(",", $point_set);
|
||||
|
||||
foreach ($points as $point) {
|
||||
// Extract cordinates of the point
|
||||
// Extract coordinates of the point
|
||||
$cordinates = explode(" ", $point);
|
||||
|
||||
if (isset($cordinates[0]) && trim($cordinates[0]) != ''
|
||||
|
||||
@ -50,7 +50,7 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry
|
||||
*
|
||||
* @param string $spatial spatial data of a row
|
||||
*
|
||||
* @return array array containing the min, max values for x and y cordinates
|
||||
* @return array array containing the min, max values for x and y coordinates
|
||||
* @access public
|
||||
*/
|
||||
public function scaleRow($spatial)
|
||||
@ -73,7 +73,7 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry
|
||||
}
|
||||
$scale_data = $gis_obj->scaleRow($sub_part);
|
||||
|
||||
// Upadate minimum/maximum values for x and y cordinates.
|
||||
// Update minimum/maximum values for x and y coordinates.
|
||||
$c_maxX = (float) $scale_data['maxX'];
|
||||
if (! isset($min_max['maxX']) || $c_maxX > $min_max['maxX']) {
|
||||
$min_max['maxX'] = $c_maxX;
|
||||
@ -141,7 +141,7 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry
|
||||
* @param TCPDF $pdf TCPDF instance
|
||||
*
|
||||
* @return TCPDF the modified TCPDF instance
|
||||
* @access pubilc
|
||||
* @access public
|
||||
*/
|
||||
public function prepareRowAsPdf($spatial, $label, $color, $scale_data, $pdf)
|
||||
{
|
||||
|
||||
@ -50,7 +50,7 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
|
||||
*
|
||||
* @param string $spatial spatial data of a row
|
||||
*
|
||||
* @return array an array containing the min, max values for x and y cordinates
|
||||
* @return array an array containing the min, max values for x and y coordinates
|
||||
* @access public
|
||||
*/
|
||||
public function scaleRow($spatial)
|
||||
|
||||
@ -50,7 +50,7 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry
|
||||
*
|
||||
* @param string $spatial spatial data of a row
|
||||
*
|
||||
* @return array an array containing the min, max values for x and y cordinates
|
||||
* @return array an array containing the min, max values for x and y coordinates
|
||||
* @access public
|
||||
*/
|
||||
public function scaleRow($spatial)
|
||||
@ -59,7 +59,7 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry
|
||||
|
||||
// Trim to remove leading 'MULTILINESTRING((' and trailing '))'
|
||||
$multilinestirng = substr($spatial, 17, (strlen($spatial) - 19));
|
||||
// Seperate each linestring
|
||||
// Separate each linestring
|
||||
$linestirngs = explode("),(", $multilinestirng);
|
||||
|
||||
foreach ($linestirngs as $linestring) {
|
||||
|
||||
@ -396,7 +396,7 @@ class PMA_Schema_PDF extends PMA_PDF
|
||||
/**
|
||||
* Set whether the document is generated from client side DB
|
||||
*
|
||||
* @param string $value 'on' if offline
|
||||
* @param string $value whether offline
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
@ -404,7 +404,7 @@ class PMA_Schema_PDF extends PMA_PDF
|
||||
*/
|
||||
public function setOffline($value)
|
||||
{
|
||||
$this->_offline = (isset($value) && $value == 'on');
|
||||
$this->_offline = $value;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -288,7 +288,7 @@ function PMA_getPageName($pg)
|
||||
$query = "SELECT `page_descr`"
|
||||
. " FROM " . PMA_Util::backquote($cfgRelation['db'])
|
||||
. "." . PMA_Util::backquote($cfgRelation['pdf_pages'])
|
||||
. " WHERE " . PMA_Util::backquote('page_nr'). " = " . $pg;
|
||||
. " WHERE " . PMA_Util::backquote('page_nr') . " = " . $pg;
|
||||
$page_name = $GLOBALS['dbi']->fetchResult(
|
||||
$query,
|
||||
null,
|
||||
@ -315,7 +315,7 @@ function PMA_deletePage($pg)
|
||||
|
||||
$query = "DELETE FROM " . PMA_Util::backquote($cfgRelation['db'])
|
||||
. "." . PMA_Util::backquote($cfgRelation['table_coords'])
|
||||
. " WHERE " . PMA_Util::backquote('pdf_page_number'). " = " . $pg;
|
||||
. " WHERE " . PMA_Util::backquote('pdf_page_number') . " = " . $pg;
|
||||
$success = PMA_queryAsControlUser(
|
||||
$query, true, PMA_DatabaseInterface::QUERY_STORE
|
||||
);
|
||||
@ -323,7 +323,7 @@ function PMA_deletePage($pg)
|
||||
if ($success) {
|
||||
$query = "DELETE FROM " . PMA_Util::backquote($cfgRelation['db'])
|
||||
. "." . PMA_Util::backquote($cfgRelation['pdf_pages'])
|
||||
. " WHERE ". PMA_Util::backquote('page_nr'). " = " . $pg;
|
||||
. " WHERE " . PMA_Util::backquote('page_nr') . " = " . $pg;
|
||||
$success = PMA_queryAsControlUser(
|
||||
$query, true, PMA_DatabaseInterface::QUERY_STORE
|
||||
);
|
||||
|
||||
@ -657,6 +657,7 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
|
||||
$return['sum'][$type] += $row['#'];
|
||||
|
||||
switch($type) {
|
||||
/** @noinspection PhpMissingBreakStatementInspection */
|
||||
case 'insert':
|
||||
// Group inserts if selected
|
||||
if ($removeVars
|
||||
@ -673,10 +674,10 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
|
||||
// Add a ... to the end of this query to indicate that
|
||||
// there's been other queries
|
||||
$temp = $return['rows'][$insertTablesFirst]['argument'];
|
||||
if ($temp[strlen($temp) - 1] != '.') {
|
||||
$return['rows'][$insertTablesFirst]['argument']
|
||||
.= '<br/>...';
|
||||
}
|
||||
$return['rows'][$insertTablesFirst]['argument']
|
||||
.= PMA_getJsonForLogDataTypeGeneral_getSuspensionPoints(
|
||||
$temp[strlen($temp) - 1]
|
||||
);
|
||||
|
||||
// Group this value, thus do not add to the result list
|
||||
continue 2;
|
||||
@ -720,6 +721,22 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return suspension points if needed
|
||||
*
|
||||
* @param string $lastChar Last char
|
||||
*
|
||||
* @return null|string Return suspension points if needed
|
||||
*/
|
||||
function PMA_getJsonForLogDataTypeGeneral_getSuspensionPoints($lastChar)
|
||||
{
|
||||
if ($lastChar != '.') {
|
||||
return '<br/>...';
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
/**
|
||||
* Returns JSon for logging vars
|
||||
*
|
||||
|
||||
@ -52,7 +52,7 @@ if (! isset($mysql_charsets)) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Stores parsed elemented of query to array.
|
||||
* Stores parsed elements of query to array.
|
||||
*
|
||||
* @param array &$arr Array to store element
|
||||
* @param string $type Type of element
|
||||
@ -664,8 +664,8 @@ function PMA_SQP_parse($sql)
|
||||
$punct_data = $GLOBALS['PMA_String']->substr($sql, $count1, $l);
|
||||
}
|
||||
|
||||
// Special case, sometimes, althought two characters are
|
||||
// adjectent directly, they ACTUALLY need to be seperate
|
||||
// Special case, sometimes, although two characters are
|
||||
// adjacent directly, they ACTUALLY need to be separate
|
||||
/* DEBUG
|
||||
echo '<pre>';
|
||||
var_dump($l);
|
||||
@ -1012,7 +1012,7 @@ function PMA_SQP_analyze($arr)
|
||||
*
|
||||
* ['select_expr'] is filled with each expression, the key represents the
|
||||
* expression position in the list (0-based) (so we don't lose track of
|
||||
* multiple occurences of the same column).
|
||||
* multiple occurrences of the same column).
|
||||
*
|
||||
* ['table_ref'] is filled with each table ref, same thing for the key.
|
||||
*
|
||||
@ -1061,7 +1061,7 @@ function PMA_SQP_analyze($arr)
|
||||
* query clauses
|
||||
* -------------
|
||||
*
|
||||
* The select is splitted in those clauses:
|
||||
* The select is split in those clauses:
|
||||
* ['select_expr_clause']
|
||||
* ['from_clause']
|
||||
* ['group_by_clause']
|
||||
@ -2661,70 +2661,11 @@ function PMA_SQP_format(
|
||||
$before .= ' ';
|
||||
}
|
||||
|
||||
switch ($arr[$i]['data']) {
|
||||
case 'CREATE':
|
||||
case 'ALTER':
|
||||
case 'DROP':
|
||||
case 'RENAME';
|
||||
case 'TRUNCATE':
|
||||
case 'ANALYZE':
|
||||
case 'ANALYSE':
|
||||
case 'OPTIMIZE':
|
||||
if (!$in_priv_list) {
|
||||
$space_punct_listsep = $html_line_break;
|
||||
$space_alpha_reserved_word = ' ';
|
||||
}
|
||||
break;
|
||||
case 'EVENT':
|
||||
case 'TABLESPACE':
|
||||
case 'TABLE':
|
||||
case 'FUNCTION':
|
||||
case 'INDEX':
|
||||
case 'PROCEDURE':
|
||||
case 'SERVER':
|
||||
case 'TRIGGER':
|
||||
case 'DATABASE':
|
||||
case 'VIEW':
|
||||
case 'GROUP':
|
||||
break;
|
||||
case 'SET':
|
||||
if (!$in_priv_list) {
|
||||
$space_punct_listsep = $html_line_break;
|
||||
$space_alpha_reserved_word = ' ';
|
||||
}
|
||||
break;
|
||||
case 'EXPLAIN':
|
||||
case 'DESCRIBE':
|
||||
case 'DELETE':
|
||||
case 'SHOW':
|
||||
case 'UPDATE':
|
||||
if (!$in_priv_list) {
|
||||
$space_punct_listsep = $html_line_break;
|
||||
$space_alpha_reserved_word = ' ';
|
||||
}
|
||||
break;
|
||||
case 'INSERT':
|
||||
case 'REPLACE':
|
||||
if (!$in_priv_list) {
|
||||
$space_punct_listsep = $html_line_break;
|
||||
$space_alpha_reserved_word = $html_line_break;
|
||||
}
|
||||
break;
|
||||
case 'VALUES':
|
||||
$space_punct_listsep = ' ';
|
||||
$space_alpha_reserved_word = $html_line_break;
|
||||
break;
|
||||
case 'SELECT':
|
||||
$space_punct_listsep = ' ';
|
||||
$space_alpha_reserved_word = $html_line_break;
|
||||
break;
|
||||
case 'CALL':
|
||||
case 'DO':
|
||||
case 'HANDLER':
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
} // end switch ($arr[$i]['data'])
|
||||
list($space_punct_listsep, $space_alpha_reserved_word)
|
||||
= PMA_SQP_format_getListsepAndReservedWord(
|
||||
$arr[$i]['data'], $in_priv_list, $html_line_break,
|
||||
$space_punct_listsep, $space_alpha_reserved_word
|
||||
);
|
||||
|
||||
$after .= ' ';
|
||||
break;
|
||||
@ -2807,6 +2748,91 @@ function PMA_SQP_format(
|
||||
return $str;
|
||||
} // end of the "PMA_SQP_format()" function
|
||||
|
||||
/**
|
||||
* Define variables for PMA_SQP_format
|
||||
*
|
||||
* @param string $data Data to check
|
||||
* @param boolean $in_priv_list In privilege list
|
||||
* @param string $html_line_break HTML line break
|
||||
* @param string $space_punct_listsep List separator
|
||||
* @param string $space_alpha_reserved_word Space between reserved words
|
||||
*
|
||||
* @todo check definition of $space_punct_listsep and $space_alpha_reserved_word
|
||||
*
|
||||
* @return array Variables needed by PMA_SQP_format
|
||||
*/
|
||||
function PMA_SQP_format_getListsepAndReservedWord(
|
||||
$data, $in_priv_list, $html_line_break, $space_punct_listsep,
|
||||
$space_alpha_reserved_word
|
||||
)
|
||||
{
|
||||
switch ($data) {
|
||||
case 'CREATE':
|
||||
case 'ALTER':
|
||||
case 'DROP':
|
||||
case 'RENAME';
|
||||
case 'TRUNCATE':
|
||||
case 'ANALYZE':
|
||||
case 'ANALYSE':
|
||||
case 'OPTIMIZE':
|
||||
if (!$in_priv_list) {
|
||||
$space_punct_listsep = $html_line_break;
|
||||
$space_alpha_reserved_word = ' ';
|
||||
}
|
||||
break;
|
||||
case 'EVENT':
|
||||
case 'TABLESPACE':
|
||||
case 'TABLE':
|
||||
case 'FUNCTION':
|
||||
case 'INDEX':
|
||||
case 'PROCEDURE':
|
||||
case 'SERVER':
|
||||
case 'TRIGGER':
|
||||
case 'DATABASE':
|
||||
case 'VIEW':
|
||||
case 'GROUP':
|
||||
break;
|
||||
case 'SET':
|
||||
if (!$in_priv_list) {
|
||||
$space_punct_listsep = $html_line_break;
|
||||
$space_alpha_reserved_word = ' ';
|
||||
}
|
||||
break;
|
||||
case 'EXPLAIN':
|
||||
case 'DESCRIBE':
|
||||
case 'DELETE':
|
||||
case 'SHOW':
|
||||
case 'UPDATE':
|
||||
if (!$in_priv_list) {
|
||||
$space_punct_listsep = $html_line_break;
|
||||
$space_alpha_reserved_word = ' ';
|
||||
}
|
||||
break;
|
||||
case 'INSERT':
|
||||
case 'REPLACE':
|
||||
if (!$in_priv_list) {
|
||||
$space_punct_listsep = $html_line_break;
|
||||
$space_alpha_reserved_word = $html_line_break;
|
||||
}
|
||||
break;
|
||||
case 'VALUES':
|
||||
$space_punct_listsep = ' ';
|
||||
$space_alpha_reserved_word = $html_line_break;
|
||||
break;
|
||||
case 'SELECT':
|
||||
$space_punct_listsep = ' ';
|
||||
$space_alpha_reserved_word = $html_line_break;
|
||||
break;
|
||||
case 'CALL':
|
||||
case 'DO':
|
||||
case 'HANDLER':
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return array($space_punct_listsep, $space_alpha_reserved_word);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets SQL queries with no format
|
||||
*
|
||||
|
||||
2
sql.php
2
sql.php
@ -40,7 +40,7 @@ if (isset($ajax_reload) && $ajax_reload['reload'] === true) {
|
||||
/**
|
||||
* Defines the url to return to in case of error in a sql statement
|
||||
*/
|
||||
// Security checkings
|
||||
// Security checks
|
||||
if (! empty($goto)) {
|
||||
$is_gotofile = preg_replace('@^([^?]+).*$@s', '\\1', $goto);
|
||||
if (! @file_exists('' . $is_gotofile)) {
|
||||
|
||||
@ -162,7 +162,10 @@ class PMA_Error_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
$this->object->setBacktrace(array('bt1','bt2','bt3','bt4'));
|
||||
// case: full backtrace
|
||||
$this->assertEquals(array('bt1','bt2','bt3','bt4'), $this->object->getBacktrace());
|
||||
$this->assertEquals(
|
||||
array('bt1','bt2','bt3','bt4'),
|
||||
$this->object->getBacktrace()
|
||||
);
|
||||
|
||||
// case: first 2 frames
|
||||
$this->assertEquals(array('bt1','bt2'), $this->object->getBacktrace(2));
|
||||
|
||||
@ -61,7 +61,7 @@ abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase
|
||||
/**
|
||||
* Tests whether content is a valid image.
|
||||
*
|
||||
* @param object $image Image
|
||||
* @param object $object Image
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
@ -137,7 +137,12 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
|
||||
$mockHeader = $this->getMockBuilder('PMA_Header')
|
||||
->disableOriginalConstructor()
|
||||
->setMethods(
|
||||
array('setBodyId', 'setTitle', 'disableMenuAndConsole', 'disableWarnings')
|
||||
array(
|
||||
'setBodyId',
|
||||
'setTitle',
|
||||
'disableMenuAndConsole',
|
||||
'disableWarnings'
|
||||
)
|
||||
)
|
||||
->getMock();
|
||||
|
||||
|
||||
@ -57,7 +57,8 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase
|
||||
|
||||
$dbi->expects($this->at(0))
|
||||
->method('fetchResult')
|
||||
->with("
|
||||
->with(
|
||||
"
|
||||
SELECT CONCAT_WS('.', `db_name`, `table_name`) AS `name`,
|
||||
`x` AS `X`,
|
||||
`y` AS `Y`,
|
||||
|
||||
@ -43,7 +43,10 @@ class PMA_EscapeJsString_Test extends PHPUnit_Framework_TestCase
|
||||
array('\\\';', '\';'),
|
||||
array('\r\n\\\'<scrIpt></\' + \'script>', "\r\n'<scrIpt></sCRIPT>"),
|
||||
array('\\\';[XSS]', '\';[XSS]'),
|
||||
array('</\' + \'script></head><body>[HTML]', '</SCRIPT></head><body>[HTML]'),
|
||||
array(
|
||||
'</\' + \'script></head><body>[HTML]',
|
||||
'</SCRIPT></head><body>[HTML]'
|
||||
),
|
||||
array('\"\\\'\\\\\\\'\"', '"\'\\\'"'),
|
||||
array("\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\", "\\''''''''''''\\")
|
||||
);
|
||||
|
||||
@ -32,13 +32,19 @@ class PMA_Ip_Allow_Deny_Test extends PHPUnit_Framework_TestCase
|
||||
public function setUp()
|
||||
{
|
||||
$GLOBALS['cfg']['Server']['user'] = "pma_username";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % 255.255.255.0/4";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % from 255.255.2.0/4";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % from 2001:4998:c:a0d:0000:0000:4998:1020";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % from 2001:4998:c:a0d:0000:0000:4998:[1001-2010]";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % from 2001:4998:c:a0d:0000:0000:4998:3020/24";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
|
||||
= "allow % 255.255.255.0/4";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
|
||||
= "allow % from 255.255.2.0/4";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
|
||||
= "allow % from 2001:4998:c:a0d:0000:0000:4998:1020";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
|
||||
= "allow % from 2001:4998:c:a0d:0000:0000:4998:[1001-2010]";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
|
||||
= "allow % from 2001:4998:c:a0d:0000:0000:4998:3020/24";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "deny % 255.255.0.0/8";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "deny % from 255.255.0.0/8";
|
||||
$GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
|
||||
= "deny % from 255.255.0.0/8";
|
||||
include_once 'libraries/ip_allow_deny.lib.php';
|
||||
}
|
||||
|
||||
|
||||
@ -40,7 +40,9 @@ class PMA_PrettyPrint_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
$this->assertEquals(
|
||||
"key[test0]: \"value0\"\nkey[test1]: \"value1\"\n",
|
||||
PMA_prettyPrint(array('key' => array('test0' => 'value0', 'test1' => 'value1')))
|
||||
PMA_prettyPrint(
|
||||
array('key' => array('test0' => 'value0', 'test1' => 'value1'))
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -102,9 +102,15 @@ class PMA_Cache_Test extends PHPUnit_Framework_TestCase
|
||||
PMA_Util::cacheSet('test_data_2', 25);
|
||||
|
||||
PMA_Util::cacheUnset('test_data');
|
||||
$this->assertArrayNotHasKey('test_data', $_SESSION['cache']['server_server']);
|
||||
$this->assertArrayNotHasKey(
|
||||
'test_data',
|
||||
$_SESSION['cache']['server_server']
|
||||
);
|
||||
PMA_Util::cacheUnset('test_data_2');
|
||||
$this->assertArrayNotHasKey('test_data_2', $_SESSION['cache']['server_server']);
|
||||
$this->assertArrayNotHasKey(
|
||||
'test_data_2',
|
||||
$_SESSION['cache']['server_server']
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -116,10 +122,16 @@ class PMA_Cache_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
$GLOBALS['server'] = 'server';
|
||||
PMA_Util::cacheSet('is_superuser', 'yes');
|
||||
$this->assertEquals('yes', $_SESSION['cache']['server_server']['is_superuser']);
|
||||
$this->assertEquals(
|
||||
'yes',
|
||||
$_SESSION['cache']['server_server']['is_superuser']
|
||||
);
|
||||
|
||||
PMA_Util::clearUserCache();
|
||||
$this->assertArrayNotHasKey('is_superuser', $_SESSION['cache']['server_server']);
|
||||
$this->assertArrayNotHasKey(
|
||||
'is_superuser',
|
||||
$_SESSION['cache']['server_server']
|
||||
);
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
@ -500,7 +500,9 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
$GLOBALS['is_ajax_request'] = false;
|
||||
PMA_RTN_setGlobals();
|
||||
$this->assertTag($matcher, PMA_RTN_getEditorForm('edit', 'change', $data), false);
|
||||
$this->assertTag(
|
||||
$matcher, PMA_RTN_getEditorForm('edit', 'change', $data), false
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -29,12 +29,32 @@ class PMA_LangDetails_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
return array(
|
||||
array('af|afrikaans', 'af', '', 'af'),
|
||||
array('ar|arabic', 'ar', 'العربية', 'ar'),
|
||||
array(
|
||||
'ar|arabic',
|
||||
'ar',
|
||||
'العربية',
|
||||
'ar'
|
||||
),
|
||||
array('az|azerbaijani', 'az', 'Azərbaycanca', 'az'),
|
||||
array('bn|bangla', 'bn', 'বাংলা', 'bn'),
|
||||
array('be|belarusian', 'be', 'Беларуская', 'be'),
|
||||
array('be[-_]lat|belarusian latin', 'be-lat', 'Biełaruskaja', 'be@latin'),
|
||||
array('bg|bulgarian', 'bg', 'Български', 'bg'),
|
||||
array(
|
||||
'be|belarusian',
|
||||
'be',
|
||||
'Беларуская',
|
||||
'be'
|
||||
),
|
||||
array(
|
||||
'be[-_]lat|belarusian latin',
|
||||
'be-lat',
|
||||
'Biełaruskaja',
|
||||
'be@latin'
|
||||
),
|
||||
array(
|
||||
'bg|bulgarian',
|
||||
'bg',
|
||||
'Български',
|
||||
'bg'
|
||||
),
|
||||
array('bs|bosnian', 'bs', 'Bosanski', 'bs'),
|
||||
array('br|breton', 'br', 'Brezhoneg', 'br'),
|
||||
array('ca|catalan', 'ca', 'Català', 'ca'),
|
||||
@ -42,7 +62,12 @@ class PMA_LangDetails_Test extends PHPUnit_Framework_TestCase
|
||||
array('cy|welsh', 'cy', 'Cymraeg', 'cy'),
|
||||
array('da|danish', 'da', 'Dansk', 'da'),
|
||||
array('de|german', 'de', 'Deutsch', 'de'),
|
||||
array('el|greek', 'el', 'Ελληνικά', 'el'),
|
||||
array(
|
||||
'el|greek',
|
||||
'el',
|
||||
'Ελληνικά',
|
||||
'el'
|
||||
),
|
||||
array('en|english', 'en', '', 'en'),
|
||||
array('en[_-]gb|english (United Kingdom)', 'en-gb', '', 'en_GB'),
|
||||
array('es|spanish', 'es', 'Español', 'es'),
|
||||
@ -53,44 +78,94 @@ class PMA_LangDetails_Test extends PHPUnit_Framework_TestCase
|
||||
array('fr|french', 'fr', 'Français', 'fr'),
|
||||
array('gl|galician', 'gl', 'Galego', 'gl'),
|
||||
array('he|hebrew', 'he', 'עברית', 'he'),
|
||||
array('hi|hindi', 'hi', 'हिन्दी', 'hi'),
|
||||
array(
|
||||
'hi|hindi',
|
||||
'hi',
|
||||
'हिन्दी',
|
||||
'hi'
|
||||
),
|
||||
array('hr|croatian', 'hr', 'Hrvatski', 'hr'),
|
||||
array('hu|hungarian', 'hu', 'Magyar', 'hu'),
|
||||
array('id|indonesian', 'id', 'Bahasa Indonesia', 'id'),
|
||||
array('it|italian', 'it', 'Italiano', 'it'),
|
||||
array('ja|japanese', 'ja', '日本語', 'ja'),
|
||||
array('ko|korean', 'ko', '한국어', 'ko'),
|
||||
array('ka|georgian', 'ka', 'ქართული', 'ka'),
|
||||
array(
|
||||
'ka|georgian',
|
||||
'ka',
|
||||
'ქართული',
|
||||
'ka'
|
||||
),
|
||||
array('lt|lithuanian', 'lt', 'Lietuvių', 'lt'),
|
||||
array('lv|latvian', 'lv', 'Latviešu', 'lv'),
|
||||
array('mk|macedonian', 'mk', 'Macedonian', 'mk'),
|
||||
array('mn|mongolian', 'mn', 'Монгол', 'mn'),
|
||||
array(
|
||||
'mn|mongolian',
|
||||
'mn',
|
||||
'Монгол',
|
||||
'mn'
|
||||
),
|
||||
array('ms|malay', 'ms', 'Bahasa Melayu', 'ms'),
|
||||
array('nl|dutch', 'nl', 'Nederlands', 'nl'),
|
||||
array('nb|norwegian', 'nb', 'Norsk', 'nb'),
|
||||
array('pl|polish', 'pl', 'Polski', 'pl'),
|
||||
array('pt[-_]br|brazilian portuguese', 'pt-BR', 'Português', 'pt_BR'),
|
||||
array(
|
||||
'pt[-_]br|brazilian portuguese',
|
||||
'pt-BR',
|
||||
'Português',
|
||||
'pt_BR'
|
||||
),
|
||||
array('pt|portuguese', 'pt', 'Português', 'pt'),
|
||||
array('ro|romanian', 'ro', 'Română', 'ro'),
|
||||
array('ru|russian', 'ru', 'Русский', 'ru'),
|
||||
array(
|
||||
'ru|russian',
|
||||
'ru',
|
||||
'Русский',
|
||||
'ru'
|
||||
),
|
||||
array('si|sinhala', 'si', 'සිංහල', 'si'),
|
||||
array('sk|slovak', 'sk', 'Slovenčina', 'sk'),
|
||||
array('sl|slovenian', 'sl', 'Slovenščina', 'sl'),
|
||||
array('sq|albanian', 'sq', 'Shqip', 'sq'),
|
||||
array('sr[-_]lat|serbian latin', 'sr-lat', 'Srpski', 'sr@latin'),
|
||||
array('sr|serbian', 'sr', 'Српски', 'sr'),
|
||||
array(
|
||||
'sr|serbian',
|
||||
'sr',
|
||||
'Српски',
|
||||
'sr'
|
||||
),
|
||||
array('sv|swedish', 'sv', 'Svenska', 'sv'),
|
||||
array('ta|tamil', 'ta', 'தமிழ்', 'ta'),
|
||||
array('te|telugu', 'te', 'తెలుగు', 'te'),
|
||||
array('th|thai', 'th', 'ภาษาไทย', 'th'),
|
||||
array(
|
||||
'th|thai',
|
||||
'th',
|
||||
'ภาษาไทย',
|
||||
'th'
|
||||
),
|
||||
array('tr|turkish', 'tr', 'Türkçe', 'tr'),
|
||||
array('tt|tatarish', 'tt', 'Tatarça', 'tt'),
|
||||
array('ug|uyghur', 'ug', 'ئۇيغۇرچە', 'ug'),
|
||||
array('uk|ukrainian', 'uk', 'Українська', 'uk'),
|
||||
array(
|
||||
'uk|ukrainian',
|
||||
'uk',
|
||||
'Українська',
|
||||
'uk'
|
||||
),
|
||||
array('ur|urdu', 'ur', 'اُردوُ', 'ur'),
|
||||
array('uz[-_]lat|uzbek-latin', 'uz-lat', 'O‘zbekcha', 'uz@latin'),
|
||||
array('uz[-_]cyr|uzbek-cyrillic', 'uz-cyr', 'Ўзбекча', 'uz'),
|
||||
array('zh[-_](tw|hk)|chinese traditional', 'zh-TW', '中文', 'zh_TW'),
|
||||
array(
|
||||
'uz[-_]cyr|uzbek-cyrillic',
|
||||
'uz-cyr',
|
||||
'Ўзбекча',
|
||||
'uz'
|
||||
),
|
||||
array(
|
||||
'zh[-_](tw|hk)|chinese traditional',
|
||||
'zh-TW',
|
||||
'中文',
|
||||
'zh_TW'
|
||||
),
|
||||
array(
|
||||
'zh(?)([-_][[:alpha:]]{2,3})?|chinese simplified',
|
||||
'zh',
|
||||
|
||||
@ -181,8 +181,8 @@ function PMA_changePassUrlParamsAndSubmitQuery(
|
||||
/**
|
||||
* Display the page
|
||||
*
|
||||
* @param string $message Message
|
||||
* @param string $sql_query SQL query
|
||||
* @param string $message Message
|
||||
* @param string $sql_query SQL query
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
