[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2065-g2092572

[Michal Čihař]

The branch, master has been updated
       via  20925728e7266ee877049bffe4824b720c4b1549 (commit)
      from  e7f528e0b7f5c9c370cd657e60c5f251353c87a1 (commit)


- Log -----------------------------------------------------------------
commit 20925728e7266ee877049bffe4824b720c4b1549
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Apr 22 20:21:07 2010 +0200

    Replace other usages of deprecated split().

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

Summary of changes:
 libraries/auth/swekey/swekey.auth.lib.php |    2 +-
 libraries/import/csv.php                  |   28 ++++++++++++++--------------
 libraries/import/ldi.php                  |    2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php
index f1e7c58..729c882 100644
--- a/libraries/auth/swekey/swekey.auth.lib.php
+++ b/libraries/auth/swekey/swekey.auth.lib.php
@@ -21,7 +21,7 @@ function Swekey_auth_check()
 	if ($_SESSION['SWEKEY']['ENABLED'] && empty($_SESSION['SWEKEY']['CONF_LOADED'])) {
         $_SESSION['SWEKEY']['CONF_LOADED'] = true;
         $_SESSION['SWEKEY']['VALID_SWEKEYS'] = array();
-        $valid_swekeys = split("\n", at file_get_contents($confFile));
+        $valid_swekeys = explode("\n", @file_get_contents($confFile));
         foreach ($valid_swekeys as $line) {
             if (preg_match("/^[0-9A-F]{32}:.+$/", $line) != false)
 			{
diff --git a/libraries/import/csv.php b/libraries/import/csv.php
index f7ab3ed..c6aebdf 100644
--- a/libraries/import/csv.php
+++ b/libraries/import/csv.php
@@ -31,7 +31,7 @@ if (isset($plugin_list)) {
             ),
         'options_text' => 'strOptions',
         );
-    
+
     if ($plugin_param !== 'table') {
         $plugin_list['csv']['options'][] =
             array('type' => 'bool', 'name' => 'col_names', 'text' => 'strImportColNames');
@@ -39,7 +39,7 @@ if (isset($plugin_list)) {
         $plugin_list['csv']['options'][] =
             array('type' => 'text', 'name' => 'columns', 'text' => 'strColumnNames');
     }
-    
+
     /* We do not define function when plugin is just queried for information above */
     return;
 }
@@ -101,7 +101,7 @@ if (!$analyze) {
     } else {
         $sql_template .= ' (';
         $fields = array();
-        $tmp   = split(',( ?)', $csv_columns);
+        $tmp   = preg_split('/,( ?)/', $csv_columns);
         foreach ($tmp as $key => $val) {
             if (count($fields) > 0) {
                 $sql_template .= ', ';
@@ -126,7 +126,7 @@ if (!$analyze) {
         }
         $sql_template .= ') ';
     }
-    
+
     $required_fields = count($fields);
 
     $sql_template .= ' VALUES (';
@@ -287,18 +287,18 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
             if (!$csv_finish) {
                 $values[] = '';
             }
-            
+
             if ($analyze) {
                 foreach ($values as $ley => $val) {
                     $tempRow[] = $val;
                     ++$col_count;
                 }
-                
+
                 if ($col_count > $max_cols) {
                     $max_cols = $col_count;
                 }
                 $col_count = 0;
-                
+
                 $rows[] = $tempRow;
                 $tempRow = array();
             } else {
@@ -315,7 +315,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
                         break;
                     }
                 }
-                
+
                 $first = TRUE;
                 $sql = $sql_template;
                 foreach ($values as $key => $val) {
@@ -331,13 +331,13 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
                     $first = FALSE;
                 }
                 $sql .= ')';
-                
+
                 /**
                  * @todo maybe we could add original line to verbose SQL in comment
                  */
                 PMA_importRunQuery($sql, $sql);
             }
-            
+
             $line++;
             $csv_finish = FALSE;
             $values = array();
@@ -358,26 +358,26 @@ if ($analyze) {
             $rows[$i][] = 'NULL';
         }
     }
-    
+
     if ($_REQUEST['csv_col_names']) {
         $col_names = array_splice($rows, 0, 1);
         $col_names = $col_names[0];
     }
-    
+
     if ((isset($col_names) && count($col_names) != $max_cols) || !isset($col_names)) {
         // Fill out column names
         for ($i = 0; $i < $max_cols; ++$i) {
             $col_names[] = 'COL '.($i+1);
         }
     }
-    
+
     if (strlen($db)) {
         $result = PMA_DBI_fetch_result('SHOW TABLES');
         $tbl_name = 'TABLE '.(count($result) + 1);
     } else {
         $tbl_name = 'TBL_NAME';
     }
-    
+
     $tables[] = array($tbl_name, $col_names, $rows);
 
     /* Obtain the best-fit MySQL types for each column */
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
index 77ba0c1..f939a2d 100644
--- a/libraries/import/ldi.php
+++ b/libraries/import/ldi.php
@@ -90,7 +90,7 @@ if ($skip_queries > 0) {
 }
 if (strlen($ldi_columns) > 0) {
     $sql .= ' (';
-    $tmp   = split(',( ?)', $ldi_columns);
+    $tmp   = preg_split('/,( ?)/', $ldi_columns);
     $cnt_tmp = count($tmp);
     for ($i = 0; $i < $cnt_tmp; $i++) {
         if ($i > 0) {


hooks/post-receive
-- 
phpMyAdmin