[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5788-g95c0b51

[Michal Čihař]

The branch, master has been updated
       via  95c0b5125d1be0177d9a30f8b7414804662e6064 (commit)
      from  79a23fcd01ee2bd7ca2f5e5cb89bc993492597fa (commit)


- Log -----------------------------------------------------------------
commit 95c0b5125d1be0177d9a30f8b7414804662e6064
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jul 20 13:57:25 2010 +0200

    This function is not used anywhere.

-----------------------------------------------------------------------

Summary of changes:
 libraries/charset_conversion.lib.php |   45 ----------------------------------
 1 files changed, 0 insertions(+), 45 deletions(-)

diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 15f4a11..0b03c7e 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -84,49 +84,4 @@ function PMA_convert_string($src_charset, $dest_charset, $what) {
     }
 } //  end of the "PMA_convert_string()" function
 
-
-/**
- * Converts encoding of file according to parameters with detected
- * conversion function. The old file will be unlinked and new created and
- * its file name is returned.
- *
- * @param   string   source charset
- * @param   string   target charset
- * @param   string   file to convert
- *
- * @return  string   new temporay file
- *
- * @access  public
- *
- */
-function PMA_convert_file($src_charset, $dest_charset, $file) {
-    switch ($GLOBALS['PMA_recoding_engine']) {
-        case PMA_CHARSET_RECODE:
-        case PMA_CHARSET_ICONV:
-            $tmpfname = tempnam('', 'PMA_convert_file');
-            $fin      = fopen($file, 'r');
-            $fout     = fopen($tmpfname, 'w');
-            if ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_RECODE) {
-                recode_file($src_charset . '..'  . $dest_charset, $fin, $fout);
-            } else {
-                while (!feof($fin)) {
-                    $line = fgets($fin, 4096);
-                    if ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV) {
-                        $dist = iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line);
-                    } elseif ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV_AIX) {
-                        $dist = PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line);
-                    }
-                    fputs($fout, $dist);
-                } // end while
-            }
-            fclose($fin);
-            fclose($fout);
-            unlink($file);
-
-            return $tmpfname;
-        default:
-            return $file;
-    }
-} //  end of the "PMA_convert_file()" function
-
 ?>


hooks/post-receive
-- 
phpMyAdmin