diff --git a/config.default.php b/config.default.php index f4f83e016..a1c65f139 100644 --- a/config.default.php +++ b/config.default.php @@ -640,7 +640,7 @@ $cfg['ColumnTypes'] = array( // Attributes // Note: the "ON UPDATE CURRENT_TIMESTAMP" attribute is added dynamically -// for MySQL >= 4.1.2, in tbl_properties.inc.php +// for MySQL >= 4.1.2, in libraries/tbl_properties.inc.php $cfg['AttributeTypes'] = array( '', diff --git a/header.inc.php b/header.inc.php index 4fc404887..b247c3e5d 100644 --- a/header.inc.php +++ b/header.inc.php @@ -175,7 +175,7 @@ if (empty($GLOBALS['is_header_sent'])) { 's_db.png' ); if (!empty($GLOBALS['table'])) { - require_once('./tbl_properties_table_info.php'); + require_once('./libraries/tbl_properties_table_info.inc.php'); echo $separator; printf( $item, @@ -187,7 +187,7 @@ if (empty($GLOBALS['is_header_sent'])) { /** * Displays table comment - * @uses $show_comment from tbl_properties_table_info.php + * @uses $show_comment from libraries/tbl_properties_table_info.inc.php * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php */ if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) { diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 30fb3f158..d0dda9641 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -129,7 +129,7 @@ if ( !empty($submit_mult) && !empty($what)) { if (!empty($table)) { require('./tbl_properties_common.php'); $url_query .= '&goto=tbl_properties.php&back=tbl_properties.php'; - require('./tbl_properties_table_info.php'); + require('./libraries/tbl_properties_table_info.inc.php'); } elseif (!empty($db)) { require('./libraries/db_details_common.inc.php'); diff --git a/tbl_properties.inc.php b/libraries/tbl_properties.inc.php similarity index 100% rename from tbl_properties.inc.php rename to libraries/tbl_properties.inc.php diff --git a/tbl_properties_links.php b/libraries/tbl_properties_links.inc.php similarity index 100% rename from tbl_properties_links.php rename to libraries/tbl_properties_links.inc.php diff --git a/tbl_properties_table_info.php b/libraries/tbl_properties_table_info.inc.php similarity index 100% rename from tbl_properties_table_info.php rename to libraries/tbl_properties_table_info.inc.php diff --git a/sql.php b/sql.php index 46470e329..4e087616d 100644 --- a/sql.php +++ b/sql.php @@ -691,8 +691,8 @@ else { if (!empty($table)) { require('./tbl_properties_common.php'); $url_query .= '&goto=tbl_properties.php&back=tbl_properties.php'; - require('./tbl_properties_table_info.php'); - require('./tbl_properties_links.php'); + require('./libraries/tbl_properties_table_info.inc.php'); + require('./libraries/tbl_properties_links.inc.php'); } elseif (!empty($db)) { require('./libraries/db_details_common.inc.php'); diff --git a/tbl_addfield.php b/tbl_addfield.php index 2feea092c..1597bd072 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -192,7 +192,7 @@ if (isset($submit_num_fields)) { PMA_mysqlDie('', '', '', $err_url, FALSE); // garvin: An error happened while inserting/updating a table definition. // to prevent total loss of that data, we embed the form once again. - // The variable $regenerate will be used to restore data in tbl_properties.inc.php + // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php $num_fields = $orig_num_fields; if (isset($orig_after_field)) { $after_field = $orig_after_field; @@ -212,17 +212,17 @@ if ($abort == FALSE) { * Gets tables informations */ require_once('./tbl_properties_common.php'); - require_once('./tbl_properties_table_info.php'); + require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Displays top menu links */ $active_page = 'tbl_properties_structure.php'; - require_once('./tbl_properties_links.php'); + require_once('./libraries/tbl_properties_links.inc.php'); /** * Display the form */ $action = 'tbl_addfield.php'; - require_once('./tbl_properties.inc.php'); + require_once('./libraries/tbl_properties.inc.php'); // Diplays the footer echo "\n"; diff --git a/tbl_alter.php b/tbl_alter.php index 9237f8486..8faaa4b29 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -17,13 +17,13 @@ PMA_checkParameters(array('db', 'table')); * Gets tables informations */ require_once('./tbl_properties_common.php'); -require_once('./tbl_properties_table_info.php'); +require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Displays top menu links */ $active_page = 'tbl_properties_structure.php'; // I don't see the need to display the links here, they will be displayed later -//require('./tbl_properties_links.php'); +//require('./libraries/tbl_properties_links.inc.php'); /** @@ -142,7 +142,7 @@ if (isset($do_save_data)) { PMA_mysqlDie('', '', '', $err_url, FALSE); // garvin: An error happened while inserting/updating a table definition. // to prevent total loss of that data, we embed the form once again. - // The variable $regenerate will be used to restore data in tbl_properties.inc.php + // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php if (isset($orig_field)) { $field = $orig_field; } @@ -194,7 +194,7 @@ if ($abort == FALSE) { 0, 1 ); $analyzed_sql = PMA_SQP_analyze( PMA_SQP_parse( $show_create_table ) ); - require('./tbl_properties.inc.php'); + require('./libraries/tbl_properties.inc.php'); } diff --git a/tbl_change.php b/tbl_change.php index 20e1b5959..76fbe875c 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -72,7 +72,7 @@ require_once('./libraries/db_table_exists.lib.php'); $url_query = PMA_generate_common_url($db, $table) . '&goto=tbl_properties.php'; -require_once('./tbl_properties_table_info.php'); +require_once('./libraries/tbl_properties_table_info.inc.php'); /* Get comments */ @@ -92,7 +92,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) { /** * Displays top menu links */ -require_once('./tbl_properties_links.php'); +require_once('./libraries/tbl_properties_links.inc.php'); /** diff --git a/tbl_create.php b/tbl_create.php index e54faa434..de9a68f3c 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -200,7 +200,7 @@ if (isset($submit_num_fields)) { PMA_mysqlDie('', '', '', $err_url, FALSE); // garvin: An error happened while inserting/updating a table definition. // to prevent total loss of that data, we embed the form once again. - // The variable $regenerate will be used to restore data in tbl_properties.inc.php + // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php $num_fields = $orig_num_fields; $regenerate = TRUE; } @@ -228,7 +228,7 @@ if ($abort == FALSE) { // Table name and number of fields are valid -> show the form else { $action = 'tbl_create.php'; - require('./tbl_properties.inc.php'); + require('./libraries/tbl_properties.inc.php'); // Displays the footer echo "\n"; require_once('./footer.inc.php'); diff --git a/tbl_import.php b/tbl_import.php index 799c0cf38..47489e401 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -8,11 +8,11 @@ require_once('./libraries/common.lib.php'); * Gets tables informations and displays top links */ require_once('./tbl_properties_common.php'); -require_once('./tbl_properties_table_info.php'); +require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Displays top menu links */ -require_once('./tbl_properties_links.php'); +require_once('./libraries/tbl_properties_links.inc.php'); $import_type = 'table'; require_once('./libraries/display_import.lib.php'); diff --git a/tbl_properties.php b/tbl_properties.php index 1fa3cdb7c..7a50fb0cf 100644 --- a/tbl_properties.php +++ b/tbl_properties.php @@ -17,12 +17,12 @@ $back = 'tbl_properties.php'; /** * Get table information */ -require_once('./tbl_properties_table_info.php'); +require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Displays top menu links */ -require_once('./tbl_properties_links.php'); +require_once('./libraries/tbl_properties_links.inc.php'); /** * Query box, bookmark, insert data from textfile diff --git a/tbl_properties_export.php b/tbl_properties_export.php index c474a5b50..3d99930a6 100644 --- a/tbl_properties_export.php +++ b/tbl_properties_export.php @@ -9,7 +9,7 @@ require_once('./libraries/common.lib.php'); */ require_once('./tbl_properties_common.php'); $url_query .= '&goto=tbl_properties_export.php&back=tbl_properties_export.php'; -require_once('./tbl_properties_table_info.php'); +require_once('./libraries/tbl_properties_table_info.inc.php'); ?> @@ -104,7 +104,7 @@ if (isset($sql_query)) { /** * Displays top menu links */ -require('./tbl_properties_links.php'); +require('./libraries/tbl_properties_links.inc.php'); $export_type = 'table'; require_once('./libraries/display_export.lib.php'); diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php index 6b3fc9ba1..1947d79e3 100644 --- a/tbl_properties_operations.php +++ b/tbl_properties_operations.php @@ -79,7 +79,7 @@ if (isset($submitoptions)) { } if ($reread_info) { - require('./tbl_properties_table_info.php'); + require('./libraries/tbl_properties_table_info.inc.php'); } unset($reread_info); @@ -99,12 +99,12 @@ if (isset($submitorderby) && !empty($order_field)) { /** * Gets tables informations */ -require_once('./tbl_properties_table_info.php'); +require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Displays top menu links */ -require_once('./tbl_properties_links.php'); +require_once('./libraries/tbl_properties_links.inc.php'); /** * Get columns names diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php index fb991d004..77a96d7b3 100644 --- a/tbl_properties_structure.php +++ b/tbl_properties_structure.php @@ -44,7 +44,7 @@ $url_query .= '&goto=tbl_properties_structure.php&back=tbl_properties_st /** * Gets tables informations */ -require_once('./tbl_properties_table_info.php'); +require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Show result of multi submit operation @@ -57,7 +57,7 @@ if ((!empty($submit_mult) && isset($selected_fld)) /** * Displays top menu links */ -require_once('./tbl_properties_links.php'); +require_once('./libraries/tbl_properties_links.inc.php'); // 2. Gets table keys and retains them $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($table) . ';'); @@ -508,7 +508,7 @@ echo $strPrintView; @@ -560,7 +560,7 @@ echo $strPrintView; * links again */ if ($fields_cnt > 20) { - require('./tbl_properties_links.php'); + require('./libraries/tbl_properties_links.inc.php'); } // end if ($fields_cnt > 20) echo "\n\n"; diff --git a/tbl_relation.php b/tbl_relation.php index fbe13520b..02bed21e6 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -13,9 +13,9 @@ $url_query .= '&goto=tbl_properties.php'; /** * Gets tables informations */ -require_once('./tbl_properties_table_info.php'); +require_once('./libraries/tbl_properties_table_info.inc.php'); -// Note: in tbl_properties_links.php we get and display the table comment. +// Note: in libraries/tbl_properties_links.inc.php we get and display the table comment. // For InnoDB, this comment contains the REFER information but any update // has not been done yet (will be done in tbl_relation.php later). $avoid_show_comment = TRUE; @@ -23,7 +23,7 @@ $avoid_show_comment = TRUE; /** * Displays top menu links */ -require_once('./tbl_properties_links.php'); +require_once('./libraries/tbl_properties_links.inc.php'); require_once('./libraries/relation.lib.php'); diff --git a/tbl_select.php b/tbl_select.php index 3911cf334..0f2095247 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -35,12 +35,12 @@ if (!isset($param) || $param[0] == '') { /** * Gets tables informations */ - require_once('./tbl_properties_table_info.php'); + require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Displays top menu links */ - require_once('./tbl_properties_links.php'); + require_once('./libraries/tbl_properties_links.inc.php'); if (!isset($goto)) { $goto = $GLOBALS['cfg']['DefaultTabTable'];