diff --git a/db_operations.php b/db_operations.php index 010fa0496f..a7ce9745b7 100644 --- a/db_operations.php +++ b/db_operations.php @@ -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' diff --git a/doc/transformations.rst b/doc/transformations.rst index be60b33c80..f04f80c455 100644 --- a/doc/transformations.rst +++ b/doc/transformations.rst @@ -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.) - diff --git a/export.php b/export.php index 54a3c2ec9b..9f153c8bca 100644 --- a/export.php +++ b/export.php @@ -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) diff --git a/gis_data_editor.php b/gis_data_editor.php index f1d93d1e8b..7d38a3648f 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -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 diff --git a/import.php b/import.php index b98cbed3a1..76ed062add 100644 --- a/import.php +++ b/import.php @@ -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) { diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 15847bdc78..e2e4afa517 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -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']); diff --git a/libraries/classes/Controllers/Table/TableGisVisualizationController.php b/libraries/classes/Controllers/Table/TableGisVisualizationController.php index 686f2a6e13..8069f77ced 100644 --- a/libraries/classes/Controllers/Table/TableGisVisualizationController.php +++ b/libraries/classes/Controllers/Table/TableGisVisualizationController.php @@ -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, diff --git a/libraries/classes/DisplayResults.php b/libraries/classes/DisplayResults.php index ecf4a7ebbc..eabada6697 100644 --- a/libraries/classes/DisplayResults.php +++ b/libraries/classes/DisplayResults.php @@ -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)) { diff --git a/libraries/gis/GISFactory.php b/libraries/classes/Gis/GisFactory.php similarity index 66% rename from libraries/gis/GISFactory.php rename to libraries/classes/Gis/GisFactory.php index c5f98cf87e..560f89d828 100644 --- a/libraries/gis/GISFactory.php +++ b/libraries/classes/Gis/GisFactory.php @@ -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; } diff --git a/libraries/gis/GISGeometry.php b/libraries/classes/Gis/GisGeometry.php similarity index 99% rename from libraries/gis/GISGeometry.php rename to libraries/classes/Gis/GisGeometry.php index a0f8cf6c16..8abb0bddc0 100644 --- a/libraries/gis/GISGeometry.php +++ b/libraries/classes/Gis/GisGeometry.php @@ -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. diff --git a/libraries/gis/GISGeometrycollection.php b/libraries/classes/Gis/GisGeometryCollection.php similarity index 95% rename from libraries/gis/GISGeometrycollection.php rename to libraries/classes/Gis/GisGeometryCollection.php index 932f0ff208..5f81db43ea 100644 --- a/libraries/gis/GISGeometrycollection.php +++ b/libraries/classes/Gis/GisGeometryCollection.php @@ -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; } diff --git a/libraries/gis/GISLinestring.php b/libraries/classes/Gis/GisLineString.php similarity index 98% rename from libraries/gis/GISLinestring.php rename to libraries/classes/Gis/GisLineString.php index 0935c8edd3..00a80e2271 100644 --- a/libraries/gis/GISLinestring.php +++ b/libraries/classes/Gis/GisLineString.php @@ -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 { diff --git a/libraries/gis/GISMultilinestring.php b/libraries/classes/Gis/GisMultiLineString.php similarity index 98% rename from libraries/gis/GISMultilinestring.php rename to libraries/classes/Gis/GisMultiLineString.php index 398815ef48..7fe4359ff3 100644 --- a/libraries/gis/GISMultilinestring.php +++ b/libraries/classes/Gis/GisMultiLineString.php @@ -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 { diff --git a/libraries/gis/GISMultipoint.php b/libraries/classes/Gis/GisMultiPoint.php similarity index 98% rename from libraries/gis/GISMultipoint.php rename to libraries/classes/Gis/GisMultiPoint.php index e63c0034c1..611c3f83e6 100644 --- a/libraries/gis/GISMultipoint.php +++ b/libraries/classes/Gis/GisMultiPoint.php @@ -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 { diff --git a/libraries/gis/GISMultipolygon.php b/libraries/classes/Gis/GisMultiPolygon.php similarity index 98% rename from libraries/gis/GISMultipolygon.php rename to libraries/classes/Gis/GisMultiPolygon.php index b47dc74d23..cd32782efc 100644 --- a/libraries/gis/GISMultipolygon.php +++ b/libraries/classes/Gis/GisMultiPolygon.php @@ -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 { diff --git a/libraries/gis/GISPoint.php b/libraries/classes/Gis/GisPoint.php similarity index 98% rename from libraries/gis/GISPoint.php rename to libraries/classes/Gis/GisPoint.php index b92beb9899..2942d2ee0d 100644 --- a/libraries/gis/GISPoint.php +++ b/libraries/classes/Gis/GisPoint.php @@ -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 { diff --git a/libraries/gis/GISPolygon.php b/libraries/classes/Gis/GisPolygon.php similarity index 98% rename from libraries/gis/GISPolygon.php rename to libraries/classes/Gis/GisPolygon.php index 06b9828733..d0d81033db 100644 --- a/libraries/gis/GISPolygon.php +++ b/libraries/classes/Gis/GisPolygon.php @@ -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 { diff --git a/libraries/gis/GISVisualization.php b/libraries/classes/Gis/GisVisualization.php similarity index 98% rename from libraries/gis/GISVisualization.php rename to libraries/classes/Gis/GisVisualization.php index 8927b636ea..1227d4c7a2 100644 --- a/libraries/gis/GISVisualization.php +++ b/libraries/classes/Gis/GisVisualization.php @@ -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; } diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 2cd2e9936e..752e2cc118 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -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; diff --git a/libraries/navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php similarity index 99% rename from libraries/navigation/Navigation.php rename to libraries/classes/Navigation/Navigation.php index df5bd3cb0a..f801b52c7b 100644 --- a/libraries/navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -6,7 +6,7 @@ * * @package PhpMyAdmin-navigation */ -namespace PMA\libraries\navigation; +namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Message; diff --git a/libraries/navigation/NavigationHeader.php b/libraries/classes/Navigation/NavigationHeader.php similarity index 99% rename from libraries/navigation/NavigationHeader.php rename to libraries/classes/Navigation/NavigationHeader.php index aba2b38910..2a6d5d8558 100644 --- a/libraries/navigation/NavigationHeader.php +++ b/libraries/classes/Navigation/NavigationHeader.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation; +namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Template; diff --git a/libraries/navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php similarity index 98% rename from libraries/navigation/NavigationTree.php rename to libraries/classes/Navigation/NavigationTree.php index d9ffa8a9de..e1aa71fb7d 100644 --- a/libraries/navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -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++) { diff --git a/libraries/navigation/NodeFactory.php b/libraries/classes/Navigation/NodeFactory.php similarity index 93% rename from libraries/navigation/NodeFactory.php rename to libraries/classes/Navigation/NodeFactory.php index 305a7e7bb0..5c0f4dc9ba 100644 --- a/libraries/navigation/NodeFactory.php +++ b/libraries/classes/Navigation/NodeFactory.php @@ -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); } } - diff --git a/libraries/navigation/nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php similarity index 98% rename from libraries/navigation/nodes/Node.php rename to libraries/classes/Navigation/Nodes/Node.php index 62f4a6c9b5..c8ca16dc5b 100644 --- a/libraries/navigation/nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -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) diff --git a/libraries/navigation/nodes/NodeColumn.php b/libraries/classes/Navigation/Nodes/NodeColumn.php similarity index 96% rename from libraries/navigation/nodes/NodeColumn.php rename to libraries/classes/Navigation/Nodes/NodeColumn.php index 99bcd8978e..e7215f88b7 100644 --- a/libraries/navigation/nodes/NodeColumn.php +++ b/libraries/classes/Navigation/Nodes/NodeColumn.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeColumnContainer.php b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeColumnContainer.php rename to libraries/classes/Navigation/Nodes/NodeColumnContainer.php index 308f00ff0c..927718c08d 100644 --- a/libraries/navigation/nodes/NodeColumnContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php @@ -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; /** diff --git a/libraries/navigation/nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php similarity index 98% rename from libraries/navigation/nodes/NodeDatabase.php rename to libraries/classes/Navigation/Nodes/NodeDatabase.php index bf0b71bbb4..4698c68c5e 100644 --- a/libraries/navigation/nodes/NodeDatabase.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php @@ -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) diff --git a/libraries/navigation/nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php similarity index 97% rename from libraries/navigation/nodes/NodeDatabaseChild.php rename to libraries/classes/Navigation/Nodes/NodeDatabaseChild.php index bcea8cdede..d0616857eb 100644 --- a/libraries/navigation/nodes/NodeDatabaseChild.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Url; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeDatabaseChildContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php similarity index 96% rename from libraries/navigation/nodes/NodeDatabaseChildContainer.php rename to libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php index 59250f7270..e11ff6970c 100644 --- a/libraries/navigation/nodes/NodeDatabaseChildContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php @@ -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 diff --git a/libraries/navigation/nodes/NodeDatabaseContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php similarity index 93% rename from libraries/navigation/nodes/NodeDatabaseContainer.php rename to libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php index 73fbb5003e..d5a08d9a85 100644 --- a/libraries/navigation/nodes/NodeDatabaseContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php @@ -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'; diff --git a/libraries/navigation/nodes/NodeEvent.php b/libraries/classes/Navigation/Nodes/NodeEvent.php similarity index 96% rename from libraries/navigation/nodes/NodeEvent.php rename to libraries/classes/Navigation/Nodes/NodeEvent.php index 45a25f9930..03015b19f8 100644 --- a/libraries/navigation/nodes/NodeEvent.php +++ b/libraries/classes/Navigation/Nodes/NodeEvent.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeEventContainer.php b/libraries/classes/Navigation/Nodes/NodeEventContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeEventContainer.php rename to libraries/classes/Navigation/Nodes/NodeEventContainer.php index 10362c9f1c..7c4b61cecb 100644 --- a/libraries/navigation/nodes/NodeEventContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeEventContainer.php @@ -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; /** diff --git a/libraries/navigation/nodes/NodeFunction.php b/libraries/classes/Navigation/Nodes/NodeFunction.php similarity index 97% rename from libraries/navigation/nodes/NodeFunction.php rename to libraries/classes/Navigation/Nodes/NodeFunction.php index 0523f0bc64..dea19ddc33 100644 --- a/libraries/navigation/nodes/NodeFunction.php +++ b/libraries/classes/Navigation/Nodes/NodeFunction.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeFunctionContainer.php b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeFunctionContainer.php rename to libraries/classes/Navigation/Nodes/NodeFunctionContainer.php index f0864762a3..9ff6de783d 100644 --- a/libraries/navigation/nodes/NodeFunctionContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php @@ -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; /** diff --git a/libraries/navigation/nodes/NodeIndex.php b/libraries/classes/Navigation/Nodes/NodeIndex.php similarity index 96% rename from libraries/navigation/nodes/NodeIndex.php rename to libraries/classes/Navigation/Nodes/NodeIndex.php index a836ce89c0..359b905737 100644 --- a/libraries/navigation/nodes/NodeIndex.php +++ b/libraries/classes/Navigation/Nodes/NodeIndex.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeIndexContainer.php b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeIndexContainer.php rename to libraries/classes/Navigation/Nodes/NodeIndexContainer.php index 5d34361efe..2e28dfd4a7 100644 --- a/libraries/navigation/nodes/NodeIndexContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php @@ -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; /** diff --git a/libraries/navigation/nodes/NodeProcedure.php b/libraries/classes/Navigation/Nodes/NodeProcedure.php similarity index 97% rename from libraries/navigation/nodes/NodeProcedure.php rename to libraries/classes/Navigation/Nodes/NodeProcedure.php index be3a891b17..e442503d38 100644 --- a/libraries/navigation/nodes/NodeProcedure.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedure.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeProcedureContainer.php b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeProcedureContainer.php rename to libraries/classes/Navigation/Nodes/NodeProcedureContainer.php index e88b2e32ed..f9ed5ea138 100644 --- a/libraries/navigation/nodes/NodeProcedureContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php @@ -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; /** diff --git a/libraries/navigation/nodes/NodeTable.php b/libraries/classes/Navigation/Nodes/NodeTable.php similarity index 96% rename from libraries/navigation/nodes/NodeTable.php rename to libraries/classes/Navigation/Nodes/NodeTable.php index 65cd08167d..f11a99ad68 100644 --- a/libraries/navigation/nodes/NodeTable.php +++ b/libraries/classes/Navigation/Nodes/NodeTable.php @@ -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) diff --git a/libraries/navigation/nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeTableContainer.php rename to libraries/classes/Navigation/Nodes/NodeTableContainer.php index 61d993bad9..cf6880adf2 100644 --- a/libraries/navigation/nodes/NodeTableContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php @@ -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; /** diff --git a/libraries/navigation/nodes/NodeTrigger.php b/libraries/classes/Navigation/Nodes/NodeTrigger.php similarity index 96% rename from libraries/navigation/nodes/NodeTrigger.php rename to libraries/classes/Navigation/Nodes/NodeTrigger.php index 42dff457d3..8ba7c35ea0 100644 --- a/libraries/navigation/nodes/NodeTrigger.php +++ b/libraries/classes/Navigation/Nodes/NodeTrigger.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeTriggerContainer.php b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeTriggerContainer.php rename to libraries/classes/Navigation/Nodes/NodeTriggerContainer.php index 422d2708b6..989c2692ce 100644 --- a/libraries/navigation/nodes/NodeTriggerContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php @@ -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; /** diff --git a/libraries/navigation/nodes/NodeView.php b/libraries/classes/Navigation/Nodes/NodeView.php similarity index 96% rename from libraries/navigation/nodes/NodeView.php rename to libraries/classes/Navigation/Nodes/NodeView.php index b4c548f155..987aba119d 100644 --- a/libraries/navigation/nodes/NodeView.php +++ b/libraries/classes/Navigation/Nodes/NodeView.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin-Navigation */ -namespace PMA\libraries\navigation\nodes; +namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/navigation/nodes/NodeViewContainer.php b/libraries/classes/Navigation/Nodes/NodeViewContainer.php similarity index 94% rename from libraries/navigation/nodes/NodeViewContainer.php rename to libraries/classes/Navigation/Nodes/NodeViewContainer.php index dfa5486f88..394173a783 100644 --- a/libraries/navigation/nodes/NodeViewContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeViewContainer.php @@ -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; /** diff --git a/libraries/plugins/auth/AuthenticationConfig.php b/libraries/classes/Plugins/Auth/AuthenticationConfig.php similarity index 98% rename from libraries/plugins/auth/AuthenticationConfig.php rename to libraries/classes/Plugins/Auth/AuthenticationConfig.php index 2cc12bdc7f..79a2242efc 100644 --- a/libraries/plugins/auth/AuthenticationConfig.php +++ b/libraries/classes/Plugins/Auth/AuthenticationConfig.php @@ -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; diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php similarity index 99% rename from libraries/plugins/auth/AuthenticationCookie.php rename to libraries/classes/Plugins/Auth/AuthenticationCookie.php index 0f2aa5f2e6..fe9a9a86af 100644 --- a/libraries/plugins/auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -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; diff --git a/libraries/plugins/auth/AuthenticationHttp.php b/libraries/classes/Plugins/Auth/AuthenticationHttp.php similarity index 98% rename from libraries/plugins/auth/AuthenticationHttp.php rename to libraries/classes/Plugins/Auth/AuthenticationHttp.php index 2be5e3db43..d58c35c1f8 100644 --- a/libraries/plugins/auth/AuthenticationHttp.php +++ b/libraries/classes/Plugins/Auth/AuthenticationHttp.php @@ -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; diff --git a/libraries/plugins/auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php similarity index 98% rename from libraries/plugins/auth/AuthenticationSignon.php rename to libraries/classes/Plugins/Auth/AuthenticationSignon.php index 0b4d4e42a3..b0087030b1 100644 --- a/libraries/plugins/auth/AuthenticationSignon.php +++ b/libraries/classes/Plugins/Auth/AuthenticationSignon.php @@ -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; /** diff --git a/libraries/plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php similarity index 99% rename from libraries/plugins/AuthenticationPlugin.php rename to libraries/classes/Plugins/AuthenticationPlugin.php index 3edc909226..d112c5a487 100644 --- a/libraries/plugins/AuthenticationPlugin.php +++ b/libraries/classes/Plugins/AuthenticationPlugin.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries\plugins; +namespace PhpMyAdmin\Plugins; use PhpMyAdmin\Core; use PhpMyAdmin\Sanitize; diff --git a/libraries/plugins/export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php similarity index 96% rename from libraries/plugins/export/ExportCodegen.php rename to libraries/classes/Plugins/Export/ExportCodegen.php index 2fbee9cfd2..96c7bb9199 100644 --- a/libraries/plugins/export/ExportCodegen.php +++ b/libraries/classes/Plugins/Export/ExportCodegen.php @@ -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; /** diff --git a/libraries/plugins/export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php similarity index 95% rename from libraries/plugins/export/ExportCsv.php rename to libraries/classes/Plugins/Export/ExportCsv.php index 43d2292ee0..490cd380f6 100644 --- a/libraries/plugins/export/ExportCsv.php +++ b/libraries/classes/Plugins/Export/ExportCsv.php @@ -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 diff --git a/libraries/plugins/export/ExportExcel.php b/libraries/classes/Plugins/Export/ExportExcel.php similarity index 83% rename from libraries/plugins/export/ExportExcel.php rename to libraries/classes/Plugins/Export/ExportExcel.php index a8b60c7299..fa4622ad0b 100644 --- a/libraries/plugins/export/ExportExcel.php +++ b/libraries/classes/Plugins/Export/ExportExcel.php @@ -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 diff --git a/libraries/plugins/export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php similarity index 97% rename from libraries/plugins/export/ExportHtmlword.php rename to libraries/classes/Plugins/Export/ExportHtmlword.php index 0d320c2af2..991acaa27d 100644 --- a/libraries/plugins/export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -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; diff --git a/libraries/plugins/export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php similarity index 94% rename from libraries/plugins/export/ExportJson.php rename to libraries/classes/Plugins/Export/ExportJson.php index 24dd893422..bf160b60f5 100644 --- a/libraries/plugins/export/ExportJson.php +++ b/libraries/classes/Plugins/Export/ExportJson.php @@ -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 diff --git a/libraries/plugins/export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php similarity index 97% rename from libraries/plugins/export/ExportLatex.php rename to libraries/classes/Plugins/Export/ExportLatex.php index f014cbbaff..83554b45b0 100644 --- a/libraries/plugins/export/ExportLatex.php +++ b/libraries/classes/Plugins/Export/ExportLatex.php @@ -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; diff --git a/libraries/plugins/export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php similarity index 96% rename from libraries/plugins/export/ExportMediawiki.php rename to libraries/classes/Plugins/Export/ExportMediawiki.php index 322b1b6e40..3a622e3e2e 100644 --- a/libraries/plugins/export/ExportMediawiki.php +++ b/libraries/classes/Plugins/Export/ExportMediawiki.php @@ -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; /** diff --git a/libraries/plugins/export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php similarity index 96% rename from libraries/plugins/export/ExportOds.php rename to libraries/classes/Plugins/Export/ExportOds.php index 7617d431a0..dbab500693 100644 --- a/libraries/plugins/export/ExportOds.php +++ b/libraries/classes/Plugins/Export/ExportOds.php @@ -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(); } diff --git a/libraries/plugins/export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php similarity index 98% rename from libraries/plugins/export/ExportOdt.php rename to libraries/classes/Plugins/Export/ExportOdt.php index 913c51bfbb..d146c80f30 100644 --- a/libraries/plugins/export/ExportOdt.php +++ b/libraries/classes/Plugins/Export/ExportOdt.php @@ -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(); } diff --git a/libraries/plugins/export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php similarity index 94% rename from libraries/plugins/export/ExportPdf.php rename to libraries/classes/Plugins/Export/ExportPdf.php index bac46971b9..66024f037e 100644 --- a/libraries/plugins/export/ExportPdf.php +++ b/libraries/classes/Plugins/Export/ExportPdf.php @@ -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 * diff --git a/libraries/plugins/export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php similarity index 95% rename from libraries/plugins/export/ExportPhparray.php rename to libraries/classes/Plugins/Export/ExportPhparray.php index 8c249be2a3..9ad272f37b 100644 --- a/libraries/plugins/export/ExportPhparray.php +++ b/libraries/classes/Plugins/Export/ExportPhparray.php @@ -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; /** diff --git a/libraries/plugins/export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php similarity index 99% rename from libraries/plugins/export/ExportSql.php rename to libraries/classes/Plugins/Export/ExportSql.php index 9907503a84..52daf04d5d 100644 --- a/libraries/plugins/export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -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; diff --git a/libraries/plugins/export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php similarity index 97% rename from libraries/plugins/export/ExportTexytext.php rename to libraries/classes/Plugins/Export/ExportTexytext.php index 51f88d4db3..b039e0ef94 100644 --- a/libraries/plugins/export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -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; diff --git a/libraries/plugins/export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php similarity index 97% rename from libraries/plugins/export/ExportXml.php rename to libraries/classes/Plugins/Export/ExportXml.php index 9fb8d5d326..d23b3abc26 100644 --- a/libraries/plugins/export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -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 */ diff --git a/libraries/plugins/export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php similarity index 94% rename from libraries/plugins/export/ExportYaml.php rename to libraries/classes/Plugins/Export/ExportYaml.php index 6c001f67f1..6745b5a746 100644 --- a/libraries/plugins/export/ExportYaml.php +++ b/libraries/classes/Plugins/Export/ExportYaml.php @@ -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 diff --git a/libraries/plugins/export/helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php similarity index 99% rename from libraries/plugins/export/helpers/Pdf.php rename to libraries/classes/Plugins/Export/Helpers/Pdf.php index 60623b34ae..67ff1ebdda 100644 --- a/libraries/plugins/export/helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -1,12 +1,12 @@ 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: diff --git a/libraries/plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php similarity index 97% rename from libraries/plugins/ExportPlugin.php rename to libraries/classes/Plugins/ExportPlugin.php index 4d872a6137..0d2622468c 100644 --- a/libraries/plugins/ExportPlugin.php +++ b/libraries/classes/Plugins/ExportPlugin.php @@ -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; /** diff --git a/libraries/plugins/IOTransformationsPlugin.php b/libraries/classes/Plugins/IOTransformationsPlugin.php similarity index 96% rename from libraries/plugins/IOTransformationsPlugin.php rename to libraries/classes/Plugins/IOTransformationsPlugin.php index eed01717dd..4b098b2bf4 100644 --- a/libraries/plugins/IOTransformationsPlugin.php +++ b/libraries/classes/Plugins/IOTransformationsPlugin.php @@ -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 diff --git a/libraries/plugins/import/AbstractImportCsv.php b/libraries/classes/Plugins/Import/AbstractImportCsv.php similarity index 81% rename from libraries/plugins/import/AbstractImportCsv.php rename to libraries/classes/Plugins/Import/AbstractImportCsv.php index 96489075a4..25cdcbc943 100644 --- a/libraries/plugins/import/AbstractImportCsv.php +++ b/libraries/classes/Plugins/Import/AbstractImportCsv.php @@ -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() { diff --git a/libraries/plugins/import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php similarity index 99% rename from libraries/plugins/import/ImportCsv.php rename to libraries/classes/Plugins/Import/ImportCsv.php index 2566cf9861..fbd830b664 100644 --- a/libraries/plugins/import/ImportCsv.php +++ b/libraries/classes/Plugins/Import/ImportCsv.php @@ -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; /** diff --git a/libraries/plugins/import/ImportLdi.php b/libraries/classes/Plugins/Import/ImportLdi.php similarity index 95% rename from libraries/plugins/import/ImportLdi.php rename to libraries/classes/Plugins/Import/ImportLdi.php index f6c42e4693..77e79bafd8 100644 --- a/libraries/plugins/import/ImportLdi.php +++ b/libraries/classes/Plugins/Import/ImportLdi.php @@ -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')) { diff --git a/libraries/plugins/import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php similarity index 99% rename from libraries/plugins/import/ImportMediawiki.php rename to libraries/classes/Plugins/Import/ImportMediawiki.php index 0e5e30c240..ccf64ee48f 100644 --- a/libraries/plugins/import/ImportMediawiki.php +++ b/libraries/classes/Plugins/Import/ImportMediawiki.php @@ -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 diff --git a/libraries/plugins/import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php similarity index 97% rename from libraries/plugins/import/ImportOds.php rename to libraries/classes/Plugins/Import/ImportOds.php index 1f610b9dc9..e6e378a772 100644 --- a/libraries/plugins/import/ImportOds.php +++ b/libraries/classes/Plugins/Import/ImportOds.php @@ -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; /** diff --git a/libraries/plugins/import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php similarity index 94% rename from libraries/plugins/import/ImportShp.php rename to libraries/classes/Plugins/Import/ImportShp.php index 7a756bab00..67c719753d 100644 --- a/libraries/plugins/import/ImportShp.php +++ b/libraries/classes/Plugins/Import/ImportShp.php @@ -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; } diff --git a/libraries/plugins/import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php similarity index 93% rename from libraries/plugins/import/ImportSql.php rename to libraries/classes/Plugins/Import/ImportSql.php index db64280de2..db92dd37ec 100644 --- a/libraries/plugins/import/ImportSql.php +++ b/libraries/classes/Plugins/Import/ImportSql.php @@ -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; /** diff --git a/libraries/plugins/import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php similarity index 98% rename from libraries/plugins/import/ImportXml.php rename to libraries/classes/Plugins/Import/ImportXml.php index 0a068f4aad..5c04a43bf1 100644 --- a/libraries/plugins/import/ImportXml.php +++ b/libraries/classes/Plugins/Import/ImportXml.php @@ -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; diff --git a/libraries/plugins/import/README b/libraries/classes/Plugins/Import/README similarity index 87% rename from libraries/plugins/import/README rename to libraries/classes/Plugins/Import/README index a7e60dd132..1064040c53 100644 --- a/libraries/plugins/import/README +++ b/libraries/classes/Plugins/Import/README @@ -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( diff --git a/libraries/plugins/import/ShapeFileImport.php b/libraries/classes/Plugins/Import/ShapeFileImport.php similarity index 95% rename from libraries/plugins/import/ShapeFileImport.php rename to libraries/classes/Plugins/Import/ShapeFileImport.php index 83345e4fd4..eadb52e168 100644 --- a/libraries/plugins/import/ShapeFileImport.php +++ b/libraries/classes/Plugins/Import/ShapeFileImport.php @@ -7,7 +7,7 @@ * @package PhpMyAdmin-Import * @subpackage ESRI_Shape */ -namespace PMA\libraries\plugins\import; +namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\ShapeFile\ShapeFile; diff --git a/libraries/plugins/import/upload/UploadApc.php b/libraries/classes/Plugins/Import/Upload/UploadApc.php similarity index 95% rename from libraries/plugins/import/upload/UploadApc.php rename to libraries/classes/Plugins/Import/Upload/UploadApc.php index 95e8c6aff4..0657cb5a52 100644 --- a/libraries/plugins/import/upload/UploadApc.php +++ b/libraries/classes/Plugins/Import/Upload/UploadApc.php @@ -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 diff --git a/libraries/plugins/import/upload/UploadNoplugin.php b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php similarity index 93% rename from libraries/plugins/import/upload/UploadNoplugin.php rename to libraries/classes/Plugins/Import/Upload/UploadNoplugin.php index 2bc67cbd61..b2539fe96a 100644 --- a/libraries/plugins/import/upload/UploadNoplugin.php +++ b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php @@ -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 diff --git a/libraries/plugins/import/upload/UploadProgress.php b/libraries/classes/Plugins/Import/Upload/UploadProgress.php similarity index 96% rename from libraries/plugins/import/upload/UploadProgress.php rename to libraries/classes/Plugins/Import/Upload/UploadProgress.php index 9b3ac31974..880c79ad29 100644 --- a/libraries/plugins/import/upload/UploadProgress.php +++ b/libraries/classes/Plugins/Import/Upload/UploadProgress.php @@ -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 diff --git a/libraries/plugins/import/upload/UploadSession.php b/libraries/classes/Plugins/Import/Upload/UploadSession.php similarity index 96% rename from libraries/plugins/import/upload/UploadSession.php rename to libraries/classes/Plugins/Import/Upload/UploadSession.php index 0891bdf038..08178e3bb0 100644 --- a/libraries/plugins/import/upload/UploadSession.php +++ b/libraries/classes/Plugins/Import/Upload/UploadSession.php @@ -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 diff --git a/libraries/plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php similarity index 90% rename from libraries/plugins/ImportPlugin.php rename to libraries/classes/Plugins/ImportPlugin.php index 3cc68a1f58..42ed2286f4 100644 --- a/libraries/plugins/ImportPlugin.php +++ b/libraries/classes/Plugins/ImportPlugin.php @@ -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() { diff --git a/libraries/plugins/schema/dia/Dia.php b/libraries/classes/Plugins/Schema/Dia/Dia.php similarity index 99% rename from libraries/plugins/schema/dia/Dia.php rename to libraries/classes/Plugins/Schema/Dia/Dia.php index f0bf07c252..b1fe5027c0 100644 --- a/libraries/plugins/schema/dia/Dia.php +++ b/libraries/classes/Plugins/Schema/Dia/Dia.php @@ -5,7 +5,7 @@ * * @package PhpMyAdmin */ -namespace PMA\libraries\plugins\schema\dia; +namespace PhpMyAdmin\Plugins\Schema\Dia; use PhpMyAdmin\Core; use PhpMyAdmin\Response; diff --git a/libraries/plugins/schema/dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php similarity index 94% rename from libraries/plugins/schema/dia/DiaRelationSchema.php rename to libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php index 01a0249faa..138e18a984 100644 --- a/libraries/plugins/schema/dia/DiaRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php @@ -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 diff --git a/libraries/plugins/schema/dia/RelationStatsDia.php b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php similarity index 97% rename from libraries/plugins/schema/dia/RelationStatsDia.php rename to libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php index f40ec2256e..d645f66759 100644 --- a/libraries/plugins/schema/dia/RelationStatsDia.php +++ b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php @@ -1,11 +1,11 @@ 'table', 'single_table' => false, diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php index 5f9c64b6de..e1974b27f0 100644 --- a/libraries/classes/Template.php +++ b/libraries/classes/Template.php @@ -7,12 +7,12 @@ */ namespace PhpMyAdmin; -use PMA\libraries\twig\CharsetsExtension; -use PMA\libraries\twig\I18nExtension; -use PMA\libraries\twig\MessageExtension; -use PMA\libraries\twig\SanitizeExtension; -use PMA\libraries\twig\UrlExtension; -use PMA\libraries\twig\UtilExtension; +use PhpMyAdmin\Twig\CharsetsExtension; +use PhpMyAdmin\Twig\I18nExtension; +use PhpMyAdmin\Twig\MessageExtension; +use PhpMyAdmin\Twig\SanitizeExtension; +use PhpMyAdmin\Twig\UrlExtension; +use PhpMyAdmin\Twig\UtilExtension; use Twig_Environment; use Twig_Loader_Filesystem; diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php index 2f08f15ab4..03d5f36fce 100644 --- a/libraries/classes/Tracker.php +++ b/libraries/classes/Tracker.php @@ -7,7 +7,7 @@ */ namespace PhpMyAdmin; -use PMA\libraries\plugins\export\ExportSql; +use PhpMyAdmin\Plugins\Export\ExportSql; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\AlterStatement; use PhpMyAdmin\SqlParser\Statements\CreateStatement; @@ -192,11 +192,11 @@ class Tracker // get Export SQL instance include_once "libraries/plugin_interface.lib.php"; - /* @var $export_sql_plugin \PMA\libraries\plugins\export\ExportSql */ + /* @var $export_sql_plugin \PhpMyAdmin\Plugins\Export\ExportSql */ $export_sql_plugin = PMA_getPlugin( "export", "sql", - 'libraries/plugins/export/', + 'libraries/classes/Plugins/Export/', array( 'export_type' => $export_type, 'single_table' => false, diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php index 5f33c646f4..dd7c58f3c2 100644 --- a/libraries/classes/Transformations.php +++ b/libraries/classes/Transformations.php @@ -100,13 +100,13 @@ class Transformations $stack = array(); $sub_dirs = array( - 'input/' => 'input_', - 'output/' => '', + 'Input/' => 'input_', + 'Output/' => '', '' => '' ); foreach ($sub_dirs as $sd => $prefix) { - $handle = opendir('libraries/plugins/transformations/' . $sd); + $handle = opendir('libraries/classes/Plugins/Transformations/' . $sd); if (! $handle) { $stack[$prefix . 'transformation'] = array(); @@ -170,7 +170,7 @@ class Transformations { // get the transformation class name $class_name = explode(".php", $filename); - $class_name = 'PMA\\' . str_replace('/', '\\', $class_name[0]); + $class_name = 'PhpMyAdmin\\' . str_replace('/', '\\', mb_substr($class_name[0], 18)); return $class_name; } @@ -184,8 +184,8 @@ class Transformations */ public static function getDescription($file) { - $include_file = 'libraries/plugins/transformations/' . $file; - /* @var $class_name PMA\libraries\plugins\TransformationsInterface */ + $include_file = 'libraries/classes/Plugins/Transformations/' . $file; + /* @var $class_name PhpMyAdmin\Plugins\TransformationsInterface */ $class_name = self::getClassName($include_file); // include and instantiate the class include_once $include_file; @@ -201,8 +201,8 @@ class Transformations */ public static function getName($file) { - $include_file = 'libraries/plugins/transformations/' . $file; - /* @var $class_name PMA\libraries\plugins\TransformationsInterface */ + $include_file = 'libraries/classes/Plugins/Transformations/' . $file; + /* @var $class_name PhpMyAdmin\Plugins\TransformationsInterface */ $class_name = self::getClassName($include_file); // include and instantiate the class include_once $include_file; diff --git a/libraries/twig/CharsetsExtension.php b/libraries/classes/Twig/CharsetsExtension.php similarity index 79% rename from libraries/twig/CharsetsExtension.php rename to libraries/classes/Twig/CharsetsExtension.php index 49d1ca58b1..1f332772e0 100644 --- a/libraries/twig/CharsetsExtension.php +++ b/libraries/classes/Twig/CharsetsExtension.php @@ -1,11 +1,11 @@ 256) { $_REQUEST['pma_password'] = substr($_REQUEST['pma_password'], 0, 256); } - $fqnAuthClass = 'PMA\libraries\plugins\auth\\' . $auth_class; + $fqnAuthClass = 'PhpMyAdmin\Plugins\Auth\\' . $auth_class; // todo: add plugin manager $plugin_manager = null; /** @var AuthenticationPlugin $auth_plugin */ diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 493109564a..4fe39242da 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -6,7 +6,7 @@ * @package PhpMyAdmin */ use PhpMyAdmin\Message; -use PMA\libraries\plugins\SchemaPlugin; +use PhpMyAdmin\Plugins\SchemaPlugin; if (! defined('PHPMYADMIN')) { exit; @@ -109,7 +109,7 @@ function PMA_getHtmlForSchemaExport($db, $page) /* @var $export_list SchemaPlugin[] */ $export_list = PMA_getPlugins( "schema", - 'libraries/plugins/schema/', + 'libraries/classes/Plugins/Schema/', null ); diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ac5ae6474e..7764b625f6 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -10,7 +10,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; use PhpMyAdmin\Message; -use PMA\libraries\plugins\ExportPlugin; +use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Response; use PhpMyAdmin\Table; use PhpMyAdmin\Template; @@ -1000,7 +1000,7 @@ function PMA_getExportDisplay( /* @var $export_list ExportPlugin[] */ $export_list = PMA_getPlugins( "export", - 'libraries/plugins/export/', + 'libraries/classes/Plugins/Export/', array( 'export_type' => $export_type, 'single_table' => isset($GLOBALS['single_table']) diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index a139309134..7ba314398e 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -13,7 +13,7 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; use PhpMyAdmin\Message; -use PMA\libraries\plugins\ImportPlugin; +use PhpMyAdmin\Plugins\ImportPlugin; use PhpMyAdmin\Url; use PhpMyAdmin\Sanitize; @@ -63,7 +63,7 @@ function PMA_getHtmlForImportJS($upload_id) // hide form $html .= ' $("#upload_form_form").css("display", "none");'; - if ($_SESSION[$SESSION_KEY]["handler"] != 'PMA\libraries\plugins\import\upload\UploadNoplugin') { + if ($_SESSION[$SESSION_KEY]["handler"] != 'PhpMyAdmin\Plugins\Import\Upload\UploadNoplugin') { $html .= PMA_getHtmlForImportWithPlugin($upload_id); @@ -437,7 +437,7 @@ function PMA_getHtmlForImport( $html .= '
getName() . '"' @@ -430,10 +430,10 @@ function PMA_getHtmlForProperty( . $propertyItem->getName() . '">' . PMA_getString($propertyItem->getText()) . ''; break; - case 'PMA\libraries\properties\options\items\DocPropertyItem': - echo 'PMA\libraries\properties\options\items\DocPropertyItem'; + case 'PhpMyAdmin\Properties\Options\Items\DocPropertyItem': + echo 'PhpMyAdmin\Properties\Options\Items\DocPropertyItem'; break; - case 'PMA\libraries\properties\options\items\HiddenPropertyItem': + case 'PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem': $ret .= '
    • '; break; - case 'PMA\libraries\properties\options\items\MessageOnlyPropertyItem': + case 'PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem': $ret .= '
  • ' . "\n"; $ret .= '

    ' . PMA_getString($propertyItem->getText()) . '

    '; break; - case 'PMA\libraries\properties\options\items\RadioPropertyItem': + case 'PhpMyAdmin\Properties\Options\Items\RadioPropertyItem': $default = PMA_pluginGetDefault( $section, $plugin_name . '_' . $propertyItem->getName() @@ -464,7 +464,7 @@ function PMA_getHtmlForProperty( . PMA_getString($val) . '
    • '; } break; - case 'PMA\libraries\properties\options\items\SelectPropertyItem': + case 'PhpMyAdmin\Properties\Options\Items\SelectPropertyItem': $ret .= '
  • ' . "\n"; $ret .= '
  • ' . "\n"; $ret .= '