X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_module.php;h=5bce6ba6c509bf96a51de8834e4b00ab0eb8fa02;hb=2a0f29497517eca1cde8b2832da5761edefb2268;hp=1e0017682268c34a541a84328421b8b90edc6f5d;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git diff --git a/admin/inst_module.php b/admin/inst_module.php index 1e001768..5bce6ba6 100644 --- a/admin/inst_module.php +++ b/admin/inst_module.php @@ -1,21 +1,25 @@ . +***********************************************************************/ +$page_security = 'SA_CREATEMODULES'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Install/Update Modules")); +page(_("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 . "/modules/installed_modules.php"); include_once($path_to_root . "/includes/ui.inc"); -$tabs = array('orders', 'AP', 'stock', 'manuf', 'proj', 'GL', 'system'); -$names = array(_("Sales"), _("Purchases"), _("Items and Inventory"), _("Manufacturing"), - _("Dimensions"), _("Banking and General Ledger"), _("Setup")); - //--------------------------------------------------------------------------------------------- if (isset($_GET['selected_id'])) @@ -30,148 +34,31 @@ else $selected_id = -1; //--------------------------------------------------------------------------------------------- - -function get_tab_title($tab) -{ - global $tabs, $names; - for ($i = 0; $i < count($tabs); $i++) - { - if ($tabs[$i] == $tab) - return $names[$i]; - } - return ""; -} - -function tab_list_row($label, $name, $selected) +function check_data($id, $exts) { - global $tabs, $names; - echo "\n"; - if ($label != null) - echo "$label\n"; - if ($selected == null) - $selected = (!isset($_POST[$name]) ? "orders" : $_POST[$name]); - echo "\n"; - echo "\n"; -} - -//--------------------------------------------------------------------------------------------- - -function check_data() -{ - if ($_POST['name'] == "" || $_POST['path'] == "") + if ($_POST['name'] == "") { + display_error(_("Extension name cannot be empty.")); return false; - return true; -} - -/** - * @return Returns the array sorted as required - * @param $aryData Array containing data to sort - * @param $strIndex name of column to use as an index - * @param $strSortBy Column to sort the array by - * @param $strSortType String containing either asc or desc [default to asc] - * @desc Naturally sorts an array using by the column $strSortBy - */ -function array_natsort($aryData, $strIndex, $strSortBy, $strSortType=false) -{ - // if the parameters are invalid - if (!is_array($aryData) || !$strIndex || !$strSortBy) - // return the array - return $aryData; - - // create our temporary arrays - $arySort = $aryResult = array(); - - // loop through the array - foreach ($aryData as $aryRow) - // set up the value in the array - $arySort[$aryRow[$strIndex]] = $aryRow[$strSortBy]; - - // apply the natural sort - natsort($arySort); - - // if the sort type is descending - if ($strSortType=="desc") - // reverse the array - arsort($arySort); - - // loop through the sorted and original data - foreach ($arySort as $arySortKey => $arySorted) - foreach ($aryData as $aryOriginal) - // if the key matches - if ($aryOriginal[$strIndex]==$arySortKey) - // add it to the output array - array_push($aryResult, $aryOriginal); - - // return the return - return $aryResult; -} - -function write_modules() -{ - global $path_to_root, $installed_modules; - - $mods = array_natsort($installed_modules, 'tab', 'tab'); - $installed_modules = $mods; - //reset($installed_languages); - $n = count($installed_modules); - $msg = " 0) - $msg .= "\t0 => "; - for ($i = 0; $i < $n; $i++) - { - if ($i > 0) - $msg .= "\t\tarray "; - else - $msg .= "array "; - $msg .= "('tab' => '" . $installed_modules[$i]['tab'] . "', "; - $msg .= "'name' => '" . $installed_modules[$i]['name'] . "', "; - $msg .= "'path' => '" . $installed_modules[$i]['path'] . "', "; - $msg .= "'filename' => '" . $installed_modules[$i]['filename'] . "'"; - $msg .= "),\n"; } - $msg .= "\t);\n?>"; - - $filename = $path_to_root . "/modules/installed_modules.php"; - // Check if the file exists and is writable first. - if (file_exists($filename) && is_writable($filename)) - { - if (!$zp = fopen($filename, 'w')) - { - display_error(_("Cannot open the modules file - ") . $filename); + foreach($exts as $n =>$ext) { + if ($_POST['name'] == $ext['name'] && $id != $n) { + display_error(_("Extension name have to be unique.")); return false; } - else - { - if (!fwrite($zp, $msg)) - { - display_error(_("Cannot write to the modules file - ") . $filename); - fclose($zp); - return false; - } - // Close file - fclose($zp); - } } - else - { - display_error(_("The modules file ") . $filename . _(" is not writable. Change its permissions so it is, then re-run the operation.")); + + if ($_POST['title'] == "") { + display_error(_("Extension title cannot be empty.")); + return false; + } + if ($_POST['path'] == "") { + display_error(_("Extension folder name cannot be empty.")); return false; } + if ($id == -1 && !is_uploaded_file($_FILES['uploadfile']['tmp_name'])) { + display_error(_("You have to select plugin file to upload")); + return false; + } return true; } @@ -179,16 +66,22 @@ function write_modules() function handle_submit() { - global $path_to_root, $installed_modules, $db_connections; + global $path_to_root, $db_connections, $selected_id; - if (!check_data()) + $extensions = get_company_extensions(); + if (!check_data($selected_id, $extensions)) return false; $id = $_GET['id']; - $installed_modules[$id]['tab'] = $_POST['tab']; - $installed_modules[$id]['name'] = $_POST['name']; - $installed_modules[$id]['path'] = $_POST['path']; + $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']; + + // Currently we support only plugin extensions here. + $extensions[$id]['type'] = 'plugin'; $directory = $path_to_root . "/modules/" . $_POST['path']; if (!file_exists($directory)) { @@ -196,7 +89,7 @@ function handle_submit() } if (is_uploaded_file($_FILES['uploadfile']['tmp_name'])) { - $installed_modules[$id]['filename'] = $_FILES['uploadfile']['name']; + $extensions[$id]['filename'] = $_FILES['uploadfile']['name']; $file1 = $_FILES['uploadfile']['tmp_name']; $file2 = $directory . "/".$_FILES['uploadfile']['name']; if (file_exists($file2)) @@ -204,7 +97,7 @@ function handle_submit() move_uploaded_file($file1, $file2); } else - $installed_modules[$id]['filename'] = $_POST['filename']; + $extensions[$id]['filename'] = get_post('filename'); if (is_uploaded_file($_FILES['uploadfile2']['tmp_name'])) { $file1 = $_FILES['uploadfile2']['tmp_name']; @@ -215,7 +108,20 @@ function handle_submit() $db_name = $_SESSION["wa_current_user"]->company; db_import($file2, $db_connections[$db_name]); } - if (!write_modules()) + + if (is_uploaded_file($_FILES['uploadfile3']['tmp_name'])) + { + $extensions[$id]['acc_file'] = $_FILES['uploadfile3']['name']; + $file1 = $_FILES['uploadfile3']['tmp_name']; + $file2 = $directory . "/".$_FILES['uploadfile3']['name']; + if (file_exists($file2)) + unlink($file2); + move_uploaded_file($file1, $file2); + } + else + $extensions[$id]['acc_file'] = get_post('acc_file'); + + if (!write_extensions($extensions)) return false; return true; } @@ -224,11 +130,19 @@ function handle_submit() function handle_delete() { - global $path_to_root, $installed_modules; + global $path_to_root, $db_connections; + + $extensions = get_company_extensions(); $id = $_GET['id']; - $path = $installed_modules[$id]['path']; + $path = $extensions[$id]['path']; + + 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)) { @@ -241,64 +155,138 @@ function handle_delete() } rmdir($filename); - unset($installed_modules[$id]); - $mods = array_values($installed_modules); - $installed_modules = $mods; + $ident = $extensions[$id]['name']; + unset($extensions[$id]); + $mods = array_values($extensions); + $extensions = $mods; - if (!write_modules()) + 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); + } meta_forward($_SERVER['PHP_SELF']); } //--------------------------------------------------------------------------------------------- -function display_modules() +function display_extensions() { - global $table_style, $installed_modules; + global $table_style, $tabs; echo " "; start_table($table_style); - $th = array(_("Tab"), _("Name"), _("Folder"), _("Filename"), "", ""); + $th = array(_("Name"),_("Tab"), _("Link text"), _("Folder"), _("Filename"), + _("Access extensions"),"", ""); table_header($th); $k = 0; - $mods = $installed_modules; + $mods = get_company_extensions(); $n = count($mods); for ($i = 0; $i < $n; $i++) { + $is_mod = $mods[$i]['type'] == 'module'; alt_table_row_color($k); - - label_cell(get_tab_title($mods[$i]['tab'])); 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']); - edit_link_cell("selected_id=" . $i); - label_cell("" . _("Delete") . ""); + label_cell(@$mods[$i]['acc_file']); + $edit = _("Edit"); + $delete = _("Delete"); + if ($is_mod) + { + label_cell(''); // not implemented (yet) + label_cell(''); + } + else + { + if (user_graphic_links()) + { + $edit = set_icon(ICON_EDIT, $edit); + $delete = set_icon(ICON_DELETE, $delete); + } + label_cell("$edit"); + label_cell("$delete"); + } end_row(); } end_table(); } +function company_extensions($id) +{ + global $table_style, $tabs; + + start_table($table_style); + + $th = array(_("Name"),_("Tab"), _("Link text"), _("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) { + foreach($exts as $ext) + if ($ext['name'] == $ins['name']) { + $mods[$key]['active'] = @$ext['active']; + continue 2; + } + } + + table_header($th); + $k = 0; + $n = count($mods); + for ($i = 0; $i < $n; $i++) + { + 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, + false, false, "align='center'"); + end_row(); + } + + end_table(1); + submit_center('Update', _('Update'), true, false, 'default'); +} + //--------------------------------------------------------------------------------------------- -function display_module_edit($selected_id) +function display_ext_edit($selected_id) { - global $installed_modules, $table_style2; + global $table_style2; + $extensions = get_company_extensions(); if ($selected_id != -1) $n = $selected_id; else - $n = count($installed_modules); + $n = count($extensions); - start_form(true, true); echo "