gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-15 06:01:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

no need to instanciate Extension Mgr, as it is done inc.Extension.php

Browse Source
This commit is contained in:
Uwe Steinmann 2018-03-13 18:38:30 +01:00
parent 6d802ec7c6
commit ba53d01096
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
op/op.ExtensionMgr.php
View File

@ -49,7 +49,7 @@ if ($action == "download") {
if (!file_exists($settings->_rootDir.'/ext/'.$extname) ) { if (!file_exists($settings->_rootDir.'/ext/'.$extname) ) {
UI::exitError(getMLText("admin_tools"),getMLText("missing_extension")); UI::exitError(getMLText("admin_tools"),getMLText("missing_extension"));
} }
$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir); // $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extMgr); $controller->setParam('extmgr', $extMgr);
$controller->setParam('extname', $extname); $controller->setParam('extname', $extname);
if (!$controller($_POST)) { if (!$controller($_POST)) {
@ -58,7 +58,7 @@ if ($action == "download") {
add_log_line(); add_log_line();
} /* }}} */ } /* }}} */
elseif ($action == "refresh") { /* {{{ */ elseif ($action == "refresh") { /* {{{ */
$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir); // $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$extMgr->createExtensionConf(); $extMgr->createExtensionConf();
$controller->setParam('extmgr', $extMgr); $controller->setParam('extmgr', $extMgr);
if (!$controller($_POST)) { if (!$controller($_POST)) {
@ -75,7 +75,7 @@ elseif ($action == "upload") { /* {{{ */
if($_FILES['userfile']['type'] != 'application/zip') { if($_FILES['userfile']['type'] != 'application/zip') {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
} }
$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir); // $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extMgr); $controller->setParam('extmgr', $extMgr);
$controller->setParam('file', $_FILES['userfile']['tmp_name']); $controller->setParam('file', $_FILES['userfile']['tmp_name']);
if (!$controller($_POST)) { if (!$controller($_POST)) {
@ -94,7 +94,7 @@ elseif ($action == "import") { /* {{{ */
$file = tempnam(sys_get_temp_dir(), ''); $file = tempnam(sys_get_temp_dir(), '');
file_put_contents($file, $content); file_put_contents($file, $content);
$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir); // $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extMgr); $controller->setParam('extmgr', $extMgr);
$controller->setParam('file', $file); $controller->setParam('file', $file);
$_POST['action'] = 'upload'; $_POST['action'] = 'upload';