Changes in hotkeys system for tas support.

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

diff --git a/admin/create_coy.php b/admin/create_coy.php
index 29acd007ae6c31105881537f7529e5f13f2d55f6..1ee6d4003cd34341573d1a357bad1b0dd3ed4e15 100644 (file)
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -80,7 +80,7 @@ function remove_connection($id) {
 function handle_submit()
 {
        global $db_connections, $def_coy, $tb_pref_counter, $db,
-           $comp_path, $comp_subdirs, $path_to_root;
+           $comp_subdirs, $path_to_root;
 
        $new = false;
        $error = false;
@@ -165,7 +165,7 @@ function handle_submit()
 
        if ($new)
        {
-               create_comp_dirs("$comp_path/$id", $comp_subdirs);
+               create_comp_dirs(company_path($id), $comp_subdirs);
        }
        $exts = get_company_extensions();
        write_extensions($exts, $id);
@@ -177,13 +177,14 @@ function handle_submit()
 
 function handle_delete()
 {
-       global $comp_path, $def_coy, $db_connections, $comp_subdirs, $path_to_root;
+       global $def_coy, $db_connections, $comp_subdirs, $path_to_root;
 
        $id = $_GET['id'];
 
        // First make sure all company directories from the one under removal are writable. 
        // 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)) {
                        display_error(_('Broken company subdirectories system. You have to remove this company manually.'));
                        return;
@@ -198,15 +199,15 @@ function handle_delete()
        // rename directory to temporary name to ensure all
        // other subdirectories will have right owners even after
        // unsuccessfull removal.
-       $cdir = $comp_path.'/'.$id;
-       $tmpname  = $comp_path.'/old_'.$id;
+       $cdir = company_path($id);
+       $tmpname  = company_path('/old_'.$id);
        if (!@rename($cdir, $tmpname)) {
                display_error(_('Cannot rename subdirectory to temporary name.'));
                return;
        }
        // 'shift' company directories names
        for ($i = $id+1; $i < count($db_connections); $i++) {
-               if (!rename($comp_path.'/'.$i, $comp_path.'/'.($i-1))) {
+               if (!rename(company_path($i), company_path($i-1))) {
                        display_error(_("Cannot rename company subdirectory"));
                        return;
                }
@@ -242,7 +243,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;
 
@@ -254,7 +255,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"), "", "");
@@ -301,7 +302,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;
@@ -323,7 +324,7 @@ function display_company_edit($selected_id)
                }
                </script>";
 
-       start_table($table_style2);
+       start_table(TABLESTYLE2);
 
        if ($selected_id != -1)
        {