projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated version for 2.3beta
[fa-stable.git]
/
admin
/
create_coy.php
diff --git
a/admin/create_coy.php
b/admin/create_coy.php
index 2d9242f43d1f01d5ddb8e3a4544baeec6b342d15..9ac71ef0bf2d1370984f800cf416783d4ea6f8c6 100644
(file)
--- a/
admin/create_coy.php
+++ b/
admin/create_coy.php
@@
-42,6
+42,11
@@
function check_data()
if ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
return false;
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']
foreach($db_connections as $id=>$con)
{
if($id != $selected_id && $_POST['host'] == $con['host']
@@
-82,12
+87,12
@@
function handle_submit()
global $db_connections, $def_coy, $tb_pref_counter, $db,
$comp_subdirs, $path_to_root;
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'];
$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]['name'] = $_POST['name'];
$db_connections[$id]['host'] = $_POST['host'];
@@
-100,7
+105,6
@@
function handle_submit()
{
$db_connections[$id]['tbpref'] = $_POST['tbpref'] == 1 ?
$tb_pref_counter."_" : '';
{
$db_connections[$id]['tbpref'] = $_POST['tbpref'] == 1 ?
$tb_pref_counter."_" : '';
- $new = true;
}
else if ($_POST['tbpref'] != "")
$db_connections[$id]['tbpref'] = $_POST['tbpref'];
}
else if ($_POST['tbpref'] != "")
$db_connections[$id]['tbpref'] = $_POST['tbpref'];
@@
-146,7
+150,7
@@
function handle_submit()
{
display_error(_("Error connecting to Database: ") . $conn['dbname'] . _(", Please correct it"));
$error = true;
{
display_error(_("Error connecting to Database: ") . $conn['dbname'] . _(", Please correct it"));
$error = true;
- } else {
+ } else
if ($_POST['admpassword'] != "")
{
db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'");
}
}
db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'");
}
}