XoopsModules25x / adminer

include/plugins/plugin.php

Doc Comments +6 added lines

@@ -27,6 +27,9 @@ 
 		}
 	}
 	
+	/**
+	 * @param string $function
+	 */
 	function _applyPlugin($function, $args) {
 		foreach ($this->plugins as $plugin) {
 			if (method_exists($plugin, $function)) {
@@ -46,6 +49,9 @@ 
 		return $this->_callParent($function, $args);
 	}
 	
+	/**
+	 * @param string $function
+	 */
 	function _appendPlugin($function, $args) {
 		$return = $this->_callParent($function, $args);
 		foreach ($this->plugins as $plugin) {

Indentation +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 	var $plugins;
 	
 	/**
-	* @param array
-	*/
+	 * @param array
+	 */
 	function AdminerPlugin($plugins) {
 		$this->plugins = $plugins;
 		// it is possible to use ReflectionObject in PHP 5 to find out which plugins defines which methods at once

index.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 **/
 
 if ( !include("../../mainfile.php") ) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 $module_dirname = basename( dirname( __FILE__ ) ) ;
 if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );

Spacing +5 added lines, -5 removed lines

@@ -17,14 +17,14 @@
  * @version             $Id $
 **/
 
-if ( !include("../../mainfile.php") ) {
+if (!include("../../mainfile.php")) {
     die("XOOPS root path not defined");
 }
-$module_dirname = basename( dirname( __FILE__ ) ) ;
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
+$module_dirname = basename(dirname(__FILE__));
+if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) exit(_NOPERM);
 $xoopsOption["template_main"] = $module_dirname . "_index.html";
 
-include(XOOPS_ROOT_PATH."/header.php");
+include(XOOPS_ROOT_PATH . "/header.php");
 
-include(XOOPS_ROOT_PATH."/footer.php");
+include(XOOPS_ROOT_PATH . "/footer.php");
 ?>

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
     die("XOOPS root path not defined");
 }
 $module_dirname = basename( dirname( __FILE__ ) ) ;
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+	exit( _NOPERM );
+}
 $xoopsOption["template_main"] = $module_dirname . "_index.html";
 
 include(XOOPS_ROOT_PATH."/header.php");

xoops_version.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  * @author              Kris <http://www.xoofoo.org>
  * @version             $Id $
 **/
-$module_dirname = basename( dirname( __FILE__ ) ) ;
+$module_dirname = basename(dirname(__FILE__));
 $modversion['name'] = _MI_ADMINER_NAME;
 $modversion['version'] = 3.0;
 $modversion['description'] = _MI_ADMINER_DESC;

mysql.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 **/
 // connect xoops database 
 if ( !include("../../mainfile.php") ) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 $module_dirname = basename( dirname( __FILE__ ) ) ;
 include(XOOPS_ROOT_PATH."/header.php");

Spacing +5 added lines, -5 removed lines

@@ -17,12 +17,12 @@ 
  * @version             $Id $
 **/
 // connect xoops database 
-if ( !include("../../mainfile.php") ) {
+if (!include("../../mainfile.php")) {
     die("XOOPS root path not defined");
 }
-$module_dirname = basename( dirname( __FILE__ ) ) ;
-include(XOOPS_ROOT_PATH."/header.php");
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
+$module_dirname = basename(dirname(__FILE__));
+include(XOOPS_ROOT_PATH . "/header.php");
+if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) exit(_NOPERM);
 
 function adminer_object() {
 	class AdminerKfr extends Adminer {
@@ -30,7 +30,7 @@ 
 			return 'XOOPS Admin';
 		}
 		function credentials() {
-			return array(XOOPS_DB_HOST,XOOPS_DB_USER,XOOPS_DB_PASS);
+			return array(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
 		}
 		function database() {
 			return XOOPS_DB_NAME;

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
 }
 $module_dirname = basename( dirname( __FILE__ ) ) ;
 include(XOOPS_ROOT_PATH."/header.php");
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+	exit( _NOPERM );
+}
 
 function adminer_object() {
 	class AdminerKfr extends Adminer {

include/bigdump.php

Indentation +267 added lines, -267 removed lines

@@ -51,7 +51,7 @@ 
 $ajax               = true;   // AJAX mode: import will be done without refreshing the website
 $linespersession    = 3000;   // Lines to be executed per one import session
 $delaypersession    = 0;      // You can specify a sleep time in milliseconds after each session
-                              // Works only if JavaScript is activated. Use to reduce server overrun
+							  // Works only if JavaScript is activated. Use to reduce server overrun
 
 // CSV related settings (only if you use a CSV dump)
 
@@ -319,23 +319,23 @@ 
 if (!$error && isset($_REQUEST["uploadbutton"]))
 { if (is_uploaded_file($_FILES["dumpfile"]["tmp_name"]) && ($_FILES["dumpfile"]["error"])==0)
   { 
-    $uploaded_filename=str_replace(" ","_",$_FILES["dumpfile"]["name"]);
-    $uploaded_filename=preg_replace("/[^_A-Za-z0-9-\.]/i",'',$uploaded_filename);
-    $uploaded_filepath=str_replace("\\","/",$upload_dir."/".$uploaded_filename);
-
-    if (file_exists($uploaded_filename))
-    { echo ("<p class=\"error\">File $uploaded_filename already exist! Delete and upload again!</p>\n");
-    }
-    else if (!preg_match("/(\.(sql|gz|csv))$/i",$uploaded_filename))
-    { echo ("<p class=\"error\">You may only upload .sql .gz or .csv files.</p>\n");
-    }
-    else if (!@move_uploaded_file($_FILES["dumpfile"]["tmp_name"],$uploaded_filepath))
-    { echo ("<p class=\"error\">Error moving uploaded file ".$_FILES["dumpfile"]["tmp_name"]." to the $uploaded_filepath</p>\n");
-      echo ("<p>Check the directory permissions for $upload_dir (must be 777)!</p>\n");
-    }
-    else
-    { echo ("<p class=\"success\">Uploaded file saved as $uploaded_filename</p>\n");
-    }
+	$uploaded_filename=str_replace(" ","_",$_FILES["dumpfile"]["name"]);
+	$uploaded_filename=preg_replace("/[^_A-Za-z0-9-\.]/i",'',$uploaded_filename);
+	$uploaded_filepath=str_replace("\\","/",$upload_dir."/".$uploaded_filename);
+
+	if (file_exists($uploaded_filename))
+	{ echo ("<p class=\"error\">File $uploaded_filename already exist! Delete and upload again!</p>\n");
+	}
+	else if (!preg_match("/(\.(sql|gz|csv))$/i",$uploaded_filename))
+	{ echo ("<p class=\"error\">You may only upload .sql .gz or .csv files.</p>\n");
+	}
+	else if (!@move_uploaded_file($_FILES["dumpfile"]["tmp_name"],$uploaded_filepath))
+	{ echo ("<p class=\"error\">Error moving uploaded file ".$_FILES["dumpfile"]["tmp_name"]." to the $uploaded_filepath</p>\n");
+	  echo ("<p>Check the directory permissions for $upload_dir (must be 777)!</p>\n");
+	}
+	else
+	{ echo ("<p class=\"success\">Uploaded file saved as $uploaded_filename</p>\n");
+	}
   }
   else
   { echo ("<p class=\"error\">Error uploading file ".$_FILES["dumpfile"]["name"]."</p>\n");
@@ -347,9 +347,9 @@ 
 
 if (!$error && isset($_REQUEST["delete"]) && $_REQUEST["delete"]!=basename($_SERVER["SCRIPT_FILENAME"]))
 { if (preg_match("/(\.(sql|gz|csv))$/i",$_REQUEST["delete"]) && @unlink(basename($_REQUEST["delete"])))
-    echo ("<p class=\"success\">".$_REQUEST["delete"]." was removed successfully</p>\n");
+	echo ("<p class=\"success\">".$_REQUEST["delete"]." was removed successfully</p>\n");
   else
-    echo ("<p class=\"error\">Can't remove ".$_REQUEST["delete"]."</p>\n");
+	echo ("<p class=\"error\">Can't remove ".$_REQUEST["delete"]."</p>\n");
 }
 
 // Connect to the database, set charset and execute pre-queries
@@ -357,26 +357,26 @@ 
 if (!$error && !TESTMODE)
 { $dbconnection = @mysql_connect($db_server,$db_username,$db_password);
   if ($dbconnection) 
-    $db = mysql_select_db($db_name);
+	$db = mysql_select_db($db_name);
   if (!$dbconnection || !$db) 
   { echo ("<p class=\"error\">Database connection failed due to ".mysql_error()."</p>\n");
-    echo ("<p>Edit the database settings in ".$_SERVER["SCRIPT_FILENAME"]." or contact your database provider.</p>\n");
-    $error=true;
+	echo ("<p>Edit the database settings in ".$_SERVER["SCRIPT_FILENAME"]." or contact your database provider.</p>\n");
+	$error=true;
   }
   if (!$error && $db_connection_charset!=='')
-    @mysql_query("SET NAMES $db_connection_charset", $dbconnection);
+	@mysql_query("SET NAMES $db_connection_charset", $dbconnection);
 
   if (!$error && isset ($pre_query) && sizeof ($pre_query)>0)
   { reset($pre_query);
-    foreach ($pre_query as $pre_query_value)
-    {	if (!@mysql_query($pre_query_value, $dbconnection))
-    	{ echo ("<p class=\"error\">Error with pre-query.</p>\n");
-      	echo ("<p>Query: ".trim(nl2br(htmlentities($pre_query_value)))."</p>\n");
-      	echo ("<p>MySQL: ".mysql_error()."</p>\n");
-      	$error=true;
-      	break;
-     }
-    }
+	foreach ($pre_query as $pre_query_value)
+	{	if (!@mysql_query($pre_query_value, $dbconnection))
+		{ echo ("<p class=\"error\">Error with pre-query.</p>\n");
+	  	echo ("<p>Query: ".trim(nl2br(htmlentities($pre_query_value)))."</p>\n");
+	  	echo ("<p>MySQL: ".mysql_error()."</p>\n");
+	  	$error=true;
+	  	break;
+	 }
+	}
   }
 }
 else
@@ -392,49 +392,49 @@ 
 if (!$error && !isset($_REQUEST["fn"]) && $filename=="")
 { if ($dirhandle = opendir($upload_dir)) 
   { 
-    $files=array();
-    while (false !== ($files[] = readdir($dirhandle)));
-    closedir($dirhandle);
-    $dirhead=false;
-
-    if (sizeof($files)>0)
-    { 
-      sort($files);
-      foreach ($files as $dirfile)
-      { 
-        if ($dirfile != "." && $dirfile != ".." && $dirfile!=basename($_SERVER["SCRIPT_FILENAME"]) && preg_match("/\.(sql|gz|csv)$/i",$dirfile))
-        { if (!$dirhead)
-          { echo ("<table width=\"100%\" cellspacing=\"2\" cellpadding=\"2\">\n");
-            echo ("<tr><th>Filename</th><th>Size</th><th>Date&amp;Time</th><th>Type</th><th>&nbsp;</th><th>&nbsp;</th>\n");
-            $dirhead=true;
-          }
-          echo ("<tr><td>$dirfile</td><td class=\"right\">".filesize($dirfile)."</td><td>".date ("Y-m-d H:i:s", filemtime($dirfile))."</td>");
-
-          if (preg_match("/\.sql$/i",$dirfile))
-            echo ("<td>SQL</td>");
-          elseif (preg_match("/\.gz$/i",$dirfile))
-            echo ("<td>GZip</td>");
-          elseif (preg_match("/\.csv$/i",$dirfile))
-            echo ("<td>CSV</td>");
-          else
-            echo ("<td>Misc</td>");
-
-          if ((preg_match("/\.gz$/i",$dirfile) && function_exists("gzopen")) || preg_match("/\.sql$/i",$dirfile) || preg_match("/\.csv$/i",$dirfile))
-            echo ("<td><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($dirfile)."&amp;foffset=0&amp;totalqueries=0&amp;delimiter=".urlencode($delimiter)."\">Start Import</a> into $db_name at $db_server</td>\n <td><a href=\"".$_SERVER["PHP_SELF"]."?delete=".urlencode($dirfile)."\">Delete file</a></td></tr>\n");
-          else
-            echo ("<td>&nbsp;</td>\n <td>&nbsp;</td></tr>\n");
-        }
-      }
-    }
-
-    if ($dirhead) 
-      echo ("</table>\n");
-    else 
-      echo ("<p>No uploaded SQL, GZ or CSV files found in the working directory</p>\n");
+	$files=array();
+	while (false !== ($files[] = readdir($dirhandle)));
+	closedir($dirhandle);
+	$dirhead=false;
+
+	if (sizeof($files)>0)
+	{ 
+	  sort($files);
+	  foreach ($files as $dirfile)
+	  { 
+		if ($dirfile != "." && $dirfile != ".." && $dirfile!=basename($_SERVER["SCRIPT_FILENAME"]) && preg_match("/\.(sql|gz|csv)$/i",$dirfile))
+		{ if (!$dirhead)
+		  { echo ("<table width=\"100%\" cellspacing=\"2\" cellpadding=\"2\">\n");
+			echo ("<tr><th>Filename</th><th>Size</th><th>Date&amp;Time</th><th>Type</th><th>&nbsp;</th><th>&nbsp;</th>\n");
+			$dirhead=true;
+		  }
+		  echo ("<tr><td>$dirfile</td><td class=\"right\">".filesize($dirfile)."</td><td>".date ("Y-m-d H:i:s", filemtime($dirfile))."</td>");
+
+		  if (preg_match("/\.sql$/i",$dirfile))
+			echo ("<td>SQL</td>");
+		  elseif (preg_match("/\.gz$/i",$dirfile))
+			echo ("<td>GZip</td>");
+		  elseif (preg_match("/\.csv$/i",$dirfile))
+			echo ("<td>CSV</td>");
+		  else
+			echo ("<td>Misc</td>");
+
+		  if ((preg_match("/\.gz$/i",$dirfile) && function_exists("gzopen")) || preg_match("/\.sql$/i",$dirfile) || preg_match("/\.csv$/i",$dirfile))
+			echo ("<td><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($dirfile)."&amp;foffset=0&amp;totalqueries=0&amp;delimiter=".urlencode($delimiter)."\">Start Import</a> into $db_name at $db_server</td>\n <td><a href=\"".$_SERVER["PHP_SELF"]."?delete=".urlencode($dirfile)."\">Delete file</a></td></tr>\n");
+		  else
+			echo ("<td>&nbsp;</td>\n <td>&nbsp;</td></tr>\n");
+		}
+	  }
+	}
+
+	if ($dirhead) 
+	  echo ("</table>\n");
+	else 
+	  echo ("<p>No uploaded SQL, GZ or CSV files found in the working directory</p>\n");
   }
   else
   { echo ("<p class=\"error\">Error listing directory $upload_dir</p>\n");
-    $error=true;
+	$error=true;
   }
 }
 
@@ -456,14 +456,14 @@ 
   do { $tempfilename=time().".tmp"; } while (file_exists($tempfilename));
   if (!($tempfile=@fopen($tempfilename,"w")))
   { echo ("<p>Upload form disabled. Permissions for the working directory <i>$upload_dir</i> <b>must be set writable for the webserver</b> in order ");
-    echo ("to upload files here. Alternatively you can upload your dump files via FTP.</p>\n");
+	echo ("to upload files here. Alternatively you can upload your dump files via FTP.</p>\n");
   }
   else
   { fclose($tempfile);
-    unlink ($tempfilename);
+	unlink ($tempfilename);
  
-    echo ("<p>You can now upload your dump file up to $upload_max_filesize bytes (".round ($upload_max_filesize/1024/1024)." Mbytes)  ");
-    echo ("directly from your browser to the server. Alternatively you can upload your dump files of any size via FTP.</p>\n");
+	echo ("<p>You can now upload your dump file up to $upload_max_filesize bytes (".round ($upload_max_filesize/1024/1024)." Mbytes)  ");
+	echo ("directly from your browser to the server. Alternatively you can upload your dump files of any size via FTP.</p>\n");
 ?>
 <form method="POST" action="<?php echo ($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
 <input type="hidden" name="MAX_FILE_SIZE" value="$upload_max_filesize">
@@ -482,7 +482,7 @@ 
   $row = mysql_fetch_assoc($result);
   if ($row) 
   { $charset = $row['Value'];
-    echo ("<p>Note: The current mySQL connection charset is <i>$charset</i>. Your dump file must be encoded in <i>$charset</i> in order to avoid problems with non-latin characters. You can change the connection charset using the \$db_connection_charset variable in bigdump.php</p>\n");
+	echo ("<p>Note: The current mySQL connection charset is <i>$charset</i>. Your dump file must be encoded in <i>$charset</i> in order to avoid problems with non-latin characters. You can change the connection charset using the \$db_connection_charset variable in bigdump.php</p>\n");
   }
 }
 
@@ -494,36 +494,36 @@ 
 // Set current filename ($filename overrides $_REQUEST["fn"] if set)
 
   if ($filename!="")
-    $curfilename=$filename;
+	$curfilename=$filename;
   else if (isset($_REQUEST["fn"]))
-    $curfilename=urldecode($_REQUEST["fn"]);
+	$curfilename=urldecode($_REQUEST["fn"]);
   else
-    $curfilename="";
+	$curfilename="";
 
 // Recognize GZip filename
 
   if (preg_match("/\.gz$/i",$curfilename)) 
-    $gzipmode=true;
+	$gzipmode=true;
   else
-    $gzipmode=false;
+	$gzipmode=false;
 
   if ((!$gzipmode && !$file=@fopen($curfilename,"r")) || ($gzipmode && !$file=@gzopen($curfilename,"r")))
   { echo ("<p class=\"error\">Can't open ".$curfilename." for import</p>\n");
-    echo ("<p>Please, check that your dump file name contains only alphanumerical characters, and rename it accordingly, for example: $curfilename.".
-           "<br>Or, specify \$filename in bigdump.php with the full filename. ".
-           "<br>Or, you have to upload the $curfilename to the server first.</p>\n");
-    $error=true;
+	echo ("<p>Please, check that your dump file name contains only alphanumerical characters, and rename it accordingly, for example: $curfilename.".
+		   "<br>Or, specify \$filename in bigdump.php with the full filename. ".
+		   "<br>Or, you have to upload the $curfilename to the server first.</p>\n");
+	$error=true;
   }
 
 // Get the file size (can't do it fast on gzipped files, no idea how)
 
   else if ((!$gzipmode && @fseek($file, 0, SEEK_END)==0) || ($gzipmode && @gzseek($file, 0)==0))
   { if (!$gzipmode) $filesize = ftell($file);
-    else $filesize = gztell($file);                   // Always zero, ignore
+	else $filesize = gztell($file);                   // Always zero, ignore
   }
   else
   { echo ("<p class=\"error\">I can't seek into $curfilename</p>\n");
-    $error=true;
+	$error=true;
   }
 }
 
@@ -546,171 +546,171 @@ 
 
   if (!is_numeric($_REQUEST["start"]) || !is_numeric($_REQUEST["foffset"]))
   { echo ("<p class=\"error\">UNEXPECTED: Non-numeric values for start and foffset</p>\n");
-    $error=true;
+	$error=true;
   }
   else
   {	$_REQUEST["start"]   = floor($_REQUEST["start"]);
-    $_REQUEST["foffset"] = floor($_REQUEST["foffset"]);
+	$_REQUEST["foffset"] = floor($_REQUEST["foffset"]);
   }
 
 // Set the current delimiter if defined
 
   if (isset($_REQUEST["delimiter"]))
-    $delimiter = $_REQUEST["delimiter"];
+	$delimiter = $_REQUEST["delimiter"];
 
 // Empty CSV table if requested
 
   if (!$error && $_REQUEST["start"]==1 && $csv_insert_table != "" && $csv_preempty_table)
   { 
-    $query = "DELETE FROM $csv_insert_table";
-    if (!TESTMODE && !mysql_query(trim($query), $dbconnection))
-    { echo ("<p class=\"error\">Error when deleting entries from $csv_insert_table.</p>\n");
-      echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
-      echo ("<p>MySQL: ".mysql_error()."</p>\n");
-      $error=true;
-    }
+	$query = "DELETE FROM $csv_insert_table";
+	if (!TESTMODE && !mysql_query(trim($query), $dbconnection))
+	{ echo ("<p class=\"error\">Error when deleting entries from $csv_insert_table.</p>\n");
+	  echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
+	  echo ("<p>MySQL: ".mysql_error()."</p>\n");
+	  $error=true;
+	}
   }
   
 // Print start message
 
   if (!$error)
   { skin_open();
-    if (TESTMODE) 
-      echo ("<p class=\"centr\">TEST MODE ENABLED</p>\n");
-    echo ("<p class=\"centr\">Processing file: <b>".$curfilename."</b></p>\n");
-    echo ("<p class=\"smlcentr\">Starting from line: ".$_REQUEST["start"]."</p>\n");	
-    skin_close();
+	if (TESTMODE) 
+	  echo ("<p class=\"centr\">TEST MODE ENABLED</p>\n");
+	echo ("<p class=\"centr\">Processing file: <b>".$curfilename."</b></p>\n");
+	echo ("<p class=\"smlcentr\">Starting from line: ".$_REQUEST["start"]."</p>\n");	
+	skin_close();
   }
 
 // Check $_REQUEST["foffset"] upon $filesize (can't do it on gzipped files)
 
   if (!$error && !$gzipmode && $_REQUEST["foffset"]>$filesize)
   { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer behind the end of file</p>\n");
-    $error=true;
+	$error=true;
   }
 
 // Set file pointer to $_REQUEST["foffset"]
 
   if (!$error && ((!$gzipmode && fseek($file, $_REQUEST["foffset"])!=0) || ($gzipmode && gzseek($file, $_REQUEST["foffset"])!=0)))
   { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer to offset: ".$_REQUEST["foffset"]."</p>\n");
-    $error=true;
+	$error=true;
   }
 
 // Start processing queries from $file
 
   if (!$error)
   { $query="";
-    $queries=0;
-    $totalqueries=$_REQUEST["totalqueries"];
-    $linenumber=$_REQUEST["start"];
-    $querylines=0;
-    $inparents=false;
+	$queries=0;
+	$totalqueries=$_REQUEST["totalqueries"];
+	$linenumber=$_REQUEST["start"];
+	$querylines=0;
+	$inparents=false;
 
 // Stay processing as long as the $linespersession is not reached or the query is still incomplete
 
-    while ($linenumber<$_REQUEST["start"]+$linespersession || $query!="")
-    {
+	while ($linenumber<$_REQUEST["start"]+$linespersession || $query!="")
+	{
 
 // Read the whole next line
 
-      $dumpline = "";
-      while (!feof($file) && substr ($dumpline, -1) != "\n" && substr ($dumpline, -1) != "\r")
-      { if (!$gzipmode)
-          $dumpline .= fgets($file, DATA_CHUNK_LENGTH);
-        else
-          $dumpline .= gzgets($file, DATA_CHUNK_LENGTH);
-      }
-      if ($dumpline==="") break;
+	  $dumpline = "";
+	  while (!feof($file) && substr ($dumpline, -1) != "\n" && substr ($dumpline, -1) != "\r")
+	  { if (!$gzipmode)
+		  $dumpline .= fgets($file, DATA_CHUNK_LENGTH);
+		else
+		  $dumpline .= gzgets($file, DATA_CHUNK_LENGTH);
+	  }
+	  if ($dumpline==="") break;
 
 // Remove UTF8 Byte Order Mark at the file beginning if any
 
-      if ($_REQUEST["foffset"]==0)
-        $dumpline=preg_replace('|^\xEF\xBB\xBF|','',$dumpline);
+	  if ($_REQUEST["foffset"]==0)
+		$dumpline=preg_replace('|^\xEF\xBB\xBF|','',$dumpline);
 
 // Create an SQL query from CSV line
 
-      if (($csv_insert_table != "") && (preg_match("/(\.csv)$/i",$curfilename)))
-      {
-        if ($csv_add_slashes)
-          $dumpline = addslashes($dumpline);
-        $dumpline = explode($csv_delimiter,$dumpline);
-        if ($csv_add_quotes)
-          $dumpline = "'".implode("','",$dumpline)."'";
-        else
-          $dumpline = implode(",",$dumpline);
-        $dumpline = 'INSERT INTO '.$csv_insert_table.' VALUES ('.$dumpline.');';
-      }
+	  if (($csv_insert_table != "") && (preg_match("/(\.csv)$/i",$curfilename)))
+	  {
+		if ($csv_add_slashes)
+		  $dumpline = addslashes($dumpline);
+		$dumpline = explode($csv_delimiter,$dumpline);
+		if ($csv_add_quotes)
+		  $dumpline = "'".implode("','",$dumpline)."'";
+		else
+		  $dumpline = implode(",",$dumpline);
+		$dumpline = 'INSERT INTO '.$csv_insert_table.' VALUES ('.$dumpline.');';
+	  }
 
 // Handle DOS and Mac encoded linebreaks (I don't know if it really works on Win32 or Mac Servers)
 
-      $dumpline=str_replace("\r\n", "\n", $dumpline);
-      $dumpline=str_replace("\r", "\n", $dumpline);
+	  $dumpline=str_replace("\r\n", "\n", $dumpline);
+	  $dumpline=str_replace("\r", "\n", $dumpline);
             
 // DIAGNOSTIC
 // echo ("<p>Line $linenumber: $dumpline</p>\n");
 
 // Recognize delimiter statement
 
-      if (!$inparents && strpos ($dumpline, "DELIMITER ") === 0)
-        $delimiter = str_replace ("DELIMITER ","",trim($dumpline));
+	  if (!$inparents && strpos ($dumpline, "DELIMITER ") === 0)
+		$delimiter = str_replace ("DELIMITER ","",trim($dumpline));
 
 // Skip comments and blank lines only if NOT in parents
 
-      if (!$inparents)
-      { $skipline=false;
-        reset($comment);
-        foreach ($comment as $comment_value)
-        { 
+	  if (!$inparents)
+	  { $skipline=false;
+		reset($comment);
+		foreach ($comment as $comment_value)
+		{ 
 
 // DIAGNOSTIC
 //          echo ($comment_value);
-          if (trim($dumpline)=="" || strpos (trim($dumpline), $comment_value) === 0)
-          { $skipline=true;
-            break;
-          }
-        }
-        if ($skipline)
-        { $linenumber++;
+		  if (trim($dumpline)=="" || strpos (trim($dumpline), $comment_value) === 0)
+		  { $skipline=true;
+			break;
+		  }
+		}
+		if ($skipline)
+		{ $linenumber++;
 
 // DIAGNOSTIC
 // echo ("<p>Comment line skipped</p>\n");
 
-          continue;
-        }
-      }
+		  continue;
+		}
+	  }
 
 // Remove double back-slashes from the dumpline prior to count the quotes ('\\' can only be within strings)
       
-      $dumpline_deslashed = str_replace ("\\\\","",$dumpline);
+	  $dumpline_deslashed = str_replace ("\\\\","",$dumpline);
 
 // Count ' and \' (or " and \") in the dumpline to avoid query break within a text field ending by $delimiter
 
-      $parents=substr_count ($dumpline_deslashed, $string_quotes)-substr_count ($dumpline_deslashed, "\\$string_quotes");
-      if ($parents % 2 != 0)
-        $inparents=!$inparents;
+	  $parents=substr_count ($dumpline_deslashed, $string_quotes)-substr_count ($dumpline_deslashed, "\\$string_quotes");
+	  if ($parents % 2 != 0)
+		$inparents=!$inparents;
 
 // Add the line to query
 
-      $query .= $dumpline;
+	  $query .= $dumpline;
 
 // Don't count the line if in parents (text fields may include unlimited linebreaks)
       
-      if (!$inparents)
-        $querylines++;
+	  if (!$inparents)
+		$querylines++;
       
 // Stop if query contains more lines as defined by MAX_QUERY_LINES
 
-      if ($querylines>MAX_QUERY_LINES)
-      {
-        echo ("<p class=\"error\">Stopped at the line $linenumber. </p>");
-        echo ("<p>At this place the current query includes more than ".MAX_QUERY_LINES." dump lines. That can happen if your dump file was ");
-        echo ("created by some tool which doesn't place a semicolon followed by a linebreak at the end of each query, or if your dump contains ");
-        echo ("extended inserts or very long procedure definitions. Please read the <a href=\"http://www.ozerov.de/bigdump/usage/\">BigDump usage notes</a> ");
-        echo ("for more infos. Ask for our support services ");
-        echo ("in order to handle dump files containing extended inserts.</p>\n");
-        $error=true;
-        break;
-      }
+	  if ($querylines>MAX_QUERY_LINES)
+	  {
+		echo ("<p class=\"error\">Stopped at the line $linenumber. </p>");
+		echo ("<p>At this place the current query includes more than ".MAX_QUERY_LINES." dump lines. That can happen if your dump file was ");
+		echo ("created by some tool which doesn't place a semicolon followed by a linebreak at the end of each query, or if your dump contains ");
+		echo ("extended inserts or very long procedure definitions. Please read the <a href=\"http://www.ozerov.de/bigdump/usage/\">BigDump usage notes</a> ");
+		echo ("for more infos. Ask for our support services ");
+		echo ("in order to handle dump files containing extended inserts.</p>\n");
+		$error=true;
+		break;
+	  }
 
 // Execute query if end of query detected ($delimiter as last character) AND NOT in parents
 
@@ -719,43 +719,43 @@ 
 // echo ("<p>In Parents: ".($inparents?"true":"false")."</p>\n");
 // echo ("<p>Line: $dumpline</p>\n");
 
-      if (preg_match('/'.preg_quote($delimiter).'$/',trim($dumpline)) && !$inparents)
-      { 
+	  if (preg_match('/'.preg_quote($delimiter).'$/',trim($dumpline)) && !$inparents)
+	  { 
 
 // Cut off delimiter of the end of the query
 
-        $query = substr(trim($query),0,-1*strlen($delimiter));
+		$query = substr(trim($query),0,-1*strlen($delimiter));
 
 // DIAGNOSTIC
 // echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
 
-        if (!TESTMODE && !mysql_query($query, $dbconnection))
-        { echo ("<p class=\"error\">Error at the line $linenumber: ". trim($dumpline)."</p>\n");
-          echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
-          echo ("<p>MySQL: ".mysql_error()."</p>\n");
-          $error=true;
-          break;
-        }
-        $totalqueries++;
-        $queries++;
-        $query="";
-        $querylines=0;
-      }
-      $linenumber++;
-    }
+		if (!TESTMODE && !mysql_query($query, $dbconnection))
+		{ echo ("<p class=\"error\">Error at the line $linenumber: ". trim($dumpline)."</p>\n");
+		  echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
+		  echo ("<p>MySQL: ".mysql_error()."</p>\n");
+		  $error=true;
+		  break;
+		}
+		$totalqueries++;
+		$queries++;
+		$query="";
+		$querylines=0;
+	  }
+	  $linenumber++;
+	}
   }
 
 // Get the current file position
 
   if (!$error)
   { if (!$gzipmode) 
-      $foffset = ftell($file);
-    else
-      $foffset = gztell($file);
-    if (!$foffset)
-    { echo ("<p class=\"error\">UNEXPECTED: Can't read the file pointer offset</p>\n");
-      $error=true;
-    }
+	  $foffset = ftell($file);
+	else
+	  $foffset = gztell($file);
+	if (!$foffset)
+	{ echo ("<p class=\"error\">UNEXPECTED: Can't read the file pointer offset</p>\n");
+	  $error=true;
+	}
   }
 
 // Print statistics
@@ -766,63 +766,63 @@ 
 
   if (!$error)
   { 
-    $lines_this   = $linenumber-$_REQUEST["start"];
-    $lines_done   = $linenumber-1;
-    $lines_togo   = ' ? ';
-    $lines_tota   = ' ? ';
+	$lines_this   = $linenumber-$_REQUEST["start"];
+	$lines_done   = $linenumber-1;
+	$lines_togo   = ' ? ';
+	$lines_tota   = ' ? ';
     
-    $queries_this = $queries;
-    $queries_done = $totalqueries;
-    $queries_togo = ' ? ';
-    $queries_tota = ' ? ';
-
-    $bytes_this   = $foffset-$_REQUEST["foffset"];
-    $bytes_done   = $foffset;
-    $kbytes_this  = round($bytes_this/1024,2);
-    $kbytes_done  = round($bytes_done/1024,2);
-    $mbytes_this  = round($kbytes_this/1024,2);
-    $mbytes_done  = round($kbytes_done/1024,2);
+	$queries_this = $queries;
+	$queries_done = $totalqueries;
+	$queries_togo = ' ? ';
+	$queries_tota = ' ? ';
+
+	$bytes_this   = $foffset-$_REQUEST["foffset"];
+	$bytes_done   = $foffset;
+	$kbytes_this  = round($bytes_this/1024,2);
+	$kbytes_done  = round($bytes_done/1024,2);
+	$mbytes_this  = round($kbytes_this/1024,2);
+	$mbytes_done  = round($kbytes_done/1024,2);
    
-    if (!$gzipmode)
-    {
-      $bytes_togo  = $filesize-$foffset;
-      $bytes_tota  = $filesize;
-      $kbytes_togo = round($bytes_togo/1024,2);
-      $kbytes_tota = round($bytes_tota/1024,2);
-      $mbytes_togo = round($kbytes_togo/1024,2);
-      $mbytes_tota = round($kbytes_tota/1024,2);
+	if (!$gzipmode)
+	{
+	  $bytes_togo  = $filesize-$foffset;
+	  $bytes_tota  = $filesize;
+	  $kbytes_togo = round($bytes_togo/1024,2);
+	  $kbytes_tota = round($bytes_tota/1024,2);
+	  $mbytes_togo = round($kbytes_togo/1024,2);
+	  $mbytes_tota = round($kbytes_tota/1024,2);
       
-      $pct_this   = ceil($bytes_this/$filesize*100);
-      $pct_done   = ceil($foffset/$filesize*100);
-      $pct_togo   = 100 - $pct_done;
-      $pct_tota   = 100;
-
-      if ($bytes_togo==0) 
-      { $lines_togo   = '0'; 
-        $lines_tota   = $linenumber-1; 
-        $queries_togo = '0'; 
-        $queries_tota = $totalqueries; 
-      }
-
-      $pct_bar    = "<div style=\"height:15px;width:$pct_done%;background-color:#000080;margin:0px;\"></div>";
-    }
-    else
-    {
-      $bytes_togo  = ' ? ';
-      $bytes_tota  = ' ? ';
-      $kbytes_togo = ' ? ';
-      $kbytes_tota = ' ? ';
-      $mbytes_togo = ' ? ';
-      $mbytes_tota = ' ? ';
+	  $pct_this   = ceil($bytes_this/$filesize*100);
+	  $pct_done   = ceil($foffset/$filesize*100);
+	  $pct_togo   = 100 - $pct_done;
+	  $pct_tota   = 100;
+
+	  if ($bytes_togo==0) 
+	  { $lines_togo   = '0'; 
+		$lines_tota   = $linenumber-1; 
+		$queries_togo = '0'; 
+		$queries_tota = $totalqueries; 
+	  }
+
+	  $pct_bar    = "<div style=\"height:15px;width:$pct_done%;background-color:#000080;margin:0px;\"></div>";
+	}
+	else
+	{
+	  $bytes_togo  = ' ? ';
+	  $bytes_tota  = ' ? ';
+	  $kbytes_togo = ' ? ';
+	  $kbytes_tota = ' ? ';
+	  $mbytes_togo = ' ? ';
+	  $mbytes_tota = ' ? ';
       
-      $pct_this    = ' ? ';
-      $pct_done    = ' ? ';
-      $pct_togo    = ' ? ';
-      $pct_tota    = 100;
-      $pct_bar     = str_replace(' ','&nbsp;','<tt>[         Not available for gzipped files          ]</tt>');
-    }
+	  $pct_this    = ' ? ';
+	  $pct_done    = ' ? ';
+	  $pct_togo    = ' ? ';
+	  $pct_tota    = 100;
+	  $pct_bar     = str_replace(' ','&nbsp;','<tt>[         Not available for gzipped files          ]</tt>');
+	}
     
-    echo ("
+	echo ("
     <center>
     <table width=\"520\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">
     <tr><th class=\"bg4\"> </th><th class=\"bg4\">Session</th><th class=\"bg4\">Done</th><th class=\"bg4\">To go</th><th class=\"bg4\">Total</th></tr>
@@ -839,11 +839,11 @@ 
 
 // Finish message and restart the script
 
-    if ($linenumber<$_REQUEST["start"]+$linespersession)
-    { echo ("<p class=\"successcentr\">Congratulations: End of file reached, assuming OK</p>\n");
-      echo ("<p class=\"successcentr\">IMPORTANT: REMOVE YOUR DUMP FILE and BIGDUMP SCRIPT FROM SERVER NOW!</p>\n");
-      echo ("<p class=\"centr\">Thank you for using this tool! Please rate <a href=\"http://www.hotscripts.com/listing/bigdump/?RID=403\" target=\"_blank\">Bigdump at Hotscripts.com</a></p>\n");
-      echo ("<p class=\"centr\">You can send me some bucks or euros as appreciation via PayPal. Thank you!</p>\n");
+	if ($linenumber<$_REQUEST["start"]+$linespersession)
+	{ echo ("<p class=\"successcentr\">Congratulations: End of file reached, assuming OK</p>\n");
+	  echo ("<p class=\"successcentr\">IMPORTANT: REMOVE YOUR DUMP FILE and BIGDUMP SCRIPT FROM SERVER NOW!</p>\n");
+	  echo ("<p class=\"centr\">Thank you for using this tool! Please rate <a href=\"http://www.hotscripts.com/listing/bigdump/?RID=403\" target=\"_blank\">Bigdump at Hotscripts.com</a></p>\n");
+	  echo ("<p class=\"centr\">You can send me some bucks or euros as appreciation via PayPal. Thank you!</p>\n");
 ?>
 
 <!-- Start Paypal donation code -->
@@ -863,23 +863,23 @@ 
 
 <?php      
 
-      $error=true; // This is a semi-error telling the script is finished
-    }
-    else
-    { if ($delaypersession!=0)
-        echo ("<p class=\"centr\">Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
-      if (!$ajax) 
-        echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".urlencode($curfilename)."&foffset=$foffset&totalqueries=$totalqueries&delimiter=".urlencode($delimiter)."\";',500+$delaypersession);</script>\n");
-
-      echo ("<noscript>\n");
-      echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&amp;fn=".urlencode($curfilename)."&amp;foffset=$foffset&amp;totalqueries=$totalqueries&amp;delimiter=".urlencode($delimiter)."\">Continue from the line $linenumber</a> (Enable JavaScript to do it automatically)</p>\n");
-      echo ("</noscript>\n");
+	  $error=true; // This is a semi-error telling the script is finished
+	}
+	else
+	{ if ($delaypersession!=0)
+		echo ("<p class=\"centr\">Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
+	  if (!$ajax) 
+		echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".urlencode($curfilename)."&foffset=$foffset&totalqueries=$totalqueries&delimiter=".urlencode($delimiter)."\";',500+$delaypersession);</script>\n");
+
+	  echo ("<noscript>\n");
+	  echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&amp;fn=".urlencode($curfilename)."&amp;foffset=$foffset&amp;totalqueries=$totalqueries&amp;delimiter=".urlencode($delimiter)."\">Continue from the line $linenumber</a> (Enable JavaScript to do it automatically)</p>\n");
+	  echo ("</noscript>\n");
    
-      echo ("<p class=\"centr\">Press <b><a href=\"".$_SERVER["PHP_SELF"]."\">STOP</a></b> to abort the import <b>OR WAIT!</b></p>\n");
-    }
+	  echo ("<p class=\"centr\">Press <b><a href=\"".$_SERVER["PHP_SELF"]."\">STOP</a></b> to abort the import <b>OR WAIT!</b></p>\n");
+	}
   }
   else 
-    echo ("<p class=\"error\">Stopped on error</p>\n");
+	echo ("<p class=\"error\">Stopped on error</p>\n");
 
 skin_close();
 
@@ -925,7 +925,7 @@ 
 	die;
   } 
   else 
-    create_ajax_script();	  
+	create_ajax_script();	  
 }
 
 // Anyway put out the output from above

Spacing +169 added lines, -169 removed lines

@@ -47,28 +47,28 @@ 
 
 // Other settings (optional)
 
-$filename           = '';     // Specify the dump filename to suppress the file selection dialog
-$ajax               = true;   // AJAX mode: import will be done without refreshing the website
-$linespersession    = 3000;   // Lines to be executed per one import session
-$delaypersession    = 0;      // You can specify a sleep time in milliseconds after each session
+$filename           = ''; // Specify the dump filename to suppress the file selection dialog
+$ajax               = true; // AJAX mode: import will be done without refreshing the website
+$linespersession    = 3000; // Lines to be executed per one import session
+$delaypersession    = 0; // You can specify a sleep time in milliseconds after each session
                               // Works only if JavaScript is activated. Use to reduce server overrun
 
 // CSV related settings (only if you use a CSV dump)
 
-$csv_insert_table   = '';     // Destination table for CSV files
-$csv_preempty_table = false;  // true: delete all entries from table specified in $csv_insert_table before processing
-$csv_delimiter      = ',';    // Field delimiter in CSV file
-$csv_add_quotes     = true;   // If your CSV data already have quotes around each field set it to false
-$csv_add_slashes    = true;   // If your CSV data already have slashes in front of ' and " set it to false
+$csv_insert_table   = ''; // Destination table for CSV files
+$csv_preempty_table = false; // true: delete all entries from table specified in $csv_insert_table before processing
+$csv_delimiter      = ','; // Field delimiter in CSV file
+$csv_add_quotes     = true; // If your CSV data already have quotes around each field set it to false
+$csv_add_slashes    = true; // If your CSV data already have slashes in front of ' and " set it to false
 
 // Allowed comment markers: lines starting with these strings will be ignored by BigDump
 
-$comment[]='#';                       // Standard comment lines are dropped by default
-$comment[]='-- ';
-$comment[]='DELIMITER';               // Ignore DELIMITER switch as it's not a valid SQL statement
+$comment[] = '#'; // Standard comment lines are dropped by default
+$comment[] = '-- ';
+$comment[] = 'DELIMITER'; // Ignore DELIMITER switch as it's not a valid SQL statement
 // $comment[]='---';                  // Uncomment this line if using proprietary dump created by outdated mysqldump
 // $comment[]='CREATE DATABASE';      // Uncomment this line if your dump contains create database queries in order to ignore them
-$comment[]='/*!';                     // Or add your own string to leave out other proprietary things
+$comment[] = '/*!'; // Or add your own string to leave out other proprietary things
 
 // Pre-queries: SQL queries to be executed at the beginning of each import session
 
@@ -88,7 +88,7 @@ 
 
 // String quotes character
 
-$string_quotes = '\'';                  // Change to '"' if your dump file uses double qoutes for strings
+$string_quotes = '\''; // Change to '"' if your dump file uses double qoutes for strings
 
 
 // *******************************************************************************************
@@ -98,10 +98,10 @@ 
 if ($ajax)
   ob_start();
 
-define ('VERSION','0.34b');
-define ('DATA_CHUNK_LENGTH',16384);  // How many chars are read per time
-define ('MAX_QUERY_LINES',300);      // How many lines may be considered to be one query (except text lines)
-define ('TESTMODE',false);           // Set to true to process the file without actually accessing the database
+define('VERSION', '0.34b');
+define('DATA_CHUNK_LENGTH', 16384); // How many chars are read per time
+define('MAX_QUERY_LINES', 300); // How many lines may be considered to be one query (except text lines)
+define('TESTMODE', false); // Set to true to process the file without actually accessing the database
 
 header("Expires: Mon, 1 Dec 2003 01:00:00 GMT");
 header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -119,7 +119,7 @@ 
 
 foreach ($_REQUEST as $key => $val) 
 {
-  $val = preg_replace("/[^_A-Za-z0-9-\.&= ;\$]/i",'', $val);
+  $val = preg_replace("/[^_A-Za-z0-9-\.&= ;\$]/i", '', $val);
   $_REQUEST[$key] = $val;
 }
 
@@ -272,7 +272,7 @@ 
 }
 
 skin_open();
-echo ('<h1>BigDump: Staggered MySQL Dump Importer v'.VERSION.'</h1>');
+echo ('<h1>BigDump: Staggered MySQL Dump Importer v' . VERSION . '</h1>');
 skin_close();
 
 $error = false;
@@ -281,56 +281,56 @@ 
 // Check PHP version
 
 if (!$error && !function_exists('version_compare'))
-{ echo ("<p class=\"error\">PHP version 4.1.0 is required for BigDump to proceed. You have PHP ".phpversion()." installed. Sorry!</p>\n");
-  $error=true;
+{ echo ("<p class=\"error\">PHP version 4.1.0 is required for BigDump to proceed. You have PHP " . phpversion() . " installed. Sorry!</p>\n");
+  $error = true;
 }
 
 // Check if mysql extension is available
 
 if (!$error && !function_exists('mysql_connect'))
 { echo ("<p class=\"error\">There is no mySQL extension available in your PHP installation. Sorry!</p>\n");
-  $error=true;
+  $error = true;
 }
 
 // Calculate PHP max upload size (handle settings like 10M or 100K)
 
 if (!$error)
-{ $upload_max_filesize=ini_get("upload_max_filesize");
-  if (preg_match("/([0-9]+)K/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024;
-  if (preg_match("/([0-9]+)M/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024*1024;
-  if (preg_match("/([0-9]+)G/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024*1024*1024;
+{ $upload_max_filesize = ini_get("upload_max_filesize");
+  if (preg_match("/([0-9]+)K/i", $upload_max_filesize, $tempregs)) $upload_max_filesize = $tempregs[1] * 1024;
+  if (preg_match("/([0-9]+)M/i", $upload_max_filesize, $tempregs)) $upload_max_filesize = $tempregs[1] * 1024 * 1024;
+  if (preg_match("/([0-9]+)G/i", $upload_max_filesize, $tempregs)) $upload_max_filesize = $tempregs[1] * 1024 * 1024 * 1024;
 }
 
 // Get the current directory
 
 if (isset($_SERVER["CGIA"]))
-  $upload_dir=dirname($_SERVER["CGIA"]);
+  $upload_dir = dirname($_SERVER["CGIA"]);
 else if (isset($_SERVER["ORIG_PATH_TRANSLATED"]))
-  $upload_dir=dirname($_SERVER["ORIG_PATH_TRANSLATED"]);
+  $upload_dir = dirname($_SERVER["ORIG_PATH_TRANSLATED"]);
 else if (isset($_SERVER["ORIG_SCRIPT_FILENAME"]))
-  $upload_dir=dirname($_SERVER["ORIG_SCRIPT_FILENAME"]);
+  $upload_dir = dirname($_SERVER["ORIG_SCRIPT_FILENAME"]);
 else if (isset($_SERVER["PATH_TRANSLATED"]))
-  $upload_dir=dirname($_SERVER["PATH_TRANSLATED"]);
+  $upload_dir = dirname($_SERVER["PATH_TRANSLATED"]);
 else 
-  $upload_dir=dirname($_SERVER["SCRIPT_FILENAME"]);
+  $upload_dir = dirname($_SERVER["SCRIPT_FILENAME"]);
 
 // Handle file upload
 
 if (!$error && isset($_REQUEST["uploadbutton"]))
-{ if (is_uploaded_file($_FILES["dumpfile"]["tmp_name"]) && ($_FILES["dumpfile"]["error"])==0)
+{ if (is_uploaded_file($_FILES["dumpfile"]["tmp_name"]) && ($_FILES["dumpfile"]["error"]) == 0)
   { 
-    $uploaded_filename=str_replace(" ","_",$_FILES["dumpfile"]["name"]);
-    $uploaded_filename=preg_replace("/[^_A-Za-z0-9-\.]/i",'',$uploaded_filename);
-    $uploaded_filepath=str_replace("\\","/",$upload_dir."/".$uploaded_filename);
+    $uploaded_filename = str_replace(" ", "_", $_FILES["dumpfile"]["name"]);
+    $uploaded_filename = preg_replace("/[^_A-Za-z0-9-\.]/i", '', $uploaded_filename);
+    $uploaded_filepath = str_replace("\\", "/", $upload_dir . "/" . $uploaded_filename);
 
     if (file_exists($uploaded_filename))
     { echo ("<p class=\"error\">File $uploaded_filename already exist! Delete and upload again!</p>\n");
     }
-    else if (!preg_match("/(\.(sql|gz|csv))$/i",$uploaded_filename))
+    else if (!preg_match("/(\.(sql|gz|csv))$/i", $uploaded_filename))
     { echo ("<p class=\"error\">You may only upload .sql .gz or .csv files.</p>\n");
     }
-    else if (!@move_uploaded_file($_FILES["dumpfile"]["tmp_name"],$uploaded_filepath))
-    { echo ("<p class=\"error\">Error moving uploaded file ".$_FILES["dumpfile"]["tmp_name"]." to the $uploaded_filepath</p>\n");
+    else if (!@move_uploaded_file($_FILES["dumpfile"]["tmp_name"], $uploaded_filepath))
+    { echo ("<p class=\"error\">Error moving uploaded file " . $_FILES["dumpfile"]["tmp_name"] . " to the $uploaded_filepath</p>\n");
       echo ("<p>Check the directory permissions for $upload_dir (must be 777)!</p>\n");
     }
     else
@@ -338,42 +338,42 @@ 
     }
   }
   else
-  { echo ("<p class=\"error\">Error uploading file ".$_FILES["dumpfile"]["name"]."</p>\n");
+  { echo ("<p class=\"error\">Error uploading file " . $_FILES["dumpfile"]["name"] . "</p>\n");
   }
 }
 
 
 // Handle file deletion (delete only in the current directory for security reasons)
 
-if (!$error && isset($_REQUEST["delete"]) && $_REQUEST["delete"]!=basename($_SERVER["SCRIPT_FILENAME"]))
-{ if (preg_match("/(\.(sql|gz|csv))$/i",$_REQUEST["delete"]) && @unlink(basename($_REQUEST["delete"])))
-    echo ("<p class=\"success\">".$_REQUEST["delete"]." was removed successfully</p>\n");
+if (!$error && isset($_REQUEST["delete"]) && $_REQUEST["delete"] != basename($_SERVER["SCRIPT_FILENAME"]))
+{ if (preg_match("/(\.(sql|gz|csv))$/i", $_REQUEST["delete"]) && @unlink(basename($_REQUEST["delete"])))
+    echo ("<p class=\"success\">" . $_REQUEST["delete"] . " was removed successfully</p>\n");
   else
-    echo ("<p class=\"error\">Can't remove ".$_REQUEST["delete"]."</p>\n");
+    echo ("<p class=\"error\">Can't remove " . $_REQUEST["delete"] . "</p>\n");
 }
 
 // Connect to the database, set charset and execute pre-queries
 
 if (!$error && !TESTMODE)
-{ $dbconnection = @mysql_connect($db_server,$db_username,$db_password);
+{ $dbconnection = @mysql_connect($db_server, $db_username, $db_password);
   if ($dbconnection) 
     $db = mysql_select_db($db_name);
   if (!$dbconnection || !$db) 
-  { echo ("<p class=\"error\">Database connection failed due to ".mysql_error()."</p>\n");
-    echo ("<p>Edit the database settings in ".$_SERVER["SCRIPT_FILENAME"]." or contact your database provider.</p>\n");
-    $error=true;
+  { echo ("<p class=\"error\">Database connection failed due to " . mysql_error() . "</p>\n");
+    echo ("<p>Edit the database settings in " . $_SERVER["SCRIPT_FILENAME"] . " or contact your database provider.</p>\n");
+    $error = true;
   }
-  if (!$error && $db_connection_charset!=='')
+  if (!$error && $db_connection_charset !== '')
     @mysql_query("SET NAMES $db_connection_charset", $dbconnection);
 
-  if (!$error && isset ($pre_query) && sizeof ($pre_query)>0)
+  if (!$error && isset ($pre_query) && sizeof($pre_query) > 0)
   { reset($pre_query);
     foreach ($pre_query as $pre_query_value)
     {	if (!@mysql_query($pre_query_value, $dbconnection))
     	{ echo ("<p class=\"error\">Error with pre-query.</p>\n");
-      	echo ("<p>Query: ".trim(nl2br(htmlentities($pre_query_value)))."</p>\n");
-      	echo ("<p>MySQL: ".mysql_error()."</p>\n");
-      	$error=true;
+      	echo ("<p>Query: " . trim(nl2br(htmlentities($pre_query_value))) . "</p>\n");
+      	echo ("<p>MySQL: " . mysql_error() . "</p>\n");
+      	$error = true;
       	break;
      }
     }
@@ -389,38 +389,38 @@ 
 
 // List uploaded files in multifile mode
 
-if (!$error && !isset($_REQUEST["fn"]) && $filename=="")
+if (!$error && !isset($_REQUEST["fn"]) && $filename == "")
 { if ($dirhandle = opendir($upload_dir)) 
   { 
-    $files=array();
+    $files = array();
     while (false !== ($files[] = readdir($dirhandle)));
     closedir($dirhandle);
-    $dirhead=false;
+    $dirhead = false;
 
-    if (sizeof($files)>0)
+    if (sizeof($files) > 0)
     { 
       sort($files);
       foreach ($files as $dirfile)
       { 
-        if ($dirfile != "." && $dirfile != ".." && $dirfile!=basename($_SERVER["SCRIPT_FILENAME"]) && preg_match("/\.(sql|gz|csv)$/i",$dirfile))
+        if ($dirfile != "." && $dirfile != ".." && $dirfile != basename($_SERVER["SCRIPT_FILENAME"]) && preg_match("/\.(sql|gz|csv)$/i", $dirfile))
         { if (!$dirhead)
           { echo ("<table width=\"100%\" cellspacing=\"2\" cellpadding=\"2\">\n");
             echo ("<tr><th>Filename</th><th>Size</th><th>Date&amp;Time</th><th>Type</th><th>&nbsp;</th><th>&nbsp;</th>\n");
-            $dirhead=true;
+            $dirhead = true;
           }
-          echo ("<tr><td>$dirfile</td><td class=\"right\">".filesize($dirfile)."</td><td>".date ("Y-m-d H:i:s", filemtime($dirfile))."</td>");
+          echo ("<tr><td>$dirfile</td><td class=\"right\">" . filesize($dirfile) . "</td><td>" . date("Y-m-d H:i:s", filemtime($dirfile)) . "</td>");
 
-          if (preg_match("/\.sql$/i",$dirfile))
+          if (preg_match("/\.sql$/i", $dirfile))
             echo ("<td>SQL</td>");
-          elseif (preg_match("/\.gz$/i",$dirfile))
+          elseif (preg_match("/\.gz$/i", $dirfile))
             echo ("<td>GZip</td>");
-          elseif (preg_match("/\.csv$/i",$dirfile))
+          elseif (preg_match("/\.csv$/i", $dirfile))
             echo ("<td>CSV</td>");
           else
             echo ("<td>Misc</td>");
 
-          if ((preg_match("/\.gz$/i",$dirfile) && function_exists("gzopen")) || preg_match("/\.sql$/i",$dirfile) || preg_match("/\.csv$/i",$dirfile))
-            echo ("<td><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($dirfile)."&amp;foffset=0&amp;totalqueries=0&amp;delimiter=".urlencode($delimiter)."\">Start Import</a> into $db_name at $db_server</td>\n <td><a href=\"".$_SERVER["PHP_SELF"]."?delete=".urlencode($dirfile)."\">Delete file</a></td></tr>\n");
+          if ((preg_match("/\.gz$/i", $dirfile) && function_exists("gzopen")) || preg_match("/\.sql$/i", $dirfile) || preg_match("/\.csv$/i", $dirfile))
+            echo ("<td><a href=\"" . $_SERVER["PHP_SELF"] . "?start=1&amp;fn=" . urlencode($dirfile) . "&amp;foffset=0&amp;totalqueries=0&amp;delimiter=" . urlencode($delimiter) . "\">Start Import</a> into $db_name at $db_server</td>\n <td><a href=\"" . $_SERVER["PHP_SELF"] . "?delete=" . urlencode($dirfile) . "\">Delete file</a></td></tr>\n");
           else
             echo ("<td>&nbsp;</td>\n <td>&nbsp;</td></tr>\n");
         }
@@ -434,35 +434,35 @@ 
   }
   else
   { echo ("<p class=\"error\">Error listing directory $upload_dir</p>\n");
-    $error=true;
+    $error = true;
   }
 }
 
 
 // Single file mode
 
-if (!$error && !isset ($_REQUEST["fn"]) && $filename!="")
-{ echo ("<p><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($filename)."&amp;foffset=0&amp;totalqueries=0\">Start Import</a> from $filename into $db_name at $db_server</p>\n");
+if (!$error && !isset ($_REQUEST["fn"]) && $filename != "")
+{ echo ("<p><a href=\"" . $_SERVER["PHP_SELF"] . "?start=1&amp;fn=" . urlencode($filename) . "&amp;foffset=0&amp;totalqueries=0\">Start Import</a> from $filename into $db_name at $db_server</p>\n");
 }
 
 
 // File Upload Form
 
-if (!$error && !isset($_REQUEST["fn"]) && $filename=="")
+if (!$error && !isset($_REQUEST["fn"]) && $filename == "")
 { 
 
 // Test permissions on working directory
 
-  do { $tempfilename=time().".tmp"; } while (file_exists($tempfilename));
-  if (!($tempfile=@fopen($tempfilename,"w")))
+  do { $tempfilename = time() . ".tmp"; } while (file_exists($tempfilename));
+  if (!($tempfile = @fopen($tempfilename, "w")))
   { echo ("<p>Upload form disabled. Permissions for the working directory <i>$upload_dir</i> <b>must be set writable for the webserver</b> in order ");
     echo ("to upload files here. Alternatively you can upload your dump files via FTP.</p>\n");
   }
   else
   { fclose($tempfile);
-    unlink ($tempfilename);
+    unlink($tempfilename);
  
-    echo ("<p>You can now upload your dump file up to $upload_max_filesize bytes (".round ($upload_max_filesize/1024/1024)." Mbytes)  ");
+    echo ("<p>You can now upload your dump file up to $upload_max_filesize bytes (" . round($upload_max_filesize / 1024 / 1024) . " Mbytes)  ");
     echo ("directly from your browser to the server. Alternatively you can upload your dump files of any size via FTP.</p>\n");
 ?>
 <form method="POST" action="<?php echo ($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
@@ -493,45 +493,45 @@ 
 
 // Set current filename ($filename overrides $_REQUEST["fn"] if set)
 
-  if ($filename!="")
-    $curfilename=$filename;
+  if ($filename != "")
+    $curfilename = $filename;
   else if (isset($_REQUEST["fn"]))
-    $curfilename=urldecode($_REQUEST["fn"]);
+    $curfilename = urldecode($_REQUEST["fn"]);
   else
-    $curfilename="";
+    $curfilename = "";
 
 // Recognize GZip filename
 
-  if (preg_match("/\.gz$/i",$curfilename)) 
-    $gzipmode=true;
+  if (preg_match("/\.gz$/i", $curfilename)) 
+    $gzipmode = true;
   else
-    $gzipmode=false;
+    $gzipmode = false;
 
-  if ((!$gzipmode && !$file=@fopen($curfilename,"r")) || ($gzipmode && !$file=@gzopen($curfilename,"r")))
-  { echo ("<p class=\"error\">Can't open ".$curfilename." for import</p>\n");
-    echo ("<p>Please, check that your dump file name contains only alphanumerical characters, and rename it accordingly, for example: $curfilename.".
-           "<br>Or, specify \$filename in bigdump.php with the full filename. ".
+  if ((!$gzipmode && !$file = @fopen($curfilename, "r")) || ($gzipmode && !$file = @gzopen($curfilename, "r")))
+  { echo ("<p class=\"error\">Can't open " . $curfilename . " for import</p>\n");
+    echo ("<p>Please, check that your dump file name contains only alphanumerical characters, and rename it accordingly, for example: $curfilename." .
+           "<br>Or, specify \$filename in bigdump.php with the full filename. " .
            "<br>Or, you have to upload the $curfilename to the server first.</p>\n");
-    $error=true;
+    $error = true;
   }
 
 // Get the file size (can't do it fast on gzipped files, no idea how)
 
-  else if ((!$gzipmode && @fseek($file, 0, SEEK_END)==0) || ($gzipmode && @gzseek($file, 0)==0))
+  else if ((!$gzipmode && @fseek($file, 0, SEEK_END) == 0) || ($gzipmode && @gzseek($file, 0) == 0))
   { if (!$gzipmode) $filesize = ftell($file);
-    else $filesize = gztell($file);                   // Always zero, ignore
+    else $filesize = gztell($file); // Always zero, ignore
   }
   else
   { echo ("<p class=\"error\">I can't seek into $curfilename</p>\n");
-    $error=true;
+    $error = true;
   }
 }
 
 // Stop if csv file is used, but $csv_insert_table is not set
 
-if (($csv_insert_table == "") && (preg_match("/(\.csv)$/i",$curfilename)))
+if (($csv_insert_table == "") && (preg_match("/(\.csv)$/i", $curfilename)))
 { echo ("<p class=\"error\">You have to specify \$csv_insert_table when using a CSV file. </p>\n");
-  $error=true;
+  $error = true;
 }
 
 
@@ -539,14 +539,14 @@ 
 // START IMPORT SESSION HERE
 // *******************************************************************************************
 
-if (!$error && isset($_REQUEST["start"]) && isset($_REQUEST["foffset"]) && preg_match("/(\.(sql|gz|csv))$/i",$curfilename))
+if (!$error && isset($_REQUEST["start"]) && isset($_REQUEST["foffset"]) && preg_match("/(\.(sql|gz|csv))$/i", $curfilename))
 {
 
 // Check start and foffset are numeric values
 
   if (!is_numeric($_REQUEST["start"]) || !is_numeric($_REQUEST["foffset"]))
   { echo ("<p class=\"error\">UNEXPECTED: Non-numeric values for start and foffset</p>\n");
-    $error=true;
+    $error = true;
   }
   else
   {	$_REQUEST["start"]   = floor($_REQUEST["start"]);
@@ -560,14 +560,14 @@ 
 
 // Empty CSV table if requested
 
-  if (!$error && $_REQUEST["start"]==1 && $csv_insert_table != "" && $csv_preempty_table)
+  if (!$error && $_REQUEST["start"] == 1 && $csv_insert_table != "" && $csv_preempty_table)
   { 
     $query = "DELETE FROM $csv_insert_table";
     if (!TESTMODE && !mysql_query(trim($query), $dbconnection))
     { echo ("<p class=\"error\">Error when deleting entries from $csv_insert_table.</p>\n");
-      echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
-      echo ("<p>MySQL: ".mysql_error()."</p>\n");
-      $error=true;
+      echo ("<p>Query: " . trim(nl2br(htmlentities($query))) . "</p>\n");
+      echo ("<p>MySQL: " . mysql_error() . "</p>\n");
+      $error = true;
     }
   }
   
@@ -577,95 +577,95 @@ 
   { skin_open();
     if (TESTMODE) 
       echo ("<p class=\"centr\">TEST MODE ENABLED</p>\n");
-    echo ("<p class=\"centr\">Processing file: <b>".$curfilename."</b></p>\n");
-    echo ("<p class=\"smlcentr\">Starting from line: ".$_REQUEST["start"]."</p>\n");	
+    echo ("<p class=\"centr\">Processing file: <b>" . $curfilename . "</b></p>\n");
+    echo ("<p class=\"smlcentr\">Starting from line: " . $_REQUEST["start"] . "</p>\n");	
     skin_close();
   }
 
 // Check $_REQUEST["foffset"] upon $filesize (can't do it on gzipped files)
 
-  if (!$error && !$gzipmode && $_REQUEST["foffset"]>$filesize)
+  if (!$error && !$gzipmode && $_REQUEST["foffset"] > $filesize)
   { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer behind the end of file</p>\n");
-    $error=true;
+    $error = true;
   }
 
 // Set file pointer to $_REQUEST["foffset"]
 
-  if (!$error && ((!$gzipmode && fseek($file, $_REQUEST["foffset"])!=0) || ($gzipmode && gzseek($file, $_REQUEST["foffset"])!=0)))
-  { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer to offset: ".$_REQUEST["foffset"]."</p>\n");
-    $error=true;
+  if (!$error && ((!$gzipmode && fseek($file, $_REQUEST["foffset"]) != 0) || ($gzipmode && gzseek($file, $_REQUEST["foffset"]) != 0)))
+  { echo ("<p class=\"error\">UNEXPECTED: Can't set file pointer to offset: " . $_REQUEST["foffset"] . "</p>\n");
+    $error = true;
   }
 
 // Start processing queries from $file
 
   if (!$error)
-  { $query="";
-    $queries=0;
-    $totalqueries=$_REQUEST["totalqueries"];
-    $linenumber=$_REQUEST["start"];
-    $querylines=0;
-    $inparents=false;
+  { $query = "";
+    $queries = 0;
+    $totalqueries = $_REQUEST["totalqueries"];
+    $linenumber = $_REQUEST["start"];
+    $querylines = 0;
+    $inparents = false;
 
 // Stay processing as long as the $linespersession is not reached or the query is still incomplete
 
-    while ($linenumber<$_REQUEST["start"]+$linespersession || $query!="")
+    while ($linenumber < $_REQUEST["start"] + $linespersession || $query != "")
     {
 
 // Read the whole next line
 
       $dumpline = "";
-      while (!feof($file) && substr ($dumpline, -1) != "\n" && substr ($dumpline, -1) != "\r")
+      while (!feof($file) && substr($dumpline, -1) != "\n" && substr($dumpline, -1) != "\r")
       { if (!$gzipmode)
           $dumpline .= fgets($file, DATA_CHUNK_LENGTH);
         else
           $dumpline .= gzgets($file, DATA_CHUNK_LENGTH);
       }
-      if ($dumpline==="") break;
+      if ($dumpline === "") break;
 
 // Remove UTF8 Byte Order Mark at the file beginning if any
 
-      if ($_REQUEST["foffset"]==0)
-        $dumpline=preg_replace('|^\xEF\xBB\xBF|','',$dumpline);
+      if ($_REQUEST["foffset"] == 0)
+        $dumpline = preg_replace('|^\xEF\xBB\xBF|', '', $dumpline);
 
 // Create an SQL query from CSV line
 
-      if (($csv_insert_table != "") && (preg_match("/(\.csv)$/i",$curfilename)))
+      if (($csv_insert_table != "") && (preg_match("/(\.csv)$/i", $curfilename)))
       {
         if ($csv_add_slashes)
           $dumpline = addslashes($dumpline);
-        $dumpline = explode($csv_delimiter,$dumpline);
+        $dumpline = explode($csv_delimiter, $dumpline);
         if ($csv_add_quotes)
-          $dumpline = "'".implode("','",$dumpline)."'";
+          $dumpline = "'" . implode("','", $dumpline) . "'";
         else
-          $dumpline = implode(",",$dumpline);
-        $dumpline = 'INSERT INTO '.$csv_insert_table.' VALUES ('.$dumpline.');';
+          $dumpline = implode(",", $dumpline);
+        $dumpline = 'INSERT INTO ' . $csv_insert_table . ' VALUES (' . $dumpline . ');';
       }
 
 // Handle DOS and Mac encoded linebreaks (I don't know if it really works on Win32 or Mac Servers)
 
-      $dumpline=str_replace("\r\n", "\n", $dumpline);
-      $dumpline=str_replace("\r", "\n", $dumpline);
+      $dumpline = str_replace("\r\n", "\n", $dumpline);
+      $dumpline = str_replace("\r", "\n", $dumpline);
             
 // DIAGNOSTIC
 // echo ("<p>Line $linenumber: $dumpline</p>\n");
 
 // Recognize delimiter statement
 
-      if (!$inparents && strpos ($dumpline, "DELIMITER ") === 0)
-        $delimiter = str_replace ("DELIMITER ","",trim($dumpline));
+      if (!$inparents && strpos($dumpline, "DELIMITER ") === 0)
+        $delimiter = str_replace("DELIMITER ", "", trim($dumpline));
 
 // Skip comments and blank lines only if NOT in parents
 
       if (!$inparents)
-      { $skipline=false;
+      { $skipline = false;
         reset($comment);
         foreach ($comment as $comment_value)
         { 
 
 // DIAGNOSTIC
 //          echo ($comment_value);
-          if (trim($dumpline)=="" || strpos (trim($dumpline), $comment_value) === 0)
-          { $skipline=true;
+          if (trim($dumpline) == "" || strpos(trim($dumpline), $comment_value) === 0)
+          { $skipline = true;
             break;
           }
         }
@@ -681,13 +681,13 @@ 
 
 // Remove double back-slashes from the dumpline prior to count the quotes ('\\' can only be within strings)
       
-      $dumpline_deslashed = str_replace ("\\\\","",$dumpline);
+      $dumpline_deslashed = str_replace("\\\\", "", $dumpline);
 
 // Count ' and \' (or " and \") in the dumpline to avoid query break within a text field ending by $delimiter
 
-      $parents=substr_count ($dumpline_deslashed, $string_quotes)-substr_count ($dumpline_deslashed, "\\$string_quotes");
+      $parents = substr_count($dumpline_deslashed, $string_quotes) - substr_count($dumpline_deslashed, "\\$string_quotes");
       if ($parents % 2 != 0)
-        $inparents=!$inparents;
+        $inparents = !$inparents;
 
 // Add the line to query
 
@@ -700,15 +700,15 @@ 
       
 // Stop if query contains more lines as defined by MAX_QUERY_LINES
 
-      if ($querylines>MAX_QUERY_LINES)
+      if ($querylines > MAX_QUERY_LINES)
       {
         echo ("<p class=\"error\">Stopped at the line $linenumber. </p>");
-        echo ("<p>At this place the current query includes more than ".MAX_QUERY_LINES." dump lines. That can happen if your dump file was ");
+        echo ("<p>At this place the current query includes more than " . MAX_QUERY_LINES . " dump lines. That can happen if your dump file was ");
         echo ("created by some tool which doesn't place a semicolon followed by a linebreak at the end of each query, or if your dump contains ");
         echo ("extended inserts or very long procedure definitions. Please read the <a href=\"http://www.ozerov.de/bigdump/usage/\">BigDump usage notes</a> ");
         echo ("for more infos. Ask for our support services ");
         echo ("in order to handle dump files containing extended inserts.</p>\n");
-        $error=true;
+        $error = true;
         break;
       }
 
@@ -719,27 +719,27 @@ 
 // echo ("<p>In Parents: ".($inparents?"true":"false")."</p>\n");
 // echo ("<p>Line: $dumpline</p>\n");
 
-      if (preg_match('/'.preg_quote($delimiter).'$/',trim($dumpline)) && !$inparents)
+      if (preg_match('/' . preg_quote($delimiter) . '$/', trim($dumpline)) && !$inparents)
       { 
 
 // Cut off delimiter of the end of the query
 
-        $query = substr(trim($query),0,-1*strlen($delimiter));
+        $query = substr(trim($query), 0, -1 * strlen($delimiter));
 
 // DIAGNOSTIC
 // echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
 
         if (!TESTMODE && !mysql_query($query, $dbconnection))
-        { echo ("<p class=\"error\">Error at the line $linenumber: ". trim($dumpline)."</p>\n");
-          echo ("<p>Query: ".trim(nl2br(htmlentities($query)))."</p>\n");
-          echo ("<p>MySQL: ".mysql_error()."</p>\n");
-          $error=true;
+        { echo ("<p class=\"error\">Error at the line $linenumber: " . trim($dumpline) . "</p>\n");
+          echo ("<p>Query: " . trim(nl2br(htmlentities($query))) . "</p>\n");
+          echo ("<p>MySQL: " . mysql_error() . "</p>\n");
+          $error = true;
           break;
         }
         $totalqueries++;
         $queries++;
-        $query="";
-        $querylines=0;
+        $query = "";
+        $querylines = 0;
       }
       $linenumber++;
     }
@@ -754,7 +754,7 @@ 
       $foffset = gztell($file);
     if (!$foffset)
     { echo ("<p class=\"error\">UNEXPECTED: Can't read the file pointer offset</p>\n");
-      $error=true;
+      $error = true;
     }
   }
 
@@ -766,8 +766,8 @@ 
 
   if (!$error)
   { 
-    $lines_this   = $linenumber-$_REQUEST["start"];
-    $lines_done   = $linenumber-1;
+    $lines_this   = $linenumber - $_REQUEST["start"];
+    $lines_done   = $linenumber - 1;
     $lines_togo   = ' ? ';
     $lines_tota   = ' ? ';
     
@@ -776,35 +776,35 @@ 
     $queries_togo = ' ? ';
     $queries_tota = ' ? ';
 
-    $bytes_this   = $foffset-$_REQUEST["foffset"];
+    $bytes_this   = $foffset - $_REQUEST["foffset"];
     $bytes_done   = $foffset;
-    $kbytes_this  = round($bytes_this/1024,2);
-    $kbytes_done  = round($bytes_done/1024,2);
-    $mbytes_this  = round($kbytes_this/1024,2);
-    $mbytes_done  = round($kbytes_done/1024,2);
+    $kbytes_this  = round($bytes_this / 1024, 2);
+    $kbytes_done  = round($bytes_done / 1024, 2);
+    $mbytes_this  = round($kbytes_this / 1024, 2);
+    $mbytes_done  = round($kbytes_done / 1024, 2);
    
     if (!$gzipmode)
     {
-      $bytes_togo  = $filesize-$foffset;
+      $bytes_togo  = $filesize - $foffset;
       $bytes_tota  = $filesize;
-      $kbytes_togo = round($bytes_togo/1024,2);
-      $kbytes_tota = round($bytes_tota/1024,2);
-      $mbytes_togo = round($kbytes_togo/1024,2);
-      $mbytes_tota = round($kbytes_tota/1024,2);
+      $kbytes_togo = round($bytes_togo / 1024, 2);
+      $kbytes_tota = round($bytes_tota / 1024, 2);
+      $mbytes_togo = round($kbytes_togo / 1024, 2);
+      $mbytes_tota = round($kbytes_tota / 1024, 2);
       
-      $pct_this   = ceil($bytes_this/$filesize*100);
-      $pct_done   = ceil($foffset/$filesize*100);
+      $pct_this   = ceil($bytes_this / $filesize * 100);
+      $pct_done   = ceil($foffset / $filesize * 100);
       $pct_togo   = 100 - $pct_done;
       $pct_tota   = 100;
 
-      if ($bytes_togo==0) 
+      if ($bytes_togo == 0) 
       { $lines_togo   = '0'; 
-        $lines_tota   = $linenumber-1; 
+        $lines_tota   = $linenumber - 1; 
         $queries_togo = '0'; 
         $queries_tota = $totalqueries; 
       }
 
-      $pct_bar    = "<div style=\"height:15px;width:$pct_done%;background-color:#000080;margin:0px;\"></div>";
+      $pct_bar = "<div style=\"height:15px;width:$pct_done%;background-color:#000080;margin:0px;\"></div>";
     }
     else
     {
@@ -819,7 +819,7 @@ 
       $pct_done    = ' ? ';
       $pct_togo    = ' ? ';
       $pct_tota    = 100;
-      $pct_bar     = str_replace(' ','&nbsp;','<tt>[         Not available for gzipped files          ]</tt>');
+      $pct_bar     = str_replace(' ', '&nbsp;', '<tt>[         Not available for gzipped files          ]</tt>');
     }
     
     echo ("
@@ -839,7 +839,7 @@ 
 
 // Finish message and restart the script
 
-    if ($linenumber<$_REQUEST["start"]+$linespersession)
+    if ($linenumber < $_REQUEST["start"] + $linespersession)
     { echo ("<p class=\"successcentr\">Congratulations: End of file reached, assuming OK</p>\n");
       echo ("<p class=\"successcentr\">IMPORTANT: REMOVE YOUR DUMP FILE and BIGDUMP SCRIPT FROM SERVER NOW!</p>\n");
       echo ("<p class=\"centr\">Thank you for using this tool! Please rate <a href=\"http://www.hotscripts.com/listing/bigdump/?RID=403\" target=\"_blank\">Bigdump at Hotscripts.com</a></p>\n");
@@ -863,19 +863,19 @@ 
 
 <?php      
 
-      $error=true; // This is a semi-error telling the script is finished
+      $error = true; // This is a semi-error telling the script is finished
     }
     else
-    { if ($delaypersession!=0)
+    { if ($delaypersession != 0)
         echo ("<p class=\"centr\">Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
       if (!$ajax) 
-        echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".urlencode($curfilename)."&foffset=$foffset&totalqueries=$totalqueries&delimiter=".urlencode($delimiter)."\";',500+$delaypersession);</script>\n");
+        echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"" . $_SERVER["PHP_SELF"] . "?start=$linenumber&fn=" . urlencode($curfilename) . "&foffset=$foffset&totalqueries=$totalqueries&delimiter=" . urlencode($delimiter) . "\";',500+$delaypersession);</script>\n");
 
       echo ("<noscript>\n");
-      echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&amp;fn=".urlencode($curfilename)."&amp;foffset=$foffset&amp;totalqueries=$totalqueries&amp;delimiter=".urlencode($delimiter)."\">Continue from the line $linenumber</a> (Enable JavaScript to do it automatically)</p>\n");
+      echo ("<p class=\"centr\"><a href=\"" . $_SERVER["PHP_SELF"] . "?start=$linenumber&amp;fn=" . urlencode($curfilename) . "&amp;foffset=$foffset&amp;totalqueries=$totalqueries&amp;delimiter=" . urlencode($delimiter) . "\">Continue from the line $linenumber</a> (Enable JavaScript to do it automatically)</p>\n");
       echo ("</noscript>\n");
    
-      echo ("<p class=\"centr\">Press <b><a href=\"".$_SERVER["PHP_SELF"]."\">STOP</a></b> to abort the import <b>OR WAIT!</b></p>\n");
+      echo ("<p class=\"centr\">Press <b><a href=\"" . $_SERVER["PHP_SELF"] . "\">STOP</a></b> to abort the import <b>OR WAIT!</b></p>\n");
     }
   }
   else 
@@ -886,7 +886,7 @@ 
 }
 
 if ($error)
-  echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."\">Start from the beginning</a> (DROP the old tables before restarting)</p>\n");
+  echo ("<p class=\"centr\"><a href=\"" . $_SERVER["PHP_SELF"] . "\">Start from the beginning</a> (DROP the old tables before restarting)</p>\n");
 
 if ($dbconnection) mysql_close($dbconnection);
 if ($file && !$gzipmode) fclose($file);
@@ -947,7 +947,7 @@ 
 				 $bytes_this, $bytes_done, $bytes_togo, $bytes_tota,
 				 $kbytes_this, $kbytes_done, $kbytes_togo, $kbytes_tota,
 				 $mbytes_this, $mbytes_done, $mbytes_togo, $mbytes_tota,
-				 $pct_this, $pct_done, $pct_togo, $pct_tota,$pct_bar;
+				 $pct_this, $pct_done, $pct_togo, $pct_tota, $pct_bar;
 
 	header('Content-Type: application/xml');
 	header('Cache-Control: no-cache');
@@ -994,7 +994,7 @@ 
 	echo "<elem22>$pct_done</elem22>";
 	echo "<elem23>$pct_togo</elem23>";
 	echo "<elem24>$pct_tota</elem24>";
-	echo "<elem_bar>".htmlentities($pct_bar)."</elem_bar>";
+	echo "<elem_bar>" . htmlentities($pct_bar) . "</elem_bar>";
 				
 	echo "</root>";		
 }
@@ -1097,7 +1097,7 @@ 
 	// First Ajax request from initial page
 
 	var http_request = false;
-	var url_request =  get_url(<?php echo ($linenumber.',"'.urlencode($curfilename).'",'.$foffset.','.$totalqueries.',"'.urlencode($delimiter).'"') ;?>);
+	var url_request =  get_url(<?php echo ($linenumber . ',"' . urlencode($curfilename) . '",' . $foffset . ',' . $totalqueries . ',"' . urlencode($delimiter) . '"'); ?>);
 	window.setTimeout("makeRequest(url_request)",500+<?php echo $delaypersession; ?>);
 	</script>
 

Braces +140 added lines, -110 removed lines

@@ -95,8 +95,9 @@ 
 // If not familiar with PHP please don't change anything below this line
 // *******************************************************************************************
 
-if ($ajax)
+if ($ajax) {
   ob_start();
+}
 
 define ('VERSION','0.34b');
 define ('DATA_CHUNK_LENGTH',16384);  // How many chars are read per time
@@ -112,8 +113,9 @@ 
 @ini_set('auto_detect_line_endings', true);
 @set_time_limit(0);
 
-if (function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
+if (function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get")) {
   @date_default_timezone_set(@date_default_timezone_get());
+}
 
 // Clean and strip anything we don't want from user's input [0.27b]
 
@@ -296,23 +298,30 @@ 
 
 if (!$error)
 { $upload_max_filesize=ini_get("upload_max_filesize");
-  if (preg_match("/([0-9]+)K/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024;
-  if (preg_match("/([0-9]+)M/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024*1024;
-  if (preg_match("/([0-9]+)G/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024*1024*1024;
-}
+  if (preg_match("/([0-9]+)K/i",$upload_max_filesize,$tempregs)) {
+  	$upload_max_filesize=$tempregs[1]*1024;
+  }
+  if (preg_match("/([0-9]+)M/i",$upload_max_filesize,$tempregs)) {
+  	$upload_max_filesize=$tempregs[1]*1024*1024;
+  }
+  if (preg_match("/([0-9]+)G/i",$upload_max_filesize,$tempregs)) {
+  	$upload_max_filesize=$tempregs[1]*1024*1024*1024;
+  }
+  }
 
 // Get the current directory
 
-if (isset($_SERVER["CGIA"]))
+if (isset($_SERVER["CGIA"])) {
   $upload_dir=dirname($_SERVER["CGIA"]);
-else if (isset($_SERVER["ORIG_PATH_TRANSLATED"]))
+} else if (isset($_SERVER["ORIG_PATH_TRANSLATED"])) {
   $upload_dir=dirname($_SERVER["ORIG_PATH_TRANSLATED"]);
-else if (isset($_SERVER["ORIG_SCRIPT_FILENAME"]))
+} else if (isset($_SERVER["ORIG_SCRIPT_FILENAME"])) {
   $upload_dir=dirname($_SERVER["ORIG_SCRIPT_FILENAME"]);
-else if (isset($_SERVER["PATH_TRANSLATED"]))
+} else if (isset($_SERVER["PATH_TRANSLATED"])) {
   $upload_dir=dirname($_SERVER["PATH_TRANSLATED"]);
-else 
+} else {
   $upload_dir=dirname($_SERVER["SCRIPT_FILENAME"]);
+}
 
 // Handle file upload
 
@@ -325,19 +334,15 @@ 
 
     if (file_exists($uploaded_filename))
     { echo ("<p class=\"error\">File $uploaded_filename already exist! Delete and upload again!</p>\n");
-    }
-    else if (!preg_match("/(\.(sql|gz|csv))$/i",$uploaded_filename))
+    } else if (!preg_match("/(\.(sql|gz|csv))$/i",$uploaded_filename))
     { echo ("<p class=\"error\">You may only upload .sql .gz or .csv files.</p>\n");
-    }
-    else if (!@move_uploaded_file($_FILES["dumpfile"]["tmp_name"],$uploaded_filepath))
+    } else if (!@move_uploaded_file($_FILES["dumpfile"]["tmp_name"],$uploaded_filepath))
     { echo ("<p class=\"error\">Error moving uploaded file ".$_FILES["dumpfile"]["tmp_name"]." to the $uploaded_filepath</p>\n");
       echo ("<p>Check the directory permissions for $upload_dir (must be 777)!</p>\n");
-    }
-    else
+    } else
     { echo ("<p class=\"success\">Uploaded file saved as $uploaded_filename</p>\n");
     }
-  }
-  else
+  } else
   { echo ("<p class=\"error\">Error uploading file ".$_FILES["dumpfile"]["name"]."</p>\n");
   }
 }
@@ -346,25 +351,28 @@ 
 // Handle file deletion (delete only in the current directory for security reasons)
 
 if (!$error && isset($_REQUEST["delete"]) && $_REQUEST["delete"]!=basename($_SERVER["SCRIPT_FILENAME"]))
-{ if (preg_match("/(\.(sql|gz|csv))$/i",$_REQUEST["delete"]) && @unlink(basename($_REQUEST["delete"])))
+{ if (preg_match("/(\.(sql|gz|csv))$/i",$_REQUEST["delete"]) && @unlink(basename($_REQUEST["delete"]))) {
     echo ("<p class=\"success\">".$_REQUEST["delete"]." was removed successfully</p>\n");
-  else
-    echo ("<p class=\"error\">Can't remove ".$_REQUEST["delete"]."</p>\n");
-}
+} else {
+      echo ("<p class=\"error\">Can't remove ".$_REQUEST["delete"]."</p>\n");
+  }
+  }
 
 // Connect to the database, set charset and execute pre-queries
 
 if (!$error && !TESTMODE)
 { $dbconnection = @mysql_connect($db_server,$db_username,$db_password);
-  if ($dbconnection) 
-    $db = mysql_select_db($db_name);
+  if ($dbconnection) {
+      $db = mysql_select_db($db_name);
+  }
   if (!$dbconnection || !$db) 
   { echo ("<p class=\"error\">Database connection failed due to ".mysql_error()."</p>\n");
     echo ("<p>Edit the database settings in ".$_SERVER["SCRIPT_FILENAME"]." or contact your database provider.</p>\n");
     $error=true;
   }
-  if (!$error && $db_connection_charset!=='')
-    @mysql_query("SET NAMES $db_connection_charset", $dbconnection);
+  if (!$error && $db_connection_charset!=='') {
+      @mysql_query("SET NAMES $db_connection_charset", $dbconnection);
+  }
 
   if (!$error && isset ($pre_query) && sizeof ($pre_query)>0)
   { reset($pre_query);
@@ -378,8 +386,7 @@ 
      }
     }
   }
-}
-else
+} else
 { $dbconnection = false;
 }
 
@@ -410,29 +417,31 @@ 
           }
           echo ("<tr><td>$dirfile</td><td class=\"right\">".filesize($dirfile)."</td><td>".date ("Y-m-d H:i:s", filemtime($dirfile))."</td>");
 
-          if (preg_match("/\.sql$/i",$dirfile))
-            echo ("<td>SQL</td>");
-          elseif (preg_match("/\.gz$/i",$dirfile))
-            echo ("<td>GZip</td>");
-          elseif (preg_match("/\.csv$/i",$dirfile))
-            echo ("<td>CSV</td>");
-          else
-            echo ("<td>Misc</td>");
-
-          if ((preg_match("/\.gz$/i",$dirfile) && function_exists("gzopen")) || preg_match("/\.sql$/i",$dirfile) || preg_match("/\.csv$/i",$dirfile))
-            echo ("<td><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($dirfile)."&amp;foffset=0&amp;totalqueries=0&amp;delimiter=".urlencode($delimiter)."\">Start Import</a> into $db_name at $db_server</td>\n <td><a href=\"".$_SERVER["PHP_SELF"]."?delete=".urlencode($dirfile)."\">Delete file</a></td></tr>\n");
-          else
-            echo ("<td>&nbsp;</td>\n <td>&nbsp;</td></tr>\n");
+          if (preg_match("/\.sql$/i",$dirfile)) {
+                      echo ("<td>SQL</td>");
+          } elseif (preg_match("/\.gz$/i",$dirfile)) {
+                      echo ("<td>GZip</td>");
+          } elseif (preg_match("/\.csv$/i",$dirfile)) {
+                      echo ("<td>CSV</td>");
+          } else {
+                      echo ("<td>Misc</td>");
+          }
+
+          if ((preg_match("/\.gz$/i",$dirfile) && function_exists("gzopen")) || preg_match("/\.sql$/i",$dirfile) || preg_match("/\.csv$/i",$dirfile)) {
+                      echo ("<td><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($dirfile)."&amp;foffset=0&amp;totalqueries=0&amp;delimiter=".urlencode($delimiter)."\">Start Import</a> into $db_name at $db_server</td>\n <td><a href=\"".$_SERVER["PHP_SELF"]."?delete=".urlencode($dirfile)."\">Delete file</a></td></tr>\n");
+          } else {
+                      echo ("<td>&nbsp;</td>\n <td>&nbsp;</td></tr>\n");
+          }
         }
       }
     }
 
-    if ($dirhead) 
-      echo ("</table>\n");
-    else 
-      echo ("<p>No uploaded SQL, GZ or CSV files found in the working directory</p>\n");
-  }
-  else
+    if ($dirhead) {
+          echo ("</table>\n");
+    } else {
+          echo ("<p>No uploaded SQL, GZ or CSV files found in the working directory</p>\n");
+    }
+  } else
   { echo ("<p class=\"error\">Error listing directory $upload_dir</p>\n");
     $error=true;
   }
@@ -457,8 +466,7 @@ 
   if (!($tempfile=@fopen($tempfilename,"w")))
   { echo ("<p>Upload form disabled. Permissions for the working directory <i>$upload_dir</i> <b>must be set writable for the webserver</b> in order ");
     echo ("to upload files here. Alternatively you can upload your dump files via FTP.</p>\n");
-  }
-  else
+  } else
   { fclose($tempfile);
     unlink ($tempfilename);
  
@@ -493,19 +501,21 @@ 
 
 // Set current filename ($filename overrides $_REQUEST["fn"] if set)
 
-  if ($filename!="")
-    $curfilename=$filename;
-  else if (isset($_REQUEST["fn"]))
-    $curfilename=urldecode($_REQUEST["fn"]);
-  else
-    $curfilename="";
+  if ($filename!="") {
+      $curfilename=$filename;
+  } else if (isset($_REQUEST["fn"])) {
+      $curfilename=urldecode($_REQUEST["fn"]);
+  } else {
+      $curfilename="";
+  }
 
 // Recognize GZip filename
 
-  if (preg_match("/\.gz$/i",$curfilename)) 
-    $gzipmode=true;
-  else
-    $gzipmode=false;
+  if (preg_match("/\.gz$/i",$curfilename)) {
+      $gzipmode=true;
+  } else {
+      $gzipmode=false;
+  }
 
   if ((!$gzipmode && !$file=@fopen($curfilename,"r")) || ($gzipmode && !$file=@gzopen($curfilename,"r")))
   { echo ("<p class=\"error\">Can't open ".$curfilename." for import</p>\n");
@@ -518,10 +528,13 @@ 
 // Get the file size (can't do it fast on gzipped files, no idea how)
 
   else if ((!$gzipmode && @fseek($file, 0, SEEK_END)==0) || ($gzipmode && @gzseek($file, 0)==0))
-  { if (!$gzipmode) $filesize = ftell($file);
-    else $filesize = gztell($file);                   // Always zero, ignore
-  }
-  else
+  { if (!$gzipmode) {
+  	$filesize = ftell($file);
+  } else {
+    	$filesize = gztell($file);
+    }
+    // Always zero, ignore
+  } else
   { echo ("<p class=\"error\">I can't seek into $curfilename</p>\n");
     $error=true;
   }
@@ -547,16 +560,16 @@ 
   if (!is_numeric($_REQUEST["start"]) || !is_numeric($_REQUEST["foffset"]))
   { echo ("<p class=\"error\">UNEXPECTED: Non-numeric values for start and foffset</p>\n");
     $error=true;
-  }
-  else
+  } else
   {	$_REQUEST["start"]   = floor($_REQUEST["start"]);
     $_REQUEST["foffset"] = floor($_REQUEST["foffset"]);
   }
 
 // Set the current delimiter if defined
 
-  if (isset($_REQUEST["delimiter"]))
-    $delimiter = $_REQUEST["delimiter"];
+  if (isset($_REQUEST["delimiter"])) {
+      $delimiter = $_REQUEST["delimiter"];
+  }
 
 // Empty CSV table if requested
 
@@ -575,8 +588,9 @@ 
 
   if (!$error)
   { skin_open();
-    if (TESTMODE) 
-      echo ("<p class=\"centr\">TEST MODE ENABLED</p>\n");
+    if (TESTMODE) {
+          echo ("<p class=\"centr\">TEST MODE ENABLED</p>\n");
+    }
     echo ("<p class=\"centr\">Processing file: <b>".$curfilename."</b></p>\n");
     echo ("<p class=\"smlcentr\">Starting from line: ".$_REQUEST["start"]."</p>\n");	
     skin_close();
@@ -615,29 +629,35 @@ 
 
       $dumpline = "";
       while (!feof($file) && substr ($dumpline, -1) != "\n" && substr ($dumpline, -1) != "\r")
-      { if (!$gzipmode)
-          $dumpline .= fgets($file, DATA_CHUNK_LENGTH);
-        else
-          $dumpline .= gzgets($file, DATA_CHUNK_LENGTH);
+      { if (!$gzipmode) {
+                $dumpline .= fgets($file, DATA_CHUNK_LENGTH);
+      } else {
+                  $dumpline .= gzgets($file, DATA_CHUNK_LENGTH);
+        }
+      }
+      if ($dumpline==="") {
+      	break;
       }
-      if ($dumpline==="") break;
 
 // Remove UTF8 Byte Order Mark at the file beginning if any
 
-      if ($_REQUEST["foffset"]==0)
-        $dumpline=preg_replace('|^\xEF\xBB\xBF|','',$dumpline);
+      if ($_REQUEST["foffset"]==0) {
+              $dumpline=preg_replace('|^\xEF\xBB\xBF|','',$dumpline);
+      }
 
 // Create an SQL query from CSV line
 
       if (($csv_insert_table != "") && (preg_match("/(\.csv)$/i",$curfilename)))
       {
-        if ($csv_add_slashes)
-          $dumpline = addslashes($dumpline);
+        if ($csv_add_slashes) {
+                  $dumpline = addslashes($dumpline);
+        }
         $dumpline = explode($csv_delimiter,$dumpline);
-        if ($csv_add_quotes)
-          $dumpline = "'".implode("','",$dumpline)."'";
-        else
-          $dumpline = implode(",",$dumpline);
+        if ($csv_add_quotes) {
+                  $dumpline = "'".implode("','",$dumpline)."'";
+        } else {
+                  $dumpline = implode(",",$dumpline);
+        }
         $dumpline = 'INSERT INTO '.$csv_insert_table.' VALUES ('.$dumpline.');';
       }
 
@@ -651,8 +671,9 @@ 
 
 // Recognize delimiter statement
 
-      if (!$inparents && strpos ($dumpline, "DELIMITER ") === 0)
-        $delimiter = str_replace ("DELIMITER ","",trim($dumpline));
+      if (!$inparents && strpos ($dumpline, "DELIMITER ") === 0) {
+              $delimiter = str_replace ("DELIMITER ","",trim($dumpline));
+      }
 
 // Skip comments and blank lines only if NOT in parents
 
@@ -686,8 +707,9 @@ 
 // Count ' and \' (or " and \") in the dumpline to avoid query break within a text field ending by $delimiter
 
       $parents=substr_count ($dumpline_deslashed, $string_quotes)-substr_count ($dumpline_deslashed, "\\$string_quotes");
-      if ($parents % 2 != 0)
-        $inparents=!$inparents;
+      if ($parents % 2 != 0) {
+              $inparents=!$inparents;
+      }
 
 // Add the line to query
 
@@ -695,8 +717,9 @@ 
 
 // Don't count the line if in parents (text fields may include unlimited linebreaks)
       
-      if (!$inparents)
-        $querylines++;
+      if (!$inparents) {
+              $querylines++;
+      }
       
 // Stop if query contains more lines as defined by MAX_QUERY_LINES
 
@@ -748,10 +771,11 @@ 
 // Get the current file position
 
   if (!$error)
-  { if (!$gzipmode) 
-      $foffset = ftell($file);
-    else
-      $foffset = gztell($file);
+  { if (!$gzipmode) {
+        $foffset = ftell($file);
+  } else {
+          $foffset = gztell($file);
+    }
     if (!$foffset)
     { echo ("<p class=\"error\">UNEXPECTED: Can't read the file pointer offset</p>\n");
       $error=true;
@@ -805,8 +829,7 @@ 
       }
 
       $pct_bar    = "<div style=\"height:15px;width:$pct_done%;background-color:#000080;margin:0px;\"></div>";
-    }
-    else
+    } else
     {
       $bytes_togo  = ' ? ';
       $bytes_tota  = ' ? ';
@@ -864,12 +887,13 @@ 
 <?php      
 
       $error=true; // This is a semi-error telling the script is finished
+    } else
+    { if ($delaypersession!=0) {
+            echo ("<p class=\"centr\">Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
     }
-    else
-    { if ($delaypersession!=0)
-        echo ("<p class=\"centr\">Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
-      if (!$ajax) 
-        echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".urlencode($curfilename)."&foffset=$foffset&totalqueries=$totalqueries&delimiter=".urlencode($delimiter)."\";',500+$delaypersession);</script>\n");
+      if (!$ajax) {
+              echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".urlencode($curfilename)."&foffset=$foffset&totalqueries=$totalqueries&delimiter=".urlencode($delimiter)."\";',500+$delaypersession);</script>\n");
+      }
 
       echo ("<noscript>\n");
       echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&amp;fn=".urlencode($curfilename)."&amp;foffset=$foffset&amp;totalqueries=$totalqueries&amp;delimiter=".urlencode($delimiter)."\">Continue from the line $linenumber</a> (Enable JavaScript to do it automatically)</p>\n");
@@ -877,20 +901,26 @@ 
    
       echo ("<p class=\"centr\">Press <b><a href=\"".$_SERVER["PHP_SELF"]."\">STOP</a></b> to abort the import <b>OR WAIT!</b></p>\n");
     }
+  } else {
+      echo ("<p class=\"error\">Stopped on error</p>\n");
   }
-  else 
-    echo ("<p class=\"error\">Stopped on error</p>\n");
 
 skin_close();
 
 }
 
-if ($error)
+if ($error) {
   echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."\">Start from the beginning</a> (DROP the old tables before restarting)</p>\n");
+}
 
-if ($dbconnection) mysql_close($dbconnection);
-if ($file && !$gzipmode) fclose($file);
-else if ($file && $gzipmode) gzclose($file);
+if ($dbconnection) {
+	mysql_close($dbconnection);
+}
+if ($file && !$gzipmode) {
+	fclose($file);
+} else if ($file && $gzipmode) {
+	gzclose($file);
+}
 
 ?>
 
@@ -923,10 +953,10 @@ 
   {	ob_end_clean();
 	create_xml_response();
 	die;
-  } 
-  else 
-    create_ajax_script();	  
-}
+  } else {
+      create_ajax_script();
+  }
+  }
 
 // Anyway put out the output from above
 

include/plugins/frames.php

Indentation +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 	var $sameOrigin;
 	
 	/**
-	* @param bool allow running from the same origin only
-	*/
+	 * @param bool allow running from the same origin only
+	 */
 	function AdminerFrames($sameOrigin = false) {
 		$this->sameOrigin = $sameOrigin;
 	}

include/plugins/tinymce.php

Indentation +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
 	var $path;
 	
 	/**
-	* @param string
-	*/
+	 * @param string
+	 */
 	function AdminerTinymce($path = "tiny_mce/tiny_mce.js") {
 		$this->path = $path;
 	}

include/plugins/login-table.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 	var $database;
 	
 	/** Set database of login table
-	* @param string
-	*/
+	 * @param string
+	 */
 	function AdminerLoginTable($database) {
 		$this->database = $database;
 	}

include/plugins/file-upload.php

Indentation +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
 	var $uploadPath, $displayPath;
 	
 	/**
-	* @param string prefix for uploading data (create writable subdirectory for each table containing uploadable fields)
-	* @param string prefix for displaying data, null stands for $uploadPath
-	*/
+	 * @param string prefix for uploading data (create writable subdirectory for each table containing uploadable fields)
+	 * @param string prefix for displaying data, null stands for $uploadPath
+	 */
 	function AdminerFileUpload($uploadPath = "../static/data/", $displayPath = null) {
 		$this->uploadPath = $uploadPath;
 		$this->displayPath = (isset($displayPath) ? $displayPath : $uploadPath);