mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-09 03:32:00 +09:00
merge with 1.4.5 branch(1.4.5.10)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@9269 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko
parent
92332c8ebb
commit
a0d57a320f
98 changed files with 970 additions and 432 deletions
|
|
@ -20,7 +20,7 @@
|
|||
$ftp_info = Context::getFTPInfo();
|
||||
if(!$ftp_info->ftp_root_path) Context::set('show_ftp_note', true);
|
||||
else $this->ftp_set = true;
|
||||
|
||||
|
||||
|
||||
$this->dispCategory();
|
||||
$oModel = &getModel('autoinstall');
|
||||
|
|
@ -69,9 +69,9 @@
|
|||
}
|
||||
if($v->type == "core") $v->avail_remove = false;
|
||||
else if($v->type == "module") {
|
||||
$v->avail_remove = $oModel->checkRemovable($packages[$v->package_srl]->path);
|
||||
$v->avail_remove = $oModel->checkRemovable($packages[$v->package_srl]->path);
|
||||
}
|
||||
else $v->avail_remove = true;
|
||||
else $v->avail_remove = true;
|
||||
}
|
||||
$item_list[$v->package_srl] = $v;
|
||||
}
|
||||
|
|
@ -96,6 +96,7 @@
|
|||
$title = $xmlDoc->{$type}->title->body;
|
||||
$installed[$key]->title = $title;
|
||||
}
|
||||
|
||||
Context::set('installed', $installed);
|
||||
foreach($installed as $key=>$val)
|
||||
{
|
||||
|
|
@ -113,14 +114,14 @@
|
|||
function dispAutoinstallAdminInstalledPackages()
|
||||
{
|
||||
$page = Context::get('page');
|
||||
if(!$page) $page = 1;
|
||||
if(!$page) $page = 1;
|
||||
Context::set('page', $page);
|
||||
$oModel = &getModel('autoinstall');
|
||||
$output = $oModel->getInstalledPackageList($page);
|
||||
$package_list = $output->data;
|
||||
|
||||
$params["act"] = "getResourceapiPackages";
|
||||
$params["package_srls"] = implode(",", array_keys($package_list));
|
||||
$params["package_srls"] = implode(",", array_keys($package_list));
|
||||
$body = XmlGenerater::generate($params);
|
||||
$buff = FileHandler::getRemoteResource($this->uri, $body, 3, "POST", "application/xml");
|
||||
$xml_lUpdate = new XmlParser();
|
||||
|
|
@ -133,11 +134,14 @@
|
|||
{
|
||||
$res[] = $item_list[$package_srl];
|
||||
}
|
||||
Context::set('item_list', $res);
|
||||
Context::set('item_list', $res);
|
||||
}
|
||||
Context::set('page_navigation', $output->page_navigation);
|
||||
|
||||
$this->setTemplateFile('index');
|
||||
$this->setTemplateFile('index');
|
||||
|
||||
$security = new Security();
|
||||
$security->encodeHTML('item_list..');
|
||||
}
|
||||
|
||||
function dispAutoinstallAdminInstall() {
|
||||
|
|
@ -201,7 +205,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'])
|
||||
|
|
@ -209,6 +212,9 @@
|
|||
Context::set('need_password', true);
|
||||
}
|
||||
$this->setTemplateFile('install');
|
||||
|
||||
$security = new Security();
|
||||
$security->encodeHTML('package.' , 'package.depends..');
|
||||
}
|
||||
|
||||
function dispAutoinstallAdminIndex() {
|
||||
|
|
@ -231,13 +237,13 @@
|
|||
$item = $oModel->getLatestPackage();
|
||||
if(!$item || $item->updatedate < $updateDate || count($this->categories) < 1)
|
||||
{
|
||||
Context::set('need_update', true);
|
||||
Context::set('need_update', true);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$page = Context::get('page');
|
||||
if(!$page) $page = 1;
|
||||
if(!$page) $page = 1;
|
||||
Context::set('page', $page);
|
||||
|
||||
$order_type = Context::get('order_type');
|
||||
|
|
@ -263,17 +269,20 @@
|
|||
{
|
||||
$params["search_keyword"] = $search_keyword;
|
||||
}
|
||||
$xmlDoc = XmlGenerater::getXmlDoc($params);
|
||||
$xmlDoc = XmlGenerater::getXmlDoc($params);
|
||||
if($xmlDoc && $xmlDoc->response->packagelist->item)
|
||||
{
|
||||
$item_list = $this->rearranges($xmlDoc->response->packagelist->item);
|
||||
Context::set('item_list', $item_list);
|
||||
Context::set('item_list', $item_list);
|
||||
$array = array('total_count', 'total_page', 'cur_page', 'page_count', 'first_page', 'last_page');
|
||||
$page_nav = $this->rearrange($xmlDoc->response->page_navigation, $array);
|
||||
$page_nav = $this->rearrange($xmlDoc->response->page_navigation, $array);
|
||||
$page_navigation = new PageHandler($page_nav->total_count, $page_nav->total_page, $page_nav->cur_page, $page_nav->page_count);
|
||||
Context::set('page_navigation', $page_navigation);
|
||||
}
|
||||
|
||||
$security = new Security();
|
||||
$security->encodeHTML('package.' , 'package.depends..');
|
||||
|
||||
}
|
||||
|
||||
function dispCategory()
|
||||
|
|
@ -298,22 +307,24 @@
|
|||
$installedPackage = $oModel->getPackage($package_srl);
|
||||
$path = $installedPackage->path;
|
||||
$type = $oModel->getTypeFromPath($path);
|
||||
if(!$type || $type == "core") $this->stop("msg_invalid_request");
|
||||
if(!$type || $type == "core") $this->stop("msg_invalid_request");
|
||||
$config_file = $oModel->getConfigFilePath($type);
|
||||
if(!$config_file) $this->stop("msg_invalid_request");
|
||||
if(!$config_file) $this->stop("msg_invalid_request");
|
||||
|
||||
$xml = new XmlParser();
|
||||
$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($path).$config_file);
|
||||
if(!$xmlDoc) $this->stop("msg_invalid_request");
|
||||
if(!$xmlDoc) $this->stop("msg_invalid_request");
|
||||
if($type == "drcomponent") $type = "component";
|
||||
if($type == "style") $type = "skin";
|
||||
$title = $xmlDoc->{$type}->title->body;
|
||||
$installedPackage->title = $title;
|
||||
$installedPackage->type = $type;
|
||||
Context::set('package', $installedPackage);
|
||||
|
||||
$this->setTemplateFile('uninstall');
|
||||
$this->setTemplateFile('uninstall');
|
||||
Context::addJsFilter($this->module_path.'tpl/filter', 'uninstall_package.xml');
|
||||
|
||||
$security = new Security();
|
||||
$security->encodeHTML('package.');
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<table class="updateList" border="1" cellspacing="0">
|
||||
<col width="120" /><col />
|
||||
<!--@foreach($item_list as $key => $val)-->
|
||||
<tr>
|
||||
<tr>
|
||||
{@ $target_url = $original_site."?mid=download&package_srl=".$val->package_srl; }
|
||||
<th><a href="{$target_url}"><img src="{str_replace('./', $uri, $val->item_screenshot_url)}" width="100" height="100" alt="" /></a></th>
|
||||
<td>
|
||||
|
|
@ -34,15 +34,15 @@
|
|||
<!--@if($val->category_srl)-->
|
||||
<a href="{getUrl('category_srl',$val->category_srl)}">[{$categories[$val->category_srl]->title}]</a>
|
||||
<!--@end-->
|
||||
<a href="{$target_url}">{htmlspecialchars($val->title)} ver. {htmlspecialchars($val->item_version)}</a>
|
||||
<a href="{$target_url}">{$val->title} ver. {$val->item_version}</a>
|
||||
</h3>
|
||||
<!--@if($val->current_version)-->
|
||||
<p>{$lang->current_version} : {$val->current_version}
|
||||
<p>{$lang->current_version} : {$val->current_version}
|
||||
<!--@if($val->deps)-->
|
||||
<br />
|
||||
<br />
|
||||
{$lang->dependant_list} :
|
||||
<!--@foreach($val->deps as $package_srl)-->
|
||||
{$installed[$package_srl]->title}.
|
||||
{$installed[$package_srl]->title}.
|
||||
<!--@endforeach-->
|
||||
<!--@end-->
|
||||
</p>
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
<!--@end-->
|
||||
</div>
|
||||
<div class="info">
|
||||
<p class="desc">{cut_str(htmlspecialchars($val->package_description),200)}</p>
|
||||
<p class="desc">{cut_str($val->package_description,200)}</p>
|
||||
<p class="meta">
|
||||
<span class="reputation">
|
||||
<!--@for($i=0;$i<5;$i++)-->
|
||||
|
|
@ -83,10 +83,10 @@
|
|||
</table>
|
||||
|
||||
<div class="pagination a1">
|
||||
<a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a>
|
||||
<a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a>
|
||||
<!--@while($page_no = $page_navigation->getNextPage())-->
|
||||
<!--@if($page == $page_no)-->
|
||||
<strong>{$page_no}</strong>
|
||||
<strong>{$page_no}</strong>
|
||||
<!--@else-->
|
||||
<a href="{getUrl('page',$page_no)}">{$page_no}</a>
|
||||
<!--@end-->
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue