merge 1.4.5.10

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9272 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 08:23:36 +00:00
commit 105e3f4843
66 changed files with 4864 additions and 214 deletions

View file

@ -97,6 +97,7 @@
$title = $xmlDoc->{$type}->title->body;
$installed[$key]->title = $title;
}
Context::set('installed', $installed);
foreach($installed as $key=>$val)
@ -140,6 +141,9 @@
Context::set('page_navigation', $output->page_navigation);
$this->setTemplateFile('index');
$security = new Security();
$security->encodeHTML('item_list..');
}
function dispAutoinstallAdminInstall() {
@ -203,7 +207,6 @@
$package->cur_version = $installedPackage->current_version;
$package->need_update = version_compare($package->version, $installedPackage->current_version, ">");
}
Context::set("package", $package);
}
if(!$_SESSION['ftp_password'])
@ -211,6 +214,9 @@
Context::set('need_password', true);
}
$this->setTemplateFile('install');
$security = new Security();
$security->encodeHTML('package.' , 'package.depends..');
}
function dispAutoinstallAdminIndex() {
@ -288,6 +294,9 @@
Context::set('page_navigation', $page_navigation);
}
$security = new Security();
$security->encodeHTML('package.' , 'package.depends..');
}
function dispCategory()
@ -330,6 +339,11 @@
$installedPackage->avail_remove = $item_list[$package_srl]->avail_remove;
$installedPackage->deps = $item_list[$package_srl]->deps;
Context::set('package', $installedPackage);
$this->setTemplateFile('uninstall');
Context::addJsFilter($this->module_path.'tpl/filter', 'uninstall_package.xml');
$security = new Security();
$security->encodeHTML('package.');
$this->setTemplateFile('uninstall');
}