fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-12 07:11:42 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 2119. supporting php 5.4. autoinstall module.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12714 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-02-06 09:47:19 +00:00
parent 0841f7be53
commit 6be23a3ac2
7 changed files with 610 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/autoinstall/autoinstall.admin.model.php
View file

@ -1,4 +1,5 @@
<?php
/**
* Model class of the autoinstall module
* @author NHN (developers@xpressengine.com)
@ -28,7 +29,7 @@ class autoinstallAdminModel extends autoinstall
$order_type = 'desc';
}
$page = (int)$page;
$page = (int) $page;
if($page < 1)
{
$page = 1;
@ -164,14 +165,14 @@ class autoinstallAdminModel extends autoinstall
{
$is_authed = 0;
$ftp_info = Context::getFTPInfo();
$ftp_info = Context::getFTPInfo();
if(!$ftp_info->ftp_root_path)
{
$is_authed = -1;
}
else
{
$is_authed = (int)isset($_SESSION['ftp_password']);
$is_authed = (int) isset($_SESSION['ftp_password']);
}
$this->add('is_authed', $is_authed);
@ -184,14 +185,17 @@ class autoinstallAdminModel extends autoinstall
{
$oModel = getModel('autoinstall');
$output = executeQueryArray('autoinstall.getNeedUpdate');
if(!is_array($output->data)) return NULL;
if(!is_array($output->data))
{
return NULL;
}
$result = array();
$xml = new XmlParser();
foreach($output->data as $package)
{
$packageSrl = $package->package_srl;
$packageInfo = new stdClass();
$packageInfo->currentVersion = $package->current_version;
$packageInfo->version = $package->version;
@ -210,9 +214,18 @@ class autoinstallAdminModel extends autoinstall
if($xmlDoc)
{
$type = $packageInfo->type;
if($type == "drcomponent") $type = "component";
if($type == "style" || $type == "m.skin") $type = "skin";
if($type == "m.layout") $type = "layout";
if($type == "drcomponent")
{
$type = "component";
}
if($type == "style" || $type == "m.skin")
{
$type = "skin";
}
if($type == "m.layout")
{
$type = "layout";
}
$title = $xmlDoc->{$type}->title->body;
}
else