Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12474] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/backup
|
From: <be...@us...> - 2014-04-25 11:31:25
|
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&Time</th><th>Type</th><th> </th><th> </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&fn=".urlencode($filename)."&foffset=0&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&fn=".urlencode($filename)."&foffset=0&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 ("<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");
@@ -522,39 +479,30 @@
// 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 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
- { echo ("<p class=\"error\">I can't seek into $curfilename</p>\n");
+ } else { echo ("<p class=\"error\">I can't seek into $curfilename</p>\n");
$error=true;
}
}
// Stop if csv file is used, but $csv_insert_table is not set
-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");
+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;
}
-
// *******************************************************************************************
// 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");
+ 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
- { $_REQUEST["start"] = floor($_REQUEST["start"]);
+ } else { $_REQUEST["start"] = floor($_REQUEST["start"]);
$_REQUEST["foffset"] = floor($_REQUEST["foffset"]);
}
@@ -565,46 +513,40 @@
// 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");
+ 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)
+ 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");
+ 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");
+ 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;
}
// 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");
+ 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="";
+ if (!$error) { $query="";
$queries=0;
$totalqueries=$_REQUEST["totalqueries"];
$linenumber=$_REQUEST["start"];
@@ -613,14 +555,12 @@
// 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)
+ 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);
@@ -634,8 +574,7 @@
// 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);
@@ -650,7 +589,7 @@
$dumpline=str_replace("\r\n", "\n", $dumpline);
$dumpline=str_replace("\r", "\n", $dumpline);
-
+
// DIAGNOSTIC
// echo ("<p>Line $linenumber: $dumpline</p>\n");
@@ -661,21 +600,17 @@
// Skip comments and blank lines only if NOT in parents
- if (!$inparents)
- { $skipline=false;
+ if (!$inparents) { $skipline=false;
reset($comment);
- foreach ($comment as $comment_value)
- {
+ 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;
}
}
- if ($skipline)
- { $linenumber++;
+ if ($skipline) { $linenumber++;
// DIAGNOSTIC
// echo ("<p>Comment line skipped</p>\n");
@@ -685,7 +620,7 @@
}
// Remove double back-slashes from the dumpline prior to count the quotes ('\\' can only be within strings)
-
+
$dumpline_deslashed = str_replace ("\\\\","",$dumpline);
// Count ' and \' (or " and \") in the dumpline to avoid query break within a text field ending by $delimiter
@@ -699,14 +634,13 @@
$query .= $dumpline;
// Don't count the line if in parents (text fields may include unlimited linebreaks)
-
+
if (!$inparents)
$querylines++;
-
+
// 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 ("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 ");
@@ -724,8 +658,7 @@
// 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
@@ -734,8 +667,7 @@
// 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");
+ 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;
@@ -752,13 +684,11 @@
// Get the current file position
- if (!$error)
- { if (!$gzipmode)
+ 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");
+ if (!$foffset) { echo ("<p class=\"error\">UNEXPECTED: Can't read the file pointer offset</p>\n");
$error=true;
}
}
@@ -769,13 +699,12 @@
// echo ("<p class=\"centr\"><b>Statistics</b></p>\n");
- if (!$error)
- {
+ if (!$error) {
$lines_this = $linenumber-$_REQUEST["start"];
$lines_done = $linenumber-1;
$lines_togo = ' ? ';
$lines_tota = ' ? ';
-
+
$queries_this = $queries;
$queries_done = $totalqueries;
$queries_togo = ' ? ';
@@ -787,46 +716,42 @@
$kbytes_done = round($bytes_done/1024,2);
$mbytes_this = round($kbytes_this/1024,2);
$mbytes_done = round($kbytes_done/1024,2);
-
- if (!$gzipmode)
- {
+
+ 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;
+ 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
- {
+ } 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(' ',' ','<tt>[ Not available for gzipped files ]</tt>');
}
-
+
echo ("
<center>
<table width=\"520\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">
@@ -844,8 +769,7 @@
// Finish message and restart the script
- if ($linenumber<$_REQUEST["start"]+$linespersession)
- { echo ("<p class=\"successcentr\">Congratulations: End of file reached, assuming OK</p>\n");
+ if ($linenumber<$_REQUEST["start"]+$linespersession) { echo ("<p class=\"successcentr\">Congratulations: End of file reached, assuming OK</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");
?>
@@ -865,24 +789,21 @@
</form>
<!-- End Paypal donation code -->
-<?php
+<?php
$error=true; // This is a semi-error telling the script is finished
- }
- else
- { if ($delaypersession!=0)
+ } else { if ($delaypersession!=0)
echo ("<p class=\"centr\">Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
- if (!$ajax)
+ 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&fn=".urlencode($curfilename)."&foffset=$foffset&totalqueries=$totalqueries&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");
}
- }
- else
+ } else
echo ("<p class=\"error\">Stopped on error</p>\n");
skin_close();
@@ -902,7 +823,7 @@
</td></tr></table>
-</center>
+</div>
</body>
</html>
@@ -911,8 +832,7 @@
include 'admin_footer.php';
// If error or finished put out the whole output from above and stop
-if ($error)
-{
+if ($error) {
$out1 = ob_get_contents();
ob_end_clean();
echo $out1;
@@ -921,15 +841,12 @@
// If Ajax enabled and in import progress creates responses (XML response or script for the initial page)
-if ($ajax && isset($_REQUEST['start']))
-{
- if (isset($_REQUEST['ajaxrequest']))
- { ob_end_clean();
- create_xml_response();
- die;
- }
- else
- create_ajax_script();
+if ($ajax && isset($_REQUEST['start'])) {
+ if (isset($_REQUEST['ajaxrequest'])) { ob_end_clean();
+ create_xml_response();
+ die;
+ } else
+ create_ajax_script();
}
// Anyway put out the output from above
@@ -938,174 +855,174 @@
// THE MAIN SCRIPT ENDS HERE
-
// *******************************************************************************************
// AJAX utilities
// *******************************************************************************************
-function create_xml_response()
+function create_xml_response()
{
global $linenumber, $foffset, $totalqueries, $curfilename, $delimiter,
- $lines_this, $lines_done, $lines_togo, $lines_tota,
- $queries_this, $queries_done, $queries_togo, $queries_tota,
- $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;
+ $lines_this, $lines_done, $lines_togo, $lines_tota,
+ $queries_this, $queries_done, $queries_togo, $queries_tota,
+ $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;
- header('Content-Type: application/xml');
- header('Cache-Control: no-cache');
-
- echo '<?xml version="1.0" encoding="ISO-8859-1"?>';
- echo "<root>";
+ header('Content-Type: application/xml');
+ header('Cache-Control: no-cache');
+ echo '<?xml version="1.0" encoding="ISO-8859-1"?>';
+ echo "<root>";
+
// data - for calculations
- echo "<linenumber>$linenumber</linenumber>";
- echo "<foffset>$foffset</foffset>";
- echo "<fn>$curfilename</fn>";
- echo "<totalqueries>$totalqueries</totalqueries>";
- echo "<delimiter>$delimiter</delimiter>";
+ echo "<linenumber>$linenumber</linenumber>";
+ echo "<foffset>$foffset</foffset>";
+ echo "<fn>$curfilename</fn>";
+ echo "<totalqueries>$totalqueries</totalqueries>";
+ echo "<delimiter>$delimiter</delimiter>";
// results - for page update
- echo "<elem1>$lines_this</elem1>";
- echo "<elem2>$lines_done</elem2>";
- echo "<elem3>$lines_togo</elem3>";
- echo "<elem4>$lines_tota</elem4>";
-
- echo "<elem5>$queries_this</elem5>";
- echo "<elem6>$queries_done</elem6>";
- echo "<elem7>$queries_togo</elem7>";
- echo "<elem8>$queries_tota</elem8>";
-
- echo "<elem9>$bytes_this</elem9>";
- echo "<elem10>$bytes_done</elem10>";
- echo "<elem11>$bytes_togo</elem11>";
- echo "<elem12>$bytes_tota</elem12>";
-
- echo "<elem13>$kbytes_this</elem13>";
- echo "<elem14>$kbytes_done</elem14>";
- echo "<elem15>$kbytes_togo</elem15>";
- echo "<elem16>$kbytes_tota</elem16>";
-
- echo "<elem17>$mbytes_this</elem17>";
- echo "<elem18>$mbytes_done</elem18>";
- echo "<elem19>$mbytes_togo</elem19>";
- echo "<elem20>$mbytes_tota</elem20>";
-
- echo "<elem21>$pct_this</elem21>";
- echo "<elem22>$pct_done</elem22>";
- echo "<elem23>$pct_togo</elem23>";
- echo "<elem24>$pct_tota</elem24>";
- echo "<elem_bar>".htmlentities($pct_bar)."</elem_bar>";
-
- echo "</root>";
+ echo "<elem1>$lines_this</elem1>";
+ echo "<elem2>$lines_done</elem2>";
+ echo "<elem3>$lines_togo</elem3>";
+ echo "<elem4>$lines_tota</elem4>";
+
+ echo "<elem5>$queries_this</elem5>";
+ echo "<elem6>$queries_done</elem6>";
+ echo "<elem7>$queries_togo</elem7>";
+ echo "<elem8>$queries_tota</elem8>";
+
+ echo "<elem9>$bytes_this</elem9>";
+ echo "<elem10>$bytes_done</elem10>";
+ echo "<elem11>$bytes_togo</elem11>";
+ echo "<elem12>$bytes_tota</elem12>";
+
+ echo "<elem13>$kbytes_this</elem13>";
+ echo "<elem14>$kbytes_done</elem14>";
+ echo "<elem15>$kbytes_togo</elem15>";
+ echo "<elem16>$kbytes_tota</elem16>";
+
+ echo "<elem17>$mbytes_this</elem17>";
+ echo "<elem18>$mbytes_done</elem18>";
+ echo "<elem19>$mbytes_togo</elem19>";
+ echo "<elem20>$mbytes_tota</elem20>";
+
+ echo "<elem21>$pct_this</elem21>";
+ echo "<elem22>$pct_done</elem22>";
+ echo "<elem23>$pct_togo</elem23>";
+ echo "<elem24>$pct_tota</elem24>";
+ echo "<elem_bar>".htmlentities($pct_bar)."</elem_bar>";
+
+ echo "</root>";
}
-
-function create_ajax_script()
+function create_ajax_script()
{
global $linenumber, $foffset, $totalqueries, $delaypersession, $curfilename, $delimiter;
?>
- <script type="text/javascript" language="javascript">
+ <script type="text/javascript" language="javascript">
- // creates next action url (upload page, or XML response)
- function get_url(linenumber,fn,foffset,totalqueries,delimiter) {
- return "<?php echo $_SERVER['PHP_SELF'] ?>?start="+linenumber+"&fn="+fn+"&foffset="+foffset+"&totalqueries="+totalqueries+"&delimiter="+delimiter+"&ajaxrequest=true";
- }
-
- // extracts text from XML element (itemname must be unique)
- function get_xml_data(itemname,xmld) {
- return xmld.getElementsByTagName(itemname).item(0).firstChild.data;
- }
-
- function makeRequest(url) {
- http_request = false;
- if (window.XMLHttpRequest) {
- // Mozilla etc.
- http_request = new XMLHttpRequest();
- if (http_request.overrideMimeType) {
- http_request.overrideMimeType("text/xml");
- }
- } else if (window.ActiveXObject) {
- // IE
- try {
- http_request = new ActiveXObject("Msxml2.XMLHTTP");
- } catch(e) {
- try {
- http_request = new ActiveXObject("Microsoft.XMLHTTP");
- } catch(e) {}
- }
- }
- if (!http_request) {
- alert("Cannot create an XMLHTTP instance");
- return false;
- }
- http_request.onreadystatechange = server_response;
- http_request.open("GET", url, true);
- http_request.send(null);
- }
-
- function server_response()
- {
+ // creates next action url (upload page, or XML response)
+ function get_url(linenumber,fn,foffset,totalqueries,delimiter)
+ {
+ return "<?php echo $_SERVER['PHP_SELF'] ?>?start="+linenumber+"&fn="+fn+"&foffset="+foffset+"&totalqueries="+totalqueries+"&delimiter="+delimiter+"&ajaxrequest=true";
+ }
- // waiting for correct response
- if (http_request.readyState != 4)
- return;
+ // extracts text from XML element (itemname must be unique)
+ function get_xml_data(itemname,xmld)
+ {
+ return xmld.getElementsByTagName(itemname).item(0).firstChild.data;
+ }
- if (http_request.status != 200)
- {
- alert("Page unavailable, or wrong url!")
- return;
- }
-
- // r = xml response
- var r = http_request.responseXML;
-
- //if received not XML but HTML with new page to show
- if (!r || r.getElementsByTagName('root').length == 0)
- { var text = http_request.responseText;
- document.open();
- document.write(text);
- document.close();
- return;
- }
-
- // update "Starting from line: "
- document.getElementsByTagName('p').item(1).innerHTML =
- "Starting from line: " +
- r.getElementsByTagName('linenumber').item(0).firstChild.nodeValue;
-
- // update table with new values
- for(i = 1; i <= 24; i++)
- document.getElementsByTagName('td').item(i).firstChild.data = get_xml_data('elem'+i,r);
-
- // update color bar
- document.getElementsByTagName('td').item(25).innerHTML =
- r.getElementsByTagName('elem_bar').item(0).firstChild.nodeValue;
-
- // action url (XML response)
- url_request = get_url(
- get_xml_data('linenumber',r),
- get_xml_data('fn',r),
- get_xml_data('foffset',r),
- get_xml_data('totalqueries',r),
- get_xml_data('delimiter',r));
-
- // ask for XML response
- window.setTimeout("makeRequest(url_request)",500+<?php echo $delaypersession; ?>);
- }
+ function makeRequest(url)
+ {
+ http_request = false;
+ if (window.XMLHttpRequest) {
+ // Mozilla etc.
+ http_request = new XMLHttpRequest();
+ if (http_request.overrideMimeType) {
+ http_request.overrideMimeType("text/xml");
+ }
+ } elseif (window.ActiveXObject) {
+ // IE
+ try {
+ http_request = new ActiveXObject("Msxml2.XMLHTTP");
+ } catch (e) {
+ try {
+ http_request = new ActiveXObject("Microsoft.XMLHTTP");
+ } catch (e) {}
+ }
+ }
+ if (!http_request) {
+ alert("Cannot create an XMLHTTP instance");
- // First Ajax request from initial page
+ return false;
+ }
+ http_request.onreadystatechange = server_response;
+ http_request.open("GET", url, true);
+ http_request.send(null);
+ }
- var http_request = false;
- var url_request = get_url(<?php echo ($linenumber.',"'.urlencode($curfilename).'",'.$foffset.','.$totalqueries.',"'.urlencode($delimiter).'"') ;?>);
- window.setTimeout("makeRequest(url_request)",500+<?php echo $delaypersession; ?>);
- </script>
+ function server_response()
+ {
+ // waiting for correct response
+ if (http_request.readyState != 4)
+ return;
+
+ if (http_request.status != 200) {
+ alert("Page unavailable, or wrong url!");
+
+ return;
+ }
+
+ // r = xml response
+ var r = http_request.responseXML;
+
+ //if received not XML but HTML with new page to show
+ if (!r || r.getElementsByTagName('root').length == 0) { var text = http_request.responseText;
+ document.open();
+ document.write(text);
+ document.close();
+
+ return;
+ }
+
+ // update "Starting from line: "
+ document.getElementsByTagName('p').item(1).innerHTML =
+ "Starting from line: " +
+ r.getElementsByTagName('linenumber').item(0).firstChild.nodeValue;
+
+ // update table with new values
+ for(i = 1; i <= 24; i++)
+ document.getElementsByTagName('td').item(i).firstChild.data = get_xml_data('elem'+i,r);
+
+ // update color bar
+ document.getElementsByTagName('td').item(25).innerHTML =
+ r.getElementsByTagName('elem_bar').item(0).firstChild.nodeValue;
+
+ // action url (XML response)
+ url_request = get_url(
+ get_xml_data('linenumber',r),
+ get_xml_data('fn',r),
+ get_xml_data('foffset',r),
+ get_xml_data('totalqueries',r),
+ get_xml_data('delimiter',r));
+
+ // ask for XML response
+ window.setTimeout("makeRequest(url_request)",500+<?php echo $delaypersession; ?>);
+ }
+
+ // First Ajax request from initial page
+
+ var http_request = false;
+ var url_request = get_url(<?php echo ($linenumber.',"'.urlencode($curfilename).'",'.$foffset.','.$totalqueries.',"'.urlencode($delimiter).'"') ;?>);
+ window.setTimeout("makeRequest(url_request)",500+<?php echo $delaypersession; ?>);
+ </script>
+
<?php
}
-
-?>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/index.php 2014-04-25 11:29:22 UTC (rev 12473)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/index.php 2014-04-25 11:31:21 UTC (rev 12474)
@@ -9,10 +9,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright XOOPS Project
+ * @copyright XOOPS Project
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package
- * @author metalslug
+ * @package
+ * @author metalslug
*
* Version : $Id:
* ****************************************************************************
@@ -21,50 +21,50 @@
require_once '../../../include/cp_header.php';
include 'admin_header.php';
xoops_cp_header();
-$indexadmin = new ModuleAdmin();
+$indexadmin = new ModuleAdmin();
$tot_file=0;
if ($handle = opendir(XOOPS_ROOT_PATH.'/uploads/backup/')) {
- while (false !== ($file = readdir($handle))) {
- if ( $file == ".." || $file == "." || substr($file,0,1)=='.' || $file=="convert") continue;
+ while (false !== ($file = readdir($handle))) {
+ if ( $file == ".." || $file == "." || substr($file,0,1)=='.' || $file=="convert") continue;
$tot_file++;
}
- closedir($handle);
-}
+ closedir($handle);
+}
$val=mysql_query("SHOW VARIABLES LIKE 'character%'");
$val2=mysql_query("SHOW VARIABLES LIKE 'collation%'");
$sql = "SHOW TABLES";
$result = mysql_query($sql);
- $tot_tables = mysql_num_rows($result);
- $indexadmin->addInfoBox(_DB_BACKUP_BOX1);
- if ( 0 < $tot_file ) {
- $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX1, _MD_BACKUP_TOTALFILES, $tot_file, 'Red');
- } else {
- $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX1, _MD_BACKUP_TOTALFILES, $tot_file, 'Green');
- }
- $indexadmin->addInfoBox(_DB_BACKUP_BOX2);
- if ( 0 == $tot_tables ) {
- $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, _MD_BACKUP_TOTALDB_TABLES, $tot_tables, 'Red');
- } else {
- $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, _MD_BACKUP_TOTALDB_TABLES, $tot_tables, 'Green');
- }
- $a=0;
- while($re=mysql_fetch_array($val)) {
- $value[]=$re['Value'];
- $var_name[]=$re['Variable_name'];
- $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, $var_name[$a]." %s", $value[$a], 'Green');
- $a++;
- }
- $a=0;
- unset($value);
- unset($var_name);
- while($re=mysql_fetch_array($val2)) {
- $value[]=$re['Value'];
- $var_name[]=$re['Variable_name'];
- $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, $var_name[$a]." %s", $value[$a], 'Green');
- $a++;
- }
- echo $indexadmin->addNavigation('index.php') ;
- echo $indexadmin->renderIndex();
-
-include "admin_footer.php";
+ $tot_tables = mysql_num_rows($result);
+ $indexadmin->addInfoBox(_DB_BACKUP_BOX1);
+ if (0 < $tot_file) {
+ $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX1, _MD_BACKUP_TOTALFILES, $tot_file, 'Red');
+ } else {
+ $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX1, _MD_BACKUP_TOTALFILES, $tot_file, 'Green');
+ }
+ $indexadmin->addInfoBox(_DB_BACKUP_BOX2);
+ if (0 == $tot_tables) {
+ $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, _MD_BACKUP_TOTALDB_TABLES, $tot_tables, 'Red');
+ } else {
+ $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, _MD_BACKUP_TOTALDB_TABLES, $tot_tables, 'Green');
+ }
+ $a=0;
+ while ($re=mysql_fetch_array($val)) {
+ $value[]=$re['Value'];
+ $var_name[]=$re['Variable_name'];
+ $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, $var_name[$a]." %s", $value[$a], 'Green');
+ $a++;
+ }
+ $a=0;
+ unset($value);
+ unset($var_name);
+ while ($re=mysql_fetch_array($val2)) {
+ $value[]=$re['Value'];
+ $var_name[]=$re['Variable_name'];
+ $indexadmin->addInfoBoxLine(_DB_BACKUP_BOX2, $var_name[$a]." %s", $value[$a], 'Green');
+ $a++;
+ }
+ echo $indexadmin->addNavigation('index.php') ;
+ echo $indexadmin->renderIndex();
+
+include 'admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/main.php 2014-04-25 11:29:22 UTC (rev 12473)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/backup/admin/main.php 2014-04-25 11:31:21 UTC (rev 12474)
@@ -3,172 +3,165 @@
include_once 'admin_header.php';
include_once XOOPS_ROOT_PATH."/modules/" . $xoopsModule->getVar("dirname") . "/include/functions.php";
if ( file_exists("../language/".$xoopsConfig['language']."/admin.php") ) {
- include_once "../language/".$xoopsConfig['language']."/admin.php";
-} else {
-include_once "../language/english/admin.php";
+ include_once '../language/'.$xoopsConfig['language']."/admin.php";
+} else {
+include_once '../language/english/admin.php';
}
include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
$op = !empty( $_G...
[truncated message content] |
