mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-05-02 00:32:15 +09:00
Various fixes to remove warnings in PHP 8.0
This commit is contained in:
Kijin Sung
parent
9a0bf6d907
commit
49923844b2
36 changed files with 271 additions and 176 deletions
|
|
@ -92,7 +92,7 @@ class addonController extends addon
|
|||
$extra_vars = new stdClass;
|
||||
}
|
||||
|
||||
$mid_list = $extra_vars->mid_list;
|
||||
$mid_list = $extra_vars->mid_list ?? [];
|
||||
if(!is_array($mid_list))
|
||||
{
|
||||
$mid_list = array();
|
||||
|
|
@ -102,7 +102,7 @@ class addonController extends addon
|
|||
$buff[] = '$before_time = microtime(true);';
|
||||
|
||||
// Run method and mid list
|
||||
$run_method = $extra_vars->xe_run_method ?: 'run_selected';
|
||||
$run_method = ($extra_vars->xe_run_method ?? null) ?: 'run_selected';
|
||||
$buff[] = '$rm = \'' . $run_method . "';";
|
||||
$buff[] = '$ml = ' . var_export(array_fill_keys($mid_list, true), true) . ';';
|
||||
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ class adminAdminModel extends admin
|
|||
foreach($installed_module_list as $key => $value)
|
||||
{
|
||||
$moduleActionInfo = $oModuleModel->getModuleActionXml($value->module);
|
||||
if(is_object($moduleActionInfo->menu))
|
||||
if(isset($moduleActionInfo->menu) && is_object($moduleActionInfo->menu))
|
||||
{
|
||||
foreach($moduleActionInfo->menu as $key2 => $value2)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@ class adminAdminView extends admin
|
|||
Context::set('subMenuTitle', $subMenuTitle);
|
||||
Context::set('gnbUrlList', $menu->list);
|
||||
Context::set('parentSrl', $parentSrl);
|
||||
Context::set('gnb_title_info', $gnbTitleInfo);
|
||||
Context::set('gnb_title_info', $gnbTitleInfo ?? null);
|
||||
Context::addBrowserTitle($subMenuTitle ? $subMenuTitle : 'Dashboard');
|
||||
}
|
||||
|
||||
|
|
@ -368,7 +368,7 @@ class adminAdminView extends admin
|
|||
}
|
||||
|
||||
Context::set('module_list', $module_list);
|
||||
Context::set('needUpdate', $isUpdated);
|
||||
Context::set('needUpdate', false);
|
||||
Context::set('addTables', $addTables);
|
||||
Context::set('needUpdate', $needUpdate);
|
||||
Context::set('newVersionList', $needUpdateList);
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ class admin extends ModuleObject
|
|||
|
||||
// old admin menu
|
||||
$output = $oMenuAdminModel->getMenuByTitle('__XE_ADMIN__');
|
||||
$menuSrl = $output->menu_srl;
|
||||
$menuSrl = $output->menu_srl ?? 0;
|
||||
|
||||
$oMenuAdminController = getAdminController('menu');
|
||||
if($menuSrl)
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<a class="default_header" href="javascript:void()"><i class="xi xi-cog"></i></a>
|
||||
</h1>
|
||||
<p class="site" cond="$this->user->isAdmin()">
|
||||
<a href="{getUrl(['module' => 'admin', 'act' => $act, 'module_srl' => $module_info->module_srl])}">{lang('admin.view_in_manager_layout')}</a>
|
||||
<a href="{getUrl(['module' => 'admin', 'act' => $act ?? null, 'module_srl' => $module_info->module_srl])}">{lang('admin.view_in_manager_layout')}</a>
|
||||
</p>
|
||||
<!--@else-->
|
||||
<h1>
|
||||
|
|
@ -47,9 +47,9 @@
|
|||
</div>
|
||||
</header>
|
||||
<!-- BODY -->
|
||||
<div class="body <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'close')-->wide<!--@end-->" style="padding-left:0"|cond="$module_manager">
|
||||
<div class="body <!--@if(isset($_COOKIE['__xe_admin_gnb_status']) && $_COOKIE['__xe_admin_gnb_status'] == 'close')-->wide<!--@end-->" style="padding-left:0"|cond="$module_manager">
|
||||
<!-- GNB -->
|
||||
<nav class="gnb <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'open')-->open<!--@end-->" id="gnb" cond="!$module_manager">
|
||||
<nav class="gnb <!--@if(isset($_COOKIE['__xe_admin_gnb_status']) && $_COOKIE['__xe_admin_gnb_status'] == 'open')-->open<!--@end-->" id="gnb" cond="!$module_manager">
|
||||
<a href="#gnbNav"><i class="x_icon-align-justify x_icon-white"></i><b></b> Menu Open/Close</a>
|
||||
<ul id="gnbNav" class="ex">
|
||||
<script>
|
||||
|
|
@ -57,19 +57,18 @@
|
|||
</script>
|
||||
<!--@foreach($gnbUrlList as $key=>$value)-->
|
||||
<!--@if(strstr($value['menu_name_key'], 'configuration'))-->
|
||||
<li class="open"|cond="$_COOKIE['__xe_admin_gnb_tx_favorite'] == 'open'">
|
||||
<li class="open"|cond="isset($_COOKIE['__xe_admin_gnb_tx_favorite']) && $_COOKIE['__xe_admin_gnb_tx_favorite'] == 'open'">
|
||||
<script>
|
||||
__xe_admin_gnb_txs.push('__xe_admin_gnb_tx_favorite');
|
||||
</script>
|
||||
<a href="#favorite" data-href="favorite" title="{$lang->favorite}"><span class="tx">{$lang->favorite}</span></a>
|
||||
<ul id="favorite" style="display:block"|cond="$_COOKIE['__xe_admin_gnb_tx_favorite'] == 'open'">
|
||||
<ul id="favorite" style="display:block"|cond="isset($_COOKIE['__xe_admin_gnb_tx_favorite']) && $_COOKIE['__xe_admin_gnb_tx_favorite'] == 'open'">
|
||||
<li loop="$favorite_list => $favorite">
|
||||
<a cond="$favorite->title" href="{getUrl(['module' => 'admin', 'act' => $favorite->admin_index_act])}" title="{$favorite->title}">{$favorite->title}</a>
|
||||
<a cond="!$favorite->title">{$lang->msg_not_founded}</a>
|
||||
<form class="remove" action="./" method="post">
|
||||
<input type="hidden" name="module" value="admin" />
|
||||
<input type="hidden" name="act" value="procAdminToggleFavorite" />
|
||||
<input type="hidden" name="site_srl" value="0" />
|
||||
<input type="hidden" name="act" value="" />
|
||||
<input type="hidden" name="module_name" value="{$favorite->module}" />
|
||||
<input type="hidden" name="success_return_url" value="{getUrl(['module' => 'admin'])}" />
|
||||
<button type="submit" class="x_close" title="{$lang->cmd_delete}">×</button>
|
||||
|
|
@ -79,12 +78,12 @@
|
|||
</ul>
|
||||
</li>
|
||||
<!--@end-->
|
||||
<li class="<!--@if(($parentSrl==$key || $value['href']=='index.php?module=admin') && !$mid && !$act)-->active open<!--@elseif($_COOKIE['__xe_admin_gnb_tx_' . md5($value['href'])] == 'open')-->open<!--@end-->">
|
||||
<li class="<!--@if(($parentSrl==$key || $value['href']=='index.php?module=admin') && !isset($mid) && !isset($act))-->active open<!--@elseif(isset($_COOKIE['__xe_admin_gnb_tx_' . md5($value['href'])]) && $_COOKIE['__xe_admin_gnb_tx_' . md5($value['href'])] == 'open')-->open<!--@end-->">
|
||||
<script>
|
||||
__xe_admin_gnb_txs.push('{'__xe_admin_gnb_tx_' . md5($value['href'])}');
|
||||
</script>
|
||||
<a href="{str_replace('//', '/', \RX_BASEURL . $value['href'])}" data-href="{md5($value['href'])}" title="{$value['text']}"><span class="tx">{$value['text']}</span></a>
|
||||
<ul cond="count($value['list'])" style="display:block"|cond="$_COOKIE['__xe_admin_gnb_tx_' . md5($value['href'])] == 'open'">
|
||||
<ul cond="count($value['list'])" style="display:block"|cond="isset($_COOKIE['__xe_admin_gnb_tx_' . md5($value['href'])]) && $_COOKIE['__xe_admin_gnb_tx_' . md5($value['href'])] == 'open'">
|
||||
<li loop="$value['list']=>$key2,$value2" cond="$value2['text']!=''" class="active_"|cond="$value2['text'] == $subMenuTitle" ><a href="{str_replace('//', '/', \RX_BASEURL . $value2['href'])}" title="{$value2['text']}">{$value2['text']}</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
<h2>{$lang->checkBrowserIE8}</h2>
|
||||
</div>
|
||||
|
||||
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/index/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
|
||||
<div cond="isset($XE_VALIDATOR_MESSAGE) && ($XE_VALIDATOR_ID ?? '') == 'modules/admin/tpl/index/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
|
||||
<p>{$XE_VALIDATOR_MESSAGE}</p>
|
||||
</div>
|
||||
|
||||
<div class="message error" cond="$db_info->use_sitelock == 'Y'">
|
||||
<div class="message error" cond="config('lock.locked')">
|
||||
<h2>{$lang->sitelock_in_use}</h2>
|
||||
<p>{$lang->about_sitelock_in_use} <a href="{getUrl(['module' => 'admin', 'act' => 'dispAdminConfigSitelock'])}">{$lang->cmd_configure}</a></p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -371,25 +371,25 @@ class commentModel extends comment
|
|||
$obj = new stdClass();
|
||||
}
|
||||
|
||||
if($obj->mid)
|
||||
if(isset($obj->mid) && $obj->mid)
|
||||
{
|
||||
$obj->module_srl = ModuleModel::getModuleSrlByMid($obj->mid);
|
||||
unset($obj->mid);
|
||||
}
|
||||
|
||||
// check if module_srl is an arrary.
|
||||
if(is_array($obj->module_srl))
|
||||
if(isset($obj->module_srl) && is_array($obj->module_srl))
|
||||
{
|
||||
$args->module_srl = implode(',', $obj->module_srl);
|
||||
}
|
||||
else
|
||||
{
|
||||
$args->module_srl = $obj->module_srl;
|
||||
$args->module_srl = $obj->module_srl ?? null;
|
||||
}
|
||||
|
||||
$args->is_secret = $obj->is_secret;
|
||||
$args->document_srl = $obj->document_srl;
|
||||
$args->list_count = $obj->list_count;
|
||||
$args->is_secret = $obj->is_secret ?? null;
|
||||
$args->document_srl = $obj->document_srl ?? null;
|
||||
$args->list_count = $obj->list_count ?? null;
|
||||
|
||||
if(strpos($args->module_srl, ",") === false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ class documentItem extends BaseObject
|
|||
}
|
||||
|
||||
$this->document_srl = $attribute->document_srl;
|
||||
$this->lang_code = $attribute->lang_code;
|
||||
$this->lang_code = $attribute->lang_code ?? null;
|
||||
$this->adds($attribute);
|
||||
|
||||
// set XE_DOCUMENT_LIST
|
||||
|
|
@ -696,8 +696,7 @@ class documentItem extends BaseObject
|
|||
}
|
||||
|
||||
// Define a link if using a rewrite module
|
||||
$oContext = Context::getInstance();
|
||||
if($oContext->allow_rewrite)
|
||||
if(Context::isAllowRewrite())
|
||||
{
|
||||
$content = preg_replace('/<a([ \t]+)href=("|\')\.\/\?/i',"<a href=\\2". Context::getRequestUri() ."?", $content);
|
||||
}
|
||||
|
|
@ -1326,11 +1325,11 @@ class documentItem extends BaseObject
|
|||
|
||||
if(Mobile::isFromMobilePhone())
|
||||
{
|
||||
$iconSkin = $documentConfig->micons;
|
||||
$iconSkin = $documentConfig->micons ?? null;
|
||||
}
|
||||
else
|
||||
{
|
||||
$iconSkin = $documentConfig->icons;
|
||||
$iconSkin = $documentConfig->icons ?? null;
|
||||
}
|
||||
if($iconSkin == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ class documentModel extends document
|
|||
$oDocument = $_document_list[$document_srl];
|
||||
$module_srl = $oDocument->get('module_srl');
|
||||
$document_lang_code = $oDocument->get('lang_code');
|
||||
$document_extra_values = $extra_values[$document_srl];
|
||||
$document_extra_values = $extra_values[$document_srl] ?? [];
|
||||
|
||||
// set XE_EXTRA_VARS
|
||||
if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
|
||||
|
|
@ -303,7 +303,7 @@ class documentModel extends document
|
|||
{
|
||||
$args = new stdClass();
|
||||
$args->module_srl = $obj->module_srl;
|
||||
$args->category_srl = $obj->category_srl;
|
||||
$args->category_srl = $obj->category_srl ?? null;
|
||||
$output = executeQueryArray('document.getNoticeList', $args, $columnList);
|
||||
if(!$output->toBool() || !$result = $output->data)
|
||||
{
|
||||
|
|
@ -1217,7 +1217,7 @@ class documentModel extends document
|
|||
public static function _setSortIndex($obj, $load_extra_vars = true)
|
||||
{
|
||||
$args = new stdClass;
|
||||
$args->sort_index = $obj->sort_index;
|
||||
$args->sort_index = $obj->sort_index ?? null;
|
||||
$args->isExtraVars = false;
|
||||
|
||||
// check it's default sort
|
||||
|
|
@ -1264,29 +1264,29 @@ class documentModel extends document
|
|||
public static function _setSearchOption($searchOpt, &$args, &$query_id, &$use_division)
|
||||
{
|
||||
$args = new stdClass;
|
||||
$args->module_srl = $searchOpt->module_srl;
|
||||
$args->exclude_module_srl = $searchOpt->exclude_module_srl;
|
||||
$args->category_srl = $searchOpt->category_srl ?: null;
|
||||
$args->member_srl = $searchOpt->member_srl ?: ($searchOpt->member_srls ?: null);
|
||||
$args->order_type = $searchOpt->order_type === 'desc' ? 'desc' : 'asc';
|
||||
$args->module_srl = $searchOpt->module_srl ?? null;
|
||||
$args->exclude_module_srl = $searchOpt->exclude_module_srl ?? null;
|
||||
$args->category_srl = $searchOpt->category_srl ?? null;
|
||||
$args->member_srl = $searchOpt->member_srl ?? ($searchOpt->member_srls ?? null);
|
||||
$args->order_type = (isset($searchOpt->order_type) && $searchOpt->order_type === 'desc') ? 'desc' : 'asc';
|
||||
$args->sort_index = $searchOpt->sort_index;
|
||||
$args->page = $searchOpt->page ?: 1;
|
||||
$args->list_count = $searchOpt->list_count ?: 20;
|
||||
$args->page_count = $searchOpt->page_count ?: 10;
|
||||
$args->start_date = $searchOpt->start_date ?: null;
|
||||
$args->end_date = $searchOpt->end_date ?: null;
|
||||
$args->page = $searchOpt->page ?? 1;
|
||||
$args->list_count = $searchOpt->list_count ?? 20;
|
||||
$args->page_count = $searchOpt->page_count ?? 10;
|
||||
$args->start_date = $searchOpt->start_date ?? null;
|
||||
$args->end_date = $searchOpt->end_date ?? null;
|
||||
$args->s_is_notice = $searchOpt->except_notice ? 'N' : null;
|
||||
$args->statusList = $searchOpt->statusList ?: array(self::getConfigStatus('public'), self::getConfigStatus('secret'));
|
||||
$args->columnList = $searchOpt->columnList ?: array();
|
||||
$args->statusList = $searchOpt->statusList ?? array(self::getConfigStatus('public'), self::getConfigStatus('secret'));
|
||||
$args->columnList = $searchOpt->columnList ?? array();
|
||||
|
||||
// get directly module_srl by mid
|
||||
if($searchOpt->mid)
|
||||
if(isset($searchOpt->mid) && $searchOpt->mid)
|
||||
{
|
||||
$args->module_srl = ModuleModel::getModuleSrlByMid($searchOpt->mid);
|
||||
}
|
||||
|
||||
// add subcategories
|
||||
if($args->category_srl)
|
||||
if(isset($args->category_srl) && $args->category_srl)
|
||||
{
|
||||
$category_list = self::getCategoryList($args->module_srl);
|
||||
if(isset($category_list[$args->category_srl]))
|
||||
|
|
@ -1300,8 +1300,8 @@ class documentModel extends document
|
|||
// default
|
||||
$query_id = null;
|
||||
$use_division = false;
|
||||
$search_target = $searchOpt->search_target;
|
||||
$search_keyword = trim($searchOpt->search_keyword);
|
||||
$search_target = $searchOpt->search_target ?? null;
|
||||
$search_keyword = trim($searchOpt->search_keyword ?? null) ?: null;
|
||||
|
||||
// search
|
||||
if($search_target && $search_keyword)
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ class editorController extends editor
|
|||
function procLoadEditorStyle()
|
||||
{
|
||||
$module_info = Context::get('module_info');
|
||||
$module_srl = $module_info->module_srl;
|
||||
$module_srl = $module_info->module_srl ?? 0;
|
||||
if($module_srl)
|
||||
{
|
||||
$editor_config = getModel('editor')->getEditorConfig($module_srl);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class editorModel extends editor
|
|||
// Load editor config for current module.
|
||||
if ($module_srl)
|
||||
{
|
||||
if (!self::$_module_config[$module_srl])
|
||||
if (!isset(self::$_module_config[$module_srl]))
|
||||
{
|
||||
self::$_module_config[$module_srl] = ModuleModel::getModulePartConfig('editor', $module_srl);
|
||||
if (!is_object(self::$_module_config[$module_srl]))
|
||||
|
|
@ -47,24 +47,36 @@ class editorModel extends editor
|
|||
}
|
||||
|
||||
// Fill in some other values.
|
||||
if(!is_array($editor_config->enable_html_grant)) $editor_config->enable_html_grant = array();
|
||||
if(!is_array($editor_config->enable_comment_html_grant)) $editor_config->enable_comment_html_grant = array();
|
||||
if(!is_array($editor_config->upload_file_grant)) $editor_config->upload_file_grant = array();
|
||||
if(!is_array($editor_config->comment_upload_file_grant)) $editor_config->comment_upload_file_grant = array();
|
||||
if(!is_array($editor_config->enable_default_component_grant)) $editor_config->enable_default_component_grant = array();
|
||||
if(!is_array($editor_config->enable_comment_default_component_grant)) $editor_config->enable_comment_default_component_grant = array();
|
||||
if(!is_array($editor_config->enable_component_grant)) $editor_config->enable_component_grant = array();
|
||||
if(!is_array($editor_config->enable_comment_component_grant)) $editor_config->enable_comment_component_grant= array();
|
||||
$grant_vars = array(
|
||||
'enable_html_grant',
|
||||
'enable_comment_html_grant',
|
||||
'upload_file_grant',
|
||||
'comment_upload_file_grant',
|
||||
'enable_default_component_grant',
|
||||
'enable_comment_default_component_grant',
|
||||
'enable_component_grant',
|
||||
'enable_comment_component_grant',
|
||||
);
|
||||
foreach ($grant_vars as $var)
|
||||
{
|
||||
if (!isset($editor_config->{$var}) || !is_array($editor_config->{$var}))
|
||||
{
|
||||
$editor_config->{$var} = [];
|
||||
}
|
||||
}
|
||||
|
||||
// Load the default config for editor module.
|
||||
$editor_default_config = ModuleModel::getModuleConfig('editor') ?: new stdClass;
|
||||
|
||||
// Check whether we should use the default config.
|
||||
if($editor_config->default_editor_settings !== 'Y' && $editor_default_config->editor_skin && $editor_config->editor_skin && $editor_default_config->editor_skin !== $editor_config->editor_skin)
|
||||
if(!isset($editor_config->default_editor_settings) || $editor_config->default_editor_settings !== 'Y')
|
||||
{
|
||||
$editor_config->default_editor_settings = 'N';
|
||||
if(isset($editor_config->editor_skin) && isset($editor_default_config->editor_skin) && $editor_default_config->editor_skin !== $editor_config->editor_skin)
|
||||
{
|
||||
$editor_config->default_editor_settings = 'N';
|
||||
}
|
||||
}
|
||||
if(!$editor_config->default_editor_settings)
|
||||
if(!isset($editor_config->default_editor_settings))
|
||||
{
|
||||
$editor_config->default_editor_settings = 'Y';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -477,11 +477,20 @@ class layoutModel extends layout
|
|||
}
|
||||
|
||||
// Get a path of the requested module. Return if not exists.
|
||||
if(!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
|
||||
if(!is_dir($layout_path)) return;
|
||||
if(!isset($layout_path))
|
||||
{
|
||||
$layout_path = $this->getLayoutPath($layout, $layout_type);
|
||||
}
|
||||
if(!is_dir($layout_path))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Read the xml file for module skin information
|
||||
if(!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
|
||||
if(!isset($xml_file))
|
||||
{
|
||||
$xml_file = sprintf("%sconf/info.xml", $layout_path);
|
||||
}
|
||||
if(!file_exists($xml_file))
|
||||
{
|
||||
$layout_info = new stdClass;
|
||||
|
|
|
|||
|
|
@ -344,6 +344,10 @@ class memberModel extends member
|
|||
{
|
||||
if(!$member_srl) return new stdClass;
|
||||
|
||||
if(!isset($GLOBALS['__member_info__']))
|
||||
{
|
||||
$GLOBALS['__member_info__'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__'][$member_srl]))
|
||||
{
|
||||
$cache_key = sprintf('member:member_info:%d', $member_srl);
|
||||
|
|
@ -385,6 +389,10 @@ class memberModel extends member
|
|||
*/
|
||||
public static function arrangeMemberInfo($info, $site_srl = 0)
|
||||
{
|
||||
if(!isset($GLOBALS['__member_info__']))
|
||||
{
|
||||
$GLOBALS['__member_info__'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__'][$info->member_srl]))
|
||||
{
|
||||
$config = self::getMemberConfig();
|
||||
|
|
@ -983,13 +991,20 @@ class memberModel extends member
|
|||
*/
|
||||
public static function getProfileImage($member_srl)
|
||||
{
|
||||
if(!isset($GLOBALS['__member_info__']['profile_image'][$member_srl]))
|
||||
if(!isset($GLOBALS['__member_info__']))
|
||||
{
|
||||
$GLOBALS['__member_info__'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__']['profile_image']))
|
||||
{
|
||||
$GLOBALS['__member_info__']['profile_image'] = [];
|
||||
}
|
||||
if(!array_key_exists($member_srl, $GLOBALS['__member_info__']['profile_image']))
|
||||
{
|
||||
$GLOBALS['__member_info__']['profile_image'][$member_srl] = null;
|
||||
$exts = array('gif','jpg','png');
|
||||
for($i=0;$i<3;$i++)
|
||||
foreach(['jpg', 'jpeg', 'gif', 'png'] as $ext)
|
||||
{
|
||||
$image_name_file = sprintf('files/member_extra_info/profile_image/%s%d.%s', getNumberingPath($member_srl), $member_srl, $exts[$i]);
|
||||
$image_name_file = sprintf('files/member_extra_info/profile_image/%s%d.%s', getNumberingPath($member_srl), $member_srl, $ext);
|
||||
if(file_exists($image_name_file))
|
||||
{
|
||||
list($width, $height, $type, $attrs) = getimagesize($image_name_file);
|
||||
|
|
@ -1012,6 +1027,14 @@ class memberModel extends member
|
|||
*/
|
||||
public static function getImageName($member_srl)
|
||||
{
|
||||
if(!isset($GLOBALS['__member_info__']))
|
||||
{
|
||||
$GLOBALS['__member_info__'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__']['image_name']))
|
||||
{
|
||||
$GLOBALS['__member_info__']['image_name'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__']['image_name'][$member_srl]))
|
||||
{
|
||||
$image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
|
||||
|
|
@ -1025,7 +1048,10 @@ class memberModel extends member
|
|||
$info->file = './'.$image_name_file;
|
||||
$GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
|
||||
}
|
||||
else $GLOBALS['__member_info__']['image_name'][$member_srl] = null;
|
||||
else
|
||||
{
|
||||
$GLOBALS['__member_info__']['image_name'][$member_srl] = '';
|
||||
}
|
||||
}
|
||||
return $GLOBALS['__member_info__']['image_name'][$member_srl];
|
||||
}
|
||||
|
|
@ -1035,6 +1061,14 @@ class memberModel extends member
|
|||
*/
|
||||
public static function getImageMark($member_srl)
|
||||
{
|
||||
if(!isset($GLOBALS['__member_info__']))
|
||||
{
|
||||
$GLOBALS['__member_info__'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__']['image_mark']))
|
||||
{
|
||||
$GLOBALS['__member_info__']['image_mark'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__']['image_mark'][$member_srl]))
|
||||
{
|
||||
$image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
|
||||
|
|
@ -1048,7 +1082,10 @@ class memberModel extends member
|
|||
$info->file = './'.$image_mark_file;
|
||||
$GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
|
||||
}
|
||||
else $GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
|
||||
else
|
||||
{
|
||||
$GLOBALS['__member_info__']['image_mark'][$member_srl] = '';
|
||||
}
|
||||
}
|
||||
|
||||
return $GLOBALS['__member_info__']['image_mark'][$member_srl];
|
||||
|
|
@ -1060,6 +1097,14 @@ class memberModel extends member
|
|||
*/
|
||||
public static function getGroupImageMark($member_srl,$site_srl=0)
|
||||
{
|
||||
if(!isset($GLOBALS['__member_info__']))
|
||||
{
|
||||
$GLOBALS['__member_info__'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__']['group_image_mark']))
|
||||
{
|
||||
$GLOBALS['__member_info__']['group_image_mark'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
|
||||
{
|
||||
$config = ModuleModel::getModuleConfig('member');
|
||||
|
|
@ -1100,18 +1145,11 @@ class memberModel extends member
|
|||
}
|
||||
if (!$info)
|
||||
{
|
||||
$GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
|
||||
$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = '';
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]) && $GLOBALS['__member_info__']['group_image_mark'][$member_srl] !== 'N')
|
||||
{
|
||||
return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
|
||||
}
|
||||
else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1119,6 +1157,14 @@ class memberModel extends member
|
|||
*/
|
||||
public static function getSignature($member_srl)
|
||||
{
|
||||
if(!isset($GLOBALS['__member_info__']))
|
||||
{
|
||||
$GLOBALS['__member_info__'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__']['signature']))
|
||||
{
|
||||
$GLOBALS['__member_info__']['signature'] = [];
|
||||
}
|
||||
if(!isset($GLOBALS['__member_info__']['signature'][$member_srl]))
|
||||
{
|
||||
$filename = sprintf('files/member_extra_info/signature/%s%d.signature.php', getNumberingPath($member_srl), $member_srl);
|
||||
|
|
|
|||
|
|
@ -1778,15 +1778,9 @@ class menuAdminController extends menu
|
|||
FileHandler::writeFile($php_file, '<?php if(!defined("__XE__")) exit(); ?>');
|
||||
return $xml_file;
|
||||
}
|
||||
$site_srl = (int)$output->data->site_srl;
|
||||
$site_srl = 0;
|
||||
$domain = null;
|
||||
|
||||
if($site_srl)
|
||||
{
|
||||
$oModuleModel = getModel('module');
|
||||
$columnList = array('sites.domain');
|
||||
$site_info = $oModuleModel->getSiteInfo($site_srl, $columnList);
|
||||
$domain = $site_info->domain;
|
||||
}
|
||||
// Get a list of menu items corresponding to menu_srl by listorder
|
||||
$args->menu_srl = $menu_srl;
|
||||
$args->sort_index = 'listorder';
|
||||
|
|
@ -1889,14 +1883,20 @@ class menuAdminController extends menu
|
|||
if(!$source_node) return;
|
||||
|
||||
$oMenuAdminModel = getAdminModel('menu');
|
||||
$buff = '';
|
||||
|
||||
foreach($source_node as $menu_item_srl => $node)
|
||||
{
|
||||
$child_buff = "";
|
||||
// Get data of the child nodes
|
||||
if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
|
||||
if($menu_item_srl && isset($tree[$menu_item_srl]))
|
||||
{
|
||||
$child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
|
||||
}
|
||||
|
||||
// List variables
|
||||
$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
|
||||
$name_arr_str = '';
|
||||
foreach($names as $key => $val)
|
||||
{
|
||||
$name_arr_str .= sprintf('%s => %s, ', var_export($key, true), var_export($val, true));
|
||||
|
|
@ -1973,8 +1973,14 @@ class menuAdminController extends menu
|
|||
$link
|
||||
);
|
||||
|
||||
if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
|
||||
else $buff .= sprintf('<node %s />', $attribute);
|
||||
if($child_buff)
|
||||
{
|
||||
$buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
|
||||
}
|
||||
else
|
||||
{
|
||||
$buff .= sprintf('<node %s />', $attribute);
|
||||
}
|
||||
}
|
||||
return $buff;
|
||||
}
|
||||
|
|
@ -1992,7 +1998,7 @@ class menuAdminController extends menu
|
|||
*/
|
||||
function getPhpCacheCode($source_node, $tree, $site_srl, $domain)
|
||||
{
|
||||
$output = array("buff"=>"", "url_list"=>array());
|
||||
$output = array('buff' => '', 'url_list' => array(), 'name' => null);
|
||||
if(!$source_node) return $output;
|
||||
|
||||
$oMenuAdminModel = getAdminModel('menu');
|
||||
|
|
@ -2000,8 +2006,14 @@ class menuAdminController extends menu
|
|||
foreach($source_node as $menu_item_srl => $node)
|
||||
{
|
||||
// Get data from child nodes if exist.
|
||||
if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
|
||||
else $child_output = array("buff"=>"", "url_list"=>array());
|
||||
if($menu_item_srl && isset($tree[$menu_item_srl]))
|
||||
{
|
||||
$child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
|
||||
}
|
||||
else
|
||||
{
|
||||
$child_output = array('buff' => '', 'url_list' => array(), 'name' => null);
|
||||
}
|
||||
|
||||
// List variables
|
||||
$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
|
||||
|
|
@ -2027,9 +2039,9 @@ class menuAdminController extends menu
|
|||
else $group_check_code = "true";
|
||||
|
||||
// List variables
|
||||
$href = escape($node->href, false);
|
||||
$url = escape($node->url, false);
|
||||
$desc = escape($node->desc, false);
|
||||
$href = escape($node->href ?? '', false);
|
||||
$url = escape($node->url ?? '', false);
|
||||
$desc = escape($node->desc ?? '', false);
|
||||
if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
|
||||
{
|
||||
$href = "getSiteUrl('$domain', '','mid','$node->url')";
|
||||
|
|
|
|||
|
|
@ -879,7 +879,7 @@ class moduleAdminController extends module
|
|||
$lang_supported = Context::loadLangSelected();
|
||||
$defaultLang = config('locale.default_lang');
|
||||
|
||||
if(!is_array($langMap[$defaultLang]))
|
||||
if(!isset($langMap[$defaultLang]) || !is_array($langMap[$defaultLang]))
|
||||
{
|
||||
$langMap[$defaultLang] = array();
|
||||
}
|
||||
|
|
@ -899,7 +899,7 @@ class moduleAdminController extends module
|
|||
continue;
|
||||
}
|
||||
|
||||
if(!is_array($langMap[$targetLangCode]))
|
||||
if(!isset($langMap[$targetLangCode]) || !is_array($langMap[$targetLangCode]))
|
||||
{
|
||||
$langMap[$targetLangCode] = array();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -442,7 +442,9 @@ class moduleAdminModel extends module
|
|||
if(is_array($lang_supported))
|
||||
{
|
||||
foreach($lang_supported as $key => $val)
|
||||
$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
|
||||
{
|
||||
$output[$key] = (isset($selected_lang[$key]) && $selected_lang[$key]) ? $selected_lang[$key] : $name;
|
||||
}
|
||||
}
|
||||
return $output;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1209,7 +1209,7 @@ class moduleModel extends module
|
|||
$output = executeQuery('module.getModuleConfig', $args);
|
||||
|
||||
// Only object type
|
||||
if($output->data->config)
|
||||
if(isset($output->data->config) && $output->data->config)
|
||||
{
|
||||
$config = unserialize($output->data->config);
|
||||
}
|
||||
|
|
@ -1363,7 +1363,7 @@ class moduleModel extends module
|
|||
$info->created_table_count = null; //$created_table_count;
|
||||
$info->table_count = null; //$table_count;
|
||||
$info->path = $path;
|
||||
$info->admin_index_act = $info->admin_index_act;
|
||||
$info->admin_index_act = $info->admin_index_act ?? null;
|
||||
$list[] = $info;
|
||||
}
|
||||
return $list;
|
||||
|
|
@ -1466,7 +1466,7 @@ class moduleModel extends module
|
|||
$info->created_table_count = $created_table_count;
|
||||
$info->table_count = $table_count;
|
||||
$info->path = $path;
|
||||
$info->admin_index_act = $info->admin_index_act;
|
||||
$info->admin_index_act = $info->admin_index_act ?? null;
|
||||
|
||||
if(!Context::isBlacklistedPlugin($module_name))
|
||||
{
|
||||
|
|
@ -1491,7 +1491,7 @@ class moduleModel extends module
|
|||
// Check if all action-forwardable routes are registered
|
||||
$module_action_info = self::getModuleActionXml($module_name);
|
||||
$forwardable_routes = array();
|
||||
foreach ($module_action_info->action ?: [] as $action_name => $action_info)
|
||||
foreach ($module_action_info->action ?? [] as $action_name => $action_info)
|
||||
{
|
||||
if (count($action_info->route) && $action_info->standalone !== 'false')
|
||||
{
|
||||
|
|
@ -1501,14 +1501,14 @@ class moduleModel extends module
|
|||
);
|
||||
}
|
||||
}
|
||||
foreach ($module_action_info->route->GET ?: [] as $regexp => $action_name)
|
||||
foreach ($module_action_info->route->GET ?? [] as $regexp => $action_name)
|
||||
{
|
||||
if (isset($forwardable_routes[$action_name]))
|
||||
{
|
||||
$forwardable_routes[$action_name]['regexp'][] = ['GET', $regexp];
|
||||
}
|
||||
}
|
||||
foreach ($module_action_info->route->POST ?: [] as $regexp => $action_name)
|
||||
foreach ($module_action_info->route->POST ?? [] as $regexp => $action_name)
|
||||
{
|
||||
if (isset($forwardable_routes[$action_name]))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ class ncenterlite extends ModuleObject
|
|||
$variable_name = array();
|
||||
foreach($member_config->signupForm as $value)
|
||||
{
|
||||
if($value->type == 'tel')
|
||||
if(isset($value->type) && $value->type == 'tel')
|
||||
{
|
||||
$variable_name[] = $value->name;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ class pageView extends page
|
|||
case 'WIDGET' :
|
||||
{
|
||||
$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
|
||||
$this->interval = (int)($this->module_info->page_caching_interval);
|
||||
$this->interval = (int)($this->module_info->page_caching_interval ?? 0);
|
||||
break;
|
||||
}
|
||||
case 'OUTSIDE' :
|
||||
{
|
||||
$this->cache_file = sprintf("%sfiles/cache/opage/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getSslStatus());
|
||||
$this->interval = (int)($this->module_info->page_caching_interval);
|
||||
$this->interval = (int)($this->module_info->page_caching_interval ?? 0);
|
||||
$this->path = $this->module_info->path;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ class pointModel extends point
|
|||
$level_count = count($level_step ?: []);
|
||||
for ($level = 0; $level <= $level_count; $level++)
|
||||
{
|
||||
if ($point < $level_step[$level] ?? 0)
|
||||
if (isset($level_step[$level]) && $point < $level_step[$level])
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ class rssController extends rss
|
|||
*/
|
||||
function triggerRssUrlInsert($obj)
|
||||
{
|
||||
if(!$current_module_srl = Context::get('current_module_info')->module_srl)
|
||||
$current_module_srl = Context::get('current_module_info')->module_srl ?? null;
|
||||
if (!$current_module_srl)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,9 +15,12 @@ class rssModel extends rss
|
|||
function getConfig()
|
||||
{
|
||||
$config = getModel('module')->getModuleConfig('rss') ?: new stdClass;
|
||||
$config->use_total_feed = $config->use_total_feed ?: 'Y';
|
||||
$config->feed_document_count = $config->feed_document_count ?: 15;
|
||||
$config->image_url = $config->image . '?' . date('YmdHis', filemtime($config->image));
|
||||
$config->use_total_feed = $config->use_total_feed ?? 'Y';
|
||||
$config->feed_document_count = $config->feed_document_count ?? 15;
|
||||
if (isset($config->image) && $config->image)
|
||||
{
|
||||
$config->image_url = $config->image . '?' . date('YmdHis', filemtime($config->image));
|
||||
}
|
||||
|
||||
return $config;
|
||||
}
|
||||
|
|
@ -26,8 +29,8 @@ class rssModel extends rss
|
|||
{
|
||||
$config = getModel('module')->getModulePartConfig('rss', $module_srl) ?: new stdClass;
|
||||
$config->module_srl = $module_srl;
|
||||
$config->open_rss = $config->open_rss ?: 'N';
|
||||
$config->open_total_feed = $config->open_total_feed ?: 'N';
|
||||
$config->open_rss = $config->open_rss ?? 'N';
|
||||
$config->open_total_feed = $config->open_total_feed ?? 'N';
|
||||
|
||||
return $config;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -671,7 +671,7 @@ class widgetController extends widget
|
|||
return lang('msg_invalid_request');
|
||||
}
|
||||
|
||||
if(!$GLOBALS['_xe_loaded_widgets_'][$widget])
|
||||
if(!isset($GLOBALS['_xe_loaded_widgets_'][$widget]))
|
||||
{
|
||||
// Finding the location of a widget
|
||||
$oWidgetModel = getModel('widget');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue