add getRemoveUrlByPath(), checking dependency when dispAutoinstallAdminUninstall

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8642 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-07-26 07:04:49 +00:00
parent 9acd474c52
commit 5f7be4a7f1
15 changed files with 153 additions and 70 deletions

View file

@ -30,7 +30,7 @@
$this->setMessage("success_updated", 'update');
$this->setRedirectUrl(Context::get('error_return_url'));
}
function _updateinfo(){
$oModel = &getModel('autoinstall');
$item = $oModel->getLatestPackage();
@ -64,7 +64,7 @@
$type = $oModel->getTypeFromPath($package->path);
if($type == "core")
{
$version = __ZBXE_VERSION__;
$version = __ZBXE_VERSION__;
}
else
{
@ -85,7 +85,7 @@
case "style":
case "m.skin":
$type = "skin";
case "skin":
case "skin":
case "widgetstyle":
$config_file = "/skin.xml";
break;
@ -155,9 +155,9 @@
$output = $oModuleInstaller->install();
if(!$output->toBool()) return $output;
}
$this->_updateinfo();
$this->setMessage('success_installed', 'update');
$this->setRedirectUrl(preg_replace('/act=[^&]*/', 'act=dispAutoinstallAdminIndex', Context::get('error_return_url')));
}
@ -249,7 +249,7 @@
if(!$output->toBool()) return $output;
$this->_updateinfo();
$this->setMessage('success_deleted', 'update');
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstalledPackages'));
}