Browse code

Fixed/improved backup, added with and without UTF-8

Rainer Volkrodt authored on 2016/05/18 08:52:49
Showing 3 changed files
... ...
@@ -6,6 +6,8 @@
6 6
 // Based on eFiction 1.1
7 7
 // Copyright (C) 2003 by Rebecca Smallwood.
8 8
 // http://efiction.sourceforge.net/
9
+//
10
+// Size fix / UTF-8 feature 2016-05-18
9 11
 // ----------------------------------------------------------------------
10 12
 // LICENSE
11 13
 //
... ...
@@ -51,33 +53,31 @@ if(!isADMIN) die( );
51 53
 
52 54
 // Database backup
53 55
 function datadump ($table) {
54
-    $result .= "# Dump of $table \r\n";
55
-    $result .= "# Dump DATE : " . date("d-M-Y") ."\r\n\r\n";
56
+    echo "# Dump of $table \r\n";
57
+    echo "# Dump DATE : " . date("d-M-Y") ."\r\n\r\n";
56 58
 
57 59
     $tabledata = dbquery("SELECT * FROM $table");
58 60
 
59 61
 	while($t = dbassoc($tabledata)) {
60
-		$result .= "INSERT INTO ".$table." ";
62
+		echo "INSERT INTO ".$table." ";
61 63
 		$row = array( );
62 64
 		foreach($t AS $field => $value) {			
63 65
 			$value = escapestring($value);
64
-			$value = ereg_replace("\n","\\n",$value);
66
+			$value = str_replace("\n","\\n",$value);
65 67
 			if (isset($value)) $row[$field] = "\"$value\"";
66 68
 			else $row[$field] = "\"\"";
67 69
 		}   
68
-		$result .= "VALUES(".implode(", ", $row).");\r\n";
70
+		echo "VALUES(".implode(", ", $row).");\r\n";
69 71
 	}
70
-	return $result . "\r\n\r\n\r\n";
72
+	echo "\r\n\r\n\r\n";
71 73
 }
72 74
 
73 75
 	$alltables = dbquery("SHOW TABLES");
74
-	$content = "";
76
+
75 77
 	while ($table = dbassoc($alltables)) {
76
-		foreach ($table as $db => $tablename) {
77
-			$content .= datadump($tablename);
78
-		}
78
+			datadump(current($table));
79 79
 	}
80
-	echo $content;
80
+
81 81
  	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_BACKUP, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM')");
82 82
 	exit( );
83 83
 
84 84
similarity index 100%
85 85
rename from admin/backup_mk2.php
86 86
rename to admin/backup_utf8.php
... ...
@@ -208,7 +208,7 @@ else {
208 208
 	<li><a href='admin.php?action=maintenance&amp;maint=panels'>"._PANELORDER."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_PANELORDER."</span></A></li>
209 209
 	<li><a href='admin.php?action=maintenance&amp;maint=optimize'>"._OPTIMIZE."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_OPTIMIZE."</span></A></li>
210 210
 	<li><a href='admin/backup.php' target='_new'>"._BACKUP."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_BACKUP."</span></A></li>
211
-	<li><a href='admin/backup_mk2.php' target='_new'>"._BACKUP."</a> (mk2) <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_BACKUP."</span></A></li>
211
+	<li><a href='admin/backup_utf8.php' target='_new'>"._BACKUP."</a> (UTF-8) <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_BACKUP."</span></A></li>
212 212
 	<li><a href='admin.php?action=maintenance&amp;maint=update'>"._UPDATE."</a>  <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_UPDATE."</span></A></li>
213 213
 </ul>";
214 214
 }