Fixed session name to avoid conflicts during multiuser debugging.

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

diff --git a/admin/create_coy.php b/admin/create_coy.php
index a7cae00ce4cc3ec19a1587e5acc9b3b05eea1d35..8324fa7d9d5a638789bbc1391df7914288db4ef9 100644 (file)
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -1,6 +1,6 @@
 <?php
 
-$page_security = 15;
+$page_security = 20;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 
@@ -29,13 +29,14 @@ else
 
 function check_data()
 {
-       global $db_connections, $tb_pref_counter;
+       global $db_connections, $tb_pref_counter, $selected_id;
 
        if ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
                return false;
        foreach($db_connections as $id=>$con)
        {
-               if ($_POST['host'] == $con['host'] && $_POST['dbname'] == $con['dbname'])
+        if($id != $selected_id && $_POST['host'] == $con['host'] 
+               && $_POST['dbname'] == $con['dbname'])
                {
                        if ($_POST['tbpref'] == $con['tbpref'])
                        {
@@ -57,7 +58,6 @@ function check_data()
 function remove_connection($id) {
        global $db_connections;
 
-       $dbase = $db_connections[$id]['dbname'];
        $err = db_drop_db($db_connections[$id]);
 
        unset($db_connections[$id]);
@@ -162,9 +162,22 @@ function handle_delete()
 
        $id = $_GET['id'];
 
+       $cdir = $comp_path.'/'.$id;
+       @flush_dir($cdir);
+       if (!rmdir($cdir))
+       {
+               display_error(_("Cannot remove company data directory ") . $cdir);
+               return;
+       }
+       for($i = $id+1; $i < count($db_connections); $i++) {
+               if (!rename($comp_path.'/'.$i, $comp_path.'/'.($i-1))) {
+                       display_error(_("Cannot rename company subdirectory"));
+                       return;
+               }       
+       }
        $err = remove_connection($id);
        if ($err == 0)
-               display_error(_("Error removing Database: ") . $dbase . _(", please remove it manuallly"));
+               display_error(_("Error removing Database: ") . $dbase . _(", please remove it manually"));
 
        if ($def_coy == $id)
                $def_coy = 0;
@@ -178,14 +191,6 @@ function handle_delete()
        if ($error != 0)
                return;
 
-       $cdir = $comp_path.'/'.$id;
-       flush_dir($cdir);
-       if (!rmdir($cdir))
-       {
-               display_error(_("Cannot remove company data directory ") . $cdir);
-               return;
-       }
-
        meta_forward($_SERVER['PHP_SELF']);
 }
 
@@ -232,8 +237,8 @@ function display_companies()
                label_cell($conn[$i]['tbpref']);
                label_cell($what);
                label_cell("<a href=" . $_SERVER['PHP_SELF']. "?selected_id=" . $i . ">" . _("Edit") . "</a>");
-               if ($i != $coyno)
-                       label_cell("<a href='javascript:deleteCompany(" . $i . ")'>" . _("Delete") . "</a>");
+               label_cell( $i == $coyno ? '' :
+       "<a href='javascript:deleteCompany(" . $i . ")'>" . _("Delete") . "</a>");
                end_row();
        }