merged 3.2 code

[nucleus-jp/nucleus-jp-ancient.git] / euc / nucleus / libs / backup.php

diff --git a/euc/nucleus/libs/backup.php b/euc/nucleus/libs/backup.php
index 2b944e9..6b395a4 100755 (executable)
--- a/euc/nucleus/libs/backup.php
+++ b/euc/nucleus/libs/backup.php
@@ -1,8 +1,20 @@
 <?php\r
 /**\r
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) \r
+  * Copyright (C) 2002-2005 The Nucleus Group\r
+  *\r
+  * This program is free software; you can redistribute it and/or\r
+  * modify it under the terms of the GNU General Public License\r
+  * as published by the Free Software Foundation; either version 2\r
+  * of the License, or (at your option) any later version.\r
+  * (see nucleus/documentation/index.html#license for more info)\r
+  *\r
   * Scripts to create/restore a backup of the Nucleus database\r
   *\r
   * Based on code in phpBB (http://phpBB.sourceforge.net)\r
+  *\r
+  * $Id: backup.php,v 1.3 2005-03-16 08:10:35 kimitake Exp $\r
+  * $NucleusJP: backup.php,v 1.3 2005/03/12 06:19:05 kimitake Exp $\r
   */\r
 \r
  \r
@@ -37,7 +49,9 @@ function do_backup($gzip = 0) {
                                        sql_table('plugin_event'),\r
                                        sql_table('plugin_option'),\r
                                        sql_table('plugin_option_desc'),\r
-                                       sql_table('category')\r
+                                       sql_table('category'),\r
+                                       sql_table('activation'),\r
+                                       sql_table('tickets'),\r
                          );\r
 \r
        // add tables that plugins want to backup to the list\r
@@ -85,7 +99,7 @@ function do_backup($gzip = 0) {
        echo "#\n";\r
        echo "# backup-date: " .  gmdate("d-m-Y H:i:s", time()) . " GMT\n";\r
        global $nucleus;\r
-       echo "# nucleus version: " . $nucleus['version'] . "\n";        \r
+       echo "# Nucleus CMS version: " . $nucleus['version'] . "\n";    \r
        echo "#\n";\r
        echo "# WARNING: Only try to restore on servers running the exact same version of Nucleus\n";\r
        echo "#\n";\r
@@ -275,13 +289,15 @@ function do_restore() {
                \r
        $backup_file_name = $uploadInfo['name'];\r
        $backup_file_tmpname = $uploadInfo['tmp_name'];\r
-       $backup_file_type = $uploadInfo['backup_file']['type'];\r
+       $backup_file_type = $uploadInfo['type'];\r
 \r
        if (!file_exists($backup_file_tmpname))\r
                return 'File Upload Error';\r
        \r
        if (!preg_match("/^(text\/[a-zA-Z]+)|(application\/(x\-)?gzip(\-compressed)?)|(application\/octet-stream)$/is", $backup_file_type) )\r
                return 'The uploaded file is not of the correct type';\r
+               \r
+               \r
        \r
        if (preg_match("/\.gz/is",$backup_file_name)) \r
                $gzip = 1;\r