From 31c18cbe11c929b8ff7b95d2bcf478c8c6212d65 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 18 Jul 2010 14:31:53 -0400 Subject: [PATCH 001/154] 3.3.5-rc1 --- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation.html b/Documentation.html index 196828516..9053c486c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.3.5-dev - Documentation + phpMyAdmin 3.3.5-rc1 - Documentation @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 2df920ba9..18a6bef3b 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.5-dev + Version 3.3.5-rc1 ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index a7b448bee..493185886 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.5-dev'); + $this->set('PMA_VERSION', '3.3.5-rc1'); /** * @deprecated */ diff --git a/translators.html b/translators.html index ec250a860..407c759c9 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ - phpMyAdmin 3.3.5-dev - Official translators + phpMyAdmin 3.3.5-rc1 - Official translators @@ -19,7 +19,7 @@ From 828d008838565b1980c67e82ff48eb087a0bcb9a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 18 Jul 2010 14:34:32 -0400 Subject: [PATCH 002/154] 3.3.6-dev --- ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b0c93fbc..3f1afa7fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ +3.3.6.0 (not yet released) + 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker diff --git a/Documentation.html b/Documentation.html index 196828516..8d001e23b 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.3.5-dev - Documentation + phpMyAdmin 3.3.6-dev - Documentation @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 2df920ba9..8be673ecd 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.5-dev + Version 3.3.6-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index a7b448bee..a6b1d8c2c 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.5-dev'); + $this->set('PMA_VERSION', '3.3.6-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index ec250a860..d78b68bc4 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ - phpMyAdmin 3.3.5-dev - Official translators + phpMyAdmin 3.3.6-dev - Official translators @@ -19,7 +19,7 @@ From be361aa8570e6b103c90c959ef31a0fed2d1441d Mon Sep 17 00:00:00 2001 From: gheni Date: Tue, 20 Jul 2010 11:27:23 +0200 Subject: [PATCH 003/154] Translation update done using Pootle. --- po/ug.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ug.po b/po/ug.po index 16481edae..8a87f5f5c 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-19 10:04-0400\n" -"PO-Revision-Date: 2010-07-20 11:03+0200\n" +"PO-Revision-Date: 2010-07-20 11:27+0200\n" "Last-Translator: \n" "Language-Team: Uyghur \n" "Language: ug\n" @@ -980,7 +980,7 @@ msgstr "تاشقى ئاچقۇق قىممىتى" #: js/messages.php:62 msgid "Please select the primary key or a unique key" -msgstr "" +msgstr "ئاساسىي قىممەت ياكى بىردىنبىر قىمەتنى تاللاڭ" # column نى سۆزلەم دەپ ئالساق مۇۋاپىق بولغىدەك #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 From 9b2a7e30e318cb4f7cc9076fc67b67695e3dd077 Mon Sep 17 00:00:00 2001 From: gheni Date: Tue, 20 Jul 2010 11:28:24 +0200 Subject: [PATCH 004/154] Translation update done using Pootle. --- po/ug.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ug.po b/po/ug.po index 8a87f5f5c..e78d0e39a 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-19 10:04-0400\n" -"PO-Revision-Date: 2010-07-20 11:27+0200\n" +"PO-Revision-Date: 2010-07-20 11:28+0200\n" "Last-Translator: \n" "Language-Team: Uyghur \n" "Language: ug\n" @@ -989,7 +989,7 @@ msgstr "سۆزلەمنى كۆرسەتمەسلىك" #: js/messages.php:66 msgid "Generate password" -msgstr "" +msgstr "پارول ھاسىللاش" #: js/messages.php:67 libraries/replication_gui.lib.php:366 msgid "Generate" From dc873dd68a6f80edf443c76f91e7c041bb583169 Mon Sep 17 00:00:00 2001 From: gheni Date: Tue, 20 Jul 2010 11:28:53 +0200 Subject: [PATCH 005/154] Translation update done using Pootle. --- po/ug.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ug.po b/po/ug.po index e78d0e39a..4b6a3357f 100644 --- a/po/ug.po +++ b/po/ug.po @@ -993,7 +993,7 @@ msgstr "پارول ھاسىللاش" #: js/messages.php:67 libraries/replication_gui.lib.php:366 msgid "Generate" -msgstr "" +msgstr "ھاسىللاش" #. l10n: Display text for calendar close link #: js/messages.php:77 From 2288d4bf2e8bc30f9b7ff8e28911f046a1b0cfb2 Mon Sep 17 00:00:00 2001 From: gheni Date: Tue, 20 Jul 2010 11:46:35 +0200 Subject: [PATCH 006/154] Translation update done using Pootle. --- po/ug.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ug.po b/po/ug.po index 4b6a3357f..0bd8c2636 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-19 10:04-0400\n" -"PO-Revision-Date: 2010-07-20 11:28+0200\n" +"PO-Revision-Date: 2010-07-20 11:46+0200\n" "Last-Translator: \n" "Language-Team: Uyghur \n" "Language: ug\n" @@ -1320,7 +1320,7 @@ msgstr "تەھىرلەش" #: libraries/Index.class.php:472 msgid "The primary key has been dropped" -msgstr "" +msgstr "ئاساسىي قىممەت ئۆچۈرۈلدى" #: libraries/Index.class.php:476 #, php-format From 95c0b5125d1be0177d9a30f8b7414804662e6064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 20 Jul 2010 13:57:25 +0200 Subject: [PATCH 007/154] This function is not used anywhere. --- libraries/charset_conversion.lib.php | 45 ---------------------------- 1 file changed, 45 deletions(-) diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 15f4a11e4..0b03c7ee3 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -84,49 +84,4 @@ function PMA_convert_string($src_charset, $dest_charset, $what) { } } // end of the "PMA_convert_string()" function - -/** - * Converts encoding of file according to parameters with detected - * conversion function. The old file will be unlinked and new created and - * its file name is returned. - * - * @param string source charset - * @param string target charset - * @param string file to convert - * - * @return string new temporay file - * - * @access public - * - */ -function PMA_convert_file($src_charset, $dest_charset, $file) { - switch ($GLOBALS['PMA_recoding_engine']) { - case PMA_CHARSET_RECODE: - case PMA_CHARSET_ICONV: - $tmpfname = tempnam('', 'PMA_convert_file'); - $fin = fopen($file, 'r'); - $fout = fopen($tmpfname, 'w'); - if ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_RECODE) { - recode_file($src_charset . '..' . $dest_charset, $fin, $fout); - } else { - while (!feof($fin)) { - $line = fgets($fin, 4096); - if ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV) { - $dist = iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line); - } elseif ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV_AIX) { - $dist = PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line); - } - fputs($fout, $dist); - } // end while - } - fclose($fin); - fclose($fout); - unlink($file); - - return $tmpfname; - default: - return $file; - } -} // end of the "PMA_convert_file()" function - ?> From 318dc4b650cc487fbcf6c1b444f4b05b4a0de1c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 20 Jul 2010 13:59:17 +0200 Subject: [PATCH 008/154] Drop @version tag from docblocks. --- browse_foreigners.php | 1 - bs_change_mime_type.php | 1 - bs_disp_as_mime_type.php | 1 - bs_play_media.php | 1 - changelog.php | 1 - chk_rel.php | 1 - db_create.php | 1 - db_datadict.php | 1 - db_export.php | 1 - db_import.php | 1 - db_operations.php | 1 - db_printview.php | 1 - db_qbe.php | 1 - db_search.php | 1 - db_sql.php | 1 - db_structure.php | 1 - db_tracking.php | 1 - error.php | 1 - export.php | 1 - import.php | 1 - import_status.php | 1 - index.php | 1 - libraries/Config.class.php | 1 - libraries/Error.class.php | 1 - libraries/Error_Handler.class.php | 1 - libraries/File.class.php | 1 - libraries/Index.class.php | 1 - libraries/List.class.php | 1 - libraries/List_Database.class.php | 1 - libraries/Message.class.php | 1 - libraries/Partition.class.php | 1 - libraries/StorageEngine.class.php | 1 - libraries/Table.class.php | 1 - libraries/Theme.class.php | 1 - libraries/Theme_Manager.class.php | 1 - libraries/Tracker.class.php | 1 - libraries/auth/config.auth.lib.php | 1 - libraries/auth/cookie.auth.lib.php | 1 - libraries/auth/http.auth.lib.php | 1 - libraries/auth/signon.auth.lib.php | 1 - libraries/blowfish.php | 1 - libraries/bookmark.lib.php | 1 - libraries/charset_conversion.lib.php | 1 - libraries/check_user_privileges.lib.php | 1 - libraries/cleanup.lib.php | 1 - libraries/common.inc.php | 1 - libraries/common.lib.php | 1 - libraries/config.default.php | 1 - libraries/core.lib.php | 1 - libraries/database_interface.lib.php | 1 - libraries/db_common.inc.php | 1 - libraries/db_events.inc.php | 1 - libraries/db_info.inc.php | 1 - libraries/db_links.inc.php | 1 - libraries/db_routines.inc.php | 1 - libraries/db_structure.lib.php | 1 - libraries/db_table_exists.lib.php | 1 - libraries/dbg/setup.php | 1 - libraries/dbi/mysql.dbi.lib.php | 1 - libraries/dbi/mysqli.dbi.lib.php | 1 - libraries/display_change_password.lib.php | 1 - libraries/display_create_database.lib.php | 1 - libraries/display_create_table.lib.php | 1 - libraries/display_export.lib.php | 1 - libraries/display_import_ajax.lib.php | 1 - libraries/display_select_lang.lib.php | 1 - libraries/display_tbl.lib.php | 1 - libraries/display_tbl_links.lib.php | 1 - libraries/engines/bdb.lib.php | 1 - libraries/engines/berkeleydb.lib.php | 1 - libraries/engines/binlog.lib.php | 1 - libraries/engines/innobase.lib.php | 1 - libraries/engines/innodb.lib.php | 1 - libraries/engines/memory.lib.php | 1 - libraries/engines/merge.lib.php | 1 - libraries/engines/mrg_myisam.lib.php | 1 - libraries/engines/myisam.lib.php | 1 - libraries/engines/ndbcluster.lib.php | 1 - libraries/engines/pbxt.lib.php | 1 - libraries/export/codegen.php | 1 - libraries/export/csv.php | 1 - libraries/export/excel.php | 1 - libraries/export/htmlword.php | 1 - libraries/export/latex.php | 1 - libraries/export/ods.php | 1 - libraries/export/odt.php | 1 - libraries/export/pdf.php | 1 - libraries/export/sql.php | 1 - libraries/export/xls.php | 1 - libraries/export/xlsx.php | 1 - libraries/export/xml.php | 1 - libraries/export/yaml.php | 1 - libraries/file_listing.php | 1 - libraries/footer.inc.php | 1 - libraries/grab_globals.lib.php | 1 - libraries/header.inc.php | 1 - libraries/header_http.inc.php | 1 - libraries/header_meta_style.inc.php | 1 - libraries/header_printview.inc.php | 1 - libraries/header_scripts.inc.php | 1 - libraries/iconv_wrapper.lib.php | 1 - libraries/import.lib.php | 1 - libraries/import/csv.php | 1 - libraries/import/docsql.php | 1 - libraries/import/ldi.php | 1 - libraries/import/sql.php | 1 - libraries/import/upload/apc.php | 1 - libraries/import/upload/noplugin.php | 1 - libraries/import/upload/uploadprogress.php | 1 - libraries/import/xls.php | 1 - libraries/import/xlsx.php | 1 - libraries/information_schema_relations.lib.php | 1 - libraries/ip_allow_deny.lib.php | 1 - libraries/js_escape.lib.php | 1 - libraries/kanji-encoding.lib.php | 1 - libraries/logging.lib.php | 1 - libraries/mime.lib.php | 1 - libraries/mult_submits.inc.php | 1 - libraries/mysql_charsets.lib.php | 1 - libraries/navigation_header.inc.php | 1 - libraries/ob.lib.php | 1 - libraries/opendocument.lib.php | 1 - libraries/parse_analyze.lib.php | 1 - libraries/plugin_interface.lib.php | 1 - libraries/relation.lib.php | 1 - libraries/relation_cleanup.lib.php | 1 - libraries/replication.inc.php | 1 - libraries/replication_gui.lib.php | 1 - libraries/sanitizing.lib.php | 1 - libraries/select_lang.lib.php | 1 - libraries/select_server.lib.php | 1 - libraries/server_common.inc.php | 1 - libraries/server_links.inc.php | 1 - libraries/session.inc.php | 1 - libraries/sql_query_form.lib.php | 1 - libraries/sqlparser.data.php | 1 - libraries/sqlparser.lib.php | 1 - libraries/sqlvalidator.lib.php | 1 - libraries/string.lib.php | 1 - libraries/string_mb.lib.php | 1 - libraries/string_native.lib.php | 1 - libraries/string_type_ctype.lib.php | 1 - libraries/string_type_native.lib.php | 1 - libraries/tbl_common.php | 1 - libraries/tbl_info.inc.php | 1 - libraries/tbl_links.inc.php | 1 - libraries/tbl_properties.inc.php | 1 - libraries/tbl_replace_fields.inc.php | 1 - libraries/tbl_triggers.lib.php | 1 - libraries/transformations.lib.php | 1 - .../transformations/application_octetstream__download.inc.php | 1 - libraries/transformations/application_octetstream__hex.inc.php | 1 - libraries/transformations/global.inc.php | 1 - libraries/transformations/image_jpeg__inline.inc.php | 1 - libraries/transformations/image_jpeg__link.inc.php | 1 - libraries/transformations/image_png__inline.inc.php | 1 - libraries/transformations/text_plain__dateformat.inc.php | 1 - libraries/transformations/text_plain__external.inc.php | 1 - libraries/transformations/text_plain__formatted.inc.php | 1 - libraries/transformations/text_plain__imagelink.inc.php | 1 - libraries/transformations/text_plain__link.inc.php | 1 - libraries/transformations/text_plain__longToIpv4.inc.php | 1 - libraries/transformations/text_plain__sql.inc.php | 1 - libraries/transformations/text_plain__substr.inc.php | 1 - libraries/url_generating.lib.php | 1 - libraries/vendor_config.php | 1 - libraries/zip.lib.php | 1 - license.php | 1 - main.php | 1 - navigation.php | 1 - pdf_pages.php | 1 - pdf_schema.php | 1 - phpinfo.php | 1 - phpmyadmin.css.php | 1 - pmd_common.php | 1 - pmd_display_field.php | 1 - pmd_general.php | 1 - pmd_help.php | 1 - pmd_pdf.php | 1 - pmd_relation_new.php | 1 - pmd_relation_upd.php | 1 - pmd_save_pos.php | 1 - querywindow.php | 1 - scripts/decode_bug.php | 1 - scripts/signon.php | 1 - server_binlog.php | 1 - server_collations.php | 1 - server_databases.php | 1 - server_engines.php | 1 - server_export.php | 1 - server_import.php | 1 - server_privileges.php | 1 - server_processlist.php | 1 - server_replication.php | 1 - server_sql.php | 1 - server_status.php | 1 - server_synchronize.php | 1 - server_variables.php | 1 - show_config_errors.php | 1 - sql.php | 1 - tbl_addfield.php | 1 - tbl_alter.php | 1 - tbl_change.php | 1 - tbl_create.php | 1 - tbl_export.php | 1 - tbl_get_field.php | 1 - tbl_import.php | 1 - tbl_indexes.php | 1 - tbl_move_copy.php | 1 - tbl_operations.php | 1 - tbl_printview.php | 1 - tbl_relation.php | 1 - tbl_replace.php | 1 - tbl_row_action.php | 1 - tbl_select.php | 1 - tbl_sql.php | 1 - tbl_structure.php | 1 - tbl_tracking.php | 1 - test/AllSeleniumTests.php | 1 - test/AllTests.php | 1 - test/Environment_test.php | 1 - test/FailTest.php | 1 - test/PMA_Message_test.php | 1 - test/PMA_STR_sub_test.php | 1 - test/PMA_blowfish_test.php | 1 - test/PMA_escapeJsString_test.php | 1 - test/PMA_escapeMySqlWildcards_test.php | 1 - test/PMA_foreignKeySupported_test.php | 1 - test/PMA_generateCommonUrl_test.php | 1 - test/PMA_get_real_size_test.php | 1 - test/PMA_headerLocation_test.php | 1 - test/PMA_ifSetOr_test.php | 1 - test/PMA_isValid_test.php | 1 - test/PMA_pow_test.php | 1 - test/PMA_sanitize_test.php | 1 - test/PMA_transformation_getOptions_test.php | 1 - test/PmaSeleniumLoginTest.php | 1 - test/PmaSeleniumPrivilegesTest.php | 1 - test/PmaSeleniumTestCase.php | 1 - test/PmaSeleniumXssTest.php | 1 - test/theme.php | 1 - test/wui.php | 1 - themes.php | 1 - themes/darkblue_orange/css/theme_right.css.php | 1 - themes/darkblue_orange/info.inc.php | 1 - themes/darkblue_orange/layout.inc.php | 1 - themes/original/css/theme_left.css.php | 1 - themes/original/css/theme_print.css.php | 1 - themes/original/css/theme_right.css.php | 1 - themes/original/info.inc.php | 1 - themes/original/layout.inc.php | 1 - transformation_overview.php | 1 - transformation_wrapper.php | 1 - user_password.php | 1 - view_create.php | 1 - view_operations.php | 1 - 256 files changed, 256 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 714d8676d..0f39cb4fe 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -3,7 +3,6 @@ /** * display selection for relational field values * - * @version $Id$ * @package phpMyAdmin */ diff --git a/bs_change_mime_type.php b/bs_change_mime_type.php index b8fea6b55..8ad8d1abc 100644 --- a/bs_change_mime_type.php +++ b/bs_change_mime_type.php @@ -1,7 +1,6 @@ frames-capable browser.') * @uses $GLOBALS['cfg']['QueryHistoryDB'] * @uses $GLOBALS['cfg']['Server']['user'] diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 28994c2b1..5a31629c2 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -3,7 +3,6 @@ /** * * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 849287e43..b063995be 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -3,7 +3,6 @@ /** * Holds class PMA_Error * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index fab7a3986..0b9089833 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -3,7 +3,6 @@ /** * Holds class PMA_Error_Handler * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/File.class.php b/libraries/File.class.php index 9dfe5687b..2f0fecd8a 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -3,7 +3,6 @@ /** * file upload functions * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 66a2114ba..61d12113e 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -3,7 +3,6 @@ /** * holds the database index class * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/List.class.php b/libraries/List.class.php index 029b6fc3d..65ac7fc5a 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -3,7 +3,6 @@ /** * hold the PMA_List base class * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 397a6db32..f793ed424 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -3,7 +3,6 @@ /** * holds the PMA_List_Database class * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Message.class.php b/libraries/Message.class.php index ffddb87e0..68d32bcfc 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -3,7 +3,6 @@ /** * Holds class PMA_Message * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php index cd696338a..c2b14a4e3 100644 --- a/libraries/Partition.class.php +++ b/libraries/Partition.class.php @@ -3,7 +3,6 @@ /** * Library for extracting information about the partitions * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 711f709e1..d0f697472 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -3,7 +3,6 @@ /** * Library for extracting information about the available storage engines * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Table.class.php b/libraries/Table.class.php index ef522f967..7839107e8 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index cf8f0a5b4..c74ec7b8e 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -3,7 +3,6 @@ /** * hold PMA_Theme class * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 9adb7c54c..c5298f378 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index e909e76b8..82deb43fe 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index 71e9a62cd..e16d1894f 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -4,7 +4,6 @@ * Set of functions used to run config authentication (ie no authentication). * * @package phpMyAdmin-Auth-Config - * @version $Id$ */ diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index d524e1cb1..833703c0b 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -4,7 +4,6 @@ * Set of functions used to run cookie based authentication. * * @package phpMyAdmin-Auth-Cookie - * @version $Id$ */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index 7ccea39e3..b3d305a10 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -5,7 +5,6 @@ * NOTE: Requires PHP loaded as a Apache module. * * @package phpMyAdmin-Auth-HTTP - * @version $Id$ */ diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index 2f828bda8..4215408af 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -4,7 +4,6 @@ * Set of functions used to run single signon authentication. * * @package phpMyAdmin-Auth-Signon - * @version $Id$ */ diff --git a/libraries/blowfish.php b/libraries/blowfish.php index 1dc3dcda0..ae85f4335 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -11,7 +11,6 @@ * See the enclosed file COPYING for license information (LGPL). If you * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * - * @version $Id$ * @since Horde 2.2 * @package horde.cipher */ diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index 73a9665b9..fa6b4bfcd 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -3,7 +3,6 @@ /** * Set of functions used with the bookmark feature * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 0b03c7ee3..9acd1843a 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -3,7 +3,6 @@ /** * Charset conversion functions. * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 398101bf6..6dbc251e4 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -3,7 +3,6 @@ /** * Get user's global privileges and some db-specific privileges * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php index 2bd1ef88c..b77fd315e 100644 --- a/libraries/cleanup.lib.php +++ b/libraries/cleanup.lib.php @@ -3,7 +3,6 @@ /** * Functions for cleanup of user input. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 8ad8a2c4f..abbd66372 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -28,7 +28,6 @@ * - db connection * - authentication work * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 6591715ec..26114015f 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3,7 +3,6 @@ /** * Misc functions used all over the scripts. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/config.default.php b/libraries/config.default.php index e16216c17..bb4e80571 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -16,7 +16,6 @@ * * All directives are explained in Documentation.html * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/core.lib.php b/libraries/core.lib.php index acc98145f..a4746e2a5 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -5,7 +5,6 @@ * This script is distinct from libraries/common.inc.php because this * script is called from /test. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index de65d12b8..2f24e4fb7 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -3,7 +3,6 @@ /** * Common Option Constants For DBI Functions * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 5d1699546..b9a4a97d4 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 33c5d1798..a72c7eb24 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 20dff36ba..2d5652b4a 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -31,7 +31,6 @@ * @uses strnatcasecmp() * @uses count() * @uses addslashes() - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 1010eac93..a86bcf559 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index 5235ab518..8af21970a 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -12,7 +12,6 @@ * our current sql.php. * Of course the interface would need a way to pass calling parameters. * Also, support DEFINER (like we do in export). - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 2b6f42034..c938ce071 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index d1ae16a34..1110dc52d 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -4,7 +4,6 @@ * Ensure the database and the table exist (else move to the "parent" script) * and display headers * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php index 07732dfd6..5f3618584 100644 --- a/libraries/dbg/setup.php +++ b/libraries/dbg/setup.php @@ -1,7 +1,6 @@ * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php index a52098f16..87642472f 100644 --- a/libraries/logging.lib.php +++ b/libraries/logging.lib.php @@ -5,7 +5,6 @@ * * This includes web server specific code to log some information. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php index 6ee5249a9..b8d035a7b 100644 --- a/libraries/mime.lib.php +++ b/libraries/mime.lib.php @@ -3,7 +3,6 @@ /** * MIME detection code. * - * @version $Id$ * @package phpMyAdmin * @todo Maybe we could try to use fileinfo module if loaded */ diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index c50894188..0b3413b39 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 1782a3e6c..303c63770 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index 969d86ad8..d6cb38325 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -3,7 +3,6 @@ /** * displays the pma logo, links and db and server selection in left frame * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php index 22903247e..780ee0274 100644 --- a/libraries/ob.lib.php +++ b/libraries/ob.lib.php @@ -9,7 +9,6 @@ * Check for all the needed functions for output buffering * Make some wrappers for the top and bottoms of our files. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php index b81d7594c..810d97f5e 100644 --- a/libraries/opendocument.lib.php +++ b/libraries/opendocument.lib.php @@ -3,7 +3,6 @@ /** * Simple interface for creating OASIS OpenDocument files. * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php index 75dd00b21..345c0964c 100644 --- a/libraries/parse_analyze.lib.php +++ b/libraries/parse_analyze.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index b78d32f80..da52b83d7 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -3,7 +3,6 @@ /** * Generic plugin interface. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 6aefe89d2..36f02b086 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -3,7 +3,6 @@ /** * Set of functions used with the relation and pdf feature * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index 6c2c7895c..313e0b22e 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -3,7 +3,6 @@ /** * Set of functions used for cleaning up phpMyAdmin tables * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 7b8ca0afb..3669a4ebd 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index a975bee72..d64e5f417 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 2b54bf197..c9b79a747 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -3,7 +3,6 @@ /** * This is in a separate script because it's called from a number of scripts * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f4c0c1bab..f750d810f 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -3,7 +3,6 @@ /** * phpMyAdmin Language Loading File * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index f873a5ed3..602b63cfc 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -3,7 +3,6 @@ /** * Code for displaying server selection * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 89e468bf6..56ab26189 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -7,7 +7,6 @@ * @uses PMA_DBI_fetch_result() * @uses PMA_DBI_QUERY_STORE * @uses $userlink - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 1608de3e7..c5d384f9f 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 8f5bec9d0..551668d9f 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -3,7 +3,6 @@ /** * session handling * - * @version $Id$ * @todo add failover or warn if sessions are not configured properly * @todo add an option to use mm-module for session handler * @see http://www.php.net/session diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 30f02f64d..a29f227c4 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -3,7 +3,6 @@ /** * functions for displaying the sql query form * - * @version $Id$ * @usedby server_sql.php * @usedby db_sql.php * @usedby tbl_sql.php diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index b68d193a4..8af645874 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -19,7 +19,6 @@ * It's easier to use only uppercase for proper sorting. In case of * doubt, use the DEBUG code after this function's definition. * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index bb103aa50..5509db1c9 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -24,7 +24,6 @@ * page for it to work, I recommend '' at the moment.) * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index 52dd994eb..2e965f851 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -27,7 +27,6 @@ * * Also set a username and password if you have a private one * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/string.lib.php b/libraries/string.lib.php index d87dbf7f3..e17a935b9 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @uses extension_loaded() * @uses substr() * @uses function_exists() diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php index eac8a94ea..69b5a0d3c 100644 --- a/libraries/string_mb.lib.php +++ b/libraries/string_mb.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @package phpMyAdmin-String-MB */ diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php index 8a5b8cc78..e70bf0b01 100644 --- a/libraries/string_native.lib.php +++ b/libraries/string_native.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @package phpMyAdmin-String-Native */ diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php index 4e7a10674..b211dd59c 100644 --- a/libraries/string_type_ctype.lib.php +++ b/libraries/string_type_ctype.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @package phpMyAdmin-StringType-CType */ diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php index 337c23df7..a2c7f0e20 100644 --- a/libraries/string_type_native.lib.php +++ b/libraries/string_type_native.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @package phpMyAdmin-StringType-Native */ diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php index 0ef16c22b..41d81523b 100644 --- a/libraries/tbl_common.php +++ b/libraries/tbl_common.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index c1adea476..e97c2fb7d 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -6,7 +6,6 @@ * @todo should be handled by class Table * @todo this should be recoded as functions, to avoid messing with global variables * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index e9b4cb939..1f695a529 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 0d00d17ec..4b10f513d 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -4,7 +4,6 @@ * Display form for changing/adding table fields/columns * * included by tbl_addfield.php, -_alter.php, -_create.php - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 08bbdb7fd..824d5bc06 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -17,7 +17,6 @@ * * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES * - * @version $Id$ * * @uses $_REQUEST * @uses defined() diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php index d397b3c2e..da2ee1dcb 100644 --- a/libraries/tbl_triggers.lib.php +++ b/libraries/tbl_triggers.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index c3249f18e..7148003b5 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -3,7 +3,6 @@ /** * Set of functions used with the relation and pdf feature * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php index 4fbc24dd3..28b199a67 100644 --- a/libraries/transformations/application_octetstream__download.inc.php +++ b/libraries/transformations/application_octetstream__download.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_application_octetstream__download_info() { diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php index 712235498..f5050ce48 100644 --- a/libraries/transformations/application_octetstream__hex.inc.php +++ b/libraries/transformations/application_octetstream__hex.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_application_octetstream__hex_info() { diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php index 1e662ee6d..974f24fac 100644 --- a/libraries/transformations/global.inc.php +++ b/libraries/transformations/global.inc.php @@ -19,7 +19,6 @@ * * Please provide a comment for your function, what it does and what parameters are available. * - * @version $Id$ * @package phpMyAdmin-Transformation */ diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php index 682e4a0bb..d4312aaf5 100644 --- a/libraries/transformations/image_jpeg__inline.inc.php +++ b/libraries/transformations/image_jpeg__inline.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_image_jpeg__inline_info() { diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php index 5223e506b..0d0b9a393 100644 --- a/libraries/transformations/image_jpeg__link.inc.php +++ b/libraries/transformations/image_jpeg__link.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_image_jpeg__link_info() { diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php index f631aa4a1..3655171f5 100644 --- a/libraries/transformations/image_png__inline.inc.php +++ b/libraries/transformations/image_png__inline.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_image_png__inline_info() { diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php index cf3c2b02f..42a19a96d 100644 --- a/libraries/transformations/text_plain__dateformat.inc.php +++ b/libraries/transformations/text_plain__dateformat.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__dateformat_info() { diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php index 8c35a4eb9..2ed3cdd13 100644 --- a/libraries/transformations/text_plain__external.inc.php +++ b/libraries/transformations/text_plain__external.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__external_info() { diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php index add22e148..f251f29aa 100644 --- a/libraries/transformations/text_plain__formatted.inc.php +++ b/libraries/transformations/text_plain__formatted.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__formatted_info() { diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php index cb62067ec..b22c945f1 100644 --- a/libraries/transformations/text_plain__imagelink.inc.php +++ b/libraries/transformations/text_plain__imagelink.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__imagelink_info() { diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php index 579deda78..bec766195 100644 --- a/libraries/transformations/text_plain__link.inc.php +++ b/libraries/transformations/text_plain__link.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__link_info() { diff --git a/libraries/transformations/text_plain__longToIpv4.inc.php b/libraries/transformations/text_plain__longToIpv4.inc.php index bcfc12a4a..a6d31aad4 100644 --- a/libraries/transformations/text_plain__longToIpv4.inc.php +++ b/libraries/transformations/text_plain__longToIpv4.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__longToIpv4_info() { diff --git a/libraries/transformations/text_plain__sql.inc.php b/libraries/transformations/text_plain__sql.inc.php index 5d5bfb1e5..afc288862 100644 --- a/libraries/transformations/text_plain__sql.inc.php +++ b/libraries/transformations/text_plain__sql.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__sql_info() { diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php index 9982dcba4..67d45365b 100644 --- a/libraries/transformations/text_plain__substr.inc.php +++ b/libraries/transformations/text_plain__substr.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__substr_info() { diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index ef5c7fa2a..069e4b439 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -3,7 +3,6 @@ /** * URL/hidden inputs generating. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 35b6dea37..5cea60964 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -7,7 +7,6 @@ * For changing this file you should know what you are doing. For this reason * options here are not part of normal configuration. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php index f616c7d04..c6ac6e509 100644 --- a/libraries/zip.lib.php +++ b/libraries/zip.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/license.php b/license.php index 029461129..b4b394f57 100644 --- a/license.php +++ b/license.php @@ -6,7 +6,6 @@ * 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 * - * @version $Id$ * @package phpMyAdmin */ diff --git a/main.php b/main.php index 360e98881..ba6faa151 100644 --- a/main.php +++ b/main.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/navigation.php b/navigation.php index 909bc0054..06581cc5e 100644 --- a/navigation.php +++ b/navigation.php @@ -3,7 +3,6 @@ /** * the navigation frame - displays server, db and table selection tree * - * @version $Id$ * @package phpMyAdmin * @uses $GLOBALS['pma']->databases * @uses $GLOBALS['server'] diff --git a/pdf_pages.php b/pdf_pages.php index 2e907b8d5..a26420f04 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/pdf_schema.php b/pdf_schema.php index 43bffaeec..097979209 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/phpinfo.php b/phpinfo.php index 043db9563..777521b4a 100644 --- a/phpinfo.php +++ b/phpinfo.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * phpinfo() wrapper to allow displaying only when configured to do so. - * @version $Id$ * @package phpMyAdmin */ diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index ebf48bb36..2275c97ff 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/pmd_common.php b/pmd_common.php index bb376fa9d..bf2351493 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -1,7 +1,6 @@ * - * @version $Id$ * @package phpMyAdmin-debug */ diff --git a/scripts/signon.php b/scripts/signon.php index a289fce9a..d2aac588a 100644 --- a/scripts/signon.php +++ b/scripts/signon.php @@ -7,7 +7,6 @@ * not intended to be perfect code and look, only shows how you can * integrate this functionality in your application. * - * @version $Id$ * @package phpMyAdmin * @subpackage Example */ diff --git a/server_binlog.php b/server_binlog.php index c8dd61497..71afc0801 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -35,7 +35,6 @@ * @uses array_key_exists() * @uses implode() * @uses htmlspecialchars() - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_collations.php b/server_collations.php index 0abeaab40..b6482cd84 100644 --- a/server_collations.php +++ b/server_collations.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_databases.php b/server_databases.php index 9a05c707d..0c7d598e5 100644 --- a/server_databases.php +++ b/server_databases.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_engines.php b/server_engines.php index 6fa73ec6e..f9664ca02 100644 --- a/server_engines.php +++ b/server_engines.php @@ -3,7 +3,6 @@ /** * display list of server enignes and additonal information about them * - * @version $Id$ * @todo falcon storage enginge is not listed under dev.mysql.com/doc/refman but dev.mysql.com/doc/falcon/ * @package phpMyAdmin */ diff --git a/server_export.php b/server_export.php index e728465bc..9d78ce7bf 100644 --- a/server_export.php +++ b/server_export.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_import.php b/server_import.php index d0ec6872f..e7a911894 100644 --- a/server_import.php +++ b/server_import.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_privileges.php b/server_privileges.php index ea4b8c858..a909ef588 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_processlist.php b/server_processlist.php index a77706097..58f4813fa 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_replication.php b/server_replication.php index dae375adb..1dbd42e3c 100644 --- a/server_replication.php +++ b/server_replication.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_sql.php b/server_sql.php index 54141b101..1b8027c33 100644 --- a/server_sql.php +++ b/server_sql.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_status.php b/server_status.php index 5ebd83591..30edca2c8 100644 --- a/server_status.php +++ b/server_status.php @@ -4,7 +4,6 @@ * displays status variables with descriptions and some hints an optmizing * + reset status variables * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_synchronize.php b/server_synchronize.php index c5d807728..1272dda97 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -3,7 +3,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_variables.php b/server_variables.php index 0248b8adc..db156a212 100644 --- a/server_variables.php +++ b/server_variables.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/show_config_errors.php b/show_config_errors.php index 8b1cd187e..9024fec22 100644 --- a/show_config_errors.php +++ b/show_config_errors.php @@ -3,7 +3,6 @@ /** * Simple wrapper just to enable error reporting and include config * - * @version $Id$ * @package phpMyAdmin */ diff --git a/sql.php b/sql.php index 288f150d4..c2b103123 100644 --- a/sql.php +++ b/sql.php @@ -3,7 +3,6 @@ /** * @todo we must handle the case if sql.php is called directly with a query * that returns 0 rows - to prevent cyclic redirects or includes - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_addfield.php b/tbl_addfield.php index 500a3daee..b61327fb4 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_alter.php b/tbl_alter.php index 92c9fedda..7f81c4179 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -6,7 +6,6 @@ * linked from table_structure, uses libraries/tbl_properties.inc.php to display * form and handles this form data * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_change.php b/tbl_change.php index 61ccadc1c..f8734904a 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -5,7 +5,6 @@ * * register_globals_save (mark this file save for disabling register globals) * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_create.php b/tbl_create.php index 02c637dff..885678866 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -31,7 +31,6 @@ * @uses strlen() * @uses sprintf() * @uses htmlspecialchars() - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_export.php b/tbl_export.php index 086dd39f7..eeaf24815 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_get_field.php b/tbl_get_field.php index ac123572a..a58eb5117 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Provides download to a given field defined in parameters. - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_import.php b/tbl_import.php index a0500fd07..ead8ff0e7 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_indexes.php b/tbl_indexes.php index 470cd04f6..172191ac3 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -3,7 +3,6 @@ /** * Displays index edit/creation form and handles it * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_move_copy.php b/tbl_move_copy.php index f4c8d478a..fa8a11e4f 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_operations.php b/tbl_operations.php index 4e0738ab7..fa89491ee 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_printview.php b/tbl_printview.php index 7f7a8c804..1b625f99e 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_relation.php b/tbl_relation.php index 5ca5ed54e..ab5851177 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -10,7 +10,6 @@ * @todo check foreign fields to be from same type and size, all other makes no sense * @todo add an link to create an index required for constraints, or an option to do automatically * @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_replace.php b/tbl_replace.php index b508342ca..d3271acb1 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -5,7 +5,6 @@ * * usally called as form action from tbl_change.php to insert or update table rows * - * @version $Id$ * * @todo 'edit_next' tends to not work as expected if used ... at least there is no order by * it needs the original query and the row number and than replace the LIMIT clause diff --git a/tbl_row_action.php b/tbl_row_action.php index bfe2e43af..356ad57d9 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -3,7 +3,6 @@ /** * handle row specifc actions like edit, delete, export * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_select.php b/tbl_select.php index 99936f36e..d9e8a4662 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -7,7 +7,6 @@ * and include sql.php to execute it * * @todo display search form again if no results from previous search - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_sql.php b/tbl_sql.php index 5565d923b..a9366c81b 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_structure.php b/tbl_structure.php index 8f1f26db9..b0263a39c 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -3,7 +3,6 @@ /** * Displays table structure infos like fields/columns, indexes, size, rows * and allows manipulation of indexes and columns/fields - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_tracking.php b/tbl_tracking.php index 3e761f8b1..698076a14 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php index 50b27c901..5d9baedfe 100644 --- a/test/AllSeleniumTests.php +++ b/test/AllSeleniumTests.php @@ -3,7 +3,6 @@ /** * runs all defined Selenium tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/AllTests.php b/test/AllTests.php index 079a947a1..b77f3ecfc 100644 --- a/test/AllTests.php +++ b/test/AllTests.php @@ -3,7 +3,6 @@ /** * runs all defined tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/Environment_test.php b/test/Environment_test.php index 7bc16e75e..f61956f36 100644 --- a/test/Environment_test.php +++ b/test/Environment_test.php @@ -3,7 +3,6 @@ /** * tests for environment like OS, PHP, modules, ... * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/FailTest.php b/test/FailTest.php index 0cecf6934..f430bb470 100644 --- a/test/FailTest.php +++ b/test/FailTest.php @@ -3,7 +3,6 @@ /** * tests for PMA_get_real_size() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_Message_test.php b/test/PMA_Message_test.php index 009dc2361..e3a44928c 100644 --- a/test/PMA_Message_test.php +++ b/test/PMA_Message_test.php @@ -3,7 +3,6 @@ /** * Test for PMA_Message class * - * @version $Id$ */ /** diff --git a/test/PMA_STR_sub_test.php b/test/PMA_STR_sub_test.php index 957f2cb12..7900b9262 100644 --- a/test/PMA_STR_sub_test.php +++ b/test/PMA_STR_sub_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_pow() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_blowfish_test.php b/test/PMA_blowfish_test.php index 307d966ab..234339abc 100644 --- a/test/PMA_blowfish_test.php +++ b/test/PMA_blowfish_test.php @@ -4,7 +4,6 @@ * Test for blowfish encryption. * * @package phpMyAdmin-test - * @version $Id$ */ /** diff --git a/test/PMA_escapeJsString_test.php b/test/PMA_escapeJsString_test.php index 6b54cea65..4efd6337e 100644 --- a/test/PMA_escapeJsString_test.php +++ b/test/PMA_escapeJsString_test.php @@ -4,7 +4,6 @@ * Test for javascript escaping. * * @package phpMyAdmin-test - * @version $Id$ */ /** diff --git a/test/PMA_escapeMySqlWildcards_test.php b/test/PMA_escapeMySqlWildcards_test.php index 75dd4e837..ccdf15b97 100644 --- a/test/PMA_escapeMySqlWildcards_test.php +++ b/test/PMA_escapeMySqlWildcards_test.php @@ -4,7 +4,6 @@ * Test for MySQL Wildcards escaping/unescaping * * @package phpMyAdmin-test - * @version $Id$ */ /** diff --git a/test/PMA_foreignKeySupported_test.php b/test/PMA_foreignKeySupported_test.php index 6d3e1ab33..f00afca2c 100644 --- a/test/PMA_foreignKeySupported_test.php +++ b/test/PMA_foreignKeySupported_test.php @@ -4,7 +4,6 @@ * Test for supporting foreign key * * @package phpMyAdmin-test - * @version $Id$ */ /** diff --git a/test/PMA_generateCommonUrl_test.php b/test/PMA_generateCommonUrl_test.php index 8f62a82cd..22e948b6b 100644 --- a/test/PMA_generateCommonUrl_test.php +++ b/test/PMA_generateCommonUrl_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_generate_common_url() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_get_real_size_test.php b/test/PMA_get_real_size_test.php index baad230eb..14d2a61fe 100644 --- a/test/PMA_get_real_size_test.php +++ b/test/PMA_get_real_size_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_get_real_size() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_headerLocation_test.php b/test/PMA_headerLocation_test.php index 7626906d2..f37e061a1 100644 --- a/test/PMA_headerLocation_test.php +++ b/test/PMA_headerLocation_test.php @@ -3,7 +3,6 @@ /** * Test for PMA_sendHeaderLocation * - * @version $Id$ */ /** diff --git a/test/PMA_ifSetOr_test.php b/test/PMA_ifSetOr_test.php index 4e9dce185..fbeb80ee0 100644 --- a/test/PMA_ifSetOr_test.php +++ b/test/PMA_ifSetOr_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_ifSetOr() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_isValid_test.php b/test/PMA_isValid_test.php index fd561ff5d..ffd41a261 100644 --- a/test/PMA_isValid_test.php +++ b/test/PMA_isValid_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_pow() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_pow_test.php b/test/PMA_pow_test.php index e9b9441b5..cb62e528c 100644 --- a/test/PMA_pow_test.php +++ b/test/PMA_pow_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_pow() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_sanitize_test.php b/test/PMA_sanitize_test.php index 396daa604..1400c7ede 100644 --- a/test/PMA_sanitize_test.php +++ b/test/PMA_sanitize_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_sanitize() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_transformation_getOptions_test.php b/test/PMA_transformation_getOptions_test.php index b47812df5..126a6204c 100644 --- a/test/PMA_transformation_getOptions_test.php +++ b/test/PMA_transformation_getOptions_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_sanitize() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PmaSeleniumLoginTest.php b/test/PmaSeleniumLoginTest.php index dad0f5fd2..9c1be97b8 100644 --- a/test/PmaSeleniumLoginTest.php +++ b/test/PmaSeleniumLoginTest.php @@ -3,7 +3,6 @@ /** * Selenium TestCase for login related tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PmaSeleniumPrivilegesTest.php b/test/PmaSeleniumPrivilegesTest.php index 149f3ed7d..64ff25d10 100644 --- a/test/PmaSeleniumPrivilegesTest.php +++ b/test/PmaSeleniumPrivilegesTest.php @@ -3,7 +3,6 @@ /** * Selenium TestCase for privilege related tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PmaSeleniumTestCase.php b/test/PmaSeleniumTestCase.php index e2468b64c..ac70594d4 100644 --- a/test/PmaSeleniumTestCase.php +++ b/test/PmaSeleniumTestCase.php @@ -3,7 +3,6 @@ /** * Selenium parent class for TestCases * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PmaSeleniumXssTest.php b/test/PmaSeleniumXssTest.php index 0870aa435..5099506f9 100644 --- a/test/PmaSeleniumXssTest.php +++ b/test/PmaSeleniumXssTest.php @@ -3,7 +3,6 @@ /** * Selenium TestCase for XSS related tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/theme.php b/test/theme.php index cbd998178..098feed77 100644 --- a/test/theme.php +++ b/test/theme.php @@ -5,7 +5,6 @@ * * @uses libraries/common.inc.php global fnctions * @package phpMyAdmin-test - * @version $Id$ */ chdir('..'); diff --git a/test/wui.php b/test/wui.php index d1f6f6cce..c3b459d0a 100644 --- a/test/wui.php +++ b/test/wui.php @@ -3,7 +3,6 @@ /** * runs all defined tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/themes.php b/themes.php index e6863712c..a996030f4 100644 --- a/themes.php +++ b/themes.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index c4b8cda00..cf5437884 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -3,7 +3,6 @@ /** * main css file from theme Darkblue Orange * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Darkblue_orange */ diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php index 57cc4568f..62f981bca 100644 --- a/themes/darkblue_orange/info.inc.php +++ b/themes/darkblue_orange/info.inc.php @@ -3,7 +3,6 @@ /** * Theme information * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Darkblue_orange */ diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php index 50ed7bf1d..e7282e1c5 100644 --- a/themes/darkblue_orange/layout.inc.php +++ b/themes/darkblue_orange/layout.inc.php @@ -4,7 +4,6 @@ * configures general layout * for detailed layout configuration please refer to the css files * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Darkblue_orange */ diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index e161f5906..0fcaf2105 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -3,7 +3,6 @@ /** * navigation css file from theme Original * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php index b39f5cf80..49a0d2363 100644 --- a/themes/original/css/theme_print.css.php +++ b/themes/original/css/theme_print.css.php @@ -3,7 +3,6 @@ /** * print css file from theme Original * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index b3c510154..4cd48eadf 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -3,7 +3,6 @@ /** * main css file from theme Original * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php index 0608898fe..5f7beba8f 100644 --- a/themes/original/info.inc.php +++ b/themes/original/info.inc.php @@ -3,7 +3,6 @@ /** * Theme information * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 909320a36..604982aeb 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -4,7 +4,6 @@ * configures general layout * for detailed layout configuration please refer to the css files * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/transformation_overview.php b/transformation_overview.php index 12ca39513..acf2ca489 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/transformation_wrapper.php b/transformation_wrapper.php index a231d49a7..3dd9c3123 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/user_password.php b/user_password.php index 91cfde006..6cb795ab7 100644 --- a/user_password.php +++ b/user_password.php @@ -25,7 +25,6 @@ * @uses PMA_blowfish_encrypt() * @uses PMA_showMessage() * @uses define() - * @version $Id$ * @package phpMyAdmin */ diff --git a/view_create.php b/view_create.php index 6797919c0..a1de4cc5b 100644 --- a/view_create.php +++ b/view_create.php @@ -5,7 +5,6 @@ * * @todo js error when view name is empty (strFormEmpty) * @todo (also validate if js is disabled, after form submission?) - * @version $Id$ * @package phpMyAdmin */ diff --git a/view_operations.php b/view_operations.php index b707ca5d1..08c26d6e1 100644 --- a/view_operations.php +++ b/view_operations.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ From 29ccdfc1ff9a44206d9705161f2f7c6ce41a7ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 20 Jul 2010 14:14:44 +0200 Subject: [PATCH 009/154] Focus SQL query area after dom is ready. --- js/functions.js | 1 + libraries/sql_query_form.lib.php | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/js/functions.js b/js/functions.js index f03b9e3ff..381f6a6bb 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1725,5 +1725,6 @@ $(document).ready(function(){ insertQuery(evt.target.id); return false; }); + $('#sqlquery').focus(); }); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index a29f227c4..52de14936 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -305,12 +305,6 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter } echo '' . "\n"; - echo '' . "\n"; - if (count($fields_list)) { echo '
' . "\n" .'' . "\n" From 4330ee3fd431f488263cb9a86fdb1f72fd4f9b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 20 Jul 2010 14:15:00 +0200 Subject: [PATCH 010/154] Whitespace cleanup. --- js/functions.js | 218 ++++++++++++++++++++++++------------------------ 1 file changed, 109 insertions(+), 109 deletions(-) diff --git a/js/functions.js b/js/functions.js index 381f6a6bb..e5d836322 100644 --- a/js/functions.js +++ b/js/functions.js @@ -194,7 +194,7 @@ function confirmQuery(theForm1, sqlQuery1) * Displays a confirmation box before disabling the BLOB repository for a given database. * This function is called while clicking links * - * @param object the database + * @param object the database * * @return boolean whether to disable the repository or not */ @@ -282,10 +282,10 @@ function checkSqlQuery(theForm) // Global variable row_class is set to even var row_class = 'even'; -/** +/** * Generates a row dynamically in the differences table displaying -* the complete statistics of difference in table like number of -* rows to be updated, number of rows to be inserted, number of +* the complete statistics of difference in table like number of +* rows to be updated, number of rows to be inserted, number of * columns to be added, number of columns to be removed, etc. * * @param index index of matching table @@ -294,17 +294,17 @@ var row_class = 'even'; * @param remove_size number of columns to be removed * @param insert_index number of indexes to be inserted * @param remove_index number of indexes to be removed -* @param img_obj image object +* @param img_obj image object * @param table_name name of the table */ function showDetails(i, update_size, insert_size, remove_size, insert_index, remove_index, img_obj, table_name) -{ +{ // The path of the image is split to facilitate comparison - var relative_path = (img_obj.src).split("themes/"); - + var relative_path = (img_obj.src).split("themes/"); + // The image source is changed when the showDetails function is called. - if (relative_path[1] == 'original/img/new_data_hovered.jpg') { + if (relative_path[1] == 'original/img/new_data_hovered.jpg') { img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg"; img_obj.alt = PMA_messages['strClickToUnselect']; //only for IE browser } else if (relative_path[1] == 'original/img/new_struct_hovered.jpg') { @@ -313,76 +313,76 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') { img_obj.src = "./themes/original/img/new_struct_hovered.jpg"; img_obj.alt = PMA_messages['strClickToSelect']; - } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { + } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { img_obj.src = "./themes/original/img/new_data_hovered.jpg"; img_obj.alt = PMA_messages['strClickToSelect']; - } - - var div = document.getElementById("list"); - var table = div.getElementsByTagName("table")[0]; + } + + var div = document.getElementById("list"); + var table = div.getElementsByTagName("table")[0]; var table_body = table.getElementsByTagName("tbody")[0]; - + //Global variable row_class is being used if (row_class == 'even') { row_class = 'odd'; } else { - row_class = 'even'; + row_class = 'even'; } - // If the red or green button against a table name is pressed then append a new row to show the details of differences of this table. - if ((relative_path[1] != 'original/img/new_struct_selected_hovered.jpg') && (relative_path[1] != 'original/img/new_data_selected_hovered.jpg')) { - - var newRow = document.createElement("tr"); + // If the red or green button against a table name is pressed then append a new row to show the details of differences of this table. + if ((relative_path[1] != 'original/img/new_struct_selected_hovered.jpg') && (relative_path[1] != 'original/img/new_data_selected_hovered.jpg')) { + + var newRow = document.createElement("tr"); newRow.setAttribute("class", row_class); - newRow.className = row_class; - // Id assigned to this row element is same as the index of this table name in the matching_tables/source_tables_uncommon array + newRow.className = row_class; + // Id assigned to this row element is same as the index of this table name in the matching_tables/source_tables_uncommon array newRow.setAttribute("id" , i); - + var table_name_cell = document.createElement("td"); table_name_cell.align = "center"; table_name_cell.innerHTML = table_name ; - + newRow.appendChild(table_name_cell); - + var create_table = document.createElement("td"); create_table.align = "center"; - + var add_cols = document.createElement("td"); add_cols.align = "center"; - + var remove_cols = document.createElement("td"); remove_cols.align = "center"; - + var alter_cols = document.createElement("td"); alter_cols.align = "center"; - + var add_index = document.createElement("td"); add_index.align = "center"; - + var delete_index = document.createElement("td"); delete_index.align = "center"; - + var update_rows = document.createElement("td"); update_rows.align = "center"; - + var insert_rows = document.createElement("td"); insert_rows.align = "center"; - + var tick_image = document.createElement("img"); - tick_image.src = "./themes/original/img/s_success.png"; + tick_image.src = "./themes/original/img/s_success.png"; if (update_size == '' && insert_size == '' && remove_size == '') { /** - This is the case when the table needs to be created in target database. + This is the case when the table needs to be created in target database. */ create_table.appendChild(tick_image); add_cols.innerHTML = "--"; - remove_cols.innerHTML = "--"; + remove_cols.innerHTML = "--"; alter_cols.innerHTML = "--"; delete_index.innerHTML = "--"; add_index.innerHTML = "--"; update_rows.innerHTML = "--"; insert_rows.innerHTML = "--"; - + newRow.appendChild(create_table); newRow.appendChild(add_cols); newRow.appendChild(remove_cols); @@ -391,43 +391,21 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem newRow.appendChild(add_index); newRow.appendChild(update_rows); newRow.appendChild(insert_rows); - + } else if (update_size == '' && remove_size == '') { /** - This is the case when data difference is displayed in the - table which is present in source but absent from target database + This is the case when data difference is displayed in the + table which is present in source but absent from target database */ create_table.innerHTML = "--"; add_cols.innerHTML = "--"; - remove_cols.innerHTML = "--"; + remove_cols.innerHTML = "--"; alter_cols.innerHTML = "--"; add_index.innerHTML = "--"; delete_index.innerHTML = "--"; update_rows.innerHTML = "--"; insert_rows.innerHTML = insert_size; - - newRow.appendChild(create_table); - newRow.appendChild(add_cols); - newRow.appendChild(remove_cols); - newRow.appendChild(alter_cols); - newRow.appendChild(delete_index); - newRow.appendChild(add_index); - newRow.appendChild(update_rows); - newRow.appendChild(insert_rows); - - } else if (remove_size == '') { - /** - This is the case when data difference between matching_tables is displayed. - */ - create_table.innerHTML = "--"; - add_cols.innerHTML = "--"; - remove_cols.innerHTML = "--"; - alter_cols.innerHTML = "--"; - add_index.innerHTML = "--"; - delete_index.innerHTML = "--"; - update_rows.innerHTML = update_size; - insert_rows.innerHTML = insert_size; - + newRow.appendChild(create_table); newRow.appendChild(add_cols); newRow.appendChild(remove_cols); @@ -436,41 +414,63 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem newRow.appendChild(add_index); newRow.appendChild(update_rows); newRow.appendChild(insert_rows); - + + } else if (remove_size == '') { + /** + This is the case when data difference between matching_tables is displayed. + */ + create_table.innerHTML = "--"; + add_cols.innerHTML = "--"; + remove_cols.innerHTML = "--"; + alter_cols.innerHTML = "--"; + add_index.innerHTML = "--"; + delete_index.innerHTML = "--"; + update_rows.innerHTML = update_size; + insert_rows.innerHTML = insert_size; + + newRow.appendChild(create_table); + newRow.appendChild(add_cols); + newRow.appendChild(remove_cols); + newRow.appendChild(alter_cols); + newRow.appendChild(delete_index); + newRow.appendChild(add_index); + newRow.appendChild(update_rows); + newRow.appendChild(insert_rows); + } else { /** This is the case when structure difference between matching_tables id displayed */ create_table.innerHTML = "--"; add_cols.innerHTML = insert_size; - remove_cols.innerHTML = remove_size; + remove_cols.innerHTML = remove_size; alter_cols.innerHTML = update_size; delete_index.innerHTML = remove_index; add_index.innerHTML = insert_index; update_rows.innerHTML = "--"; insert_rows.innerHTML = "--"; - + newRow.appendChild(create_table); newRow.appendChild(add_cols); newRow.appendChild(remove_cols); - newRow.appendChild(alter_cols); + newRow.appendChild(alter_cols); newRow.appendChild(delete_index); newRow.appendChild(add_index); newRow.appendChild(update_rows); newRow.appendChild(insert_rows); } table_body.appendChild(newRow); - + } else if ((relative_path[1] != 'original/img/new_struct_hovered.jpg') && (relative_path[1] != 'original/img/new_data_hovered.jpg')) { //The case when the row showing the details need to be removed from the table i.e. the difference button is deselected now. var table_rows = table_body.getElementsByTagName("tr"); var j; var index = 0; - for (j=0; j < table_rows.length; j++) - { - if (table_rows[j].id == i) { + for (j=0; j < table_rows.length; j++) + { + if (table_rows[j].id == i) { index = j; - table_rows[j].parentNode.removeChild(table_rows[j]); + table_rows[j].parentNode.removeChild(table_rows[j]); } } //The table row css is being adjusted. Class "odd" for odd rows and "even" for even rows should be maintained. @@ -481,11 +481,11 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem table_rows[index].setAttribute("class","odd"); // for Mozilla firefox table_rows[index].className = "odd"; // for IE browser } else { - table_rows[index].setAttribute("class","even"); // for Mozilla firefox - table_rows[index].className = "even"; // for IE browser + table_rows[index].setAttribute("class","even"); // for Mozilla firefox + table_rows[index].className = "even"; // for IE browser } - } - } + } + } } /** @@ -494,35 +494,35 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem * @param img_obj the image object whose source needs to be changed * */ - + function change_Image(img_obj) { - var relative_path = (img_obj.src).split("themes/"); - - if (relative_path[1] == 'original/img/new_data.jpg') { - img_obj.src = "./themes/original/img/new_data_hovered.jpg"; + var relative_path = (img_obj.src).split("themes/"); + + if (relative_path[1] == 'original/img/new_data.jpg') { + img_obj.src = "./themes/original/img/new_data_hovered.jpg"; } else if (relative_path[1] == 'original/img/new_struct.jpg') { img_obj.src = "./themes/original/img/new_struct_hovered.jpg"; } else if (relative_path[1] == 'original/img/new_struct_hovered.jpg') { img_obj.src = "./themes/original/img/new_struct.jpg"; - } else if (relative_path[1] == 'original/img/new_data_hovered.jpg') { - img_obj.src = "./themes/original/img/new_data.jpg"; - } else if (relative_path[1] == 'original/img/new_data_selected.jpg') { - img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg"; - } else if(relative_path[1] == 'original/img/new_struct_selected.jpg') { - img_obj.src = "./themes/original/img/new_struct_selected_hovered.jpg"; - } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') { - img_obj.src = "./themes/original/img/new_struct_selected.jpg"; - } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { - img_obj.src = "./themes/original/img/new_data_selected.jpg"; + } else if (relative_path[1] == 'original/img/new_data_hovered.jpg') { + img_obj.src = "./themes/original/img/new_data.jpg"; + } else if (relative_path[1] == 'original/img/new_data_selected.jpg') { + img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg"; + } else if(relative_path[1] == 'original/img/new_struct_selected.jpg') { + img_obj.src = "./themes/original/img/new_struct_selected_hovered.jpg"; + } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') { + img_obj.src = "./themes/original/img/new_struct_selected.jpg"; + } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { + img_obj.src = "./themes/original/img/new_data_selected.jpg"; } } /** - * Generates the URL containing the list of selected table ids for synchronization and - * a variable checked for confirmation of deleting previous rows from target tables + * Generates the URL containing the list of selected table ids for synchronization and + * a variable checked for confirmation of deleting previous rows from target tables * - * @param token the token generated for each PMA form + * @param token the token generated for each PMA form * */ @@ -536,15 +536,15 @@ function ApplySelectedChanges(token) var x = table_rows.length; var i; /** - Append the token at the beginning of the query string followed by - Table_ids that shows that "Apply Selected Changes" button is pressed + Append the token at the beginning of the query string followed by + Table_ids that shows that "Apply Selected Changes" button is pressed */ var append_string = "?token="+token+"&Table_ids="+1; for(i=0; i Date: Tue, 20 Jul 2010 14:19:46 +0200 Subject: [PATCH 011/154] rfe #3016457 [interface] Define tab order in SQL form to allow easier tab navigation. --- ChangeLog | 2 ++ libraries/sql_query_form.lib.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f19f49635..45b5aa4ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,8 @@ $Id$ (fixed for Privileges and Change password) - [core] RecodingEngine now accepts none as valid option. + [core] Dropped AllowAnywhereRecoding configuration variable. +- rfe #3016457 [interface] Define tab order in SQL form to allow easier tab + navigation. 3.3.6.0 (not yet released) diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 52de14936..68574cb3b 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -290,7 +290,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter echo '' . $legend . '' . "\n"; echo '
' . "\n"; echo '
' . "\n" - .'