//---------------------------------------------------------------------------------------------
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;
{
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 ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
+ {
+ display_error(_("Database settings are not specified."));
+ 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;
}
$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)
$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]['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'] = "";
+
+ $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 (isset($_POST['admpassword']) && $_POST['admpassword'] != "")
+ } 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'] == "")
+ $_POST['admpassword'] = "password";
update_admin_password($conn, md5($_POST['admpassword']));
- }
- set_global_connection();
- if ($error) {
- remove_connection($selected_id);
- return false;
+ }
+ }
+ set_global_connection();
+ if ($error) {
+ remove_connection($selected_id);
+ return false;
+ }
}
$error = write_config_db($new);
if ($error == -1)
{
global $def_coy, $db_connections, $comp_subdirs, $path_to_root;
- $id = $_GET['id'];
+ $id = (int)$_GET['id'];
// 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!
$coyno = $_SESSION["wa_current_user"]->company;
echo "
- <script language='javascript'>
- function deleteCompany(id) {
- if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id))
+ <script type='text/javascript'>
+ function deleteCompany(id, name) {
+ if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id+' '+name+'?'))
return
document.location.replace('create_coy.php?c=df&id='+id)
}
$delete = set_icon(ICON_DELETE, $delete);
}
label_cell("<a href='" . $_SERVER['PHP_SELF']. "?selected_id=$i'>$edit</a>");
+ $name = "\"".$conn[$i]['name']."\"";
label_cell( $i == $coyno ? '' :
- "<a href='javascript:deleteCompany(" . $i . ")'>$delete</a>");
+ "<a href='javascript:deleteCompany($i, $name)'>$delete</a>");
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 '<b>password</b>' by default "), 1, 0, "class='currentfg'");
}
//---------------------------------------------------------------------------------------------
{
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);
hidden('dbpassword', $_POST['dbpassword']);
}
else
+ {
$_POST['tbpref'] = $tb_pref_counter."_";
- text_row_ex(_("Company"), 'name', 30);
- text_row_ex(_("Host"), 'host', 30);
- text_row_ex(_("Database User"), 'dbuser', 30);
+ // Insert the current settings as default
+ $conn = $db_connections[user_company()];
+ $_POST['name'] = '';
+ $_POST['host'] = $conn['host'];
+ $_POST['dbuser'] = $conn['dbuser'];
+ $_POST['dbpassword'] = $conn['dbpassword'];
+ $_POST['dbname'] = $conn['dbname'];
+ }
+
+ text_row_ex(_("Company"), 'name', 50);
+
if ($selected_id == -1)
+ {
+ text_row_ex(_("Host"), 'host', 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);
yesno_list_row(_("Table Pref"), 'tbpref', 1, $_POST['tbpref'], _("None"), false);
- else
+ } else {
+ label_row(_("Host"), $_POST['host']);
+ label_row(_("Database User"), $_POST['dbuser']);
+ label_row(_("Database Name"), $_POST['dbname']);
label_row(_("Table Pref"), $_POST['tbpref']);
+ }
yesno_list_row(_("Default"), 'def', null, "", "", false);
- coa_list_row(_("Database Script"), 'coa');
-
- text_row_ex(_("New script Admin Password"), 'admpassword', 20);
+ if ($selected_id == -1)
+ {
+ coa_list_row(_("Database Script"), 'coa');
+ text_row_ex(_("New script Admin Password"), 'admpassword', 20);
+ }
end_table(1);
submit_center('save', _("Save"));
-// echo "<center><input type='button' style='width:150px' value='". _("Save"). "'></center>";
-
end_form();
}
projects / fa-stable.git / blobdiff