projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional access control related ui helpers added: check_edit_access, access_post...
[fa-stable.git]
/
admin
/
create_coy.php
diff --git
a/admin/create_coy.php
b/admin/create_coy.php
index 66d01d1d347d773a21bb7bdeae1780d37ef6574f..0366e76c2a382de99b970a4e52f1957d7eb6ddb9 100644
(file)
--- a/
admin/create_coy.php
+++ b/
admin/create_coy.php
@@
-25,20
+25,20
@@
$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting', '
//---------------------------------------------------------------------------------------------
if (isset($_GET['selected_id']))
{
//---------------------------------------------------------------------------------------------
if (isset($_GET['selected_id']))
{
- $selected_id = $_GET['selected_id'];
+ $selected_id =
(int)
$_GET['selected_id'];
}
elseif (isset($_POST['selected_id']))
{
}
elseif (isset($_POST['selected_id']))
{
- $selected_id = $_POST['selected_id'];
+ $selected_id =
(int)
$_POST['selected_id'];
}
else
$selected_id = -1;
//---------------------------------------------------------------------------------------------
}
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'] == "")
if($selected_id != -1) {
if ($_POST['name'] == "")
@@
-88,13
+88,13
@@
function remove_connection($id) {
}
//---------------------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------------------
-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;
$error = false;
- if (!check_data())
+ if (!check_data(
$selected_id
))
return false;
if ($selected_id==-1)
return false;
if ($selected_id==-1)
@@
-106,7
+106,7
@@
function handle_submit()
$def_coy = $selected_id;
$db_connections[$selected_id]['name'] = $_POST['name'];
$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]['host'] = $_POST['host'];
$db_connections[$selected_id]['dbuser'] = $_POST['dbuser'];
$db_connections[$selected_id]['dbpassword'] = $_POST['dbpassword'];
@@
-122,25
+122,32
@@
function handle_submit()
$db_connections[$selected_id]['tbpref'] = "";
$conn = $db_connections[$selected_id];
$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 {
{
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 (!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'] != "")
- update_admin_password($conn, md5($_POST['admpassword']));
+ }
+ 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);
$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)
if ($error == -1)
display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
else if ($error == -2)
@@
-159,16
+166,15
@@
function handle_submit()
$exts = get_company_extensions();
write_extensions($exts, $selected_id);
display_notification($new ? _('New company has been created.') : _('Company has been updated.'));
$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;
}
//---------------------------------------------------------------------------------------------
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!
// 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!
@@
-207,6
+213,7
@@
function handle_delete()
if ($def_coy == $id)
$def_coy = 0;
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");
$error = write_config_db();
if ($error == -1)
display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
@@
-226,6
+233,7
@@
function handle_delete()
return;
}
display_notification(_("Selected company has been deleted"));
return;
}
display_notification(_("Selected company has been deleted"));
+ $Ajax->activate('_page_body');
}
//---------------------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------------------
@@
-234,12
+242,12
@@
function display_companies()
{
global $def_coy, $db_connections;
{
global $def_coy, $db_connections;
- $coyno =
$_SESSION["wa_current_user"]->company
;
+ $coyno =
user_company()
;
echo "
<script language='javascript'>
echo "
<script language='javascript'>
- function deleteCompany(id) {
- if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id))
+ 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)
}
return
document.location.replace('create_coy.php?c=df&id='+id)
}
@@
-278,13
+286,15
@@
function display_companies()
$delete = set_icon(ICON_DELETE, $delete);
}
label_cell("<a href='" . $_SERVER['PHP_SELF']. "?selected_id=$i'>$edit</a>");
$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 ? '' :
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'");
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'");
}
//---------------------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------------------
@@
-320,13
+330,14
@@
function display_company_edit($selected_id)
$_POST['tbpref'] = $tb_pref_counter."_";
// Insert the current settings as default
$conn = $db_connections[user_company()];
$_POST['tbpref'] = $tb_pref_counter."_";
// 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'];
}
$_POST['host'] = $conn['host'];
$_POST['dbuser'] = $conn['dbuser'];
$_POST['dbpassword'] = $conn['dbpassword'];
$_POST['dbname'] = $conn['dbname'];
}
- text_row_ex(_("Company"), 'name',
3
0);
+ text_row_ex(_("Company"), 'name',
5
0);
if ($selected_id == -1)
{
if ($selected_id == -1)
{
@@
-359,12
+370,12
@@
function display_company_edit($selected_id)
//---------------------------------------------------------------------------------------------
if (isset($_GET['c']) && $_GET['c'] == 'df') {
//---------------------------------------------------------------------------------------------
if (isset($_GET['c']) && $_GET['c'] == 'df') {
- handle_delete();
+ handle_delete(
(int)$_GET['id']
);
$selected_id = -1;
}
if (get_post('save')) {
$selected_id = -1;
}
if (get_post('save')) {
- if (handle_submit())
+ if (handle_submit(
$selected_id
))
$selected_id = -1;
}
$selected_id = -1;
}
@@
-379,4
+390,3
@@
display_company_edit($selected_id);
//---------------------------------------------------------------------------------------------
end_page();
//---------------------------------------------------------------------------------------------
end_page();
-?>
\ No newline at end of file