diff --git a/ChangeLog b/ChangeLog index 9d8ed5bcd..87fb690fe 100755 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,9 @@ $Source$ * db_operations.php, db_details_links.php, db_details_structure.php: Separate operations from structure (RFE #808029). * tbl_move_copy.php: Remove unused PMA_myHandler(). + * lang/*, libraries/tbl_move_copy.php, libraries/export/sql.php, + db_operations.php, tbl_move_copy.php: Implemented database copying (RFE + #996730), this forced separating code for copying tables. 2004-10-19 Marc Delisle * libraries/database_interface.lib.php: bug #1041667, correctly diff --git a/db_operations.php b/db_operations.php index f28950cff..9d6d330e7 100644 --- a/db_operations.php +++ b/db_operations.php @@ -9,7 +9,15 @@ require_once('./libraries/mysql_charsets.lib.php'); /** * Rename database */ -if (isset($db) && isset($db_rename) && $db_rename == 'true') { +if (isset($db) && + ((isset($db_rename) && $db_rename == 'true') || + (isset($db_copy) && $db_copy == 'true'))) { + + require_once('./libraries/tbl_move_copy.php'); + + if (isset($db_rename) && $db_rename == 'true') $move = TRUE; + else $move = FALSE; + if (!isset($newname) || empty($newname)) { $message = $strDatabaseEmpty; } else { @@ -18,61 +26,33 @@ if (isset($db) && isset($db_rename) && $db_rename == 'true') { PMA_DBI_query($local_query); $tables = PMA_DBI_get_tables($db); foreach ($tables as $table) { - $local_query = 'RENAME TABLE ' - . PMA_backquote($db) . '.' . PMA_backquote($table) - . ' TO ' - . PMA_backquote($newname) . '.' . PMA_backquote($table) - . ';'; + $back = $sql_query; + $sql_query = ''; + PMA_table_move_copy($db, $table, $newname, $table, isset($what) ? $what : 'data', $move); + $sql_query = $back . $sql_query; + } + if ($move) { + $local_query = 'DROP DATABASE ' . PMA_backquote($db) . ';'; $sql_query .= "\n" . $local_query; PMA_DBI_query($local_query); + $message = sprintf($strRenameDatabaseOK, htmlspecialchars($db), htmlspecialchars($newname)); + } else { + $message = sprintf($strCopyDatabaseOK, htmlspecialchars($db), htmlspecialchars($newname)); } - $local_query = 'DROP DATABASE ' . PMA_backquote($db) . ';'; - $sql_query .= "\n" . $local_query; - PMA_DBI_query($local_query); $reload = TRUE; - $message = sprintf($strRenameDatabaseOK, htmlspecialchars($db), htmlspecialchars($newname)); - - /* Update relations */ - require_once('./libraries/relation.lib.php'); - $cfgRelation = PMA_getRelationsParam(); - - if ($cfgRelation['commwork']) { - PMA_query_as_cu('UPDATE ' . PMA_backquote($cfgRelation['column_info']) - . ' SET db_name = \'' . PMA_sqlAddslashes($newname) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''); - } - if ($cfgRelation['bookmarkwork']) { - PMA_query_as_cu('UPDATE ' . PMA_backquote($cfgRelation['bookmark']) - . ' SET dbase = \'' . PMA_sqlAddslashes($newname) . '\'' - . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''); - } - if ($cfgRelation['displaywork']) { - PMA_query_as_cu('UPDATE ' . PMA_backquote($cfgRelation['table_info']) - . ' SET db_name = \'' . PMA_sqlAddslashes($newname) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''); - } - - if ($cfgRelation['relwork']) { - PMA_query_as_cu('UPDATE ' . PMA_backquote($cfgRelation['relation']) - . ' SET foreign_db = \'' . PMA_sqlAddslashes($newname) . '\'' - . ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\''); - PMA_query_as_cu('UPDATE ' . PMA_backquote($cfgRelation['relation']) - . ' SET master_db = \'' . PMA_sqlAddslashes($newname) . '\'' - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\''); - } - if ($cfgRelation['historywork']) { - PMA_query_as_cu('UPDATE ' . PMA_backquote($cfgRelation['history']) - . ' SET db = \'' . PMA_sqlAddslashes($newname) . '\'' - . ' WHERE db = \'' . PMA_sqlAddslashes($db) . '\''); - } - if ($cfgRelation['pdfwork']) { - PMA_query_as_cu('UPDATE ' . PMA_backquote($cfgRelation['table_info']) - . ' SET db_name = \'' . PMA_sqlAddslashes($newname) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''); - } /* Change database to be used */ - $db = $newname; + if ($move) { + $db = $newname; + } else { + $pma_uri_parts = parse_url($cfg['PmaAbsoluteUri']); + if (isset($switch_to_new) && $switch_to_new == 'true') { + setcookie('pma_switch_to_new', 'true', 0, substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')), '', ($pma_uri_parts['scheme'] == 'https')); + $db = $newname; + } else { + setcookie('pma_switch_to_new', '', 0, substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')), '', ($pma_uri_parts['scheme'] == 'https')); + } + } } } /** @@ -81,7 +61,7 @@ if (isset($db) && isset($db_rename) && $db_rename == 'true') { */ if (empty($is_info)) { require('./db_details_common.php'); - $url_query .= '&goto=db_details_structure.php'; + $url_query .= '&goto=db_operations.php'; // Gets the database structure $sub_part = '_structure'; @@ -141,7 +121,7 @@ if ($cfgRelation['commwork']) { } echo $strDBRename.': '; ?> -
' @@ -150,6 +130,41 @@ if ($cfgRelation['commwork']) {
+ + + '; + } + echo $strDBCopy.': '; + ?> +
+ ' + . PMA_generate_common_hidden_inputs($db); + ?> + + +   
+   
+   
+ +
+
+ + style="vertical-align: middle" />   + + + + + +
+ = 40101) { @@ -163,7 +178,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) { } echo ' : ' . "\n" . ' ' . "\n" - . '
' . "\n" + . ' ' . "\n" . ' ' . PMA_generate_common_hidden_inputs($db, $table, 3) . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, FALSE, 3) diff --git a/lang/afrikaans-iso-8859-1.inc.php b/lang/afrikaans-iso-8859-1.inc.php index 04e51d3da..dbac8b5c3 100644 --- a/lang/afrikaans-iso-8859-1.inc.php +++ b/lang/afrikaans-iso-8859-1.inc.php @@ -745,4 +745,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 29fd5eca6..c1947225a 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -746,4 +746,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php b/lang/albanian-iso-8859-1.inc.php index 90e9da803..d4e3f8935 100644 --- a/lang/albanian-iso-8859-1.inc.php +++ b/lang/albanian-iso-8859-1.inc.php @@ -735,4 +735,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 1d53cf326..937b8a18c 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -736,4 +736,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index cc765d255..09697899e 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -739,4 +739,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php b/lang/arabic-windows-1256.inc.php index f3c6aa03d..b16885276 100644 --- a/lang/arabic-windows-1256.inc.php +++ b/lang/arabic-windows-1256.inc.php @@ -738,4 +738,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/azerbaijani-iso-8859-9.inc.php b/lang/azerbaijani-iso-8859-9.inc.php index bce4baf19..fdbf7b0cc 100644 --- a/lang/azerbaijani-iso-8859-9.inc.php +++ b/lang/azerbaijani-iso-8859-9.inc.php @@ -734,4 +734,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index d1882de9a..a223bd670 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -735,4 +735,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/basque-iso-8859-1.inc.php b/lang/basque-iso-8859-1.inc.php index e786a0335..22b8ff145 100644 --- a/lang/basque-iso-8859-1.inc.php +++ b/lang/basque-iso-8859-1.inc.php @@ -737,4 +737,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 6fd412909..638b1c9f5 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -738,4 +738,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 0e9413d44..9c34549fa 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -744,4 +744,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/bosnian-windows-1250.inc.php b/lang/bosnian-windows-1250.inc.php index 2f738c4ef..6f77b20f6 100644 --- a/lang/bosnian-windows-1250.inc.php +++ b/lang/bosnian-windows-1250.inc.php @@ -743,4 +743,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php b/lang/brazilian_portuguese-iso-8859-1.inc.php index 6c8fff8d6..8c3fae2ed 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php @@ -759,4 +759,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index e5bf171d3..63513ee21 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -760,4 +760,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php b/lang/bulgarian-koi8-r.inc.php index d0b0b7971..f32c4db7d 100644 --- a/lang/bulgarian-koi8-r.inc.php +++ b/lang/bulgarian-koi8-r.inc.php @@ -744,4 +744,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index d5ab0903a..b1451ee8e 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -745,4 +745,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php b/lang/bulgarian-windows-1251.inc.php index 8f2cba6c8..79b5be85b 100644 --- a/lang/bulgarian-windows-1251.inc.php +++ b/lang/bulgarian-windows-1251.inc.php @@ -744,4 +744,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php b/lang/catalan-iso-8859-1.inc.php index 0c5d484ca..37aa24782 100644 --- a/lang/catalan-iso-8859-1.inc.php +++ b/lang/catalan-iso-8859-1.inc.php @@ -730,4 +730,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 40e0200a5..f8f769e2f 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/chinese_simplified-gb2312.inc.php b/lang/chinese_simplified-gb2312.inc.php index acbb18b0e..9817e5a4f 100644 --- a/lang/chinese_simplified-gb2312.inc.php +++ b/lang/chinese_simplified-gb2312.inc.php @@ -736,4 +736,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index effd340fa..17725dd24 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -737,4 +737,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/chinese_traditional-big5.inc.php b/lang/chinese_traditional-big5.inc.php index a90e04133..05128e851 100644 --- a/lang/chinese_traditional-big5.inc.php +++ b/lang/chinese_traditional-big5.inc.php @@ -736,4 +736,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 4239c3267..279fd533e 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -740,4 +740,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php b/lang/croatian-iso-8859-2.inc.php index cb8e9a601..6300561c4 100644 --- a/lang/croatian-iso-8859-2.inc.php +++ b/lang/croatian-iso-8859-2.inc.php @@ -758,4 +758,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index af11efb77..3b92e0dc9 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -759,4 +759,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php b/lang/croatian-windows-1250.inc.php index e213fb094..98bf2df8b 100644 --- a/lang/croatian-windows-1250.inc.php +++ b/lang/croatian-windows-1250.inc.php @@ -758,4 +758,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php b/lang/czech-iso-8859-2.inc.php index efb233305..2b93f085c 100644 --- a/lang/czech-iso-8859-2.inc.php +++ b/lang/czech-iso-8859-2.inc.php @@ -144,6 +144,7 @@ $strConnections = 'P $strConstraintsForDumped = 'Omezení pro exportované tabulky'; $strConstraintsForTable = 'Omezení pro tabulku'; $strCookiesRequired = 'Během tohoto kroku musíte mít povoleny cookies.'; +$strCopyDatabaseOK = 'Databáze %s byla zkopírována na %s'; $strCopyTable = 'Kopírovat tabulku do (databáze.tabulka):'; $strCopyTableOK = 'Tabulka %s byla zkopírována do %s.'; $strCopyTableSameNames = 'Nelze kopírovat tabulku na sebe samu!'; @@ -163,6 +164,7 @@ $strCzech = ' $strCzechSlovak = 'Čeątina/Slovenątina'; $strDBComment = 'Komentář k databázi: '; +$strDBCopy = 'Zkopírovat databázi na'; $strDBGContext = 'Kontext'; $strDBGContextID = 'Kontext ID'; $strDBGHits = 'Zásahů'; diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 15e565e37..fad5b0bbd 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -145,6 +145,7 @@ $strConnections = 'PĹ™ipojenĂ­'; $strConstraintsForDumped = 'OmezenĂ­ pro exportovanĂ© tabulky'; $strConstraintsForTable = 'OmezenĂ­ pro tabulku'; $strCookiesRequired = 'BÄ›hem tohoto kroku musĂ­te mĂ­t povoleny cookies.'; +$strCopyDatabaseOK = 'Databáze %s byla zkopĂ­rována na %s'; $strCopyTable = 'KopĂ­rovat tabulku do (databáze.tabulka):'; $strCopyTableOK = 'Tabulka %s byla zkopĂ­rována do %s.'; $strCopyTableSameNames = 'Nelze kopĂ­rovat tabulku na sebe samu!'; @@ -164,6 +165,7 @@ $strCzech = 'ÄŚeština'; $strCzechSlovak = 'ÄŚeština/Slovenština'; $strDBComment = 'Komentář k databázi: '; +$strDBCopy = 'ZkopĂ­rovat databázi na'; $strDBGContext = 'Kontext'; $strDBGContextID = 'Kontext ID'; $strDBGHits = 'ZásahĹŻ'; diff --git a/lang/czech-windows-1250.inc.php b/lang/czech-windows-1250.inc.php index 0589d5406..00713cb20 100644 --- a/lang/czech-windows-1250.inc.php +++ b/lang/czech-windows-1250.inc.php @@ -144,6 +144,7 @@ $strConnections = 'P $strConstraintsForDumped = 'Omezení pro exportované tabulky'; $strConstraintsForTable = 'Omezení pro tabulku'; $strCookiesRequired = 'Během tohoto kroku musíte mít povoleny cookies.'; +$strCopyDatabaseOK = 'Databáze %s byla zkopírována na %s'; $strCopyTable = 'Kopírovat tabulku do (databáze.tabulka):'; $strCopyTableOK = 'Tabulka %s byla zkopírována do %s.'; $strCopyTableSameNames = 'Nelze kopírovat tabulku na sebe samu!'; @@ -163,6 +164,7 @@ $strCzech = ' $strCzechSlovak = 'Čeština/Slovenština'; $strDBComment = 'Komentář k databázi: '; +$strDBCopy = 'Zkopírovat databázi na'; $strDBGContext = 'Kontext'; $strDBGContextID = 'Kontext ID'; $strDBGHits = 'Zásahů'; diff --git a/lang/danish-iso-8859-1.inc.php b/lang/danish-iso-8859-1.inc.php index 6d776091a..5906b85ae 100644 --- a/lang/danish-iso-8859-1.inc.php +++ b/lang/danish-iso-8859-1.inc.php @@ -730,4 +730,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index bc1e85dc2..611ec9cc3 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php index 7c7c845e8..d9e11302e 100644 --- a/lang/dutch-iso-8859-1.inc.php +++ b/lang/dutch-iso-8859-1.inc.php @@ -734,4 +734,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index d581bda6b..2415a4232 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -735,4 +735,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php b/lang/english-iso-8859-1.inc.php index b78bd162a..f8cf6af92 100644 --- a/lang/english-iso-8859-1.inc.php +++ b/lang/english-iso-8859-1.inc.php @@ -69,8 +69,15 @@ $strBack = 'Back'; $strBaltic = 'Baltic'; $strBeginCut = 'BEGIN CUT'; $strBeginRaw = 'BEGIN RAW'; +$strBinLogEventType = 'Event type'; +$strBinLogInfo = 'Information'; +$strBinLogName = 'Log name'; +$strBinLogOriginalPosition = 'Original position'; +$strBinLogPosition = 'Position'; +$strBinLogServerId = 'Server ID'; $strBinary = 'Binary'; $strBinaryDoNotEdit = 'Binary - do not edit'; +$strBinaryLog = 'Binary log'; $strBookmarkAllUsers = 'Let every user access this bookmark'; $strBookmarkDeleted = 'The bookmark has been deleted.'; $strBookmarkLabel = 'Label'; @@ -131,6 +138,7 @@ $strConnections = 'Connections'; $strConstraintsForDumped = 'Constraints for dumped tables'; $strConstraintsForTable = 'Constraints for table'; $strCookiesRequired = 'Cookies must be enabled past this point.'; +$strCopyDatabaseOK = 'Database %s has been copied to %s'; $strCopyTable = 'Copy table to (database.table):'; $strCopyTableOK = 'Table %s has been copied to %s.'; $strCopyTableSameNames = 'Can\'t copy table to same one!'; @@ -150,6 +158,7 @@ $strCzech = 'Czech'; $strCzechSlovak = 'Czech-Slovak'; $strDBComment = 'Database comment: '; +$strDBCopy = 'Copy database to'; $strDBGContext = 'Context'; $strDBGContextID = 'Context ID'; $strDBGHits = 'Hits'; @@ -567,6 +576,7 @@ $strSearchType = 'Find:'; $strSecretRequired = 'The configuration file now needs a secret passphrase (blowfish_secret).'; $strSelectADb = 'Please select a database'; $strSelectAll = 'Select All'; +$strSelectBinaryLog = 'Select binary log to view'; $strSelectFields = 'Select fields (at least one):'; $strSelectNumRows = 'in query'; $strSelectTables = 'Select Tables'; @@ -722,12 +732,4 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; -$strBinLogName = 'Log name'; //to translate -$strBinLogPosition = 'Position'; //to translate -$strBinLogEventType = 'Event type'; //to translate -$strBinLogServerId = 'Server ID'; //to translate -$strBinLogOriginalPosition = 'Original position'; //to translate -$strBinLogInfo = 'Information'; //to translate -$strBinaryLog = 'Binary log'; //to translate -$strSelectBinaryLog = 'Select binary log to view'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 536c10149..8a6501b53 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -70,8 +70,15 @@ $strBack = 'Back'; $strBaltic = 'Baltic'; $strBeginCut = 'BEGIN CUT'; $strBeginRaw = 'BEGIN RAW'; +$strBinLogEventType = 'Event type'; +$strBinLogInfo = 'Information'; +$strBinLogName = 'Log name'; +$strBinLogOriginalPosition = 'Original position'; +$strBinLogPosition = 'Position'; +$strBinLogServerId = 'Server ID'; $strBinary = 'Binary'; $strBinaryDoNotEdit = 'Binary - do not edit'; +$strBinaryLog = 'Binary log'; $strBookmarkAllUsers = 'Let every user access this bookmark'; $strBookmarkDeleted = 'The bookmark has been deleted.'; $strBookmarkLabel = 'Label'; @@ -132,6 +139,7 @@ $strConnections = 'Connections'; $strConstraintsForDumped = 'Constraints for dumped tables'; $strConstraintsForTable = 'Constraints for table'; $strCookiesRequired = 'Cookies must be enabled past this point.'; +$strCopyDatabaseOK = 'Database %s has been copied to %s'; $strCopyTable = 'Copy table to (database.table):'; $strCopyTableOK = 'Table %s has been copied to %s.'; $strCopyTableSameNames = 'Can\'t copy table to same one!'; @@ -151,6 +159,7 @@ $strCzech = 'Czech'; $strCzechSlovak = 'Czech-Slovak'; $strDBComment = 'Database comment: '; +$strDBCopy = 'Copy database to'; $strDBGContext = 'Context'; $strDBGContextID = 'Context ID'; $strDBGHits = 'Hits'; @@ -568,6 +577,7 @@ $strSearchType = 'Find:'; $strSecretRequired = 'The configuration file now needs a secret passphrase (blowfish_secret).'; $strSelectADb = 'Please select a database'; $strSelectAll = 'Select All'; +$strSelectBinaryLog = 'Select binary log to view'; $strSelectFields = 'Select fields (at least one):'; $strSelectNumRows = 'in query'; $strSelectTables = 'Select Tables'; @@ -723,12 +733,4 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; -$strBinLogName = 'Log name'; //to translate -$strBinLogPosition = 'Position'; //to translate -$strBinLogEventType = 'Event type'; //to translate -$strBinLogServerId = 'Server ID'; //to translate -$strBinLogOriginalPosition = 'Original position'; //to translate -$strBinLogInfo = 'Information'; //to translate -$strBinaryLog = 'Binary log'; //to translate -$strSelectBinaryLog = 'Select binary log to view'; //to translate ?> diff --git a/lang/estonian-iso-8859-1.inc.php b/lang/estonian-iso-8859-1.inc.php index 8aa8a4496..181781bb5 100644 --- a/lang/estonian-iso-8859-1.inc.php +++ b/lang/estonian-iso-8859-1.inc.php @@ -730,4 +730,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 67b82a717..a5de86e74 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php b/lang/finnish-iso-8859-1.inc.php index b834ce8d1..200fa2e7d 100644 --- a/lang/finnish-iso-8859-1.inc.php +++ b/lang/finnish-iso-8859-1.inc.php @@ -755,4 +755,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 0d2761554..f8468be68 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -756,4 +756,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php b/lang/french-iso-8859-1.inc.php index 0b2c2e20b..0666fd471 100644 --- a/lang/french-iso-8859-1.inc.php +++ b/lang/french-iso-8859-1.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 2a937deb2..bd042275e 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -732,4 +732,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php b/lang/galician-iso-8859-1.inc.php index 75bc45728..e3a83949f 100644 --- a/lang/galician-iso-8859-1.inc.php +++ b/lang/galician-iso-8859-1.inc.php @@ -735,4 +735,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index e3db35453..124b35a95 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -736,4 +736,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index f963706c7..d1e0ac915 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -759,4 +759,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php b/lang/german-iso-8859-1.inc.php index de6e2fa32..315b639e2 100644 --- a/lang/german-iso-8859-1.inc.php +++ b/lang/german-iso-8859-1.inc.php @@ -738,4 +738,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 33e2a1ab9..495a8c418 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -739,4 +739,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/greek-iso-8859-7.inc.php b/lang/greek-iso-8859-7.inc.php index ef8f620ba..992a1f443 100644 --- a/lang/greek-iso-8859-7.inc.php +++ b/lang/greek-iso-8859-7.inc.php @@ -739,4 +739,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 753f623e0..332e9c9b8 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -740,4 +740,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php b/lang/hebrew-iso-8859-8-i.inc.php index 7c0186bbd..9c9fbe663 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php +++ b/lang/hebrew-iso-8859-8-i.inc.php @@ -755,4 +755,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 1ad2a14e9..c1225154f 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -756,4 +756,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index e313b55c5..b4d915e41 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -763,4 +763,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php b/lang/hungarian-iso-8859-2.inc.php index bbdda840a..bfea81ae7 100644 --- a/lang/hungarian-iso-8859-2.inc.php +++ b/lang/hungarian-iso-8859-2.inc.php @@ -737,4 +737,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 7ec1eb5bd..ea1ab4034 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -738,4 +738,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php b/lang/indonesian-iso-8859-1.inc.php index 83ba09753..bd009d638 100644 --- a/lang/indonesian-iso-8859-1.inc.php +++ b/lang/indonesian-iso-8859-1.inc.php @@ -730,4 +730,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 34bc885c2..8a4485b65 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php b/lang/italian-iso-8859-1.inc.php index 62b3bb760..d0535d880 100644 --- a/lang/italian-iso-8859-1.inc.php +++ b/lang/italian-iso-8859-1.inc.php @@ -735,4 +735,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 88e52f4d0..9d4a1864f 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -736,4 +736,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/japanese-euc.inc.php b/lang/japanese-euc.inc.php index f05709775..82332cd50 100644 --- a/lang/japanese-euc.inc.php +++ b/lang/japanese-euc.inc.php @@ -751,4 +751,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php index 32bc61bc1..9b7327e71 100644 --- a/lang/japanese-sjis.inc.php +++ b/lang/japanese-sjis.inc.php @@ -752,4 +752,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 55026ff77..5a0ef7f6f 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -752,4 +752,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/korean-euc-kr.inc.php b/lang/korean-euc-kr.inc.php index 2b50f545b..1391f64d9 100644 --- a/lang/korean-euc-kr.inc.php +++ b/lang/korean-euc-kr.inc.php @@ -753,4 +753,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index cc84300aa..789864085 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -754,4 +754,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index c7c819cc2..77a25cac4 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -737,4 +737,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php b/lang/latvian-windows-1257.inc.php index 6ad38e65c..0faee9ad2 100644 --- a/lang/latvian-windows-1257.inc.php +++ b/lang/latvian-windows-1257.inc.php @@ -736,4 +736,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 513d935e5..064a5b1c0 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php b/lang/lithuanian-windows-1257.inc.php index 75b7f1090..f2ffa5b25 100644 --- a/lang/lithuanian-windows-1257.inc.php +++ b/lang/lithuanian-windows-1257.inc.php @@ -730,4 +730,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php b/lang/malay-iso-8859-1.inc.php index e7f027b2b..b1afac5a4 100644 --- a/lang/malay-iso-8859-1.inc.php +++ b/lang/malay-iso-8859-1.inc.php @@ -754,4 +754,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index ee3a0eaca..7157a1031 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -755,4 +755,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php b/lang/norwegian-iso-8859-1.inc.php index 7c23273f4..172064f8d 100644 --- a/lang/norwegian-iso-8859-1.inc.php +++ b/lang/norwegian-iso-8859-1.inc.php @@ -734,4 +734,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 8d0ede579..a1cb09643 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -735,4 +735,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index c18c42c01..cd581b672 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -760,4 +760,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/persian-windows-1256.inc.php b/lang/persian-windows-1256.inc.php index d77228aa8..9d3909556 100644 --- a/lang/persian-windows-1256.inc.php +++ b/lang/persian-windows-1256.inc.php @@ -759,4 +759,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php b/lang/polish-iso-8859-2.inc.php index a6e3591f8..1da6bdabb 100644 --- a/lang/polish-iso-8859-2.inc.php +++ b/lang/polish-iso-8859-2.inc.php @@ -730,4 +730,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index ebd2cb03b..8fe650eff 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php b/lang/portuguese-iso-8859-1.inc.php index 2d0b58e66..5a6e17d12 100644 --- a/lang/portuguese-iso-8859-1.inc.php +++ b/lang/portuguese-iso-8859-1.inc.php @@ -750,4 +750,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index b1b0ae395..1988e4775 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -751,4 +751,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php b/lang/romanian-iso-8859-1.inc.php index 79c933061..bbced7074 100644 --- a/lang/romanian-iso-8859-1.inc.php +++ b/lang/romanian-iso-8859-1.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 876c7330d..e4acec87f 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -732,4 +732,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/russian-cp-866.inc.php b/lang/russian-cp-866.inc.php index e8c5196a1..88022ce29 100644 --- a/lang/russian-cp-866.inc.php +++ b/lang/russian-cp-866.inc.php @@ -738,4 +738,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php b/lang/russian-koi8-r.inc.php index b73ecb278..4079f2733 100644 --- a/lang/russian-koi8-r.inc.php +++ b/lang/russian-koi8-r.inc.php @@ -738,4 +738,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index c7cd59185..bdac30efd 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -739,4 +739,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php b/lang/russian-windows-1251.inc.php index 04aee28d9..bd66f2930 100644 --- a/lang/russian-windows-1251.inc.php +++ b/lang/russian-windows-1251.inc.php @@ -738,4 +738,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 00a8034ad..65bc00341 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -737,4 +737,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/serbian_cyrillic-windows-1251.inc.php b/lang/serbian_cyrillic-windows-1251.inc.php index 5d9553396..726b8cf77 100644 --- a/lang/serbian_cyrillic-windows-1251.inc.php +++ b/lang/serbian_cyrillic-windows-1251.inc.php @@ -736,4 +736,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 489b3441f..f68adc37d 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -737,4 +737,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/serbian_latin-windows-1250.inc.php b/lang/serbian_latin-windows-1250.inc.php index d1f1ba453..1c0ca05a0 100644 --- a/lang/serbian_latin-windows-1250.inc.php +++ b/lang/serbian_latin-windows-1250.inc.php @@ -736,4 +736,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php b/lang/slovak-iso-8859-2.inc.php index 7712922fb..760448df1 100644 --- a/lang/slovak-iso-8859-2.inc.php +++ b/lang/slovak-iso-8859-2.inc.php @@ -732,4 +732,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index fd2ee4cdb..52ce88a3d 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -733,4 +733,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php b/lang/slovak-windows-1250.inc.php index 37a3c987b..4799b5219 100644 --- a/lang/slovak-windows-1250.inc.php +++ b/lang/slovak-windows-1250.inc.php @@ -732,4 +732,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php b/lang/slovenian-iso-8859-2.inc.php index 24cc55e70..8ecfa9ac6 100644 --- a/lang/slovenian-iso-8859-2.inc.php +++ b/lang/slovenian-iso-8859-2.inc.php @@ -732,4 +732,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index bb6ee5abe..13e607bf9 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -733,4 +733,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php b/lang/slovenian-windows-1250.inc.php index 62a44c077..5a93bded7 100644 --- a/lang/slovenian-windows-1250.inc.php +++ b/lang/slovenian-windows-1250.inc.php @@ -732,4 +732,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php b/lang/spanish-iso-8859-1.inc.php index 2707754e2..8933627b9 100644 --- a/lang/spanish-iso-8859-1.inc.php +++ b/lang/spanish-iso-8859-1.inc.php @@ -730,4 +730,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 706cf3f15..6c5f2acff 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php b/lang/swedish-iso-8859-1.inc.php index 58cea2db3..6dd26d6bb 100644 --- a/lang/swedish-iso-8859-1.inc.php +++ b/lang/swedish-iso-8859-1.inc.php @@ -730,4 +730,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 0b0355bee..05dc2f0d3 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -731,4 +731,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php b/lang/thai-tis-620.inc.php index 075e8ec29..6fd19c048 100644 --- a/lang/thai-tis-620.inc.php +++ b/lang/thai-tis-620.inc.php @@ -755,4 +755,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 96e983331..3faa8786b 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -756,4 +756,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php b/lang/turkish-iso-8859-9.inc.php index 69171e9c8..ec1cf270e 100644 --- a/lang/turkish-iso-8859-9.inc.php +++ b/lang/turkish-iso-8859-9.inc.php @@ -744,4 +744,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 97b0a9d37..c8104f89d 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -745,4 +745,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index f37ef2644..3ab353f4a 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -736,4 +736,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php b/lang/ukrainian-windows-1251.inc.php index a94fab031..6518a2ed5 100644 --- a/lang/ukrainian-windows-1251.inc.php +++ b/lang/ukrainian-windows-1251.inc.php @@ -735,4 +735,6 @@ $strBinLogOriginalPosition = 'Original position'; //to translate $strBinLogInfo = 'Information'; //to translate $strBinaryLog = 'Binary log'; //to translate $strSelectBinaryLog = 'Select binary log to view'; //to translate +$strDBCopy = 'Copy database to'; //to translate +$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate ?> diff --git a/libraries/export/sql.php b/libraries/export/sql.php index eee7a5d46..fe169ce9b 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -9,7 +9,7 @@ error_reporting(E_ALL); /** * Marker for comments, -- is needed for ANSI SQL. */ -$comment_marker = '-- '; +$GLOBALS['comment_marker'] = '-- '; /** * Outputs comment diff --git a/libraries/tbl_move_copy.php b/libraries/tbl_move_copy.php new file mode 100644 index 000000000..39fea3f51 --- /dev/null +++ b/libraries/tbl_move_copy.php @@ -0,0 +1,351 @@ + 'FIELDVALUE')) + * @param array Which fields will be used as new VALUES. These are the important + * keys which differ from the old entry. + * (array('FIELDNAME' => 'NEW FIELDVALUE')) + + * @global string relation variable + * + * @author Garvin Hicking + */ +function PMA_duplicate_table_info($work, $pma_table, $get_fields, $where_fields, $new_fields) { + global $cfgRelation; + + $last_id = -1; + + if ($cfgRelation[$work]) { + $select_parts = array(); + $row_fields = array(); + foreach ($get_fields AS $nr => $get_field) { + $select_parts[] = PMA_backquote($get_field); + $row_fields[$get_field] = 'cc'; + } + + $where_parts = array(); + foreach ($where_fields AS $_where => $_value) { + $where_parts[] = PMA_backquote($_where) . ' = \'' . PMA_sqlAddslashes($_value) . '\''; + } + + $new_parts = array(); + $new_value_parts = array(); + foreach ($new_fields AS $_where => $_value) { + $new_parts[] = PMA_backquote($_where); + $new_value_parts[] = PMA_sqlAddslashes($_value); + } + + $table_copy_query = 'SELECT ' . implode(', ', $select_parts) + . ' FROM ' . PMA_backquote($cfgRelation[$pma_table]) + . ' WHERE ' . implode(' AND ', $where_parts); + $table_copy_rs = PMA_query_as_cu($table_copy_query); + + while ($table_copy_row = @PMA_DBI_fetch_assoc($table_copy_rs)) { + $value_parts = array(); + foreach ($table_copy_row AS $_key => $_val) { + if (isset($row_fields[$_key]) && $row_fields[$_key] == 'cc') { + $value_parts[] = PMA_sqlAddslashes($_val); + } + } + + $new_table_query = 'INSERT IGNORE INTO ' . PMA_backquote($cfgRelation[$pma_table]) + . ' (' . implode(', ', $select_parts) . ', ' . implode(', ', $new_parts) . ')' + . ' VALUES ' + . ' (\'' . implode('\', \'', $value_parts) . '\', \'' . implode('\', \'', $new_value_parts) . '\')'; + + $new_table_rs = PMA_query_as_cu($new_table_query); + $last_id = PMA_DBI_insert_id(); + } // end while + + return $last_id; + } + + return true; +} // end of 'PMA_duplicate_table_info()' function + + +/** + * Copies or renames table + * FIXME: use RENAME + * + * @author Michal ÄŚihaĹ™ + */ +function PMA_table_move_copy($source_db, $source_table, $target_db, $target_table, $what, $move) { + global $cfgRelation, $dblist, $err_url, $sql_query; + + // set export settings we need + $GLOBALS['use_backquotes'] = 1; + $GLOBALS['asfile'] = 1; + + // Ensure the target is valid + if (count($dblist) > 0 && + (PMA_isInto($source_db, $dblist) == -1 || PMA_isInto($target_db, $dblist) == -1)) { + exit(); + } + + $source = PMA_backquote($source_db) . '.' . PMA_backquote($source_table); + if (empty($target_db)) $target_db = $source_db; + + // This could avoid some problems with replicated databases, when + // moving table from replicated one to not replicated one + PMA_DBI_select_db($target_db); + + $target = PMA_backquote($target_db) . '.' . PMA_backquote($target_table); + + // do not create the table if dataonly + if ($what != 'dataonly') { + require_once('./libraries/export/sql.php'); + + $no_constraints_comments = true; + $sql_structure = PMA_getTableDef($source_db, $source_table, "\n", $err_url); + unset($no_constraints_comments); + + $parsed_sql = PMA_SQP_parse($sql_structure); + + /* nijel: Find table name in query and replace it */ + $i = 0; + while ($parsed_sql[$i]['type'] != 'quote_backtick') $i++; + + /* no need to PMA_backquote() */ + $parsed_sql[$i]['data'] = $target; + + /* Generate query back */ + $sql_structure = PMA_SQP_formatHtml($parsed_sql, 'query_only'); + // If table exists, and 'add drop table' is selected: Drop it! + $drop_query = ''; + if (isset($GLOBALS['drop_if_exists']) && $GLOBALS['drop_if_exists'] == 'true') { + $drop_query = 'DROP TABLE IF EXISTS ' . PMA_backquote($target_db) . '.' . PMA_backquote($target_table); + $result = PMA_DBI_query($drop_query); + + if (isset($sql_query)) { + $sql_query .= "\n" . $drop_query . ';'; + } else { + $sql_query = $drop_query . ';'; + } + + // garvin: If an existing table gets deleted, maintain any entries + // for the PMA_* tables + $maintain_relations = TRUE; + } + + $result = @PMA_DBI_query($sql_structure); + if (isset($sql_query)) { + $sql_query .= "\n" . $sql_structure . ';'; + } else { + $sql_query = $sql_structure . ';'; + } + + if (($move || isset($GLOBALS['constraints'])) && isset($sql_constraints)) { + $parsed_sql = PMA_SQP_parse($sql_constraints); + + $i = 0; + while ($parsed_sql[$i]['type'] != 'quote_backtick') $i++; + + /* no need to PMA_backquote() */ + $parsed_sql[$i]['data'] = $target; + + /* Generate query back */ + $sql_constraints = PMA_SQP_formatHtml($parsed_sql, 'query_only'); + $result = PMA_DBI_query($sql_constraints); + if (isset($sql_query)) { + $sql_query .= "\n" . $sql_constraints; + } else { + $sql_query = $sql_constraints; + } + } + + } else { + $sql_query=''; + } + + // Copy the data + //if ($result != FALSE && ($what == 'data' || $what == 'dataonly')) { + if ($what == 'data' || $what == 'dataonly') { + $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source; + PMA_DBI_query($sql_insert_data); + $sql_query .= "\n\n" . $sql_insert_data . ';'; + } + + require_once('./libraries/relation.lib.php'); + $cfgRelation = PMA_getRelationsParam(); + + // Drops old table if the user has requested to move it + if ($move) { + + // This could avoid some problems with replicated databases, when + // moving table from replicated one to not replicated one + PMA_DBI_select_db($source_db); + + $sql_drop_table = 'DROP TABLE ' . $source; + PMA_DBI_query($sql_drop_table); + + // garvin: Move old entries from PMA-DBs to new table + if ($cfgRelation['commwork']) { + $remove_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_info']) + . ' SET table_name = \'' . PMA_sqlAddslashes($target_table) . '\', ' + . ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\''; + $rmv_rs = PMA_query_as_cu($remove_query); + unset($rmv_query); + } + + // garvin: updating bookmarks is not possible since only a single table is moved, + // and not the whole DB. + // if ($cfgRelation['bookmarkwork']) { + // $remove_query = 'UPDATE ' . PMA_backquote($cfgRelation['bookmark']) + // . ' SET dbase = \'' . PMA_sqlAddslashes($target_db) . '\'' + // . ' WHERE dbase = \'' . PMA_sqlAddslashes($source_db) . '\''; + // $rmv_rs = PMA_query_as_cu($remove_query); + // unset($rmv_query); + // } + + if ($cfgRelation['displaywork']) { + $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['table_info']) + . ' SET db_name = \'' . PMA_sqlAddslashes($target_db) . '\', ' + . ' table_name = \'' . PMA_sqlAddslashes($target_table) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\''; + $tb_rs = PMA_query_as_cu($table_query); + unset($table_query); + unset($tb_rs); + } + + if ($cfgRelation['relwork']) { + $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['relation']) + . ' SET foreign_table = \'' . PMA_sqlAddslashes($target_table) . '\',' + . ' foreign_db = \'' . PMA_sqlAddslashes($target_db) . '\'' + . ' WHERE foreign_db = \'' . PMA_sqlAddslashes($source_db) . '\'' + . ' AND foreign_table = \'' . PMA_sqlAddslashes($source_table) . '\''; + $tb_rs = PMA_query_as_cu($table_query); + unset($table_query); + unset($tb_rs); + + $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['relation']) + . ' SET master_table = \'' . PMA_sqlAddslashes($target_table) . '\',' + . ' master_db = \'' . PMA_sqlAddslashes($target_db) . '\'' + . ' WHERE master_db = \'' . PMA_sqlAddslashes($source_db) . '\'' + . ' AND master_table = \'' . PMA_sqlAddslashes($source_table) . '\''; + $tb_rs = PMA_query_as_cu($table_query); + unset($table_query); + unset($tb_rs); + } + + // garvin: [TODO] Can't get moving PDFs the right way. The page numbers always + // get screwed up independently from duplication because the numbers do not + // seem to be stored on a per-database basis. Would the author of pdf support + // please have a look at it? + + if ($cfgRelation['pdfwork']) { + $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['table_coords']) + . ' SET table_name = \'' . PMA_sqlAddslashes($target_table) . '\',' + . ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\''; + $tb_rs = PMA_query_as_cu($table_query); + unset($table_query); + unset($tb_rs); + /* + $pdf_query = 'SELECT pdf_page_number ' + . ' FROM ' . PMA_backquote($cfgRelation['table_coords']) + . ' WHERE db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddslashes($target_table) . '\''; + $pdf_rs = PMA_query_as_cu($pdf_query); + + while ($pdf_copy_row = PMA_DBI_fetch_assoc($pdf_rs)) { + $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['pdf_pages']) + . ' SET db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\'' + . ' AND page_nr = \'' . PMA_sqlAddslashes($pdf_copy_row['pdf_page_number']) . '\''; + $tb_rs = PMA_query_as_cu($table_query); + unset($table_query); + unset($tb_rs); + } + */ + } + + $sql_query .= "\n\n" . $sql_drop_table . ';'; + } else { + // garvin: Create new entries as duplicates from old PMA DBs + if ($what != 'dataonly' && !isset($maintain_relations)) { + if ($cfgRelation['commwork']) { + // Get all comments and MIME-Types for current table + $comments_copy_query = 'SELECT + column_name, ' . PMA_backquote('comment') . ($cfgRelation['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ' + FROM ' . PMA_backquote($cfgRelation['column_info']) . ' + WHERE + db_name = \'' . PMA_sqlAddslashes($source_db) . '\' AND + table_name = \'' . PMA_sqlAddslashes($source_table) . '\''; + $comments_copy_rs = PMA_query_as_cu($comments_copy_query); + + // Write every comment as new copied entry. [MIME] + while ($comments_copy_row = PMA_DBI_fetch_assoc($comments_copy_rs)) { + $new_comment_query = 'REPLACE INTO ' . PMA_backquote($cfgRelation['column_info']) + . ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ($cfgRelation['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ') ' + . ' VALUES(' + . '\'' . PMA_sqlAddslashes($target_db) . '\',' + . '\'' . PMA_sqlAddslashes($target_table) . '\',' + . '\'' . PMA_sqlAddslashes($comments_copy_row['column_name']) . '\'' + . ($cfgRelation['mimework'] ? ',\'' . PMA_sqlAddslashes($comments_copy_row['comment']) . '\',' + . '\'' . PMA_sqlAddslashes($comments_copy_row['mimetype']) . '\',' + . '\'' . PMA_sqlAddslashes($comments_copy_row['transformation']) . '\',' + . '\'' . PMA_sqlAddslashes($comments_copy_row['transformation_options']) . '\'' : '') + . ')'; + $new_comment_rs = PMA_query_as_cu($new_comment_query); + } // end while + } + + if ($source_db != $target_db) { + $get_fields = array('user','label','query'); + $where_fields = array('dbase' => $source_db); + $new_fields = array('dbase' => $target_db); + PMA_duplicate_table_info('bookmarkwork', 'bookmark', $get_fields, $where_fields, $new_fields); + } + + $get_fields = array('display_field'); + $where_fields = array('db_name' => $source_db, 'table_name' => $source_table); + $new_fields = array('db_name' => $target_db, 'table_name' => $target_table); + PMA_duplicate_table_info('displaywork', 'table_info', $get_fields, $where_fields, $new_fields); + + $get_fields = array('master_field', 'foreign_db', 'foreign_table', 'foreign_field'); + $where_fields = array('master_db' => $source_db, 'master_table' => $source_table); + $new_fields = array('master_db' => $target_db, 'master_table' => $target_table); + PMA_duplicate_table_info('relwork', 'relation', $get_fields, $where_fields, $new_fields); + + $get_fields = array('foreign_field', 'master_db', 'master_table', 'master_field'); + $where_fields = array('foreign_db' => $source_db, 'foreign_table' => $source_table); + $new_fields = array('foreign_db' => $target_db, 'foreign_table' => $target_table); + PMA_duplicate_table_info('relwork', 'relation', $get_fields, $where_fields, $new_fields); + + // garvin: [TODO] Can't get duplicating PDFs the right way. The page numbers always + // get screwed up independently from duplication because the numbers do not + // seem to be stored on a per-database basis. Would the author of pdf support + // please have a look at it? + /* + $get_fields = array('page_descr'); + $where_fields = array('db_name' => $source_db); + $new_fields = array('db_name' => $target_db); + $last_id = PMA_duplicate_table_info('pdfwork', 'pdf_pages', $get_fields, $where_fields, $new_fields); + + if (isset($last_id) && $last_id >= 0) { + $get_fields = array('x', 'y'); + $where_fields = array('db_name' => $source_db, 'table_name' => $source_table); + $new_fields = array('db_name' => $target_db, 'table_name' => $target_table, 'pdf_page_number' => $last_id); + PMA_duplicate_table_info('pdfwork', 'table_coords', $get_fields, $where_fields, $new_fields); + } + */ + } + } + +} +?> diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 93342b47a..594ce3081 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -2,90 +2,17 @@ /* $Id$ */ // vim: expandtab sw=4 ts=4 sts=4: -// Check parameters - -require_once('./libraries/grab_globals.lib.php'); -require_once('./libraries/common.lib.php'); - -PMA_checkParameters(array('db', 'table')); - -/** - * Inserts existing entries in a PMA_* table by reading a value from an old entry - * - * @param string The array index, which Relation feature to check - * ('relwork', 'commwork', ...) - * @param string The array index, which PMA-table to update - * ('bookmark', 'relation', ...) - * @param array Which fields will be SELECT'ed from the old entry - * @param array Which fields will be used for the WHERE query - * (array('FIELDNAME' => 'FIELDVALUE')) - * @param array Which fields will be used as new VALUES. These are the important - * keys which differ from the old entry. - * (array('FIELDNAME' => 'NEW FIELDVALUE')) - - * @global string relation variable - * - * @author Garvin Hicking - */ -function PMA_duplicate_table($work, $pma_table, $get_fields, $where_fields, $new_fields) { -global $cfgRelation; - - $last_id = -1; - - if ($cfgRelation[$work]) { - $select_parts = array(); - $row_fields = array(); - foreach ($get_fields AS $nr => $get_field) { - $select_parts[] = PMA_backquote($get_field); - $row_fields[$get_field] = 'cc'; - } - - $where_parts = array(); - foreach ($where_fields AS $_where => $_value) { - $where_parts[] = PMA_backquote($_where) . ' = \'' . PMA_sqlAddslashes($_value) . '\''; - } - - $new_parts = array(); - $new_value_parts = array(); - foreach ($new_fields AS $_where => $_value) { - $new_parts[] = PMA_backquote($_where); - $new_value_parts[] = PMA_sqlAddslashes($_value); - } - - $table_copy_query = 'SELECT ' . implode(', ', $select_parts) - . ' FROM ' . PMA_backquote($cfgRelation[$pma_table]) - . ' WHERE ' . implode(' AND ', $where_parts); - $table_copy_rs = PMA_query_as_cu($table_copy_query); - - while ($table_copy_row = @PMA_DBI_fetch_assoc($table_copy_rs)) { - $value_parts = array(); - foreach ($table_copy_row AS $_key => $_val) { - if (isset($row_fields[$_key]) && $row_fields[$_key] == 'cc') { - $value_parts[] = PMA_sqlAddslashes($_val); - } - } - - $new_table_query = 'INSERT IGNORE INTO ' . PMA_backquote($cfgRelation[$pma_table]) - . ' (' . implode(', ', $select_parts) . ', ' . implode(', ', $new_parts) . ')' - . ' VALUES ' - . ' (\'' . implode('\', \'', $value_parts) . '\', \'' . implode('\', \'', $new_value_parts) . '\')'; - - $new_table_rs = PMA_query_as_cu($new_table_query); - $last_id = PMA_DBI_insert_id(); - } // end while - - return $last_id; - } - - return true; -} // end of 'PMA_duplicate_table()' function - /** * Gets some core libraries */ require_once('./libraries/grab_globals.lib.php'); require_once('./libraries/common.lib.php'); +// Check parameters + +PMA_checkParameters(array('db', 'table')); + +require_once('./libraries/tbl_move_copy.php'); /** * Defines the url to return to in case of error in a sql statement @@ -102,276 +29,14 @@ PMA_DBI_select_db($db); * A target table name has been sent to this script -> do the work */ if (isset($new_name) && trim($new_name) != '') { - $use_backquotes = 1; - $asfile = 1; - - // Ensure the target is valid - if (count($dblist) > 0 && - (PMA_isInto($db, $dblist) == -1 || PMA_isInto($target_db, $dblist) == -1)) { - exit(); - } - - if ($db == $target_db && $new_name == $table) { + if ($db == $target_db && $table == $new_name) { $message = (isset($submit_move) ? $strMoveTableSameNames : $strCopyTableSameNames); } else { - $source = PMA_backquote($db) . '.' . PMA_backquote($table); - if (empty($target_db)) $target_db = $db; - - // This could avoid some problems with replicated databases, when - // moving table from replicated one to not replicated one - PMA_DBI_select_db($target_db); - - $target = PMA_backquote($target_db) . '.' . PMA_backquote($new_name); - - // do not create the table if dataonly - if ($what != 'dataonly') { - require('./libraries/export/sql.php'); - - $no_constraints_comments = true; - $sql_structure = PMA_getTableDef($db, $table, "\n", $err_url); - unset($no_constraints_comments); - - $parsed_sql = PMA_SQP_parse($sql_structure); - - /* nijel: Find table name in query and replace it */ - $i = 0; - while ($parsed_sql[$i]['type'] != 'quote_backtick') $i++; - - /* no need to PMA_backquote() */ - $parsed_sql[$i]['data'] = $target; - - /* Generate query back */ - $sql_structure = PMA_SQP_formatHtml($parsed_sql, 'query_only'); - // If table exists, and 'add drop table' is selected: Drop it! - $drop_query = ''; - if (isset($drop_if_exists) && $drop_if_exists == 'true') { - $drop_query = 'DROP TABLE IF EXISTS ' . PMA_backquote($target_db) . '.' . PMA_backquote($new_name); - $result = PMA_DBI_query($drop_query); - - if (isset($sql_query)) { - $sql_query .= "\n" . $drop_query . ';'; - } else { - $sql_query = $drop_query . ';'; - } - - // garvin: If an existing table gets deleted, maintain any entries - // for the PMA_* tables - $maintain_relations = TRUE; - } - - $result = @PMA_DBI_query($sql_structure); - if (isset($sql_query)) { - $sql_query .= "\n" . $sql_structure . ';'; - } else { - $sql_query = $sql_structure . ';'; - } - - if ((isset($submit_move) || isset($constraints)) && isset($sql_constraints)) { - $parsed_sql = PMA_SQP_parse($sql_constraints); - - $i = 0; - while ($parsed_sql[$i]['type'] != 'quote_backtick') $i++; - - /* no need to PMA_backquote() */ - $parsed_sql[$i]['data'] = $target; - - /* Generate query back */ - $sql_constraints = PMA_SQP_formatHtml($parsed_sql, 'query_only'); - $result = PMA_DBI_query($sql_constraints); - if (isset($sql_query)) { - $sql_query .= "\n" . $sql_constraints; - } else { - $sql_query = $sql_constraints; - } - } - - } else { - $sql_query=''; - } - - // Copy the data - //if ($result != FALSE && ($what == 'data' || $what == 'dataonly')) { - if ($what == 'data' || $what == 'dataonly') { - $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source; - PMA_DBI_query($sql_insert_data); - $sql_query .= "\n\n" . $sql_insert_data . ';'; - } - - require_once('./libraries/relation.lib.php'); - $cfgRelation = PMA_getRelationsParam(); - - // Drops old table if the user has requested to move it - if (isset($submit_move)) { - - // This could avoid some problems with replicated databases, when - // moving table from replicated one to not replicated one - PMA_DBI_select_db($db); - - $sql_drop_table = 'DROP TABLE ' . $source; - PMA_DBI_query($sql_drop_table); - - // garvin: Move old entries from PMA-DBs to new table - if ($cfgRelation['commwork']) { - $remove_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_info']) - . ' SET table_name = \'' . PMA_sqlAddslashes($new_name) . '\', ' - . ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; - $rmv_rs = PMA_query_as_cu($remove_query); - unset($rmv_query); - } - - // garvin: updating bookmarks is not possible since only a single table is moved, - // and not the whole DB. - // if ($cfgRelation['bookmarkwork']) { - // $remove_query = 'UPDATE ' . PMA_backquote($cfgRelation['bookmark']) - // . ' SET dbase = \'' . PMA_sqlAddslashes($target_db) . '\'' - // . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''; - // $rmv_rs = PMA_query_as_cu($remove_query); - // unset($rmv_query); - // } - - if ($cfgRelation['displaywork']) { - $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['table_info']) - . ' SET db_name = \'' . PMA_sqlAddslashes($target_db) . '\', ' - . ' table_name = \'' . PMA_sqlAddslashes($new_name) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; - $tb_rs = PMA_query_as_cu($table_query); - unset($table_query); - unset($tb_rs); - } - - if ($cfgRelation['relwork']) { - $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['relation']) - . ' SET foreign_table = \'' . PMA_sqlAddslashes($new_name) . '\',' - . ' foreign_db = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND foreign_table = \'' . PMA_sqlAddslashes($table) . '\''; - $tb_rs = PMA_query_as_cu($table_query); - unset($table_query); - unset($tb_rs); - - $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['relation']) - . ' SET master_table = \'' . PMA_sqlAddslashes($new_name) . '\',' - . ' master_db = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\''; - $tb_rs = PMA_query_as_cu($table_query); - unset($table_query); - unset($tb_rs); - } - - // garvin: [TODO] Can't get moving PDFs the right way. The page numbers always - // get screwed up independently from duplication because the numbers do not - // seem to be stored on a per-database basis. Would the author of pdf support - // please have a look at it? - - if ($cfgRelation['pdfwork']) { - $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['table_coords']) - . ' SET table_name = \'' . PMA_sqlAddslashes($new_name) . '\',' - . ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; - $tb_rs = PMA_query_as_cu($table_query); - unset($table_query); - unset($tb_rs); - /* - $pdf_query = 'SELECT pdf_page_number ' - . ' FROM ' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($new_name) . '\''; - $pdf_rs = PMA_query_as_cu($pdf_query); - - while ($pdf_copy_row = PMA_DBI_fetch_assoc($pdf_rs)) { - $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['pdf_pages']) - . ' SET db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND page_nr = \'' . PMA_sqlAddslashes($pdf_copy_row['pdf_page_number']) . '\''; - $tb_rs = PMA_query_as_cu($table_query); - unset($table_query); - unset($tb_rs); - } - */ - } - - $sql_query .= "\n\n" . $sql_drop_table . ';'; - } else { - // garvin: Create new entries as duplicates from old PMA DBs - if ($what != 'dataonly' && !isset($maintain_relations)) { - if ($cfgRelation['commwork']) { - // Get all comments and MIME-Types for current table - $comments_copy_query = 'SELECT - column_name, ' . PMA_backquote('comment') . ($cfgRelation['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ' - FROM ' . PMA_backquote($cfgRelation['column_info']) . ' - WHERE - db_name = \'' . PMA_sqlAddslashes($db) . '\' AND - table_name = \'' . PMA_sqlAddslashes($table) . '\''; - $comments_copy_rs = PMA_query_as_cu($comments_copy_query); - - // Write every comment as new copied entry. [MIME] - while ($comments_copy_row = PMA_DBI_fetch_assoc($comments_copy_rs)) { - $new_comment_query = 'REPLACE INTO ' . PMA_backquote($cfgRelation['column_info']) - . ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ($cfgRelation['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ') ' - . ' VALUES(' - . '\'' . PMA_sqlAddslashes($target_db) . '\',' - . '\'' . PMA_sqlAddslashes($new_name) . '\',' - . '\'' . PMA_sqlAddslashes($comments_copy_row['column_name']) . '\'' - . ($cfgRelation['mimework'] ? ',\'' . PMA_sqlAddslashes($comments_copy_row['comment']) . '\',' - . '\'' . PMA_sqlAddslashes($comments_copy_row['mimetype']) . '\',' - . '\'' . PMA_sqlAddslashes($comments_copy_row['transformation']) . '\',' - . '\'' . PMA_sqlAddslashes($comments_copy_row['transformation_options']) . '\'' : '') - . ')'; - $new_comment_rs = PMA_query_as_cu($new_comment_query); - } // end while - } - - if ($db != $target_db) { - $get_fields = array('user','label','query'); - $where_fields = array('dbase' => $db); - $new_fields = array('dbase' => $target_db); - PMA_duplicate_table('bookmarkwork', 'bookmark', $get_fields, $where_fields, $new_fields); - } - - $get_fields = array('display_field'); - $where_fields = array('db_name' => $db, 'table_name' => $table); - $new_fields = array('db_name' => $target_db, 'table_name' => $new_name); - PMA_duplicate_table('displaywork', 'table_info', $get_fields, $where_fields, $new_fields); - - $get_fields = array('master_field', 'foreign_db', 'foreign_table', 'foreign_field'); - $where_fields = array('master_db' => $db, 'master_table' => $table); - $new_fields = array('master_db' => $target_db, 'master_table' => $new_name); - PMA_duplicate_table('relwork', 'relation', $get_fields, $where_fields, $new_fields); - - $get_fields = array('foreign_field', 'master_db', 'master_table', 'master_field'); - $where_fields = array('foreign_db' => $db, 'foreign_table' => $table); - $new_fields = array('foreign_db' => $target_db, 'foreign_table' => $new_name); - PMA_duplicate_table('relwork', 'relation', $get_fields, $where_fields, $new_fields); - - // garvin: [TODO] Can't get duplicating PDFs the right way. The page numbers always - // get screwed up independently from duplication because the numbers do not - // seem to be stored on a per-database basis. Would the author of pdf support - // please have a look at it? - /* - $get_fields = array('page_descr'); - $where_fields = array('db_name' => $db); - $new_fields = array('db_name' => $target_db); - $last_id = PMA_duplicate_table('pdfwork', 'pdf_pages', $get_fields, $where_fields, $new_fields); - - if (isset($last_id) && $last_id >= 0) { - $get_fields = array('x', 'y'); - $where_fields = array('db_name' => $db, 'table_name' => $table); - $new_fields = array('db_name' => $target_db, 'table_name' => $new_name, 'pdf_page_number' => $last_id); - PMA_duplicate_table('pdfwork', 'table_coords', $get_fields, $where_fields, $new_fields); - } - */ - } - } - - $message = (isset($submit_move) ? $strMoveTableOK : $strCopyTableOK); - $message = sprintf($message, htmlspecialchars($source), htmlspecialchars($target)); - $reload = 1; + PMA_table_move_copy($db, $table, $target_db, $new_name, $what, isset($submit_move)); $js_to_run = 'functions.js'; + $message = (isset($submit_move) ? $strMoveTableOK : $strCopyTableOK); + $message = sprintf($message, htmlspecialchars($table), htmlspecialchars($new_name)); + $reload = 1; /* Check: Work on new table or on old table? */ if (isset($submit_move)) { $db = $target_db; @@ -380,11 +45,10 @@ if (isset($new_name) && trim($new_name) != '') { $pma_uri_parts = parse_url($cfg['PmaAbsoluteUri']); if (isset($switch_to_new) && $switch_to_new == 'true') { setcookie('pma_switch_to_new', 'true', 0, substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')), '', ($pma_uri_parts['scheme'] == 'https')); - $db = $target_db; - $table = $new_name; + $db = $target_db; + $table = $new_name; } else { setcookie('pma_switch_to_new', '', 0, substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')), '', ($pma_uri_parts['scheme'] == 'https')); - // garvin:Keep original table for work. } } }