fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-28 23:03:25 +09:00
Code Issues Projects Releases Packages Wiki Activity

NOISSUE PHP 5.4 이상 호환성 개선.

Browse source
This commit is contained in:
bnu 2013-11-30 17:35:22 +09:00
parent 742af78932
commit 41ff8ace3b
32 changed files with 365 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/admin/admin.admin.controller.php
View file

@ -170,7 +170,6 @@ class adminAdminController extends admin
$skinTarget = 'mskin';
}
$buff = '';
if(is_readable($siteDesignFile))
{
include($siteDesignFile);
@ -202,31 +201,33 @@ class adminAdminController extends admin
function makeDefaultDesignFile($designInfo, $site_srl = 0)
{
$buff = array();
$buff[] = '<?php if(!defined("__XE__")) exit();';
$buff[] = '$designInfo = new stdClass;';
if($designInfo->layout_srl)
{
$buff .= sprintf('$designInfo->layout_srl = %s; ', $designInfo->layout_srl) . "\n";
$buff[] = sprintf('$designInfo->layout_srl = %s; ', $designInfo->layout_srl);
}
if($designInfo->mlayout_srl)
{
$buff .= sprintf('$designInfo->mlayout_srl = %s;', $designInfo->mlayout_srl) . "\n";
$buff[] = sprintf('$designInfo->mlayout_srl = %s;', $designInfo->mlayout_srl);
}
$buff .= '$designInfo->module = new stdClass();' . "\n";
$buff[] = '$designInfo->module = new stdClass;';
foreach($designInfo->module as $moduleName => $skinInfo)
{
$buff .= sprintf('$designInfo->module->%s = new stdClass();', $moduleName) . "\n";
$buff[] = sprintf('$designInfo->module->%s = new stdClass;', $moduleName);
foreach($skinInfo as $target => $skinName)
{
$buff .= sprintf('$designInfo->module->%s->%s = \'%s\';', $moduleName, $target, $skinName) . "\n";
$buff[] = sprintf('$designInfo->module->%s->%s = \'%s\';', $moduleName, $target, $skinName);
}
}
$buff = sprintf('<?php if(!defined("__XE__")) exit();' . "\n" . '$designInfo = new stdClass();' . "\n" . '%s ?>', $buff);
$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $site_srl . '.php';
FileHandler::writeFile($siteDesignFile, $buff);
FileHandler::writeFile($siteDesignFile, implode(PHP_EOL, $buff));
}
/**

6
modules/admin/admin.admin.model.php
View file

@ -316,8 +316,9 @@ class adminAdminModel extends admin
, 'module' => array('addon', 'admin', 'autoinstall', 'comment', 'communication', 'counter', 'document', 'editor', 'file', 'importer', 'install', 'integration_search', 'layout', 'member', 'menu', 'message', 'module', 'opage', 'page', 'point', 'poll', 'rss', 'session', 'spamfilter', 'tag', 'trackback', 'trash', 'widget')
, 'addon' => array('autolink', 'blogapi', 'captcha', 'counter', 'member_communication', 'member_extra_info', 'mobile', 'openid_delegation_id', 'point_level_icon', 'resize_image')
);
$info = array();
$db_info = Context::getDBInfo();
$info['type'] = ($type != 'INSTALL' ? 'WORKING' : 'INSTALL');
$info['location'] = _XE_LOCATION_;
$info['package'] = _XE_PACKAGE_;
@ -326,12 +327,11 @@ class adminAdminModel extends admin
$info['xe_version'] = __XE_VERSION__;
$info['php'] = phpversion();
$db_info = Context::getDBInfo();
$info['db_type'] = Context::getDBType();
$info['use_rewrite'] = $db_info->use_rewrite;
$info['use_db_session'] = $db_info->use_db_session == 'Y' ? 'Y' : 'N';
$info['use_ssl'] = $db_info->use_ssl;
$info['phpext'] = '';
foreach(get_loaded_extensions() as $ext)
{