issue 2119. supporting php 5.4. modules and widgets.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12706 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-02-05 09:45:04 +00:00
parent ff75082eee
commit 8a7c28babc
90 changed files with 572 additions and 83 deletions

View file

@ -169,6 +169,7 @@ class adminAdminController extends admin
foreach($vars->module_skin as $moduleName => $skinName)
{
$designInfo->module->{$moduleName} = new stdClass();
$designInfo->module->{$moduleName}->{$skinTarget} = $skinName;
}
@ -373,6 +374,7 @@ class adminAdminController extends admin
*/
function _insertFavorite($siteSrl, $module, $type = 'module')
{
$args = new stdClass();
$args->adminFavoriteSrl = getNextSequence();
$args->site_srl = $siteSrl;
$args->module = $module;
@ -387,6 +389,7 @@ class adminAdminController extends admin
*/
function _deleteFavorite($favoriteSrl)
{
$args = new stdClass();
$args->admin_favorite_srl = $favoriteSrl;
$output = executeQuery('admin.deleteFavorite', $args);
return $output;

View file

@ -399,6 +399,7 @@ class adminAdminModel extends admin
$xml_obj = $_xml_obj->theme;
// 스킨이름
$theme_info = new stdClass();
$theme_info->name = $theme_name;
$theme_info->title = $xml_obj->title->body;
$thumbnail = './themes/'.$theme_name.'/thumbnail.png';
@ -414,7 +415,7 @@ class adminAdminModel extends admin
foreach($publisher_list as $publisher)
{
unset($publisher_obj);
$publisher_obj = new stdClass();
$publisher_obj->name = $publisher->name->body;
$publisher_obj->email_address = $publisher->attrs->email_address;
$publisher_obj->homepage = $publisher->attrs->link;
@ -424,6 +425,7 @@ class adminAdminModel extends admin
$layout = $xml_obj->layout;
$layout_path = $layout->directory->attrs->path;
$layout_parse = explode('/',$layout_path);
$layout_info = new stdClass();
switch($layout_parse[1])
{
case 'themes' :
@ -462,6 +464,7 @@ class adminAdminModel extends admin
if ($is_new_layout)
{
$site_module_info = Context::get('site_module_info');
$args = new stdClass();
$args->site_srl = (int)$site_module_info->site_srl;
$args->layout_srl = getNextSequence();
$args->layout = $layout_info->name;
@ -483,7 +486,7 @@ class adminAdminModel extends admin
$skins = array();
foreach($skin_list as $val)
{
unset($skin_info);
$skin_info = new stdClass();
unset($skin_parse);
$skin_parse = explode('/',$val->directory->attrs->path);
switch($skin_parse[1])
@ -605,6 +608,7 @@ class adminAdminModel extends admin
*/
function getFavoriteList($siteSrl = 0, $isGetModuleInfo = false)
{
$args = new stdClass();
$args->site_srl = $siteSrl;
$output = executeQueryArray('admin.getFavoriteList', $args);
if(!$output->toBool()) return $output;
@ -634,6 +638,7 @@ class adminAdminModel extends admin
*/
function isExistsFavorite($siteSrl, $module)
{
$args = new stdClass();
$args->site_srl = $siteSrl;
$args->module = $module;
$output = executeQuery('admin.getFavorite', $args);

View file

@ -174,6 +174,7 @@ class adminAdminView extends admin
// Admin logo, title setup
$objConfig = $oModuleModel->getModuleConfig('admin');
$gnbTitleInfo = new stdClass();
$gnbTitleInfo->adminTitle = $objConfig->adminTitle ? $objConfig->adminTitle:'XE Admin';
$gnbTitleInfo->adminLogo = $objConfig->adminLogo ? $objConfig->adminLogo:'modules/admin/tpl/img/xe.h1.png';
@ -208,7 +209,7 @@ class adminAdminView extends admin
foreach($item as $key => $val)
{
$obj = null;
$obj = new stdClass();
$obj->title = $val->body;
$obj->date = $val->attrs->date;
$obj->url = $val->attrs->url;
@ -238,17 +239,21 @@ class adminAdminView extends admin
function dispAdminIndex()
{
// Get statistics
$args = new stdClass();
$args->date = date("Ymd000000", time()-60*60*24);
$today = date("Ymd");
// Member Status
$oMemberAdminModel = &getAdminModel('member');
$status = new stdClass();
$status->member = new stdClass();
$status->member->todayCount = $oMemberAdminModel->getMemberCountByDate($today);
$status->member->totalCount = $oMemberAdminModel->getMemberCountByDate();
// Document Status
$oDocumentAdminModel = &getAdminModel('document');
$statusList = array('PUBLIC', 'SECRET');
$status->document = new stdClass();
$status->document->todayCount = $oDocumentAdminModel->getDocumentCountByDate($today, array(), $statusList);
$status->document->totalCount = $oDocumentAdminModel->getDocumentCountByDate('', array(), $statusList);
@ -267,6 +272,7 @@ class adminAdminView extends admin
// Latest Comment
$oCommentModel = &getModel('comment');
$columnList = array('comment_srl', 'module_srl', 'document_srl', 'content', 'nick_name', 'member_srl');
$args = new stdClass();
$args->list_count = 5;
$output = $oCommentModel->getNewestCommentList($args, $columnList);
if(is_array($output))

View file

@ -99,6 +99,7 @@ class admin extends ModuleObject
$this->_oldAdminmenuDelete();
$returnObj = new stdClass();
$returnObj->menu_srl = $output->menu_srl;
$returnObj->php_file = FileHandler::getRealPath($output->php_file);
@ -113,6 +114,7 @@ class admin extends ModuleObject
public function createXeAdminMenu()
{
//insert menu
$args = new stdClass();
$args->title = $this->adminMenuName;
$args->menu_srl = getNextSequence();
$args->listorder = $args->menu_srl * -1;
@ -126,6 +128,7 @@ class admin extends ModuleObject
foreach($gnbList AS $key=>$value)
{
//insert menu item
$args = new stdClass();
$args->menu_srl = $menuSrl;
$args->menu_item_srl = getNextSequence();
$args->name = '{$lang->menu_gnb[\''.$value.'\']}';
@ -248,6 +251,7 @@ class admin extends ModuleObject
// gnb sub item create
// common argument setting
$args = new stdClass();
$args->menu_srl = $menuSrl;
$args->open_window = 'N';
$args->expand = 'N';