Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--import.php12
-rw-r--r--libraries/schema/Dia_Relation_Schema.class.php7
-rw-r--r--libraries/schema/Eps_Relation_Schema.class.php3
-rw-r--r--libraries/schema/Pdf_Relation_Schema.class.php3
-rw-r--r--libraries/schema/Svg_Relation_Schema.class.php3
-rw-r--r--libraries/schema/TableStats.class.php8
-rw-r--r--test/classes/gis/PMA_GIS_Geom_test.php2
-rw-r--r--test/libraries/PMA_PMD_common_test.php3
-rw-r--r--user_password.php4
9 files changed, 28 insertions, 17 deletions
diff --git a/import.php b/import.php
index 0d01f223a5..046b08bc59 100644
--- a/import.php
+++ b/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);
diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php
index 2f67a43cd3..6583e8307e 100644
--- a/libraries/schema/Dia_Relation_Schema.class.php
+++ b/libraries/schema/Dia_Relation_Schema.class.php
@@ -214,6 +214,7 @@ class Table_Stats_Dia extends TableStats
* @param integer $pageNumber The current page number (from the
* $cfg['Servers'][$i]['table_coords'] table)
* @param boolean $showKeys Whether to display ONLY keys or not
+ * @param boolean $offline Load without query
*
* @global object $dia The current dia document
* @global array $cfgRelation The relations settings
@@ -223,8 +224,10 @@ class Table_Stats_Dia extends TableStats
*/
function __construct($tableName, $pageNumber, $showKeys = false, $offline = false)
{
- global $dia, $cfgRelation, $db;
- parent::__construct($dia, $db, $pageNumber, $tableName, $showKeys, false, $offline);
+ global $dia, $db;
+ parent::__construct(
+ $dia, $db, $pageNumber, $tableName, $showKeys, false, $offline
+ );
/**
* Every object in Dia document needs an ID to identify
diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php
index aea5607cde..fa044b3df5 100644
--- a/libraries/schema/Eps_Relation_Schema.class.php
+++ b/libraries/schema/Eps_Relation_Schema.class.php
@@ -327,6 +327,7 @@ class Table_Stats_Eps extends TableStats
* @param integer &$same_wide_width The max width among tables
* @param boolean $showKeys Whether to display keys or not
* @param boolean $showInfo Whether to display table position or not
+ * @param boolean $offline Load without query
*
* @global object $eps The current eps document
* @global integer The current page number (from the
@@ -342,7 +343,7 @@ class Table_Stats_Eps extends TableStats
$tableName, $font, $fontSize, $pageNumber, &$same_wide_width,
$showKeys = false, $showInfo = false, $offline = false
) {
- global $eps, $cfgRelation, $db;
+ global $eps, $db;
parent::__construct(
$eps, $db, $pageNumber, $tableName, $showKeys, $showInfo, $offline
);
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index 04f34013ad..a3e720f18c 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -418,6 +418,7 @@ class Table_Stats_Pdf extends TableStats
* @param integer &$sameWideWidth The max. with among tables
* @param boolean $showKeys Whether to display keys or not
* @param boolean $showInfo Whether to display table position or not
+ * @param boolean $offline Load without query
*
* @global object $pdf The current PDF document
* @global array $cfgRelation The relations settings
@@ -429,7 +430,7 @@ class Table_Stats_Pdf extends TableStats
function __construct($tableName, $fontSize, $pageNumber, &$sameWideWidth,
$showKeys = false, $showInfo = false, $offline = false
) {
- global $pdf, $cfgRelation, $db;
+ global $pdf, $db;
parent::__construct(
$pdf, $db, $pageNumber, $tableName, $showKeys, $showInfo, $offline
);
diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php
index c46f0be5da..01d3a6675b 100644
--- a/libraries/schema/Svg_Relation_Schema.class.php
+++ b/libraries/schema/Svg_Relation_Schema.class.php
@@ -293,6 +293,7 @@ class Table_Stats_Svg extends TableStats
* @param integer &$same_wide_width The max. with among tables
* @param boolean $showKeys Whether to display keys or not
* @param boolean $showInfo Whether to display table position or not
+ * @param boolean $offline Load without query
*
* @global object $svg The current SVG image document
* @global integer The current page number (from the
@@ -309,7 +310,7 @@ class Table_Stats_Svg extends TableStats
$tableName, $font, $fontSize, $pageNumber, &$same_wide_width,
$showKeys = false, $showInfo = false, $offline = false
) {
- global $svg, $cfgRelation, $db;
+ global $svg, $db;
parent::__construct(
$svg, $db, $pageNumber, $tableName, $showKeys, $showInfo, $offline
);
diff --git a/libraries/schema/TableStats.class.php b/libraries/schema/TableStats.class.php
index f9e6f1e06a..e5a4ef4ed7 100644
--- a/libraries/schema/TableStats.class.php
+++ b/libraries/schema/TableStats.class.php
@@ -48,6 +48,7 @@ abstract class TableStats
* @param string $tableName table name
* @param boolean $showKeys whether to display keys or not
* @param boolean $showInfo whether to display table position or not
+ * @param boolean $offline load without query
*/
public function __construct(
$diagram, $db, $pageNumber, $tableName, $showKeys, $showInfo, $offline
@@ -122,10 +123,10 @@ abstract class TableStats
{
global $cfgRelation;
- if ($this->offline){
+ if ($this->offline) {
$tbl_coords = json_decode($GLOBALS['tbl_coords']);
foreach ($tbl_coords as $tbl) {
- if( $this->tableName === $tbl->table_name){
+ if ($this->tableName === $tbl->table_name) {
$this->x = (double) $tbl->x;
$this->y = (double) $tbl->y;
break;
@@ -136,7 +137,8 @@ abstract class TableStats
. PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . "."
. PMA_Util::backquote($cfgRelation['table_coords'])
. " WHERE db_name = '" . PMA_Util::sqlAddSlashes($this->db) . "'"
- . " AND table_name = '" . PMA_Util::sqlAddSlashes($this->tableName) . "'"
+ . " AND table_name = '" . PMA_Util::sqlAddSlashes($this->tableName)
+ . "'"
. " AND pdf_page_number = " . $this->pageNumber;
$result = PMA_queryAsControlUser(
$sql, false, PMA_DatabaseInterface::QUERY_STORE
diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php
index d7b0fa3e2a..93cefaf878 100644
--- a/test/classes/gis/PMA_GIS_Geom_test.php
+++ b/test/classes/gis/PMA_GIS_Geom_test.php
@@ -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
*/
diff --git a/test/libraries/PMA_PMD_common_test.php b/test/libraries/PMA_PMD_common_test.php
index 2420a7ac81..b8c1b440be 100644
--- a/test/libraries/PMA_PMD_common_test.php
+++ b/test/libraries/PMA_PMD_common_test.php
@@ -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`,
diff --git a/user_password.php b/user_password.php
index cabad4bb67..7a2dd739e2 100644
--- a/user_password.php
+++ b/user_password.php
@@ -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
*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 01:20:18 +0300