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

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-08-03 14:04:20 +09:00
commit 818897fed4
8 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -737,7 +737,7 @@ class boardController extends board
}
$url = getUrl('', 'mid', $mid, 'member_srl', $obj->member_srl);
getController('member')->addMemberPopupMenu($url, 'cmd_view_own_document', '');
getController('member')->addMemberPopupMenu($url, 'cmd_view_own_document', '', 'self', 'board_own_document');
}
/**

12
modules/board/board.view.php
View file

@ -1216,9 +1216,19 @@ class boardView extends board
{
throw new Rhymix\Framework\Exceptions\NotPermitted;
}
$document_srl = Context::get('document_srl');
if(!$document_srl)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$updatelog = DocumentModel::getDocumentUpdateLog($document_srl);
if(!$updatelog->toBool())
{
return $updatelog;
}
Context::set('total_count', $updatelog->page_navigation->total_count);
Context::set('total_page', $updatelog->page_navigation->total_page);
Context::set('page', $updatelog->page);

4
modules/editor/skins/simpleeditor/js/simpleeditor.js
View file

@ -44,7 +44,7 @@
str = String(str);
str = str.replace(/<!--(.*?)-->/gs, '');
str = str.replace(/<\/?(\?xml|meta|link|font|span|style|script|noscript|frame|noframes|(?:st1|o):[a-z0-9]+)\b[^>]*?>/ig, '');
str = str.replace(/(id|class|style|on(?:[a-z0-9]+)|Mso(?:[a-z0-9]+))="[^"]*"/ig, '');
str = str.replace(/\b(id|class|style|on(?:[a-z0-9]+)|Mso(?:[a-z0-9]+))="[^"]*"/ig, '');
str = str.replace(/(<\/?)div(\W)/g, '$1p$2');
if (!str.match(/<\/?p>/)) {
str = '<p>' + str + '</p>';
@ -78,7 +78,7 @@
// Set editor sequence and other info to the form.
insert_form[0].setAttribute('editor_sequence', editor_sequence);
editorRelKeys[editor_sequence] = {};
editorRelKeys[editor_sequence].primary = insert_form.find("input[name='" + primary_key + "']");
editorRelKeys[editor_sequence].primary = insert_form.find("input[name='" + primary_key + "']").get(0);
editorRelKeys[editor_sequence].content = content_input;
editorRelKeys[editor_sequence].func = editorGetContent;

4
modules/editor/tpl/admin_index.html
View file

@ -105,7 +105,7 @@
<!--@endforeach-->
</select>
<select name="comment_editor_colorset" class="editor_colorset_selector">
<!--@foreach($editor_skin_list[$editor_config->editor_skin]->colorset ?: [] as $colorset)-->
<!--@foreach($editor_skin_list[$editor_config->comment_editor_skin]->colorset ?: [] as $colorset)-->
<option value="{$colorset->name}" selected="selected"|cond="$colorset->name === $editor_config->comment_editor_colorset">{$colorset->title}</option>
<!--@endforeach-->
</select>
@ -134,7 +134,7 @@
<!--@endforeach-->
</select>
<select name="mobile_comment_editor_colorset" class="editor_colorset_selector">
<!--@foreach($editor_skin_list[$editor_config->mobile_editor_skin]->colorset ?: [] as $colorset)-->
<!--@foreach($editor_skin_list[$editor_config->mobile_comment_editor_skin]->colorset ?: [] as $colorset)-->
<option value="{$colorset->name}" selected="selected"|cond="$colorset->name === $editor_config->mobile_comment_editor_colorset">{$colorset->title}</option>
<!--@endforeach-->
</select>

4
modules/editor/tpl/editor_module_config.html
View file

@ -62,7 +62,7 @@
<!--@endforeach-->
</select>
<select name="comment_editor_colorset" class="editor_colorset_selector">
<!--@foreach($editor_skin_list[$editor_config->editor_skin]->colorset ?: [] as $colorset)-->
<!--@foreach($editor_skin_list[$editor_config->comment_editor_skin]->colorset ?: [] as $colorset)-->
<option value="{$colorset->name}" selected="selected"|cond="$colorset->name === $editor_config->comment_editor_colorset">{$colorset->title}</option>
<!--@endforeach-->
</select>
@ -117,7 +117,7 @@
<!--@endforeach-->
</select>
<select name="mobile_comment_editor_colorset" class="editor_colorset_selector">
<!--@foreach($editor_skin_list[$editor_config->mobile_editor_skin]->colorset ?: [] as $colorset)-->
<!--@foreach($editor_skin_list[$editor_config->mobile_comment_editor_skin]->colorset ?: [] as $colorset)-->
<option value="{$colorset->name}" selected="selected"|cond="$colorset->name === $editor_config->mobile_comment_editor_colorset">{$colorset->title}</option>
<!--@endforeach-->
</select>

5
modules/member/member.controller.php
View file

@ -2566,7 +2566,7 @@ class memberController extends member
/**
* Nickname and click Log In to add a pop-up menu that appears when the method
*/
function addMemberPopupMenu($url, $str, $icon = '', $target = 'self')
function addMemberPopupMenu($url, $str, $icon = '', $target = 'self', $class = '')
{
$member_popup_menu_list = Context::get('member_popup_menu_list');
if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
@ -2574,7 +2574,8 @@ class memberController extends member
$obj = new stdClass;
$obj->url = $url;
$obj->str = $str;
$obj->icon = $icon;
$obj->class = $class;
$obj->icon = $icon ?: null;
$obj->target = $target;
$member_popup_menu_list[] = $obj;

4
modules/member/member.model.php
View file

@ -212,13 +212,13 @@ class memberModel extends member
// View homepage info
if($member_info->homepage && $homepage_is_public)
{
$oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', 'blank');
$oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', 'blank', 'homepage');
}
// View blog info
if($member_info->blog && $blog_is_public)
{
$oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', 'blank');
$oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', 'blank', 'blog');
}
// Call a trigger (after)