gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-01-22 13:52:30 +01:00
commit ed533ad8db
25 changed files with 48 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gis_data_editor.php
View File

@ -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

35
libraries/Table.class.php
View File

@ -336,22 +336,6 @@ class PMA_Table
return in_array(strtoupper($engine), array('MERGE', 'MRG_MYISAM'));
}
/**
* Returns tooltip for the table
* Format : <table_comment> (<number_of_rows>)
*
* @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
@ -1072,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)
@ -1083,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);

6
libraries/gis/pma_gis_factory.php → libraries/gis/GIS_Factory.class.php
View File

@ -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();

0
libraries/gis/pma_gis_geometry.php → libraries/gis/GIS_Geometry.class.php
View File

0
libraries/gis/pma_gis_geometrycollection.php → libraries/gis/GIS_Geometrycollection.class.php
View File

0
libraries/gis/pma_gis_linestring.php → libraries/gis/GIS_Linestring.class.php
View File

0
libraries/gis/pma_gis_multilinestring.php → libraries/gis/GIS_Multilinestring.class.php
View File

0
libraries/gis/pma_gis_multipoint.php → libraries/gis/GIS_Multipoint.class.php
View File

2
libraries/gis/pma_gis_multipolygon.php → libraries/gis/GIS_Multipolygon.class.php
View File

@ -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']);

0
libraries/gis/pma_gis_point.php → libraries/gis/GIS_Point.class.php
View File

0
libraries/gis/pma_gis_polygon.php → libraries/gis/GIS_Polygon.class.php
View File

0
libraries/gis/pma_gis_visualization.php → libraries/gis/GIS_Visualization.class.php
View File

2
libraries/plugins/import/ImportShp.class.php
View File

@ -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;

8
libraries/tbl_gis_visualization.lib.php
View File

@ -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);

21
test/classes/PMA_Table_test.php
View File

@ -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
*

18
test/classes/gis/PMA_GIS_Factory_test.php
View File

@ -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

2
test/classes/gis/PMA_GIS_Geom_test.php
View File

@ -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_<Geom_type> test classes

2
test/classes/gis/PMA_GIS_Geometry_test.php
View File

@ -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

6
test/classes/gis/PMA_GIS_Geometrycollection_test.php
View File

@ -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';
/**

4
test/classes/gis/PMA_GIS_Linestring_test.php
View File

@ -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';
/**

4
test/classes/gis/PMA_GIS_Multilinestring_test.php
View File

@ -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';
/**

4
test/classes/gis/PMA_GIS_Multipoint_test.php
View File

@ -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';
/**

4
test/classes/gis/PMA_GIS_Multipolygon_test.php
View File

@ -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';

4
test/classes/gis/PMA_GIS_Point_test.php
View File

@ -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';
/**

4
test/classes/gis/PMA_GIS_Polygon_test.php
View File

@ -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';