Merged bugfixes upto [0000072] (version 2.0.3).

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

diff --git a/admin/create_coy.php b/admin/create_coy.php
index ddce8db2ee0e18f46134b472f888e25c73cf19a8..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");
 
@@ -11,10 +11,9 @@ include_once($path_to_root . "/includes/ui.inc");
 
 page(_("Create/Update Company"));
 
-$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache');
+$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting');
 
 //---------------------------------------------------------------------------------------------
-
 if (isset($_GET['selected_id']))
 {
        $selected_id = $_GET['selected_id'];
@@ -30,6 +29,27 @@ else
 
 function check_data()
 {
+       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($id != $selected_id && $_POST['host'] == $con['host'] 
+               && $_POST['dbname'] == $con['dbname'])
+               {
+                       if ($_POST['tbpref'] == $con['tbpref'])
+                       {
+                               display_error(_("This database settings are already used by another company."));
+                               return false;
+                       }
+                       if ($_POST['tbpref'] == 0 || $con['tbpref'] == '')
+                       {
+                               display_error(_("You cannot have table set without prefix together with prefixed sets in the same database."));
+                               return false;
+                       }
+               }
+       }
        return true;
 }
 
@@ -38,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]);
@@ -68,9 +87,10 @@ function handle_submit()
        $db_connections[$id]['dbname'] = $_POST['dbname'];
        if (isset($_GET['ul']) && $_GET['ul'] == 1)
        {
-               if (is_numeric($_POST['tbpref']) && $_POST['tbpref'] == 1)
+               if (is_numeric($_POST['tbpref']))
                {
-                       $db_connections[$id]['tbpref'] = $tb_pref_counter."_";
+                       $db_connections[$id]['tbpref'] = $_POST['tbpref'] == 1 ?
+                         $tb_pref_counter."_" : '';
                        $new = true;
                }
                else if ($_POST['tbpref'] != "")
@@ -142,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;
@@ -158,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']);
 }
 
@@ -212,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();
        }
 
@@ -289,8 +314,8 @@ function display_company_edit($selected_id)
        text_row_ex(_("New script Admin Password"), 'admpassword', 20);
 
        end_table();
-       display_note(_("Choose from Database scripts in SQL folder. No Datase is created without a script."), 0, 1);
-       echo "<center><input onclick='javascript:updateCompany()' type='button' style='width:150' value='". _("Save"). "'>";
+       display_note(_("Choose from Database scripts in SQL folder. No Database is created without a script."), 0, 1);
+       echo "<center><input onclick='javascript:updateCompany()' type='button' style='width:150px' value='". _("Save"). "'></center>";
 
 
        end_form();
@@ -323,7 +348,6 @@ hyperlink_no_params($_SERVER['PHP_SELF'], _("Create a new company"));
 display_company_edit($selected_id);
 
 //---------------------------------------------------------------------------------------------
-
 end_page();
 
 ?>
\ No newline at end of file