From 0f772aa17378ace2cf71dbae8f9bcbdb7aed6c89 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Sat, 14 Apr 2012 16:50:49 +0200 Subject: [PATCH] check if PHPMYADMIN is set --- libraries/Advisor.class.php | 3 +++ libraries/Config.class.php | 3 +++ libraries/File.class.php | 3 +++ libraries/Index.class.php | 3 +++ libraries/List.class.php | 3 +++ libraries/List_Database.class.php | 3 +++ libraries/PDF.class.php | 3 +++ libraries/Partition.class.php | 4 +++- libraries/RecentTable.class.php | 3 +++ libraries/StorageEngine.class.php | 3 +++ libraries/Table.class.php | 3 +++ libraries/Theme.class.php | 3 +++ libraries/Theme_Manager.class.php | 3 +++ libraries/Tracker.class.php | 3 +++ libraries/bookmark.lib.php | 3 +++ libraries/cleanup.lib.php | 3 +++ libraries/core.lib.php | 3 +++ libraries/data_dictionary_relations.lib.php | 5 ++++- libraries/data_drizzle.inc.php | 3 +++ libraries/data_mysql.inc.php | 3 +++ libraries/dbi/drizzle-wrappers.lib.php | 3 +++ libraries/display_tbl.lib.php | 3 +++ libraries/engines/bdb.lib.php | 3 +++ libraries/engines/berkeleydb.lib.php | 3 +++ libraries/engines/binlog.lib.php | 3 +++ libraries/engines/innobase.lib.php | 3 +++ libraries/engines/innodb.lib.php | 3 +++ libraries/engines/memory.lib.php | 3 +++ libraries/engines/merge.lib.php | 3 +++ libraries/engines/mrg_myisam.lib.php | 3 +++ libraries/engines/myisam.lib.php | 3 +++ libraries/engines/ndbcluster.lib.php | 3 +++ libraries/engines/pbxt.lib.php | 3 +++ libraries/file_listing.php | 3 +++ libraries/gis/pma_gis_factory.php | 4 ++++ libraries/gis/pma_gis_geometry.php | 4 ++++ libraries/gis/pma_gis_geometrycollection.php | 4 ++++ libraries/gis/pma_gis_linestring.php | 4 ++++ libraries/gis/pma_gis_multilinestring.php | 4 ++++ libraries/gis/pma_gis_multipoint.php | 4 ++++ libraries/gis/pma_gis_multipolygon.php | 4 ++++ libraries/gis/pma_gis_point.php | 4 ++++ libraries/gis/pma_gis_polygon.php | 4 ++++ libraries/gis/pma_gis_visualization.php | 4 ++++ libraries/information_schema_relations.lib.php | 3 +++ libraries/ip_allow_deny.lib.php | 4 +++- libraries/js_escape.lib.php | 3 +++ libraries/logging.lib.php | 3 +++ libraries/mime.lib.php | 3 +++ libraries/ob.lib.php | 3 +++ libraries/pmd_common.php | 3 +++ libraries/rte/rte_words.lib.php | 4 ++++ libraries/sanitizing.lib.php | 3 +++ libraries/schema/Dia_Relation_Schema.class.php | 3 +++ libraries/schema/Eps_Relation_Schema.class.php | 3 +++ libraries/schema/Export_Relation_Schema.class.php | 3 +++ libraries/schema/Pdf_Relation_Schema.class.php | 3 +++ libraries/schema/Svg_Relation_Schema.class.php | 3 +++ libraries/schema/User_Schema.class.php | 3 +++ libraries/schema/Visio_Relation_Schema.class.php | 3 +++ libraries/select_server.lib.php | 3 +++ libraries/server_synchronize.lib.php | 3 +++ libraries/server_variables_doc.php | 4 ++++ libraries/string_mb.lib.php | 3 +++ libraries/string_native.lib.php | 3 +++ libraries/string_type_ctype.lib.php | 3 +++ libraries/string_type_native.lib.php | 3 +++ libraries/sysinfo.lib.php | 3 +++ libraries/tbl_select.lib.php | 3 +++ libraries/transformations.lib.php | 3 +++ .../application_octetstream__download.inc.php | 3 +++ .../transformations/application_octetstream__hex.inc.php | 3 +++ libraries/transformations/image_jpeg__inline.inc.php | 3 +++ libraries/transformations/image_jpeg__link.inc.php | 3 +++ libraries/transformations/image_png__inline.inc.php | 3 +++ libraries/transformations/text_plain__append.inc.php | 3 +++ libraries/transformations/text_plain__dateformat.inc.php | 3 +++ libraries/transformations/text_plain__external.inc.php | 3 +++ libraries/transformations/text_plain__formatted.inc.php | 3 +++ libraries/transformations/text_plain__imagelink.inc.php | 3 +++ libraries/transformations/text_plain__link.inc.php | 3 +++ libraries/transformations/text_plain__longToIpv4.inc.php | 3 +++ libraries/transformations/text_plain__sql.inc.php | 3 +++ libraries/transformations/text_plain__substr.inc.php | 3 +++ libraries/url_generating.lib.php | 3 +++ libraries/user_preferences.lib.php | 3 +++ libraries/vendor_config.php | 3 +++ libraries/zip.lib.php | 3 +++ libraries/zip_extension.lib.php | 4 +++- 89 files changed, 280 insertions(+), 4 deletions(-) diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index ab06be9d08..dc6684aedd 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -6,6 +6,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} class Advisor { diff --git a/libraries/Config.class.php b/libraries/Config.class.php index dbb1b2fc61..f3f1632e16 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * Load vendor configuration. diff --git a/libraries/File.class.php b/libraries/File.class.php index 55bc78343f..08f9b44fc5 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 750d52c51f..ca5368605c 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * @since phpMyAdmin 3.0.0 diff --git a/libraries/List.class.php b/libraries/List.class.php index 682c0e423f..dff7ee0750 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * @todo add caching diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 380fd26ba4..77ab42d225 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * the list base class diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php index c30aef2d64..fe52a709c3 100644 --- a/libraries/PDF.class.php +++ b/libraries/PDF.class.php @@ -3,6 +3,9 @@ /** * TCPDF wrapper class. */ +if (! defined('PHPMYADMIN')) { + exit; +} require_once './libraries/tcpdf/tcpdf.php'; diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php index 0fb68c4c7a..43609e3c1c 100644 --- a/libraries/Partition.class.php +++ b/libraries/Partition.class.php @@ -5,7 +5,9 @@ * * @package PhpMyAdmin */ - +if (! defined('PHPMYADMIN')) { + exit; +} /** * base Partition Class diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index c6c4a97567..3d5a71b5d5 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -4,6 +4,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} require_once './libraries/Message.class.php'; diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index e41f7be93c..d99fe3b3f8 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * defines diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 7774c824f4..d17f69c72e 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -4,6 +4,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * @todo make use of PMA_Message and PMA_Error diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index abfb0d8736..e855f801e4 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * handles theme diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 135994f041..f1a0136a8d 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -4,6 +4,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index dce0cb16e4..590b81e376 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -4,6 +4,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * This class tracks changes on databases, tables and views. diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index b047c0644f..2642d46c9f 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * Defines the bookmark parameters for the current user diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php index bbdf22852a..6cbc416e85 100644 --- a/libraries/cleanup.lib.php +++ b/libraries/cleanup.lib.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * Removes all variables from request except whitelisted ones. diff --git a/libraries/core.lib.php b/libraries/core.lib.php index f39e52e7de..cd5fbb3688 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -7,6 +7,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * checks given $var and returns it if valid, or $default of not valid diff --git a/libraries/data_dictionary_relations.lib.php b/libraries/data_dictionary_relations.lib.php index 168d71546e..651dd658f4 100644 --- a/libraries/data_dictionary_relations.lib.php +++ b/libraries/data_dictionary_relations.lib.php @@ -4,6 +4,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * @@ -160,4 +163,4 @@ $GLOBALS['data_dictionary_relations'] = array( ) ); -?> \ No newline at end of file +?> diff --git a/libraries/data_drizzle.inc.php b/libraries/data_drizzle.inc.php index d5c59427c2..a1a1bffeab 100644 --- a/libraries/data_drizzle.inc.php +++ b/libraries/data_drizzle.inc.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} $auto_column_types = empty($cfg['ColumnTypes']); diff --git a/libraries/data_mysql.inc.php b/libraries/data_mysql.inc.php index 3ea587cab7..b3b44f8fa2 100644 --- a/libraries/data_mysql.inc.php +++ b/libraries/data_mysql.inc.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} // VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity $cfg['ColumnTypes'] = !empty($cfg['ColumnTypes']) ? $cfg['ColumnTypes'] : array( diff --git a/libraries/dbi/drizzle-wrappers.lib.php b/libraries/dbi/drizzle-wrappers.lib.php index b47f69548c..093d09e9d9 100644 --- a/libraries/dbi/drizzle-wrappers.lib.php +++ b/libraries/dbi/drizzle-wrappers.lib.php @@ -10,6 +10,9 @@ * @package PhpMyAdmin-DBI * @subpackage Drizzle */ +if (! defined('PHPMYADMIN')) { + exit; +} // TODO: drizzle module segfaults while freeing resources, often. This allows at least for some development function _drizzle_shutdown_flush() diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index b037cf8b5b..04c0a48082 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -5,6 +5,9 @@ * * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php index 1a8f2cd7c7..49dd262e98 100644 --- a/libraries/engines/bdb.lib.php +++ b/libraries/engines/bdb.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php index 5b6e34a7ff..898f9c1db2 100644 --- a/libraries/engines/berkeleydb.lib.php +++ b/libraries/engines/berkeleydb.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * Load BDB class. diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php index 27e733f223..983509fc38 100644 --- a/libraries/engines/binlog.lib.php +++ b/libraries/engines/binlog.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php index faa2509d86..f81ae3f3b9 100644 --- a/libraries/engines/innobase.lib.php +++ b/libraries/engines/innobase.lib.php @@ -4,6 +4,9 @@ * * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index a4f17b94f5..1e4ff16858 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php index 68d2ab2db0..f8bb0227cc 100644 --- a/libraries/engines/memory.lib.php +++ b/libraries/engines/memory.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * the MEMORY (HEAP) storage engine diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php index 2d9d871e82..be72b262cc 100644 --- a/libraries/engines/merge.lib.php +++ b/libraries/engines/merge.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php index 61468f4439..87737f22fc 100644 --- a/libraries/engines/mrg_myisam.lib.php +++ b/libraries/engines/mrg_myisam.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php index 339709e046..3cd4790406 100644 --- a/libraries/engines/myisam.lib.php +++ b/libraries/engines/myisam.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * the MyISAM storage engine diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php index 0054ab90fe..1ef34b74b4 100644 --- a/libraries/engines/ndbcluster.lib.php +++ b/libraries/engines/ndbcluster.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php index feb021a94c..ad931c9b84 100644 --- a/libraries/engines/pbxt.lib.php +++ b/libraries/engines/pbxt.lib.php @@ -3,6 +3,9 @@ /** * @package PhpMyAdmin-Engines */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * the MyISAM storage engine diff --git a/libraries/file_listing.php b/libraries/file_listing.php index 91c62a55a6..1dcfe5a2f4 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -6,6 +6,9 @@ * @todo rename to file_listing.lib.php * @package PhpMyAdmin */ +if (! defined('PHPMYADMIN')) { + exit; +} /** * Returns array of filtered file names diff --git a/libraries/gis/pma_gis_factory.php b/libraries/gis/pma_gis_factory.php index c62599fedd..39a6ab040b 100644 --- a/libraries/gis/pma_gis_factory.php +++ b/libraries/gis/pma_gis_factory.php @@ -1,5 +1,9 @@