Major change in the installation of modules to also accept an SQL-file for upload.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c8ed3cfb802084bb67bc4c816c15bd61c4012afb..d53aba0c34ad05ad9c6140851220ede921f36928 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,18 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+-------------------- 1.14 Stable Released ----------------------
+01-Oct-2007 Joe Hunt
+ ! Major change in the installation of modules to also accept an SQL-file for upload.
+ $ config.php
+   /admin/inst_module.php
+   /admin/db/maintenance_db.inc
+   
+30-Sep-2007 Joe Hunt
+ # The following files were still vulnerable. Fixed
+ $ /access/login.php
+   /includes/lang/language.php
+
 -------------------- 1.13 Stable Released ----------------------
 14-Sep-2007 Joe Hunt
  + Added optional link for electronic payment on invoices (PayPal). 

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index c525f900457c0a79946d5f20cd24c7ca515a58d1..2d233d874b6a273fdce771b5b0b23dad28efc172 100644 (file)
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -126,6 +126,7 @@ function db_import($filename, $connection)
                $line = trim($line);
 
                $line = str_replace("0_", $connection["tbpref"], $line);
+               $line = str_replace("Y_", "0_", $line);
                // the last line did not belong to a 'create' sql query
                if (!$table) 
                {

diff --git a/admin/inst_module.php b/admin/inst_module.php
index 5f8e236361d36e44c3b4e8195750f6938cea03a6..76cb83635f02bdb4b56cc63696389db1190d1616 100644 (file)
--- a/admin/inst_module.php
+++ b/admin/inst_module.php
@@ -8,6 +8,7 @@ page(_("Install/Update Modules"));
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/admin/db/company_db.inc");
+include_once($path_to_root . "/admin/db/maintenance_db.inc");
 include_once($path_to_root . "/modules/installed_modules.php");
 include_once($path_to_root . "/includes/ui.inc");
 
@@ -175,7 +176,7 @@ function write_modules()
 
 function handle_submit()
 {
-       global $path_to_root, $installed_modules;
+       global $path_to_root, $installed_modules, $db_connections;
 
        if (!check_data())
                return false;
@@ -201,6 +202,16 @@ function handle_submit()
        }
        else
                $installed_modules[$id]['filename'] = $_POST['filename'];
+       if (is_uploaded_file($_FILES['uploadfile2']['tmp_name']))
+       {
+               $file1 = $_FILES['uploadfile2']['tmp_name'];
+               $file2 = $directory . "/".$_FILES['uploadfile2']['name'];
+               if (file_exists($file2))
+                       unlink($file2);
+               move_uploaded_file($file1, $file2);
+               $db_name = $_SESSION["wa_current_user"]->company;
+               db_import($file2, $db_connections[$db_name]);
+       }
        if (!write_modules())
                return false;
        return true;
@@ -311,6 +322,7 @@ function display_module_edit($selected_id)
        text_row_ex(_("Folder"), 'path', 20);
 
        label_row(_("Module File"), "<input name='uploadfile' type='file'>");
+       label_row(_("SQL File"), "<input name='uploadfile2' type='file'>");
 
        end_table(0);
        display_note(_("Select your module PHP file from your local harddisk."), 0, 1);

diff --git a/config.php b/config.php
index 09580d15f496f862956c78cdb7d09c9e93ad02cc..419f949e01c0447ccd1a0a4199b2535324fe793e 100644 (file)
--- a/config.php
+++ b/config.php
@@ -53,10 +53,10 @@
        // Main Title
        $app_title = "FrontAccounting";
     // application version
-    $version           = "1.13";
+    $version           = "1.14";
 
     // Build for development purposes
-    $build_version     = "53";
+    $build_version     = "79";
 
        // Powered by
        $power_by               = "FrontAccounting";