Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

This commit is contained in:
Michal Čihař 2017-07-21 11:44:02 +02:00
commit b08a868efe
295 changed files with 2740 additions and 3821 deletions

View File

@ -12,7 +12,7 @@
* @package PhpMyAdmin
*/
use PhpMyAdmin\Response;
use PMA\libraries\plugins\export\ExportSql;
use PhpMyAdmin\Plugins\Export\ExportSql;
/**
* requirements
@ -77,7 +77,7 @@ if (strlen($GLOBALS['db']) > 0
$export_sql_plugin = PMA_getPlugin(
"export",
"sql",
'libraries/plugins/export/',
'libraries/classes/Plugins/Export/',
array(
'single_table' => isset($single_table),
'export_type' => 'database'

View File

@ -3,7 +3,7 @@
Transformations
===============
.. note::
.. note::
You need to have configured the :ref:`linked-tables` for using transformations
feature.
@ -87,9 +87,9 @@ File structure
++++++++++++++
All specific transformations for mimetypes are defined through class
files in the directory 'libraries/plugins/transformations/'. Each of
files in the directory 'libraries/classes/Plugins/Transformations/'. Each of
them extends a certain transformation abstract class declared in
libraries/plugins/transformations/abstract.
libraries/classes/Plugins/Transformations/Abs.
They are stored in files to ease up customization and easy adding of
new transformations.
@ -117,8 +117,8 @@ getInfo() returns the transformation's description and possible
options it may receive and applyTransformation() is the method that
does the actual work of the transformation plug-in.
Please see the libraries/plugins/transformations/TEMPLATE and
libraries/plugins/transformations/TEMPLATE\_ABSTRACT files for adding
Please see the libraries/classes/Plugins/Transformations/TEMPLATE and
libraries/classes/Plugins/Transformations/TEMPLATE\_ABSTRACT files for adding
your own transformation plug-in. You can also generate a new
transformation plug-in (with or without the abstract transformation
class), by using
@ -140,4 +140,3 @@ The applyTransformation() method always gets passed three variables:
unsigned/zerofill/not\_null/... properties. The $meta->mimetype
variable contains the original MIME-type of the column (i.e.
'text/plain', 'image/jpeg' etc.)

View File

@ -8,7 +8,7 @@
use PhpMyAdmin\Core;
use PhpMyAdmin\Encoding;
use PMA\libraries\plugins\ExportPlugin;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PhpMyAdmin\Sanitize;
@ -183,7 +183,7 @@ $what = Core::securePath($_POST['what']);
$export_plugin = PMA_getPlugin(
"export",
$what,
'libraries/plugins/export/',
'libraries/classes/Plugins/Export/',
array(
'export_type' => $export_type,
'single_table' => isset($single_table)

View File

@ -7,8 +7,8 @@
*/
use PhpMyAdmin\Core;
use PMA\libraries\gis\GISFactory;
use PMA\libraries\gis\GISVisualization;
use PhpMyAdmin\Gis\GisFactory;
use PhpMyAdmin\Gis\GisVisualization;
use PhpMyAdmin\Response;
use PhpMyAdmin\Url;
@ -70,7 +70,7 @@ if (! isset($gis_data['gis_type'])) {
$geom_type = htmlspecialchars($gis_data['gis_type']);
// Generate parameters from value passed.
$gis_obj = GISFactory::factory($geom_type);
$gis_obj = GisFactory::factory($geom_type);
if (isset($_REQUEST['value'])) {
$gis_data = array_merge(
$gis_data, $gis_obj->generateParams($_REQUEST['value'])
@ -91,10 +91,10 @@ $visualizationSettings = array(
'spatialColumn' => 'wkt'
);
$data = array(array('wkt' => $wkt_with_zero, 'srid' => $srid));
$visualization = GISVisualization::getByData($data, $visualizationSettings)
$visualization = GisVisualization::getByData($data, $visualizationSettings)
->toImage('svg');
$open_layers = GISVisualization::getByData($data, $visualizationSettings)
$open_layers = GisVisualization::getByData($data, $visualizationSettings)
->asOl();
// If the call is to update the WKT and visualization make an AJAX response

View File

@ -10,7 +10,7 @@ use PhpMyAdmin\Bookmark;
use PhpMyAdmin\Core;
use PhpMyAdmin\Encoding;
use PhpMyAdmin\File;
use PMA\libraries\plugins\ImportPlugin;
use PhpMyAdmin\Plugins\ImportPlugin;
use PhpMyAdmin\Response;
use PhpMyAdmin\Sql;
use PhpMyAdmin\Url;
@ -522,7 +522,7 @@ if (! $error) {
$import_plugin = PMA_getPlugin(
"import",
$format,
'libraries/plugins/import/',
'libraries/classes/Plugins/Import/',
$import_type
);
if ($import_plugin == null) {

View File

@ -290,7 +290,7 @@ function PMA_analyseShowGrant()
$GLOBALS['dbi']->freeResult($rs_usr);
// must also cacheUnset() them in
// libraries/plugins/auth/AuthenticationCookie.php
// PhpMyAdmin\Plugins\Auth\AuthenticationCookie
PhpMyAdmin\Util::cacheSet('is_create_db_priv', $GLOBALS['is_create_db_priv']);
PhpMyAdmin\Util::cacheSet('is_reload_priv', $GLOBALS['is_reload_priv']);
PhpMyAdmin\Util::cacheSet('db_to_create', $GLOBALS['db_to_create']);

View File

@ -9,7 +9,7 @@ namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Controllers\TableController;
use PhpMyAdmin\Core;
use PMA\libraries\gis\GISVisualization;
use PhpMyAdmin\Gis\GisVisualization;
use PhpMyAdmin\Message;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
@ -41,7 +41,7 @@ class TableGisVisualizationController extends TableController
protected $visualizationSettings;
/**
* @var \PMA\libraries\gis\GISVisualization $visualization
* @var \PhpMyAdmin\Gis\GisVisualization $visualization
*/
protected $visualization;
@ -143,7 +143,7 @@ class TableGisVisualizationController extends TableController
$rows = $GLOBALS['cfg']['MaxRows'];
}
}
$this->visualization = GISVisualization::get(
$this->visualization = GisVisualization::get(
$this->sql_query,
$this->visualizationSettings,
$rows,

View File

@ -11,7 +11,7 @@ use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Index;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\transformations\Text_Plain_Link;
use PhpMyAdmin\Plugins\Transformations\Text_Plain_Link;
use PhpMyAdmin\Response;
use PhpMyAdmin\Sanitize;
use PhpMyAdmin\Sql;
@ -246,23 +246,23 @@ class DisplayResults
private function _setDefaultTransformations()
{
$json_highlighting_data = array(
'libraries/plugins/transformations/output/Text_Plain_Json.php',
'PMA\libraries\plugins\transformations\output\Text_Plain_Json',
'libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php',
'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Json',
'Text_Plain'
);
$sql_highlighting_data = array(
'libraries/plugins/transformations/output/Text_Plain_Sql.php',
'PMA\libraries\plugins\transformations\output\Text_Plain_Sql',
'libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php',
'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql',
'Text_Plain'
);
$blob_sql_highlighting_data = array(
'libraries/plugins/transformations/output/Text_Octetstream_Sql.php',
'PMA\libraries\plugins\transformations\output\Text_Octetstream_Sql',
'libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php',
'PhpMyAdmin\Plugins\Transformations\Output\Text_Octetstream_Sql',
'Text_Octetstream'
);
$link_data = array(
'libraries/plugins/transformations/Text_Plain_Link.php',
'PMA\libraries\plugins\transformations\Text_Plain_Link',
'libraries/classes/Plugins/Transformations/Text_Plain_Link.php',
'PhpMyAdmin\Plugins\Transformations\Text_Plain_Link',
'Text_Plain'
);
$this->transformation_info = array(
@ -3050,7 +3050,7 @@ class DisplayResults
) {
$file = $mime_map[$orgFullColName]['transformation'];
$include_file = 'libraries/plugins/transformations/' . $file;
$include_file = 'libraries/classes/Plugins/Transformations/' . $file;
if (@file_exists($include_file)) {

View File

@ -5,21 +5,21 @@
*
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
/**
* Factory class that handles the creation of geometric objects.
*
* @package PhpMyAdmin-GIS
*/
class GISFactory
class GisFactory
{
/**
* Returns the singleton instance of geometric class of the given type.
*
* @param string $type type of the geometric object
*
* @return GISGeometry the singleton instance of geometric class
* @return GisGeometry the singleton instance of geometric class
* of the given type
*
* @access public
@ -29,19 +29,19 @@ class GISFactory
{
switch (strtoupper($type)) {
case 'MULTIPOLYGON' :
return GISMultipolygon::singleton();
return GisMultiPolygon::singleton();
case 'POLYGON' :
return GISPolygon::singleton();
return GisPolygon::singleton();
case 'MULTIPOINT' :
return GISMultipoint::singleton();
return GisMultiPoint::singleton();
case 'POINT' :
return GISPoint::singleton();
return GisPoint::singleton();
case 'MULTILINESTRING' :
return GISMultilinestring::singleton();
return GisMultiLineString::singleton();
case 'LINESTRING' :
return GISLinestring::singleton();
return GisLineString::singleton();
case 'GEOMETRYCOLLECTION' :
return GISGeometrycollection::singleton();
return GisGeometryCollection::singleton();
default :
return false;
}

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
use \TCPDF;
use TCPDF;
/**
* Base class for all GIS data type classes.
*
* @package PhpMyAdmin-GIS
*/
abstract class GISGeometry
abstract class GisGeometry
{
/**
* Prepares and returns the code related to a row in the GIS dataset as SVG.

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
use \TCPDF;
use TCPDF;
/**
* Handles actions related to GIS GEOMETRYCOLLECTION objects
*
* @package PhpMyAdmin-GIS
*/
class GISGeometrycollection extends GISGeometry
class GisGeometryCollection extends GisGeometry
{
// Hold the singleton instance of the class
private static $_instance;
@ -32,7 +32,7 @@ class GISGeometrycollection extends GISGeometry
/**
* Returns the singleton.
*
* @return GISGeometrycollection the singleton
* @return GisGeometryCollection the singleton
* @access public
*/
public static function singleton()
@ -75,7 +75,7 @@ class GISGeometrycollection extends GISGeometry
}
$type = mb_substr($sub_part, 0, $type_pos);
$gis_obj = GISFactory::factory($type);
$gis_obj = GisFactory::factory($type);
if (!$gis_obj) {
continue;
}
@ -137,7 +137,7 @@ class GISGeometrycollection extends GISGeometry
}
$type = mb_substr($sub_part, 0, $type_pos);
$gis_obj = GISFactory::factory($type);
$gis_obj = GisFactory::factory($type);
if (!$gis_obj) {
continue;
}
@ -184,7 +184,7 @@ class GISGeometrycollection extends GISGeometry
}
$type = mb_substr($sub_part, 0, $type_pos);
$gis_obj = GISFactory::factory($type);
$gis_obj = GisFactory::factory($type);
if (!$gis_obj) {
continue;
}
@ -232,7 +232,7 @@ class GISGeometrycollection extends GISGeometry
}
$type = mb_substr($sub_part, 0, $type_pos);
$gis_obj = GISFactory::factory($type);
$gis_obj = GisFactory::factory($type);
if (!$gis_obj) {
continue;
}
@ -281,7 +281,7 @@ class GISGeometrycollection extends GISGeometry
}
$type = mb_substr($sub_part, 0, $type_pos);
$gis_obj = GISFactory::factory($type);
$gis_obj = GisFactory::factory($type);
if (!$gis_obj) {
continue;
}
@ -350,7 +350,7 @@ class GISGeometrycollection extends GISGeometry
for ($i = 0; $i < $geom_count; $i++) {
if (isset($gis_data[$i]['gis_type'])) {
$type = $gis_data[$i]['gis_type'];
$gis_obj = GISFactory::factory($type);
$gis_obj = GisFactory::factory($type);
if (!$gis_obj) {
continue;
}
@ -381,7 +381,7 @@ class GISGeometrycollection extends GISGeometry
public function generateParams($value)
{
$params = array();
$data = GISGeometry::generateParams($value);
$data = GisGeometry::generateParams($value);
$params['srid'] = $data['srid'];
$wkt = $data['wkt'];
@ -403,7 +403,7 @@ class GISGeometrycollection extends GISGeometry
continue;
}
$type = mb_substr($sub_part, 0, $type_pos);
$gis_obj = GISFactory::factory($type);
$gis_obj = GisFactory::factory($type);
if (!$gis_obj) {
continue;
}

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
use \TCPDF;
use TCPDF;
/**
* Handles actions related to GIS LINESTRING objects
*
* @package PhpMyAdmin-GIS
*/
class GISLinestring extends GISGeometry
class GisLineString extends GisGeometry
{
// Hold the singleton instance of the class
private static $_instance;
@ -32,7 +32,7 @@ class GISLinestring extends GISGeometry
/**
* Returns the singleton.
*
* @return GISLinestring the singleton
* @return GisLineString the singleton
* @access public
*/
public static function singleton()
@ -324,7 +324,7 @@ class GISLinestring extends GISGeometry
$params = array();
if ($index == -1) {
$index = 0;
$data = GISGeometry::generateParams($value);
$data = GisGeometry::generateParams($value);
$params['srid'] = $data['srid'];
$wkt = $data['wkt'];
} else {

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
use \TCPDF;
use TCPDF;
/**
* Handles actions related to GIS MULTILINESTRING objects
*
* @package PhpMyAdmin-GIS
*/
class GISMultilinestring extends GISGeometry
class GisMultiLineString extends GisGeometry
{
// Hold the singleton instance of the class
private static $_instance;
@ -32,7 +32,7 @@ class GISMultilinestring extends GISGeometry
/**
* Returns the singleton.
*
* @return GISMultilinestring the singleton
* @return GisMultiLineString the singleton
* @access public
*/
public static function singleton()
@ -405,7 +405,7 @@ class GISMultilinestring extends GISGeometry
$params = array();
if ($index == -1) {
$index = 0;
$data = GISGeometry::generateParams($value);
$data = GisGeometry::generateParams($value);
$params['srid'] = $data['srid'];
$wkt = $data['wkt'];
} else {

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
use \TCPDF;
use TCPDF;
/**
* Handles actions related to GIS MULTIPOINT objects
*
* @package PhpMyAdmin-GIS
*/
class GISMultipoint extends GISGeometry
class GisMultiPoint extends GisGeometry
{
// Hold the singleton instance of the class
private static $_instance;
@ -32,7 +32,7 @@ class GISMultipoint extends GISGeometry
/**
* Returns the singleton.
*
* @return GISMultipoint the singleton
* @return GisMultiPoint the singleton
* @access public
*/
public static function singleton()
@ -352,7 +352,7 @@ class GISMultipoint extends GISGeometry
$params = array();
if ($index == -1) {
$index = 0;
$data = GISGeometry::generateParams($value);
$data = GisGeometry::generateParams($value);
$params['srid'] = $data['srid'];
$wkt = $data['wkt'];
} else {

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
use \TCPDF;
use TCPDF;
/**
* Handles actions related to GIS MULTIPOLYGON objects
*
* @package PhpMyAdmin-GIS
*/
class GISMultipolygon extends GISGeometry
class GisMultiPolygon extends GisGeometry
{
// Hold the singleton instance of the class
private static $_instance;
@ -32,7 +32,7 @@ class GISMultipolygon extends GISGeometry
/**
* Returns the singleton.
*
* @return GISMultipolygon the singleton
* @return GisMultiPolygon the singleton
* @access public
*/
public static function singleton()
@ -448,14 +448,14 @@ class GISMultipolygon extends GISGeometry
// correctly classify inner rings to their respective outer rings.
foreach ($row_data['parts'] as $i => $ring) {
$row_data['parts'][$i]['isOuter']
= GISPolygon::isOuterRing($ring['points']);
= GisPolygon::isOuterRing($ring['points']);
}
// Find points on surface for inner rings
foreach ($row_data['parts'] as $i => $ring) {
if (!$ring['isOuter']) {
$row_data['parts'][$i]['pointOnSurface']
= GISPolygon::getPointOnSurface($ring['points']);
= GisPolygon::getPointOnSurface($ring['points']);
}
}
@ -471,7 +471,7 @@ class GISMultipolygon extends GISGeometry
// If the pointOnSurface of the inner ring
// is also inside the outer ring
if (GISPolygon::isPointInsidePolygon(
if (GisPolygon::isPointInsidePolygon(
$ring1['pointOnSurface'],
$ring2['points']
)
@ -549,7 +549,7 @@ class GISMultipolygon extends GISGeometry
$params = array();
if ($index == -1) {
$index = 0;
$data = GISGeometry::generateParams($value);
$data = GisGeometry::generateParams($value);
$params['srid'] = $data['srid'];
$wkt = $data['wkt'];
} else {

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
use \TCPDF;
use TCPDF;
/**
* Handles actions related to GIS POINT objects
*
* @package PhpMyAdmin-GIS
*/
class GISPoint extends GISGeometry
class GisPoint extends GisGeometry
{
// Hold the singleton instance of the class
private static $_instance;
@ -32,7 +32,7 @@ class GISPoint extends GISGeometry
/**
* Returns the singleton.
*
* @return GISPoint the singleton
* @return GisPoint the singleton
* @access public
*/
public static function singleton()
@ -331,7 +331,7 @@ class GISPoint extends GISGeometry
$params = array();
if ($index == -1) {
$index = 0;
$data = GISGeometry::generateParams($value);
$data = GisGeometry::generateParams($value);
$params['srid'] = $data['srid'];
$wkt = $data['wkt'];
} else {

View File

@ -5,17 +5,17 @@
*
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
use PhpMyAdmin\Util;
use \TCPDF;
use TCPDF;
/**
* Handles actions related to GIS POLYGON objects
*
* @package PhpMyAdmin-GIS
*/
class GISPolygon extends GISGeometry
class GisPolygon extends GisGeometry
{
// Hold the singleton instance of the class
private static $_instance;
@ -32,7 +32,7 @@ class GISPolygon extends GISGeometry
/**
* Returns the singleton.
*
* @return GISPolygon the singleton
* @return GisPolygon the singleton
* @access public
*/
public static function singleton()
@ -437,7 +437,7 @@ class GISPolygon extends GISGeometry
{
// If area is negative then it's in clockwise orientation,
// i.e. it's an outer ring
if (GISPolygon::area($ring) < 0) {
if (GisPolygon::area($ring) < 0) {
return true;
}
@ -553,11 +553,11 @@ class GISPolygon extends GISGeometry
// One of the points should be inside the polygon,
// unless epsilon chosen is too large
if (GISPolygon::isPointInsidePolygon($pointA, $ring)) {
if (GisPolygon::isPointInsidePolygon($pointA, $ring)) {
return $pointA;
}
if (GISPolygon::isPointInsidePolygon($pointB, $ring)) {
if (GisPolygon::isPointInsidePolygon($pointB, $ring)) {
return $pointB;
}
@ -583,7 +583,7 @@ class GISPolygon extends GISGeometry
$params = array();
if ($index == -1) {
$index = 0;
$data = GISGeometry::generateParams($value);
$data = GisGeometry::generateParams($value);
$params['srid'] = $data['srid'];
$wkt = $data['wkt'];
} else {

View File

@ -6,19 +6,19 @@
* @package PhpMyAdmin-GIS
*/
namespace PMA\libraries\gis;
namespace PhpMyAdmin\Gis;
use PhpMyAdmin\Core;
use PhpMyAdmin\Util;
use \TCPDF;
use PhpMyAdmin\Sanitize;
use PhpMyAdmin\Util;
use TCPDF;
/**
* Handles visualization of GIS data
*
* @package PhpMyAdmin-GIS
*/
class GISVisualization
class GisVisualization
{
/**
* @var array Raw data for the visualization
@ -78,13 +78,13 @@ class GISVisualization
* @param integer $row number of rows
* @param integer $pos start position
*
* @return GISVisualization
* @return GisVisualization
*
* @access public
*/
public static function get($sql_query, $options, $row, $pos)
{
return new GISVisualization($sql_query, $options, $row, $pos);
return new GisVisualization($sql_query, $options, $row, $pos);
}
/**
@ -94,11 +94,11 @@ class GISVisualization
* ignored
* @param array $options Users specified options
*
* @return GISVisualization
* @return GisVisualization
*/
public static function getByData($data, $options)
{
return new GISVisualization(null, $options, null, null, $data);
return new GisVisualization(null, $options, null, null, $data);
}
/**
@ -558,7 +558,7 @@ class GISVisualization
}
$type = mb_substr($ref_data, 0, $type_pos);
$gis_obj = GISFactory::factory($type);
$gis_obj = GisFactory::factory($type);
if (!$gis_obj) {
continue;
}
@ -647,7 +647,7 @@ class GISVisualization
}
$type = mb_substr($ref_data, 0, $type_pos);
$gis_obj = GISFactory::factory($type);
$gis_obj = GisFactory::factory($type);
if (!$gis_obj) {
continue;
}

View File

@ -12,7 +12,7 @@ use PhpMyAdmin\Console;
use PhpMyAdmin\Core;
use PhpMyAdmin\Menu;
use PhpMyAdmin\Message;
use PMA\libraries\navigation\Navigation;
use PhpMyAdmin\Navigation\Navigation;
use PhpMyAdmin\RecentFavoriteTable;
use PhpMyAdmin\Sanitize;
use PhpMyAdmin\Scripts;

View File

@ -6,7 +6,7 @@
*
* @package PhpMyAdmin-navigation
*/
namespace PMA\libraries\navigation;
namespace PhpMyAdmin\Navigation;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\Message;

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation;
namespace PhpMyAdmin\Navigation;
use PhpMyAdmin\Sanitize;
use PhpMyAdmin\Template;

View File

@ -5,13 +5,13 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation;
namespace PhpMyAdmin\Navigation;
use PMA\libraries\navigation\nodes\Node;
use PMA\libraries\navigation\nodes\NodeDatabase;
use PMA\libraries\navigation\nodes\NodeTable;
use PMA\libraries\navigation\nodes\NodeTableContainer;
use PMA\libraries\navigation\nodes\NodeViewContainer;
use PhpMyAdmin\Navigation\Nodes\Node;
use PhpMyAdmin\Navigation\Nodes\NodeDatabase;
use PhpMyAdmin\Navigation\Nodes\NodeTable;
use PhpMyAdmin\Navigation\Nodes\NodeTableContainer;
use PhpMyAdmin\Navigation\Nodes\NodeViewContainer;
use PhpMyAdmin\RecentFavoriteTable;
use PhpMyAdmin\Response;
use PhpMyAdmin\Util;
@ -860,7 +860,7 @@ class NavigationTree
$children = $this->_tree->children;
usort(
$children,
array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
);
$this->_setVisibility();
for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
@ -903,7 +903,7 @@ class NavigationTree
$children = $node->children;
usort(
$children,
array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
);
for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
if ($i + 1 != $nbChildren) {
@ -1207,7 +1207,7 @@ class NavigationTree
$children = $node->children;
usort(
$children,
array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
);
$buffer = '';
$extra_class = '';
@ -1299,7 +1299,7 @@ class NavigationTree
$children = $this->_tree->children;
usort(
$children,
array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
);
$this->_setVisibility();
for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-navigation
*/
namespace PMA\libraries\navigation;
namespace PhpMyAdmin\Navigation;
use PMA\libraries\navigation\nodes\Node;
use PhpMyAdmin\Navigation\Nodes\Node;
/**
* Node factory - instantiates Node objects or objects derived from the Node class
@ -16,7 +16,7 @@ use PMA\libraries\navigation\nodes\Node;
*/
class NodeFactory
{
protected static $_namespace = 'PMA\\libraries\\navigation\\nodes\\%s';
protected static $_namespace = 'PhpMyAdmin\\Navigation\\Nodes\\%s';
/**
* Sanitizes the name of a Node class
*
@ -89,4 +89,3 @@ class NodeFactory
return new $class($name, $type, $is_group);
}
}

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Util;
@ -341,7 +341,7 @@ class Node
/**
* Returns the names of children of type $type present inside this container
* This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase and PMA\libraries\navigation\nodes\NodeTable classes
* This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase and PhpMyAdmin\Navigation\Nodes\NodeTable classes
*
* @param string $type The type of item we are looking for
* ('tables', 'views', etc)
@ -550,7 +550,7 @@ class Node
/**
* Returns the number of children of type $type present inside this container
* This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase and PMA\libraries\navigation\nodes\NodeTable classes
* This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase and PhpMyAdmin\Navigation\Nodes\NodeTable classes
*
* @param string $type The type of item we are looking for
* ('tables', 'views', etc)

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Util;

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PMA\libraries\navigation\NodeFactory;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Util;
/**

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
@ -57,8 +57,8 @@ class NodeDatabase extends Node
/**
* Returns the number of children of type $type present inside this container
* This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
* and PMA\libraries\navigation\nodes\NodeTable classes
* This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase
* and PhpMyAdmin\Navigation\Nodes\NodeTable classes
*
* @param string $type The type of item we are looking for
* ('tables', 'views', etc)
@ -352,8 +352,8 @@ class NodeDatabase extends Node
/**
* Returns the names of children of type $type present inside this container
* This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
* and PMA\libraries\navigation\nodes\NodeTable classes
* This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase
* and PhpMyAdmin\Navigation\Nodes\NodeTable classes
*
* @param string $type The type of item we are looking for
* ('tables', 'views', etc)

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
/**
* Represents container node that carries children of a database

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PMA\libraries\navigation\NodeFactory;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Util;
require_once './libraries/check_user_privileges.lib.php';

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Util;

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PMA\libraries\navigation\NodeFactory;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Util;
/**

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Util;

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PMA\libraries\navigation\NodeFactory;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Util;
/**

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Util;

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PMA\libraries\navigation\NodeFactory;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Util;
/**

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Util;

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PMA\libraries\navigation\NodeFactory;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Util;
/**

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Util;
@ -75,8 +75,8 @@ class NodeTable extends NodeDatabaseChild
/**
* Returns the number of children of type $type present inside this container
* This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
* and PMA\libraries\navigation\nodes\NodeTable classes
* This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase
* and PhpMyAdmin\Navigation\Nodes\NodeTable classes
*
* @param string $type The type of item we are looking for
* ('columns' or 'indexes')
@ -145,8 +145,8 @@ class NodeTable extends NodeDatabaseChild
/**
* Returns the names of children of type $type present inside this container
* This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
* and PMA\libraries\navigation\nodes\NodeTable classes
* This method is overridden by the PhpMyAdmin\Navigation\Nodes\NodeDatabase
* and PhpMyAdmin\Navigation\Nodes\NodeTable classes
*
* @param string $type The type of item we are looking for
* ('tables', 'views', etc)

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PMA\libraries\navigation\NodeFactory;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Util;
/**

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Util;

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PMA\libraries\navigation\NodeFactory;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Util;
/**

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\Util;

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin-Navigation
*/
namespace PMA\libraries\navigation\nodes;
namespace PhpMyAdmin\Navigation\Nodes;
use PMA\libraries\navigation\NodeFactory;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Util;
/**

View File

@ -6,9 +6,9 @@
* @package PhpMyAdmin-Authentication
* @subpackage Config
*/
namespace PMA\libraries\plugins\auth;
namespace PhpMyAdmin\Plugins\Auth;
use PMA\libraries\plugins\AuthenticationPlugin;
use PhpMyAdmin\Plugins\AuthenticationPlugin;
use PhpMyAdmin\Response;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;

View File

@ -6,12 +6,12 @@
* @package PhpMyAdmin-Authentication
* @subpackage Cookie
*/
namespace PMA\libraries\plugins\auth;
namespace PhpMyAdmin\Plugins\Auth;
use phpseclib\Crypt;
use PhpMyAdmin\LanguageManager;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\AuthenticationPlugin;
use PhpMyAdmin\Plugins\AuthenticationPlugin;
use PhpMyAdmin\Response;
use PhpMyAdmin\Util;
use PhpMyAdmin\Config;

View File

@ -7,9 +7,9 @@
* @package PhpMyAdmin-Authentication
* @subpackage HTTP
*/
namespace PMA\libraries\plugins\auth;
namespace PhpMyAdmin\Plugins\Auth;
use PMA\libraries\plugins\AuthenticationPlugin;
use PhpMyAdmin\Plugins\AuthenticationPlugin;
use PhpMyAdmin\Message;
use PhpMyAdmin\Response;
use PhpMyAdmin\Config;

View File

@ -6,10 +6,10 @@
* @package PhpMyAdmin-Authentication
* @subpackage SignOn
*/
namespace PMA\libraries\plugins\auth;
namespace PhpMyAdmin\Plugins\Auth;
use PhpMyAdmin\Core;
use PMA\libraries\plugins\AuthenticationPlugin;
use PhpMyAdmin\Plugins\AuthenticationPlugin;
use PhpMyAdmin\Util;
/**

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins;
namespace PhpMyAdmin\Plugins;
use PhpMyAdmin\Core;
use PhpMyAdmin\Sanitize;

View File

@ -6,15 +6,15 @@
* @package PhpMyAdmin-Export
* @subpackage CodeGen
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\plugins\export\helpers\TableProperty;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\HiddenPropertyItem;
use PMA\libraries\properties\options\items\SelectPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Plugins\Export\Helpers\TableProperty;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
use PhpMyAdmin\Util;
/**

View File

@ -7,16 +7,16 @@
* @subpackage CSV
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\HiddenPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
/**
* Handles the export for the CSV format

View File

@ -6,15 +6,15 @@
* @package PhpMyAdmin-Export
* @subpackage CSV-Excel
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\HiddenPropertyItem;
use PMA\libraries\properties\options\items\SelectPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
/**
* Handles the export for the CSV-Excel format

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-Export
* @subpackage HTML-Word
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\RadioPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Util;

View File

@ -6,15 +6,15 @@
* @package PhpMyAdmin-Export
* @subpackage JSON
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\HiddenPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
/**
* Handles the export for the JSON format

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-Export
* @subpackage Latex
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\RadioPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Util;

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-Export
* @subpackage MediaWiki
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\RadioPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
use PhpMyAdmin\Util;
/**

View File

@ -6,19 +6,17 @@
* @package PhpMyAdmin-Export
* @subpackage ODS
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\OpenDocument;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\HiddenPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
$GLOBALS['ods_buffer'] = '';
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
/**
* Handles the export for the ODS class
@ -33,6 +31,7 @@ class ExportOds extends ExportPlugin
*/
public function __construct()
{
$GLOBALS['ods_buffer'] = '';
$this->setProperties();
}

View File

@ -6,22 +6,20 @@
* @package PhpMyAdmin-Export
* @subpackage ODT
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\OpenDocument;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\RadioPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Util;
$GLOBALS['odt_buffer'] = '';
/**
* Handles the export for the ODT class
*
@ -35,6 +33,7 @@ class ExportOdt extends ExportPlugin
*/
public function __construct()
{
$GLOBALS['odt_buffer'] = '';
$this->setProperties();
}

View File

@ -6,15 +6,15 @@
* @package PhpMyAdmin-Export
* @subpackage PDF
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\plugins\export\helpers\Pdf;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\RadioPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Plugins\Export\Helpers\Pdf;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
/**
* Skip the plugin if TCPDF is not available.
@ -33,7 +33,7 @@ if (! class_exists('TCPDF')) {
class ExportPdf extends ExportPlugin
{
/**
* PMA\libraries\plugins\export\helpers\Pdf instance
* PhpMyAdmin\Plugins\Export\Helpers\Pdf instance
*
* @var Pdf
*/
@ -343,7 +343,7 @@ class ExportPdf extends ExportPlugin
/* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
/**
* Gets the PMA\libraries\plugins\export\helpers\Pdf instance
* Gets the PhpMyAdmin\Plugins\Export\Helpers\Pdf instance
*
* @return Pdf
*/
@ -353,7 +353,7 @@ class ExportPdf extends ExportPlugin
}
/**
* Instantiates the PMA\libraries\plugins\export\helpers\Pdf class
* Instantiates the PhpMyAdmin\Plugins\Export\Helpers\Pdf class
*
* @param Pdf $pdf The instance
*

View File

@ -7,14 +7,14 @@
* @subpackage PHP
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\items\HiddenPropertyItem;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Util;
/**

View File

@ -6,21 +6,21 @@
* @package PhpMyAdmin-Export
* @subpackage SQL
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\MessageOnlyPropertyItem;
use PMA\libraries\properties\options\items\NumberPropertyItem;
use PMA\libraries\properties\options\items\RadioPropertyItem;
use PMA\libraries\properties\options\items\SelectPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem;
use PhpMyAdmin\Properties\Options\Items\NumberPropertyItem;
use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
use PhpMyAdmin\SqlParser\Components\CreateDefinition;
use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Parser;

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-Export
* @subpackage Texy!text
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\RadioPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Util;

View File

@ -6,15 +6,15 @@
* @package PhpMyAdmin-Export
* @subpackage XML
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\HiddenPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
use PhpMyAdmin\Util;
if (strlen($GLOBALS['db']) === 0) { /* Can't do server export */

View File

@ -7,14 +7,14 @@
* @subpackage YAML
*/
namespace PMA\libraries\plugins\export;
namespace PhpMyAdmin\Plugins\Export;
use PhpMyAdmin\DatabaseInterface;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\HiddenPropertyItem;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem;
/**
* Handles the export for the YAML format

View File

@ -1,12 +1,12 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* PMA\libraries\plugins\export\helpers\Pdf class
* PhpMyAdmin\Plugins\Export\Helpers\Pdf class
*
* @package PhpMyAdmin-Export
* @subpackage PDF
*/
namespace PMA\libraries\plugins\export\helpers;
namespace PhpMyAdmin\Plugins\Export\Helpers;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Pdf as PdfLib;

View File

@ -1,17 +1,17 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Holds the PMA\libraries\plugins\export\helpers\TableProperty class
* Holds the PhpMyAdmin\Plugins\Export\Helpers\TableProperty class
*
* @package PhpMyAdmin-Export
* @subpackage CodeGen
*/
namespace PMA\libraries\plugins\export\helpers;
namespace PhpMyAdmin\Plugins\Export\Helpers;
use PMA\libraries\plugins\export\ExportCodegen;
use PhpMyAdmin\Plugins\Export\ExportCodegen;
/**
* PMA\libraries\plugins\export\helpers\TableProperty class
* PhpMyAdmin\Plugins\Export\Helpers\TableProperty class
*
* @package PhpMyAdmin-Export
* @subpackage CodeGen

View File

@ -20,7 +20,7 @@ if (! defined('PHPMYADMIN')) {
*
* @package PhpMyAdmin-Export
*/
class Export[Name] extends PMA\libraries\plugins\ExportPlugin
class Export[Name] extends PhpMyAdmin\Plugins\ExportPlugin
{
/**
* optional - declare variables and descriptions
@ -67,7 +67,7 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
*/
protected function setProperties()
{
$exportPluginProperties = new PMA\libraries\properties\plugins\ExportPluginProperties();
$exportPluginProperties = new PhpMyAdmin\Properties\Plugins\ExportPluginProperties();
$exportPluginProperties->setText('[name]'); // the name of your plug-in
$exportPluginProperties->setExtension('[ext]'); // extension this plug-in can handle
$exportPluginProperties->setOptionsText(__('Options'));
@ -75,12 +75,12 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
// create the root group that will be the options field for
// $exportPluginProperties
// this will be shown as "Format specific options"
$exportSpecificOptions = new PMA\libraries\properties\options\groups\OptionsPropertyRootGroup(
$exportSpecificOptions = new PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup(
"Format Specific Options"
);
// general options main group
$generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup(
$generalOptions = new PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup(
"general_opts"
);
@ -92,7 +92,7 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
// size - size of text element
// len - maximal size of input
// values - possible values of the item
$leaf = new PMA\libraries\properties\options\items\RadioPropertyItem(
$leaf = new PhpMyAdmin\Properties\Options\Items\RadioPropertyItem(
"structure_or_data"
);
$leaf->setValues(
@ -194,7 +194,7 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
return true;
}
// optional - implement other methods defined in PMA\libraries\plugins\ExportPlugin.class.php:
// optional - implement other methods defined in PhpMyAdmin\Plugins\ExportPlugin.class.php:
// - exportRoutines()
// - exportStructure()
// - getTableDefStandIn()
@ -203,7 +203,7 @@ class Export[Name] extends PMA\libraries\plugins\ExportPlugin
// optional - implement other private methods in order to avoid
// having huge methods or avoid duplicate code. Make use of them
// as well as of the getters and setters declared both here
// and in the PMA\libraries\plugins\ExportPlugin class
// and in the PhpMyAdmin\Plugins\ExportPlugin class
// optional:

View File

@ -6,9 +6,9 @@
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins;
namespace PhpMyAdmin\Plugins;
use PMA\libraries\properties\plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
/**
* Provides a common interface that will have to be implemented by all of the
@ -21,10 +21,10 @@ use PMA\libraries\properties\plugins\ExportPluginProperties;
abstract class ExportPlugin
{
/**
* PMA\libraries\properties\plugins\ExportPluginProperties object containing
* PhpMyAdmin\Properties\Plugins\ExportPluginProperties object containing
* the specific export plugin type properties
*
* @var \PMA\libraries\properties\plugins\ExportPluginProperties
* @var \PhpMyAdmin\Properties\Plugins\ExportPluginProperties
*/
protected $properties;
/**

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins;
namespace PhpMyAdmin\Plugins;
use PMA\libraries\plugins\TransformationsPlugin;
use PhpMyAdmin\Plugins\TransformationsPlugin;
/**
* Provides a common interface that will have to be implemented

View File

@ -6,14 +6,14 @@
* @package PhpMyAdmin-Import
* @subpackage CSV
*/
namespace PMA\libraries\plugins\import;
namespace PhpMyAdmin\Plugins\Import;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\plugins\ImportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\plugins\ImportPlugin;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Plugins\ImportPlugin;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
/**
* Super class of the import plugins for the CSV format
@ -27,7 +27,7 @@ abstract class AbstractImportCsv extends ImportPlugin
* Sets the import plugin properties.
* Called in the constructor.
*
* @return \PMA\libraries\properties\options\groups\OptionsPropertyMainGroup PMA\libraries\properties\options\groups\OptionsPropertyMainGroup object of the plugin
* @return \PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup object of the plugin
*/
protected function setProperties()
{

View File

@ -7,11 +7,11 @@
* @package PhpMyAdmin-Import
* @subpackage CSV
*/
namespace PMA\libraries\plugins\import;
namespace PhpMyAdmin\Plugins\Import;
use PhpMyAdmin\Message;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
use PhpMyAdmin\Util;
/**

View File

@ -6,12 +6,12 @@
* @package PhpMyAdmin-Import
* @subpackage LDI
*/
namespace PMA\libraries\plugins\import;
namespace PhpMyAdmin\Plugins\Import;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\import\AbstractImportCsv;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\TextPropertyItem;
use PhpMyAdmin\Plugins\Import\AbstractImportCsv;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
use PhpMyAdmin\Util;
if (!defined('PHPMYADMIN')) {

View File

@ -6,11 +6,11 @@
* @package PhpMyAdmin-Import
* @subpackage MediaWiki
*/
namespace PMA\libraries\plugins\import;
namespace PhpMyAdmin\Plugins\Import;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\ImportPlugin;
use PMA\libraries\properties\plugins\ImportPluginProperties;
use PhpMyAdmin\Plugins\ImportPlugin;
use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
/**
* Handles the import for the MediaWiki format

View File

@ -8,14 +8,14 @@
* @package PhpMyAdmin-Import
* @subpackage ODS
*/
namespace PMA\libraries\plugins\import;
namespace PhpMyAdmin\Plugins\Import;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\ImportPlugin;
use PMA\libraries\properties\plugins\ImportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PhpMyAdmin\Plugins\ImportPlugin;
use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use SimpleXMLElement;
/**

View File

@ -6,16 +6,16 @@
* @package PhpMyAdmin-Import
* @subpackage ESRI_Shape
*/
namespace PMA\libraries\plugins\import;
namespace PhpMyAdmin\Plugins\Import;
use PMA\libraries\gis\GISFactory;
use PMA\libraries\gis\GISMultilinestring;
use PMA\libraries\gis\GISMultipoint;
use PMA\libraries\gis\GISPoint;
use PMA\libraries\gis\GISPolygon;
use PhpMyAdmin\Gis\GisFactory;
use PhpMyAdmin\Gis\GisMultiLineString;
use PhpMyAdmin\Gis\GisMultiPoint;
use PhpMyAdmin\Gis\GisPoint;
use PhpMyAdmin\Gis\GisPolygon;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\ImportPlugin;
use PMA\libraries\properties\plugins\ImportPluginProperties;
use PhpMyAdmin\Plugins\ImportPlugin;
use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
use PhpMyAdmin\Sanitize;
use PhpMyAdmin\ZipExtension;
@ -186,8 +186,8 @@ class ImportShp extends ImportPlugin
}
if (isset($gis_type)) {
/** @var GISMultilinestring|\PMA\libraries\gis\GISMultipoint|\PMA\libraries\gis\GISPoint|GISPolygon $gis_obj */
$gis_obj = GISFactory::factory($gis_type);
/** @var GisMultiLineString|\PhpMyAdmin\Gis\GisMultiPoint|\PhpMyAdmin\Gis\GisPoint|GisPolygon $gis_obj */
$gis_obj = GisFactory::factory($gis_type);
} else {
$gis_obj = null;
}

View File

@ -6,14 +6,14 @@
* @package PhpMyAdmin-Import
* @subpackage SQL
*/
namespace PMA\libraries\plugins\import;
namespace PhpMyAdmin\Plugins\Import;
use PMA\libraries\plugins\ImportPlugin;
use PMA\libraries\properties\plugins\ImportPluginProperties;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\items\SelectPropertyItem;
use PhpMyAdmin\Plugins\ImportPlugin;
use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
use PhpMyAdmin\SqlParser\Utils\BufferedQuery;
/**

View File

@ -8,11 +8,11 @@
* @subpackage XML
*/
namespace PMA\libraries\plugins\import;
namespace PhpMyAdmin\Plugins\Import;
use PhpMyAdmin\Message;
use PMA\libraries\plugins\ImportPlugin;
use PMA\libraries\properties\plugins\ImportPluginProperties;
use PhpMyAdmin\Plugins\ImportPlugin;
use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
use PhpMyAdmin\Util;
use SimpleXMLElement;

View File

@ -10,19 +10,16 @@ gettext mechanism, see https://wiki.phpmyadmin.net/pma/Gettext_for_developers.
* @package PhpMyAdmin-Import
* @subpackage [Name]
*/
if (! defined('PHPMYADMIN')) {
exit;
}
namespace PhpMyAdmin\Plugins\Import;
/* Get the import interface */
require_once 'libraries/plugins/PMA\libraries\plugins\ImportPlugin.class.php';
use PhpMyAdmin\Plugins\ImportPlugin;
/**
* Handles the import for the [Name] format
*
* @package PhpMyAdmin-Import
*/
class Import[Name] extends PMA\libraries\plugins\ImportPlugin
class Import[Name] extends ImportPlugin
{
/**
* optional - declare variables and descriptions
@ -47,7 +44,7 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
*/
protected function setProperties()
{
$importPluginProperties = new PMA\libraries\properties\plugins\ImportPluginProperties();
$importPluginProperties = new PhpMyAdmin\Properties\Plugins\ImportPluginProperties();
$importPluginProperties->setText('[name]'); // the name of your plug-in
$importPluginProperties->setExtension('[ext]'); // extension this plug-in can handle
$importPluginProperties->setOptionsText(__('Options'));
@ -56,12 +53,12 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
// $importPluginProperties
// this will be shown as "Format specific options"
$importSpecificOptions = new
PMA\libraries\properties\options\groups\OptionsPropertyRootGroup(
PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup(
"Format Specific Options"
);
// general options main group
$generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup(
$generalOptions = new PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup(
"general_opts"
);
@ -73,7 +70,7 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
// size - size of text element
// len - maximal size of input
// values - possible values of the item
$leaf = new PMA\libraries\properties\options\items\RadioPropertyItem(
$leaf = new PhpMyAdmin\Properties\Options\Items\RadioPropertyItem(
"structure_or_data"
);
$leaf->setValues(

View File

@ -7,7 +7,7 @@
* @package PhpMyAdmin-Import
* @subpackage ESRI_Shape
*/
namespace PMA\libraries\plugins\import;
namespace PhpMyAdmin\Plugins\Import;
use PhpMyAdmin\ShapeFile\ShapeFile;

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\import\upload;
namespace PhpMyAdmin\Plugins\Import\Upload;
use PMA\libraries\plugins\UploadInterface;
use PhpMyAdmin\Plugins\UploadInterface;
/**
* Implementation for the APC extension

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\import\upload;
namespace PhpMyAdmin\Plugins\Import\Upload;
use PMA\libraries\plugins\UploadInterface;
use PhpMyAdmin\Plugins\UploadInterface;
/**
* Implementation for no plugin

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\import\upload;
namespace PhpMyAdmin\Plugins\Import\Upload;
use PMA\libraries\plugins\UploadInterface;
use PhpMyAdmin\Plugins\UploadInterface;
/**
* Implementation for upload progress

View File

@ -5,9 +5,9 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\import\upload;
namespace PhpMyAdmin\Plugins\Import\Upload;
use PMA\libraries\plugins\UploadInterface;
use PhpMyAdmin\Plugins\UploadInterface;
/**
* Implementation for session

View File

@ -6,9 +6,9 @@
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins;
namespace PhpMyAdmin\Plugins;
use PMA\libraries\properties\plugins\ImportPluginProperties;
use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
/**
* Provides a common interface that will have to be implemented by all of the
@ -38,7 +38,7 @@ abstract class ImportPlugin
/**
* Gets the import specific format plugin properties
*
* @return \PMA\libraries\properties\plugins\ImportPluginProperties
* @return \PhpMyAdmin\Properties\Plugins\ImportPluginProperties
*/
public function getProperties()
{

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\dia;
namespace PhpMyAdmin\Plugins\Schema\Dia;
use PhpMyAdmin\Core;
use PhpMyAdmin\Response;

View File

@ -5,13 +5,13 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\dia;
namespace PhpMyAdmin\Plugins\Schema\Dia;
use PMA\libraries\plugins\schema\eps\TableStatsEps;
use PMA\libraries\plugins\schema\ExportRelationSchema;
use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
use PMA\libraries\plugins\schema\svg\TableStatsSvg;
use PMA\libraries\plugins\schema\dia\TableStatsDia;
use PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps;
use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf;
use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg;
use PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia;
/**
* Dia Relation Schema Class
@ -43,7 +43,7 @@ class DiaRelationSchema extends ExportRelationSchema
public static $objectId = 0;
/**
* The "PMA\libraries\plugins\schema\dia\DiaRelationSchema" constructor
* The "PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema" constructor
*
* Upon instantiation This outputs the Dia XML document
* that user can download

View File

@ -1,11 +1,11 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Contains PMA\libraries\plugins\schema\dia\RelationStatsDia class
* Contains PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia class
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\dia;
namespace PhpMyAdmin\Plugins\Schema\Dia;
/**
* Relation preferences/statistics
@ -36,7 +36,7 @@ class RelationStatsDia
public $referenceColor;
/**
* The "PMA\libraries\plugins\schema\dia\RelationStatsDia" constructor
* The "PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia" constructor
*
* @param object $diagram The DIA diagram
* @param string $master_table The master table name

View File

@ -1,14 +1,14 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Contains PMA\libraries\plugins\schema\dia\TableStatsDia class
* Contains PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia class
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\dia;
namespace PhpMyAdmin\Plugins\Schema\Dia;
use PMA\libraries\plugins\schema\ExportRelationSchema;
use PMA\libraries\plugins\schema\TableStats;
use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
use PhpMyAdmin\Plugins\Schema\TableStats;
/**
* Table preferences/statistics
@ -26,7 +26,7 @@ class TableStatsDia extends TableStats
public $tableColor;
/**
* The "PMA\libraries\plugins\schema\dia\TableStatsDia" constructor
* The "PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia" constructor
*
* @param object $diagram The current dia document
* @param string $db The database name

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\eps;
namespace PhpMyAdmin\Plugins\Schema\Eps;
use PhpMyAdmin\Core;
use PhpMyAdmin\Response;

View File

@ -5,13 +5,13 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\eps;
namespace PhpMyAdmin\Plugins\Schema\Eps;
use PMA\libraries\plugins\schema\dia\RelationStatsDia;
use PMA\libraries\plugins\schema\dia\TableStatsDia;
use PMA\libraries\plugins\schema\ExportRelationSchema;
use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
use PMA\libraries\plugins\schema\svg\TableStatsSvg;
use PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia;
use PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia;
use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf;
use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg;
/**
* EPS Relation Schema Class
@ -165,7 +165,7 @@ class EpsRelationSchema extends ExportRelationSchema
* @return void
*
* @see _setMinMax,Table_Stats_Eps::__construct(),
* PMA\libraries\plugins\schema\eps\RelationStatsEps::__construct()
* PhpMyAdmin\Plugins\Schema\Eps\RelationStatsEps::__construct()
*/
private function _addRelation(
$masterTable, $font, $fontSize, $masterField,

View File

@ -1,13 +1,13 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Contains PMA\libraries\plugins\schema\eps\RelationStatsEps class
* Contains PhpMyAdmin\Plugins\Schema\Eps\RelationStatsEps class
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\eps;
namespace PhpMyAdmin\Plugins\Schema\Eps;
use PMA\libraries\plugins\schema\RelationStats;
use PhpMyAdmin\Plugins\Schema\RelationStats;
/**
* Relation preferences/statistics
@ -24,7 +24,7 @@ use PMA\libraries\plugins\schema\RelationStats;
class RelationStatsEps extends RelationStats
{
/**
* The "PMA\libraries\plugins\schema\eps\RelationStatsEps" constructor
* The "PhpMyAdmin\Plugins\Schema\Eps\RelationStatsEps" constructor
*
* @param object $diagram The EPS diagram
* @param string $master_table The master table name

View File

@ -1,15 +1,15 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Contains PMA\libraries\plugins\schema\eps\TableStatsEps class
* Contains PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps class
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\eps;
namespace PhpMyAdmin\Plugins\Schema\Eps;
use PhpMyAdmin\Font;
use PMA\libraries\plugins\schema\ExportRelationSchema;
use PMA\libraries\plugins\schema\TableStats;
use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
use PhpMyAdmin\Plugins\Schema\TableStats;
/**
* Table preferences/statistics
@ -30,7 +30,7 @@ class TableStatsEps extends TableStats
public $currentCell = 0;
/**
* The "PMA\libraries\plugins\schema\eps\TableStatsEps" constructor
* The "PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps" constructor
*
* @param object $diagram The EPS diagram
* @param string $db The database name
@ -45,7 +45,7 @@ class TableStatsEps extends TableStats
* from the browser
*
* @see PMA_EPS, Table_Stats_Eps::Table_Stats_setWidth,
* PMA\libraries\plugins\schema\eps\TableStatsEps::Table_Stats_setHeight
* PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps::Table_Stats_setHeight
*/
public function __construct(
$diagram,

View File

@ -1,12 +1,12 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Contains PMA\libraries\plugins\schema\ExportRelationSchema class which is
* Contains PhpMyAdmin\Plugins\Schema\ExportRelationSchema class which is
* inherited by all schema classes.
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema;
namespace PhpMyAdmin\Plugins\Schema;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\pdf;
namespace PhpMyAdmin\Plugins\Schema\Pdf;
use PhpMyAdmin\Pdf as PdfLib;
use PhpMyAdmin\Util;

View File

@ -5,10 +5,10 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\pdf;
namespace PhpMyAdmin\Plugins\Schema\Pdf;
use PhpMyAdmin\Pdf as PdfLib;
use PMA\libraries\plugins\schema\ExportRelationSchema;
use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Util;

View File

@ -1,13 +1,13 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Contains PMA\libraries\plugins\schema\pdf\RelationStatsPdf class
* Contains PhpMyAdmin\Plugins\Schema\Pdf\RelationStatsPdf class
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\pdf;
namespace PhpMyAdmin\Plugins\Schema\Pdf;
use PMA\libraries\plugins\schema\RelationStats;
use PhpMyAdmin\Plugins\Schema\RelationStats;
/**
* Relation preferences/statistics
@ -25,7 +25,7 @@ use PMA\libraries\plugins\schema\RelationStats;
class RelationStatsPdf extends RelationStats
{
/**
* The "PMA\libraries\plugins\schema\pdf\RelationStatsPdf" constructor
* The "PhpMyAdmin\Plugins\Schema\Pdf\RelationStatsPdf" constructor
*
* @param object $diagram The PDF diagram
* @param string $master_table The master table name

View File

@ -1,14 +1,14 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Contains PMA\libraries\plugins\schema\pdf\TableStatsPdf class
* Contains PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf class
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema\pdf;
namespace PhpMyAdmin\Plugins\Schema\Pdf;
use PMA\libraries\plugins\schema\ExportRelationSchema;
use PMA\libraries\plugins\schema\TableStats;
use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
use PhpMyAdmin\Plugins\Schema\TableStats;
use PhpMyAdmin\Pdf as PdfLib;
/**
@ -31,7 +31,7 @@ class TableStatsPdf extends TableStats
private $_ff = PdfLib::PMA_PDF_FONT;
/**
* The "PMA\libraries\plugins\schema\pdf\TableStatsPdf" constructor
* The "PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf" constructor
*
* @param object $diagram The PDF diagram
* @param string $db The database name
@ -46,7 +46,7 @@ class TableStatsPdf extends TableStats
* from the browser
*
* @see PMA_Schema_PDF, Table_Stats_Pdf::Table_Stats_setWidth,
* PMA\libraries\plugins\schema\pdf\TableStatsPdf::Table_Stats_setHeight
* PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf::Table_Stats_setHeight
*/
public function __construct(
$diagram,

View File

@ -5,7 +5,7 @@
*
* @package PhpMyAdmin
*/
namespace PMA\libraries\plugins\schema;
namespace PhpMyAdmin\Plugins\Schema;
/**
* Relations preferences/statistics

View File

@ -6,14 +6,14 @@
* @package PhpMyAdmin-Schema
* @subpackage Dia
*/
namespace PMA\libraries\plugins\schema;
namespace PhpMyAdmin\Plugins\Schema;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\plugins\SchemaPlugin;
use PMA\libraries\plugins\schema\dia\DiaRelationSchema;
use PMA\libraries\properties\plugins\SchemaPluginProperties;
use PMA\libraries\properties\options\items\SelectPropertyItem;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Plugins\SchemaPlugin;
use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema;
use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties;
use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
/**
* Handles the schema export for the Dia format

View File

@ -6,15 +6,15 @@
* @package PhpMyAdmin-Schema
* @subpackage EPS
*/
namespace PMA\libraries\plugins\schema;
namespace PhpMyAdmin\Plugins\Schema;
use PMA\libraries\properties\options\items\BoolPropertyItem;
use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
use PMA\libraries\plugins\schema\eps\EpsRelationSchema;
use PMA\libraries\plugins\SchemaPlugin;
use PMA\libraries\properties\plugins\SchemaPluginProperties;
use PMA\libraries\properties\options\items\SelectPropertyItem;
use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema;
use PhpMyAdmin\Plugins\SchemaPlugin;
use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties;
use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
/**
* Handles the schema export for the EPS format

Some files were not shown because too many files have changed in this diff Show More