gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-27 10:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2025-11-08 15:56:46 +01:00
commit 161e4b2825
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
op/op.ExtensionMgr.php
View File

@ -56,8 +56,8 @@ if ($action == "download") { /* {{{ */
if (!file_exists($settings->_rootDir.'/ext/'.$extname) ) {
UI::exitError(getMLText("admin_tools"),getMLText("missing_extension"));
}
// $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extMgr);
// $extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extmgr);
$controller->setParam('extname', $extname);
if (!$controller()) {
echo json_encode(array('success'=>false, 'msg'=>'Could not download extension'));
@ -65,11 +65,11 @@ if ($action == "download") { /* {{{ */
add_log_line();
} /* }}} */
elseif ($action == "refresh") { /* {{{ */
// $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$extMgr->createExtensionConf();
$controller->setParam('extmgr', $extMgr);
// $extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$extmgr->createExtensionConf();
$controller->setParam('extmgr', $extmgr);
if (!$controller()) {
UI::exitError(getMLText("admin_tools"),$extMgr->getErrorMsg());
UI::exitError(getMLText("admin_tools"),$extmgr->getErrorMsg());
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_refresh')));
add_log_line();
@ -79,7 +79,7 @@ elseif ($action == "upload") { /* {{{ */
if(!$settings->_enableExtensionImport) {
UI::exitError(getMLText("admin_tools"),getMLText("extension_mgr_upload_disabled"));
}
if(!$extMgr->isWritableExtDir()) {
if(!$extmgr->isWritableExtDir()) {
UI::exitError(getMLText("admin_tools"),getMLText("extension_mgr_no_upload"));
}
if($_FILES['userfile']['error']) {
@ -88,8 +88,8 @@ elseif ($action == "upload") { /* {{{ */
if(!in_array($_FILES['userfile']['type'], array('application/zip', 'application/x-zip-compressed'))) {
UI::exitError(getMLText("admin_tools"),getMLText("extension_mgr_no_zipfile"));
}
// $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extMgr);
// $extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extmgr);
$controller->setParam('file', $_FILES['userfile']['tmp_name']);
if (!$controller()) {
UI::exitError(getMLText("admin_tools"),$controller->getErrorMsg());
@ -105,7 +105,7 @@ elseif ($action == "import") { /* {{{ */
if(!$_POST['url']) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
$file = $extMgr->getExtensionFromRepository($_POST['url']);
$file = $extmgr->getExtensionFromRepository($_POST['url']);
/*
$reposurl = $settings->_repositoryUrl;
$content = file_get_contents($reposurl."/".$_POST['url']);
@ -113,8 +113,8 @@ elseif ($action == "import") { /* {{{ */
file_put_contents($file, $content);
*/
// $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extMgr);
// $extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extmgr);
$controller->setParam('file', $file);
$controller->setParam('action', 'upload');
if (!$controller()) {
@ -128,7 +128,7 @@ elseif ($action == "import") { /* {{{ */
} /* }}} */
elseif ($action == "getlist") { /* {{{ */
$v = new SeedDMS_Version();
$controller->setParam('extmgr', $extMgr);
$controller->setParam('extmgr', $extmgr);
$controller->setParam('forceupdate', (isset($_POST['forceupdate']) && $_POST['forceupdate']) ? true : false);
$controller->setParam('version', $v->version());
if (!$controller()) {
@ -147,7 +147,7 @@ elseif ($action == "toggle") { /* {{{ */
if (!file_exists($settings->_rootDir.'/ext/'.$extname) ) {
UI::exitError(getMLText("admin_tools"),getMLText("missing_extension"));
}
$controller->setParam('extmgr', $extMgr);
$controller->setParam('extmgr', $extmgr);
$controller->setParam('extname', $extname);
if (!$controller()) {
echo json_encode(array('success'=>false, 'msg'=>getMLText('extinsion_toggle_error')));
@ -155,7 +155,7 @@ elseif ($action == "toggle") { /* {{{ */
if($settings->extensionIsDisabled($extname))
echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_is_off_now')));
else {
$ret = $extMgr->migrate($extname, $settings, $dms, $logger);
$ret = $extmgr->migrate($extname, $settings, $dms, $logger);
if($ret !== null) {
if($ret === true)
echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_migration_success')));