xoops-svn

[<be...@us...>]

Revision: 12474
          http://sourceforge.net/p/xoops/svn/12474
Author:   beckmi
Date:     2014-04-25 11:31:21 +0000 (Fri, 25 Apr 2014)
Log Message:
-----------
XOOPS 2.5.7 Module Pack update (work in progress): Backup 

Modified Paths:
--------------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/about.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/admin_header.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/backup.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/bigdump.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/index.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/menu.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/other.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/view.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/docs/changelog.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/include/build_dump.lib.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/include/defines.lib.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/include/functions.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/include/zip.lib.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/language/english/admin.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/language/english/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/language/english/modinfo.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/xoops_version.php

Added Paths:
-----------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/admin/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/admin/convert.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/admin/database.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/admin/database_add.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/admin/del.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/admin/delete.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/admin/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/admin/restore.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/admin/show.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/images/slogo.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/assets/index.html

Removed Paths:
-------------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/images/

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/about.php	2014-04-25 11:29:22 UTC (rev 12473)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/about.php	2014-04-25 11:31:21 UTC (rev 12474)
@@ -11,5 +11,3 @@
 echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
 
 include 'admin_footer.php';
-
-?>

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/admin_header.php	2014-04-25 11:29:22 UTC (rev 12473)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/admin_header.php	2014-04-25 11:31:21 UTC (rev 12474)
@@ -1,18 +1,17 @@
 <?php
 include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
 include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include("../../../include/cp_header.php");
+include '../../../include/cp_header.php';
 
 //defined ('FRAMEWORKS_ART_FUNCTIONS_INI') || include_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.ini.php' ;
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
         include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
         //return true;
-    }else{
+    } else {
         echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
         //return false;
     }
 
-
 $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
 $pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
 $pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
@@ -28,4 +27,3 @@
 xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
 xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
 xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
-?>

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/backup.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/backup.php	2014-04-25 11:29:22 UTC (rev 12473)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/backup.php	2014-04-25 11:31:21 UTC (rev 12474)
@@ -15,7 +15,6 @@
 include_once(XOOPS_ROOT_PATH.'/modules/backup/include/zip.lib.php');
 include_once(XOOPS_ROOT_PATH."/class/xoopslists.php");
 
-
 ini_set("memory_limit", "512M");
 $cfgBackupTarget = $xoopsModuleConfig['cfgBackupTarget'];
 $drop = $xoopsModuleConfig['drop'];
@@ -28,13 +27,16 @@
 
 if ($db_name) {
 $db_selected = mysql_select_db($db_name);
-	if (!$db_selected) {
-  	redirect_header('index.php', 3, 'Database not exist');
-	exit;
-	}
+    if (!$db_selected) {
+      redirect_header('index.php', 3, 'Database not exist');
+    exit;
+    }
 }
 
 $server = $db_name;
+/**
+ * @param $sql_insert
+ */
 function PMA_myHandler($sql_insert)
 {
     global $tmp_buffer;
@@ -44,18 +46,20 @@
     $tmp_buffer .= $sql_insert . $eol_dlm . $GLOBALS['crlf'];
 }
 
+/**
+ * @return string
+ */
 function PMA_whichCrlf()
 {
     $the_crlf = "\n";
     if (PMA_USR_OS == 'Win') {
         $the_crlf = "\r\n";
-    }
-    else if (PMA_USR_OS == 'Mac') {
+    } elseif (PMA_USR_OS == 'Mac') {
         $the_crlf = "\r";
-    }
-    else {
+    } else {
         $the_crlf = "\n";
     }
+
     return $the_crlf;
 }
 
@@ -67,15 +71,15 @@
 if (($cfgZipType == 'bzip') && (PMA_PHP_INT_VERSION >= 40004 && @function_exists('bzcompress'))) {
     $ext       = 'bz2';
     $mime_type = 'application/x-bzip';
-} else if (($cfgZipType == 'gzip') &&(PMA_PHP_INT_VERSION >= 40004 && @function_exists('gzencode'))) {
+} elseif (($cfgZipType == 'gzip') &&(PMA_PHP_INT_VERSION >= 40004 && @function_exists('gzencode'))) {
     $ext       = 'gz';
     $mime_type = 'application/x-gzip';
-} else if (($cfgZipType == 'zip') && (PMA_PHP_INT_VERSION >= 40000 && @function_exists('gzcompress'))) {
+} elseif (($cfgZipType == 'zip') && (PMA_PHP_INT_VERSION >= 40000 && @function_exists('gzcompress'))) {
     $ext       = 'zip';
     $mime_type = 'application/x-zip';
 } else {
     $ext       = 'sql';
-	$cfgZipType = 'none';
+    $cfgZipType = 'none';
     $mime_type = (PMA_USR_BROWSER_AGENT == 'IE' || PMA_USR_BROWSER_AGENT == 'OPERA')
                ? 'application/octetstream'
                : 'application/octet-stream';
@@ -90,12 +94,12 @@
 
 if ($num_tables == 0) {
     echo '# ' ._DB_NOTABLESFOUND;
-	if(isset($_GET['oldurl'])){
-		redirect_header($_GET['oldurl'], 3, _DB_BACKUP_READY );
-	}else{
-		redirect_header("javascript:history.go(-1)", 1, _DB_BACKUP_READY );
-	}
-	exit;
+    if (isset($_GET['oldurl'])) {
+        redirect_header($_GET['oldurl'], 3, _DB_BACKUP_READY );
+    } else {
+        redirect_header("javascript:history.go(-1)", 1, _DB_BACKUP_READY );
+    }
+    exit;
 }
 
 $filename_prefix = $prefix.'_'.$db.'-'.date('ymdHi');
@@ -105,24 +109,24 @@
 $split = (is_array($other_tables)&&count($other_tables)>0)?$other_tables:array("1");
 }
 $files_backup=array();
-for($i=0; $i<$num_tables; $i++){
-	$name = mysql_tablename($tables, $i);
-	if(in_array("1",$split)||in_array($name, $split)){
-		$files_backup[$name] = array($name);
-	}else{
-	if ($xoopsModuleConfig['split']==1) $files_backup["body"][] = $name;
-	}
+for ($i=0; $i<$num_tables; ++$i) {
+    $name = mysql_tablename($tables, $i);
+    if (in_array("1",$split)||in_array($name, $split)) {
+        $files_backup[$name] = array($name);
+    } else {
+    if ($xoopsModuleConfig['split']==1) $files_backup["body"][] = $name;
+    }
 }
 
 $formatted_db_name = (isset($use_backquotes))
                    ? PMA_backquote($db)
                    : '\'' . $db . '\'';
-foreach($files_backup as $fl => $names){
-	if ($xoopsModuleConfig['split']==1) {
-	$filename = ($fl == "body")?$filename_prefix:$filename_prefix."_".$fl;
-	} else {
-	$filename = $filename_prefix."_".$fl;
-	}
+foreach ($files_backup as $fl => $names) {
+    if ($xoopsModuleConfig['split']==1) {
+    $filename = ($fl == "body")?$filename_prefix:$filename_prefix."_".$fl;
+    } else {
+    $filename = $filename_prefix."_".$fl;
+    }
     $dump_buffer       = '# Backup for MySQL' . $crlf
                        .  '#' . $crlf;
     foreach ($names as $table) {
@@ -147,101 +151,98 @@
         $dump_buffer .= $tmp_buffer;
     }
     $dump_buffer .= $crlf;
-	$dump_buffer=str_replace(' DEFAULT CHARSET=latin1', '', $dump_buffer);
-	$dump_buffer=str_replace(' DEFAULT CHARSET=utf8', '', $dump_buffer);
+    $dump_buffer=str_replace(' DEFAULT CHARSET=latin1', '', $dump_buffer);
+    $dump_buffer=str_replace(' DEFAULT CHARSET=utf8', '', $dump_buffer);
 
-	if ($cfgZipType == 'zip') {
-	    if (PMA_PHP_INT_VERSION >= 40000 && @function_exists('gzcompress')) {
-	        $extbis = '.sql';
-	        $zipfile = new zipfile();
-	        $zipfile -> addFile($dump_buffer, $filename . $extbis);
-	        $dump_buffer = $zipfile -> file();
-	    }
-	}
-	else if ($cfgZipType == 'bzip') {
-	    if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('bzcompress')) {
-	        $dump_buffer = bzcompress($dump_buffer);
-	    }
-	}
-	else if ($cfgZipType == 'gzip') {
-	    if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('gzencode')) {
-	        // without the optional parameter level because it bug
-	        $dump_buffer = gzencode($dump_buffer);
-	    }
-	}
-	
-	$fp = fopen($dirname.'/'. $filename . '.' . $ext,'w');
-	//$dump_buffer=str_replace(' DEFAULT CHARSET=latin1','',$dump_buffer);
-	fwrite($fp, $dump_buffer);
-	fclose($fp);
-	
-	if ($cfgBackupTarget == 'download') {
-		if(!is_object($xoopsUser)||!$xoopsUser->isAdmin()){
-	    	redirect_header("javascript:history.go(-1)", 1, _NOPERM );
-			exit;
-		 }
-		header('Content-Type: ' . $mime_type);
-	    if (PMA_USR_BROWSER_AGENT == 'IE') {
-	        header('Content-Disposition: inline; filename="' . $filename . '.' . $ext . '"');
-	        header('Expires: 0');
-	        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-	        header('Pragma: public');
-	    } else {
-	        header('Content-Disposition: attachment; filename="' . $filename . '.' . $ext . '"');
-	        header('Expires: 0');
-	        header('Pragma: no-cache');
-	    }
-	    echo $dump_buffer;
-	} elseif ($cfgBackupTarget == 'email') {
-	    $subject = sprintf(_DB_BACKUP_FOR, $xoopsConfig['sitename']) ;    
-	    $message = _DB_CREATEON.': '.date('H:i D d-M-Y')." \n" ;    
-	    $message .= _DB_DOWNLOAD.":\n";
-	    $message .= XOOPS_URL."/uploads/backup/".$filename.'.'.$ext."\n\n";
-	    $message .= "------------------\n";
-	    $message .= $xoopsConfig['sitename']."\n".$xoopsConfig['xoops_url']."/";
-	    $xoopsMailer =& xoops_getMailer();
-	    $xoopsMailer->useMail();
-	    $emails = explode(',',$xoopsModuleConfig['email_to']);
-	    foreach ($emails as $key=>$value) { $emails[$key]=trim($value); }
-	    $xoopsMailer->setToEmails($emails);
-	    $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
-	    $xoopsMailer->setFromName($xoopsConfig['sitename']);
-	    $xoopsMailer->setSubject($subject);
-	    $xoopsMailer->setBody($message);
-	    if($xoopsModuleConfig['email_attach']){
-	    	$xoopsMailer->multimailer->AddAttachment($dirname.'/'.$filename.'.'.$ext);
-	    }
-	    $xoopsMailer->send();
-	}
+    if ($cfgZipType == 'zip') {
+        if (PMA_PHP_INT_VERSION >= 40000 && @function_exists('gzcompress')) {
+            $extbis = '.sql';
+            $zipfile = new zipfile();
+            $zipfile -> addFile($dump_buffer, $filename . $extbis);
+            $dump_buffer = $zipfile -> file();
+        }
+    } elseif ($cfgZipType == 'bzip') {
+        if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('bzcompress')) {
+            $dump_buffer = bzcompress($dump_buffer);
+        }
+    } elseif ($cfgZipType == 'gzip') {
+        if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('gzencode')) {
+            // without the optional parameter level because it bug
+            $dump_buffer = gzencode($dump_buffer);
+        }
+    }
+
+    $fp = fopen($dirname.'/'. $filename . '.' . $ext,'w');
+    //$dump_buffer=str_replace(' DEFAULT CHARSET=latin1','',$dump_buffer);
+    fwrite($fp, $dump_buffer);
+    fclose($fp);
+
+    if ($cfgBackupTarget == 'download') {
+        if (!is_object($xoopsUser)||!$xoopsUser->isAdmin()) {
+            redirect_header("javascript:history.go(-1)", 1, _NOPERM );
+            exit;
+         }
+        header('Content-Type: ' . $mime_type);
+        if (PMA_USR_BROWSER_AGENT == 'IE') {
+            header('Content-Disposition: inline; filename="' . $filename . '.' . $ext . '"');
+            header('Expires: 0');
+            header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+            header('Pragma: public');
+        } else {
+            header('Content-Disposition: attachment; filename="' . $filename . '.' . $ext . '"');
+            header('Expires: 0');
+            header('Pragma: no-cache');
+        }
+        echo $dump_buffer;
+    } elseif ($cfgBackupTarget == 'email') {
+        $subject = sprintf(_DB_BACKUP_FOR, $xoopsConfig['sitename']) ;
+        $message = _DB_CREATEON.': '.date('H:i D d-M-Y')." \n" ;
+        $message .= _DB_DOWNLOAD.":\n";
+        $message .= XOOPS_URL."/uploads/backup/".$filename.'.'.$ext."\n\n";
+        $message .= "------------------\n";
+//        $message .= $xoopsConfig['sitename']."\n".$xoopsConfig['xoops_url']."/";
+        $message .= $xoopsConfig['sitename']."\n".XOOPS_URL."/";
+        $xoopsMailer =& xoops_getMailer();
+        $xoopsMailer->useMail();
+        $emails = explode(',',$xoopsModuleConfig['email_to']);
+        foreach ($emails as $key=>$value) { $emails[$key]=trim($value); }
+        $xoopsMailer->setToEmails($emails);
+        $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+        $xoopsMailer->setFromName($xoopsConfig['sitename']);
+        $xoopsMailer->setSubject($subject);
+        $xoopsMailer->setBody($message);
+        if ($xoopsModuleConfig['email_attach']) {
+            $xoopsMailer->multimailer->AddAttachment($dirname.'/'.$filename.'.'.$ext);
+        }
+        $xoopsMailer->send();
+    }
 }
 
 $db_files =& XoopsLists::getFileListAsArray($dirname);
 $dbfiles = array();
 $dbprefix = array();
-foreach($db_files as $_file => $_filename){
-	if(preg_match("/(^".$prefix."[^_]*)(_.*)?\.(.*)/i", $_filename, $matches)){
-		$dbprefix[$matches[1]] = 1;
-		$dbfiles[]=$_filename;
-	}
+foreach ($db_files as $_file => $_filename) {
+    if (preg_match("/(^".$prefix."[^_]*)(_.*)?\.(.*)/i", $_filename, $matches)) {
+        $dbprefix[$matches[1]] = 1;
+        $dbfiles[]=$_filename;
+    }
 }
 
 $dbpre = array_keys($dbprefix);
 arsort($dbpre);
 reset($dbpre);
 $dbpre_valid = array_slice($dbpre, 0, $xoopsModuleConfig['dbfiles_store']);
-foreach($dbfiles as $dbfile){
-	if(!preg_match("/^(".implode("|",$dbpre_valid).")(_.*)?\.(.*)/i", $dbfile, $matches)){
-		unlink($dirname.'/'.$dbfile);
-	}
+foreach ($dbfiles as $dbfile) {
+    if (!preg_match("/^(".implode("|",$dbpre_valid).")(_.*)?\.(.*)/i", $dbfile, $matches)) {
+        unlink($dirname.'/'.$dbfile);
+    }
 }
 
-
 if ($cfgBackupTarget != 'download') {
-	if(isset($_GET['oldurl'])){
-		redirect_header($_GET['oldurl'], 3, _DB_BACKUP_READY );
-	}else{
-		redirect_header("javascript:history.go(-1)", 1, _DB_BACKUP_READY );
-	}
+    if (isset($_GET['oldurl'])) {
+        redirect_header($_GET['oldurl'], 3, _DB_BACKUP_READY );
+    } else {
+        redirect_header("javascript:history.go(-1)", 1, _DB_BACKUP_READY );
+    }
 }
-include "admin_footer.php";
-?>
+include 'admin_footer.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/bigdump.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/bigdump.php	2014-04-25 11:29:22 UTC (rev 12473)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/bigdump.php	2014-04-25 11:31:21 UTC (rev 12474)
@@ -5,8 +5,8 @@
 // Even through the webservers with hard runtime limit and those in safe mode
 // Works fine with Internet Explorer 7.0 and Firefox 2.x
 
-// Author:       Alexey Ozerov (alexey at ozerov dot de) 
-//               AJAX & CSV functionalities: Krzysiek Herod (kr81uni at wp dot pl) 
+// Author:       Alexey Ozerov (alexey at ozerov dot de)
+//               AJAX & CSV functionalities: Krzysiek Herod (kr81uni at wp dot pl)
 // Copyright:    GPL (C) 2003-2011
 // More Infos:   http://www.ozerov.de/bigdump
 
@@ -46,7 +46,7 @@
 if ( isset($_COOKIE['db_name']) && isset($_COOKIE['c_set'])) {
 $c_set = $_COOKIE['c_set'];
 $db_name=$_COOKIE['db_name'];
-$charset=($c_set=='utf8')?'latin1':''; 
+$charset=($c_set=='utf8')?'latin1':'';
 } else {
 redirect_header('index.php', 3, _NOPERM);
 exit;
@@ -126,8 +126,7 @@
 
 // Clean and strip anything we don't want from user's input [0.27b]
 
-foreach ($_REQUEST as $key => $val) 
-{
+foreach ($_REQUEST as $key => $val) {
   $val = preg_replace("/[^_A-Za-z0-9-\.&= ;\$]/i",'', $val);
   $_REQUEST[$key] = $val;
 }
@@ -154,7 +153,7 @@
 { background-color:#FFFFF0;
 }
 
-h1 
+h1
 { font-size:20px;
   line-height:24px;
   font-family:Arial,Helvetica,sans-serif;
@@ -173,7 +172,7 @@
 }
 
 p.centr
-{ 
+{
   text-align:center;
 }
 
@@ -265,7 +264,7 @@
 
 <body>
 
-<center>
+<div style="text-align: center;">
 
 <table width="780" cellspacing="0" cellpadding="0">
 <tr><td class="transparent">
@@ -274,11 +273,13 @@
 
 <?php
 
-function skin_open() {
+function skin_open()
+{
 echo ('<div class="skin1">');
 }
 
-function skin_close() {
+function skin_close()
+{
 echo ('</div>');
 }
 
@@ -291,22 +292,19 @@
 
 // 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");
+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;
 }
 
 // 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");
+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;
 }
 
 // Calculate PHP max upload size (handle settings like 10M or 100K)
 
-if (!$error)
-{ $upload_max_filesize=ini_get("upload_max_filesize");
+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;
@@ -314,43 +312,29 @@
 
 // Get the current directory
 
-
   $upload_dir=XOOPS_ROOT_PATH.'/uploads/backup';
  chdir($upload_dir);
 
 // Handle file upload
 
-if (!$error && isset($_REQUEST["uploadbutton"]))
-{ if (is_uploaded_file($_FILES["dumpfile"]["tmp_name"]) && ($_FILES["dumpfile"]["error"])==0)
-  { 
+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");
+    if (file_exists($uploaded_filename)) { echo ("<p class=\"error\">File $uploaded_filename already exist! Delete and upload again!</p>\n");
+    } elseif (!preg_match("/(\.(sql|gz|csv))$/i",$uploaded_filename)) { echo ("<p class=\"error\">You may only upload .sql .gz or .csv files.</p>\n");
+    } elseif (!@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=\"success\">Uploaded file saved as $uploaded_filename</p>\n");
-    }
+  } else { echo ("<p class=\"error\">Error uploading file ".$_FILES["dumpfile"]["name"]."</p>\n");
   }
-  else
-  { 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"])))
+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");
@@ -358,58 +342,44 @@
 
 // Connect to the database, set charset and execute pre-queries
 
-if (!$error && !TESTMODE)
-{ $dbconnection = $xoopsDB->conn;
-  if ($dbconnection) 
+if (!$error && !TESTMODE) { $dbconnection = $xoopsDB->conn;
+  if ($dbconnection)
     $db = mysql_select_db($db_name);
 @mysql_query("SET character_set_results = '$c_set', character_set_client = '$c_set', character_set_connection = '$c_set', character_set_database = '$c_set', character_set_server = '$c_set'");
-  if (!$dbconnection || !$db) 
-  { echo ("<p class=\"error\">Database connection failed due to ".mysql_error()."</p>\n");
+  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 && 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;
+  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;
      }
     }
   }
+} else { $dbconnection = false;
 }
-else
-{ $dbconnection = false;
-}
 
-
 // DIAGNOSTIC
 // echo("<h1>Checkpoint!</h1>");
 
 // List uploaded files in multifile mode
 
-if (!$error && !isset($_REQUEST["fn"]) && $filename=="")
-{ if ($dirhandle = opendir($upload_dir)) 
-  { 
+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)
-    { 
+    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");
+      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;
           }
@@ -432,41 +402,32 @@
       }
     }
 
-    if ($dirhead) 
+    if ($dirhead)
       echo ("</table>\n");
-    else 
+    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");
+  } else { echo ("<p class=\"error\">Error listing directory $upload_dir</p>\n");
     $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</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</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")))
-  { 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 ");
+  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);
+  } else { fclose($tempfile);
     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");
 ?>
@@ -481,20 +442,17 @@
 
 // Print the current mySQL connection charset
 
-if (!$error && !TESTMODE && !isset($_REQUEST["fn"]))
-{ 
+if (!$error && !TESTMODE && !isset($_REQUEST["fn"])) {
   $result = mysql_query("SHOW VARIABLES LIKE 'character_set_connection';");
   $row = mysql_fetch_assoc($result);
-  if ($row) 
-  { $charset = $row['Value'];
+  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");
   }
 }
 
 // Open the file
 
-if (!$error && isset($_REQUEST["start"]))
-{ 
+if (!$error && isset($_REQUEST["start"])) {
 
 // Set current filename ($filename overrides $_REQUEST["fn"] if set)
 
@@ -507,13 +465,12 @@
 
 // Recognize GZip filename
 
-  if (preg_match("/\.gz$/i",$curfilename)) 
+  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");
+  if ((!$gzipmode && !$file=@fopen($curfilename,"r")) || ($gzipmode && !$file=@gzopen($curfilename,"r"))) { echo (...
 
[truncated message content]