diff options
185 files changed, 451 insertions, 376 deletions
diff --git a/browse_foreigners.php b/browse_foreigners.php index 22c3ab057b..349188a99a 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * display selection for relational field values */ diff --git a/calendar.php b/calendar.php index 4c8b1a71d7..7b86b89855 100644 --- a/calendar.php +++ b/calendar.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ require_once('./libraries/common.lib.php'); diff --git a/changelog.php b/changelog.php index 1ced513a14..13d767cce6 100644 --- a/changelog.php +++ b/changelog.php @@ -1,9 +1,9 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Simple script to set correct charset for changelog * - * @id $Id$ + * @version $Id$ */ $changelog = htmlspecialchars(file_get_contents('ChangeLog')); diff --git a/chk_rel.php b/chk_rel.php index 51d6a4afe4..e35e46ee84 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/config.sample.inc.php b/config.sample.inc.php index b6f549cdef..1fb5773992 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -1,7 +1,6 @@ <?php
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
/**
* phpMyAdmin sample configuration, you can use it as base for
diff --git a/db_create.php b/db_create.php index 35a6de244c..926a63d703 100644 --- a/db_create.php +++ b/db_create.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/db_datadict.php b/db_datadict.php index 25ce6badb4..b532e46fb5 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ diff --git a/db_export.php b/db_export.php index cdecaba5d0..a6d27ae28e 100644 --- a/db_export.php +++ b/db_export.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * dumps a database * @@ -42,14 +42,14 @@ foreach ( $tables as $each_table ) { // continue; //} if ( ! empty( $unselectall ) - || ( isset( $tmp_select ) + || ( isset( $tmp_select ) && false !== strpos( $tmp_select, '|' . $each_table['Name'] . '|') ) ) { $is_selected = ''; } else { $is_selected = ' selected="selected"'; } $table_html = htmlspecialchars( $each_table['Name'] ); - $multi_values .= ' <option value="' . $table_html . '"' + $multi_values .= ' <option value="' . $table_html . '"' . $is_selected . '>' . $table_html . '</option>' . "\n"; } // end for $multi_values .= "\n"; diff --git a/db_import.php b/db_import.php index 0d1ab19b42..16d1a8dc87 100644 --- a/db_import.php +++ b/db_import.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/db_operations.php b/db_operations.php index add3e6e282..4d8b4cc9fc 100644 --- a/db_operations.php +++ b/db_operations.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * handles miscellaneous db operations: diff --git a/db_printview.php b/db_printview.php index 4398832bef..3ea1591d18 100644 --- a/db_printview.php +++ b/db_printview.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/common.lib.php'; diff --git a/db_qbe.php b/db_qbe.php index f57630f0b4..f0b1a0d5d9 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * query by example the whole database diff --git a/db_sql.php b/db_sql.php index 3445ac9bb3..87a579c3e7 100644 --- a/db_sql.php +++ b/db_sql.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/db_structure.php b/db_structure.php index 77ef9657f8..5542eedaa9 100644 --- a/db_structure.php +++ b/db_structure.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/common.lib.php'; require_once './libraries/Table.class.php'; @@ -347,7 +347,7 @@ foreach ($tables as $keyname => $each_table) { // so ensure that we'll display "in use" below for a table // that needs to be repaired - if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) { + if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) { if ($table_is_view && $each_table['TABLE_ROWS'] >= $cfg['MaxExactCountViews']) { $at_least_one_view_exceeds_max_count = true; $show_superscript = '<sup>1</sup>'; @@ -496,7 +496,7 @@ if ($at_least_one_view_exceeds_max_count && !$db_is_information_schema) { <hr /> <?php -// Routines +// Routines echo '<fieldset>' . "\n"; echo ' <legend>' . $strRoutines . '</legend>' . "\n"; require './libraries/db_routines.inc.php'; diff --git a/import.php b/import.php index bcb613f186..5ded837790 100644 --- a/import.php +++ b/import.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /* Core script for import, this is just the glue around all other stuff */ @@ -393,7 +393,7 @@ if ($timeout_passed) { } } -// Parse and analyze the query, for correct db and table name +// Parse and analyze the query, for correct db and table name // in case of a query typed in the query window require_once('./libraries/parse_analyze.lib.php'); @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * forms frameset * diff --git a/js/navigation.js b/js/navigation.js index 3bff4b6fac..52e29de474 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -1,4 +1,11 @@ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * function used in or for navigation frame + */ + +/** + * init + */ var today = new Date(); var expires = new Date(today.getTime() + (56 * 86400000)); var pma_navi_width; @@ -80,7 +87,7 @@ function PMA_setFrameSize() pma_navi_width = PMA_getCookie('pma_navi_width'); //alert('from cookie: ' + typeof(pma_navi_width) + ' : ' + pma_navi_width); if (pma_navi_width != null) { - if (parent.text_dir == 'ltr') { + if (parent.text_dir == 'ltr') { parent.document.getElementById('mainFrameset').cols = pma_navi_width + ',*'; } else { parent.document.getElementById('mainFrameset').cols = '*,' + pma_navi_width; diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 689224bc8e..983d80922b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Configuration class @@ -402,7 +402,7 @@ class PMA_Config // (from config.inc.php) so that $cfg['DefaultConnectionCollation'] // can have an effect. Note that the presence of collation // information in a cookie has priority over what is defined - // in the default or user's config files. + // in the default or user's config files. /** * @todo check validity of $_COOKIE['pma_collation_connection'] */ diff --git a/libraries/PMA_Sql.class.php b/libraries/PMA_Sql.class.php index c2a4b2bd19..6c5af44f4f 100644 --- a/libraries/PMA_Sql.class.php +++ b/libraries/PMA_Sql.class.php @@ -1,5 +1,5 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * holds PMA_Sql class * diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 64e427ca92..2d9565246a 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: class PMA_Table { @@ -600,22 +600,22 @@ class PMA_Table { } /* no need to PMA_backquote() */ - if (isset($target_for_view)) { - // this a view definition; we just found the first db name - // that follows DEFINER VIEW - // so change it for the new db name + if (isset($target_for_view)) { + // this a view definition; we just found the first db name + // that follows DEFINER VIEW + // so change it for the new db name $parsed_sql[$i]['data'] = $target_for_view; - // then we have to find all references to the source db - // and change them to the target db, ensuring we stay into - // the $parsed_sql limits - $last = $parsed_sql['len'] - 1; - $backquoted_source_db = PMA_backquote($source_db); - for (++$i; $i <= $last; $i++) { - if ($parsed_sql[$i]['type'] == 'quote_backtick' && $parsed_sql[$i]['data'] == $backquoted_source_db) { + // then we have to find all references to the source db + // and change them to the target db, ensuring we stay into + // the $parsed_sql limits + $last = $parsed_sql['len'] - 1; + $backquoted_source_db = PMA_backquote($source_db); + for (++$i; $i <= $last; $i++) { + if ($parsed_sql[$i]['type'] == 'quote_backtick' && $parsed_sql[$i]['data'] == $backquoted_source_db) { $parsed_sql[$i]['data'] = $target_for_view; - } - } - unset($last,$backquoted_source_db); + } + } + unset($last,$backquoted_source_db); } else { $parsed_sql[$i]['data'] = $target; } diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index a8a1d117ef..a0a93eb9b8 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -1,5 +1,5 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * hold PMA_Theme class * diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 9269cf9883..d9f19f9aa8 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/Theme.class.php'; diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index af82f16d7d..8bc8baaa5f 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -1,11 +1,10 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: - -// +--------------------------------------------------------------------------+ -// | Set of functions used to run config authentication (ie no | -// | authentication). | -// +--------------------------------------------------------------------------+ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Set of functions used to run config authentication (ie no authentication). + * + * @version $Id$ + */ /** diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index 077d7769f4..2a42504307 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -1,11 +1,11 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: - -// +--------------------------------------------------------------------------+ -// | Set of functions used to run http authentication. | -// | NOTE: Requires PHP loaded as a Apache module. | -// +--------------------------------------------------------------------------+ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Set of functions used to run http authentication. + * NOTE: Requires PHP loaded as a Apache module. + * + * @version $Id$ + */ /** diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index 9ba906733c..390c196e80 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -1,10 +1,10 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: - -// +--------------------------------------------------------------------------+ -// | Set of functions used to run single signon authentication. | -// +--------------------------------------------------------------------------+ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Set of functions used to run single signon authentication. + * + * @version $Id$ + */ /** diff --git a/libraries/blowfish.php b/libraries/blowfish.php index 86fe752632..624bc394dd 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -1,7 +1,6 @@ <?php - +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * The Cipher_blowfish:: class implements the Cipher interface enryption data @@ -389,7 +388,7 @@ class Horde_Cipher_blowfish { $parts = $this->_encryptBlock($L, $R); return pack("NN", $parts['L'], $parts['R']); } - + /** * Encrypt a block on data. * diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index 66c0e2e68f..846438c3a4 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used with the bookmark feature diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index b4b88415ec..c5ce78c882 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 09d52c167c..6084810d36 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Get user's global privileges and some db-specific privileges // ($controllink and $userlink are links to MySQL defined in the "common.lib.php" library) diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php index dd7f8659f9..7ca559951f 100644 --- a/libraries/cleanup.lib.php +++ b/libraries/cleanup.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id: common.lib.php 9531 2006-10-10 14:06:56Z nijel $ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Functions for cleanup of user input. diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 45bb6300ea..dc87f0f371 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1,5 +1,5 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Misc stuff and functions used by ALL the scripts. * MUST be included by every script diff --git a/libraries/config.default.php b/libraries/config.default.php index 42477e635a..d721107403 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1,5 +1,5 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * N N OOO !! DDDD OOO N N OOO TTTTT EEEE DDDD I TTTTT !! * NN N O O !! D D O O NN N O O T E D D I T !! @@ -541,7 +541,7 @@ $cfg['LeftLogoLink'] = 'main.php'; /** * whether to open the linked page in the main window ('main') or - * in a new window ('new') + * in a new window ('new') * * @global string $cfg['LeftLogoLinkWindow'] */ diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 34bc4a9af6..0f2b11a5b6 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Common Option Constants For DBI Functions diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 9bc3804f80..d576c21e10 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Gets some core libraries diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 10fb3fc2a6..54fa578cdf 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Check parameters @@ -58,7 +58,7 @@ if ( $cfg['ShowTooltip'] ) { // Special speedup for newer MySQL Versions (in 4.0 format changed) if ( true === $cfg['SkipLockedTables'] ) { $db_info_result = PMA_DBI_query('SHOW OPEN TABLES FROM ' . PMA_backquote($db) . ';'); - + // Blending out tables in use if ($db_info_result != FALSE && PMA_DBI_num_rows($db_info_result) > 0) { while ($tmp = PMA_DBI_fetch_row($db_info_result)) { @@ -97,7 +97,7 @@ if ( true === $cfg['SkipLockedTables'] ) { } } PMA_DBI_free_result($db_info_result); - + if ( $GLOBALS['cfg']['NaturalOrder'] ) { uksort( $tables, 'strnatcasecmp' ); } @@ -123,7 +123,7 @@ if ( ! isset( $sot_ready ) ) { // all tables in db $tables = PMA_DBI_get_tables_full( $db ); } - + if ( $cfg['ShowTooltip'] ) { foreach ( $tables as $each_table ) { fillTooltip( $tooltip_truename, $tooltip_aliasname, $each_table ); diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 9ccd5b1738..c06eb2ec98 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index ca6d11c18c..f4268d401c 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -1,11 +1,11 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Check parameters if ( PMA_MYSQL_INT_VERSION >= 50002 ) { $url_query .= '&goto=db_structure.php'; - + $routines = PMA_DBI_fetch_result('SELECT SPECIFIC_NAME,ROUTINE_NAME,ROUTINE_TYPE,DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); if ($routines) { @@ -23,7 +23,7 @@ if ( PMA_MYSQL_INT_VERSION >= 50002 ) { $strRoutineReturnType); $ct=0; $delimiter = '//'; - foreach ($routines as $routine) { + foreach ($routines as $routine) { $drop_and_create = '\'DROP ' . $routine['ROUTINE_TYPE'] . ' ' . PMA_backquote($routine['SPECIFIC_NAME']) . $delimiter . "\n" . 'CREATE ' . $routine['ROUTINE_TYPE'] . ' ' . PMA_backquote($routine['SPECIFIC_NAME']) . '()' . "\n" . '\''; @@ -53,7 +53,7 @@ if ( PMA_MYSQL_INT_VERSION >= 50002 ) { <td><b>%s</b></td> <td>%s</td> <td>%s</td> - <td>%s</td> + <td>%s</td> <td>%s</td> <td>%s</td> </tr>', diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index b8e8e41918..dc95b7ce6c 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Ensure the database and the table exist (else move to the "parent" script) diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php index 9ed2e576a8..7ff6f5bfac 100644 --- a/libraries/dbg/setup.php +++ b/libraries/dbg/setup.php @@ -1,9 +1,12 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ + /** * checks for DBG extension and trys to load if not loaded - * + * * allways use $GLOBALS here, as this script is included by footer.inc.hp * which can also be included from inside a function */ @@ -14,7 +17,7 @@ if ( $GLOBALS['cfg']['DBG']['enable'] ) { if ( ! @extension_loaded('dbg') && ! PMA_dl('dbg') ) { echo '<div class="warning">' .sprintf( $GLOBALS['strCantLoad'], 'DBG' ) - .' <a href="./Documentation.html#faqdbg" target="documentation">' + .' <a href="./Documentation.html#faqdbg" target="documentation">' .$GLOBALS['strDocu'] . '</a>' .'</div>'; } else { diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 187410faf3..4a77318ee6 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -1,11 +1,14 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: - +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Interface to the classic MySQL extension + * + * @version $Id$ */ +/** + * + */ // MySQL client API if (!defined('PMA_MYSQL_CLIENT_API')) { if (function_exists('mysql_get_client_info')) { diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 3e4e896acb..9f1b996a32 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -1,9 +1,9 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: - +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Interface to the improved MySQL extension (MySQLi) + * + * @version $Id$ */ // MySQL client API diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php index 319307c9a8..f2936ddfa5 100644 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Displays form for creating database (if user has privileges for that) diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index 5406273575..38c9e11ef6 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Displays form for creating a table (if user has privileges for that) @@ -10,7 +10,7 @@ require_once('./libraries/check_user_privileges.lib.php'); // privilege by looking at SHOW GRANTS output; // for < 4.1.0, it could be more difficult because the logic tries to // detect the current host and it might be expressed in many ways; also -// on a shared server, the user might be unable to define a controluser +// on a shared server, the user might be unable to define a controluser // that has the proper rights to the "mysql" db; // so we give up and assume that user has the right to create a table // diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 631333553a..e02714f97b 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/Table.class.php'; diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 415f11f013..38d9bc99a0 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/file_listing.php'); require_once('./libraries/plugin_interface.lib.php'); diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index 781fcd9ad4..1db1ee6331 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* * Code for displaying language selection * $Id$ @@ -49,7 +50,7 @@ function PMA_select_language($use_fieldset = FALSE) { } $language_title = $GLOBALS['strLanguage'] . ($GLOBALS['strLanguage'] != 'Language' ? ' - Language' : '') . ' <a href="./translators.html" target="documentation">' . - ( $cfg['ReplaceHelpImg'] ? + ( $cfg['ReplaceHelpImg'] ? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />' : '(*)' ) . '</a>'; if ($use_fieldset) { diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 1e4a86d63d..a96773dce6 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/Table.class.php'; @@ -1718,7 +1718,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) // displayed $total = ''; $is_display = PMA_setDisplayMode($the_disp_mode, $total); - // what was this for? + // what was this for? // $total can be 0 if $cfg['MaxExactCountViews'] = 0 //if ($total == '') { // unset($total); @@ -2019,7 +2019,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { // CREATE VIEW /** * - * @todo detect privileges to create a view + * @todo detect privileges to create a view * (but see 2006-01-19 note in display_create_table.lib.php, * I think we cannot detect db-specific privileges reliably) */ diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index b02dbaf1ee..c87aa514ac 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // modified 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de> // - bugfix for select all checkboxes diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php index dd33c8c4cc..2b37e1b228 100644 --- a/libraries/engines/bdb.lib.php +++ b/libraries/engines/bdb.lib.php @@ -1,7 +1,12 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ +/** + * + */ class PMA_StorageEngine_bdb extends PMA_StorageEngine { /** diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php index 49984fc43e..5608622458 100644 --- a/libraries/engines/berkeleydb.lib.php +++ b/libraries/engines/berkeleydb.lib.php @@ -1,7 +1,12 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ +/** + * + */ include_once './libraries/engines/bdb.lib.php'; class PMA_StorageEngine_berkeleydb extends PMA_StorageEngine_bdb diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php index 195e8efaed..e08f0436a4 100644 --- a/libraries/engines/binlog.lib.php +++ b/libraries/engines/binlog.lib.php @@ -1,7 +1,12 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ +/** + * + */ class PMA_StorageEngine_binlog extends PMA_StorageEngine { /** diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php index c6f52e5435..69139b2bed 100644 --- a/libraries/engines/innobase.lib.php +++ b/libraries/engines/innobase.lib.php @@ -1,8 +1,18 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * + * @version $Id$ + */ -include_once('./libraries/engines/innodb.lib.php'); +/** + * + */ +include_once './libraries/engines/innodb.lib.php'; + +/** + * + */ class PMA_StorageEngine_innobase extends PMA_StorageEngine_innodb {} ?> diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index dcb6bc7a30..87c8b8abcc 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -1,7 +1,12 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ +/** + * + */ class PMA_StorageEngine_innodb extends PMA_StorageEngine { /** diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php index b4f2c9c1f2..a826a3881b 100644 --- a/libraries/engines/memory.lib.php +++ b/libraries/engines/memory.lib.php @@ -1,6 +1,9 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ + /** * the MEMORY (HEAP) storage engine */ diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php index a24fc25c3e..0a1d709681 100644 --- a/libraries/engines/merge.lib.php +++ b/libraries/engines/merge.lib.php @@ -1,7 +1,12 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ +/** + * + */ class PMA_StorageEngine_merge extends PMA_StorageEngine { } diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php index b8ee290f24..695a6afd43 100644 --- a/libraries/engines/mrg_myisam.lib.php +++ b/libraries/engines/mrg_myisam.lib.php @@ -1,9 +1,17 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ +/** + * + */ include_once './libraries/engines/merge.lib.php'; +/** + * + */ class PMA_StorageEngine_mrg_myisam extends PMA_StorageEngine_merge { /** diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php index 8fff62bbaf..8ec7a60a4f 100644 --- a/libraries/engines/myisam.lib.php +++ b/libraries/engines/myisam.lib.php @@ -1,6 +1,9 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ + /** * the MyISAM storage engine */ diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php index 374a4f6ac3..59ea133d7e 100644 --- a/libraries/engines/ndbcluster.lib.php +++ b/libraries/engines/ndbcluster.lib.php @@ -1,7 +1,12 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ +/** + * + */ class PMA_StorageEngine_ndbcluster extends PMA_StorageEngine { /** diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 89b55636e6..aee7a43031 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -1,6 +1,8 @@ <?php -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @version $Id$ + */ /** * Set of functions used to build CSV dumps of tables diff --git a/libraries/export/excel.php b/libraries/export/excel.php index 1c69bff8de..e71d111ad0 100644 --- a/libraries/export/excel.php +++ b/libraries/export/excel.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used to build CSV dumps of tables diff --git a/libraries/export/htmlexcel.php b/libraries/export/htmlexcel.php index dedf5ac7b7..81b2db9794 100644 --- a/libraries/export/htmlexcel.php +++ b/libraries/export/htmlexcel.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used to build CSV dumps of tables @@ -68,7 +68,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> - <meta http-equiv="Content-type" content="text/html;charset=' . ( isset($charset_of_file) ? $charset_of_file : $charset ) .'" /> + <meta http-equiv="Content-type" content="text/html;charset=' . ( isset($charset_of_file) ? $charset_of_file : $charset ) .'" /> <style id="Classeur1_16681_Styles"> </style> diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index dfa0bd2150..43316cab95 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used to build CSV dumps of tables @@ -61,7 +61,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> - <meta http-equiv="Content-type" content="text/html;charset=' . ( isset($charset_of_file) ? $charset_of_file : $charset ) .'" /> + <meta http-equiv="Content-type" content="text/html;charset=' . ( isset($charset_of_file) ? $charset_of_file : $charset ) .'" /> </head> <body>'); } diff --git a/libraries/export/latex.php b/libraries/export/latex.php index b1e046ae0b..8e3b4a4f1c 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used to build dumps of tables @@ -278,7 +278,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { * @param boolean whether to include relation comments * @param boolean whether to include column comments * @param boolean whether to include mime comments - * @param string future feature: support view dependencies + * @param string future feature: support view dependencies * * @return bool Whether it suceeded * diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 22c54dc832..0eb4845079 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used to build CSV dumps of tables diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 68f5999946..95f99a16f3 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used to build CSV dumps of tables @@ -225,7 +225,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { * @param boolean whether to include relation comments * @param boolean whether to include column comments * @param boolean whether to include mime comments - * @param string future feature: support view dependencies + * @param string future feature: support view dependencies * * @return bool Whether it suceeded * diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index bc7fa55271..b4a023ddd3 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Produce a PDF report (export) from a query diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 79228f868e..f52f87c23c 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -1,6 +1,7 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: + /** * Set of functions used to build SQL dumps of tables */ @@ -166,8 +167,8 @@ function PMA_exportFooter() $charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : ''; if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) { $foot .= $crlf - . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf - . '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . $crlf + . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf + . '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . $crlf . '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . $crlf; } @@ -216,7 +217,7 @@ function PMA_exportHeader() } /* We want exported AUTO_INCREMENT fields to have still same value, do this only for recent MySQL exports */ - if (!isset($GLOBALS['sql_compatibility']) || $GLOBALS['sql_compatibility'] == 'NONE') { + if (!isset($GLOBALS['sql_compatibility']) || $GLOBALS['sql_compatibility'] == 'NONE') { $head .= $crlf . 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . $crlf; } @@ -224,7 +225,7 @@ function PMA_exportHeader() $head .= $crlf .'SET AUTOCOMMIT=0;' . $crlf . 'START TRANSACTION;' . $crlf; } - + $head .= $crlf; $charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : ''; @@ -320,7 +321,7 @@ function PMA_exportDBFooter($db) $delimiter = '$$'; $procs_funcs = $crlf . $comment_marker . $crlf - . $comment_marker . $GLOBALS['strProcedures'] . $crlf + . $comment_marker . $GLOBALS['strProcedures'] . $crlf . $comment_marker . $crlf . 'DELIMITER ' . $delimiter . $crlf . $comment_marker . $crlf; @@ -347,7 +348,7 @@ function PMA_exportDBFooter($db) if ( !empty($procs_funcs)) { $result = PMA_exportOutputHandler($procs_funcs); } - } + } return $result; } @@ -359,7 +360,7 @@ function PMA_exportDBFooter($db) * @param string the vew name * @param string the end of line sequence * - * @return string resulting definition + * @return string resulting definition * * @access public */ @@ -370,7 +371,7 @@ function PMA_getTableDefStandIn($db, $view, $crlf) { foreach($columns as $column_name => $definition) { $tmp[] = PMA_backquote($column_name) . ' ' . $definition['Type'] . $crlf; } - $create_query .= implode(',', $tmp) . ');'; + $create_query .= implode(',', $tmp) . ');'; return($create_query); } @@ -528,11 +529,11 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false) if (strpos($sql_lines[$j], 'CONSTRAINT') === FALSE) { $str_tmp = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]); $sql_constraints_query .= $str_tmp; - $sql_constraints .= $str_tmp; + $sql_constraints .= $str_tmp; } else { $str_tmp = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]); $sql_constraints_query .= $str_tmp; - $sql_constraints .= $str_tmp; + $sql_constraints .= $str_tmp; } $first = FALSE; } else { @@ -552,7 +553,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false) // remove a possible "AUTO_INCREMENT = value" clause // that could be there starting with MySQL 5.0.24 $schema_create = preg_replace('/AUTO_INCREMENT\s*=\s*([0-9])+/', '', $schema_create); - + $schema_create .= $auto_increment; PMA_DBI_free_result($result); @@ -656,7 +657,7 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_comm * @param boolean whether to include relation comments * @param boolean whether to include column comments * @param boolean whether to include mime comments - * @param string 'stand_in', 'create_table', 'create_view' + * @param string 'stand_in', 'create_table', 'create_view' * * @return bool Whether it suceeded * diff --git a/libraries/export/xls.php b/libraries/export/xls.php index d5f6c3179f..58cb680e89 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Check if we have native MS Excel export using PEAR class Spreadsheet_Excel_Writer if (!empty($GLOBALS['cfg']['TempDir'])) { diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 190b00b939..e6c22e08db 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used to build XML dumps of tables diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 68db6ae9f0..455a05ae3c 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -1,5 +1,6 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/* $Id$ */ if (isset($plugin_list)) { $plugin_list['yaml'] = array( @@ -7,7 +8,7 @@ if (isset($plugin_list)) { 'extension' => 'yml', 'mime_type' => 'text/yaml', 'force_file' => true, - 'options' => array( + 'options' => array( array('type' => 'hidden', 'name' => 'data'), ), 'options_text' => 'strOptions', @@ -51,7 +52,7 @@ function PMA_exportFooter() */ function PMA_exportHeader() { - return TRUE; + return TRUE; } /** @@ -119,14 +120,14 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } unset($i); - $cnt = 0; - $buffer = ''; + $cnt = 0; + $buffer = ''; while ($record = PMA_DBI_fetch_row($result)) { - $cnt++; - $buffer = $cnt . ":$crlf"; + $cnt++; + $buffer = $cnt . ":$crlf"; for ($i = 0; $i < $columns_cnt; $i++) { if ( isset($record[$i]) && !is_null($record[$i])) { - $buffer .= ' ' . $columns[$i] . ': ' . htmlspecialchars($record[$i]) . $crlf; + $buffer .= ' ' . $columns[$i] . ': ' . htmlspecialchars($record[$i]) . $crlf; } } diff --git a/libraries/file_listing.php b/libraries/file_listing.php index d54b29aba6..2a6d71c7b3 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Functions for listing directories /** @@ -63,9 +63,9 @@ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') function PMA_supportedDecompressions() { global $cfg; - + $compressions = ''; - + if ($cfg['GZipDump'] && @function_exists('gzopen')) { if (!empty($compressions)) { $compressions .= '|'; diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index 36b7781969..a112a65511 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * WARNING: This script has to be included at the very end of your code because @@ -137,7 +137,7 @@ if (file_exists('./config.footer.inc.php')) { * Generates profiling data if requested */ -// profiling deactivated due to licensing issues +// profiling deactivated due to licensing issues if (! empty($GLOBALS['cfg']['DBG']['enable']) && ! empty($GLOBALS['cfg']['DBG']['profile']['enable'])) { //run the basic setup code first diff --git a/libraries/get_foreign.lib.php b/libraries/get_foreign.lib.php index b4bb7d6a40..b9c39553b7 100644 --- a/libraries/get_foreign.lib.php +++ b/libraries/get_foreign.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/Table.class.php'; diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index c45a505a41..3600e36f7c 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/libraries/header.inc.php b/libraries/header.inc.php index e89b023a5b..b393fe43a4 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/common.lib.php'; diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index 7ce4a6190f..ccc0f70983 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) { die("GLOBALS overwrite attempt"); diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 778fdfd429..2377281a1e 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) { die("GLOBALS overwrite attempt"); diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index a74135f729..89bd4d9b95 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Gets a core script and starts output buffering work diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php index c33d7a7ede..7c936f47fd 100644 --- a/libraries/iconv_wrapper.lib.php +++ b/libraries/iconv_wrapper.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: # GNU iconv code set to IBM AIX libiconv code set table # Keys of this table should be in lowercase, and searches should be performed using lowercase! @@ -39,7 +39,7 @@ $gnu_iconv_to_aix_iconv_codepage_map = array ( * * @access public * - * @author bwiberg Björn Wiberg <Bjorn.Wiberg@its.uu.se> + * @author bwiberg Björn Wiberg <Bjorn.Wiberg@its.uu.se> */ function PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) { diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index 06e12379ae..627104937b 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4 ft=php: /* DocSQL import plugin for phpMyAdmin */ @@ -11,7 +11,7 @@ if ($plugin_param == 'database' && $GLOBALS['num_tables'] > 0 && $GLOBALS['cfgRe 'text' => 'strDocSQL', // text to be displayed as choice 'extension' => '', // extension this plugin can handle 'options' => array( // array of options for your plugin (optional) - array('type' => 'text', 'name' => 'table', 'text' => 'strTableName'), + array('type' => 'text', 'name' => 'table', 'text' => 'strTableName'), ), 'options_text' => 'strDocSQLOptions', // text to describe plugin options (must be set if options are used) ); @@ -56,7 +56,7 @@ if ($plugin_param == 'database' && $GLOBALS['num_tables'] > 0 && $GLOBALS['cfgRe if (!empty($inf[2]) && strlen(trim($inf[2])) > 0) { $for = explode('->', $inf[2]); $qry = ' - INSERT INTO + INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['relation']) . ' ( master_db, master_table, master_field, foreign_db, foreign_table, foreign_field) VALUES ( diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 77584b4c6e..a7d0dbc626 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /* CSV import plugin for phpMyAdmin */ @@ -91,12 +91,12 @@ if ($plugin_param == 'table') { } // end for $sql .= ')'; } - + PMA_importRunQuery($sql, $sql); PMA_importRunQuery(); $finished = TRUE; } - + } } ?> diff --git a/libraries/import/sql.php b/libraries/import/sql.php index 7f7c2f0449..9c4eea1c6a 100644 --- a/libraries/import/sql.php +++ b/libraries/import/sql.php @@ -1,7 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /* SQL import plugin for phpMyAdmin */ @@ -207,14 +206,14 @@ if (isset($plugin_list)) { continue; } } - // Change delimiter, if redefined, and skip it (don't send to server!) + // Change delimiter, if redefined, and skip it (don't send to server!) if ((substr($buffer, $i, 9) == "DELIMITER") && ($buffer[$i + 9] <= ' ') && ($i<$len-11) && (!(strpos($buffer,"\n",$i+11)===FALSE) )) { $new_line_pos = strpos($buffer, "\n", $i + 10); $sql_delimiter = substr($buffer, $i+10, $new_line_pos - $i -10); $i= $new_line_pos + 1; // Next query part will start here $start_pos = $i; - continue; + continue; } // End of SQL @@ -248,7 +247,7 @@ if (isset($plugin_list)) { $start_pos = $i; } } - + } // End of parser loop } // End of import loop // Commit any possible data in buffers diff --git a/libraries/information_schema_relations.lib.php b/libraries/information_schema_relations.lib.php index c4501cb257..2fa0c600d5 100644 --- a/libraries/information_schema_relations.lib.php +++ b/libraries/information_schema_relations.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: $GLOBALS['information_schema_relations'] = array( 'CHARACTER_SETS' => array( diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index fd5d8e87ba..4ae321112d 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * This library is used with the server IP allow/deny host authentication diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 19170ee20c..8ddbfee670 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Javascript escaping functions. @@ -29,16 +29,16 @@ */ function PMA_jsFormat($a_string = '', $add_backquotes = true) { - if (is_string($a_string)) { - $a_string = htmlspecialchars($a_string); - $a_string = PMA_escapeJsString($a_string); - /** - * @todo what is this good for? - */ - $a_string = str_replace('#', '\\#', $a_string); - } + if (is_string($a_string)) { + $a_string = htmlspecialchars($a_string); + $a_string = PMA_escapeJsString($a_string); + /** + * @todo what is this good for? + */ + $a_string = str_replace('#', '\\#', $a_string); + } - return (($add_backquotes) ? PMA_backquote($a_string) : $a_string); + return (($add_backquotes) ? PMA_backquote($a_string) : $a_string); } // end of the 'PMA_jsFormat()' function /** @@ -53,12 +53,12 @@ function PMA_jsFormat($a_string = '', $add_backquotes = true) */ function PMA_escapeJsString($string) { - return preg_replace('@</script@i', '</\' + \'script', - strtr($string, array( - '\\' => '\\\\', - '\'' => '\\\'', - "\n" => '\n', - "\r" => '\r'))); + return preg_replace('@</script@i', '</\' + \'script', + strtr($string, array( + '\\' => '\\\\', + '\'' => '\\\'', + "\n" => '\n', + "\r" => '\r'))); } ?> diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php index 20d3404fa6..5aba38f3b2 100644 --- a/libraries/kanji-encoding.lib.php +++ b/libraries/kanji-encoding.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/libraries/language.lib.php b/libraries/language.lib.php index 278eff22f6..81eb2275fd 100644 --- a/libraries/language.lib.php +++ b/libraries/language.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * phpMyAdmin Language Loading File diff --git a/libraries/mcrypt.lib.php b/libraries/mcrypt.lib.php index 3954f67bbf..ea7a729af8 100644 --- a/libraries/mcrypt.lib.php +++ b/libraries/mcrypt.lib.php @@ -1,7 +1,6 @@ <?php - +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Initialization diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 9a3bab9d54..9e64cfe76d 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** @@ -193,7 +193,7 @@ if ( !empty($submit_mult) && !empty($what)) { $full_query = preg_replace('@,$@', ');<br />', $full_query); } break; - + case 'drop_fld': if ($full_query == '') { $full_query .= 'ALTER TABLE ' @@ -302,7 +302,7 @@ elseif ($mult_btn == $strYes) { } // end while PMA_DBI_free_result($result); } - + for ($i = 0; $i < $selected_cnt; $i++) { switch ($query_type) { case 'row_delete': @@ -399,7 +399,7 @@ elseif ($mult_btn == $strYes) { // All "DROP TABLE", "DROP FIELD", "OPTIMIZE TABLE" and "REPAIR TABLE" // statements will be run at once below - if ($run_parts) { + if ($run_parts) { $sql_query .= $a_query . ';' . "\n"; if ($query_type != 'drop_db') { PMA_DBI_select_db($db); diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 73d8ab0b99..d2beb05079 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: if (PMA_MYSQL_INT_VERSION >= 40100){ diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index 99c8383199..39b6e48b85 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * displays the pma logo, links and db and server selection in left frame diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php index a42620a4c7..dd0e4229a1 100644 --- a/libraries/ob.lib.php +++ b/libraries/ob.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php index ab0114443c..035df66781 100644 --- a/libraries/opendocument.lib.php +++ b/libraries/opendocument.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Simple interface for creating OASIS OpenDocument files. diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php index c862a69b17..c60bb08454 100644 --- a/libraries/parse_analyze.lib.php +++ b/libraries/parse_analyze.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: $GLOBALS['unparsed_sql'] = $sql_query; $parsed_sql = PMA_SQP_parse($sql_query); diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 3b204f0b46..2a2b000099 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Generic plugin interface. diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 3c76487cba..84061105f2 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/Table.class.php'; diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index 6abdf97ba3..b67d7b34ce 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used for cleaning up phpMyAdmin tables diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 01f02910b6..c09696a2a5 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -1,5 +1,5 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * phpMyAdmin Language Loading File * diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index 630f25e50d..ea183b87d2 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -1,5 +1,5 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* * Code for displaying server selection written by nijel * $Id$ @@ -71,7 +71,7 @@ function PMA_select_server($not_only_options, $ommit_fieldset) $label .= ' - ' . $server['only_db']; // try to avoid displaying a too wide selector } elseif (count($server['only_db']) < 4) { - $label .= ' - ' . implode(', ', $server['only_db']); + $label .= ' - ' . implode(', ', $server['only_db']); } } if (!empty($server['user']) && $server['auth_type'] == 'config') { diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 1e2ac50678..e817a637e5 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Check parameters diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 9d4e252d27..914bd5e358 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * session handling * diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index b89bff049d..35cd20ebab 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * functions for displaying the sql query form * @@ -187,7 +187,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') * @uses htmlspecialchars() * @param string $query query to display in the textarea * @param boolean $is_querywindow if inside querywindow or not - * @param string $delimiter default delimiter to use + * @param string $delimiter default delimiter to use */ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter = ';') { diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 037b3a0c24..4d36b3fd19 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -1,5 +1,5 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * SQL Parser Matching Data * diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index a4df1de8c9..6ffce23846 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * PHP interface to MimerSQL Validator diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index bbca25945b..c97b6f891b 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -1,7 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: - /** * SQL Validator interface for phpMyAdmin diff --git a/libraries/storage_engines.lib.php b/libraries/storage_engines.lib.php index a73ce02815..968c09e9fe 100644 --- a/libraries/storage_engines.lib.php +++ b/libraries/storage_engines.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Library for extracting information about the available storage engines diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 649e8b5260..b550ddb240 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** Specialized String Functions for phpMyAdmin * @@ -23,11 +23,11 @@ if (PMA_PHP_INT_VERSION != 40203) { /* windows-* and tis-620 are not supported and are not multibyte, * others can be ignored as they're not multibyte */ -$GLOBALS['using_mb_charset'] = +$GLOBALS['using_mb_charset'] = substr($GLOBALS['charset'], 0, 8) != 'windows-' && - substr($GLOBALS['charset'], 0, 9) != 'iso-8859-' && - substr($GLOBALS['charset'], 0, 3) != 'cp-' && - $GLOBALS['charset'] != 'koi8-r' && + substr($GLOBALS['charset'], 0, 9) != 'iso-8859-' && + substr($GLOBALS['charset'], 0, 3) != 'cp-' && + $GLOBALS['charset'] != 'koi8-r' && $GLOBALS['charset'] != 'tis-620'; $GLOBALS['PMA_allow_mbstr'] = @function_exists('mb_strlen') && $GLOBALS['using_mb_charset']; diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php index b182f0c13e..1838b931cb 100644 --- a/libraries/tbl_common.php +++ b/libraries/tbl_common.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index 2c2c634af4..a09f3b8b3e 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/Table.class.php'; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 2cca105aee..1160c6a5e1 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Check parameters @@ -17,7 +17,7 @@ require_once('./libraries/bookmark.lib.php'); /** * Set parameters for links */ -if (empty($url_query) +if (empty($url_query) || (isset($_POST['table']) && isset($_POST['new_name']) && $_POST['table'] != $_POST['new_name'])) { $url_query = PMA_generate_common_url($db, $table); } diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index c72f24ef29..2bf8dc2e43 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Check parameters require_once('./libraries/common.lib.php'); @@ -357,11 +357,11 @@ for ( $i = 0 ; $i <= $num_fields; $i++ ) { // here, we have a TIMESTAMP that SHOW FULL FIELDS reports as having the // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe // the latter. - if (isset($row['Field']) - && isset($analyzed_sql[0]) + if (isset($row['Field']) + && isset($analyzed_sql[0]) && isset($analyzed_sql[0]['create_table_fields']) && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['type']) - && $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP' + && $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP' && $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == true) { $row['Null'] = ''; } diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 132905335c..9e352d7c38 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -1,5 +1,5 @@ <?php -// vim: expandtab sw=4 ts=4 sts=4: +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * f i e l d u p l o a d e d f r o m a f i l e * @@ -18,7 +18,6 @@ * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES * * @version $Id$ - * vim: expandtab sw=4 ts=4 sts=4: * * @uses $_REQUEST * @uses defined() diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 76ada0df29..ad9a56ce3f 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Set of functions used with the relation and pdf feature diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php index e4857204f6..565c86340d 100644 --- a/libraries/transformations/application_octetstream__download.inc.php +++ b/libraries/transformations/application_octetstream__download.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_application_octetstream__download(&$buffer, $options = array(), $meta = '') { global $row, $fields_meta; @@ -18,7 +18,7 @@ function PMA_transformation_application_octetstream__download(&$buffer, $options if (isset($pos)) { $cn = $row[$pos]; } - } + } if (empty($cn)) { $cn = 'binary_file.dat'; } diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php index 21bbb9aa41..f7519d7a7d 100644 --- a/libraries/transformations/application_octetstream__hex.inc.php +++ b/libraries/transformations/application_octetstream__hex.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_application_octetstream__hex($buffer, $options = array(), $meta = '') { // possibly use a global transform and feed it with special options: diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php index eb451dfede..a46eefa5aa 100644 --- a/libraries/transformations/global.inc.php +++ b/libraries/transformations/global.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * GLOBAL Plugin function (Garvin Hicking). diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php index e4bba209fc..6d71453817 100644 --- a/libraries/transformations/image_jpeg__inline.inc.php +++ b/libraries/transformations/image_jpeg__inline.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_image_jpeg__inline($buffer, $options = array(), $meta = '') { require_once('./libraries/transformations/global.inc.php'); diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php index 09c929fbb4..d7d742293c 100644 --- a/libraries/transformations/image_jpeg__link.inc.php +++ b/libraries/transformations/image_jpeg__link.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_image_jpeg__link($buffer, $options = array(), $meta = '') { require_once('./libraries/transformations/global.inc.php'); diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php index 2db43d8926..0f155ef6c6 100644 --- a/libraries/transformations/image_png__inline.inc.php +++ b/libraries/transformations/image_png__inline.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_image_png__inline($buffer, $options = array(), $meta = '') { require_once('./libraries/transformations/global.inc.php'); diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php index 4bc2b3d282..bbec0c5cc5 100644 --- a/libraries/transformations/text_plain__dateformat.inc.php +++ b/libraries/transformations/text_plain__dateformat.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_text_plain__dateformat($buffer, $options = array(), $meta = '') { // possibly use a global transform and feed it with special options: diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php index b0520245ed..6fadaf6ba1 100644 --- a/libraries/transformations/text_plain__external.inc.php +++ b/libraries/transformations/text_plain__external.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_text_plain__external_nowrap($options = array()) { if (!isset($options[3]) || $options[3] == '') { @@ -76,7 +76,7 @@ function PMA_transformation_text_plain__external($buffer, $options = array(), $m $newstring .= fgets($pipes[1], 1024); } fclose($pipes[1]); - // we don't currently use the return value + // we don't currently use the return value $return_value = proc_close($process); } diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php index 96bf92e212..da87e1b98b 100644 --- a/libraries/transformations/text_plain__formatted.inc.php +++ b/libraries/transformations/text_plain__formatted.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_text_plain__formatted($buffer, $options = array(), $meta = '') { return $buffer; diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php index 356ce6ed9d..150e26088a 100644 --- a/libraries/transformations/text_plain__imagelink.inc.php +++ b/libraries/transformations/text_plain__imagelink.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_text_plain__imagelink($buffer, $options = array(), $meta = '') { require_once('./libraries/transformations/global.inc.php'); diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php index 2891930145..f51b0c5be6 100644 --- a/libraries/transformations/text_plain__link.inc.php +++ b/libraries/transformations/text_plain__link.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_text_plain__link($buffer, $options = array(), $meta = '') { require_once('./libraries/transformations/global.inc.php'); diff --git a/libraries/transformations/text_plain__sql.inc.php b/libraries/transformations/text_plain__sql.inc.php index d7b1aced42..5af3ea3ce7 100644 --- a/libraries/transformations/text_plain__sql.inc.php +++ b/libraries/transformations/text_plain__sql.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_text_plain__sql($buffer, $options = array(), $meta = '') { $result = PMA_SQP_formatHtml(PMA_SQP_parse($buffer)); diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php index 177c148735..99ab2f579d 100644 --- a/libraries/transformations/text_plain__substr.inc.php +++ b/libraries/transformations/text_plain__substr.inc.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: function PMA_transformation_text_plain__substr($buffer, $options = array(), $meta = '') { // possibly use a global transform and feed it with special options: diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index 11a7553dc7..c67ac61c77 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php index 00a0ca090b..c7e3980997 100644 --- a/libraries/zip.lib.php +++ b/libraries/zip.lib.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/license.php b/license.php index 40a184afeb..ca7ae7f150 100644 --- a/license.php +++ b/license.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ // Simple script to set correct charset for the license -// vim: expandtab sw=4 ts=4 sts=4: // // Note: please do not fold this script into a general script // that would read any file using a GET parameter, it would open a hole @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Don't display the page heading diff --git a/navigation.php b/navigation.php index bae5a82ab2..72af447762 100644 --- a/navigation.php +++ b/navigation.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * the navigation frame - displays server, db and table selection tree * diff --git a/pdf_pages.php b/pdf_pages.php index 7d63f6f8b2..a7edf76237 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Gets some core libraries @@ -85,7 +85,7 @@ if ($cfgRelation['pdfwork']) { if (isset($auto_layout_internal) || isset($auto_layout_innodb)) { $all_tables = array(); } - + if (isset($auto_layout_innodb)) { // get the tables list $tables = PMA_DBI_get_tables_full($db); @@ -184,8 +184,8 @@ if ($cfgRelation['pdfwork']) { $delta *= $delta_mult; break; } // end switch - } // end foreach - } // end if some auto-layout to do + } // end foreach + } // end if some auto-layout to do $chpage = $pdf_page_number; diff --git a/pdf_schema.php b/pdf_schema.php index 86c27da995..c1aedb3e4c 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Contributed by Maxime Delorme and merged by lem9 */ @@ -90,7 +90,7 @@ class PMA_PDF extends TCPDF { $nb = $this->page; foreach ($this->Alias AS $alias => $value) { for ($n = 1;$n <= $nb;$n++) - $this->pages[$n]=str_replace($alias, $value, $this->pages[$n]); + $this->pages[$n]=str_replace($alias, $value, $this->pages[$n]); } } parent::_putpages(); diff --git a/phpinfo.php b/phpinfo.php index add1f181e0..29fbb20c9b 100644 --- a/phpinfo.php +++ b/phpinfo.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index 17964c7569..2177c1a65c 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.lib.php'; diff --git a/pmd_common.php b/pmd_common.php index ad588915d5..dcdfe27d14 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com) @@ -10,7 +10,7 @@ require_once './libraries/common.lib.php'; // not understand require_once './libraries/header_http.inc.php'; -$GLOBALS['PMD']['STYLE'] = 'default'; +$GLOBALS['PMD']['STYLE'] = 'default'; require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); @@ -21,8 +21,8 @@ function get_tabs() // PMA_DBI { global $db, $script_display_field; $GLOBALS['PMD']['TABLE_NAME'] = array();// that foreach no error - $GLOBALS['PMD']['OWNER'] = array(); - $GLOBALS['PMD']['TABLE_NAME_SMALL'] = array(); + $GLOBALS['PMD']['OWNER'] = array(); + $GLOBALS['PMD']['TABLE_NAME_SMALL'] = array(); $tables = PMA_DBI_get_tables_full($db); // seems to be needed later @@ -32,29 +32,29 @@ function get_tabs() // PMA_DBI $GLOBALS['PMD']['TABLE_NAME'][$i] = $db . "." . $one_table['TABLE_NAME']; $GLOBALS['PMD']['OWNER'][$i] = $db; $GLOBALS['PMD']['TABLE_NAME_SMALL'][$i] = $one_table['TABLE_NAME']; - + $GLOBALS['PMD_URL']['TABLE_NAME'][$i] = urlencode($db . "." . $one_table['TABLE_NAME']); $GLOBALS['PMD_URL']['OWNER'][$i] = urlencode($db); $GLOBALS['PMD_URL']['TABLE_NAME_SMALL'][$i] = urlencode($one_table['TABLE_NAME']); - + $GLOBALS['PMD_OUT']['TABLE_NAME'][$i] = htmlspecialchars($db . "." . $one_table['TABLE_NAME'], ENT_QUOTES); $GLOBALS['PMD_OUT']['OWNER'][$i] = htmlspecialchars($db, ENT_QUOTES); - $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i] = htmlspecialchars($one_table['TABLE_NAME'], ENT_QUOTES); - + $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i] = htmlspecialchars($one_table['TABLE_NAME'], ENT_QUOTES); + $GLOBALS['PMD']['TABLE_TYPE'][$i] = strtoupper($one_table['ENGINE']); - + $DF = PMA_getDisplayField($db, $one_table['TABLE_NAME']); if($DF!='') $script_display_field .= " display_field['" . $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i] . "'] = '" . urlencode($DF) . "';\n"; - + $i++; - } + } $script_display_field .= "</script>\n"; // return $GLOBALS['PMD']; // many bases // not use ?????? } function get_tab_info() // PMA_DBI //PMA_backquote -{ +{ global $db; PMA_DBI_select_db($db); $tab_column = array(); @@ -63,7 +63,7 @@ function get_tab_info() // PMA_DBI //PMA_backquote $fields_rs = PMA_DBI_query('SHOW FULL FIELDS FROM '.PMA_backquote($GLOBALS['PMD']["TABLE_NAME_SMALL"][$i]), NULL, PMA_DBI_QUERY_STORE); $fields_cnt = PMA_DBI_num_rows($fields_rs); $j=0; - while ($row = PMA_DBI_fetch_assoc($fields_rs)) { + while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['COLUMN_ID'][$j] = $j; $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['COLUMN_NAME'][$j] = $row['Field']; $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['TYPE'][$j] = $row['Type']; @@ -85,7 +85,7 @@ function get_script_contr() { //echo "<br> internal ".$db." - ".$val[0]." - "; //print_r($row ); if ($row !== false) { - foreach ($row as $field => $value) { + foreach ($row as $field => $value) { $con['C_NAME'][$i] = ''; $con['DTN'][$i] = urlencode($db . "." . $val[0]); $con['DCN'][$i] = urlencode($field); @@ -98,7 +98,7 @@ function get_script_contr() { //echo "<br> INNO "; //print_r($row ); if ($row !== false) { - foreach ($row as $field => $value) { + foreach ($row as $field => $value) { $con['C_NAME'][$i] = ''; $con['DTN'][$i] = urlencode($db.".".$val[0]); $con['DCN'][$i] = urlencode($field); @@ -107,8 +107,8 @@ function get_script_contr() { $i++; } } - } - + } + $ti = 0; $script_contr = "<script>\n var contr = new Array();\n"; for ( $i=0; $i < sizeof( $con["C_NAME"] ); $i++ ) { @@ -117,8 +117,8 @@ function get_script_contr() { if (in_array($con['DTN'][$i],$GLOBALS['PMD_URL']["TABLE_NAME"]) && in_array($con['STN'][$i],$GLOBALS['PMD_URL']["TABLE_NAME"])) { $script_contr .= " contr[$ti]['".$con['C_NAME'][$i]."']['".$con['DTN'][$i]."'] = new Array();\n";$m_col = array();//} $script_contr .= " contr[$ti]['".$con['C_NAME'][$i]."']['".$con['DTN'][$i]."']['".$con['DCN'][$i]."'] = new Array();\n";//} - $script_contr .= " contr[$ti]['".$con['C_NAME'][$i]."']['".$con['DTN'][$i]."']['".$con['DCN'][$i]."'][0] = '".$con['STN'][$i]."';\n"; // - $script_contr .= " contr[$ti]['".$con['C_NAME'][$i]."']['".$con['DTN'][$i]."']['".$con['DCN'][$i]."'][1] = '".$con['SCN'][$i]."';\n"; // + $script_contr .= " contr[$ti]['".$con['C_NAME'][$i]."']['".$con['DTN'][$i]."']['".$con['DCN'][$i]."'][0] = '".$con['STN'][$i]."';\n"; // + $script_contr .= " contr[$ti]['".$con['C_NAME'][$i]."']['".$con['DTN'][$i]."']['".$con['DCN'][$i]."'][1] = '".$con['SCN'][$i]."';\n"; // } $ti++; } @@ -132,7 +132,7 @@ function get_pk_or_unique_keys() { PMA_DBI_select_db($db); $tables_pk_or_unique_keys = array(); - + for( $I=0; $I<sizeof($GLOBALS['PMD']['TABLE_NAME_SMALL']); $I++) { $ret_keys = PMA_get_indexes($GLOBALS['PMD']['TABLE_NAME_SMALL'][$I]); if (! empty($ret_keys)) { @@ -157,7 +157,7 @@ function get_all_keys() { PMA_DBI_select_db($db); $tables_all_keys = array(); - + for( $I=0; $I<sizeof($GLOBALS['PMD']['TABLE_NAME_SMALL']); $I++) { $ret_keys = PMA_get_indexes($GLOBALS['PMD']['TABLE_NAME_SMALL'][$I]); if (! empty($ret_keys)) { @@ -183,18 +183,18 @@ function get_script_tabs() { return $script_tabs; } -function get_tab_pos() { - $stmt = PMA_query_as_cu("SELECT * FROM " . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']), FALSE, PMA_DBI_QUERY_STORE); +function get_tab_pos() { + $stmt = PMA_query_as_cu("SELECT * FROM " . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']), FALSE, PMA_DBI_QUERY_STORE); if ( $stmt ) // exist table repository { - while ($t_p = PMA_DBI_fetch_array($stmt, MYSQL_ASSOC)) { + while ($t_p = PMA_DBI_fetch_array($stmt, MYSQL_ASSOC)) { $t_name = $t_p['db_name'] . '.' . $t_p['table_name']; $tab_pos[ $t_name ]['X'] = $t_p['x']; $tab_pos[ $t_name ]['Y'] = $t_p['y']; $tab_pos[ $t_name ]['V'] = $t_p['v']; $tab_pos[ $t_name ]['H'] = $t_p['h']; } - } + } return isset($tab_pos) ? $tab_pos : NULL; } diff --git a/pmd_display_field.php b/pmd_display_field.php index 6a64eb1eb0..7c04c8d034 100644 --- a/pmd_display_field.php +++ b/pmd_display_field.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id: pmd_display_field.php 9828 2007-01-05 17:30:36Z lem9 $ */ -// vim: expandtab sw=4 ts=4 sts=4: /* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com) @@ -14,7 +14,7 @@ $table = $T; $display_field = $F; if ($cfgRelation['displaywork']) { - + $disp = PMA_getDisplayField($db, $table); if ($disp) { if ($display_field != $disp) { @@ -39,7 +39,7 @@ if ($cfgRelation['displaywork']) { if (isset($upd_query)) { $upd_rs = PMA_query_as_cu($upd_query); } -} // end if +} // end if header("Content-Type: text/xml; charset=utf-8"); header("Cache-Control: no-cache"); diff --git a/pmd_general.php b/pmd_general.php index c709bdb7a1..d951bb598f 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /* @author Ivan A Kirillov (Ivan.A.Kirillov@gmail.com) diff --git a/pmd_help.php b/pmd_help.php index 4e56bce8df..1ba945c217 100644 --- a/pmd_help.php +++ b/pmd_help.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once 'pmd_common.php'; ?> diff --git a/pmd_pdf.php b/pmd_pdf.php index 841a7c4427..e3d966415b 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: include_once 'pmd_common.php'; if ( ! isset($scale)) { diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 2fd60ba806..9ac32f0e34 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -1,12 +1,12 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: include_once 'pmd_common.php'; $die_save_pos = 0; include_once 'pmd_save_pos.php'; require_once './libraries/relation.lib.php'; -extract($_POST); +extract($_POST); $tables = PMA_DBI_get_tables_full($db, $T1); $type_T1 = strtoupper($tables[$T1]['ENGINE']); @@ -18,10 +18,10 @@ $type_T2 = strtoupper($tables[$T2]['ENGINE']); // I n n o D B if ($type_T1 == 'INNODB' and $type_T2 == 'INNODB') { // relation exists? - $existrel_innodb = PMA_getForeigners($db, $T2, '', 'innodb'); - if (isset($existrel_innodb[$F2]) + $existrel_innodb = PMA_getForeigners($db, $T2, '', 'innodb'); + if (isset($existrel_innodb[$F2]) && isset($existrel_innodb[$F2]['constraint'])) { - PMD_return(0,'strErrorRelationExists'); + PMD_return(0,'strErrorRelationExists'); } // note: in InnoDB, the index does not requires to be on a PRIMARY // or UNIQUE key @@ -31,10 +31,10 @@ if ($type_T1 == 'INNODB' and $type_T2 == 'INNODB') { while ($row = PMA_DBI_fetch_assoc($result)) $index_array1[$row['Column_name']] = 1; PMA_DBI_free_result($result); - + $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($T2) . ';'); $index_array2 = array(); // will be used to emphasis prim. keys in the table view - while ($row = PMA_DBI_fetch_assoc($result)) + while ($row = PMA_DBI_fetch_assoc($result)) $index_array2[$row['Column_name']] = 1; PMA_DBI_free_result($result); @@ -47,7 +47,7 @@ if ($type_T1 == 'INNODB' and $type_T2 == 'INNODB') { . PMA_backquote($T1) . '(' . PMA_backquote($F1) . ')'; - if ($on_delete != 'nix') { + if ($on_delete != 'nix') { $upd_query .= ' ON DELETE ' . $on_delete; } if ($on_update != 'nix') { @@ -74,11 +74,11 @@ if ($type_T1 == 'INNODB' and $type_T2 == 'INNODB') { . '\'' . PMA_sqlAddslashes($db) . '\', ' . '\'' . PMA_sqlAddslashes($T1) . '\',' . '\'' . PMA_sqlAddslashes($F1) . '\')'; - + if (PMA_query_as_cu( $q , false, PMA_DBI_QUERY_STORE)) { - PMD_return(1, 'strInternalRelationAdded'); + PMD_return(1, 'strInternalRelationAdded'); } else { - PMD_return(0, 'strErrorRelationAdded'); + PMD_return(0, 'strErrorRelationAdded'); } } } diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 02733d094c..f35b66f915 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -1,10 +1,10 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: include_once 'pmd_common.php'; require_once './libraries/relation.lib.php'; -extract($_POST); +extract($_POST); extract($_GET); $die_save_pos = 0; include_once 'pmd_save_pos.php'; @@ -29,19 +29,19 @@ if ($type_T1 == 'INNODB' && $type_T2 == 'INNODB') { $upd_rs = PMA_DBI_query($upd_query); } } -//--------------------------------------------------------------------------------------------------- +//--------------------------------------------------------------------------------------------------- PMA_query_as_cu('DELETE FROM '.$cfg['Server']['relation'].' WHERE ' - . 'master_db = \'' . PMA_sqlAddslashes($DB2) . '\'' - . 'AND master_table = \'' . PMA_sqlAddslashes($T2) . '\'' - . 'AND master_field = \'' . PMA_sqlAddslashes($F2) . '\'' - . 'AND foreign_db = \'' . PMA_sqlAddslashes($DB1) . '\'' - . 'AND foreign_table = \'' . PMA_sqlAddslashes($T1) . '\'' + . 'master_db = \'' . PMA_sqlAddslashes($DB2) . '\'' + . 'AND master_table = \'' . PMA_sqlAddslashes($T2) . '\'' + . 'AND master_field = \'' . PMA_sqlAddslashes($F2) . '\'' + . 'AND foreign_db = \'' . PMA_sqlAddslashes($DB1) . '\'' + . 'AND foreign_table = \'' . PMA_sqlAddslashes($T1) . '\'' . 'AND foreign_field = \'' . PMA_sqlAddslashes($F1) . '\'' , FALSE, PMA_DBI_QUERY_STORE); -PMD_return(1, 'strRelationDeleted'); +PMD_return(1, 'strRelationDeleted'); function PMD_return($b,$ret) { diff --git a/pmd_save_pos.php b/pmd_save_pos.php index b6f7ec81dc..a7c14b1089 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: include_once 'pmd_common.php'; require_once './libraries/relation.lib.php'; diff --git a/readme.php b/readme.php index 90c63e7aaf..72cd78ad4d 100644 --- a/readme.php +++ b/readme.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ // Simple script to set correct charset for the readme -// vim: expandtab sw=4 ts=4 sts=4: // // Note: please do not fold this script into a general script // that would read any file using a GET parameter, it would open a hole diff --git a/scripts/check_lang.php b/scripts/check_lang.php index d89151cea1..9ff666cb91 100644 --- a/scripts/check_lang.php +++ b/scripts/check_lang.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4 foldmarker={,} fdm=marker: /** diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php index 589f149922..6ce9a07097 100644 --- a/scripts/decode_bug.php +++ b/scripts/decode_bug.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4 foldmarker={,} fdm=marker: /** diff --git a/scripts/setup.php b/scripts/setup.php index bea938662e..ac6e9d7aee 100644 --- a/scripts/setup.php +++ b/scripts/setup.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * phpMyAdmin setup script * @@ -9,10 +10,8 @@ * @author Michal Čihař <michal@cihar.com> * @copyright 2006 Michal Čihař <michal@cihar.com> * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 - * @version Subversion $Id$ + * @version $Id$ */ -/* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Grab phpMyAdmin version and PMA_dl function define( 'PMA_MINIMUM_COMMON', TRUE ); diff --git a/scripts/signon.php b/scripts/signon.php index c9344e9ee4..2231b627c8 100644 --- a/scripts/signon.php +++ b/scripts/signon.php @@ -1,11 +1,11 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: // Single signon for phpMyAdmin // -// This is just example how to use single signon with phpMyAdmin, it is -// not intended to be perfect code and look, only shows how you can +// This is just example how to use single signon with phpMyAdmin, it is +// not intended to be perfect code and look, only shows how you can // integrate this functionality in your application. /* Was data posted? */ @@ -14,7 +14,7 @@ if (isset($_POST['user'])) { session_set_cookie_params(0, '/', '', 0); /* Create signon session */ $session_name = 'SignonSession'; - session_name($session_name); + session_name($session_name); session_start(); /* Store there credentials */ $_SESSION['PMA_single_signon_user'] = $_POST['user']; diff --git a/server_collations.php b/server_collations.php index 34a8c83377..1f2812b750 100644 --- a/server_collations.php +++ b/server_collations.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * requirements diff --git a/server_databases.php b/server_databases.php index 964de87621..d138977a49 100644 --- a/server_databases.php +++ b/server_databases.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Does the common work diff --git a/server_engines.php b/server_engines.php index 4575b3f1b0..0eedac364a 100644 --- a/server_engines.php +++ b/server_engines.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * display list of server enignes and additonal information about them */ diff --git a/server_export.php b/server_export.php index 002d8e04c5..1544e0eb87 100644 --- a/server_export.php +++ b/server_export.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Does the common work diff --git a/server_import.php b/server_import.php index 361d5b784c..80dc646108 100644 --- a/server_import.php +++ b/server_import.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/server_privileges.php b/server_privileges.php index a4300809ee..3cd6a58389 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/server_processlist.php b/server_processlist.php index f2305f5200..c2ba23b6d9 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/server_sql.php b/server_sql.php index 628484d075..7ac4c2b479 100644 --- a/server_sql.php +++ b/server_sql.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/server_status.php b/server_status.php index 07cdf156a3..d373226d51 100644 --- a/server_status.php +++ b/server_status.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * displays status variables with descriptions and some hints an optmizing * + reset status variables @@ -262,7 +262,7 @@ $sections = array( // variable or section name => (name => url) $links = array(); -// because of PMA_NO_VARIABLES_IMPORT, the $PHP_SELF globalized by +// because of PMA_NO_VARIABLES_IMPORT, the $PHP_SELF globalized by // grab_globals is not available here when register_globals = Off // and in some situations, $_SERVER['PHP_SELF'] is not defined $links['table'][$strFlushTables] diff --git a/server_variables.php b/server_variables.php index 7be848e6d7..4e46d6f16c 100644 --- a/server_variables.php +++ b/server_variables.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: if ( ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) { define( 'PMA_NO_VARIABLES_IMPORT', true ); diff --git a/show_config_errors.php b/show_config_errors.php index 4e18ad57a6..a00cf84b18 100644 --- a/show_config_errors.php +++ b/show_config_errors.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /* Simple wrapper just to enable error reporting and include config */ @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * @todo we must handle the case if sql.php is called directly with a query * what returns 0 rows - to prevent cyclic redirects or includes diff --git a/tbl_addfield.php b/tbl_addfield.php index c342a469cb..54673379a5 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Get some core libraries diff --git a/tbl_alter.php b/tbl_alter.php index 5e620d98d6..e24d87f528 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Gets some core libraries diff --git a/tbl_export.php b/tbl_export.php index f96a11b5ce..c24dcb6c9a 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/tbl_import.php b/tbl_import.php index b5d4a80366..8d4dbade3b 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 0d0e97d4d4..c442d97046 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Gets some core libraries diff --git a/tbl_operations.php b/tbl_operations.php index 9ee07a91d0..3ac5554c3a 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/common.lib.php'; require_once './libraries/Table.class.php'; diff --git a/tbl_printview.php b/tbl_printview.php index 9bded5ecc4..249124ae56 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ require_once './libraries/common.lib.php'; diff --git a/tbl_relation.php b/tbl_relation.php index f2a018822f..a450768d2d 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Gets some core libraries @@ -226,12 +226,12 @@ if (isset($_REQUEST['destination_innodb'])) { } unset($sql_query, $tmp_error); } - } // end foreach + } // end foreach if (!empty($display_query)) { if ($seen_error) { - PMA_showMessage($strError); + PMA_showMessage($strError); } else { - PMA_showMessage($strSuccess); + PMA_showMessage($strSuccess); } } } // end if isset($destination_innodb) diff --git a/tbl_replace.php b/tbl_replace.php index 4de64ae0da..23e640d24b 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -1,7 +1,7 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * manipulation of table data like inserting, replacing and updating - * vim: expandtab sw=4 ts=4 sts=4: * * usally called as form action from tbl_change.php to insert or update table rows * diff --git a/tbl_row_action.php b/tbl_row_action.php index d61839babf..bcdcc9e244 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); require_once('./libraries/mysql_charsets.lib.php'); diff --git a/tbl_select.php b/tbl_select.php index 89ae7ff32b..dafec85b0e 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** @@ -290,7 +290,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) { //]]> </script> <?php - } + } ?> <input type="hidden" name="names[<?php echo $i; ?>]" value="<?php echo htmlspecialchars($fields_list[$i]); ?>" /> diff --git a/tbl_sql.php b/tbl_sql.php index a022f20549..fa76ae2300 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once('./libraries/common.lib.php'); diff --git a/tbl_structure.php b/tbl_structure.php index 244b33321b..ea0db4ca5a 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/common.lib.php'; require_once './libraries/mysql_charsets.lib.php'; diff --git a/themes.php b/themes.php index 7b083ce0d0..db3c47a290 100644 --- a/themes.php +++ b/themes.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* get some globals */ require_once('./libraries/common.lib.php'); diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index ce9abb4a4b..ecf8efb07d 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ // unplanned execution path if (!defined('PMA_MINIMUM_COMMON')) { exit(); diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php index 40bbfd2c0f..eeaf8b7cd4 100644 --- a/themes/darkblue_orange/info.inc.php +++ b/themes/darkblue_orange/info.inc.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ /* Theme information */ $theme_name = 'Darkblue/orange'; diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php index 21a7f41356..b8d0afff23 100644 --- a/themes/darkblue_orange/layout.inc.php +++ b/themes/darkblue_orange/layout.inc.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * configures general layout * for detailed layout configuration please refer to the css files diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 599d1254b6..9cf63ef897 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ // unplanned execution path if (!defined('PMA_MINIMUM_COMMON')) { exit(); diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index d40b30a507..d497423ba6 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ // unplanned execution path if (!defined('PMA_MINIMUM_COMMON')) { exit(); diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php index 480632e012..9f8d25c18a 100644 --- a/themes/original/info.inc.php +++ b/themes/original/info.inc.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ /* Theme information */ $theme_name = 'Original'; diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index ab855df207..b7d1718596 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -1,4 +1,5 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * configures general layout * for detailed layout configuration please refer to the css files diff --git a/transformation_overview.php b/transformation_overview.php index 6012cab17c..3e076ffd22 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** * Don't display the page heading diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 7e6bafe0da..4886722d5a 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: define('IS_TRANSFORMATION_WRAPPER', true); diff --git a/user_password.php b/user_password.php index d3ef11629c..54e0a6b897 100644 --- a/user_password.php +++ b/user_password.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: /** diff --git a/view_create.php b/view_create.php index cb890ce9ea..073683a78f 100644 --- a/view_create.php +++ b/view_create.php @@ -1,6 +1,6 @@ <?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ /* $Id$ */ -// vim: expandtab sw=4 ts=4 sts=4: require_once './libraries/common.lib.php'; @@ -48,11 +48,11 @@ if (isset($_POST['submitoptions'])) { } $message .= PMA_DBI_query($create_query) ? $strSuccess : $strError; - + // to display the CREATE VIEW query $sql_query = $create_query; - - require './' . $cfg['DefaultTabDatabase']; + + require './' . $cfg['DefaultTabDatabase']; exit(); } else { @@ -69,8 +69,8 @@ if (isset($_POST['submitoptions'])) { /** * Displays the page * - * @todo js error when view name is empty (strFormEmpty) - * @todo (also validate if js is disabled, after form submission?) + * @todo js error when view name is empty (strFormEmpty) + * @todo (also validate if js is disabled, after form submission?) */ ?> |