Marged fixes from ain trunk up to 2.2.11

[fa-stable.git] / admin / create_coy.php

diff --git a/admin/create_coy.php b/admin/create_coy.php
index aa765395b0db5054569ac8ba37e90aeed3a1c988..9ac71ef0bf2d1370984f800cf416783d4ea6f8c6 100644 (file)
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -42,6 +42,11 @@ function check_data()
 
        if ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
                return false;
+       if ($selected_id == -1 && (!isset($_GET['ul']) || $_GET['ul'] != 1))
+       {
+               display_error(_("When creating a new company, you must provide a Database script file."));
+               return false;
+       }
        foreach($db_connections as $id=>$con)
        {
         if($id != $selected_id && $_POST['host'] == $con['host'] 
@@ -82,12 +87,12 @@ function handle_submit()
        global $db_connections, $def_coy, $tb_pref_counter, $db,
            $comp_subdirs, $path_to_root;
 
-       $new = false;
        $error = false;
        if (!check_data())
                return false;
 
        $id = $_GET['id'];
+       $new = !isset($db_connections[$id]);
 
        $db_connections[$id]['name'] = $_POST['name'];
        $db_connections[$id]['host'] = $_POST['host'];
@@ -100,7 +105,6 @@ function handle_submit()
                {
                        $db_connections[$id]['tbpref'] = $_POST['tbpref'] == 1 ?
                          $tb_pref_counter."_" : '';
-                       $new = true;
                }
                else if ($_POST['tbpref'] != "")
                        $db_connections[$id]['tbpref'] = $_POST['tbpref'];
@@ -146,7 +150,7 @@ function handle_submit()
                        {
                                display_error(_("Error connecting to Database: ") . $conn['dbname'] . _(", Please correct it"));
                                $error = true;
-                       } else {
+                       } elseif ($_POST['admpassword'] != "") {
                                db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'");
                        }
                }
@@ -185,7 +189,7 @@ function handle_delete()
        // Without this after operation we end up with changed per-company owners!
        for($i = $id; $i < count($db_connections); $i++) {
                        $comp_path = company_path($i);
-               if (!is_dir($comp_path.'/'.$i) || !is_writable($comp_path.'/'.$i)) {
+               if (!is_dir($comp_path) || !is_writable($comp_path)) {
                        display_error(_('Broken company subdirectories system. You have to remove this company manually.'));
                        return;
                }
@@ -243,7 +247,7 @@ function handle_delete()
 
 function display_companies()
 {
-       global $table_style, $def_coy, $db_connections;
+       global $def_coy, $db_connections;
 
        $coyno = $_SESSION["wa_current_user"]->company;
 
@@ -255,7 +259,7 @@ function display_companies()
                        document.location.replace('create_coy.php?c=df&id='+id)
                }
                </script>";
-       start_table($table_style);
+       start_table(TABLESTYLE);
 
        $th = array(_("Company"), _("Database Host"), _("Database User"),
                _("Database Name"), _("Table Pref"), _("Default"), "", "");
@@ -302,7 +306,7 @@ function display_companies()
 
 function display_company_edit($selected_id)
 {
-       global $def_coy, $db_connections, $tb_pref_counter, $table_style2;
+       global $def_coy, $db_connections, $tb_pref_counter;
 
        if ($selected_id != -1)
                $n = $selected_id;
@@ -324,7 +328,7 @@ function display_company_edit($selected_id)
                }
                </script>";
 
-       start_table($table_style2);
+       start_table(TABLESTYLE2);
 
        if ($selected_id != -1)
        {