Company directory was not deleted after company removal.

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

diff --git a/admin/create_coy.php b/admin/create_coy.php
index 8324fa7d9d5a638789bbc1391df7914288db4ef9..684369c5e618245d4ffceafc624c7c69279a2ce1 100644 (file)
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -1,6 +1,15 @@
 <?php
-
-$page_security = 20;
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_CREATECOMPANY';
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 
@@ -11,7 +20,7 @@ include_once($path_to_root . "/includes/ui.inc");
 
 page(_("Create/Update Company"));
 
-$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting');
+$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting', 'attachments');
 
 //---------------------------------------------------------------------------------------------
 if (isset($_GET['selected_id']))
@@ -137,19 +146,10 @@ function handle_submit()
        {
                return false;
        }
-       $index = "<?php\nheader(\"Location: ../../index.php\");\n?>";
 
        if ($new)
        {
-           $cdir = $comp_path.'/'.$id;
-           @mkdir($cdir);
-           save_to_file($cdir.'/'.'index.php', 0, $index);
-
-           foreach($comp_subdirs as $dir)
-           {
-                       @mkdir($cdir.'/'.$dir);
-                       save_to_file($cdir.'/'.$dir.'/'.'index.php', 0, $index);
-           }
+               create_comp_dirs("$comp_path/$id", $comp_subdirs);
        }
        return true;
 }
@@ -163,7 +163,7 @@ function handle_delete()
        $id = $_GET['id'];
 
        $cdir = $comp_path.'/'.$id;
-       @flush_dir($cdir);
+       @flush_dir($cdir, true);
        if (!rmdir($cdir))
        {
                display_error(_("Cannot remove company data directory ") . $cdir);
@@ -236,9 +236,16 @@ function display_companies()
                label_cell($conn[$i]['dbname']);
                label_cell($conn[$i]['tbpref']);
                label_cell($what);
-               label_cell("<a href=" . $_SERVER['PHP_SELF']. "?selected_id=" . $i . ">" . _("Edit") . "</a>");
+               $edit = _("Edit");
+               $delete = _("Delete");
+               if (user_graphic_links())
+               {
+                       $edit = set_icon(ICON_EDIT, $edit);
+                       $delete = set_icon(ICON_DELETE, $delete);
+               }
+       label_cell("<a href='" . $_SERVER['PHP_SELF']. "?selected_id=$i'>$edit</a>");
                label_cell( $i == $coyno ? '' :
-       "<a href='javascript:deleteCompany(" . $i . ")'>" . _("Delete") . "</a>");
+                       "<a href='javascript:deleteCompany(" . $i . ")'>$delete</a>");
                end_row();
        }
 
@@ -257,7 +264,7 @@ function display_company_edit($selected_id)
        else
                $n = count($db_connections);
 
-       start_form(true, true);
+       start_form(true);
 
        echo "
                <script language='javascript'>