X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcreate_coy.php;h=205f904628c34b90b08f22d772921df5019d42aa;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=348c3634c7b604e81454dd93029aa7632674494f;hpb=4e4ce8577f8582967995919860c66aa94d633afd;p=fa-stable.git diff --git a/admin/create_coy.php b/admin/create_coy.php index 348c3634..205f9046 100644 --- a/admin/create_coy.php +++ b/admin/create_coy.php @@ -22,43 +22,50 @@ page(_($help_context = "Create/Update Company")); $comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting', 'attachments'); +simple_page_mode(true); +/* + FIXME: tb_pref_counter should track prefix per database. +*/ //--------------------------------------------------------------------------------------------- -if (isset($_GET['selected_id'])) +function check_data($selected_id) { - $selected_id = $_GET['selected_id']; -} -elseif (isset($_POST['selected_id'])) -{ - $selected_id = $_POST['selected_id']; -} -else - $selected_id = -1; - -//--------------------------------------------------------------------------------------------- + global $db_connections, $tb_pref_counter; -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; - } - } + if ($selected_id != -1) { + if ($_POST['name'] == "") + { + display_error(_("Database settings are not specified.")); + return false; + } + } else { + if (!get_post('name') || !get_post('host') || !get_post('dbuser') || !get_post('dbname')) + { + display_error(_("Database settings are not specified.")); + return false; + } + if ($_POST['port'] != '' && !is_numeric($_POST['port'])) + { + display_error(_('Database port has to be numeric or empty.')); + 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; } @@ -73,62 +80,70 @@ function remove_connection($id) { unset($db_connections[$id]); $conn = array_values($db_connections); $db_connections = $conn; - //$$db_connections = array_values($db_connections); return $err; } //--------------------------------------------------------------------------------------------- -function handle_submit() +function handle_submit($selected_id) { global $db_connections, $def_coy, $tb_pref_counter, $db, - $comp_subdirs, $path_to_root, $selected_id; + $comp_subdirs, $path_to_root, $Mode; $error = false; - if (!check_data()) - return false; if ($selected_id==-1) $selected_id = count($db_connections); $new = !isset($db_connections[$selected_id]); - $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'])) - { - $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) + if (check_value('def')) $def_coy = $selected_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.')); + $db_connections[$selected_id]['name'] = $_POST['name']; + if ($new) { + $db_connections[$selected_id]['host'] = $_POST['host']; + $db_connections[$selected_id]['port'] = $_POST['port']; + $db_connections[$selected_id]['dbuser'] = $_POST['dbuser']; + $db_connections[$selected_id]['dbpassword'] = html_entity_decode($_POST['dbpassword'], ENT_QUOTES, + $_SESSION['language']->encoding=='iso-8859-2' ? 'ISO-8859-1' : $_SESSION['language']->encoding); + $db_connections[$selected_id]['dbname'] = $_POST['dbname']; + $db_connections[$selected_id]['collation'] = $_POST['collation']; + if (is_numeric($_POST['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'] = ""; + + $conn = $db_connections[$selected_id]; + if (($db = db_create_db($conn)) === false) + { + display_error(_("Error creating Database: ") . $conn['dbname'] . _(", Please create it manually")); $error = true; - } else - if (isset($_POST['admpassword']) && $_POST['admpassword'] != "") + } else { + if (strncmp(db_get_version(), "5.6", 3) >= 0) + db_query("SET sql_mode = ''"); + 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'] == "") + $_POST['admpassword'] = "password"; update_admin_password($conn, md5($_POST['admpassword'])); - } - set_global_connection(); - if ($error) { - remove_connection($selected_id); - return false; + } + } + if ($error) { + remove_connection($selected_id); + return false; + } } $error = write_config_db($new); + if ($error == -1) display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php"); else if ($error == -2) @@ -143,20 +158,20 @@ function handle_submit() if ($new) { create_comp_dirs(company_path($selected_id), $comp_subdirs); + $exts = get_company_extensions(); + write_extensions($exts, $selected_id); } - $exts = get_company_extensions(); - write_extensions($exts, $selected_id); display_notification($new ? _('New company has been created.') : _('Company has been updated.')); + + $Mode = 'RESET'; return true; } //--------------------------------------------------------------------------------------------- -function handle_delete() +function handle_delete($id) { - global $def_coy, $db_connections, $comp_subdirs, $path_to_root; - - $id = $_GET['id']; + global $Ajax, $def_coy, $db_connections, $comp_subdirs, $path_to_root, $Mode; // 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! @@ -191,10 +206,11 @@ function handle_delete() } $err = remove_connection($id); if ($err == 0) - display_error(_("Error removing Database: ") . $dbase . _(", please remove it manually")); + display_error(_("Error removing Database: ") . $id . _(", please remove it manually")); if ($def_coy == $id) $def_coy = 0; + $error = write_config_db(); if ($error == -1) display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php"); @@ -214,28 +230,22 @@ function handle_delete() return; } display_notification(_("Selected company has been deleted")); + $Ajax->activate('_page_body'); + $Mode = 'RESET'; } //--------------------------------------------------------------------------------------------- function display_companies() { - global $def_coy, $db_connections; + global $def_coy, $db_connections, $supported_collations; - $coyno = $_SESSION["wa_current_user"]->company; + $coyno = user_company(); - echo " - "; start_table(TABLESTYLE); - $th = array(_("Company"), _("Database Host"), _("Database User"), - _("Database Name"), _("Table Pref"), _("Default"), "", ""); + $th = array(_("Company"), _("Database Host"), _("Database Port"), _("Database User"), + _("Database Name"), _("Table Pref"), _("Charset"), _("Default"), "", ""); table_header($th); $k=0; @@ -243,10 +253,6 @@ function display_companies() $n = count($conn); for ($i = 0; $i < $n; $i++) { - if ($i == $def_coy) - $what = _("Yes"); - else - $what = _("No"); if ($i == $coyno) start_row("class='stockmankobg'"); else @@ -254,25 +260,28 @@ function display_companies() label_cell($conn[$i]['name']); label_cell($conn[$i]['host']); + label_cell(isset($conn[$i]['port']) ? $conn[$i]['port'] : ''); label_cell($conn[$i]['dbuser']); label_cell($conn[$i]['dbname']); label_cell($conn[$i]['tbpref']); - label_cell($what); - $edit = _("Edit"); - $delete = _("Delete"); - if (user_graphic_links()) + label_cell(isset($conn[$i]['collation']) ? $supported_collations[$conn[$i]['collation']] : ''); + label_cell($i == $def_coy ? _("Yes") : _("No")); + edit_button_cell("Edit".$i, _("Edit")); + if ($i != $coyno) { - $edit = set_icon(ICON_EDIT, $edit); - $delete = set_icon(ICON_DELETE, $delete); - } - label_cell("$edit"); - label_cell( $i == $coyno ? '' : - "$delete"); + delete_button_cell("Delete".$i, _("Delete")); + submit_js_confirm("Delete".$i, + sprintf(_("You are about to remove company \'%s\'.\nDo you want to continue ?"), + $conn[$i]['name'])); + } else + label_cell(''); end_row(); } end_table(); display_note(_("The marked company is the current company which cannot be deleted."), 0, 0, "class='currentfg'"); + display_note(_("If no Admin Password is entered, the new Admin Password will be 'password' by default ")); + display_note(_("Set Only Port value if you cannot use the default port 3306.")); } //--------------------------------------------------------------------------------------------- @@ -281,13 +290,6 @@ function display_company_edit($selected_id) { global $def_coy, $db_connections, $tb_pref_counter; - if ($selected_id != -1) - $n = $selected_id; - else - $n = count($db_connections); - - start_form(); - start_table(TABLESTYLE2); if ($selected_id != -1) @@ -295,67 +297,87 @@ function display_company_edit($selected_id) $conn = $db_connections[$selected_id]; $_POST['name'] = $conn['name']; $_POST['host'] = $conn['host']; + $_POST['port'] = isset($conn['port']) ? $conn['port'] : ''; $_POST['dbuser'] = $conn['dbuser']; $_POST['dbpassword'] = $conn['dbpassword']; $_POST['dbname'] = $conn['dbname']; $_POST['tbpref'] = $conn['tbpref']; - if ($selected_id == $def_coy) - $_POST['def'] = true; - else - $_POST['def'] = false; + $_POST['def'] = $selected_id == $def_coy; $_POST['dbcreate'] = false; - hidden('selected_id', $selected_id); + $_POST['collation'] = isset($conn['collation']) ? $conn['collation'] : ''; hidden('tbpref', $_POST['tbpref']); hidden('dbpassword', $_POST['dbpassword']); } else + { $_POST['tbpref'] = $tb_pref_counter."_"; - text_row_ex(_("Company"), 'name', 30); - text_row_ex(_("Host"), 'host', 30, 60); - text_row_ex(_("Database User"), 'dbuser', 30); + + // Use current settings as default + $conn = $db_connections[user_company()]; + $_POST['name'] = ''; + $_POST['host'] = $conn['host']; + $_POST['port'] = isset($conn['port']) ? $conn['port'] : ''; + $_POST['dbuser'] = $conn['dbuser']; + $_POST['dbpassword'] = $conn['dbpassword']; + $_POST['dbname'] = $conn['dbname']; + $_POST['collation'] = isset($conn['collation']) ? $conn['collation'] : ''; + unset($_POST['def']); + } + + text_row_ex(_("Company"), 'name', 50); + if ($selected_id == -1) + { + text_row_ex(_("Host"), 'host', 30, 60); + text_row_ex(_("Port"), 'port', 30, 60); + text_row_ex(_("Database User"), 'dbuser', 30); text_row_ex(_("Database Password"), 'dbpassword', 30); - text_row_ex(_("Database Name"), 'dbname', 30); - if ($selected_id == -1) + text_row_ex(_("Database Name"), 'dbname', 30); + collations_list_row(_("Database Collation:"), 'collation'); yesno_list_row(_("Table Pref"), 'tbpref', 1, $_POST['tbpref'], _("None"), false); - else + check_row(_("Default Company"), 'def'); + coa_list_row(_("Database Script"), 'coa'); + text_row_ex(_("New script Admin Password"), 'admpassword', 20); + } else { + label_row(_("Host"), $_POST['host']); + label_row(_("Port"), $_POST['port']); + label_row(_("Database User"), $_POST['dbuser']); + label_row(_("Database Name"), $_POST['dbname']); + collations_list_row(_("Database Collation:"), 'collation'); label_row(_("Table Pref"), $_POST['tbpref']); - yesno_list_row(_("Default"), 'def', null, "", "", false); - - coa_list_row(_("Database Script"), 'coa'); + if (!get_post('def')) + check_row(_("Default Company"), 'def'); + else + label_row(_("Default Company"), _("Yes")); + } - text_row_ex(_("New script Admin Password"), 'admpassword', 20); end_table(1); - - submit_center('save', _("Save")); -// echo "
"; - - - end_form(); + hidden('selected_id', $selected_id); } - //--------------------------------------------------------------------------------------------- -if (isset($_GET['c']) && $_GET['c'] == 'df') { - handle_delete(); - $selected_id = -1; -} +if (($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') && check_data($selected_id)) + handle_submit($selected_id); + +if ($Mode == 'Delete') + handle_delete($selected_id); -if (get_post('save')) { - if (handle_submit()) - $selected_id = -1; +if ($Mode == 'RESET') +{ + $selected_id = -1; + unset($_POST); } //--------------------------------------------------------------------------------------------- -display_companies(); +start_form(); -hyperlink_no_params($_SERVER['PHP_SELF'], _("Create a new company")); + display_companies(); + display_company_edit($selected_id); + submit_add_or_update_center($selected_id == -1, '', 'upgrade'); -display_company_edit($selected_id); +end_form(); -//--------------------------------------------------------------------------------------------- end_page(); -?> \ No newline at end of file