projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed Journal Inquiries so it shows the Bank Deposit/Payment amount instead of...
[fa-stable.git]
/
admin
/
inst_module.php
diff --git
a/admin/inst_module.php
b/admin/inst_module.php
index 3571b6929aac329a32439c299ac883e50329e4fa..067e83f0281aba94f5d4d0975ac569ef216d5b30 100644
(file)
--- a/
admin/inst_module.php
+++ b/
admin/inst_module.php
@@
-13,7
+13,7
@@
$page_security = 'SA_CREATEMODULES';
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
-page(_("Install/Activate extensions"));
+page(_(
$help_context =
"Install/Activate extensions"));
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/admin/db/company_db.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/admin/db/company_db.inc");
@@
-92,7
+92,7
@@
function handle_submit()
return false;
$id = $selected_id==-1 ? $next_extension_id : $selected_id;
return false;
$id = $selected_id==-1 ? $next_extension_id : $selected_id;
- if ($extensions[$id]['type'] != 'plugin') {
+ if ($
selected_id != -1 && $
extensions[$id]['type'] != 'plugin') {
display_error(_('Module installation support is not implemented yet. You have to do it manually.'));
return;
}
display_error(_('Module installation support is not implemented yet. You have to do it manually.'));
return;
}
@@
-101,7
+101,7
@@
function handle_submit()
$extensions[$id]['name'] = $_POST['name'];
$extensions[$id]['path'] = $_POST['path'];
$extensions[$id]['title'] = $_POST['title'];
$extensions[$id]['name'] = $_POST['name'];
$extensions[$id]['path'] = $_POST['path'];
$extensions[$id]['title'] = $_POST['title'];
- $extensions[$id]['active'] =
$_POST['active']
;
+ $extensions[$id]['active'] =
check_value('active')
;
// Currently we support only plugin extensions here.
$extensions[$id]['type'] = 'plugin';
// Currently we support only plugin extensions here.
$extensions[$id]['type'] = 'plugin';
@@
-171,32
+171,16
@@
function handle_delete()
$extensions = get_company_extensions();
$id = $selected_id;
$extensions = get_company_extensions();
$id = $selected_id;
- $removed_ext = $extensions[$id];
-
- unset($extensions[$id]);
- $mods = array_values($extensions);
- $extensions = $mods;
-
- unset($extensions[$id]);
-
- update_extensions($extensions);
$filename = $path_to_root
. ($extensions[$id]['type']=='plugin' ? "/modules/": '/')
. $extensions[$id]['path'];
$filename = $path_to_root
. ($extensions[$id]['type']=='plugin' ? "/modules/": '/')
. $extensions[$id]['path'];
- if ($h = opendir($filename))
- {
- while (($file = readdir($h)) !== false)
- {
- if (is_file("$filename/$file"))
- unlink("$filename/$file");
- }
- closedir($h);
- }
+ flush_dir($filename);
rmdir($filename);
rmdir($filename);
-
- display_notification(_("Selected extension has been successfully deleted"));
+ unset($extensions[$id]);
+ if (update_extensions($extensions))
+ display_notification(_("Selected extension has been successfully deleted"));
return true;
}
return true;
}
@@
-204,7
+188,7
@@
function handle_delete()
function display_extensions()
{
function display_extensions()
{
- global $table_style
, $tabs
;
+ global $table_style;
start_table($table_style);
$th = array(_("Name"),_("Tab"), _("Link text"), _("Folder"), _("Filename"),
start_table($table_style);
$th = array(_("Name"),_("Tab"), _("Link text"), _("Folder"), _("Filename"),
@@
-220,7
+204,8
@@
function display_extensions()
$is_mod = $mod['type'] == 'module';
alt_table_row_color($k);
label_cell($mod['name']);
$is_mod = $mod['type'] == 'module';
alt_table_row_color($k);
label_cell($mod['name']);
- label_cell( $is_mod ? $mod['title'] : $tabs[$mod['tab']]);
+ label_cell( $is_mod ?
+ $mod['title'] : access_string($_SESSION['App']->applications[$mod['tab']]->name, true));
$ttl = access_string($mod['title']);
label_cell($ttl[0]);
label_cell($mod['path']);
$ttl = access_string($mod['title']);
label_cell($ttl[0]);
label_cell($mod['path']);
@@
-244,7
+229,7
@@
function display_extensions()
function company_extensions($id)
{
function company_extensions($id)
{
- global $table_style
, $tabs
;
+ global $table_style;
start_table($table_style);
start_table($table_style);
@@
-269,7
+254,8
@@
function company_extensions($id)
{
alt_table_row_color($k);
label_cell($mod['name']);
{
alt_table_row_color($k);
label_cell($mod['name']);
- label_cell($mod['type'] == 'module' ? $mod['title'] : $tabs[$mod['tab']]);
+ label_cell( $mod['type'] == 'module' ?
+ $mod['title'] : access_string($_SESSION['App']->applications[$mod['tab']]->name, true));
$ttl = access_string($mod['title']);
label_cell($ttl[0]);
check_cells(null, 'Active'.$i, @$mod['active'] ? 1:0,
$ttl = access_string($mod['title']);
label_cell($ttl[0]);
check_cells(null, 'Active'.$i, @$mod['active'] ? 1:0,
@@
-310,7
+296,7
@@
function display_ext_edit($selected_id)
text_row_ex(_("Name"), 'name', 30);
text_row_ex(_("Folder"), 'path', 20);
text_row_ex(_("Name"), 'name', 30);
text_row_ex(_("Folder"), 'path', 20);
- tab_list_row(_("Menu Tab"), 'tab', null);
+ tab_list_row(_("Menu Tab"), 'tab', null
, true
);
text_row_ex(_("Menu Link Text"), 'title', 30);
record_status_list_row(_("Default status"), 'active');
text_row_ex(_("Menu Link Text"), 'title', 30);
record_status_list_row(_("Default status"), 'active');