if ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
return false;
+ if ($selected_id == -1 && (!isset($_GET['ul']) || $_GET['ul'] != 1))
+ {
+ display_error(_("When creating a new company, you must provide a Database script file."));
+ return false;
+ }
foreach($db_connections as $id=>$con)
{
if($id != $selected_id && $_POST['host'] == $con['host']
global $db_connections, $def_coy, $tb_pref_counter, $db,
$comp_subdirs, $path_to_root;
- $new = false;
$error = false;
if (!check_data())
return false;
$id = $_GET['id'];
+ $new = !isset($db_connections[$id]);
$db_connections[$id]['name'] = $_POST['name'];
$db_connections[$id]['host'] = $_POST['host'];
{
$db_connections[$id]['tbpref'] = $_POST['tbpref'] == 1 ?
$tb_pref_counter."_" : '';
- $new = true;
}
else if ($_POST['tbpref'] != "")
$db_connections[$id]['tbpref'] = $_POST['tbpref'];
{
display_error(_("Error connecting to Database: ") . $conn['dbname'] . _(", Please correct it"));
$error = true;
- } else {
+ } elseif ($_POST['admpassword'] != "") {
db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'");
}
}
// 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.'/'.$i) || !is_writable($comp_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;
}
display_error(_("Cannot remove temporary renamed company data directory ") . $tmpname);
return;
}
- display_notification(_("Selected company as been deleted"));
+ 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;
document.location.replace('create_coy.php?c=df&id='+id)
}
</script>";
- start_table($table_style);
+ start_table(TABLESTYLE);
$th = array(_("Company"), _("Database Host"), _("Database User"),
_("Database Name"), _("Table Pref"), _("Default"), "", "");
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;
}
</script>";
- start_table($table_style2);
+ start_table(TABLESTYLE2);
if ($selected_id != -1)
{