fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 04:52:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1480 misc errors in PHP 8.0

Browse source
This commit is contained in:
Kijin Sung 2020-12-11 21:38:39 +09:00
parent 6d4fe58c2f
commit 372e392049
6 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/autoinstall/tpl/list.html
View file

@ -173,7 +173,7 @@
<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page', $page_navigation->last_page)}" title="{$page_navigation->last_page}">{$lang->last_page} &raquo;</a></li> <li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page', $page_navigation->last_page)}" title="{$page_navigation->last_page}">{$lang->last_page} &raquo;</a></li>
</ul> </ul>
</form> </form>
<form action="./" class="search x_input-append x_pull-right" no-error-return-url="true" cond="$act!=dispAutoinstallAdminInstalledPackages"> <form action="./" class="search x_input-append x_pull-right" no-error-return-url="true" cond="$act !== 'dispAutoinstallAdminInstalledPackages'">
<input type="hidden" name="module" value="admin" /> <input type="hidden" name="module" value="admin" />
<input type="hidden" name="act" value="{$act}" /> <input type="hidden" name="act" value="{$act}" />
<input type="hidden" name="order_target" value="{$order_target}" /> <input type="hidden" name="order_target" value="{$order_target}" />

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

@ -132,7 +132,7 @@ class fileAdminController extends file
$config->allow_outlink_site = Context::get('allow_outlink_site'); $config->allow_outlink_site = Context::get('allow_outlink_site');
$config->allow_multimedia_direct_download = Context::get('allow_multimedia_direct_download') === 'Y' ? 'Y' : 'N'; $config->allow_multimedia_direct_download = Context::get('allow_multimedia_direct_download') === 'Y' ? 'Y' : 'N';
$config->download_short_url = Context::get('download_short_url') === 'Y' ? 'Y' : 'N'; $config->download_short_url = Context::get('download_short_url') === 'Y' ? 'Y' : 'N';
$config->inline_download_format = array_map('utf8_trim', Context::get('inline_download_format')); $config->inline_download_format = array_map('utf8_trim', Context::get('inline_download_format') ?: []);
// Save and redirect // Save and redirect
$output = getController('module')->insertModuleConfig('file', $config); $output = getController('module')->insertModuleConfig('file', $config);

2
modules/integration_search/integration_search.admin.controller.php
View file

@ -25,7 +25,7 @@ class integration_searchAdminController extends integration_search
{ {
// Get configurations (using module model object) // Get configurations (using module model object)
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('integration_search'); $config = $oModuleModel->getModuleConfig('integration_search') ?: new stdClass;
$config = (object)get_object_vars($config); $config = (object)get_object_vars($config);
$config->skin = Context::get('skin'); $config->skin = Context::get('skin');

6
modules/member/tpl/login_config.html
View file

@ -8,15 +8,15 @@
<p class="x_control-label">{$lang->identifier}</p> <p class="x_control-label">{$lang->identifier}</p>
<div class="x_controls"> <div class="x_controls">
<label class="x_inline" for="identifiers_user_id"> <label class="x_inline" for="identifiers_user_id">
<input type="checkbox" name="identifiers[]" id="identifiers_user_id" value="user_id" checked="checked"|cond="$config->identifier === 'user_id' || in_array('user_id', $config->identifiers)" /> <input type="checkbox" name="identifiers[]" id="identifiers_user_id" value="user_id" checked="checked"|cond="$config->identifier === 'user_id' || (is_array($config->identifiers) && in_array('user_id', $config->identifiers))" />
{$lang->user_id} {$lang->user_id}
</label> </label>
<label class="x_inline" for="identifiers_email_address"> <label class="x_inline" for="identifiers_email_address">
<input type="checkbox" name="identifiers[]" id="identifiers_email_address" value="email_address" checked="checked"|cond="$config->identifier === 'email_address' || in_array('email_address', $config->identifiers)" /> <input type="checkbox" name="identifiers[]" id="identifiers_email_address" value="email_address" checked="checked"|cond="$config->identifier === 'email_address' || (is_array($config->identifiers) && in_array('email_address', $config->identifiers))" />
{$lang->email_address} {$lang->email_address}
</label> </label>
<label class="x_inline" for="identifiers_phone_number"> <label class="x_inline" for="identifiers_phone_number">
<input type="checkbox" name="identifiers[]" id="identifiers_phone_number" value="phone_number" checked="checked"|cond="$config->identifier === 'phone_number' || in_array('phone_number', $config->identifiers)" /> <input type="checkbox" name="identifiers[]" id="identifiers_phone_number" value="phone_number" checked="checked"|cond="$config->identifier === 'phone_number' || (is_array($config->identifiers) && in_array('phone_number', $config->identifiers))" />
{$lang->phone_number} {$lang->phone_number}
</label> </label>
<p class="x_help-block">{$lang->about_identifier}</p> <p class="x_help-block">{$lang->about_identifier}</p>

5
modules/poll/poll.admin.view.php
View file

@ -50,6 +50,10 @@ class pollAdminView extends poll
// Get the list // Get the list
$oPollAdminModel = getAdminModel('poll'); $oPollAdminModel = getAdminModel('poll');
$output = $oPollAdminModel->getPollListWithMember($args); $output = $oPollAdminModel->getPollListWithMember($args);
if (!$output->toBool())
{
return $output;
}
// check poll type. document or comment // check poll type. document or comment
if(is_array($output->data) && count($output->data)) if(is_array($output->data) && count($output->data))
@ -88,7 +92,6 @@ class pollAdminView extends poll
Context::set('page', $output->page); Context::set('page', $output->page);
Context::set('poll_list', $output->data); Context::set('poll_list', $output->data);
Context::set('page_navigation', $output->page_navigation); Context::set('page_navigation', $output->page_navigation);
Context::set('module_list', $module_list);
$security = new Security(); $security = new Security();
$security->encodeHTML('poll_list..title', 'poll_list..nick_name'); $security->encodeHTML('poll_list..title', 'poll_list..nick_name');

6
modules/widget/widget.controller.php
View file

@ -31,10 +31,10 @@ class widgetController extends widget
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
$skin_info = $oModuleModel->loadSkinInfo($path, $skin); $skin_info = $oModuleModel->loadSkinInfo($path, $skin);
for($i=0;$i<count($skin_info->colorset);$i++) $colorset_list = [];
foreach($skin_info->colorset ?: [] as $colorset)
{ {
$colorset = sprintf('%s|@|%s', $skin_info->colorset[$i]->name, $skin_info->colorset[$i]->title); $colorset_list[] = sprintf('%s|@|%s', $colorset->name, $colorset->title);
$colorset_list[] = $colorset;
} }
if(count($colorset_list)) $colorsets = implode("\n", $colorset_list); if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);