' . __('Quick steps to setup advanced features:') . '
'; @@ -378,6 +389,7 @@ function PMA_checkRelationsParam() $cfgRelation['designerwork'] = false; $cfgRelation['userconfigwork'] = false; $cfgRelation['menuswork'] = false; + $cfgRelation['navwork'] = false; $cfgRelation['allworks'] = false; $cfgRelation['user'] = null; $cfgRelation['db'] = null; @@ -445,6 +457,8 @@ function PMA_checkRelationsParam() $cfgRelation['users'] = $curr_table[0]; } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['usergroups']) { $cfgRelation['usergroups'] = $curr_table[0]; + } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['navigationhiding']) { + $cfgRelation['navigationhiding'] = $curr_table[0]; } } // end while $GLOBALS['dbi']->freeResult($tab_rs); @@ -499,13 +513,17 @@ function PMA_checkRelationsParam() $cfgRelation['menuswork'] = true; } + if (isset($cfgRelation['navigationhiding'])) { + $cfgRelation['navwork'] = true; + } + if ($cfgRelation['relwork'] && $cfgRelation['displaywork'] && $cfgRelation['pdfwork'] && $cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfgRelation['historywork'] && $cfgRelation['recentwork'] && $cfgRelation['uiprefswork'] && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork'] && $cfgRelation['bookmarkwork'] && $cfgRelation['designerwork'] - && $cfgRelation['menuswork'] + && $cfgRelation['menuswork'] && $cfgRelation['navwork'] ) { $cfgRelation['allworks'] = true; } @@ -1005,7 +1023,7 @@ function PMA_buildForeignDropdown($foreign, $data, $mode) } foreach ($foreign as $key => $value) { - if ($GLOBALS['PMA_String']::strlen($value) <= $GLOBALS['cfg']['LimitChars']) { + if ($GLOBALS['PMA_String']->strlen($value) <= $GLOBALS['cfg']['LimitChars']) { $vtitle = ''; $value = htmlspecialchars($value); } else { diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index 8dc503d588..66e19974d3 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -241,7 +241,8 @@ class PMA_Export_Relation_Schema echo ' ' . $error_message . "\n"; echo '' . "\n"; echo '' . __('Back') . ''; echo "\n"; exit; diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 7ba18b5728..dd0efacc24 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -9,6 +9,13 @@ if (! defined('PHPMYADMIN')) { exit; } +/** + * block attempts to directly run this script + */ +if (getcwd() == dirname(__FILE__)) { + die('Attack stopped'); +} + require_once 'Export_Relation_Schema.class.php'; require_once './libraries/PDF.class.php'; diff --git a/libraries/server_bin_log.lib.php b/libraries/server_bin_log.lib.php index 55e92ef713..a47282969e 100644 --- a/libraries/server_bin_log.lib.php +++ b/libraries/server_bin_log.lib.php @@ -233,10 +233,10 @@ function PMA_getAllLogItemInfo($result, $dontlimitchars) $html = ""; $odd_row = true; while ($value = $GLOBALS['dbi']->fetchAssoc($result)) { - $len_info = $GLOBALS['PMA_String']::strlen($value['Info']); + $len_info = $GLOBALS['PMA_String']->strlen($value['Info']); $len_limitChars = $GLOBALS['cfg']['LimitChars']; if (! $dontlimitchars && $len_info > $len_limitChars) { - $value['Info'] = $GLOBALS['PMA_String']::substr( + $value['Info'] = $GLOBALS['PMA_String']->substr( $value['Info'], 0, $GLOBALS['cfg']['LimitChars'] ) . '...'; } diff --git a/libraries/server_status.lib.php b/libraries/server_status.lib.php index 3f2dbd79d1..cef78c9fef 100644 --- a/libraries/server_status.lib.php +++ b/libraries/server_status.lib.php @@ -519,12 +519,12 @@ function PMA_getHtmlForServerProcessItem($process, $odd_row, $show_full_sql) $retval = '1';
- var_dump(PMA_STR_isSqlIdentifier($c, false));
+ var_dump($GLOBALS['PMA_String']->isSqlIdentifier($c, false));
var_dump($c == '@');
var_dump($c == '.');
- var_dump($GLOBALS['PMA_StringType']::isDigit($GLOBALS['PMA_String']::substr($sql, $count2 + 1, 1)));
+ var_dump($GLOBALS['PMA_String']->isDigit($GLOBALS['PMA_String']->substr($sql, $count2 + 1, 1)));
var_dump($previous_was_space);
var_dump($previous_was_bracket);
var_dump($previous_was_listsep);
@@ -495,14 +495,14 @@ function PMA_SQP_parse($sql)
*/
// Checks for identifier (alpha or numeric)
- if (PMA_STR_isSqlIdentifier($c, false)
+ if ($GLOBALS['PMA_String']->isSqlIdentifier($c, false)
|| $c == '@'
|| ($c == '.'
- && $GLOBALS['PMA_StringType']::isDigit($GLOBALS['PMA_String']::substr($sql, $count2 + 1, 1))
+ && $GLOBALS['PMA_String']->isDigit($GLOBALS['PMA_String']->substr($sql, $count2 + 1, 1))
&& ($previous_was_space || $previous_was_bracket || $previous_was_listsep))
) {
/* DEBUG
- echo $GLOBALS['PMA_String']::substr($sql, $count2);
+ echo $GLOBALS['PMA_String']->substr($sql, $count2);
echo '
';
*/
@@ -519,13 +519,13 @@ function PMA_SQP_parse($sql)
$is_digit = (
!$is_identifier
&& !$is_sql_variable
- && $GLOBALS['PMA_StringType']::isDigit($c)
+ && $GLOBALS['PMA_String']->isDigit($c)
);
$is_hex_digit = (
$is_digit
&& $c == '0'
&& $count2 < $len
- && $GLOBALS['PMA_String']::substr($sql, $count2, 1) == 'x'
+ && $GLOBALS['PMA_String']->substr($sql, $count2, 1) == 'x'
);
$is_float_digit = $c == '.';
$is_float_digit_exponent = false;
@@ -555,8 +555,8 @@ function PMA_SQP_parse($sql)
unset($pos);
}
- while (($count2 < $len) && PMA_STR_isSqlIdentifier($GLOBALS['PMA_String']::substr($sql, $count2, 1), ($is_sql_variable || $is_digit))) {
- $c2 = $GLOBALS['PMA_String']::substr($sql, $count2, 1);
+ while (($count2 < $len) && $GLOBALS['PMA_String']->isSqlIdentifier($GLOBALS['PMA_String']->substr($sql, $count2, 1), ($is_sql_variable || $is_digit))) {
+ $c2 = $GLOBALS['PMA_String']->substr($sql, $count2, 1);
if ($is_sql_variable && ($c2 == '.')) {
$count2++;
continue;
@@ -570,7 +570,7 @@ function PMA_SQP_parse($sql)
$debugstr = __('Invalid Identifer')
. ' @ ' . ($count1+1) . "\n"
. 'STR: ' . htmlspecialchars(
- $GLOBALS['PMA_String']::substr($sql, $count1, $count2 - $count1)
+ $GLOBALS['PMA_String']->substr($sql, $count1, $count2 - $count1)
);
PMA_SQP_throwError($debugstr, $sql);
return $sql_array;
@@ -587,7 +587,7 @@ function PMA_SQP_parse($sql)
$is_float_digit = false;
}
}
- if (($is_hex_digit && $GLOBALS['PMA_StringType']::isHexDigit($c2)) || ($is_digit && $GLOBALS['PMA_StringType']::isDigit($c2))) {
+ if (($is_hex_digit && $GLOBALS['PMA_String']->isHexDigit($c2)) || ($is_digit && $GLOBALS['PMA_String']->isDigit($c2))) {
$count2++;
continue;
} else {
@@ -599,7 +599,7 @@ function PMA_SQP_parse($sql)
} // end while
$l = $count2 - $count1;
- $str = $GLOBALS['PMA_String']::substr($sql, $count1, $l);
+ $str = $GLOBALS['PMA_String']->substr($sql, $count1, $l);
$type = '';
if ($is_digit || $is_float_digit || $is_hex_digit) {
@@ -624,15 +624,15 @@ function PMA_SQP_parse($sql)
}
// Checks for punct
- if ($GLOBALS['PMA_String']::strpos($allpunct_list, $c) !== false) {
- while (($count2 < $len) && $GLOBALS['PMA_String']::strpos($allpunct_list, $GLOBALS['PMA_String']::substr($sql, $count2, 1)) !== false) {
+ if ($GLOBALS['PMA_String']->strpos($allpunct_list, $c) !== false) {
+ while (($count2 < $len) && $GLOBALS['PMA_String']->strpos($allpunct_list, $GLOBALS['PMA_String']->substr($sql, $count2, 1)) !== false) {
$count2++;
}
$l = $count2 - $count1;
if ($l == 1) {
$punct_data = $c;
} else {
- $punct_data = $GLOBALS['PMA_String']::substr($sql, $count1, $l);
+ $punct_data = $GLOBALS['PMA_String']->substr($sql, $count1, $l);
}
// Special case, sometimes, althought two characters are
@@ -673,12 +673,12 @@ function PMA_SQP_parse($sql)
if (($first == ',') || ($first == ';') || ($first == '.') || ($first == '*')) {
$count2 = $count1 + 1;
$punct_data = $first;
- } elseif (($last2 == '/*') || (($last2 == '--') && ($count2 == $len || $GLOBALS['PMA_String']::substr($sql, $count2, 1) <= ' '))) {
+ } elseif (($last2 == '/*') || (($last2 == '--') && ($count2 == $len || $GLOBALS['PMA_String']->substr($sql, $count2, 1) <= ' '))) {
$count2 -= 2;
- $punct_data = $GLOBALS['PMA_String']::substr($sql, $count1, $count2 - $count1);
+ $punct_data = $GLOBALS['PMA_String']->substr($sql, $count1, $count2 - $count1);
} elseif (($last == '-') || ($last == '+') || ($last == '!')) {
$count2--;
- $punct_data = $GLOBALS['PMA_String']::substr($sql, $count1, $count2 - $count1);
+ $punct_data = $GLOBALS['PMA_String']->substr($sql, $count1, $count2 - $count1);
} elseif ($last != '~') {
/**
* @todo for negation operator, split in 2 tokens ?
@@ -701,7 +701,7 @@ function PMA_SQP_parse($sql)
$count2++;
$debugstr = 'C1 C2 LEN: ' . $count1 . ' ' . $count2 . ' ' . $len . "\n"
- . 'STR: ' . $GLOBALS['PMA_String']::substr($sql, $count1, $count2 - $count1) . "\n";
+ . 'STR: ' . $GLOBALS['PMA_String']->substr($sql, $count1, $count2 - $count1) . "\n";
PMA_SQP_bug($debugstr, $sql);
return $sql_array;
@@ -1810,10 +1810,10 @@ function PMA_SQP_analyze($arr)
$seen_order_by = true;
// Here we assume that the ORDER BY keywords took
// exactly 8 characters.
- // We use $GLOBALS['PMA_String']::substr() to be charset-safe; otherwise
+ // We use $GLOBALS['PMA_String']->substr() to be charset-safe; otherwise
// if the table name contains accents, the unsorted
// query would be missing some characters.
- $unsorted_query = $GLOBALS['PMA_String']::substr(
+ $unsorted_query = $GLOBALS['PMA_String']->substr(
$arr['raw'], 0, $arr[$i]['pos'] - 8
);
$in_order_by = true;
diff --git a/libraries/string.inc.php b/libraries/string.inc.php
new file mode 100644
index 0000000000..7248e9456a
--- /dev/null
+++ b/libraries/string.inc.php
@@ -0,0 +1,18 @@
+
\ No newline at end of file
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
deleted file mode 100644
index cc5fedb444..0000000000
--- a/libraries/string.lib.php
+++ /dev/null
@@ -1,105 +0,0 @@
-= $start && $GLOBALS['PMA_String']::substr($string, $pos, 1) == '\\') {
- $escaped = !$escaped;
- $pos--;
- } // end while
-
- return $escaped;
-} // end of the "PMA_STR_charIsEscaped()" function
-
-
-/**
- * Checks if a number is in a range
- *
- * @param integer $num number to check for
- * @param integer $lower lower bound
- * @param integer $upper upper bound
- *
- * @return boolean whether the number is in the range or not
- */
-function PMA_STR_numberInRangeInclusive($num, $lower, $upper)
-{
- return ($num >= $lower && $num <= $upper);
-} // end of the "PMA_STR_numberInRangeInclusive()" function
-
-/**
- * Checks if a character is an SQL identifier
- *
- * @param string $c character to check for
- * @param boolean $dot_is_valid whether the dot character is valid or not
- *
- * @return boolean whether the character is an SQL identifier or not
- */
-function PMA_STR_isSqlIdentifier($c, $dot_is_valid = false)
-{
- return ($GLOBALS['PMA_StringType']::isAlnum($c)
- || ($ord_c = ord($c)) && $ord_c >= 192 && $ord_c != 215 && $ord_c != 249
- || $c == '_'
- || $c == '$'
- || ($dot_is_valid != false && $c == '.'));
-} // end of the "PMA_STR_isSqlIdentifier()" function
-
-?>
diff --git a/navigation.php b/navigation.php
index 4b4b3b36f7..2c35311e50 100644
--- a/navigation.php
+++ b/navigation.php
@@ -1,7 +1,7 @@
isAjax()) {
- $navigation = new PMA_Navigation();
- $response->addJSON('message', $navigation->getDisplay());
-} else {
+$navigation = new PMA_Navigation();
+if (! $response->isAjax()) {
$response->addHTML(
PMA_Message::error(
__('Fatal error: The navigation can only be accessed via AJAX')
)
);
+ exit;
}
+
+$cfgRelation = PMA_getRelationsParam();
+if ($cfgRelation['navwork']) {
+ if (isset($_REQUEST['hideNavItem'])) {
+ if (! empty($_REQUEST['itemName'])
+ && ! empty($_REQUEST['itemType'])
+ && ! empty($_REQUEST['dbName'])
+ ) {
+ $navigation->hideNavigationItem(
+ $_REQUEST['itemName'],
+ $_REQUEST['itemType'],
+ $_REQUEST['dbName'],
+ (! empty($_REQUEST['tableName']) ? $_REQUEST['tableName'] : null)
+ );
+ }
+ exit;
+ }
+
+ if (isset($_REQUEST['unhideNavItem'])) {
+ if (! empty($_REQUEST['itemName'])
+ && ! empty($_REQUEST['itemType'])
+ && ! empty($_REQUEST['dbName'])
+ ) {
+ $navigation->unhideNavigationItem(
+ $_REQUEST['itemName'],
+ $_REQUEST['itemType'],
+ $_REQUEST['dbName'],
+ (! empty($_REQUEST['tableName']) ? $_REQUEST['tableName'] : null)
+ );
+ }
+ exit;
+ }
+
+ if (isset($_REQUEST['showUnhideDialog'])) {
+ if (! empty($_REQUEST['dbName'])) {
+ $response->addJSON(
+ 'message',
+ $navigation->getItemUnhideDialog($_REQUEST['dbName'])
+ );
+ }
+ exit;
+ }
+}
+
+// Do the magic
+$response->addJSON('message', $navigation->getDisplay());
?>
diff --git a/pmd_pdf.php b/pmd_pdf.php
index cde96f1efb..725d44c202 100644
--- a/pmd_pdf.php
+++ b/pmd_pdf.php
@@ -8,6 +8,13 @@
require_once './libraries/common.inc.php';
require_once 'libraries/pmd_common.php';
+/**
+ * Validate vulnerable POST parameters
+ */
+if (isset($_POST['scale']) && ! PMA_isValid($_POST['scale'], 'numeric')) {
+ die('Attack stopped');
+}
+
/**
* Sets globals from $_POST
*/
diff --git a/schema_export.php b/schema_export.php
index 069347a0b3..2817c384dc 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -11,6 +11,13 @@
require_once 'libraries/common.inc.php';
require 'libraries/StorageEngine.class.php';
+/**
+ * Validate vulnerable POST parameters
+ */
+if (! PMA_isValid($_POST['pdf_page_number'], 'numeric')) {
+ die('Attack stopped');
+}
+
/**
* get all variables needed for exporting relational schema
* in $cfgRelation
diff --git a/server_status.php b/server_status.php
index c2ef016a36..dc7b19c1d9 100644
--- a/server_status.php
+++ b/server_status.php
@@ -51,5 +51,4 @@ $response->addHTML(PMA_getHtmlForServerStatus($ServerStatusData));
$response->addHTML('');
exit;
-
?>
diff --git a/setup/frames/.htaccess b/setup/frames/.htaccess
deleted file mode 100644
index 56baee608b..0000000000
--- a/setup/frames/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-# This folder does not require access over HTTP
-# (the following directive denies access by default)
-Order allow,deny
diff --git a/setup/lib/.htaccess b/setup/lib/.htaccess
deleted file mode 100644
index 56baee608b..0000000000
--- a/setup/lib/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-# This folder does not require access over HTTP
-# (the following directive denies access by default)
-Order allow,deny
diff --git a/test/classes/dbi/DBIMysql_test.php b/test/classes/dbi/DBIMysql_test.php
new file mode 100644
index 0000000000..d5f0253da9
--- /dev/null
+++ b/test/classes/dbi/DBIMysql_test.php
@@ -0,0 +1,154 @@
+object = new PMA_DBI_Mysql();
+ }
+
+ /**
+ * Tears down the fixture, for example, closes a network connection.
+ * This method is called after a test is executed.
+ *
+ * @access protected
+ * @return void
+ */
+ protected function tearDown()
+ {
+ unset($this->object);
+ }
+
+ /**
+ * Test for realMultiQuery
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testRealMultiQuery()
+ {
+ //PHP's 'mysql' extension does not support multi_queries
+ $this->assertEquals(
+ false,
+ $this->object->realMultiQuery(null, "select * from PMA")
+ );
+ }
+
+ /**
+ * Test for selectDb
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testSelectDb()
+ {
+ //$link is empty
+ $GLOBALS['userlink'] = null;
+ $this->assertEquals(
+ false,
+ $this->object->selectDb("PMA")
+ );
+ }
+
+ /**
+ * Test for moreResults
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testMoreResults()
+ {
+ //PHP's 'mysql' extension does not support multi_queries
+ $this->assertEquals(
+ false,
+ $this->object->moreResults()
+ );
+ //PHP's 'mysql' extension does not support multi_queries
+ $this->assertEquals(
+ false,
+ $this->object->nextResult()
+ );
+ }
+
+ /**
+ * Test for getClientInfo
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testGetClientInfo()
+ {
+ $this->assertEquals(
+ mysql_get_client_info(),
+ $this->object->getClientInfo()
+ );
+ }
+
+ /**
+ * Test for numRows
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testNumRows()
+ {
+ $this->assertEquals(
+ false,
+ $this->object->numRows(true)
+ );
+ }
+
+ /**
+ * Test for storeResult
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testStoreResult()
+ {
+ $this->assertEquals(
+ false,
+ $this->object->storeResult()
+ );
+ }
+}
diff --git a/test/classes/dbi/DBIMysqli_test.php b/test/classes/dbi/DBIMysqli_test.php
new file mode 100644
index 0000000000..64b90372ad
--- /dev/null
+++ b/test/classes/dbi/DBIMysqli_test.php
@@ -0,0 +1,102 @@
+object = new PMA_DBI_Mysqli();
+ }
+
+ /**
+ * Tears down the fixture, for example, closes a network connection.
+ * This method is called after a test is executed.
+ *
+ * @access protected
+ * @return void
+ */
+ protected function tearDown()
+ {
+ unset($this->object);
+ }
+
+ /**
+ * Test for selectDb
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testSelectDb()
+ {
+ //$link is empty
+ $GLOBALS['userlink'] = null;
+ $this->assertEquals(
+ false,
+ $this->object->selectDb("PMA")
+ );
+ }
+
+ /**
+ * Test for getClientInfo
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testGetClientInfo()
+ {
+ $this->assertEquals(
+ mysql_get_client_info(),
+ $this->object->getClientInfo()
+ );
+ }
+
+ /**
+ * Test for numRows
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testNumRows()
+ {
+ $this->assertEquals(
+ 0,
+ $this->object->numRows(true)
+ );
+ }
+}
diff --git a/test/classes/plugin/import/ImportOds_test.php b/test/classes/plugin/import/ImportOds_test.php
index 313fc7b398..ef569184e0 100644
--- a/test/classes/plugin/import/ImportOds_test.php
+++ b/test/classes/plugin/import/ImportOds_test.php
@@ -4,7 +4,7 @@
*
* @package PhpMyAdmin-test
*/
-
+
/*
* we must set $GLOBALS['server'] here
* since 'check_user_privileges.lib.php' will use it globally
@@ -47,11 +47,11 @@ class ImportOds_Test extends PHPUnit_Framework_TestCase
* @return void
*/
protected function setUp()
- {
- $GLOBALS['plugin_param'] = "csv";
- $this->object = new ImportOds();
+ {
+ $GLOBALS['plugin_param'] = "csv";
+ $this->object = new ImportOds();
- //setting
+ //setting
$GLOBALS['finished'] = false;
$GLOBALS['read_limit'] = 100000000;
$GLOBALS['offset'] = 0;
@@ -59,20 +59,20 @@ class ImportOds_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['ServerDefault'] = 0;
$GLOBALS['cfg']['AllowUserDropDatabase'] = false;
$GLOBALS['cfg']['MySQLManualType'] = 'none';
-
+
$GLOBALS['import_file'] = 'test/test_data/db_test.ods';
-
+
/**
* Load interface for zip extension.
*/
include_once 'libraries/zip_extension.lib.php';
$result = PMA_getZipContents($GLOBALS['import_file']);
$GLOBALS['import_text'] = $result["data"];
- $GLOBALS['compression'] = 'application/zip';
+ $GLOBALS['compression'] = 'application/zip';
$GLOBALS['read_multiply'] = 10;
$GLOBALS['import_type'] = 'ods';
$GLOBALS['import_handle'] = @fopen($GLOBALS['import_file'], 'r');
-
+
//varible for Ods
$_REQUEST['ods_recognize_percentages'] = true;
$_REQUEST['ods_recognize_currency'] = true;
@@ -90,7 +90,7 @@ class ImportOds_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getProperties
*
@@ -104,17 +104,17 @@ class ImportOds_Test extends PHPUnit_Framework_TestCase
$this->assertEquals(
__('OpenDocument Spreadsheet'),
$properties->getText()
- );
+ );
$this->assertEquals(
'ods',
$properties->getExtension()
- );
+ );
$this->assertEquals(
__('Options'),
$properties->getOptionsText()
- );
+ );
}
-
+
/**
* Test for doImport
*
@@ -128,57 +128,57 @@ class ImportOds_Test extends PHPUnit_Framework_TestCase
//$import_notice will show the import detail result
global $import_notice, $sql_query, $sql_query_disabled;
$sql_query_disabled = false;
-
+
//Mock DBI
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
->disableOriginalConstructor()
->getMock();
$GLOBALS['dbi'] = $dbi;
-
+
//Test function called
$this->object->doImport();
-
- //asset that all sql are executed
+
+ //asset that all sql are executed
$this->assertContains(
'CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci',
$sql_query
- );
+ );
$this->assertContains(
'CREATE TABLE IF NOT EXISTS `ODS_DB`.`pma_bookmark`',
$sql_query
- );
+ );
$this->assertContains(
"INSERT INTO `ODS_DB`.`pma_bookmark` (`A`, `B`, `C`, `D`) VALUES (1, 'dbbase', NULL, 'ddd');",
$sql_query
- );
-
+ );
+
//asset that all databases and tables are imported
$this->assertContains(
'The following structures have either been created or altered.',
$import_notice
- );
+ );
$this->assertContains(
'Go to database: `ODS_DB`',
$import_notice
- );
+ );
$this->assertContains(
'Edit settings for `ODS_DB`',
$import_notice
- );
+ );
$this->assertContains(
'Go to table: `pma_bookmark`',
$import_notice
- );
+ );
$this->assertContains(
'Edit settings for `pma_bookmark`',
$import_notice
);
-
+
//asset that the import process is finished
$this->assertEquals(
true,
$GLOBALS['finished']
- );
+ );
}
}
diff --git a/test/classes/plugin/transformations/Image_JPEG_Inline_test.php b/test/classes/plugin/transformations/Image_JPEG_Inline_test.php
index 854267ce3c..5f491dcb23 100644
--- a/test/classes/plugin/transformations/Image_JPEG_Inline_test.php
+++ b/test/classes/plugin/transformations/Image_JPEG_Inline_test.php
@@ -34,7 +34,7 @@ class Image_JPEG_Inline_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Image_JPEG_Inline(new PluginManager());
+ $this->object = new Image_JPEG_Inline(new PluginManager());
}
/**
@@ -48,7 +48,7 @@ class Image_JPEG_Inline_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -58,14 +58,12 @@ class Image_JPEG_Inline_Test extends PHPUnit_Framework_TestCase
*/
public function testGetInfo()
{
- $info =
- 'Displays a clickable thumbnail. The options are the maximum width'
+ $info = 'Displays a clickable thumbnail. The options are the maximum width'
. ' and height in pixels. The original aspect ratio is preserved.';
- $this->assertEquals(
+ $this->assertEquals(
$info,
Image_JPEG_Inline::getInfo()
- );
-
+ );
}
/**
@@ -76,11 +74,11 @@ class Image_JPEG_Inline_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"Inline",
Image_JPEG_Inline::getName()
- );
+ );
}
/**
@@ -91,11 +89,11 @@ class Image_JPEG_Inline_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Image",
Image_JPEG_Inline::getMIMEType()
- );
+ );
}
/**
@@ -106,11 +104,11 @@ class Image_JPEG_Inline_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"JPEG",
Image_JPEG_Inline::getMIMESubtype()
- );
+ );
}
/**
@@ -124,13 +122,13 @@ class Image_JPEG_Inline_Test extends PHPUnit_Framework_TestCase
{
$buffer = "PMA_JPEG_Inline";
$options = array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link");
- $result = '
';
$this->assertEquals(
$result,
$this->object->applyTransformation($buffer, $options)
- );
+ );
}
}
diff --git a/test/classes/plugin/transformations/Image_Link_test.php b/test/classes/plugin/transformations/Image_Link_test.php
index ab3eef45ea..d5c72e062d 100644
--- a/test/classes/plugin/transformations/Image_Link_test.php
+++ b/test/classes/plugin/transformations/Image_Link_test.php
@@ -34,7 +34,7 @@ class Image_JPEG_Link_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Image_JPEG_Link(new PluginManager());
+ $this->object = new Image_JPEG_Link(new PluginManager());
}
/**
@@ -48,7 +48,7 @@ class Image_JPEG_Link_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -58,14 +58,12 @@ class Image_JPEG_Link_Test extends PHPUnit_Framework_TestCase
*/
public function testGetInfo()
{
- $info = __(
- 'Displays a link to download this image.'
- );
- $this->assertEquals(
+ $info = __('Displays a link to download this image.');
+ $this->assertEquals(
$info,
Image_JPEG_Link::getInfo()
- );
-
+ );
+
}
/**
@@ -76,11 +74,11 @@ class Image_JPEG_Link_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"ImageLink",
Image_JPEG_Link::getName()
- );
+ );
}
/**
@@ -91,11 +89,11 @@ class Image_JPEG_Link_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Image",
Image_JPEG_Link::getMIMEType()
- );
+ );
}
/**
@@ -106,11 +104,11 @@ class Image_JPEG_Link_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"JPEG",
Image_JPEG_Link::getMIMESubtype()
- );
+ );
}
/**
@@ -124,11 +122,11 @@ class Image_JPEG_Link_Test extends PHPUnit_Framework_TestCase
{
$buffer = "PMA_IMAGE_LINK";
$options = array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link");
- $result = '[BLOB]';
$this->assertEquals(
$result,
$this->object->applyTransformation($buffer, $options)
- );
+ );
}
}
diff --git a/test/classes/plugin/transformations/Image_PNG_Inline_test.php b/test/classes/plugin/transformations/Image_PNG_Inline_test.php
index e031566447..2facf47d8e 100644
--- a/test/classes/plugin/transformations/Image_PNG_Inline_test.php
+++ b/test/classes/plugin/transformations/Image_PNG_Inline_test.php
@@ -34,7 +34,7 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Image_PNG_Inline(new PluginManager());
+ $this->object = new Image_PNG_Inline(new PluginManager());
}
/**
@@ -48,7 +48,7 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -58,14 +58,13 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
*/
public function testGetInfo()
{
- $info =
- 'Displays a clickable thumbnail. The options are the maximum width'
+ $info = 'Displays a clickable thumbnail. The options are the maximum width'
. ' and height in pixels. The original aspect ratio is preserved.';
- $this->assertEquals(
+ $this->assertEquals(
$info,
Image_PNG_Inline::getInfo()
- );
-
+ );
+
}
/**
@@ -76,11 +75,11 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"Inline",
Image_PNG_Inline::getName()
- );
+ );
}
/**
@@ -91,11 +90,11 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Image",
Image_PNG_Inline::getMIMEType()
- );
+ );
}
/**
@@ -106,11 +105,11 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"PNG",
Image_PNG_Inline::getMIMESubtype()
- );
+ );
}
/**
@@ -124,13 +123,13 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
{
$buffer = "PMA_PNG_Inline";
$options = array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link");
- $result = '
';
$this->assertEquals(
$result,
$this->object->applyTransformation($buffer, $options)
- );
+ );
}
}
diff --git a/test/classes/plugin/transformations/Text_Plain_Dateformat_test.php b/test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
index 22a1fabfa1..c930e27bd5 100644
--- a/test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
@@ -36,7 +36,7 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Text_Plain_Dateformat(new PluginManager());
+ $this->object = new Text_Plain_Dateformat(new PluginManager());
}
/**
@@ -50,7 +50,7 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -69,12 +69,12 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
. ' that, date format has different value - for "local" see the'
. ' documentation for PHP\'s strftime() function and for "utc" it'
. ' is done using gmdate() function.';
-
- $this->assertEquals(
+
+ $this->assertEquals(
$info,
Text_Plain_Dateformat::getInfo()
- );
-
+ );
+
}
/**
@@ -85,11 +85,11 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"Date Format",
Text_Plain_Dateformat::getName()
- );
+ );
}
/**
@@ -100,11 +100,11 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Text",
Text_Plain_Dateformat::getMIMEType()
- );
+ );
}
/**
@@ -115,11 +115,11 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"Plain",
Text_Plain_Dateformat::getMIMESubtype()
- );
+ );
}
/**
@@ -143,11 +143,11 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
$result,
$this->object->applyTransformation($timestamp, $options, $meta)
);
-
- //other format timestamp, Detect TIMESTAMP(6 | 8 | 10 | 12 | 14)
+
+ //other format timestamp, Detect TIMESTAMP(6 | 8 | 10 | 12 | 14)
$meta->type = 'string';
$timestamp = 12345678;
- $result = ''
+ $result = ''
. 'May 23, 1970 at 09:21 PM';
$this->assertEquals(
$result,
@@ -156,7 +156,7 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
//no MYSQL timestamp
$timestamp = 123456789;
- $result = ''
+ $result = ''
. 'Nov 29, 1973 at 09:33 PM';
$this->assertEquals(
$result,
@@ -170,8 +170,8 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
$result,
$this->object->applyTransformation($timestamp, $options, $meta)
);
-
-
+
+
}
}
@@ -179,5 +179,5 @@ class Text_Plain_Dateformat_Meta
{
var $blob = null;
var $max_length = null;
- var $type = null;
+ var $type = null;
}
\ No newline at end of file
diff --git a/test/classes/plugin/transformations/Text_Plain_Download_test.php b/test/classes/plugin/transformations/Text_Plain_Download_test.php
index 5d12f94aac..49df7c3159 100644
--- a/test/classes/plugin/transformations/Text_Plain_Download_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Download_test.php
@@ -36,7 +36,7 @@ class Application_Octetstream_Download_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Application_Octetstream_Download(new PluginManager());
+ $this->object = new Application_Octetstream_Download(new PluginManager());
global $row, $fields_meta;
$fields_meta = array();
$row = array("pma"=>"aaa", "pca"=>"bbb");
@@ -53,7 +53,7 @@ class Application_Octetstream_Download_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -63,17 +63,16 @@ class Application_Octetstream_Download_Test extends PHPUnit_Framework_TestCase
*/
public function testGetInfo()
{
- $info =
- 'Displays a link to download the binary data of the column. You can'
+ $info = 'Displays a link to download the binary data of the column. You can'
. ' use the first option to specify the filename, or use the second'
. ' option as the name of a column which contains the filename. If'
. ' you use the second option, you need to set the first option to'
- . ' the empty string.';
+ . ' the empty string.';
$this->assertEquals(
$info,
Application_Octetstream_Download::getInfo()
- );
-
+ );
+
}
/**
@@ -84,11 +83,11 @@ class Application_Octetstream_Download_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"Download",
Application_Octetstream_Download::getName()
- );
+ );
}
/**
@@ -99,11 +98,11 @@ class Application_Octetstream_Download_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Application",
Application_Octetstream_Download::getMIMEType()
- );
+ );
}
/**
@@ -114,11 +113,11 @@ class Application_Octetstream_Download_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"OctetStream",
Application_Octetstream_Download::getMIMESubtype()
- );
+ );
}
/**
@@ -132,18 +131,18 @@ class Application_Octetstream_Download_Test extends PHPUnit_Framework_TestCase
{
$buffer = "PMA_BUFFER";
$options = array("filename", 'wrapper_link'=>'PMA_wrapper_link');
- $result = 'filename';
$this->assertEquals(
$result,
$this->object->applyTransformation($buffer, $options)
- );
-
+ );
+
//using default filename: binary_file.dat
$options = array("", 'cloumn', 'wrapper_link'=>'PMA_wrapper_link');
- $result = 'binary_file.dat';
$this->assertEquals(
$result,
diff --git a/test/classes/plugin/transformations/Text_Plain_External_test.php b/test/classes/plugin/transformations/Text_Plain_External_test.php
index da65caa2bf..c8c3b3c786 100644
--- a/test/classes/plugin/transformations/Text_Plain_External_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_External_test.php
@@ -35,7 +35,7 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Text_Plain_External(new PluginManager());
+ $this->object = new Text_Plain_External(new PluginManager());
}
/**
@@ -49,7 +49,7 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -59,8 +59,8 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
*/
public function testGetInfo()
{
- $info =
- 'LINUX ONLY: Launches an external application and feeds it the column'
+ $info
+ = 'LINUX ONLY: Launches an external application and feeds it the column'
. ' data via standard input. Returns the standard output of the'
. ' application. The default is Tidy, to pretty-print HTML code.'
. ' For security reasons, you have to manually edit the file'
@@ -71,12 +71,12 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
. ' The third option, if set to 1, will convert the output using'
. ' htmlspecialchars() (Default 1). The fourth option, if set to 1,'
. ' will prevent wrapping and ensure that the output appears all on'
- . ' one line (Default 1).';
+ . ' one line (Default 1).';
$this->assertEquals(
$info,
Text_Plain_External::getInfo()
- );
-
+ );
+
}
/**
@@ -87,11 +87,11 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"External",
Text_Plain_External::getName()
- );
+ );
}
/**
@@ -102,11 +102,11 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Text",
Text_Plain_External::getMIMEType()
- );
+ );
}
/**
@@ -117,11 +117,11 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"Plain",
Text_Plain_External::getMIMESubtype()
- );
+ );
}
/**
@@ -138,7 +138,7 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
$this->assertEquals(
"PMA_BUFFER",
$this->object->applyTransformation($buffer, $options)
- );
+ );
}
/**
@@ -154,21 +154,21 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
$this->assertEquals(
true,
$this->object->applyTransformationNoWrap($options)
- );
+ );
$options = array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q", "/dev/null -i -wrap -q", 1);
$this->assertEquals(
true,
$this->object->applyTransformationNoWrap($options)
- );
+ );
$options = array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q", "/dev/null -i -wrap -q", "1");
$this->assertEquals(
true,
$this->object->applyTransformationNoWrap($options)
- );
+ );
$options = array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q", "/dev/null -i -wrap -q", 2);
$this->assertEquals(
false,
$this->object->applyTransformationNoWrap($options)
- );
+ );
}
}
diff --git a/test/classes/plugin/transformations/Text_Plain_Formatted_test.php b/test/classes/plugin/transformations/Text_Plain_Formatted_test.php
index 93484fd260..3d95c1c0e8 100644
--- a/test/classes/plugin/transformations/Text_Plain_Formatted_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Formatted_test.php
@@ -34,7 +34,7 @@ class Text_Plain_Formatted_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Text_Plain_Formatted(new PluginManager());
+ $this->object = new Text_Plain_Formatted(new PluginManager());
}
/**
@@ -48,7 +48,7 @@ class Text_Plain_Formatted_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -58,15 +58,14 @@ class Text_Plain_Formatted_Test extends PHPUnit_Framework_TestCase
*/
public function testGetInfo()
{
- $info =
- 'Displays the contents of the column as-is, without running it'
+ $info = 'Displays the contents of the column as-is, without running it'
. ' through htmlspecialchars(). That is, the column is assumed'
. ' to contain valid HTML.';
$this->assertEquals(
$info,
Text_Plain_Formatted::getInfo()
- );
-
+ );
+
}
/**
@@ -77,11 +76,11 @@ class Text_Plain_Formatted_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"Formatted",
Text_Plain_Formatted::getName()
- );
+ );
}
/**
@@ -92,11 +91,11 @@ class Text_Plain_Formatted_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Text",
Text_Plain_Formatted::getMIMEType()
- );
+ );
}
/**
@@ -107,11 +106,11 @@ class Text_Plain_Formatted_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"Plain",
Text_Plain_Formatted::getMIMESubtype()
- );
+ );
}
/**
@@ -126,8 +125,8 @@ class Text_Plain_Formatted_Test extends PHPUnit_Framework_TestCase
$buffer = "PMA_BUFFER";
$options = array("option1", "option2");
$this->assertEquals(
- $buffer,
+ $buffer,
$this->object->applyTransformation($buffer, $options)
- );
+ );
}
}
diff --git a/test/classes/plugin/transformations/Text_Plain_Hex_test.php b/test/classes/plugin/transformations/Text_Plain_Hex_test.php
index c44d6103cf..fd074d1c75 100644
--- a/test/classes/plugin/transformations/Text_Plain_Hex_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Hex_test.php
@@ -35,7 +35,7 @@ class Application_Octetstream_Hex_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Application_Octetstream_Hex(new PluginManager());
+ $this->object = new Application_Octetstream_Hex(new PluginManager());
}
/**
@@ -49,7 +49,7 @@ class Application_Octetstream_Hex_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -59,15 +59,15 @@ class Application_Octetstream_Hex_Test extends PHPUnit_Framework_TestCase
*/
public function testGetInfo()
{
- $info =
- 'Displays hexadecimal representation of data. Optional first'
+ $info
+ = 'Displays hexadecimal representation of data. Optional first'
. ' parameter specifies how often space will be added (defaults'
. ' to 2 nibbles).';
$this->assertEquals(
$info,
Application_Octetstream_Hex::getInfo()
- );
-
+ );
+
}
/**
@@ -78,11 +78,11 @@ class Application_Octetstream_Hex_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"Hex",
Application_Octetstream_Hex::getName()
- );
+ );
}
/**
@@ -93,11 +93,11 @@ class Application_Octetstream_Hex_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Application",
Application_Octetstream_Hex::getMIMEType()
- );
+ );
}
/**
@@ -108,11 +108,11 @@ class Application_Octetstream_Hex_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"OctetStream",
Application_Octetstream_Hex::getMIMESubtype()
- );
+ );
}
/**
@@ -129,21 +129,21 @@ class Application_Octetstream_Hex_Test extends PHPUnit_Framework_TestCase
$this->assertEquals(
"313 131 313 130 303 1 ",
$this->object->applyTransformation($buffer, $options)
- );
-
+ );
+
$buffer = "11111001";
$options = array(0);
$this->assertEquals(
"3131313131303031",
$this->object->applyTransformation($buffer, $options)
- );
-
- //no option
+ );
+
+ //no option
$buffer = "11111001";
$this->assertEquals(
"31 31 31 31 31 30 30 31 ",
$this->object->applyTransformation($buffer)
- );
-
+ );
+
}
}
diff --git a/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php b/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
index 7a88c08350..c19abea4d7 100644
--- a/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
@@ -18,7 +18,7 @@ require_once 'libraries/plugins/transformations/Text_Plain_Imagelink.class.php';
*
* @package PhpMyAdmin-test
*/
-class Text_Plain_Imagelink_test extends PHPUnit_Framework_TestCase
+class Text_Plain_Imagelink_Test extends PHPUnit_Framework_TestCase
{
/**
* @access protected
@@ -34,7 +34,7 @@ class Text_Plain_Imagelink_test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Text_Plain_Imagelink(new PluginManager());
+ $this->object = new Text_Plain_Imagelink(new PluginManager());
}
/**
@@ -48,7 +48,7 @@ class Text_Plain_Imagelink_test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -58,15 +58,15 @@ class Text_Plain_Imagelink_test extends PHPUnit_Framework_TestCase
*/
public function testGetInfo()
{
- $info = 'Displays an image and a link; '
- . 'the column contains the filename. The first option'
- . ' is a URL prefix like "http://www.example.com/". The second and third options'
- . ' are the width and the height in pixels.';
+ $info = 'Displays an image and a link; '
+ . 'the column contains the filename. The first option'
+ . ' is a URL prefix like "http://www.example.com/". The second and third options'
+ . ' are the width and the height in pixels.';
$this->assertEquals(
$info,
Text_Plain_Imagelink::getInfo()
- );
-
+ );
+
}
/**
@@ -77,11 +77,11 @@ class Text_Plain_Imagelink_test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"Image Link",
Text_Plain_Imagelink::getName()
- );
+ );
}
/**
@@ -92,11 +92,11 @@ class Text_Plain_Imagelink_test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Text",
Text_Plain_Imagelink::getMIMEType()
- );
+ );
}
/**
@@ -107,11 +107,11 @@ class Text_Plain_Imagelink_test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"Plain",
Text_Plain_Imagelink::getMIMESubtype()
- );
+ );
}
/**
@@ -125,12 +125,12 @@ class Text_Plain_Imagelink_test extends PHPUnit_Framework_TestCase
{
$buffer = "PMA_IMAGE";
$options = array("./image/", "200");
- $result = ''
- . '
PMA_IMAGE';
$this->assertEquals(
$result,
$this->object->applyTransformation($buffer, $options)
- );
+ );
}
}
diff --git a/test/classes/plugin/transformations/Text_Plain_Link_test.php b/test/classes/plugin/transformations/Text_Plain_Link_test.php
index 39ba902a14..60991f4f90 100644
--- a/test/classes/plugin/transformations/Text_Plain_Link_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Link_test.php
@@ -34,7 +34,7 @@ class Text_Plain_Link_Test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->object = new Text_Plain_Link(new PluginManager());
+ $this->object = new Text_Plain_Link(new PluginManager());
}
/**
@@ -48,7 +48,7 @@ class Text_Plain_Link_Test extends PHPUnit_Framework_TestCase
{
unset($this->object);
}
-
+
/**
* Test for getInfo
*
@@ -58,15 +58,15 @@ class Text_Plain_Link_Test extends PHPUnit_Framework_TestCase
*/
public function testGetInfo()
{
- $info =
- 'Displays a link; the column contains the filename. The first option'
+ $info
+ = 'Displays a link; the column contains the filename. The first option'
. ' is a URL prefix like "http://www.example.com/". The second option'
. ' is a title for the link.';
- $this->assertEquals(
+ $this->assertEquals(
$info,
Text_Plain_Link::getInfo()
- );
-
+ );
+
}
/**
@@ -77,11 +77,11 @@ class Text_Plain_Link_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetName()
- {
+ {
$this->assertEquals(
"TextLink",
Text_Plain_Link::getName()
- );
+ );
}
/**
@@ -92,11 +92,11 @@ class Text_Plain_Link_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMEType()
- {
+ {
$this->assertEquals(
"Text",
Text_Plain_Link::getMIMEType()
- );
+ );
}
/**
@@ -107,11 +107,11 @@ class Text_Plain_Link_Test extends PHPUnit_Framework_TestCase
* @group medium
*/
public function testGetMIMESubtype()
- {
+ {
$this->assertEquals(
"Plain",
Text_Plain_Link::getMIMESubtype()
- );
+ );
}
/**
@@ -125,11 +125,11 @@ class Text_Plain_Link_Test extends PHPUnit_Framework_TestCase
{
$buffer = "PMA_TXT_LINK";
$options = array("./php/", "text_name");
- $result = 'text_name';
$this->assertEquals(
$result,
$this->object->applyTransformation($buffer, $options)
- );
+ );
}
}
diff --git a/test/classes/schema/User_Schema_test.php b/test/classes/schema/User_Schema_test.php
new file mode 100644
index 0000000000..2c23bbb3db
--- /dev/null
+++ b/test/classes/schema/User_Schema_test.php
@@ -0,0 +1,172 @@
+getMockBuilder('PMA_DatabaseInterface')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $dbi->expects($this->any())
+ ->method('insertId')
+ ->will($this->returnValue(10));
+
+ $databases = array();
+ $database_name = 'PMA';
+ $databases[$database_name]['SCHEMA_TABLES'] = 1;
+ $databases[$database_name]['SCHEMA_TABLE_ROWS'] = 3;
+ $databases[$database_name]['SCHEMA_DATA_LENGTH'] = 5;
+ $databases[$database_name]['SCHEMA_MAX_DATA_LENGTH'] = 10;
+ $databases[$database_name]['SCHEMA_INDEX_LENGTH'] = 10;
+ $databases[$database_name]['SCHEMA_LENGTH'] = 10;
+ $databases[$database_name]['ENGINE'] = "InnerDB";
+
+ $dbi->expects($this->any())->method('getTablesFull')
+ ->will($this->returnValue($databases));
+
+ $GLOBALS['dbi'] = $dbi;
+
+ $this->object = new PMA_User_Schema();
+ }
+
+ /**
+ * Tears down the fixture, for example, closes a network connection.
+ * This method is called after a test is executed.
+ *
+ * @access protected
+ * @return void
+ */
+ protected function tearDown()
+ {
+ unset($this->object);
+ }
+
+ /**
+ * Test for setAction & processUserChoice
+ *
+ * @return void
+ *
+ * @group medium
+ */
+ public function testSetActionAndProcessUserChoice()
+ {
+ //action: selectpage
+ $_REQUEST['chpage'] = 10;
+ $_REQUEST['action_choose'] = '2';
+ $this->object->setAction("selectpage");
+ $this->object->processUserChoice();
+ $this->assertEquals(
+ "selectpage",
+ $this->object->action
+ );
+ $this->assertEquals(
+ 10,
+ $this->object->chosenPage
+ );
+
+ $_REQUEST['action_choose'] = '1';
+ $this->object->processUserChoice();
+ //deleteCoordinates successfully
+ $this->assertEquals(
+ 0,
+ $this->object->chosenPage
+ );
+
+ //action: createpage
+ $_POST['newpage'] = "3";
+ $_POST['auto_layout_foreign'] = true;
+ $_POST['auto_layout_internal'] = true;
+ $_POST['delrow'] = array("row1", "row2");
+ $_POST['chpage'] = "chpage";
+ $this->object->setAction("delete_old_references");
+ $this->object->processUserChoice();
+ $this->object->setAction("createpage");
+ $this->object->processUserChoice();
+ $this->assertEquals(
+ 10,
+ $this->object->pageNumber
+ );
+ $this->assertEquals(
+ "1",
+ $this->object->autoLayoutForeign
+ );
+ $this->assertEquals(
+ "1",
+ $this->object->autoLayoutInternal
+ );
+
+ //action: edcoord
+ $_POST['chpage'] = "3";
+ $_POST['c_table_rows'] = 1;
+ $_POST['c_table_0'] = array(
+ 'x' => 'x0',
+ 'y' => 'y0',
+ 'name' => 'name0',
+ 'delete' => 'delete0',
+ 'x' => 'x0',
+ );
+ $this->object->setAction("edcoord");
+ $this->object->processUserChoice();
+ $this->assertEquals(
+ '3',
+ $this->object->chosenPage
+ );
+ $this->assertEquals(
+ 1,
+ $this->object->c_table_rows
+ );
+ }
+}
diff --git a/test/libraries/PMA_STR_sub_test.php b/test/libraries/PMA_STR_sub_test.php
deleted file mode 100644
index e4bf4add7e..0000000000
--- a/test/libraries/PMA_STR_sub_test.php
+++ /dev/null
@@ -1,25 +0,0 @@
-assertEquals(
- 'čšě',
- $GLOBALS['PMA_String']::substr('čšěčščěš', 0, 3)
- );
- }
-}
-?>
diff --git a/test/libraries/PMA_StringCType_test.php b/test/libraries/PMA_StringCType_test.php
index f24b767e8e..27955e9265 100644
--- a/test/libraries/PMA_StringCType_test.php
+++ b/test/libraries/PMA_StringCType_test.php
@@ -18,46 +18,48 @@ require_once 'libraries/StringCType.class.php';
*/
class PMA_StringCType_Test extends PHPUnit_Framework_TestCase
{
+ private $_object;
/**
* Setup function for test cases
- *
+ *
* @access protected
* @return void
*/
- protected function setUp()
+ protected function setUp()
{
if (!@extension_loaded('ctype')) {
$this->markTestSkipped(
"ctype extension not present."
);
}
+ $this->_object = new PMA_StringCType();
}
/**
- * Test for PMA_StringCType::isAlnum
- *
+ * Test for isAlnum()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isAlnumData
*/
public function testIsAlnum($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringCType::isAlnum($str)
+ $this->_object->isAlnum($str)
);
}
/**
* Data provider for testIsAlnum
- *
+ *
* @return array Test data
*/
- public function isAlnumData()
+ public function isAlnumData()
{
return array(
array(true, "AbCd1zyZ9"),
@@ -66,29 +68,29 @@ class PMA_StringCType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringCType::isAlpha
- *
+ * Test for isAlpha()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isAlphaData
*/
public function testIsAlpha($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringCType::isAlpha($str)
+ $this->_object->isAlpha($str)
);
}
/**
* Data provider for testIsAlpha
- *
+ *
* @return array Test data
*/
- public function isAlphaData()
+ public function isAlphaData()
{
return array(
array(true, "kJW"),
@@ -97,29 +99,29 @@ class PMA_StringCType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringCType::isDigit
- *
+ * Test for isDigit()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isDigitData
*/
public function testIsDigit($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringCType::isDigit($str)
+ $this->_object->isDigit($str)
);
}
/**
* Data provider for testIsDigit
- *
+ *
* @return array Test data
*/
- public function isDigitData()
+ public function isDigitData()
{
return array(
array(false, "kJW"),
@@ -129,29 +131,29 @@ class PMA_StringCType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringCType::isUpper
- *
+ * Test for isUpper()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isUpperData
*/
public function testIsUpper($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringCType::isUpper($str)
+ $this->_object->isUpper($str)
);
}
/**
* Data provider for testIsUpper
- *
+ *
* @return array Test data
*/
- public function isUpperData()
+ public function isUpperData()
{
return array(
array(true, "ABCD"),
@@ -161,29 +163,29 @@ class PMA_StringCType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringCType::isLower
- *
+ * Test for isLower()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isLowerData
*/
public function testIsLower($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringCType::isLower($str)
+ $this->_object->isLower($str)
);
}
/**
* Data provider for testIsLower
- *
+ *
* @return array Test data
*/
- public function isLowerData()
+ public function isLowerData()
{
return array(
array(true, "abcd"),
@@ -193,29 +195,29 @@ class PMA_StringCType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringCType::isSpace
- *
+ * Test for isSpace()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isSpaceData
*/
public function testIsSpace($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringCType::isSpace($str)
+ $this->_object->isSpace($str)
);
}
/**
* Data provider for testIsSpace
- *
+ *
* @return array Test data
*/
- public function isSpaceData()
+ public function isSpaceData()
{
return array(
array(true, " "),
@@ -226,29 +228,29 @@ class PMA_StringCType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringCType::isHexDigit
- *
+ * Test for isHexDigit()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isHexDigitData
*/
public function testIsHexDigit($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringCType::isHexDigit($str)
+ $this->_object->isHexDigit($str)
);
}
/**
* Data provider for testIsHexDigit
- *
+ *
* @return array Test data
*/
- public function isHexDigitData()
+ public function isHexDigitData()
{
return array(
array(true, "AB10BC99"),
diff --git a/test/libraries/PMA_StringMB_test.php b/test/libraries/PMA_StringMB_test.php
index 71ffc325e6..89fe57d11b 100644
--- a/test/libraries/PMA_StringMB_test.php
+++ b/test/libraries/PMA_StringMB_test.php
@@ -23,15 +23,15 @@ class PMA_String_Mb_Test extends PMA_StringNative_Test
/**
* Setup function for test cases
- *
+ *
* @access protected
* @return void
*/
- protected function setUp()
+ protected function setUp()
{
if (@function_exists('mb_strlen')) {
$this->internal_encoding = mb_internal_encoding();
- $this->testClass = new PMA_StringMB;
+ $this->testObject = new PMA_StringMB();
} else {
$this->markTestSkipped(
"Multibyte functions don't exist, skipping test."
@@ -41,11 +41,11 @@ class PMA_String_Mb_Test extends PMA_StringNative_Test
/**
* TearDown function for tests, restores internal encoding
- *
+ *
* @access protected
* @return void
*/
- protected function tearDown()
+ protected function tearDown()
{
if (isset($this->internal_encoding)) {
mb_internal_encoding($this->internal_encoding);
diff --git a/test/libraries/PMA_StringNativeType_test.php b/test/libraries/PMA_StringNativeType_test.php
index f18763e64b..eba79047f8 100644
--- a/test/libraries/PMA_StringNativeType_test.php
+++ b/test/libraries/PMA_StringNativeType_test.php
@@ -18,31 +18,43 @@ require_once 'libraries/StringNativeType.class.php';
*/
class PMA_StringNativeType_Test extends PHPUnit_Framework_TestCase
{
+ private $_object;
/**
- * Test for PMA_StringNativeType::isAlnum
- *
+ * Setup function for test cases
+ *
+ * @access protected
+ * @return void
+ */
+ protected function setUp()
+ {
+ $this->_object = new PMA_StringNativeType();
+ }
+
+ /**
+ * Test for isAlnum()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isAlnumData
*/
public function testIsAlnum($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringNativeType::isAlnum($str)
+ $this->_object->isAlnum($str)
);
}
/**
* Data provider for testIsAlnum
- *
+ *
* @return array Test data
*/
- public function isAlnumData()
+ public function isAlnumData()
{
return array(
array(true, "A"),
@@ -53,29 +65,29 @@ class PMA_StringNativeType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringNativeType::isAlpha
- *
+ * Test for isAlpha()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isAlphaData
*/
public function testIsAlpha($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringNativeType::isAlpha($str)
+ $this->_object->isAlpha($str)
);
}
/**
* Data provider for testIsAlpha
- *
+ *
* @return array Test data
*/
- public function isAlphaData()
+ public function isAlphaData()
{
return array(
array(true, "k"),
@@ -84,29 +96,29 @@ class PMA_StringNativeType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringNativeType::isDigit
- *
+ * Test for isDigit()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isDigitData
*/
public function testIsDigit($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringNativeType::isDigit($str)
+ $this->_object->isDigit($str)
);
}
/**
* Data provider for testIsDigit
- *
+ *
* @return array Test data
*/
- public function isDigitData()
+ public function isDigitData()
{
return array(
array(false, "k"),
@@ -116,29 +128,29 @@ class PMA_StringNativeType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringNativeType::isUpper
- *
+ * Test for isUpper()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isUpperData
*/
public function testIsUpper($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringNativeType::isUpper($str)
+ $this->_object->isUpper($str)
);
}
/**
* Data provider for testIsUpper
- *
+ *
* @return array Test data
*/
- public function isUpperData()
+ public function isUpperData()
{
return array(
array(true, "A"),
@@ -148,29 +160,29 @@ class PMA_StringNativeType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringNativeType::isLower
- *
+ * Test for isLower()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isLowerData
*/
public function testIsLower($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringNativeType::isLower($str)
+ $this->_object->isLower($str)
);
}
/**
* Data provider for testIsLower
- *
+ *
* @return array Test data
*/
- public function isLowerData()
+ public function isLowerData()
{
return array(
array(true, "a"),
@@ -180,29 +192,29 @@ class PMA_StringNativeType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringNativeType::isSpace
- *
+ * Test for isSpace()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isSpaceData
*/
public function testIsSpace($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringNativeType::isSpace($str)
+ $this->_object->isSpace($str)
);
}
/**
* Data provider for testIsSpace
- *
+ *
* @return array Test data
*/
- public function isSpaceData()
+ public function isSpaceData()
{
return array(
array(true, " "),
@@ -213,29 +225,29 @@ class PMA_StringNativeType_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_StringNativeType::isHexDigit
- *
+ * Test for isHexDigit()
+ *
* @param integer $expected Expected output
* @param string $str String to check
- *
+ *
* @return void
* @test
* @dataProvider isHexDigitData
*/
public function testIsHexDigit($expected, $str)
- {
+ {
$this->assertEquals(
$expected,
- PMA_StringNativeType::isHexDigit($str)
+ $this->_object->isHexDigit($str)
);
}
/**
* Data provider for testIsHexDigit
- *
+ *
* @return array Test data
*/
- public function isHexDigitData()
+ public function isHexDigitData()
{
return array(
array(true, "A"),
diff --git a/test/libraries/PMA_StringNative_test.php b/test/libraries/PMA_StringNative_test.php
index e9c31bc0e5..170eb81474 100644
--- a/test/libraries/PMA_StringNative_test.php
+++ b/test/libraries/PMA_StringNative_test.php
@@ -18,43 +18,43 @@ require_once 'libraries/StringNative.class.php';
*/
class PMA_StringNative_Test extends PHPUnit_Framework_TestCase
{
- protected $testClass;
+ protected $testObject;
/**
* Setup function for test cases
- *
+ *
* @access protected
* @return void
*/
protected function setUp()
{
- $this->testClass = new PMA_StringNative;
+ $this->testObject = new PMA_StringNative();
}
-
+
/**
* Test for PMA_StringNative::strlen
- *
+ *
* @param integer $length Length of the string
* @param string $str String to check for
- *
+ *
* @return void
* @test
* @dataProvider strlenData
*/
public function testNativeStrlen($length, $str)
- {
+ {
$this->assertEquals(
$length,
- $this->testClass->strlen($str)
+ $this->testObject->strlen($str)
);
}
/**
* Data provider for testNativeStrlen
- *
+ *
* @return array Test data
*/
- public function strlenData()
+ public function strlenData()
{
return array(
array(2, "ab"),
@@ -65,30 +65,30 @@ class PMA_StringNative_Test extends PHPUnit_Framework_TestCase
/**
* Test for PMA_StringNative::substr
- *
+ *
* @param string $str Expected substring
* @param string $haystack String to check in
* @param int $start Starting position of substring
* @param int $length Length of substring
- *
+ *
* @return void
* @test
* @dataProvider subStrData
*/
public function testNativeSubStr($str, $haystack, $start, $length)
- {
+ {
$this->assertEquals(
$str,
- $this->testClass->substr($haystack, $start, $length)
+ $this->testObject->substr($haystack, $start, $length)
);
}
/**
* Data provider for testNativeSubStr
- *
+ *
* @return array Test data
*/
- public function subStrData()
+ public function subStrData()
{
return array(
array("b", "ab", 1, 1),
@@ -98,30 +98,30 @@ class PMA_StringNative_Test extends PHPUnit_Framework_TestCase
/**
* Test for PMA_StringNative::strpos
- *
+ *
* @param int $pos Expected position
* @param string $haystack String to search in
* @param string $needle String to search for
* @param int $offset Search offset
- *
+ *
* @return void
* @test
* @dataProvider strposData
*/
public function testNativeStrpos($pos, $haystack, $needle, $offset)
- {
+ {
$this->assertEquals(
$pos,
- $this->testClass->strpos($haystack, $needle, $offset)
+ $this->testObject->strpos($haystack, $needle, $offset)
);
}
/**
* Data provider for testNativeStrpos
- *
+ *
* @return array Test data
*/
- public function strposData()
+ public function strposData()
{
return array(
array(1, "ab", "b", 0),
@@ -131,28 +131,28 @@ class PMA_StringNative_Test extends PHPUnit_Framework_TestCase
/**
* Test for PMA_StringNative::strtolower
- *
+ *
* @param string $expected Expected lowercased string
* @param string $string String to convert to lowercase
- *
+ *
* @return void
* @test
* @dataProvider strToLowerData
*/
public function testNativeStrToLower($expected, $string)
- {
+ {
$this->assertEquals(
$expected,
- $this->testClass->strtolower($string)
+ $this->testObject->strtolower($string)
);
}
/**
* Data provider for testNativeStrpos
- *
+ *
* @return array Test data
*/
- public function strToLowerData()
+ public function strToLowerData()
{
return array(
array("mary had a", "Mary Had A"),
diff --git a/test/libraries/PMA_relation_cleanup_test.php b/test/libraries/PMA_relation_cleanup_test.php
index 3722aa9e30..c84d40c59f 100644
--- a/test/libraries/PMA_relation_cleanup_test.php
+++ b/test/libraries/PMA_relation_cleanup_test.php
@@ -26,26 +26,27 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
$GLOBALS['server'] = 1;
$GLOBALS['cfg']['Server']['user'] = "user";
$GLOBALS['cfg']['Server']['pmadb'] = "pmadb";
- $GLOBALS['cfg']['Server']['bookmarktable'] = 'bookmark';
- $GLOBALS['cfg']['Server']['relation'] = 'relation';
- $GLOBALS['cfg']['Server']['table_info'] = 'table_info';
- $GLOBALS['cfg']['Server']['table_coords'] = 'table_coords';
- $GLOBALS['cfg']['Server']['designer_coords'] = 'designer_coords';
- $GLOBALS['cfg']['Server']['column_info'] = 'column_info';
- $GLOBALS['cfg']['Server']['pdf_pages'] = 'pdf_pages';
- $GLOBALS['cfg']['Server']['history'] = 'history';
- $GLOBALS['cfg']['Server']['recent'] = 'recent';
- $GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs';
- $GLOBALS['cfg']['Server']['tracking'] = 'tracking';
- $GLOBALS['cfg']['Server']['userconfig'] = 'userconfig';
- $GLOBALS['cfg']['Server']['users'] = 'users';
- $GLOBALS['cfg']['Server']['usergroups'] = 'usergroups';
-
+ $GLOBALS['cfg']['Server']['bookmarktable'] = 'bookmark';
+ $GLOBALS['cfg']['Server']['relation'] = 'relation';
+ $GLOBALS['cfg']['Server']['table_info'] = 'table_info';
+ $GLOBALS['cfg']['Server']['table_coords'] = 'table_coords';
+ $GLOBALS['cfg']['Server']['designer_coords'] = 'designer_coords';
+ $GLOBALS['cfg']['Server']['column_info'] = 'column_info';
+ $GLOBALS['cfg']['Server']['pdf_pages'] = 'pdf_pages';
+ $GLOBALS['cfg']['Server']['history'] = 'history';
+ $GLOBALS['cfg']['Server']['recent'] = 'recent';
+ $GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs';
+ $GLOBALS['cfg']['Server']['tracking'] = 'tracking';
+ $GLOBALS['cfg']['Server']['userconfig'] = 'userconfig';
+ $GLOBALS['cfg']['Server']['users'] = 'users';
+ $GLOBALS['cfg']['Server']['usergroups'] = 'usergroups';
+ $GLOBALS['cfg']['Server']['navigationhiding'] = 'navigationhiding';
+
$this->redefineRelation();
}
-
+
public function redefineRelation()
- {
+ {
$GLOBALS['dbi'] = new DBI_PMA_Relation_Cleanup();
unset($_SESSION['relation'][$GLOBALS['server']]);
}
@@ -61,7 +62,7 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
$table = "PMA_bookmark";
$column = "name";
$this->redefineRelation();
-
+
//the $cfgRelation value before cleanup column
$cfgRelation = PMA_checkRelationsParam();
$this->assertEquals(
@@ -88,20 +89,20 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
'relation',
$cfgRelation['relation']
);
-
+
//cleanup
PMA_relationsCleanupColumn($db, $table, $column);
-
+
//the $cfgRelation value after cleanup column
$cfgRelation = PMA_checkRelationsParam();
-
- $is_defined_column_info
+
+ $is_defined_column_info
= isset($cfgRelation['column_info'])? $cfgRelation['column_info'] : null;
- $is_defined_table_info
+ $is_defined_table_info
= isset($cfgRelation['table_info'])? $cfgRelation['table_info'] : null;
$is_defined_relation
= isset($cfgRelation['relation'])? $cfgRelation['relation'] : null;
-
+
$this->assertEquals(
null,
$is_defined_column_info
@@ -114,7 +115,7 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
null,
$is_defined_relation
);
-
+
}
/**
@@ -127,7 +128,7 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
$db = "PMA";
$table = "PMA_bookmark";
$this->redefineRelation();
-
+
//the $cfgRelation value before cleanup column
$cfgRelation = PMA_checkRelationsParam();
$this->assertEquals(
@@ -150,28 +151,28 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
'relation',
$cfgRelation['relation']
);
-
+
//PMA_relationsCleanupTable
PMA_relationsCleanupTable($db, $table);
-
+
//the $cfgRelation value after cleanup column
$cfgRelation = PMA_checkRelationsParam();
-
- $is_defined_column_info
+
+ $is_defined_column_info
= isset($cfgRelation['column_info'])? $cfgRelation['column_info'] : null;
- $is_defined_table_info
+ $is_defined_table_info
= isset($cfgRelation['table_info'])? $cfgRelation['table_info'] : null;
$is_defined_relation
= isset($cfgRelation['relation'])? $cfgRelation['relation'] : null;
$is_defined_table_coords
= isset($cfgRelation['table_coords'])
- ? $cfgRelation['table_coords']
+ ? $cfgRelation['table_coords']
: null;
$is_defined_designer_coords
= isset($cfgRelation['designer_coords'])
- ? $cfgRelation['designer_coords']
+ ? $cfgRelation['designer_coords']
: null;
-
+
$this->assertEquals(
null,
$is_defined_column_info
@@ -192,7 +193,7 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
null,
$is_defined_designer_coords
);
-
+
}
/**
@@ -204,7 +205,7 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
{
$db = "PMA";
$this->redefineRelation();
-
+
//the $cfgRelation value before cleanup column
$cfgRelation = PMA_checkRelationsParam();
$this->assertEquals(
@@ -235,28 +236,28 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
'relation',
$cfgRelation['relation']
);
-
+
//cleanup
PMA_relationsCleanupDatabase($db);
-
+
//the value after cleanup column
$cfgRelation = PMA_checkRelationsParam();
-
- $is_defined_column_info
+
+ $is_defined_column_info
= isset($cfgRelation['column_info'])? $cfgRelation['column_info'] : null;
- $is_defined_table_info
+ $is_defined_table_info
= isset($cfgRelation['table_info'])? $cfgRelation['table_info'] : null;
$is_defined_relation
= isset($cfgRelation['relation'])? $cfgRelation['relation'] : null;
$is_defined_table_coords
= isset($cfgRelation['table_coords'])
- ? $cfgRelation['table_coords']
+ ? $cfgRelation['table_coords']
: null;
$is_defined_designer_coords
= isset($cfgRelation['designer_coords'])
- ? $cfgRelation['designer_coords']
+ ? $cfgRelation['designer_coords']
: null;
-
+
$this->assertEquals(
null,
$is_defined_column_info
@@ -276,7 +277,7 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
$this->assertEquals(
null,
$is_defined_designer_coords
- );
+ );
}
}
@@ -286,8 +287,8 @@ class DBI_PMA_Relation_Cleanup extends PMA_DatabaseInterface
var $index;
var $values = array();
var $indexs = array();
-
- public function __construct()
+
+ public function __construct()
{
$this->index = 0;
$this->values = array(
@@ -305,6 +306,7 @@ class DBI_PMA_Relation_Cleanup extends PMA_DatabaseInterface
'userconfig',
'users',
'usergroups',
+ 'navigationhiding',
);
$this->indexs = array(
'bookmark' => 0,
@@ -321,63 +323,64 @@ class DBI_PMA_Relation_Cleanup extends PMA_DatabaseInterface
'userconfig' => 11,
'users' => 12,
'usergroups' => 13,
+ 'navigationhiding' => 14,
);
}
-
- function fetchRow($result)
+
+ function fetchRow($result)
{
if ($this->index < count($this->values)) {
$curr_table[0] = $this->values[$this->index];
$this->index++;
return $curr_table;
}
-
+
$this->index = 0;
return false;
}
-
- function query($sql, $link = null, $options = 0, $cache_affected_rows = true)
+
+ function query($sql, $link = null, $options = 0, $cache_affected_rows = true)
{
if (stripos($sql, "column_info") !== false) {
unset($this->values[$this->indexs['column_info']]);
}
-
+
if (stripos($sql, "table_info") !== false) {
unset ($this->values[$this->indexs['table_info']]);
}
-
+
if (stripos($sql, "table_coords") !== false) {
unset($this->values[$this->indexs['table_coords']]);
}
-
+
if (stripos($sql, "designer_coords") !== false) {
unset($this->values[$this->indexs['designer_coords']]);
}
-
+
if (stripos($sql, "relation") !== false) {
unset($this->values[$this->indexs['relation']]);
}
-
+
if (stripos($sql, "pdf_pages") !== false) {
unset($GLOBALS [$this->indexs['pdf_pages']]);
}
-
+
if (stripos($sql, "bookmark") !== false) {
unset($GLOBALS [$this->indexs['bookmark']]);
}
}
-
+
public function tryQuery(
$query, $link = null, $options = 0, $cache_affected_rows = true
) {
return true;
}
-
- public function selectDb($dbname, $link = null)
+
+ public function selectDb($dbname, $link = null)
{
return true;
}
-
+
public function freeResult($result)
{
return true;
diff --git a/test/libraries/PMA_string_test.php b/test/libraries/PMA_string_test.php
index 28994bfb9e..2b47263ca0 100644
--- a/test/libraries/PMA_string_test.php
+++ b/test/libraries/PMA_string_test.php
@@ -9,8 +9,8 @@
/*
* Include to test.
*/
-require_once 'libraries/string.lib.php';
-require_once 'libraries/StringNativeType.class.php';
+require_once 'libraries/String.class.php';
+
/**
* Tests for Specialized String Functions for phpMyAdmin
*
@@ -18,44 +18,48 @@ require_once 'libraries/StringNativeType.class.php';
*/
class PMA_String_Test extends PHPUnit_Framework_TestCase
{
+ /**
+ * @var PMA_String
+ */
+ private $_testObj;
/**
* Setup function for test cases
- *
+ *
* @access protected
* @return void
*/
- protected function setUp()
+ protected function setUp()
{
- $GLOBALS['PMA_StringType'] = new PMA_StringNativeType();
+ $this->_testObj = new PMA_String();
}
/**
- * Test for Str_charIsEscaped
- *
+ * Test for charIsEscaped()
+ *
* @param boolean $expected Expected value from test
* @param string $str String to check for
* @param integer $pos Character to check for
* @param integer $start Starting position of string
- *
+ *
* @return void
* @test
* @dataProvider charIsEscapedData
*/
public function testCharIsEscaped($expected, $str, $pos, $start)
- {
+ {
$this->assertEquals(
$expected,
- PMA_STR_charIsEscaped($str, $pos, $start)
+ $this->_testObj->charIsEscaped($str, $pos, $start)
);
}
/**
* Data provider for testCharIsEscaped
- *
+ *
* @return array Test data
*/
- public function charIsEscapedData()
+ public function charIsEscapedData()
{
return array(
array(false, 'test', -1, 0),
@@ -68,13 +72,13 @@ class PMA_String_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_STR_numberInRangeInclusive
- *
+ * Test for numberInRangeInclusive()
+ *
* @param bool $expected Expected value from test
* @param integer $num Number to check for
* @param integer $lower Lower bound
* @param integer $upper Upper bound
- *
+ *
* @return void
* @test
* @dataProvider numberInRangeData
@@ -84,16 +88,16 @@ class PMA_String_Test extends PHPUnit_Framework_TestCase
) {
$this->assertEquals(
$expected,
- PMA_STR_numberInRangeInclusive($num, $lower, $upper)
+ $this->_testObj->numberInRangeInclusive($num, $lower, $upper)
);
}
/**
* Data provider for testNumberInRangeInclusive
- *
+ *
* @return void
*/
- public function numberInRangeData()
+ public function numberInRangeData()
{
return array(
array(true, 2, 2, 3),
@@ -105,30 +109,30 @@ class PMA_String_Test extends PHPUnit_Framework_TestCase
}
/**
- * Test for PMA_STR_isSqlIdentifier
- *
+ * Test for isSqlIdentifier()
+ *
* @param boolean $expected Expected value from test
* @param string $c Character to check for
* @param boolean $dot_is_valid whether the dot character is valid or not
- *
+ *
* @return void
* @test
* @dataProvider isSqlIdentifierData
*/
- public function testIsSqlIdentifier($expected, $c, $dot_is_valid = false)
+ public function testIsSqlIdentifier($expected, $c, $dot_is_valid = false)
{
$this->assertEquals(
$expected,
- PMA_STR_isSqlIdentifier($c, $dot_is_valid)
+ $this->_testObj->isSqlIdentifier($c, $dot_is_valid)
);
}
/**
* Data provider for testIsSqlIdentifier
- *
+ *
* @return array Test data
*/
- public function isSqlIdentifierData()
+ public function isSqlIdentifierData()
{
return array(
array(true, '2'),
@@ -142,7 +146,5 @@ class PMA_String_Test extends PHPUnit_Framework_TestCase
array(true, '$')
);
}
-
-
}
?>
diff --git a/themes/original/css/navigation.css.php b/themes/original/css/navigation.css.php
index 2cb8d8f5b2..a9dcee78e5 100644
--- a/themes/original/css/navigation.css.php
+++ b/themes/original/css/navigation.css.php
@@ -119,6 +119,21 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
color: ;
background-color: ;
}
+#pma_navigation_tree li .dbItemControls {
+ padding-left: 4px;
+}
+#pma_navigation_tree li .navItemControls {
+ display: none;
+ padding-left: 4px;
+}
+#pma_navigation_tree li.activePointer .navItemControls {
+ display: inline;
+ opacity: 0.5;
+}
+#pma_navigation_tree li.activePointer .navItemControls:hover {
+ display: inline;
+ opacity: 1.0;
+}
#pma_navigation_tree ul {
clear: both;
padding: 0;
diff --git a/themes/original/img/b_undo.png b/themes/original/img/b_undo.png
new file mode 100644
index 0000000000..498187821c
Binary files /dev/null and b/themes/original/img/b_undo.png differ
diff --git a/themes/original/img/sprites.png b/themes/original/img/sprites.png
index 1ea0cb85ab..0ba0969243 100644
Binary files a/themes/original/img/sprites.png and b/themes/original/img/sprites.png differ
diff --git a/themes/original/sprites.lib.php b/themes/original/sprites.lib.php
index f6c8d8570b..eda977bae5 100644
--- a/themes/original/sprites.lib.php
+++ b/themes/original/sprites.lib.php
@@ -375,253 +375,258 @@ function PMA_sprites()
'width' => '16',
'height' => '16'
),
- 'b_unique' => array(
+ 'b_undo' => array(
'position' => '75',
'width' => '16',
'height' => '16'
),
- 'b_usradd' => array(
+ 'b_unique' => array(
'position' => '76',
'width' => '16',
'height' => '16'
),
- 'b_usrcheck' => array(
+ 'b_usradd' => array(
'position' => '77',
'width' => '16',
'height' => '16'
),
- 'b_usrdrop' => array(
+ 'b_usrcheck' => array(
'position' => '78',
'width' => '16',
'height' => '16'
),
- 'b_usredit' => array(
+ 'b_usrdrop' => array(
'position' => '79',
'width' => '16',
'height' => '16'
),
- 'b_usrlist' => array(
+ 'b_usredit' => array(
'position' => '80',
'width' => '16',
'height' => '16'
),
- 'b_view_add' => array(
+ 'b_usrlist' => array(
'position' => '81',
'width' => '16',
'height' => '16'
),
- 'b_view' => array(
+ 'b_view_add' => array(
'position' => '82',
'width' => '16',
'height' => '16'
),
- 'b_views' => array(
+ 'b_view' => array(
'position' => '83',
'width' => '16',
'height' => '16'
),
- 'col_drop' => array(
+ 'b_views' => array(
'position' => '84',
'width' => '16',
'height' => '16'
),
- 'eye_grey' => array(
+ 'col_drop' => array(
'position' => '85',
'width' => '16',
'height' => '16'
),
- 'eye' => array(
+ 'eye_grey' => array(
'position' => '86',
'width' => '16',
'height' => '16'
),
- 'more' => array(
+ 'eye' => array(
'position' => '87',
+ 'width' => '16',
+ 'height' => '16'
+ ),
+ 'more' => array(
+ 'position' => '88',
'width' => '13',
'height' => '16'
),
'new_data_hovered' => array(
- 'position' => '88',
- 'width' => '16',
- 'height' => '16'
- ),
- 'new_data' => array(
'position' => '89',
'width' => '16',
'height' => '16'
),
- 'new_data_selected_hovered' => array(
+ 'new_data' => array(
'position' => '90',
'width' => '16',
'height' => '16'
),
- 'new_data_selected' => array(
+ 'new_data_selected_hovered' => array(
'position' => '91',
'width' => '16',
'height' => '16'
),
- 'new_struct_hovered' => array(
+ 'new_data_selected' => array(
'position' => '92',
'width' => '16',
'height' => '16'
),
- 'new_struct' => array(
+ 'new_struct_hovered' => array(
'position' => '93',
'width' => '16',
'height' => '16'
),
- 'new_struct_selected_hovered' => array(
+ 'new_struct' => array(
'position' => '94',
'width' => '16',
'height' => '16'
),
- 'new_struct_selected' => array(
+ 'new_struct_selected_hovered' => array(
'position' => '95',
'width' => '16',
'height' => '16'
),
- 'pause' => array(
+ 'new_struct_selected' => array(
'position' => '96',
'width' => '16',
'height' => '16'
),
- 'play' => array(
+ 'pause' => array(
'position' => '97',
'width' => '16',
'height' => '16'
),
- 's_asci' => array(
+ 'play' => array(
'position' => '98',
'width' => '16',
'height' => '16'
),
- 's_asc' => array(
+ 's_asci' => array(
'position' => '99',
+ 'width' => '16',
+ 'height' => '16'
+ ),
+ 's_asc' => array(
+ 'position' => '100',
'width' => '11',
'height' => '9'
),
's_cancel' => array(
- 'position' => '100',
- 'width' => '16',
- 'height' => '16'
- ),
- 's_cog' => array(
'position' => '101',
'width' => '16',
'height' => '16'
),
- 's_db' => array(
+ 's_cog' => array(
'position' => '102',
'width' => '16',
'height' => '16'
),
- 's_desc' => array(
+ 's_db' => array(
'position' => '103',
+ 'width' => '16',
+ 'height' => '16'
+ ),
+ 's_desc' => array(
+ 'position' => '104',
'width' => '11',
'height' => '9'
),
's_error2' => array(
- 'position' => '104',
+ 'position' => '105',
'width' => '11',
'height' => '11'
),
's_error' => array(
- 'position' => '105',
- 'width' => '16',
- 'height' => '16'
- ),
- 's_host' => array(
'position' => '106',
'width' => '16',
'height' => '16'
),
- 's_lang' => array(
+ 's_host' => array(
'position' => '107',
'width' => '16',
'height' => '16'
),
- 's_loggoff' => array(
+ 's_lang' => array(
'position' => '108',
'width' => '16',
'height' => '16'
),
- 's_notice' => array(
+ 's_loggoff' => array(
'position' => '109',
'width' => '16',
'height' => '16'
),
- 's_passwd' => array(
+ 's_notice' => array(
'position' => '110',
'width' => '16',
'height' => '16'
),
- 's_really' => array(
+ 's_passwd' => array(
'position' => '111',
+ 'width' => '16',
+ 'height' => '16'
+ ),
+ 's_really' => array(
+ 'position' => '112',
'width' => '11',
'height' => '11'
),
's_reload' => array(
- 'position' => '112',
- 'width' => '16',
- 'height' => '16'
- ),
- 's_replication' => array(
'position' => '113',
'width' => '16',
'height' => '16'
),
- 's_rights' => array(
+ 's_replication' => array(
'position' => '114',
'width' => '16',
'height' => '16'
),
- 's_sortable' => array(
+ 's_rights' => array(
'position' => '115',
+ 'width' => '16',
+ 'height' => '16'
+ ),
+ 's_sortable' => array(
+ 'position' => '116',
'width' => '11',
'height' => '15'
),
's_status' => array(
- 'position' => '116',
- 'width' => '16',
- 'height' => '16'
- ),
- 's_success' => array(
'position' => '117',
'width' => '16',
'height' => '16'
),
- 's_sync' => array(
+ 's_success' => array(
'position' => '118',
'width' => '16',
'height' => '16'
),
- 's_tbl' => array(
+ 's_sync' => array(
'position' => '119',
'width' => '16',
'height' => '16'
),
- 's_theme' => array(
+ 's_tbl' => array(
'position' => '120',
'width' => '16',
'height' => '16'
),
- 's_top' => array(
+ 's_theme' => array(
'position' => '121',
'width' => '16',
'height' => '16'
),
- 's_vars' => array(
+ 's_top' => array(
'position' => '122',
'width' => '16',
'height' => '16'
),
- 's_views' => array(
+ 's_vars' => array(
'position' => '123',
+ 'width' => '16',
+ 'height' => '16'
+ ),
+ 's_views' => array(
+ 'position' => '124',
'width' => '10',
'height' => '10'
),
'window-new' => array(
- 'position' => '124',
+ 'position' => '125',
'width' => '16',
'height' => '16'
),
diff --git a/themes/pmahomme/css/navigation.css.php b/themes/pmahomme/css/navigation.css.php
index 0b9068446d..122d12c388 100644
--- a/themes/pmahomme/css/navigation.css.php
+++ b/themes/pmahomme/css/navigation.css.php
@@ -104,6 +104,21 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
color: ;
background-color: ;
}
+#pma_navigation_tree li .dbItemControls {
+ padding-left: 4px;
+}
+#pma_navigation_tree li .navItemControls {
+ display: none;
+ padding-left: 4px;
+}
+#pma_navigation_tree li.activePointer .navItemControls {
+ display: inline;
+ opacity: 0.5;
+}
+#pma_navigation_tree li.activePointer .navItemControls:hover {
+ display: inline;
+ opacity: 1.0;
+}
#pma_navigation_tree ul {
clear: both;
padding: 0;
diff --git a/themes/pmahomme/img/b_undo.png b/themes/pmahomme/img/b_undo.png
new file mode 100644
index 0000000000..498187821c
Binary files /dev/null and b/themes/pmahomme/img/b_undo.png differ
diff --git a/themes/pmahomme/img/sprites.png b/themes/pmahomme/img/sprites.png
index c370af4a52..2835f23685 100644
Binary files a/themes/pmahomme/img/sprites.png and b/themes/pmahomme/img/sprites.png differ
diff --git a/themes/pmahomme/sprites.lib.php b/themes/pmahomme/sprites.lib.php
index b0913cd5bb..da85bbdf97 100644
--- a/themes/pmahomme/sprites.lib.php
+++ b/themes/pmahomme/sprites.lib.php
@@ -430,296 +430,301 @@ function PMA_sprites()
'width' => '16',
'height' => '16'
),
- 'b_unique' => array(
+ 'b_undo' => array(
'position' => '86',
'width' => '16',
'height' => '16'
),
- 'b_usradd' => array(
+ 'b_unique' => array(
'position' => '87',
'width' => '16',
'height' => '16'
),
- 'b_usrcheck' => array(
+ 'b_usradd' => array(
'position' => '88',
'width' => '16',
'height' => '16'
),
- 'b_usrdrop' => array(
+ 'b_usrcheck' => array(
'position' => '89',
'width' => '16',
'height' => '16'
),
- 'b_usredit' => array(
+ 'b_usrdrop' => array(
'position' => '90',
'width' => '16',
'height' => '16'
),
- 'b_usrlist' => array(
+ 'b_usredit' => array(
'position' => '91',
'width' => '16',
'height' => '16'
),
- 'b_view_add' => array(
+ 'b_usrlist' => array(
'position' => '92',
'width' => '16',
'height' => '16'
),
- 'b_view' => array(
+ 'b_view_add' => array(
'position' => '93',
'width' => '16',
'height' => '16'
),
- 'b_views' => array(
+ 'b_view' => array(
'position' => '94',
'width' => '16',
'height' => '16'
),
- 'col_drop' => array(
+ 'b_views' => array(
'position' => '95',
'width' => '16',
'height' => '16'
),
- 'database' => array(
+ 'col_drop' => array(
'position' => '96',
'width' => '16',
'height' => '16'
),
- 'eye_grey' => array(
+ 'database' => array(
'position' => '97',
'width' => '16',
'height' => '16'
),
- 'eye' => array(
+ 'eye_grey' => array(
'position' => '98',
'width' => '16',
'height' => '16'
),
- 'item' => array(
+ 'eye' => array(
'position' => '99',
+ 'width' => '16',
+ 'height' => '16'
+ ),
+ 'item' => array(
+ 'position' => '100',
'width' => '9',
'height' => '9'
),
'more' => array(
- 'position' => '100',
+ 'position' => '101',
'width' => '13',
'height' => '16'
),
'new_data_hovered' => array(
- 'position' => '101',
- 'width' => '16',
- 'height' => '16'
- ),
- 'new_data' => array(
'position' => '102',
'width' => '16',
'height' => '16'
),
- 'new_data_selected_hovered' => array(
+ 'new_data' => array(
'position' => '103',
'width' => '16',
'height' => '16'
),
- 'new_data_selected' => array(
+ 'new_data_selected_hovered' => array(
'position' => '104',
'width' => '16',
'height' => '16'
),
- 'new_struct_hovered' => array(
+ 'new_data_selected' => array(
'position' => '105',
'width' => '16',
'height' => '16'
),
- 'new_struct' => array(
+ 'new_struct_hovered' => array(
'position' => '106',
'width' => '16',
'height' => '16'
),
- 'new_struct_selected_hovered' => array(
+ 'new_struct' => array(
'position' => '107',
'width' => '16',
'height' => '16'
),
- 'new_struct_selected' => array(
+ 'new_struct_selected_hovered' => array(
'position' => '108',
'width' => '16',
'height' => '16'
),
- 'pause' => array(
+ 'new_struct_selected' => array(
'position' => '109',
'width' => '16',
'height' => '16'
),
- 'php_sym' => array(
+ 'pause' => array(
'position' => '110',
'width' => '16',
'height' => '16'
),
- 'play' => array(
+ 'php_sym' => array(
'position' => '111',
'width' => '16',
'height' => '16'
),
- 's_asci' => array(
+ 'play' => array(
'position' => '112',
'width' => '16',
'height' => '16'
),
- 's_asc' => array(
+ 's_asci' => array(
'position' => '113',
'width' => '16',
'height' => '16'
),
- 's_attention' => array(
+ 's_asc' => array(
'position' => '114',
'width' => '16',
'height' => '16'
),
- 's_cancel2' => array(
+ 's_attention' => array(
'position' => '115',
'width' => '16',
'height' => '16'
),
- 's_cancel' => array(
+ 's_cancel2' => array(
'position' => '116',
'width' => '16',
'height' => '16'
),
- 's_cog' => array(
+ 's_cancel' => array(
'position' => '117',
'width' => '16',
'height' => '16'
),
- 's_db' => array(
+ 's_cog' => array(
'position' => '118',
'width' => '16',
'height' => '16'
),
- 's_desc' => array(
+ 's_db' => array(
'position' => '119',
'width' => '16',
'height' => '16'
),
- 's_error2' => array(
+ 's_desc' => array(
'position' => '120',
+ 'width' => '16',
+ 'height' => '16'
+ ),
+ 's_error2' => array(
+ 'position' => '121',
'width' => '11',
'height' => '11'
),
's_error' => array(
- 'position' => '121',
- 'width' => '16',
- 'height' => '16'
- ),
- 's_host' => array(
'position' => '122',
'width' => '16',
'height' => '16'
),
- 's_info' => array(
+ 's_host' => array(
'position' => '123',
'width' => '16',
'height' => '16'
),
- 's_lang' => array(
+ 's_info' => array(
'position' => '124',
'width' => '16',
'height' => '16'
),
- 's_loggoff' => array(
+ 's_lang' => array(
'position' => '125',
'width' => '16',
'height' => '16'
),
- 's_notice' => array(
+ 's_loggoff' => array(
'position' => '126',
'width' => '16',
'height' => '16'
),
- 's_okay' => array(
+ 's_notice' => array(
'position' => '127',
'width' => '16',
'height' => '16'
),
- 's_passwd' => array(
+ 's_okay' => array(
'position' => '128',
'width' => '16',
'height' => '16'
),
- 's_process' => array(
+ 's_passwd' => array(
'position' => '129',
'width' => '16',
'height' => '16'
),
- 's_really' => array(
+ 's_process' => array(
'position' => '130',
+ 'width' => '16',
+ 'height' => '16'
+ ),
+ 's_really' => array(
+ 'position' => '131',
'width' => '11',
'height' => '11'
),
's_reload' => array(
- 'position' => '131',
- 'width' => '16',
- 'height' => '16'
- ),
- 's_replication' => array(
'position' => '132',
'width' => '16',
'height' => '16'
),
- 's_rights' => array(
+ 's_replication' => array(
'position' => '133',
'width' => '16',
'height' => '16'
),
- 's_sortable' => array(
+ 's_rights' => array(
'position' => '134',
'width' => '16',
'height' => '16'
),
- 's_status' => array(
+ 's_sortable' => array(
'position' => '135',
'width' => '16',
'height' => '16'
),
- 's_success' => array(
+ 's_status' => array(
'position' => '136',
'width' => '16',
'height' => '16'
),
- 's_sync' => array(
+ 's_success' => array(
'position' => '137',
'width' => '16',
'height' => '16'
),
- 's_tbl' => array(
+ 's_sync' => array(
'position' => '138',
'width' => '16',
'height' => '16'
),
- 's_theme' => array(
+ 's_tbl' => array(
'position' => '139',
'width' => '16',
'height' => '16'
),
- 's_top' => array(
+ 's_theme' => array(
'position' => '140',
'width' => '16',
'height' => '16'
),
- 's_vars' => array(
+ 's_top' => array(
'position' => '141',
'width' => '16',
'height' => '16'
),
- 's_views' => array(
+ 's_vars' => array(
'position' => '142',
'width' => '16',
'height' => '16'
),
- 'window-new' => array(
+ 's_views' => array(
'position' => '143',
'width' => '16',
'height' => '16'
),
+ 'window-new' => array(
+ 'position' => '144',
+ 'width' => '16',
+ 'height' => '16'
+ ),
);
}
?>