X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fcreate_coy.php;h=6ed2c7743429950a4da971a43db48e5ef5946428;hb=95ea2a03e3ccfa59bacd3d9a47bdf6d64b7d7a60;hp=50dcca0f7eac15fea79ecb8e5a63efde8d626539;hpb=388b76390023fb33ed063682cb2ddb3b14a9ce15;p=fa-stable.git diff --git a/admin/create_coy.php b/admin/create_coy.php index 50dcca0f..6ed2c774 100644 --- a/admin/create_coy.php +++ b/admin/create_coy.php @@ -1,6 +1,15 @@ . +***********************************************************************/ +$page_security = 'SA_CREATECOMPANY'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); @@ -9,9 +18,9 @@ include_once($path_to_root . "/admin/db/company_db.inc"); include_once($path_to_root . "/admin/db/maintenance_db.inc"); include_once($path_to_root . "/includes/ui.inc"); -page(_("Create/Update Company")); +page(_($help_context = "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'])) @@ -32,7 +41,11 @@ function check_data() global $db_connections, $tb_pref_counter, $selected_id; if ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "") - return false; + { + display_error(_("Database setting are not specified.")); + return false; + } + foreach($db_connections as $id=>$con) { if($id != $selected_id && $_POST['host'] == $con['host'] @@ -43,7 +56,7 @@ function check_data() display_error(_("This database settings are already used by another company.")); return false; } - if ($_POST['tbpref'] == 0 || $con['tbpref'] == '') + 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; @@ -71,60 +84,52 @@ function remove_connection($id) { function handle_submit() { global $db_connections, $def_coy, $tb_pref_counter, $db, - $comp_path, $comp_subdirs; - - $new = false; + $comp_subdirs, $path_to_root, $selected_id; + $error = false; if (!check_data()) return false; - $id = $_GET['id']; + if ($selected_id==-1) + $selected_id = count($db_connections); + + $new = !isset($db_connections[$selected_id]); - $db_connections[$id]['name'] = $_POST['name']; - $db_connections[$id]['host'] = $_POST['host']; - $db_connections[$id]['dbuser'] = $_POST['dbuser']; - $db_connections[$id]['dbpassword'] = $_POST['dbpassword']; - $db_connections[$id]['dbname'] = $_POST['dbname']; - if (isset($_GET['ul']) && $_GET['ul'] == 1) + $db_connections[$selected_id]['name'] = $_POST['name']; + $db_connections[$selected_id]['host'] = $_POST['host']; + $db_connections[$selected_id]['dbuser'] = $_POST['dbuser']; + $db_connections[$selected_id]['dbpassword'] = $_POST['dbpassword']; + $db_connections[$selected_id]['dbname'] = $_POST['dbname']; + if (is_numeric($_POST['tbpref'])) { - if (is_numeric($_POST['tbpref'])) - { - $db_connections[$id]['tbpref'] = $_POST['tbpref'] == 1 ? - $tb_pref_counter."_" : ''; - $new = true; - } - else if ($_POST['tbpref'] != "") - $db_connections[$id]['tbpref'] = $_POST['tbpref']; - else - $db_connections[$id]['tbpref'] = ""; + $db_connections[$selected_id]['tbpref'] = $_POST['tbpref'] == 1 ? + $tb_pref_counter."_" : ''; } + else if ($_POST['tbpref'] != "") + $db_connections[$selected_id]['tbpref'] = $_POST['tbpref']; + else + $db_connections[$selected_id]['tbpref'] = ""; + if ((bool)$_POST['def'] == true) - $def_coy = $id; - if (isset($_GET['ul']) && $_GET['ul'] == 1) - { - $conn = $db_connections[$id]; - if (($db = db_create_db($conn)) == 0) - { - display_error(_("Error creating Database: ") . $conn['dbname'] . _(", Please create it manually")); - remove_connection($id); - set_global_connection(); - return false; - } + $def_coy = $selected_id; - $filename = $_FILES['uploadfile']['tmp_name']; - if (is_uploaded_file ($filename)) - { - db_import($filename, $conn, $id); + $conn = $db_connections[$selected_id]; + if (($db = db_create_db($conn)) == 0) + { + display_error(_("Error creating Database: ") . $conn['dbname'] . _(", Please create it manually")); + $error = true; + } else { + if (!db_import($path_to_root.'/sql/'.get_post('coa'), $conn, $selected_id)) { + display_error(_('Cannot create new company due to bugs in sql file.')); + $error = true; + } else if (isset($_POST['admpassword']) && $_POST['admpassword'] != "") - db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'"); - } - else - { - display_error(_("Error uploading Database Script, please upload it manually")); - set_global_connection(); - return false; - } - set_global_connection(); + update_admin_password($conn, md5($_POST['admpassword'])); + } + set_global_connection(); + if ($error) { + remove_connection($selected_id); + return false; } $error = write_config_db($new); if ($error == -1) @@ -140,8 +145,11 @@ function handle_submit() if ($new) { - create_comp_dirs("$comp_path/$id", $comp_subdirs); + create_comp_dirs(company_path($selected_id), $comp_subdirs); } + $exts = get_company_extensions(); + write_extensions($exts, $selected_id); + display_notification($new ? _('New company has been created.') : _('Company has been updated.')); return true; } @@ -149,22 +157,40 @@ function handle_submit() function handle_delete() { - global $comp_path, $def_coy, $db_connections, $comp_subdirs; + global $def_coy, $db_connections, $comp_subdirs, $path_to_root; $id = $_GET['id']; - $cdir = $comp_path.'/'.$id; - @flush_dir($cdir); - if (!rmdir($cdir)) + // 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) || !is_writable($comp_path)) { + display_error(_('Broken company subdirectories system. You have to remove this company manually.')); + return; + } + } + // make sure config file is writable + if (!is_writeable($path_to_root . "/config_db.php")) { - display_error(_("Cannot remove company data directory ") . $cdir); + display_error(_("The configuration file ") . $path_to_root . "/config_db.php" . _(" is not writable. Change its permissions so it is, then re-run the operation.")); + return; + } + // rename directory to temporary name to ensure all + // other subdirectories will have right owners even after + // unsuccessfull removal. + $cdir = company_path($id); + $tmpname = company_path('/old_'.$id); + if (!@rename($cdir, $tmpname)) { + display_error(_('Cannot rename subdirectory to temporary name.')); return; } - for($i = $id+1; $i < count($db_connections); $i++) { - if (!rename($comp_path.'/'.$i, $comp_path.'/'.($i-1))) { + // 'shift' company directories names + for ($i = $id+1; $i < count($db_connections); $i++) { + if (!rename(company_path($i), company_path($i-1))) { display_error(_("Cannot rename company subdirectory")); return; - } + } } $err = remove_connection($id); if ($err == 0) @@ -179,17 +205,25 @@ function handle_delete() display_error(_("Cannot write to the configuration file - ") . $path_to_root . "/config_db.php"); else if ($error == -3) display_error(_("The configuration file ") . $path_to_root . "/config_db.php" . _(" is not writable. Change its permissions so it is, then re-run the operation.")); - if ($error != 0) + if ($error != 0) { + @rename($tmpname, $cdir); return; - - meta_forward($_SERVER['PHP_SELF']); + } + // finally remove renamed company directory + @flush_dir($tmpname, true); + if (!@rmdir($tmpname)) + { + display_error(_("Cannot remove temporary renamed company data directory ") . $tmpname); + return; + } + display_notification(_("Selected company has been deleted")); } //--------------------------------------------------------------------------------------------- function display_companies() { - global $table_style, $def_coy, $db_connections; + global $def_coy, $db_connections; $coyno = $_SESSION["wa_current_user"]->company; @@ -201,7 +235,7 @@ function display_companies() document.location.replace('create_coy.php?c=df&id='+id) } "; - start_table($table_style); + start_table(TABLESTYLE); $th = array(_("Company"), _("Database Host"), _("Database User"), _("Database Name"), _("Table Pref"), _("Default"), "", ""); @@ -227,9 +261,16 @@ function display_companies() label_cell($conn[$i]['dbname']); label_cell($conn[$i]['tbpref']); label_cell($what); - label_cell("" . _("Edit") . ""); + $edit = _("Edit"); + $delete = _("Delete"); + if (user_graphic_links()) + { + $edit = set_icon(ICON_EDIT, $edit); + $delete = set_icon(ICON_DELETE, $delete); + } + label_cell("$edit"); label_cell( $i == $coyno ? '' : - "" . _("Delete") . ""); + "$delete"); end_row(); } @@ -241,29 +282,16 @@ 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; else $n = count($db_connections); - start_form(true, true); - - echo " - "; + start_form(); - start_table($table_style2); + start_table(TABLESTYLE2); if ($selected_id != -1) { @@ -284,9 +312,17 @@ function display_company_edit($selected_id) hidden('dbpassword', $_POST['dbpassword']); } else + { $_POST['tbpref'] = $tb_pref_counter."_"; + // Insert the current settings as default + $conn = $db_connections[user_company()]; + $_POST['host'] = $conn['host']; + $_POST['dbuser'] = $conn['dbuser']; + $_POST['dbpassword'] = $conn['dbpassword']; + $_POST['dbname'] = $conn['dbname']; + } text_row_ex(_("Company"), 'name', 30); - text_row_ex(_("Host"), 'host', 30); + text_row_ex(_("Host"), 'host', 30, 60); text_row_ex(_("Database User"), 'dbuser', 30); if ($selected_id == -1) text_row_ex(_("Database Password"), 'dbpassword', 30); @@ -297,16 +333,13 @@ function display_company_edit($selected_id) label_row(_("Table Pref"), $_POST['tbpref']); yesno_list_row(_("Default"), 'def', null, "", "", false); - start_row(); - label_cell(_("Database Script")); - label_cell(""); - end_row(); + coa_list_row(_("Database Script"), 'coa'); text_row_ex(_("New script Admin Password"), 'admpassword', 20); + end_table(1); - end_table(); - display_note(_("Choose from Database scripts in SQL folder. No Database is created without a script."), 0, 1); - echo "
"; + submit_center('save', _("Save")); +// echo "
"; end_form(); @@ -315,21 +348,16 @@ function display_company_edit($selected_id) //--------------------------------------------------------------------------------------------- -if (isset($_GET['c']) && $_GET['c'] == 'df') -{ - +if (isset($_GET['c']) && $_GET['c'] == 'df') { handle_delete(); + $selected_id = -1; } -if (isset($_GET['c']) && $_GET['c'] == 'u') -{ +if (get_post('save')) { if (handle_submit()) - { - meta_forward($_SERVER['PHP_SELF']); - } + $selected_id = -1; } - //--------------------------------------------------------------------------------------------- display_companies();