XoopsModules25x / adminer

admin/menu.php

Indentation +15 added lines, -15 removed lines

@@ -34,31 +34,31 @@
 include_once $xoopsModuleAdminPath . '/language/english/main.php';
 
 $adminmenu[] = array(
-    'title' => _AM_MODULEADMIN_HOME,
-    'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png'
+	'title' => _AM_MODULEADMIN_HOME,
+	'link'  => 'admin/index.php',
+	'icon'  => $pathIcon32 . '/home.png'
 );
 
 $adminmenu[] = array(
-    'title' => _MI_ADMINER_MENU_01,
-    'link'  => 'admin/mysql.php',
-    'icon'  => $pathIcon32 . '/database_go.png'
+	'title' => _MI_ADMINER_MENU_01,
+	'link'  => 'admin/mysql.php',
+	'icon'  => $pathIcon32 . '/database_go.png'
 );
 
 $adminmenu[] = array(
-    'title' => _MI_ADMINER_MENU_02,
-    'link'  => 'admin/editor.php',
-    'icon'  => $pathIcon32 . '/translations.png'
+	'title' => _MI_ADMINER_MENU_02,
+	'link'  => 'admin/editor.php',
+	'icon'  => $pathIcon32 . '/translations.png'
 );
 
 $adminmenu[] = array(
-    'title' => _MI_ADMINER_MENU_03,
-    'link'  => 'admin/dump.php',
-    'icon'  => $pathIcon32 . '/upload.png'
+	'title' => _MI_ADMINER_MENU_03,
+	'link'  => 'admin/dump.php',
+	'icon'  => $pathIcon32 . '/upload.png'
 );
 
 $adminmenu[] = array(
-    'title' => _AM_MODULEADMIN_ABOUT,
-    'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png'
+	'title' => _AM_MODULEADMIN_ABOUT,
+	'link'  => 'admin/about.php',
+	'icon'  => $pathIcon32 . '/about.png'
 );

mysql.php

Indentation +21 added lines, -21 removed lines

@@ -22,35 +22,35 @@
 $moduleDirName = basename(__DIR__);
 include(XOOPS_ROOT_PATH . '/header.php');
 if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
-    exit(_NOPERM);
+	exit(_NOPERM);
 }
 
 function adminer_object()
 {
-    class AdminerKfr extends Adminer
-    {
-        public function name()
-        {
-            return 'XOOPS Admin';
-        }
+	class AdminerKfr extends Adminer
+	{
+		public function name()
+		{
+			return 'XOOPS Admin';
+		}
 
-        public function credentials()
-        {
-            return array(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
-        }
+		public function credentials()
+		{
+			return array(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+		}
 
-        public function database()
-        {
-            return XOOPS_DB_NAME;
-        }
+		public function database()
+		{
+			return XOOPS_DB_NAME;
+		}
 
-        public function login($login, $password)
-        {
-            return ($login == XOOPS_DB_USER);
-        }
-    }
+		public function login($login, $password)
+		{
+			return ($login == XOOPS_DB_USER);
+		}
+	}
 
-    return new AdminerKfr;
+	return new AdminerKfr;
 }
 
 /*

include/plugins/edit-calendar.php

Indentation +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@
 	var $prepend, $langPath;
 
 	/**
-	* @param string text to append before first calendar usage
-	* @param string path to language file, %s stands for language code
-	*/
+	 * @param string text to append before first calendar usage
+	 * @param string path to language file, %s stands for language code
+	 */
 	function __construct($prepend = "<script type='text/javascript' src='jquery-ui/jquery.js'></script>\n<script type='text/javascript' src='jquery-ui/jquery-ui.js'></script>\n<script type='text/javascript' src='jquery-ui/jquery-ui-timepicker-addon.js'></script>\n<link rel='stylesheet' type='text/css' href='jquery-ui/jquery-ui.css'>\n", $langPath = 'jquery-ui/i18n/jquery.ui.datepicker-%s.js'
-    ) {
+	) {
 		$this->prepend = $prepend;
 		$this->langPath = $langPath;
 	}

include/plugins/foreign-system.php

Indentation +30 added lines, -30 removed lines

@@ -20,10 +20,10 @@ 
 				case 'tables_priv': return array(array('table' => 'user', 'source' => array('Host', 'User'), 'target' => array('Host', 'User')));
 				case 'time_zone_name': return array(array('table' => 'time_zone', 'source' => array('Time_zone_id'), 'target' => array('Time_zone_id')));
 				case 'time_zone_transition': return array(array('table' => 'time_zone', 'source' => array('Time_zone_id'), 'target' => array('Time_zone_id')), array(
-                    'table' => 'time_zone_transition_type', 'source' => array('Time_zone_id', 'Transition_type_id'), 'target' => array(
-                    'Time_zone_id',
-                    'Transition_type_id'
-                )));
+					'table' => 'time_zone_transition_type', 'source' => array('Time_zone_id', 'Transition_type_id'), 'target' => array(
+					'Time_zone_id',
+					'Transition_type_id'
+				)));
 				case 'time_zone_transition_type': return array(array('table' => 'time_zone', 'source' => array('Time_zone_id'), 'target' => array('Time_zone_id')));
 			}
 		} elseif (DB == 'information_schema') {
@@ -44,40 +44,40 @@ 
 				case 'EVENTS': return array_merge(array(array('source' => array('EVENT_CATALOG', 'EVENT_SCHEMA')) + $schemata), $routine_charsets);
 				case 'FILES': return array($schemata, $tables);
 				case 'KEY_COLUMN_USAGE': return array(array('source' => array('CONSTRAINT_CATALOG', 'CONSTRAINT_SCHEMA')) + $schemata, $schemata, $tables, $columns, array('source' => array('TABLE_CATALOG', 'REFERENCED_TABLE_SCHEMA')) + $schemata, array(
-                                                                                                                                                                                                                                                           'source' => array(
-                                                         'TABLE_CATALOG',
-                                                         'REFERENCED_TABLE_SCHEMA',
-                                                         'REFERENCED_TABLE_NAME'
-                                                     )) + $tables, array(
-                                                                                                                                                                                                                                                                                                                                                                    'source' => array(
-                                                         'TABLE_CATALOG',
-                                                         'REFERENCED_TABLE_SCHEMA',
-                                                         'REFERENCED_TABLE_NAME',
-                                                         'REFERENCED_COLUMN_NAME'
-                                                     )) + $columns);
+																																																														   'source' => array(
+														 'TABLE_CATALOG',
+														 'REFERENCED_TABLE_SCHEMA',
+														 'REFERENCED_TABLE_NAME'
+													 )) + $tables, array(
+																																																																																									'source' => array(
+														 'TABLE_CATALOG',
+														 'REFERENCED_TABLE_SCHEMA',
+														 'REFERENCED_TABLE_NAME',
+														 'REFERENCED_COLUMN_NAME'
+													 )) + $columns);
 				case 'PARTITIONS': return array($schemata, $tables);
 				case 'REFERENTIAL_CONSTRAINTS': return array(array('source' => array('CONSTRAINT_CATALOG', 'CONSTRAINT_SCHEMA')) + $schemata, array('source' => array('UNIQUE_CONSTRAINT_CATALOG', 'UNIQUE_CONSTRAINT_SCHEMA')) + $schemata, array(
-                                                                                                                                                                                                                                                 'source' => array(
-                                                                'CONSTRAINT_CATALOG',
-                                                                'CONSTRAINT_SCHEMA',
-                                                                'TABLE_NAME'
-                                                            )) + $tables, array(
-                                                                                                                                                                                                                                                                                                                                              'source' => array(
-                                                                'CONSTRAINT_CATALOG',
-                                                                'CONSTRAINT_SCHEMA',
-                                                                'REFERENCED_TABLE_NAME'
-                                                            )) + $tables);
+																																																												 'source' => array(
+																'CONSTRAINT_CATALOG',
+																'CONSTRAINT_SCHEMA',
+																'TABLE_NAME'
+															)) + $tables, array(
+																																																																																			  'source' => array(
+																'CONSTRAINT_CATALOG',
+																'CONSTRAINT_SCHEMA',
+																'REFERENCED_TABLE_NAME'
+															)) + $tables);
 				case 'ROUTINES': return array_merge(array(array('source' => array('ROUTINE_CATALOG', 'ROUTINE_SCHEMA')) + $schemata), $routine_charsets);
 				case 'SCHEMA_PRIVILEGES': return array($schemata);
 				case 'STATISTICS': return array($schemata, $tables, $columns, array('source' => array('TABLE_CATALOG', 'INDEX_SCHEMA')) + $schemata);
 				case 'TABLE_CONSTRAINTS': return array(array('source' => array('CONSTRAINT_CATALOG', 'CONSTRAINT_SCHEMA')) + $schemata, array('source' => array('CONSTRAINT_CATALOG', 'TABLE_SCHEMA')) + $schemata, array('source' => array('CONSTRAINT_CATALOG', 'TABLE_SCHEMA', 'TABLE_NAME')) + $tables);
 				case 'TABLE_PRIVILEGES': return array($schemata, $tables);
 				case 'TRIGGERS': return array_merge(array(array('source' => array('TRIGGER_CATALOG', 'TRIGGER_SCHEMA')) + $schemata, array('source' => array('EVENT_OBJECT_CATALOG', 'EVENT_OBJECT_SCHEMA')) + $schemata, array(
-                                                                                                                                                                                                                              'source' => array(
-                                                             'EVENT_OBJECT_CATALOG',
-                                                             'EVENT_OBJECT_SCHEMA',
-                                                             'EVENT_OBJECT_TABLE'
-                                                         )) + $tables), $routine_charsets);
+																																																							  'source' => array(
+															 'EVENT_OBJECT_CATALOG',
+															 'EVENT_OBJECT_SCHEMA',
+															 'EVENT_OBJECT_TABLE'
+														 )) + $tables), $routine_charsets);
 				case 'VIEWS': return array($schemata);
 			}
 		}

include/plugins/translation.php

Indentation +2 added lines, -2 removed lines

@@ -39,11 +39,11 @@
 	}
 	
 	function tableName(&$tableStatus) {
-        $tableStatus['Comment'] = $this->_translate($tableStatus['Comment']);
+		$tableStatus['Comment'] = $this->_translate($tableStatus['Comment']);
 	}
 	
 	function fieldName(&$field, $order = 0) {
-        $field['comment'] = $this->_translate($field['comment']);
+		$field['comment'] = $this->_translate($field['comment']);
 	}
 	
 	function editVal(&$val, $field) {

include/plugins/plugin.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 	}
 	
 	/** Register plugins
-	* @param array object instances or null to register all classes starting by 'Adminer'
-	*/
+	 * @param array object instances or null to register all classes starting by 'Adminer'
+	 */
 	function __construct($plugins) {
 		if ($plugins === null) {
 			$plugins = array();

include/plugins/login-servers.php

Indentation +3 added lines, -3 removed lines

@@ -11,9 +11,9 @@
 	var $servers, $driver;
 	
 	/** Set supported servers
-	* @param array array($domain) or array($domain => $description) or array($category => array())
-	* @param string
-	*/
+	 * @param array array($domain) or array($domain => $description) or array($category => array())
+	 * @param string
+	 */
 	function __construct($servers, $driver = 'server') {
 		$this->servers = $servers;
 		$this->driver = $driver;

include/plugins/file-upload.php

Indentation +4 added lines, -4 removed lines

@@ -12,10 +12,10 @@
 	var $uploadPath, $displayPath, $extensions;
 
 	/**
-	* @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 regular expression with allowed file extensions
-	*/
+	 * @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 regular expression with allowed file extensions
+	 */
 	function __construct($uploadPath = '../static/data/', $displayPath = null, $extensions = '[a-zA-Z0-9]+') {
 		$this->uploadPath = $uploadPath;
 		$this->displayPath = ($displayPath !== null ? $displayPath : $uploadPath);

include/bigdump.php

Indentation +273 added lines, -273 removed lines

@@ -55,7 +55,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)

 

@@ -353,25 +353,25 @@ 
 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);

+	$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);

 

-    do_action('file_uploaded');

+	do_action('file_uploaded');

 

-    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");

-    }

+	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");

@@ -383,9 +383,9 @@ 
 

 if (!$error && isset($_REQUEST["delete"]) && $_REQUEST["delete"]!=basename($_SERVER["SCRIPT_FILENAME"]))

 { if (preg_match("/(\.(sql|gz|csv))$/i",$_REQUEST["delete"]) && @unlink($upload_dir.'/'.$_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

@@ -395,23 +395,23 @@ 
   

   if (mysqli_connect_error()) 

   { echo ("<p class=\"error\">Database connection failed due to ".mysqli_connect_error()."</p>\n");

-    echo ("<p>Edit the database settings in BigDump configuration, or contact your database provider.</p>\n");

-    $error=true;

+	echo ("<p>Edit the database settings in BigDump configuration, or contact your database provider.</p>\n");

+	$error=true;

   }

   if (!$error && $db_connection_charset!=='')

-    $mysqli->query("SET NAMES $db_connection_charset");

+	$mysqli->query("SET NAMES $db_connection_charset");

 

   if (!$error && isset ($pre_query) && sizeof ($pre_query)>0)

   { reset($pre_query);

-    foreach ($pre_query as $pre_query_value)

-    {	if (!$mysqli->query($pre_query_value))

-    	{ echo ("<p class=\"error\">Error with pre-query.</p>\n");

-      	echo ("<p>Query: ".trim(nl2br(htmlentities($pre_query_value)))."</p>\n");

-      	echo ("<p>MySQL: ".$mysqli->error."</p>\n");

-      	$error=true;

-      	break;

-     }

-    }

+	foreach ($pre_query as $pre_query_value)

+	{	if (!$mysqli->query($pre_query_value))

+		{ echo ("<p class=\"error\">Error with pre-query.</p>\n");

+	  	echo ("<p>Query: ".trim(nl2br(htmlentities($pre_query_value)))."</p>\n");

+	  	echo ("<p>MySQL: ".$mysqli->error."</p>\n");

+	  	$error=true;

+	  	break;

+	 }

+	}

   }

 }

 else

@@ -428,50 +428,50 @@ 
 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($upload_dir.'/'.$dirfile)."</td><td>".date ("Y-m-d H:i:s", filemtime($upload_dir.'/'.$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");

+	$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($upload_dir.'/'.$dirfile)."</td><td>".date ("Y-m-d H:i:s", filemtime($upload_dir.'/'.$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");

 // TODO: 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></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");

-        }

-      }

-    }

+		  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");

+	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;

   }

 }

 

@@ -493,14 +493,14 @@ 
   do { $tempfilename=$upload_dir.'/'.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">

@@ -518,11 +518,11 @@ 
   $result = $mysqli->query("SHOW VARIABLES LIKE 'character_set_connection';");

   if ($result) 

   { $row = $result->fetch_assoc();

-    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");

-    }

-    $result->free();

+	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");

+	}

+	$result->free();

   }

 }

 

@@ -534,43 +534,43 @@ 
 // 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($upload_dir.'/'.$curfilename,"r")) || ($gzipmode && !$file=@gzopen($upload_dir.'/'.$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;

   }

 

 // Stop if csv file is used, but $csv_insert_table is not set

 

   if (!$error && ($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;

   }

 }

 

@@ -588,171 +588,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 && !$mysqli->query(trim($query)))

-    { 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: ".$mysqli->error."</p>\n");

-      $error=true;

-    }

+	$query = "DELETE FROM `$csv_insert_table`";

+	if (!TESTMODE && !$mysqli->query(trim($query)))

+	{ 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: ".$mysqli->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

 

@@ -761,43 +761,43 @@ 
 // echo ("<p>In Parents: ".($inparents?"true":"false")."</p>\n");

 // echo ("<p>Line: $dumpline</p>\n");

 

-      if ((preg_match('/'.preg_quote($delimiter,'/').'$/',trim($dumpline)) || $delimiter=='') && !$inparents)

-      { 

+	  if ((preg_match('/'.preg_quote($delimiter,'/').'$/',trim($dumpline)) || $delimiter=='') && !$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 && !$mysqli->query($query))

-        { 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: ".$mysqli->error."</p>\n");

-          $error=true;

-          break;

-        }

-        $totalqueries++;

-        $queries++;

-        $query="";

-        $querylines=0;

-      }

-      $linenumber++;

-    }

+		if (!TESTMODE && !$mysqli->query($query))

+		{ 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: ".$mysqli->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

@@ -808,63 +808,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>

@@ -881,11 +881,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 -->

@@ -904,24 +904,24 @@ 
 <!-- End Paypal donation code -->

 

 <?php      

-      do_action('script_finished');

-      $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");

+	  do_action('script_finished');

+	  $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();

 

@@ -967,7 +967,7 @@ 
 	  die;

   } 

   else 

-    create_ajax_script();	  

+	create_ajax_script();	  

 }

 

 // Anyway put out the output from above

@@ -985,8 +985,8 @@ 
   

   if (isset($plugin_actions[$tag]))

   { reset ($plugin_actions[$tag]);

-    foreach ($plugin_actions[$tag] as $action)

-      call_user_func_array($action, array());

+	foreach ($plugin_actions[$tag] as $action)

+	  call_user_func_array($action, array());

   }

 }