Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php

ChangeLog

@@ -85,6 +85,15 @@ $Id$
 - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
 - patch #3025161 [core] Prevent sending of unnecessary cookies, 
   thanks to Piotr Przybylski  - crackpl
+- bug [password] Generate password only available if JS is enabled
+  (fixed for Privileges and Change password)
+- [core] RecodingEngine now accepts none as valid option.
++ [core] Dropped AllowAnywhereRecoding configuration variable.
+- rfe #3016457 [interface] Define tab order in SQL form to allow easier tab
+  navigation.
+
+3.3.6.0 (not yet released)
+- bug #3031705 [core] Do not use CONCAT for DECIMAL fields.
 
 3.3.5.0 (not yet released)
 - patch #2932113 [information_schema] Slow export when having lots of

Documentation.html

@@ -1683,27 +1683,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         expression. For example if you want only Czech and English, you should
         set filter to <code>'^(cs|en)'</code>.</dd>
 
-    <dt id="cfg_DefaultCharset">$cfg['DefaultCharset'] string</dt>
-    <dd>Default character set to use for recoding of MySQL queries. This must be
-        enabled and it's described by
-        <a href="#cfg_AllowAnywhereRecoding" class="configrule">$cfg['AllowAnywhereRecoding']</a>
-        option.<br />
-        You can give here any character set which is in
-        <a href="#cfg_AvailableCharsets" class="configrule">$cfg['AvailableCharsets']</a>
-        array and this is just default choice, user can select any of them.</dd>
-
-    <dt id="cfg_AllowAnywhereRecoding">$cfg['AllowAnywhereRecoding'] boolean</dt>
-    <dd>Allow character set recoding of MySQL queries. You need recode or iconv
-        support (compiled in or module) in PHP to allow MySQL queries recoding
-        and used language file must have it enabled (by default only these
-        which are in Unicode, just to avoid losing some characters).<br /><br />
-
-        Setting this to <tt>TRUE</tt> also activates a pull-down menu
-        in the Export and Import pages, to choose the character set when 
-        exporting a file. The default value in this menu comes from 
-        <tt>$cfg['Export']['charset']</tt> and <tt>$cfg['Import']['charset']</tt>.
-    </dd>
-
     <dt id="cfg_RecodingEngine">$cfg['RecodingEngine'] string</dt>
     <dd>You can select here which functions will be used for character set
         conversion. Possible values are:
@@ -1711,8 +1690,15 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
                 iconv, then recode)</li>
             <li>iconv  - use iconv or libiconv functions</li>
             <li>recode - use recode_string function</li>
+            <li>none - disable encoding conversion</li>
         </ul>
         Default is auto.</dd>
+    <dd>
+        Enabled charset conversion activates a pull-down menu
+        in the Export and Import pages, to choose the character set when 
+        exporting a file. The default value in this menu comes from 
+        <tt>$cfg['Export']['charset']</tt> and <tt>$cfg['Import']['charset']</tt>.
+        </dd>
 
     <dt id="cfg_IconvExtraParams">$cfg['IconvExtraParams'] string</dt>
     <dd>Specify some parameters for iconv used in charset conversion. See
@@ -1867,7 +1853,7 @@ $cfg['TrustedProxies'] =
         editing.</dd>
 
     <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt>
-    <dd>Maximum number of characters showen in any non-numeric column on browse view.
+    <dd>Maximum number of characters shown in any non-numeric field on browse view.
         Can be turned off by a toggle button on the browse page.</dd>
 
     <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean

browse_foreigners.php

@@ -3,7 +3,6 @@
 /**
  * display selection for relational field values
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

bs_change_mime_type.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
     /**
-     * @version     1.0
      * @package     BLOBStreaming
      */
 

bs_disp_as_mime_type.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version     1.0
  * @package     BLOBStreaming
  */
 

bs_play_media.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
     /**
-     * @version     1.0
      * @package     BLOBStreaming
      */
 

changelog.php

@@ -3,7 +3,6 @@
 /**
  * Simple script to set correct charset for changelog
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

chk_rel.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

db_create.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

db_datadict.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

db_export.php

@@ -3,7 +3,6 @@
 /**
  * dumps a database
  *
- * @version $Id$
  * @uses    libraries/db_common.inc.php
  * @uses    libraries/db_info.inc.php
  * @uses    libraries/display_export.lib.php

db_import.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

db_operations.php

@@ -9,7 +9,6 @@
  *  - adding tables
  *  - viewing PDF schemas
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

db_printview.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

db_qbe.php

@@ -3,7 +3,6 @@
 /**
  * query by example the whole database
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

db_search.php

@@ -7,23 +7,6 @@
  * @todo    display executed query, optional?
  * @uses    $cfg['UseDbSearch']
  * @uses    $GLOBALS['db']
- * @uses    __('Access denied') 
- * @uses    __('at least one of the words') 
- * @uses    __('all words') 
- * @uses    __('the exact phrase') 
- * @uses    __('as regular expression') 
- * @uses    __('Search results for "<i>%s</i>" %s:') 
- * @uses    __('%s match(es) inside table <i>%s</i>') 
- * @uses    __('Browse')
- * @uses    __('Delete')
- * @uses    __('<b>Total:</b> <i>%s</i> match(es)') 
- * @uses    __('Search in database') 
- * @uses    __('Word(s) or value(s) to search for (wildcard: "%"):') 
- * @uses    __('Find:') 
- * @uses    __('Words are separated by a space character (" ").') 
- * @uses    __('Inside table(s):') 
- * @uses    __('Unselect All')
- * @uses    __('Select All') 
  * @uses    PMA_DBI_get_tables()
  * @uses    PMA_sqlAddslashes()
  * @uses    PMA_getSearchSqls()
@@ -46,7 +29,6 @@
  * @uses    array_intersect()
  * @uses    sprintf()
  * @uses    in_array()
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -257,7 +239,7 @@ if (isset($_REQUEST['submit_search'])) {
         $sql_query .= $newsearchsqls['select_count'];
 
         echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
-            .'<td>' . sprintf(__('%s match(es) inside table <i>%s</i>'), $res_cnt,
+            .'<td>' . sprintf(_ngettext('%s match inside table <i>%s</i>', '%s matches inside table <i>%s</i>', $res_cnt), $res_cnt,
                 htmlspecialchars($each_table)) . "</td>\n";
 
         if ($res_cnt > 0) {
@@ -282,7 +264,7 @@ if (isset($_REQUEST['submit_search'])) {
     echo '</table>' . "\n";
 
     if (count($tables_selected) > 1) {
-        echo '<p>' . sprintf(__('<b>Total:</b> <i>%s</i> match(es)'),
+        echo '<p>' . sprintf(_ngettext('<b>Total:</b> <i>%s</i> match', '<b>Total:</b> <i>%s</i> matches', $num_search_result_total),
             $num_search_result_total) . '</p>' . "\n";
     }
 } // end 1.

db_sql.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

db_structure.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

db_tracking.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin
  */
 

error.php

@@ -3,7 +3,6 @@
 /**
  * phpMyAdmin fatal error display page
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

export.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @todo    too much die here, or?
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -219,7 +218,7 @@ if ($what == 'sql') {
 $output_kanji_conversion = function_exists('PMA_kanji_str_conv') && $type != 'xls';
 
 // Do we need to convert charset?
-$output_charset_conversion = $asfile && $cfg['AllowAnywhereRecoding']
+$output_charset_conversion = $asfile && $GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE
     && isset($charset_of_file) && $charset_of_file != $charset
     && $type != 'xls';
 
@@ -274,11 +273,7 @@ if ($asfile) {
     }
 
     // convert filename to iso-8859-1, it is safer
-    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )) {
     $filename = PMA_convert_string($charset, 'iso-8859-1', $filename);
-    } else {
-        $filename = PMA_convert_string($convcharset, 'iso-8859-1', $filename);
-    }
 
     // Grab basic dump extension and mime type
     $filename  .= '.' . $export_list[$type]['extension'];

import.php

@@ -4,7 +4,6 @@
  * Core script for import, this is just the glue around all other stuff
  *
  * @uses    PMA_Bookmark_getList()
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -343,7 +342,7 @@ if ($import_file != 'none' && !$error) {
 //$_SESSION['Import_message'] = $message->getDisplay();
 
 // Convert the file's charset if necessary
-if ($cfg['AllowAnywhereRecoding'] && isset($charset_of_file)) {
+if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE && isset($charset_of_file)) {
     if ($charset_of_file != $charset) {
         $charset_conversion = TRUE;
     }

import_status.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

index.php

@@ -3,8 +3,6 @@
 /**
  * forms frameset
  *
- * @version $Id$
- * @uses    __('phpMyAdmin is more friendly with a <b>frames-capable</b> browser.')
  * @uses    $GLOBALS['cfg']['QueryHistoryDB']
  * @uses    $GLOBALS['cfg']['Server']['user']
  * @uses    $GLOBALS['cfg']['DefaultTabServer']     as src for the mainframe
@@ -63,7 +61,7 @@ unset($cfgRelation);
 /**
  * pass variables to child pages
  */
-$drops = array('lang', 'server', 'convcharset', 'collation_connection',
+$drops = array('lang', 'server', 'collation_connection',
     'db', 'table');
 
 foreach ($drops as $each_drop) {

js/functions.js

@@ -1725,6 +1725,7 @@ $(document).ready(function(){
         insertQuery(evt.target.id);
         return false;
     });
+    $('#sqlquery').focus();
 });
 
 /**

js/messages.php

@@ -62,6 +62,10 @@ $js_messages['strSelectForeignKey'] = __('Select Foreign Key');
 $js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key');
 $js_messages['strChangeDisplay'] = __('Choose column to display');
 
+/* password generation */
+$js_messages['strGeneratePassword'] = __('Generate password');
+$js_messages['strGenerate'] = __('Generate');
+
 echo "var PMA_messages = new Array();\n";
 foreach ($js_messages as $name => $js_message) {
     PMA_printJsValue("PMA_messages['" . $name . "']", $js_message);

js/password_generation.js

@@ -0,0 +1,10 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * for libraries/display_change_password.lib.php 
+ *
+ */
+
+$(document).ready(function() {
+    $('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
+    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
+});

libraries/Config.class.php

@@ -3,7 +3,6 @@
 /**
  *
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -994,7 +993,6 @@ class PMA_Config
      * @uses    $GLOBALS['PMA_Config']
      * @uses    PMA_Config::get()
      * @uses    PMA_Config::_getFontsizeOptions()
-     * @uses    __('Font size')
      * @static
      * @param   string  $current_size   currently slected font size with unit
      * @return  string  html selectbox
@@ -1031,7 +1029,6 @@ class PMA_Config
      *
      * @uses    PMA_generate_common_hidden_inputs()
      * @uses    PMA_Config::_getFontsizeSelection()
-     * @uses    __('Go')
      * @static
      * @param   string  $current_size   currently slected font size with unit
      * @return  string  html selectbox

libraries/Error.class.php

@@ -3,7 +3,6 @@
 /**
  * Holds class PMA_Error
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/Error_Handler.class.php

@@ -3,7 +3,6 @@
 /**
  * Holds class PMA_Error_Handler
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/File.class.php

@@ -3,7 +3,6 @@
 /**
  * file upload functions
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -259,13 +258,6 @@ class PMA_File
      * @uses    PMA_File::setRecentBLOBReference()
      * @uses    curl_setopt_array()
      * @uses    PMA_File::$_error_message
-     * @uses    __('The uploaded file exceeds the upload_max_filesize directive in php.ini.')
-     * @uses    __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.')
-     * @uses    __('The uploaded file was only partially uploaded.')
-     * @uses    __('Missing a temporary folder.')
-     * @uses    __('Failed to write file to disk.')
-     * @uses    __('File upload stopped by extension.')
-     * @uses    __('Unknown error in file upload.')
      * @uses    $_FILES
      * @param   string  $key    a numeric key used to identify the different rows
      * @param   string  $primary_key
@@ -832,7 +824,6 @@ class PMA_File
     /**
      *
      * @access  public
-     * @uses    __('File could not be read')
      * @uses    PMA_File::setName()
      * @uses    PMA_securePath()
      * @uses    PMA_userDir()
@@ -881,7 +872,6 @@ class PMA_File
      * @todo move check of $cfg['TempDir'] into PMA_Config?
      * @access  public
      * @uses    $cfg['TempDir']
-     * @uses    __('Error moving the uploaded file, see [a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]')
      * @uses    PMA_File::isReadable()
      * @uses    PMA_File::getName()
      * @uses    PMA_File::setName()
@@ -937,7 +927,6 @@ class PMA_File
      *
      * @todo    move file read part into readChunk() or getChunk()
      * @todo    add support for compression plugins
-     * @uses    __('File could not be read')
      * @uses    PMA_File::$_compression to set it
      * @uses    PMA_File::getName()
      * @uses    fopen()

libraries/Index.class.php

@@ -3,7 +3,6 @@
 /**
  * holds the database index class
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -539,7 +538,6 @@ class PMA_Index
     /**
      * Function to check over array of indexes and look for common problems
      *
-     * @uses    __('The indexes %1 and %2 seem to be equal and one of them could possibly be removed.')
      * @uses    is_string()
      * @uses    is_array()
      * @uses    count()

libraries/List.class.php

@@ -3,7 +3,6 @@
 /**
  * hold the PMA_List base class
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/List_Database.class.php

@@ -3,7 +3,6 @@
 /**
  * holds the PMA_List_Database class
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/Message.class.php

@@ -3,7 +3,6 @@
 /**
  * Holds class PMA_Message
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/Partition.class.php

@@ -3,7 +3,6 @@
 /**
  * Library for extracting information about the partitions
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/StorageEngine.class.php

@@ -3,7 +3,6 @@
 /**
  * Library for extracting information about the available storage engines
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -155,7 +154,6 @@ class PMA_StorageEngine
      * @uses    PMA_ENGINE_DETAILS_TYPE_SIZE
      * @uses    PMA_ENGINE_DETAILS_TYPE_NUMERIC
      * @uses    PMA_StorageEngine::getVariablesStatus()
-     * @uses    __('There is no detailed status information available for this storage engine.')
      * @uses    PMA_showHint()
      * @uses    PMA_formatByteDown()
      * @uses    PMA_formatNumber()
@@ -335,11 +333,6 @@ class PMA_StorageEngine
     /**
      * public String getSupportInformationMessage()
      *
-     * @uses    __('%s is the default storage engine on this MySQL server.')
-     * @uses    __('%s is available on this MySQL server.')
-     * @uses    __('%s has been disabled for this MySQL server.')
-     * @uses    __('This MySQL server does not support the %s storage engine.')
-     * @uses    __('This MySQL server does not support the %s storage engine.')
      * @uses    PMA_ENGINE_SUPPORT_DEFAULT
      * @uses    PMA_ENGINE_SUPPORT_YES
      * @uses    PMA_ENGINE_SUPPORT_DISABLED

libraries/Table.class.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/Theme.class.php

@@ -3,7 +3,6 @@
 /**
  * hold PMA_Theme class
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -145,7 +144,6 @@ class PMA_Theme {
      * @uses    PMA_Theme::setImgPath()
      * @uses    PMA_Theme::getName()
      * @uses    $GLOBALS['cfg']['ThemePath']
-     * @uses    __('No valid image path for theme %s found!')
      * @uses    is_dir()
      * @uses    sprintf()
      */
@@ -357,8 +355,6 @@ class PMA_Theme {
      * @uses    PMA_Theme::getVersion()
      * @uses    PMA_Theme::getId()
      * @uses    PMA_Theme::getPath()
-     * @uses    __('No preview available.')
-     * @uses    __('take it')
      * @uses    PMA_generate_common_url()
      * @uses    addslashes()
      * @uses    file_exists()

libraries/Theme_Manager.class.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/Tracker.class.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/auth/config.auth.lib.php

@@ -4,7 +4,6 @@
  * Set of functions used to run config authentication (ie no authentication).
  *
  * @package phpMyAdmin-Auth-Config
- * @version $Id$
  */
 
 

libraries/auth/cookie.auth.lib.php

@@ -4,7 +4,6 @@
  * Set of functions used to run cookie based authentication.
  *
  * @package phpMyAdmin-Auth-Cookie
- * @version $Id$
  */
 
 if (! defined('PHPMYADMIN')) {
@@ -115,17 +114,6 @@ function PMA_get_blowfish_secret() {
  * @uses    $GLOBALS['target']
  * @uses    $GLOBALS['db']
  * @uses    $GLOBALS['table']
- * @uses    __('Welcome to %s')
- * @uses    __('The configuration file now needs a secret passphrase (blowfish_secret).')
- * @uses    __('Error')
- * @uses    __('Log in')
- * @uses    __('Server:')
- * @uses    __('Username:')
- * @uses    __('Password:')
- * @uses    __('Server Choice')
- * @uses    __('Go')
- * @uses    __('Cookies must be enabled past this point.')
- * @uses    __('phpMyAdmin documentation')
  * @uses    $GLOBALS['pmaThemeImage']
  * @uses    $cfg['Servers']
  * @uses    $cfg['LoginCookieRecall']
@@ -644,9 +632,6 @@ function PMA_auth_set_user()
  *
  * @uses    $GLOBALS['server']
  * @uses    $GLOBALS['allowDeny_forbidden']
- * @uses    __('Access denied')
- * @uses    __('No activity within %s seconds; please log in again')
- * @uses    __('Cannot log in to the MySQL server')
  * @uses    $GLOBALS['no_activity']
  * @uses    $cfg['LoginCookieValidity']
  * @uses    $GLOBALS['PMA_Config']->removeCookie()

libraries/auth/http.auth.lib.php

@@ -5,7 +5,6 @@
  * NOTE: Requires PHP loaded as a Apache module.
  *
  * @package phpMyAdmin-Auth-HTTP
- * @version $Id$
  */
 
 

libraries/auth/signon.auth.lib.php

@@ -4,7 +4,6 @@
  * Set of functions used to run single signon authentication.
  *
  * @package phpMyAdmin-Auth-Signon
- * @version $Id$
  */
 
 

libraries/blowfish.php

@@ -11,7 +11,6 @@
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
- * @version $Id$
  * @since   Horde 2.2
  * @package horde.cipher
  */

libraries/bookmark.lib.php

@@ -3,7 +3,6 @@
 /**
  * Set of functions used with the bookmark feature
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/charset_conversion.lib.php

@@ -3,113 +3,47 @@
 /**
  * Charset conversion functions.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-/**
- * Failure on loading recode/iconv extensions.
- */
-function PMA_failRecoding() {
-    PMA_fatalError(__('Couldn\'t load the iconv or recode extension needed for charset conversion. Either configure PHP to enable these extensions or disable charset conversion in phpMyAdmin.'));
-}
-
-/**
- * Loads the recode or iconv extensions if any of it is not loaded yet
- */
-if (isset($cfg['AllowAnywhereRecoding'])
-    && $cfg['AllowAnywhereRecoding']) {
-
-    if ($cfg['RecodingEngine'] == 'recode') {
-        if (!@extension_loaded('recode')) {
-            PMA_failRecoding();
-        }
-        $PMA_recoding_engine             = 'recode';
-    } elseif ($cfg['RecodingEngine'] == 'iconv') {
-        if (!@extension_loaded('iconv')) {
-            PMA_failRecoding();
-        }
-        $PMA_recoding_engine             = 'iconv';
-    } else {
-        if (@extension_loaded('iconv')) {
-            $PMA_recoding_engine         = 'iconv';
-        } elseif (@extension_loaded('recode')) {
-            $PMA_recoding_engine         = 'recode';
-        } else {
-            PMA_failRecoding();
-        }
-    }
-} // end load recode/iconv extension
-
 define('PMA_CHARSET_NONE', 0);
 define('PMA_CHARSET_ICONV', 1);
-define('PMA_CHARSET_LIBICONV', 2);
+define('PMA_CHARSET_RECODE', 2);
-define('PMA_CHARSET_RECODE', 3);
+define('PMA_CHARSET_ICONV_AIX', 3);
-define('PMA_CHARSET_ICONV_AIX', 4);
-
-if (!isset($cfg['IconvExtraParams'])) {
-    $cfg['IconvExtraParams'] = '';
-}
 
 // Finally detect which function we will use:
-if (isset($cfg['AllowAnywhereRecoding'])
+if ($cfg['RecodingEngine'] == 'iconv') {
-    && $cfg['AllowAnywhereRecoding']) {
-
-    if (!isset($PMA_recoding_engine)) {
-        $PMA_recoding_engine = $cfg['RecodingEngine'];
-    }
-    if ($PMA_recoding_engine == 'iconv') {
     if (@function_exists('iconv')) {
         if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
             $PMA_recoding_engine = PMA_CHARSET_ICONV_AIX;
         } else {
             $PMA_recoding_engine = PMA_CHARSET_ICONV;
         }
-        } elseif (@function_exists('libiconv')) {
-            $PMA_recoding_engine = PMA_CHARSET_LIBICONV;
     } else {
         $PMA_recoding_engine = PMA_CHARSET_NONE;
-
+        PMA_warnMissingExtension('iconv');
-            if (!isset($GLOBALS['is_header_sent'])) {
-                include './libraries/header.inc.php';
     }
-            echo __('Couldn\'t use the iconv, libiconv, or recode_string functions, although the necessary extensions appear to be loaded. Check your PHP configuration.');
+} elseif ($cfg['RecodingEngine'] == 'recode') {
-            require_once './libraries/footer.inc.php';
-            exit();
-        }
-    } elseif ($PMA_recoding_engine == 'recode') {
     if (@function_exists('recode_string')) {
         $PMA_recoding_engine = PMA_CHARSET_RECODE;
     } else {
         $PMA_recoding_engine = PMA_CHARSET_NONE;
-
+        PMA_warnMissingExtension('recode');
-            require_once './libraries/header.inc.php';
-            echo __('Couldn\'t use the iconv, libiconv, or recode_string functions, although the necessary extensions appear to be loaded. Check your PHP configuration.');
-            require_once './libraries/footer.inc.php';
-            exit;
     }
-    } else {
+} elseif ($cfg['RecodingEngine'] == 'auto') {
     if (@function_exists('iconv')) {
         if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
             $PMA_recoding_engine = PMA_CHARSET_ICONV_AIX;
         } else {
             $PMA_recoding_engine = PMA_CHARSET_ICONV;
         }
-        } elseif (@function_exists('libiconv')) {
-            $PMA_recoding_engine = PMA_CHARSET_LIBICONV;
     } elseif (@function_exists('recode_string')) {
         $PMA_recoding_engine = PMA_CHARSET_RECODE;
     } else {
         $PMA_recoding_engine = PMA_CHARSET_NONE;
-
-            require_once './libraries/header.inc.php';
-            echo __('Couldn\'t use the iconv, libiconv, or recode_string functions, although the necessary extensions appear to be loaded. Check your PHP configuration.');
-            require_once './libraries/footer.inc.php';
-            exit;
-        }
     }
 } else {
     $PMA_recoding_engine = PMA_CHARSET_NONE;
@@ -120,43 +54,6 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
     require_once './libraries/iconv_wrapper.lib.php';
 }
 
-/**
- * Converts encoding of text according to current settings.
- *
- * @param   string   what to convert
- *
- * @return  string   converted text
- *
- * @global  array    the configuration array
- * @global  boolean  whether recoding is allowed or not
- * @global  string   the current charset
- * @global  array    the charset to convert to
- *
- * @access  public
- *
- */
-function PMA_convert_charset($what) {
-    global $cfg, $charset, $convcharset;
-
-    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )
-        || $convcharset == $charset) { // if input and output charset are the same, we don't have to do anything...
-        return $what;
-    } else {
-        switch ($GLOBALS['PMA_recoding_engine']) {
-            case PMA_CHARSET_RECODE:
-                return recode_string($charset . '..'  . $convcharset, $what);
-            case PMA_CHARSET_ICONV:
-                return iconv($charset, $convcharset . $cfg['IconvExtraParams'], $what);
-            case PMA_CHARSET_ICONV_AIX:
-                return PMA_aix_iconv_wrapper($charset, $convcharset . $cfg['IconvExtraParams'], $what);
-            case PMA_CHARSET_LIBICONV:
-                return libiconv($charset, $convcharset . $GLOBALS['cfg']['IconvExtraParams'], $what);
-            default:
-                return $what;
-        }
-    }
-} //  end of the "PMA_convert_charset()" function
-
 /**
  * Converts encoding of text according to parameters with detected
  * conversion function.
@@ -181,59 +78,9 @@ function PMA_convert_string($src_charset, $dest_charset, $what) {
             return iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what);
         case PMA_CHARSET_ICONV_AIX:
             return PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what);
-        case PMA_CHARSET_LIBICONV:
-            return libiconv($src_charset, $dest_charset, $what);
         default:
             return $what;
     }
 } //  end of the "PMA_convert_string()" function
 
-
-/**
- * Converts encoding of file according to parameters with detected
- * conversion function. The old file will be unlinked and new created and
- * its file name is returned.
- *
- * @param   string   source charset
- * @param   string   target charset
- * @param   string   file to convert
- *
- * @return  string   new temporay file
- *
- * @access  public
- *
- */
-function PMA_convert_file($src_charset, $dest_charset, $file) {
-    switch ($GLOBALS['PMA_recoding_engine']) {
-        case PMA_CHARSET_RECODE:
-        case PMA_CHARSET_ICONV:
-        case PMA_CHARSET_LIBICONV:
-            $tmpfname = tempnam('', 'PMA_convert_file');
-            $fin      = fopen($file, 'r');
-            $fout     = fopen($tmpfname, 'w');
-            if ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_RECODE) {
-                recode_file($src_charset . '..'  . $dest_charset, $fin, $fout);
-            } else {
-                while (!feof($fin)) {
-                    $line = fgets($fin, 4096);
-                    if ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV) {
-                        $dist = iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line);
-                    } elseif ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV_AIX) {
-                        $dist = PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line);
-                    } else {
-                        $dist = libiconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line);
-                    }
-                    fputs($fout, $dist);
-                } // end while
-            }
-            fclose($fin);
-            fclose($fout);
-            unlink($file);
-
-            return $tmpfname;
-        default:
-            return $file;
-    }
-} //  end of the "PMA_convert_file()" function
-
 ?>

libraries/check_user_privileges.lib.php

@@ -3,7 +3,6 @@
 /**
  * Get user's global privileges and some db-specific privileges
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/cleanup.lib.php

@@ -3,7 +3,6 @@
 /**
  * Functions for cleanup of user input.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/common.inc.php

@@ -28,7 +28,6 @@
  * - db connection
  * - authentication work
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -454,7 +453,7 @@ if (PMA_checkPageValidity($_REQUEST['back'], $goto_whitelist)) {
  * f.e. PMA_Config: fontsize
  *
  * @todo variables should be handled by their respective owners (objects)
- * f.e. lang, server, convcharset, collation_connection in PMA_Config
+ * f.e. lang, server, collation_connection in PMA_Config
  */
 if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['token']) {
     /**
@@ -468,7 +467,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
         /* Session ID */
         'phpMyAdmin',
         /* Cookie preferences */
-        'pma_lang', 'pma_charset', 'pma_collation_connection',
+        'pma_lang', 'pma_collation_connection',
         /* Possible login form */
         'pma_servername', 'pma_username', 'pma_password',
         /* for playing blobstreamable media */
@@ -488,14 +487,6 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
 }
 
 
-/**
- * @global string $GLOBALS['convcharset']
- * @see select_lang.lib.php
- */
-if (isset($_REQUEST['convcharset'])) {
-    $GLOBALS['convcharset'] = strip_tags($_REQUEST['convcharset']);
-}
-
 /**
  * current selected database
  * @global string $GLOBALS['db']
@@ -793,7 +784,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
      * @todo should be done in PMA_Config
      */
     $GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']);
-    $GLOBALS['PMA_Config']->setCookie('pma_charset', $GLOBALS['convcharset']);
     $GLOBALS['PMA_Config']->setCookie('pma_collation_connection', $GLOBALS['collation_connection']);
 
     $_SESSION['PMA_Theme_Manager']->setThemeCookie();

libraries/common.lib.php

@@ -3,7 +3,6 @@
 /**
  * Misc functions used all over the scripts.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -130,7 +129,6 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
 /**
  * Displays the maximum size for an upload
  *
- * @uses    __('Max: %s%s')
  * @uses    PMA_formatByteDown()
  * @uses    sprintf()
  * @param   integer  the size
@@ -346,7 +344,6 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
  * @uses    $cfg['MySQLManualType']
  * @uses    $cfg['MySQLManualBase']
  * @uses    $cfg['ReplaceHelpImg']
- * @uses    __('Documentation')
  * @uses    $GLOBALS['pmaThemeImage']
  * @uses    PMA_MYSQL_INT_VERSION
  * @uses    strtolower()
@@ -501,11 +498,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
  * @uses    footer.inc.php
  * @uses    header.inc.php
  * @uses    $GLOBALS['sql_query']
- * @uses    __('Error')
- * @uses    __('SQL query')
  * @uses    $GLOBALS['pmaThemeImage']
- * @uses    __('Edit')
- * @uses    __('MySQL said: ')
  * @uses    $GLOBALS['cfg']['PropertiesIconic']
  * @uses    $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
  * @uses    PMA_backquote()
@@ -1614,8 +1607,6 @@ function PMA_localisedDate($timestamp = -1, $format = '')
  * If the variables $link and $args ar left empty, an inactive tab is created
  *
  * @uses    $GLOBALS['PMA_PHP_SELF']
- * @uses    __('Empty')
- * @uses    __('Drop')
  * @uses    $GLOBALS['active_page']
  * @uses    $GLOBALS['url_query']
  * @uses    $cfg['MainPageIconic']
@@ -1882,7 +1873,6 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
 /**
  * Returns a given timespan value in a readable format.
  *
- * @uses    __('%s days, %s hours, %s minutes and %s seconds')
  * @uses    sprintf()
  * @uses    floor()
  * @param  int     the timespan
@@ -2191,7 +2181,6 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
  * Generate a pagination selector for browsing resultsets
  *
  * @todo $url is not javascript escaped!?
- * @uses    __('Page number:')
  * @uses    range()
  * @param   string      URL for the JavaScript
  * @param   string      Number of rows in the pagination set
@@ -2295,7 +2284,6 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
  * Generate navigation for a list
  *
  * @todo    use $pos from $_url_params
- * @uses    __('Page number:')
  * @uses    range()
  * @param   integer     number of elements in the list
  * @param   integer     current position in the list
@@ -2406,7 +2394,6 @@ function PMA_userDir($dir)
  *
  * @uses    $cfg['DefaultTabDatabase']
  * @uses    $GLOBALS['db']
- * @uses    __('Jump to database "%s".')
  * @uses    PMA_generate_common_url()
  * @uses    PMA_unescape_mysql_wildcards()
  * @uses    strlen()
@@ -2436,7 +2423,6 @@ function PMA_getDbLink($database = null)
  * that affects a functionality
  *
  * @uses    PMA_MYSQL_INT_VERSION
- * @uses    __('The %s functionality is affected by a known bug, see %s')
  * @uses    PMA_showHint()
  * @uses    sprintf()
  * @param   string  $functionality localized message explaining the func.

libraries/config.default.php

@@ -16,7 +16,6 @@
  *
  * All directives are explained in Documentation.html
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -1975,26 +1974,6 @@ $cfg['DefaultConnectionCollation'] = 'utf8_general_ci';
  */
 $cfg['FilterLanguages'] = '';
 
-/**
- * Default character set to use for recoding of MySQL queries, does not take
- * any effect when character sets recoding is switched off by
- * $cfg['AllowAnywhereRecoding'] or in language file
- * (see $cfg['AvailableCharsets'] to possible choices, you can add your own)
- *
- * @global string $cfg['DefaultCharset']
- */
-$cfg['DefaultCharset'] = 'utf-8';
-
-/**
- * Allow character set recoding of MySQL queries, must be also enabled in language
- * file to make harder using other language files than Unicode.
- * Default value is false to avoid problems on servers without the iconv
- * extension
- *
- * @global boolean $cfg['AllowAnywhereRecoding']
- */
-$cfg['AllowAnywhereRecoding'] = false;
-
 /**
  * You can select here which functions will be used for character set conversion.
  * Possible values are:
@@ -2002,6 +1981,7 @@ $cfg['AllowAnywhereRecoding'] = false;
  *               recode)
  *      iconv  - use iconv or libiconv functions
  *      recode - use recode_string function
+ *      none   - disable encoding conversion
  *
  * @global string $cfg['RecodingEngine']
  */
@@ -2303,14 +2283,6 @@ $cfg['InitialSlidersState'] = 'closed';
 
 
 
-//-----------------------------------------------------------------------------
-// custom-setup by mkkeck: 2004-05-04
-//    some specials for new icons and scrolling
-/**
- * @todo We need to rearrange these variables.
- */
-
-
 /*******************************************************************************
  * Window title settings
  */

libraries/core.lib.php

@@ -5,7 +5,6 @@
  * This script is distinct from libraries/common.inc.php because this
  * script is called from /test.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -202,7 +201,6 @@ function PMA_securePath($path)
  * @todo    use detected argument separator (PMA_Config)
  * @uses    $GLOBALS['session_name']
  * @uses    $GLOBALS['text_dir']
- * @uses    __('Error')
  * @uses    $GLOBALS['available_languages']
  * @uses    $GLOBALS['lang']
  * @uses    $GLOBALS['PMA_Config']->removeCookie()
@@ -226,7 +224,7 @@ function PMA_fatalError($error_message, $message_args = null)
     if (! isset($GLOBALS['available_languages'])) {
         $GLOBALS['cfg'] = array(
             'DefaultLang'           => 'en',
-            'AllowAnywhereRecoding' => false);
+            );
 
         // Loads the language file
         require_once './libraries/select_lang.lib.php';

libraries/database_interface.lib.php

@@ -3,7 +3,6 @@
 /**
  * Common Option Constants For DBI Functions
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/db_common.inc.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/db_events.inc.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/db_info.inc.php

@@ -31,7 +31,6 @@
  * @uses    strnatcasecmp()
  * @uses    count()
  * @uses    addslashes()
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
@@ -59,7 +58,6 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset'];
  * fills given tooltip arrays
  *
  * @uses    $cfg['ShowTooltipAliasTB']
- * @uses    __('Creation')
  * @uses    PMA_localisedDate()
  * @uses    strtotime()
  * @param   array   $tooltip_truename   tooltip data

libraries/db_links.inc.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/db_routines.inc.php

@@ -12,7 +12,6 @@
  *       our current sql.php.
  *       Of course the interface would need a way to pass calling parameters.
  *       Also, support DEFINER (like we do in export).
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/db_structure.lib.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
@@ -17,14 +16,6 @@ if (! defined('PHPMYADMIN')) {
  * @uses    PMA_showHint()
  * @uses    $GLOBALS['cfg']['PropertiesNumColumns']
  * @uses    $GLOBALS['is_show_stats']
- * @uses    __('Table')
- * @uses    __('Action')
- * @uses    __('Rows')
- * @uses    __('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')
- * @uses    __('Type')
- * @uses    __('Collation')
- * @uses    __('Size')
- * @uses    __('Overhead')
  * @uses    $GLOBALS['colspan_for_structure']
  * @uses    PMA_SortableTableHeader()
  * @param   boolean $db_is_information_schema

libraries/db_table_exists.lib.php

@@ -4,7 +4,6 @@
  * Ensure the database and the table exist (else move to the "parent" script)
  * and display headers
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/dbg/setup.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-DBG
  */
 if (! defined('PHPMYADMIN')) {

libraries/dbi/mysql.dbi.lib.php

@@ -4,7 +4,6 @@
  * Interface to the classic MySQL extension
  *
  * @package phpMyAdmin-DBI-MySQL
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -308,9 +307,6 @@ function PMA_DBI_get_client_info()
  * @uses    PMA_DBI_convert_message()
  * @uses    $GLOBALS['errno']
  * @uses    $GLOBALS['userlink']
- * @uses    __('The server is not responding')
- * @uses    __('(or the local MySQL server's socket is not correctly configured)')
- * @uses    __('Details...')
  * @uses    mysql_errno()
  * @uses    mysql_error()
  * @uses    defined()

libraries/dbi/mysqli.dbi.lib.php

@@ -4,7 +4,6 @@
  * Interface to the improved MySQL extension (MySQLi)
  *
  * @package phpMyAdmin-DBI-MySQLi
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -144,7 +143,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
  * selects given database
  *
  * @uses    $GLOBALS['userlink']
- * @uses    PMA_convert_charset()
  * @uses    mysqli_select_db()
  * @param   string          $dbname database name to select
  * @param   object mysqli   $link   the mysqli object
@@ -168,7 +166,6 @@ function PMA_DBI_select_db($dbname, $link = null)
  * @uses    PMA_DBI_QUERY_STORE
  * @uses    PMA_DBI_QUERY_UNBUFFERED
  * @uses    $GLOBALS['userlink']
- * @uses    PMA_convert_charset()
  * @uses    MYSQLI_STORE_RESULT
  * @uses    MYSQLI_USE_RESULT
  * @uses    mysqli_query()
@@ -366,8 +363,6 @@ function PMA_DBI_get_client_info()
  * @uses    PMA_DBI_convert_message()
  * @uses    $GLOBALS['errno']
  * @uses    $GLOBALS['userlink']
- * @uses    __('The server is not responding')
- * @uses    __('(or the local MySQL server's socket is not correctly configured)')
  * @uses    mysqli_errno()
  * @uses    mysqli_error()
  * @uses    mysqli_connect_errno()
@@ -493,8 +488,8 @@ function PMA_DBI_get_fields_meta($result)
 {
     // Build an associative array for a type look up
     $typeAr = array();
-    $typeAr[MYSQLI_TYPE_DECIMAL]     = 'real';
+    $typeAr[MYSQLI_TYPE_DECIMAL]     = 'decimal';
-    $typeAr[MYSQLI_TYPE_NEWDECIMAL]  = 'real';
+    $typeAr[MYSQLI_TYPE_NEWDECIMAL]  = 'decimal';
     $typeAr[MYSQLI_TYPE_BIT]         = 'int';
     $typeAr[MYSQLI_TYPE_TINY]        = 'int';
     $typeAr[MYSQLI_TYPE_SHORT]       = 'int';

libraries/display_change_password.lib.php

@@ -3,7 +3,6 @@
 /**
  * Displays form for password change
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
@@ -58,7 +57,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
             </label>
         </td>
         </tr>
-        <tr>
+        <tr id="tr_element_before_generate_password">
             <td>&nbsp;</td>
         <td>
             <input type="radio" name="pw_hash" id="radio_pw_hash_old" value="old" />
@@ -67,15 +66,6 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
             </label>
         </td>
         </tr>
-        <tr>
-        <td>
-            <?php echo __('Generate Password'); ?>
-        </td>
-        <td>
-            <input type="button" id="button_generate_password" value="<?php echo __('Generate'); ?>" onclick="suggestPassword(this.form)" />
-            <input type="text" name="generated_pw" id="generated_pw" />
-        </td>
-        </tr>
         </table>
     </fieldset>
     <fieldset id="fieldset_change_password_footer" class="tblFooters">

libraries/display_create_database.lib.php

@@ -3,7 +3,6 @@
 /**
  * Displays form for creating database (if user has privileges for that)
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/display_create_table.lib.php

@@ -22,7 +22,6 @@
  * warnings about the lack of privileges for CREATE TABLE. Tested
  * on MySQL 5.0.18.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/display_export.lib.php

@@ -1,306 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @version $Id$
- * @package phpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- *
- */
-require_once './libraries/Table.class.php';
-
-// Get relations & co. status
-require_once './libraries/relation.lib.php';
-$cfgRelation = PMA_getRelationsParam();
-
-
-require_once './libraries/file_listing.php';
-require_once './libraries/plugin_interface.lib.php';
-
-function PMA_exportCheckboxCheck($str) {
-    if (isset($GLOBALS['cfg']['Export'][$str]) && $GLOBALS['cfg']['Export'][$str]) {
-        echo ' checked="checked"';
-    }
-}
-
-function PMA_exportIsActive($what, $val) {
-    if (isset($GLOBALS['cfg']['Export'][$what]) &&  $GLOBALS['cfg']['Export'][$what] == $val) {
-        echo ' checked="checked"';
-    }
-}
-
-/* Scan for plugins */
-$export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $export_type, 'single_table' => isset($single_table)));
-
-/* Fail if we didn't find any plugin */
-if (empty($export_list)) {
-    PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display();
-    require './libraries/footer.inc.php';
-}
-?>
-
-<form method="post" action="export.php" name="dump">
-
-<?php
-if ($export_type == 'server') {
-    echo PMA_generate_common_hidden_inputs('', '', 1);
-} elseif ($export_type == 'database') {
-    echo PMA_generate_common_hidden_inputs($db, '', 1);
-} else {
-    echo PMA_generate_common_hidden_inputs($db, $table, 1);
-}
-
-// just to keep this value for possible next display of this form after saving on server
-if (isset($single_table)) {
-    echo '<input type="hidden" name="single_table" value="TRUE" />' . "\n";
-}
-
-echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . "\n";
-
-if (! empty($sql_query)) {
-    echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n";
-}
-?>
-
-<div class="exportoptions" id="header">
-    <h2>
-        <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_export.png" />
-        <?php
-        if($export_type == 'server') {
-            echo __('Exporting databases in the current server');
-        } elseif($export_type == 'database') {
-            echo __('Exporting tables in the database "' . $db . '"');
-        } else {
-            echo __('Exporting rows in the table "' . $table . '"');
-        }?>
-    </h2>
-</div>
-
-<div class="exportoptions" id="quick_or_custom">
-    <h3><?php echo __('Export Method:'); ?></h3>
-    <ul>
-        <li>
-            <?php echo '<input type="radio" name="quick_or_custom" value="quick" id="radio_quick_export" checked="checked" />';
-                echo '<label for ="radio_quick_export">' . __('Quick - display only the minimal options to configure') . '</label>'; ?>
-        </li>
-        <li>
-            <?php echo '<input type="radio" name="quick_or_custom" value="custom" id="radio_custom_export" />';
-            echo '<label for="radio_custom_export">' . __('Custom - display all possible options to configure') . '</label>';?>
-        </li>
-    </ul>
-</div>
-
-<div class="exportoptions" id="databases_and_tables">
-    <?php
-        if($export_type == 'server') {
-            echo '<h3>' . __('Database(s):') . '</h3>';
-        } else if($export_type == 'database') {
-            echo '<h3>' . __('Table(s):') . '</h3>';
-        }
-        if (! empty($multi_values)) {
-            echo $multi_values;
-        }
-    ?>
-</div>
-
-<?php if (strlen($table) && ! isset($num_tables) && ! PMA_Table::isMerge($db, $table)) { ?>
-    <div class="exportoptions" id="rows">
-        <h3><?php echo __('Rows:'); ?></h3>
-        <ul>
-            <li>
-                <?php echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />';
-                    echo '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>'; ?>
-                <ul>
-                    <li><label for="limit_to"><?php echo __('Number of rows:') . '</label> <input type="text" id="limit_to" name="limit_to" size="5" value="'
-                . (isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table))
-                . '" onfocus="this.select()" />' ?></li>
-                    <li><label for="limit_from"><?php echo __('Row to begin at:') . '</label> <input type="text" id="limit_from" name="limit_from" value="0" size="5"'
-                .' onfocus="this.select()" />'; ?></li>
-                </ul>
-            </li>
-            <li>
-                <?php echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" />';
-                echo ' <label for="radio_allrows_1">' . __('Dump all rows') . '</label>';?>
-            </li>
-        </ul>
-     </div>
-<?php } ?>
-
-
-<?php if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) { ?>
-    <div class="exportoptions" id="output_quick_export">
-        <h3><?php echo __('Output:'); ?></h3>
-        <ul>
-            <li>
-                <input type="checkbox" name="quick_export_onserver" value="saveit"
-                    id="checkbox_quick_dump_onserver"
-                    <?php PMA_exportCheckboxCheck('onserver'); ?> />
-                <label for="checkbox_quick_dump_onserver">
-                    <?php echo sprintf(__('Save on server in the directory <b>%s</b>'), htmlspecialchars(PMA_userDir($cfg['SaveDir']))); ?>
-                </label>
-            </li>
-            <li>
-                <input type="checkbox" name="quick_export_onserverover" value="saveitover"
-                id="checkbox_quick_dump_onserverover"
-                <?php PMA_exportCheckboxCheck('onserver_overwrite'); ?> />
-                <label for="checkbox_quick_dump_onserverover"><?php echo __('Overwrite existing file(s)'); ?></label>
-            </li>
-        </ul>
-    </div>
-<?php } ?>
-
-<div class="exportoptions" id="output">
-    <h3><?php echo __('Output:'); ?></h3>
-    <ul id="ul_output">
-        <li>
-            <input type="radio" name="output_format" value="sendit" id="radio_dump_asfile" <?php PMA_exportCheckboxCheck('asfile'); ?> />
-            <label for="radio_dump_asfile"><?php echo __('Save output to a file'); ?></label>
-            <ul id="ul_save_asfile">
-                <?php if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) { ?>
-                <li>
-                    <input type="checkbox" name="onserver" value="saveit"
-                        id="checkbox_dump_onserver"
-                        <?php PMA_exportCheckboxCheck('onserver'); ?> />
-                    <label for="checkbox_dump_onserver">
-                        <?php echo sprintf(__('Save on server in the directory <b>%s</b>'), htmlspecialchars(PMA_userDir($cfg['SaveDir']))); ?>
-                    </label>
-                </li>
-                <li>
-                    <input type="checkbox" name="onserverover" value="saveitover"
-                    id="checkbox_dump_onserverover"
-                    <?php PMA_exportCheckboxCheck('onserver_overwrite'); ?> />
-                    <label for="checkbox_dump_onserverover"><?php echo __('Overwrite existing file(s)'); ?></label>
-                </li>
-                <?php } ?>
-                <li>
-                    <label for="filename_template" class="desc">
-                    <?php
-                    echo __('File name template:');
-                    $trans = new PMA_Message;
-                    $trans->addMessage('__SERVER__ will become the');
-                    $trans->addString(__('server name'));
-                    if ($export_type == 'database' || $export_type == 'table') {
-                        $trans->addMessage(', __DB__ will become the');
-                        $trans->addString(__('database name'));
-                        if ($export_type == 'table') {
-                            $trans->addMessage(', __TABLE__ will become the');
-                            $trans->addString(__('table name'));
-                        }
-                    }
-
-                    $message = new PMA_Message(__('This value is interpreted using %1$sstrftime%2$s, so you can use time formatting strings. Additionally the following transformations will happen: %3$s. Other text will be kept as is.'));
-                    $message->addParam('<a href="http://php.net/strftime" target="documentation" title="'
-                        . __('Documentation') . '">', false);
-                    $message->addParam('</a>', false);
-                    $message->addParam($trans);
-
-                    echo PMA_showHint($message);
-                    ?>
-                    </label>
-                    <input type="text" name="filename_template" id="filename_template"
-                    <?php
-                        echo ' value="';
-                        if ($export_type == 'database') {
-                            if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) {
-                                echo htmlspecialchars($_COOKIE['pma_db_filename_template']);
-                            } else {
-                                echo $GLOBALS['cfg']['Export']['file_template_database'];
-                            }
-                        } elseif ($export_type == 'table') {
-                            if (isset($_COOKIE) && !empty($_COOKIE['pma_table_filename_template'])) {
-                                echo htmlspecialchars($_COOKIE['pma_table_filename_template']);
-                            } else {
-                                echo $GLOBALS['cfg']['Export']['file_template_table'];
-                            }
-                        } else {
-                            if (isset($_COOKIE) && !empty($_COOKIE['pma_server_filename_template'])) {
-                                echo htmlspecialchars($_COOKIE['pma_server_filename_template']);
-                            } else {
-                                echo $GLOBALS['cfg']['Export']['file_template_server'];
-                            }
-                        }
-                        echo '"';
-                    ?>
-                    />
-                    <input type="checkbox" name="remember_template"
-                        id="checkbox_remember_template"
-                        <?php PMA_exportCheckboxCheck('remember_file_template'); ?> />
-                    <label for="checkbox_remember_template">
-                        <?php echo __('use this for future exports'); ?></label>
-                </li>
-                <?php
-                // charset of file
-                if ($cfg['AllowAnywhereRecoding']) {
-                    echo '        <li><label for="select_charset_of_file" class="desc">'
-                        . __('Character set of the file:') . '</label>' . "\n";
-                    reset($cfg['AvailableCharsets']);
-                    echo '<select id="select_charset_of_file" name="charset_of_file" size="1">';
-                    foreach ($cfg['AvailableCharsets'] as $temp_charset) {
-                        echo '<option value="' . $temp_charset . '"';
-                        if ((empty($cfg['Export']['charset']) && $temp_charset == $charset)
-                          || $temp_charset == $cfg['Export']['charset']) {
-                            echo ' selected="selected"';
-                        }
-                        echo '>' . $temp_charset . '</option>';
-                    } // end foreach
-                    echo '</select></li>';
-                } // end if
-                ?>
-                 <?php
-                // zip, gzip and bzip2 encode features
-                $is_zip  = ($cfg['ZipDump']  && @function_exists('gzcompress'));
-                $is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode'));
-                $is_bzip = ($cfg['BZipDump'] && @function_exists('bzcompress'));
-                if ($is_zip || $is_gzip || $is_bzip) { ?>
-                    <li>
-                    <label for="compression" class="desc"><?php echo __('Compression:'); ?></label>
-                    <select id="compression" name="compression">
-                        <option value="none"><?php echo __('None'); ?></option>
-                        <?php if ($is_zip) { ?>
-                            <option value="zip"><?php echo __('zipped'); ?></option>
-                        <?php } if ($is_gzip) { ?>
-                            <option value="gzip"><?php echo __('gzipped'); ?></option>
-                        <?php } if ($is_bzip) { ?>
-                            <option value="bzip"><?php echo __('bzipped'); ?></option>
-                        <?php } ?>
-                    </select>
-                    </li>
-                <?php } else { ?>
-                    <input type="hidden" name="compression" value="none" />
-                <?php } ?>
-             </ul>
-        </li>
-        <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" /><label for="radio_view_as_text">View output as text</label></li>
-    </ul>
- </div>
-
-<div class="exportoptions" id="format">
-    <h3><?php echo __('Format:'); ?></h3>
-    <?php echo PMA_pluginGetChoice('Export', 'what', $export_list, 'format'); ?>
-</div>
-
-<div class="exportoptions" id="format_specific_opts">
-    <h3><?php echo __('Format-Specific Options:'); ?></h3>
-    <p class="no_js_msg" id="scroll_to_options_msg">Scroll down to fill in the options for the selected format and ignore the options for other formats.</p>
-    <?php echo PMA_pluginGetOptions('Export', $export_list); ?>
-</div>
-
-<?php if (function_exists('PMA_set_enc_form')) { ?>
-<!-- Encoding setting form appended by Y.Kawada -->
-<!-- Japanese encoding setting -->
-    <div class="exportoptions" id="kanji_encoding">
-        <h3><?php echo __('Encoding Conversion:'); ?></h3>
-        <?php echo PMA_set_enc_form('            '); ?>
-    </div>
-<?php } ?>
-
-<div class="exportoptions" id="submit">
-<?php PMA_externalBug(__('SQL compatibility mode'), 'mysql', '50027', '14515'); ?>
-    <input type="submit" value="<?php echo __('Go'); ?>" id="buttonGo" />
-</div>
-</form>

libraries/display_import.lib.php

@@ -1,266 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @package phpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- *
- */
-require_once './libraries/file_listing.php';
-require_once './libraries/plugin_interface.lib.php';
-require_once './libraries/display_import_ajax.lib.php';
-
-/* Scan for plugins */
-$import_list = PMA_getPlugins('./libraries/import/', $import_type);
-
-/* Fail if we didn't find any plugin */
-if (empty($import_list)) {
-    PMA_Message::error(__('Could not load import plugins, please check your installation!'))->display();
-    require './libraries/footer.inc.php';
-}
-?>
-
-<iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none;"></iframe>
-<div id="import_form_status" style="display: none;"></div>
-<div id="importmain">
-    <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" />
-    <script type="text/javascript">
-        //<![CDATA[
-        $(document).ready( function() {
-            // add event when user click on "Go" button
-            $('#buttonGo').bind('click', function() {
-                $('#upload_form_form').css("display", "none"); // hide form
-                $('#upload_form_status').css("display", "inline"); // show progress bar
-                $('#upload_form_status_info').css("display", "inline"); // - || -
-<?php
-if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
-    ?>
-                $('#upload_form_status').html('<div class="upload_progress_bar_outer"><div id="status" class="upload_progress_bar_inner"></div></div>'); // add the progress bar
-
-                var finished = false;
-                var percent  = 0.0;
-                var total    = 0;
-                var complete = 0;
-
-                var perform_upload;
-                var periodical_upload;
-
-                var request_upload = [];
-
-                perform_upload = function () {
-                    new $.getJSON(
-                    'import_status.php?id=<?php echo $upload_id ; ?>&<?php echo PMA_generate_common_url(); ?>',
-                    {},
-                    function(response) {
-                        finished = response.finished;
-                        percent = response.percent;
-                        total = response.total;
-                        complete = response.complete;
-
-                          if (total==0 && complete==0 && percent==0) {
-                              $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.')); ?>');
-                              $('#upload_form_status').css("display", "none");
-                          } else {
-                              $('#upload_form_status_info').html(' '+Math.round(percent)+'%, '+complete+'/'+total);
-                              $('#status').animate({width: Math.round(percent)*2+'px'},150);
-                          } // else
-
-                          if (finished==true) {
-                                    $('#importmain').css('display', 'none');
-                                    $('#import_form_status').css('display', 'inline');
-                                    $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.')); ?> ');
-                                    $('#import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error
-                                    <?php
-                                    // reload the left sidebar when the import is finished
-                                    $GLOBALS['reload']=true;
-                                    PMA_reloadNavigation(true);
-                                    ?>
-
-                          } // if finished
-                          else {
-                                window.setTimeout(perform_upload, 1000);
-                          }
-
-                      }
-                  );
-
-              }
-                window.setTimeout(perform_upload, 1000);
-
-    <?php
-} else { // no plugin available
-    ?>
-                        $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>');
-                        $('#upload_form_status').css("display", "none");
-    <?php
-} // else
-?>
-                    }); // onclick
-                }); // domready
-
-                document.write('<form action="import.php" method="post" enctype="multipart/form-data" name="import"<?php if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") echo ' target="import_upload_iframe"'; ?>>');
-                //]]>
-    </script>
-    <noscript>
-        <form action="import.php" method="post" enctype="multipart/form-data" name="import">
-    </noscript>
-    <input type="hidden" name="<?php echo $ID_KEY; ?>" value="<?php echo $upload_id ; ?>" />
-    <?php
-    if ($import_type == 'server') {
-        echo PMA_generate_common_hidden_inputs('', '', 1);
-    } elseif ($import_type == 'database') {
-        echo PMA_generate_common_hidden_inputs($db, '', 1);
-    } else {
-        echo PMA_generate_common_hidden_inputs($db, $table, 1);
-    }
-    echo '    <input type="hidden" name="import_type" value="' . $import_type . '" />'."\n";
-    ?>
-
-    <div class="exportoptions" id="header">
-        <h2>
-            <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_import.png" />
-            <?php
-            if($import_type == 'server') {
-                echo __('Importing into the current server');
-            } elseif($import_type == 'database') {
-                echo __('Importing into the database "' . $db . '"');
-            } else {
-                echo __('Importing into the table "' . $table . '"');
-            }?>
-        </h2>
-    </div>
-
-    <div class="importoptions">
-        <h3><?php echo __('File to Import:'); ?></h3>
-        <?php
-        // zip, gzip and bzip2 encode features
-        $compressions = array();
-
-        if ($cfg['GZipDump'] && @function_exists('gzopen')) {
-            $compressions[] = 'gzip';
-        }
-        if ($cfg['BZipDump'] && @function_exists('bzopen')) {
-            $compressions[] = 'bzip2';
-        }
-        if ($cfg['ZipDump'] && @function_exists('zip_open')) {
-            $compressions[] = 'zip';
-        }
-        // We don't have show anything about compression, when no supported
-        if ($compressions != array()) {
-             printf(__('<div class="formelementrow" id="compression_info">File may be compressed (%s) or uncompressed.<br />A compressed file\'s name must end in <b>.[format].[compression]</b>. Example: <b>.sql.zip</b></div>'), implode(", ", $compressions));
-         }?>
-
-        <div class="formelementrow" id="upload_form">
-        <?php if($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?>
-            <ul>
-            <li>
-                <input type="radio" name="file_location" id="radio_import_file" />
-                <?php PMA_browseUploadFile($max_upload_size); ?>
-            </li>
-            <li>
-                <input type="radio" name="file_location" id="radio_local_import_file" />
-                <?php PMA_selectUploadFile($import_list, $cfg['UploadDir']); ?>
-            </li>
-            </ul>
-        <?php } else if ($GLOBALS['is_upload']) {
-            $uid = uniqid("");
-            PMA_browseUploadFile($max_upload_size);
-        } else if (!$GLOBALS['is_upload']) {
-            PMA_Message::warning(__('File uploads are not allowed on this server.'))->display();
-        } else if (!empty($cfg['UploadDir'])) {
-            PMA_selectUploadFile($import_list, $cfg['UploadDir']);
-        } // end if (web-server upload directory)
-        ?>
-        </div>
-
-       <div class="formelementrow" id="charaset_of_file">
-        <?php // charset of file
-        if ($cfg['AllowAnywhereRecoding']) {
-            echo '<label for="charset_of_file">' . __('Character set of the file:') . '</label>';
-            reset($cfg['AvailableCharsets']);
-            echo '<select id="charset_of_file" name="charset_of_file" size="1">';
-            foreach ($cfg['AvailableCharsets'] as $temp_charset) {
-                echo '<option value="' . htmlentities($temp_charset) .  '"';
-                if ((empty($cfg['Import']['charset']) && $temp_charset == $charset)
-                        || $temp_charset == $cfg['Import']['charset']) {
-                    echo ' selected="selected"';
-                }
-                echo '>' . htmlentities($temp_charset) . '</option>';
-            }
-            echo ' </select><br />';
-        } else {
-            echo '<label for="charset_of_file">' . __('Character set of the file:') . '</label>' . "\n";
-            echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', 'charset_of_file', 'utf8', FALSE);
-        } // end if (recoding)
-        ?>
-        </div>
-    </div>
-    <div class="importoptions">
-        <h3><?php echo __('Partial Import:'); ?></h3>
-
-        <?php
-        if (isset($timeout_passed) && $timeout_passed) {
-            echo '<div class="formelementrow">' . "\n";
-            echo '<input type="hidden" name="skip" value="' . $offset . '" />';
-            echo sprintf(__('Previous import timed out, after resubmitting will continue from position %d.'), $offset) . '';
-            echo '</div>' . "\n";
-        }
-        ?>
-        <div class="formelementrow">
-            <input type="checkbox" name="allow_interrupt" value="yes"
-                   id="checkbox_allow_interrupt" <?php echo PMA_pluginCheckboxCheck('Import', 'allow_interrupt'); ?>/>
-            <label for="checkbox_allow_interrupt"><?php echo __('Allow the interruption of an import in case the script detects it is close to the PHP timeout limit. <i>(This might be good way to import large files, however it can break transactions.)</i>'); ?></label><br />
-        </div>
-
-        <?php
-        if (! (isset($timeout_passed) && $timeout_passed)) {
-            ?>
-        <div class="formelementrow">
-            <label for="text_skip_queries"><?php echo __('Number of rows to skip, starting from the first row:'); ?></label>
-            <input type="text" name="skip_queries" value="<?php echo PMA_pluginGetDefault('Import', 'skip_queries');?>" id="text_skip_queries" />
-        </div>
-            <?php
-        } else {
-            // If timeout has passed,
-            // do not show the Skip dialog to avoid the risk of someone
-            // entering a value here that would interfere with "skip"
-            ?>
-        <input type="hidden" name="skip_queries" value="<?php echo PMA_pluginGetDefault('Import', 'skip_queries');?>" id="text_skip_queries" />
-            <?php
-        }
-        ?>
-    </div>
-
-    <div class="importoptions">
-        <h3><?php echo __('Format:'); ?></h3>
-        <?php echo PMA_pluginGetChoice('Import', 'format', $import_list); ?>
-        <div id="import_notification"></div>
-    </div>
-
-    <div class="importoptions" id="format_specific_opts">
-        <h3><?php echo __('Format-Specific Options:'); ?></h3>
-        <p class="no_js_msg" id="scroll_to_options_msg">Scroll down to fill in the options for the selected format and ignore the options for other formats.</p>
-        <?php echo PMA_pluginGetOptions('Import', $import_list); ?>
-    </div>
-        <div class="clearfloat"></div>
-    </div>
-    <?php
-    // Encoding setting form appended by Y.Kawada
-    if (function_exists('PMA_set_enc_form')) { ?>
-        <div class="importoptions" id="kanji_encoding">
-            <h3><?php echo __('Encoding Conversion:'); ?></h3>
-            <?php echo PMA_set_enc_form('            '); ?>
-        </div>
-    <?php }
-    echo "\n";
-    ?>
-    <div class="importoptions" id="submit">
-        <input type="submit" value="<?php echo __('Go'); ?>" id="buttonGo" />
-    </div>
-</form>
-</div>

libraries/display_import_ajax.lib.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
-* @version $Id$
 * @package phpMyAdmin
 */
 

libraries/display_select_lang.lib.php

@@ -3,7 +3,6 @@
 /**
  * Code for displaying language selection
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/display_tbl.lib.php

@@ -3,7 +3,6 @@
 /**
  * library for displaying table with results from all sort of select queries
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -2309,7 +2308,6 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
  * @uses    PMA_DBI_try_query()
  * @uses    PMA_DBI_num_rows()
  * @uses    PMA_DBI_fetch_row()
- * @uses    __('Link not found')
  * @uses    PMA_DBI_free_result()
  * @uses    $GLOBALS['printview']
  * @uses    htmlspecialchars()

libraries/display_tbl_links.lib.php

@@ -7,7 +7,6 @@
  * - reversed the right modify links: 1. drop, 2. edit, 3. checkbox
  * - also changes made in js/functions.js
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {

libraries/engines/bdb.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/engines/berkeleydb.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/engines/binlog.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/engines/innobase.lib.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/engines/innodb.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
@@ -12,13 +11,6 @@
 class PMA_StorageEngine_innodb extends PMA_StorageEngine
 {
     /**
-     * @uses    __('Data home directory')
-     * @uses    __('The common part of the directory path for all InnoDB data files.')
-     * @uses    __('Data files')
-     * @uses    __('Autoextend increment')
-     * @uses    __(' The increment size for extending the size of an autoextending tablespace when it becomes full.')
-     * @uses    __('Buffer pool size')
-     * @uses    __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.')
      * @uses    PMA_ENGINE_DETAILS_TYPE_NUMERIC
      * @uses    PMA_ENGINE_DETAILS_TYPE_SIZE
      * @return  array
@@ -131,8 +123,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
     /**
      * @uses    $this->support
      * @uses    PMA_ENGINE_SUPPORT_YES
-     * @uses    __('Buffer Pool')
-     * @uses    __('InnoDB Status')
      * @return  array   detail pages
      */
     function getInfoPages()
@@ -152,22 +142,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
      * @uses    PMA_DBI_fetch_result()
      * @uses    PMA_formatNumber()
      * @uses    PMA_formatByteDown()
-     * @uses    __('Buffer Pool Usage')
-     * @uses    __('Total')
-     * @uses    __('pages')
-     * @uses    __('Free pages')
-     * @uses    __('Dirty pages')
-     * @uses    __('Pages containing data')
-     * @uses    __('Pages to be flushed')
-     * @uses    __('Busy pages')
-     * @uses    __('Latched pages')
-     * @uses    __('Buffer Pool Activity')
-     * @uses    __('Read requests')
-     * @uses    __('Write requests')
-     * @uses    __('Read misses')
-     * @uses    __('Write waits')
-     * @uses    __('Read misses in %')
-     * @uses    __('Write waits in %')
      * @uses    join()
      * @uses    htmlspecialchars()
      * @uses    PMA_formatNumber()

libraries/engines/memory.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/engines/merge.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/engines/mrg_myisam.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/engines/myisam.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/engines/ndbcluster.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/engines/pbxt.lib.php

@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 

libraries/export/codegen.php

@@ -4,7 +4,6 @@
  * Set of functions used to build NHibernate dumps of tables
  *
  * @package phpMyAdmin-Export-Codegen
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/csv.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Export-CSV
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/excel.php

@@ -4,7 +4,6 @@
  * Set of functions used to build CSV dumps of tables
  *
  * @package phpMyAdmin-Export-CSV
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/htmlword.php

@@ -4,7 +4,6 @@
  * Set of functions used to build CSV dumps of tables
  *
  * @package phpMyAdmin-Export-HTMLWord
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/latex.php

@@ -4,7 +4,6 @@
  * Set of functions used to build dumps of tables
  *
  * @package phpMyAdmin-Export-Latex
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/ods.php

@@ -4,7 +4,6 @@
  * Set of functions used to build OpenDocument Spreadsheet dumps of tables
  *
  * @package phpMyAdmin-Export-ODS
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/odt.php

@@ -4,7 +4,6 @@
  * Set of functions used to build OpenDocument Text dumps of tables
  *
  * @package phpMyAdmin-Export-ODT
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/pdf.php

@@ -4,7 +4,6 @@
  * Produce a PDF report (export) from a query
  *
  * @package phpMyAdmin-Export-PDF
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/sql.php

@@ -4,7 +4,6 @@
  * Set of functions used to build SQL dumps of tables
  *
  * @package phpMyAdmin-Export-SQL
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -238,7 +237,6 @@ function PMA_exportFooter()
     }
 
     // restore connection settings
-    // (not set if $cfg['AllowAnywhereRecoding'] is false)
     $charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
     if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
         $foot .=  $crlf
@@ -327,8 +325,7 @@ function PMA_exportHeader()
         // so that a utility like the mysql client can interpret
         // the file correctly
         if (isset($GLOBALS['charset_of_file']) && isset($mysql_charset_map[$GLOBALS['charset_of_file']])) {
-            // $cfg['AllowAnywhereRecoding'] was true so we got a charset from
+            // we got a charset from the export dialog
-            // the export dialog
             $set_names = $mysql_charset_map[$GLOBALS['charset_of_file']];
         } else {
             // by default we use the connection charset

libraries/export/xls.php

@@ -4,7 +4,6 @@
  *
  *
  * @package phpMyAdmin-Export-XLS
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/xlsx.php

@@ -4,7 +4,6 @@
  *
  *
  * @package phpMyAdmin-Export-XLSX
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;

libraries/export/xml.php

@@ -4,7 +4,6 @@
  * Set of functions used to build XML dumps of tables
  *
  * @todo    
- * @version $Id$
  * @package phpMyAdmin-Export-XML
  */
 if (! defined('PHPMYADMIN')) {

libraries/export/yaml.php

@@ -3,7 +3,6 @@
 /**
  * Set of functions used to build YAML dumps of tables
  *
- * @version $Id$
  * @package phpMyAdmin-Export-YAML
  */
 if (! defined('PHPMYADMIN')) {

libraries/file_listing.php

@@ -4,7 +4,6 @@
  * Functions for listing directories
  *
  * @todo rename to file_listing.lib.php
- * @version $Id$
  * @package phpMyAdmin
  */
 

libraries/footer.inc.php

@@ -31,7 +31,6 @@
  * @uses    $cfg['NavigationBarIconic']
  * @uses    $cfg['DBG']['enable']
  * @uses    $cfg['DBG']['profile']['enable']
- * @uses    __('Open new phpMyAdmin window')
  * @uses    $cfg['MaxCharactersInDisplayedSQL']
  * @uses    PMA_isValid()
  * @uses    PMA_setHistory()
@@ -41,7 +40,6 @@
  * @uses    PMA_generate_common_url()
  * @uses    basename()
  * @uses    file_exists()
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {