X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_module.php;h=1e0017682268c34a541a84328421b8b90edc6f5d;hb=4e5985eb8175571a2b99b73ddf9f732e23667437;hp=5f8e236361d36e44c3b4e8195750f6938cea03a6;hpb=cb8cf10b735342399abfce9384565a7474b92947;p=fa-stable.git diff --git a/admin/inst_module.php b/admin/inst_module.php index 5f8e2363..1e001768 100644 --- a/admin/inst_module.php +++ b/admin/inst_module.php @@ -1,6 +1,6 @@ " . $names[$i]. "\n"; - else + else echo "\n"; - } + } echo "\n"; echo "\n"; } @@ -65,6 +66,8 @@ function tab_list_row($label, $name, $selected) function check_data() { + if ($_POST['name'] == "" || $_POST['path'] == "") + return false; return true; } @@ -82,15 +85,15 @@ function array_natsort($aryData, $strIndex, $strSortBy, $strSortType=false) 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); @@ -98,7 +101,7 @@ function array_natsort($aryData, $strIndex, $strSortBy, $strSortType=false) if ($strSortType=="desc") // reverse the array arsort($arySort); - + // loop through the sorted and original data foreach ($arySort as $arySortKey => $arySorted) foreach ($aryData as $aryOriginal) @@ -109,7 +112,7 @@ function array_natsort($aryData, $strIndex, $strSortBy, $strSortType=false) // return the return return $aryResult; -} +} function write_modules() { @@ -118,16 +121,17 @@ function write_modules() $mods = array_natsort($installed_modules, 'tab', 'tab'); $installed_modules = $mods; //reset($installed_languages); - $n = count($installed_modules); + $n = count($installed_modules); $msg = " "; + if ($n > 0) + $msg .= "\t0 => "; for ($i = 0; $i < $n; $i++) { if ($i > 0) @@ -144,16 +148,16 @@ function write_modules() $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 (file_exists($filename) && is_writable($filename)) { - if (!$zp = fopen($filename, 'w')) + if (!$zp = fopen($filename, 'w')) { display_error(_("Cannot open the modules file - ") . $filename); return false; - } - else + } + else { - if (!fwrite($zp, $msg)) + if (!fwrite($zp, $msg)) { display_error(_("Cannot write to the modules file - ") . $filename); fclose($zp); @@ -162,8 +166,8 @@ function write_modules() // Close file fclose($zp); } - } - else + } + else { display_error(_("The modules file ") . $filename . _(" is not writable. Change its permissions so it is, then re-run the operation.")); return false; @@ -175,7 +179,7 @@ function write_modules() function handle_submit() { - global $path_to_root, $installed_modules; + global $path_to_root, $installed_modules, $db_connections; if (!check_data()) return false; @@ -185,11 +189,11 @@ function handle_submit() $installed_modules[$id]['tab'] = $_POST['tab']; $installed_modules[$id]['name'] = $_POST['name']; $installed_modules[$id]['path'] = $_POST['path']; - $directory = $path_to_root . "/modules/" . $_POST['path']; + $directory = $path_to_root . "/modules/" . $_POST['path']; if (!file_exists($directory)) { mkdir($directory); - } + } if (is_uploaded_file($_FILES['uploadfile']['tmp_name'])) { $installed_modules[$id]['filename'] = $_FILES['uploadfile']['name']; @@ -201,6 +205,16 @@ function handle_submit() } else $installed_modules[$id]['filename'] = $_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]); + } if (!write_modules()) return false; return true; @@ -212,13 +226,13 @@ function handle_delete() { global $path_to_root, $installed_modules; - $id = $_GET['id']; + $id = $_GET['id']; $path = $installed_modules[$id]['path']; - $filename = "$path_to_root/modules/$path"; - if ($h = opendir($filename)) + $filename = "$path_to_root/modules/$path"; + if ($h = opendir($filename)) { - while (($file = readdir($h)) !== false) + while (($file = readdir($h)) !== false) { if (is_file("$filename/$file")) unlink("$filename/$file"); @@ -283,7 +297,7 @@ function display_module_edit($selected_id) $n = $selected_id; else $n = count($installed_modules); - + start_form(true, true); echo " @@ -293,10 +307,10 @@ function display_module_edit($selected_id) document.forms[0].submit() } "; - + start_table($table_style2); - if ($selected_id != -1) + if ($selected_id != -1) { $mod = $installed_modules[$selected_id]; $_POST['tab'] = $mod['tab']; @@ -305,16 +319,17 @@ function display_module_edit($selected_id) $_POST['filename'] = $mod['filename']; hidden('selected_id', $selected_id); hidden('filename', $_POST['filename']); - } + } tab_list_row(_("Menu Tab"), 'tab', null); text_row_ex(_("Name"), 'name', 30); text_row_ex(_("Folder"), 'path', 20); label_row(_("Module File"), ""); + label_row(_("SQL File"), ""); end_table(0); display_note(_("Select your module PHP file from your local harddisk."), 0, 1); - echo "
"; + echo "
"; end_form(); @@ -325,18 +340,18 @@ function display_module_edit($selected_id) if (isset($_GET['c'])) { - if ($_GET['c'] == 'df') + if ($_GET['c'] == 'df') { handle_delete(); } - if ($_GET['c'] == 'u') + if ($_GET['c'] == 'u') { - if (handle_submit()) + if (handle_submit()) { //meta_forward($_SERVER['PHP_SELF']); } - } + } } //---------------------------------------------------------------------------------------------