Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

Conflicts:
	libraries/display_export.lib.php

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_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);
-        $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
     // Check if the user already added extension; get the substring where the extension would be if it was included

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;
     }
@@ -451,7 +450,7 @@ if (isset($my_die)) {
 if (! empty($last_query_with_results)) {
     // but we want to show intermediate results too
     $disp_query = $sql_query;
-    $disp_message = __('Your SQL query has been executed successfully'); 
+    $disp_message = __('Your SQL query has been executed successfully');
     $sql_query = $last_query_with_results;
     $go_sql = 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

@@ -194,7 +194,7 @@ function confirmQuery(theForm1, sqlQuery1)
  * Displays a confirmation box before disabling the BLOB repository for a given database.
  * This function is called while clicking links
  *
- * @param   object   the database 
+ * @param   object   the database
  *
  * @return  boolean  whether to disable the repository or not
  */
@@ -282,10 +282,10 @@ function checkSqlQuery(theForm)
 // Global variable row_class is set to even
 var row_class = 'even';
 
-/** 
+/**
 * Generates a row dynamically in the differences table displaying
-* the complete statistics of difference in  table like number of 
+* the complete statistics of difference in  table like number of
-* rows to be updated, number of rows to be inserted, number of 
+* rows to be updated, number of rows to be inserted, number of
 * columns to be added, number of columns to be removed, etc.
 *
 * @param  index         index of matching table
@@ -294,17 +294,17 @@ var row_class = 'even';
 * @param  remove_size   number of columns to be removed
 * @param  insert_index  number of indexes to be inserted
 * @param  remove_index  number of indexes to be removed
-* @param  img_obj       image object 
+* @param  img_obj       image object
 * @param  table_name    name of the table
 */
 
 function showDetails(i, update_size, insert_size, remove_size, insert_index, remove_index, img_obj, table_name)
-{   
+{
     // The path of the image is split to facilitate comparison
-    var relative_path = (img_obj.src).split("themes/"); 
+    var relative_path = (img_obj.src).split("themes/");
-    
+
     // The image source is changed when the showDetails function is called.
-    if (relative_path[1] == 'original/img/new_data_hovered.jpg') {    
+    if (relative_path[1] == 'original/img/new_data_hovered.jpg') {
         img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg";
         img_obj.alt = PMA_messages['strClickToUnselect'];  //only for IE browser
     } else if (relative_path[1] == 'original/img/new_struct_hovered.jpg') {
@@ -313,76 +313,76 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem
     } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') {
         img_obj.src = "./themes/original/img/new_struct_hovered.jpg";
         img_obj.alt = PMA_messages['strClickToSelect'];
-    } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') {    
+    } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') {
         img_obj.src = "./themes/original/img/new_data_hovered.jpg";
         img_obj.alt = PMA_messages['strClickToSelect'];
-    } 
+    }
-    
+
-    var div = document.getElementById("list");    
+    var div = document.getElementById("list");
-    var table = div.getElementsByTagName("table")[0]; 
+    var table = div.getElementsByTagName("table")[0];
     var table_body = table.getElementsByTagName("tbody")[0];
-    
+
     //Global variable row_class is being used
     if (row_class == 'even') {
         row_class = 'odd';
     } else {
-        row_class = 'even'; 
+        row_class = 'even';
     }
-    // If the red or green button against a table name is pressed then append a new row to show the details of differences of this table. 
+    // If the red or green button against a table name is pressed then append a new row to show the details of differences of this table.
-    if ((relative_path[1] != 'original/img/new_struct_selected_hovered.jpg') && (relative_path[1] != 'original/img/new_data_selected_hovered.jpg')) { 
+    if ((relative_path[1] != 'original/img/new_struct_selected_hovered.jpg') && (relative_path[1] != 'original/img/new_data_selected_hovered.jpg')) {
-        
+
-        var newRow = document.createElement("tr");    
+        var newRow = document.createElement("tr");
         newRow.setAttribute("class", row_class);
-        newRow.className = row_class; 
+        newRow.className = row_class;
-        // Id assigned to this row element is same as the index of this table name in the  matching_tables/source_tables_uncommon array  
+        // Id assigned to this row element is same as the index of this table name in the  matching_tables/source_tables_uncommon array
         newRow.setAttribute("id" , i);
-            
+
         var table_name_cell = document.createElement("td");
         table_name_cell.align = "center";
         table_name_cell.innerHTML = table_name ;
-        
+
         newRow.appendChild(table_name_cell);
-       
+
         var create_table = document.createElement("td");
         create_table.align = "center";
-           
+
         var add_cols = document.createElement("td");
         add_cols.align = "center";
-        
+
         var remove_cols = document.createElement("td");
         remove_cols.align = "center";
-        
+
         var alter_cols = document.createElement("td");
         alter_cols.align = "center";
-        
+
         var add_index = document.createElement("td");
         add_index.align = "center";
-        
+
         var delete_index = document.createElement("td");
         delete_index.align = "center";
-        
+
         var update_rows = document.createElement("td");
         update_rows.align = "center";
-        
+
         var insert_rows = document.createElement("td");
         insert_rows.align = "center";
-        
+
         var tick_image = document.createElement("img");
-        tick_image.src = "./themes/original/img/s_success.png"; 
+        tick_image.src = "./themes/original/img/s_success.png";
 
         if (update_size == '' && insert_size == '' && remove_size == '') {
           /**
-          This is the case when the table needs to be created in target database. 
+          This is the case when the table needs to be created in target database.
           */
             create_table.appendChild(tick_image);
             add_cols.innerHTML = "--";
-            remove_cols.innerHTML = "--";         
+            remove_cols.innerHTML = "--";
             alter_cols.innerHTML = "--";
             delete_index.innerHTML = "--";
             add_index.innerHTML = "--";
             update_rows.innerHTML = "--";
             insert_rows.innerHTML = "--";
- 
+
             newRow.appendChild(create_table);
             newRow.appendChild(add_cols);
             newRow.appendChild(remove_cols);
@@ -391,43 +391,21 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem
             newRow.appendChild(add_index);
             newRow.appendChild(update_rows);
             newRow.appendChild(insert_rows);
-            
+
         } else if (update_size == '' && remove_size == '') {
            /**
-           This is the case when data difference is displayed in the 
+           This is the case when data difference is displayed in the
-           table which is present in source but absent from target database 
+           table which is present in source but absent from target database
           */
             create_table.innerHTML = "--";
             add_cols.innerHTML = "--";
-            remove_cols.innerHTML = "--";         
+            remove_cols.innerHTML = "--";
             alter_cols.innerHTML = "--";
             add_index.innerHTML = "--";
             delete_index.innerHTML = "--";
             update_rows.innerHTML = "--";
             insert_rows.innerHTML = insert_size;
-            
+
-            newRow.appendChild(create_table);
-            newRow.appendChild(add_cols);
-            newRow.appendChild(remove_cols);
-            newRow.appendChild(alter_cols);
-            newRow.appendChild(delete_index); 
-            newRow.appendChild(add_index);
-            newRow.appendChild(update_rows);
-            newRow.appendChild(insert_rows);
-            
-        } else if (remove_size == '') {
-            /**
-             This is the case when data difference between matching_tables is displayed. 
-            */
-            create_table.innerHTML = "--";
-            add_cols.innerHTML = "--";
-            remove_cols.innerHTML = "--";         
-            alter_cols.innerHTML = "--";
-            add_index.innerHTML = "--";
-            delete_index.innerHTML = "--";
-            update_rows.innerHTML = update_size;
-            insert_rows.innerHTML = insert_size;
-            
             newRow.appendChild(create_table);
             newRow.appendChild(add_cols);
             newRow.appendChild(remove_cols);
@@ -436,41 +414,63 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem
             newRow.appendChild(add_index);
             newRow.appendChild(update_rows);
             newRow.appendChild(insert_rows);
-            
+
+        } else if (remove_size == '') {
+            /**
+             This is the case when data difference between matching_tables is displayed.
+            */
+            create_table.innerHTML = "--";
+            add_cols.innerHTML = "--";
+            remove_cols.innerHTML = "--";
+            alter_cols.innerHTML = "--";
+            add_index.innerHTML = "--";
+            delete_index.innerHTML = "--";
+            update_rows.innerHTML = update_size;
+            insert_rows.innerHTML = insert_size;
+
+            newRow.appendChild(create_table);
+            newRow.appendChild(add_cols);
+            newRow.appendChild(remove_cols);
+            newRow.appendChild(alter_cols);
+            newRow.appendChild(delete_index);
+            newRow.appendChild(add_index);
+            newRow.appendChild(update_rows);
+            newRow.appendChild(insert_rows);
+
         } else {
             /**
             This is the case when structure difference between matching_tables id displayed
             */
             create_table.innerHTML = "--";
             add_cols.innerHTML = insert_size;
-            remove_cols.innerHTML = remove_size;         
+            remove_cols.innerHTML = remove_size;
             alter_cols.innerHTML = update_size;
             delete_index.innerHTML = remove_index;
             add_index.innerHTML = insert_index;
             update_rows.innerHTML = "--";
             insert_rows.innerHTML = "--";
-           
+
             newRow.appendChild(create_table);
             newRow.appendChild(add_cols);
             newRow.appendChild(remove_cols);
-            newRow.appendChild(alter_cols); 
+            newRow.appendChild(alter_cols);
             newRow.appendChild(delete_index);
             newRow.appendChild(add_index);
             newRow.appendChild(update_rows);
             newRow.appendChild(insert_rows);
         }
         table_body.appendChild(newRow);
-      
+
     } else if ((relative_path[1] != 'original/img/new_struct_hovered.jpg') && (relative_path[1] != 'original/img/new_data_hovered.jpg')) {
       //The case when the row showing the details need to be removed from the table i.e. the difference button is deselected now.
         var table_rows = table_body.getElementsByTagName("tr");
         var j;
         var index = 0;
-        for (j=0; j < table_rows.length; j++) 
+        for (j=0; j < table_rows.length; j++)
-        {   
+        {
-            if (table_rows[j].id == i) { 
+            if (table_rows[j].id == i) {
                 index = j;
-                table_rows[j].parentNode.removeChild(table_rows[j]);     
+                table_rows[j].parentNode.removeChild(table_rows[j]);
             }
         }
         //The table row css is being adjusted. Class "odd" for odd rows and "even" for even rows should be maintained.
@@ -481,11 +481,11 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem
                 table_rows[index].setAttribute("class","odd");  // for Mozilla firefox
                 table_rows[index].className = "odd";            // for IE browser
             } else {
-                table_rows[index].setAttribute("class","even"); // for Mozilla firefox  
+                table_rows[index].setAttribute("class","even"); // for Mozilla firefox
-                table_rows[index].className = "even";           // for IE browser       
+                table_rows[index].className = "even";           // for IE browser
             }
-        }    
+        }
-    }     
+    }
 }
 
 /**
@@ -494,35 +494,35 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem
  * @param   img_obj   the image object whose source needs to be changed
  *
  */
- 
+
 function change_Image(img_obj)
 {
-     var relative_path = (img_obj.src).split("themes/"); 
+     var relative_path = (img_obj.src).split("themes/");
-    
+
-    if (relative_path[1] == 'original/img/new_data.jpg') {    
+    if (relative_path[1] == 'original/img/new_data.jpg') {
-        img_obj.src = "./themes/original/img/new_data_hovered.jpg";  
+        img_obj.src = "./themes/original/img/new_data_hovered.jpg";
     } else if (relative_path[1] == 'original/img/new_struct.jpg') {
         img_obj.src = "./themes/original/img/new_struct_hovered.jpg";
     } else if (relative_path[1] == 'original/img/new_struct_hovered.jpg') {
         img_obj.src = "./themes/original/img/new_struct.jpg";
-    } else if (relative_path[1] == 'original/img/new_data_hovered.jpg') {    
+    } else if (relative_path[1] == 'original/img/new_data_hovered.jpg') {
-        img_obj.src = "./themes/original/img/new_data.jpg";  
+        img_obj.src = "./themes/original/img/new_data.jpg";
-    } else if (relative_path[1] == 'original/img/new_data_selected.jpg') {    
+    } else if (relative_path[1] == 'original/img/new_data_selected.jpg') {
-        img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg";  
+        img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg";
-    } else if(relative_path[1] == 'original/img/new_struct_selected.jpg') {    
+    } else if(relative_path[1] == 'original/img/new_struct_selected.jpg') {
-        img_obj.src = "./themes/original/img/new_struct_selected_hovered.jpg";  
+        img_obj.src = "./themes/original/img/new_struct_selected_hovered.jpg";
-    } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') {    
+    } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') {
-        img_obj.src = "./themes/original/img/new_struct_selected.jpg";  
+        img_obj.src = "./themes/original/img/new_struct_selected.jpg";
-    } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') {    
+    } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') {
-        img_obj.src = "./themes/original/img/new_data_selected.jpg";  
+        img_obj.src = "./themes/original/img/new_data_selected.jpg";
     }
 }
 
 /**
- * Generates the URL containing the list of selected table ids for synchronization and 
+ * Generates the URL containing the list of selected table ids for synchronization and
- * a variable checked for confirmation of deleting previous rows from target tables 
+ * a variable checked for confirmation of deleting previous rows from target tables
  *
- * @param   token   the token generated for each PMA form 
+ * @param   token   the token generated for each PMA form
  *
  */
 
@@ -536,15 +536,15 @@ function ApplySelectedChanges(token)
     var x = table_rows.length;
     var i;
     /**
-     Append the token at the beginning of the query string followed by  
+     Append the token at the beginning of the query string followed by
-    Table_ids that shows that "Apply Selected Changes" button is pressed            
+    Table_ids that shows that "Apply Selected Changes" button is pressed
     */
     var append_string = "?token="+token+"&Table_ids="+1;
     for(i=0; i<x; i++){
-           append_string += "&";    
+           append_string += "&";
-           append_string += i+"="+table_rows[i].id; 
+           append_string += i+"="+table_rows[i].id;
     }
-    
+
     // Getting the value of checkbox delete_rows
     var checkbox = document.getElementById("delete_rows");
     if (checkbox.checked){
@@ -552,13 +552,13 @@ function ApplySelectedChanges(token)
     } else {
          append_string += "&checked=false";
     }
-    //Appending the token and list of table ids in the URL 
+    //Appending the token and list of table ids in the URL
     location.href += token;
     location.href += append_string;
 }
 
-/** 
+/**
-* Displays error message if any text field 
+* Displays error message if any text field
 * is left empty other than port field.
 *
 * @param  string   the form name
@@ -567,7 +567,7 @@ function ApplySelectedChanges(token)
 * @return  boolean  whether the form field is empty or not
 */
 function validateConnection(form_name, form_obj)
-{   
+{
     var check = true;
     var src_hostfilled = true;
     var trg_hostfilled = true;
@@ -602,7 +602,7 @@ function validateConnection(form_name, form_obj)
     }
     return check;
 }
-    
+
 /**
  * Check if a form's element is empty
  * should be
@@ -1637,8 +1637,8 @@ function pdfPaperSize(format, axis) {
 /**
  * for playing media from the BLOB repository
  *
- * @param   var     
+ * @param   var
- * @param   var     url_params  main purpose is to pass the token 
+ * @param   var     url_params  main purpose is to pass the token
  * @param   var     bs_ref      BLOB repository reference
  * @param   var     m_type      type of BLOB repository media
  * @param   var     w_width     width of popup window
@@ -1690,12 +1690,12 @@ function requestMIMETypeChange(db, table, reference, current_mime_type)
  */
 function changeMIMEType(db, table, reference, mime_type)
 {
-    // specify url and parameters for jQuery POST 
+    // specify url and parameters for jQuery POST
     var mime_chg_url = 'bs_change_mime_type.php';
     var params = { bs_db: db, bs_table: table, bs_reference: reference, bs_new_mime_type: mime_type };
 
     // jQuery POST
-    jQuery.post(mime_chg_url, params); 
+    jQuery.post(mime_chg_url, params);
 }
 
 /**
@@ -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,116 +3,50 @@
 /**
  * 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 (@function_exists('iconv')) {
-
+        if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
-    if (!isset($PMA_recoding_engine)) {
+            $PMA_recoding_engine = PMA_CHARSET_ICONV_AIX;
-        $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_recoding_engine = PMA_CHARSET_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.');
-            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;
-
-            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 {
-        if (@function_exists('iconv')) {
+        $PMA_recoding_engine = PMA_CHARSET_NONE;
-            if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
+        PMA_warnMissingExtension('iconv');
-                $PMA_recoding_engine = PMA_CHARSET_ICONV_AIX;
+    }
-            } else {
+} elseif ($cfg['RecodingEngine'] == 'recode') {
-                $PMA_recoding_engine = PMA_CHARSET_ICONV;
+    if (@function_exists('recode_string')) {
-            }
+        $PMA_recoding_engine = PMA_CHARSET_RECODE;
-        } elseif (@function_exists('libiconv')) {
+    } else {
-            $PMA_recoding_engine = PMA_CHARSET_LIBICONV;
+        $PMA_recoding_engine = PMA_CHARSET_NONE;
-        } elseif (@function_exists('recode_string')) {
+        PMA_warnMissingExtension('recode');
-            $PMA_recoding_engine = PMA_CHARSET_RECODE;
+    }
+} 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_NONE;
+            $PMA_recoding_engine = PMA_CHARSET_ICONV;
-
-            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;
         }
+    } elseif (@function_exists('recode_string')) {
+        $PMA_recoding_engine = PMA_CHARSET_RECODE;
+    } else {
+        $PMA_recoding_engine = PMA_CHARSET_NONE;
     }
 } else {
-    $PMA_recoding_engine         = PMA_CHARSET_NONE;
+    $PMA_recoding_engine = PMA_CHARSET_NONE;
 }
 
 /* Load AIX iconv wrapper if needed */
@@ -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()
@@ -503,11 +500,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()
@@ -1616,8 +1609,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']
@@ -1884,7 +1875,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
@@ -2193,7 +2183,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
@@ -2297,7 +2286,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
@@ -2408,7 +2396,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()
@@ -2438,7 +2425,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.
@@ -2828,7 +2814,7 @@ function PMA_getTitleForTarget($target) {
 
 $mapping = array(
 	// Values for $cfg['DefaultTabTable']
-	'tbl_structure.php' =>  __('Structure'), 
+	'tbl_structure.php' =>  __('Structure'),
 	'tbl_sql.php' => __('SQL'),
 	'tbl_select.php' =>__('Search'),
 	'tbl_change.php' =>__('Insert'),

libraries/config.default.php

@@ -16,7 +16,6 @@
  *
  * All directives are explained in Documentation.html
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -544,7 +543,7 @@ $cfg['SessionSavePath'] = '';
 /**
  * maximum allocated bytes ('0' for no limit)
  * this is a string because '16M' is a valid value; we must put here
- * a string as the default value so that /setup accepts strings 
+ * a string as the default value so that /setup accepts strings
  *
  * @global string $cfg['MemoryLimit']
  */
@@ -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

@@ -62,13 +62,6 @@ if (isset($single_table)) {
 
 echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . "\n";
 
-// If the export method was not set, the default is quick
-if(!isset($cfg['Export']['method'])) {
-    $cfg['Export']['method'] = 'quick';
-}
-// The export method (quick, custom or custom-no-form)
-echo '<input type="hidden" name="export_method" value="' . $cfg['Export']['method'] . '" />';
-
 if (! empty($sql_query)) {
     echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n";
 }
@@ -92,21 +85,11 @@ if (! empty($sql_query)) {
     <h3><?php echo __('Export Method:'); ?></h3>
     <ul>
         <li>
-            <?php echo '<input type="radio" name="quick_or_custom" value="quick" id="radio_quick_export"';
+            <?php echo '<input type="radio" name="quick_or_custom" value="quick" id="radio_quick_export" checked="checked" />';
-            if($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
-                echo ' />';
-            } else {
-                echo ' 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"';
+            <?php echo '<input type="radio" name="quick_or_custom" value="custom" id="radio_custom_export" />';
-            if($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
-                echo ' checked="checked" />';
-            } else {
-                echo ' />';
-            }
             echo '<label for="radio_custom_export">' . __('Custom - display all possible options to configure') . '</label>';?>
         </li>
     </ul>

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')) {

libraries/grab_globals.lib.php

@@ -6,7 +6,6 @@
  * variables from them. It does the same work for $HTTP_ACCEPT_LANGUAGE and
  * $HTTP_AUTHORIZATION.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
@@ -71,7 +70,6 @@ $_import_blacklist = array(
     '/^goto$/i',        // page to display
     '/^back$/i',        // the page go back
     '/^lang$/i',        // selected language
-    '/^convcharset$/i', // PMA convert charset
     '/^collation_connection$/i', //
     '/^set_theme$/i',   //
     '/^sql_query$/i',   // the query to be executed

libraries/header.inc.php

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

libraries/header_http.inc.php

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

libraries/header_meta_style.inc.php

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

libraries/header_printview.inc.php

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

libraries/header_scripts.inc.php

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

libraries/iconv_wrapper.lib.php

@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
@@ -29,7 +28,7 @@ $gnu_iconv_to_aix_iconv_codepage_map = array (
     // "big5" --> "IBM-eucTW" according to http://kadesh.cepba.upc.es/mancpp/classref/ref/ITranscoder_DSC.htm
     'big5' => 'IBM-eucTW',
 
-    // Other mappings corresponding to the phpMyAdmin dropdown box when using the AllowAnywhereRecoding feature
+    // Other mappings corresponding to the phpMyAdmin dropdown box when using the charset conversion feature
     'euc-jp' => 'IBM-eucJP',
     'koi8-r' => 'IBM-eucKR',
     'ks_c_5601-1987' => 'KSC5601.1987-0',

libraries/import.lib.php

@@ -3,7 +3,6 @@
 /**
  * Library that provides common import functions that are used by import plugins
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {