From 9f2d8f47e47fe1aca5a3c4d2385cf568f6e1de20 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 22 Jan 2014 17:19:34 +0530 Subject: [PATCH 1/3] Remove obsolete method Signed-off-by: Madhura Jayaratne --- libraries/Table.class.php | 16 ---------------- test/classes/PMA_Table_test.php | 21 --------------------- 2 files changed, 37 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index a88bdf381c..517409b567 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -336,22 +336,6 @@ class PMA_Table return in_array(strtoupper($engine), array('MERGE', 'MRG_MYISAM')); } - /** - * Returns tooltip for the table - * Format : () - * - * @param string $db database name - * @param string $table table name - * - * @return string tooltip fot the table - */ - static public function sGetToolTip($db, $table) - { - return PMA_Table::sGetStatusInfo($db, $table, 'Comment') - . ' (' . PMA_Table::countRecords($db, $table) - . ' ' . __('Rows') . ')'; - } - /** * Returns full table status info, or specific if $info provided * this info is collected from information_schema diff --git a/test/classes/PMA_Table_test.php b/test/classes/PMA_Table_test.php index ee48b9abea..28e288dc85 100644 --- a/test/classes/PMA_Table_test.php +++ b/test/classes/PMA_Table_test.php @@ -685,27 +685,6 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase ); } - /** - * Test for sGetToolTip - * - * @return void - */ - public function testSGetToolTip() - { - $table = 'PMA_BookMark'; - $db = 'PMA'; - - PMA_Table::$cache[$db][$table] = array('Comment' => "Comment222"); - - PMA_Table::$cache[$db][$table]['ExactRows'] = 10; - $result = PMA_Table::sGetToolTip($db, $table); - - $this->assertEquals( - 'Comment222 (10 Rows)', - $result - ); - } - /** * Test for generateAlter * From f5a7cef79c0ba1e1a340f7952ca229acd80fedf5 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 22 Jan 2014 17:26:41 +0530 Subject: [PATCH 2/3] Fix indentation Signed-off-by: Madhura Jayaratne --- libraries/Table.class.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 517409b567..e4a03cadbf 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1056,8 +1056,8 @@ class PMA_Table ) . ' (db_name, table_name, column_name, comment' . ($GLOBALS['cfgRelation']['mimework'] - ? ', mimetype, transformation, transformation_options' - : '') + ? ', mimetype, transformation, transformation_options' + : '') . ') ' . ' VALUES(' . '\'' . PMA_Util::sqlAddSlashes($target_db) @@ -1067,12 +1067,15 @@ class PMA_Table . '\'' . PMA_Util::sqlAddSlashes( $comments_copy_row['column_name'] - ) . '\'' - . ($GLOBALS['cfgRelation']['mimework'] ? ',\'' . PMA_Util::sqlAddSlashes($comments_copy_row['comment']) . '\',' - . '\'' . PMA_Util::sqlAddSlashes($comments_copy_row['mimetype']) . '\',' - . '\'' . PMA_Util::sqlAddSlashes($comments_copy_row['transformation']) . '\',' - . '\'' . PMA_Util::sqlAddSlashes($comments_copy_row['transformation_options']) . '\'' : '') - . ')'; + ) + . '\'' + . ($GLOBALS['cfgRelation']['mimework'] + ? ',\'' . PMA_Util::sqlAddSlashes($comments_copy_row['comment']) . '\',' + . '\'' . PMA_Util::sqlAddSlashes($comments_copy_row['mimetype']) . '\',' + . '\'' . PMA_Util::sqlAddSlashes($comments_copy_row['transformation']) . '\',' + . '\'' . PMA_Util::sqlAddSlashes($comments_copy_row['transformation_options']) . '\'' + : '') + . ')'; PMA_queryAsControlUser($new_comment_query); } // end while $GLOBALS['dbi']->freeResult($comments_copy_rs); From 16587a8c6b78548dca98e162d118fedcd7229c37 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 22 Jan 2014 18:19:48 +0530 Subject: [PATCH 3/3] Suffix files containing classes with .class.php file extension Signed-off-by: Madhura Jayaratne --- gis_data_editor.php | 4 ++-- ...a_gis_factory.php => GIS_Factory.class.php} | 6 +++--- ...gis_geometry.php => GIS_Geometry.class.php} | 0 ...on.php => GIS_Geometrycollection.class.php} | 0 ...linestring.php => GIS_Linestring.class.php} | 0 ...tring.php => GIS_Multilinestring.class.php} | 0 ...multipoint.php => GIS_Multipoint.class.php} | 0 ...ipolygon.php => GIS_Multipolygon.class.php} | 2 +- .../{pma_gis_point.php => GIS_Point.class.php} | 0 ...a_gis_polygon.php => GIS_Polygon.class.php} | 0 ...ization.php => GIS_Visualization.class.php} | 0 libraries/plugins/import/ImportShp.class.php | 2 +- libraries/tbl_gis_visualization.lib.php | 8 ++++---- test/classes/gis/PMA_GIS_Factory_test.php | 18 +++++++++--------- test/classes/gis/PMA_GIS_Geom_test.php | 2 +- test/classes/gis/PMA_GIS_Geometry_test.php | 2 +- .../gis/PMA_GIS_Geometrycollection_test.php | 6 +++--- test/classes/gis/PMA_GIS_Linestring_test.php | 4 ++-- .../gis/PMA_GIS_Multilinestring_test.php | 4 ++-- test/classes/gis/PMA_GIS_Multipoint_test.php | 4 ++-- test/classes/gis/PMA_GIS_Multipolygon_test.php | 4 ++-- test/classes/gis/PMA_GIS_Point_test.php | 4 ++-- test/classes/gis/PMA_GIS_Polygon_test.php | 4 ++-- 23 files changed, 37 insertions(+), 37 deletions(-) rename libraries/gis/{pma_gis_factory.php => GIS_Factory.class.php} (86%) rename libraries/gis/{pma_gis_geometry.php => GIS_Geometry.class.php} (100%) rename libraries/gis/{pma_gis_geometrycollection.php => GIS_Geometrycollection.class.php} (100%) rename libraries/gis/{pma_gis_linestring.php => GIS_Linestring.class.php} (100%) rename libraries/gis/{pma_gis_multilinestring.php => GIS_Multilinestring.class.php} (100%) rename libraries/gis/{pma_gis_multipoint.php => GIS_Multipoint.class.php} (100%) rename libraries/gis/{pma_gis_multipolygon.php => GIS_Multipolygon.class.php} (99%) rename libraries/gis/{pma_gis_point.php => GIS_Point.class.php} (100%) rename libraries/gis/{pma_gis_polygon.php => GIS_Polygon.class.php} (100%) rename libraries/gis/{pma_gis_visualization.php => GIS_Visualization.class.php} (100%) diff --git a/gis_data_editor.php b/gis_data_editor.php index 0c73f11c1c..792983b697 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -20,8 +20,8 @@ function escape($variable) } require_once 'libraries/common.inc.php'; -require_once 'libraries/gis/pma_gis_factory.php'; -require_once 'libraries/gis/pma_gis_visualization.php'; +require_once 'libraries/gis/GIS_Factory.class.php'; +require_once 'libraries/gis/GIS_Visualization.class.php'; require_once 'libraries/tbl_gis_visualization.lib.php'; // Get data if any posted diff --git a/libraries/gis/pma_gis_factory.php b/libraries/gis/GIS_Factory.class.php similarity index 86% rename from libraries/gis/pma_gis_factory.php rename to libraries/gis/GIS_Factory.class.php index a8f8b3777f..b2d01c11a3 100644 --- a/libraries/gis/pma_gis_factory.php +++ b/libraries/gis/GIS_Factory.class.php @@ -30,13 +30,13 @@ class PMA_GIS_Factory */ public static function factory($type) { - include_once './libraries/gis/pma_gis_geometry.php'; + include_once './libraries/gis/GIS_Geometry.class.php'; $type_lower = strtolower($type); - if (! file_exists('./libraries/gis/pma_gis_' . $type_lower . '.php')) { + if (! file_exists('./libraries/gis/GIS_' . ucfirst($type_lower) . '.class.php')) { return false; } - if (include_once './libraries/gis/pma_gis_' . $type_lower . '.php') { + if (include_once './libraries/gis/GIS_' . ucfirst($type_lower) . '.class.php') { switch(strtoupper($type)) { case 'MULTIPOLYGON' : return PMA_GIS_Multipolygon::singleton(); diff --git a/libraries/gis/pma_gis_geometry.php b/libraries/gis/GIS_Geometry.class.php similarity index 100% rename from libraries/gis/pma_gis_geometry.php rename to libraries/gis/GIS_Geometry.class.php diff --git a/libraries/gis/pma_gis_geometrycollection.php b/libraries/gis/GIS_Geometrycollection.class.php similarity index 100% rename from libraries/gis/pma_gis_geometrycollection.php rename to libraries/gis/GIS_Geometrycollection.class.php diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/GIS_Linestring.class.php similarity index 100% rename from libraries/gis/pma_gis_linestring.php rename to libraries/gis/GIS_Linestring.class.php diff --git a/libraries/gis/pma_gis_multilinestring.php b/libraries/gis/GIS_Multilinestring.class.php similarity index 100% rename from libraries/gis/pma_gis_multilinestring.php rename to libraries/gis/GIS_Multilinestring.class.php diff --git a/libraries/gis/pma_gis_multipoint.php b/libraries/gis/GIS_Multipoint.class.php similarity index 100% rename from libraries/gis/pma_gis_multipoint.php rename to libraries/gis/GIS_Multipoint.class.php diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/GIS_Multipolygon.class.php similarity index 99% rename from libraries/gis/pma_gis_multipolygon.php rename to libraries/gis/GIS_Multipolygon.class.php index d703de51d3..549cc1db67 100644 --- a/libraries/gis/pma_gis_multipolygon.php +++ b/libraries/gis/GIS_Multipolygon.class.php @@ -393,7 +393,7 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry // Determines whether each line ring is an inner ring or an outer ring. // If it's an inner ring get a point on the surface which can be used to // correctly classify inner rings to their respective outer rings. - include_once './libraries/gis/pma_gis_polygon.php'; + include_once './libraries/gis/GIS_Polygon.class.php'; foreach ($row_data['parts'] as $i => $ring) { $row_data['parts'][$i]['isOuter'] = PMA_GIS_Polygon::isOuterRing($ring['points']); diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/GIS_Point.class.php similarity index 100% rename from libraries/gis/pma_gis_point.php rename to libraries/gis/GIS_Point.class.php diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/GIS_Polygon.class.php similarity index 100% rename from libraries/gis/pma_gis_polygon.php rename to libraries/gis/GIS_Polygon.class.php diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/GIS_Visualization.class.php similarity index 100% rename from libraries/gis/pma_gis_visualization.php rename to libraries/gis/GIS_Visualization.class.php diff --git a/libraries/plugins/import/ImportShp.class.php b/libraries/plugins/import/ImportShp.class.php index e65e050248..44c653f1f5 100644 --- a/libraries/plugins/import/ImportShp.class.php +++ b/libraries/plugins/import/ImportShp.class.php @@ -215,7 +215,7 @@ class ImportShp extends ImportPlugin } if (isset($gis_type)) { - include_once './libraries/gis/pma_gis_factory.php'; + include_once './libraries/gis/GIS_Factory.class.php'; $gis_obj = PMA_GIS_Factory::factory($gis_type); } else { $gis_obj = null; diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php index f710581658..b6c2b0feca 100644 --- a/libraries/tbl_gis_visualization.lib.php +++ b/libraries/tbl_gis_visualization.lib.php @@ -136,8 +136,8 @@ function sanitize($select) */ function PMA_GIS_visualizationResults($data, &$visualizationSettings, $format) { - include_once './libraries/gis/pma_gis_visualization.php'; - include_once './libraries/gis/pma_gis_factory.php'; + include_once './libraries/gis/GIS_Visualization.class.php'; + include_once './libraries/gis/GIS_Factory.class.php'; if (! isset($data[0])) { // empty data @@ -173,8 +173,8 @@ function PMA_GIS_visualizationResults($data, &$visualizationSettings, $format) */ function PMA_GIS_saveToFile($data, $visualizationSettings, $format, $fileName) { - include_once './libraries/gis/pma_gis_visualization.php'; - include_once './libraries/gis/pma_gis_factory.php'; + include_once './libraries/gis/GIS_Visualization.class.php'; + include_once './libraries/gis/GIS_Factory.class.php'; if (isset($data[0])) { $visualization = new PMA_GIS_Visualization($data, $visualizationSettings); diff --git a/test/classes/gis/PMA_GIS_Factory_test.php b/test/classes/gis/PMA_GIS_Factory_test.php index a8c6a821ad..90562c8666 100644 --- a/test/classes/gis/PMA_GIS_Factory_test.php +++ b/test/classes/gis/PMA_GIS_Factory_test.php @@ -5,19 +5,19 @@ * * @package PhpMyAdmin-test */ -require_once 'libraries/gis/pma_gis_geometry.php'; -require_once 'libraries/gis/pma_gis_linestring.php'; -require_once 'libraries/gis/pma_gis_multilinestring.php'; -require_once 'libraries/gis/pma_gis_point.php'; -require_once 'libraries/gis/pma_gis_multipoint.php'; -require_once 'libraries/gis/pma_gis_polygon.php'; -require_once 'libraries/gis/pma_gis_multipolygon.php'; -require_once 'libraries/gis/pma_gis_geometrycollection.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; +require_once 'libraries/gis/GIS_Linestring.class.php'; +require_once 'libraries/gis/GIS_Multilinestring.class.php'; +require_once 'libraries/gis/GIS_Point.class.php'; +require_once 'libraries/gis/GIS_Multipoint.class.php'; +require_once 'libraries/gis/GIS_Polygon.class.php'; +require_once 'libraries/gis/GIS_Multipolygon.class.php'; +require_once 'libraries/gis/GIS_Geometrycollection.class.php'; /* * Include to test */ -require_once 'libraries/gis/pma_gis_factory.php'; +require_once 'libraries/gis/GIS_Factory.class.php'; /** * Test class for PMA_GIS_Factory diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php index 0ac897259b..7f06aae4d0 100644 --- a/test/classes/gis/PMA_GIS_Geom_test.php +++ b/test/classes/gis/PMA_GIS_Geom_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -require_once 'libraries/gis/pma_gis_geometry.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; /** * Abstract parent class for all PMA_GIS_ test classes diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geometry_test.php index 76333ac3fa..5b9d7a68ee 100644 --- a/test/classes/gis/PMA_GIS_Geometry_test.php +++ b/test/classes/gis/PMA_GIS_Geometry_test.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin-test */ -require_once 'libraries/gis/pma_gis_geometry.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; /** * Tests for PMA_GIS_Geometry class diff --git a/test/classes/gis/PMA_GIS_Geometrycollection_test.php b/test/classes/gis/PMA_GIS_Geometrycollection_test.php index 2ac79a3b44..48e8313a10 100644 --- a/test/classes/gis/PMA_GIS_Geometrycollection_test.php +++ b/test/classes/gis/PMA_GIS_Geometrycollection_test.php @@ -6,9 +6,9 @@ * * @package PhpMyAdmin-test */ -require_once 'libraries/gis/pma_gis_geometry.php'; -require_once 'libraries/gis/pma_gis_geometrycollection.php'; -require_once 'libraries/gis/pma_gis_factory.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; +require_once 'libraries/gis/GIS_Geometrycollection.class.php'; +require_once 'libraries/gis/GIS_Factory.class.php'; require_once 'libraries/tcpdf/tcpdf.php'; /** diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php index b28056a90b..abf6884511 100644 --- a/test/classes/gis/PMA_GIS_Linestring_test.php +++ b/test/classes/gis/PMA_GIS_Linestring_test.php @@ -7,8 +7,8 @@ */ require_once 'PMA_GIS_Geom_test.php'; -require_once 'libraries/gis/pma_gis_geometry.php'; -require_once 'libraries/gis/pma_gis_linestring.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; +require_once 'libraries/gis/GIS_Linestring.class.php'; require_once 'libraries/tcpdf/tcpdf.php'; /** diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php index 8793e477e8..7b63fa6f2a 100644 --- a/test/classes/gis/PMA_GIS_Multilinestring_test.php +++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php @@ -7,8 +7,8 @@ */ require_once 'PMA_GIS_Geom_test.php'; -require_once 'libraries/gis/pma_gis_geometry.php'; -require_once 'libraries/gis/pma_gis_multilinestring.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; +require_once 'libraries/gis/GIS_Multilinestring.class.php'; require_once 'libraries/tcpdf/tcpdf.php'; /** diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php index 79f9b8ced4..7ee12bed61 100644 --- a/test/classes/gis/PMA_GIS_Multipoint_test.php +++ b/test/classes/gis/PMA_GIS_Multipoint_test.php @@ -7,8 +7,8 @@ */ require_once 'PMA_GIS_Geom_test.php'; -require_once 'libraries/gis/pma_gis_geometry.php'; -require_once 'libraries/gis/pma_gis_multipoint.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; +require_once 'libraries/gis/GIS_Multipoint.class.php'; require_once 'libraries/tcpdf/tcpdf.php'; /** diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php index a9610b5249..3c9e2c32a6 100644 --- a/test/classes/gis/PMA_GIS_Multipolygon_test.php +++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php @@ -7,8 +7,8 @@ */ require_once 'PMA_GIS_Geom_test.php'; -require_once 'libraries/gis/pma_gis_geometry.php'; -require_once 'libraries/gis/pma_gis_multipolygon.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; +require_once 'libraries/gis/GIS_Multipolygon.class.php'; require_once 'libraries/tcpdf/tcpdf.php'; require_once 'libraries/Util.class.php'; diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php index 09fa177563..bad6288f24 100644 --- a/test/classes/gis/PMA_GIS_Point_test.php +++ b/test/classes/gis/PMA_GIS_Point_test.php @@ -7,8 +7,8 @@ */ require_once 'PMA_GIS_Geom_test.php'; -require_once 'libraries/gis/pma_gis_geometry.php'; -require_once 'libraries/gis/pma_gis_point.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; +require_once 'libraries/gis/GIS_Point.class.php'; require_once 'libraries/tcpdf/tcpdf.php'; /** diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php index c8e6ab0105..ccd3d6c243 100644 --- a/test/classes/gis/PMA_GIS_Polygon_test.php +++ b/test/classes/gis/PMA_GIS_Polygon_test.php @@ -7,8 +7,8 @@ */ require_once 'PMA_GIS_Geom_test.php'; -require_once 'libraries/gis/pma_gis_geometry.php'; -require_once 'libraries/gis/pma_gis_polygon.php'; +require_once 'libraries/gis/GIS_Geometry.class.php'; +require_once 'libraries/gis/GIS_Polygon.class.php'; require_once 'libraries/tcpdf/tcpdf.php'; require_once 'libraries/Util.class.php';