X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_module.php;h=52190ca7eabe2fe968df80479462ce59eb36f2d8;hb=380ae03e2df9602d07d156ae93b87cbe59b01b3a;hp=5bce6ba6c509bf96a51de8834e4b00ab0eb8fa02;hpb=2072f365c27558bb3f93bfc4480a72ab539b406a;p=fa-stable.git
diff --git a/admin/inst_module.php b/admin/inst_module.php
index 5bce6ba6..52190ca7 100644
--- a/admin/inst_module.php
+++ b/admin/inst_module.php
@@ -12,28 +12,19 @@
$page_security = 'SA_CREATEMODULES';
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root."/includes/packages.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 . "/admin/db/maintenance_db.inc");
include_once($path_to_root . "/includes/ui.inc");
+simple_page_mode(true);
//---------------------------------------------------------------------------------------------
-
-if (isset($_GET['selected_id']))
-{
- $selected_id = $_GET['selected_id'];
-}
-elseif (isset($_POST['selected_id']))
-{
- $selected_id = $_POST['selected_id'];
-}
-else
- $selected_id = -1;
-
-//---------------------------------------------------------------------------------------------
+// Check third-party extension parameters
+//
function check_data($id, $exts)
{
if ($_POST['name'] == "") {
@@ -66,21 +57,29 @@ function check_data($id, $exts)
function handle_submit()
{
- global $path_to_root, $db_connections, $selected_id;
+ global $path_to_root, $db_connections, $selected_id, $next_extension_id;
$extensions = get_company_extensions();
if (!check_data($selected_id, $extensions))
return false;
+ $id = $selected_id==-1 ? $next_extension_id : $selected_id;
- $id = $_GET['id'];
+ if ($selected_id != -1 && $extensions[$id]['type'] != 'plugin') {
+ display_error(_('Module installation support is not implemented.'));
+ return;
+ }
- $extensions[$id]['tab'] = $_POST['tab'];
$extensions[$id]['name'] = $_POST['name'];
- $extensions[$id]['path'] = $_POST['path'];
- $extensions[$id]['title'] = $_POST['title'];
- $extensions[$id]['active'] = $_POST['active'];
+ $extensions[$id]['package'] = '';
+ $extensions[$id]['version'] = '';
+ $extensions[$id]['active'] = check_value('active');
+ $entry = $selected_id == -1 ? array() : $extensions[$id]['entries'][0];
+
+ $entry['tab_id'] = $_POST['tab'];
+ $entry['title'] = $_POST['title'];
+ $entry['section'] = 2; // menu section aka module
- // Currently we support only plugin extensions here.
+ // Only plugin extensions can be installed manually.
$extensions[$id]['type'] = 'plugin';
$directory = $path_to_root . "/modules/" . $_POST['path'];
if (!file_exists($directory))
@@ -89,7 +88,7 @@ function handle_submit()
}
if (is_uploaded_file($_FILES['uploadfile']['tmp_name']))
{
- $extensions[$id]['filename'] = $_FILES['uploadfile']['name'];
+ $entry['url'] = '/modules/'.$_POST['path'].'/'.$_FILES['uploadfile']['name'];
$file1 = $_FILES['uploadfile']['tmp_name'];
$file2 = $directory . "/".$_FILES['uploadfile']['name'];
if (file_exists($file2))
@@ -97,21 +96,18 @@ function handle_submit()
move_uploaded_file($file1, $file2);
}
else
- $extensions[$id]['filename'] = get_post('filename');
+ $entry['url'] = '/modules/'.$_POST['path'].'/'.get_post('filename');
+
if (is_uploaded_file($_FILES['uploadfile2']['tmp_name']))
{
$file1 = $_FILES['uploadfile2']['tmp_name'];
- $file2 = $directory . "/".$_FILES['uploadfile2']['name'];
- if (file_exists($file2))
- unlink($file2);
- move_uploaded_file($file1, $file2);
$db_name = $_SESSION["wa_current_user"]->company;
- db_import($file2, $db_connections[$db_name]);
+ db_import($file1, $db_connections[$db_name]);
}
if (is_uploaded_file($_FILES['uploadfile3']['tmp_name']))
{
- $extensions[$id]['acc_file'] = $_FILES['uploadfile3']['name'];
+ $extensions[$id]['acc_file'] = '/modules/'.$_POST['path'].'/'.$_FILES['uploadfile3']['name'];
$file1 = $_FILES['uploadfile3']['tmp_name'];
$file2 = $directory . "/".$_FILES['uploadfile3']['name'];
if (file_exists($file2))
@@ -119,133 +115,137 @@ function handle_submit()
move_uploaded_file($file1, $file2);
}
else
- $extensions[$id]['acc_file'] = get_post('acc_file');
+ $extensions[$id]['acc_file'] = '/modules/'.$_POST['path'].'/'.get_post('acc_file');
+
+ // security area guess for plugins
+ $exttext = file_get_contents($path_to_root.$entry['url']);
+ $area = 'SA_OPEN';
+ if (preg_match('/.*\$page_security\s*=\s*[\'"]([^\'"]*)/', $exttext, $match)) {
+ $area = trim($match[1]);
+ }
+ $entry['access'] = $area;
+
+ $extensions[$id]['entries'] = array($entry);
- if (!write_extensions($extensions))
+ if ($selected_id == -1)
+ {
+ $next_extension_id++;
+ }
+ if (!update_extensions($extensions))
return false;
return true;
}
-//---------------------------------------------------------------------------------------------
-
-function handle_delete()
+function handle_delete($id)
{
- global $path_to_root, $db_connections;
+ global $path_to_root;
$extensions = get_company_extensions();
- $id = $_GET['id'];
-
- $path = $extensions[$id]['path'];
+ if ($extensions[$id]['package'] != '') {
+ if (!uninstall_package($extensions[$id]['package']))
+ return false;
+ } else {
- if ($extensions[$id]['type'] != 'plugin') {
- display_error(_('Module installation support is not implemented yet. You have to do it manually.'));
- return;
- }
-
- $filename = "$path_to_root/modules/$path";
- if ($h = opendir($filename))
- {
- while (($file = readdir($h)) !== false)
- {
- if (is_file("$filename/$file"))
- unlink("$filename/$file");
- }
- closedir($h);
+ $dirname = dirname(@$extensions[$id]['entries'][0]['url']);
+ if ($dirname) {
+ $dirname = $path_to_root.$dirname;
+ flush_dir($dirname, true);
+ rmdir($dirname);
+ }
}
- rmdir($filename);
-
- $ident = $extensions[$id]['name'];
unset($extensions[$id]);
- $mods = array_values($extensions);
- $extensions = $mods;
-
- if (!write_extensions($extensions))
- return;
-
- // update per company files
- $cnt = count($db_connections);
- for($i = 0; $i < $cnt; $i++)
- {
- $exts = get_company_extensions($i);
- foreach($exts as $key => $ext) {
- if ($ext['name'] == $ident) {
- unset($exts[$key]);
- break;
- }
- }
- write_extensions($exts, $i);
+ if (update_extensions($extensions)) {
+ display_notification(_("Selected extension has been successfully deleted"));
}
- meta_forward($_SERVER['PHP_SELF']);
+ return true;
+}
+//
+// Helper for formating menu tabs/entries to be displayed in extension table
+//
+function fmt_titles($defs)
+{
+ if (!$defs) return '';
+ foreach($defs as $def) {
+ $str[] = access_string($def['title'], true);
+ }
+ return implode('
', array_values($str));
}
-
//---------------------------------------------------------------------------------------------
-
+//
+// Display list of all extensions - installed and available from repository
+//
function display_extensions()
{
- global $table_style, $tabs;
-
- echo "
- ";
- start_table($table_style);
- $th = array(_("Name"),_("Tab"), _("Link text"), _("Folder"), _("Filename"),
- _("Access extensions"),"", "");
+
+ div_start('ext_tbl');
+ start_table(TABLESTYLE);
+
+ $th = array(_("Extension"),_("Modules provided"), _("Options provided"),
+ _("Installed"), _("Available"), "", "");
table_header($th);
$k = 0;
- $mods = get_company_extensions();
- $n = count($mods);
- for ($i = 0; $i < $n; $i++)
+ $mods = get_extensions_list();
+
+ foreach($mods as $pkg_name => $ext)
{
- $is_mod = $mods[$i]['type'] == 'module';
- alt_table_row_color($k);
- label_cell($mods[$i]['name']);
- label_cell( $is_mod ? $mods[$i]['title'] : $tabs[$mods[$i]['tab']]);
- $ttl = access_string($mods[$i]['title']);
- label_cell($ttl[0]);
- label_cell($mods[$i]['path']);
- label_cell($mods[$i]['filename']);
- label_cell(@$mods[$i]['acc_file']);
- $edit = _("Edit");
- $delete = _("Delete");
- if ($is_mod)
- {
- label_cell(''); // not implemented (yet)
- label_cell('');
- }
+ $available = @$ext['available'];
+ $installed = @$ext['version'];
+ $id = @$ext['local_id'];
+ $is_mod = $ext['type'] == 'module';
+
+ $entries = fmt_titles(@$ext['entries']);
+ $tabs = fmt_titles(@$ext['tabs']);
+
+ alt_table_row_color($k);
+// label_cell(is_array($ext['Descr']) ? $ext['Descr'][0] : $ext['Descr']);
+ label_cell($available ? get_package_view_str($pkg_name, $ext['name']) : $ext['name']);
+ label_cell($tabs);
+ label_cell($entries);
+
+ label_cell($id === null ? _("None") :
+ ($available && $installed ? $installed : _("Unknown")));
+ label_cell($available ? $available : _("None"));
+
+ if (!$available && $ext['type'] == 'plugin') // third-party plugin
+ button_cell('Edit'.$id, _("Edit"), _('Edit third-party extension parameters.'),
+ ICON_EDIT);
+ elseif (check_pkg_upgrade($installed, $available)) // outdated or not installed extension in repo
+ button_cell('Update'.$pkg_name, $installed ? _("Update") : _("Install"),
+ _('Upload and install latest extension package'), ICON_DOWN);
else
- {
- if (user_graphic_links())
- {
- $edit = set_icon(ICON_EDIT, $edit);
- $delete = set_icon(ICON_DELETE, $delete);
- }
- label_cell("$edit");
- label_cell("$delete");
- }
+ label_cell('');
+
+ if ($id !== null) {
+ delete_button_cell('Delete'.$id, _('Delete'));
+ submit_js_confirm('Delete'.$id,
+ sprintf(_("You are about to remove package \'%s\'.\nDo you want to continue ?"),
+ $ext['name']));
+ } else
+ label_cell('');
+
end_row();
}
- end_table();
-}
+ end_table(1);
+
+ submit_center_first('Refresh', _("Update"), '', null);
+ submit_center_last('Add', _("Add third-party plugin"), '', false);
+ div_end();
+}
+//---------------------------------------------------------------------------------
+//
+// Get all installed extensions and display
+// with current status stored in company directory.
+//
function company_extensions($id)
{
- global $table_style, $tabs;
-
- start_table($table_style);
+ start_table(TABLESTYLE);
- $th = array(_("Name"),_("Tab"), _("Link text"), _("Active"));
+ $th = array(_("Extension"),_("Modules provided"), _("Options provided"), _("Active"));
- // get all available extensions and display
- // with current status stored in company directory.
-
$mods = get_company_extensions();
$exts = get_company_extensions($id);
foreach($mods as $key => $ins) {
@@ -255,84 +255,97 @@ function company_extensions($id)
continue 2;
}
}
-
+ $mods = array_natsort($mods, null, 'name');
table_header($th);
$k = 0;
- $n = count($mods);
- for ($i = 0; $i < $n; $i++)
+ foreach($mods as $i => $mod)
{
alt_table_row_color($k);
- label_cell($mods[$i]['name']);
- label_cell($mods[$i]['type'] == 'module' ? $mods[$i]['title'] : $tabs[$mods[$i]['tab']]);
- $ttl = access_string($mods[$i]['title']);
- label_cell($ttl[0]);
- check_cells(null, 'Active'.$i, @$mods[$i]['active'] ? 1:0,
+ label_cell($mod['name']);
+ $entries = fmt_titles(@$mod['entries']);
+ $tabs = fmt_titles(@$mod['tabs']);
+ label_cell($tabs);
+ label_cell($entries);
+
+ check_cells(null, 'Active'.$i, @$mod['active'] ? 1:0,
false, false, "align='center'");
end_row();
}
end_table(1);
- submit_center('Update', _('Update'), true, false, 'default');
+ submit_center('Refresh', _('Update'), true, false, 'default');
}
//---------------------------------------------------------------------------------------------
-
+//
+// Third-party plugin installation
+//
function display_ext_edit($selected_id)
{
- global $table_style2;
+ global $Mode;
$extensions = get_company_extensions();
- if ($selected_id != -1)
- $n = $selected_id;
- else
- $n = count($extensions);
-
- echo "
- ";
-
- start_table($table_style2);
+ start_table(TABLESTYLE2);
if ($selected_id != -1 && $extensions[$selected_id]['type'] == 'plugin')
{
- $mod = $extensions[$selected_id];
- $_POST['tab'] = $mod['tab'];
- $_POST['name'] = $mod['name'];
- $_POST['title'] = $mod['title'];
- $_POST['path'] = $mod['path'];
- $_POST['filename'] = $mod['filename'];
- $_POST['acc_file'] = @$mod['acc_file'];
+ if ($Mode == 'Edit') {
+ $mod = $extensions[$selected_id];
+ $entry = $mod['entries'][0];
+
+ $_POST['name'] = $mod['name'];
+ $_POST['tab'] = $entry['tab_id'];
+ $_POST['title'] = $entry['title'];
+ $_POST['path'] = substr(dirname($entry['url']), 9); //strip '/modules/'
+ $_POST['filename'] = basename($entry['url']);
+ $_POST['acc_file'] = @$mod['acc_file'] ? basename($mod['acc_file']) : null;
+ hidden('filename', $_POST['filename']);
+ hidden('acc_file', $_POST['acc_file']);
+ }
hidden('selected_id', $selected_id);
- hidden('filename', $_POST['filename']);
- hidden('acc_file', $_POST['acc_file']);
}
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');
- label_row(_("Module File"), "");
- label_row(_("Access Levels Extensions"), "");
- label_row(_("SQL File"), "");
+ file_row(_("Module File"), 'uploadfile');
+ file_row(_("Access Levels Extensions"), 'uploadfile3');
+ file_row(_("SQL File"), 'uploadfile2');
end_table(0);
display_note(_("Select your module PHP file from your local harddisk."), 0, 1);
-
- echo "