//---------------------------------------------------------------------------------------------
if (isset($_GET['selected_id']))
{
- $selected_id = $_GET['selected_id'];
+ $selected_id = (int)$_GET['selected_id'];
}
elseif (isset($_POST['selected_id']))
{
- $selected_id = $_POST['selected_id'];
+ $selected_id = (int)$_POST['selected_id'];
}
else
$selected_id = -1;
//---------------------------------------------------------------------------------------------
-function check_data()
+function check_data($selected_id)
{
- global $db_connections, $tb_pref_counter, $selected_id;
+ global $db_connections, $tb_pref_counter;
if($selected_id != -1) {
if ($_POST['name'] == "")
}
//---------------------------------------------------------------------------------------------
-function handle_submit()
+function handle_submit($selected_id)
{
- global $db_connections, $def_coy, $tb_pref_counter, $db,
- $comp_subdirs, $path_to_root, $selected_id;
+ global $Ajax, $db_connections, $def_coy, $tb_pref_counter, $db,
+ $comp_subdirs, $path_to_root;
$error = false;
- if (!check_data())
+ if (!check_data($selected_id))
return false;
if ($selected_id==-1)
$def_coy = $selected_id;
$db_connections[$selected_id]['name'] = $_POST['name'];
- if($new) {
+ if ($new) {
$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]['tbpref'] = "";
$conn = $db_connections[$selected_id];
- if (($db = db_create_db($conn)) == 0)
+ if (($db = db_create_db($conn)) === false)
{
display_error(_("Error creating Database: ") . $conn['dbname'] . _(", Please create it manually"));
$error = true;
} 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;
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;
}
}
+
$error = write_config_db($new);
+ set_global_connection();
if ($error == -1)
display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
else if ($error == -2)
$exts = get_company_extensions();
write_extensions($exts, $selected_id);
display_notification($new ? _('New company has been created.') : _('Company has been updated.'));
+ $Ajax->activate('_page_body');
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;
// 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!
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");
return;
}
display_notification(_("Selected company has been deleted"));
+ $Ajax->activate('_page_body');
}
//---------------------------------------------------------------------------------------------
{
global $def_coy, $db_connections;
- $coyno = $_SESSION["wa_current_user"]->company;
+ $coyno = user_company();
echo "
<script language='javascript'>
$_POST['dbname'] = $conn['dbname'];
}
- text_row_ex(_("Company"), 'name', 30);
+ text_row_ex(_("Company"), 'name', 50);
if ($selected_id == -1)
{
//---------------------------------------------------------------------------------------------
if (isset($_GET['c']) && $_GET['c'] == 'df') {
- handle_delete();
+ handle_delete( (int)$_GET['id'] );
$selected_id = -1;
}
if (get_post('save')) {
- if (handle_submit())
+ if (handle_submit($selected_id))
$selected_id = -1;
}
//---------------------------------------------------------------------------------------------
end_page();
-?>
\ No newline at end of file