diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d68e95 --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +# Eclipse開発用無視ファイル設定 +/.settings +/.project +/.buildpath + +# MacOSXシステムファイル無視設定 +.DS_Store +__MACOSX +thumbs.db +._* +.Spotlight-V100 +.Trashes + +# Windowsシステムファイル無視設定 +Thumbs.db +ehthumbs.db +Desktop.ini +$RECYCLE.BIN/ diff --git a/banner/CHANGES.txt b/banner/CHANGES.txt old mode 100644 new mode 100755 index 3ac6013..3b99e9f --- a/banner/CHANGES.txt +++ b/banner/CHANGES.txt @@ -1,6 +1,16 @@ - NetComomns2-banner Changelog + NetCommons2-banner Changelog =============================== +2015/03/19: Version 2.4.2.1 +- 脆弱性に関する修正 + + +2013/05/20: Version 2.4.0.1 +=============================== +- カテゴリーが0件の場合、カテゴリーが表示されないバグを修正 +- ルームのリストア時にアップロードIDが変更されないバグを修正 + + 2012/03/26: Version 2.4.0.0 =============================== - 順番に表示する設定の場合、最後のバナーが表示されないバグの修正 diff --git a/banner/components/View.class.php b/banner/components/View.class.php index 44d7511..b36475f 100644 --- a/banner/components/View.class.php +++ b/banner/components/View.class.php @@ -116,7 +116,7 @@ function &getBanners() $sql = $this->_getBannerSelectSql() . $this->getBannerFromSql() . $categoryWhereSql - . $this->_db->getOrderSQL($orderParams); + . $this->_db->getOrderSQL($orderParams, array('banner_sequence', 'block_click_count', 'all_click_count', 'insert_user_name', 'insert_time')); $banners = $this->_db->execute($sql, $params, $limit, $offset, true, array($this, '_fetchBanner')); if ($banners === false) { $this->_db->addError(); diff --git a/banner/install.ini b/banner/install.ini old mode 100644 new mode 100755 index 36c118e..985a2c4 --- a/banner/install.ini +++ b/banner/install.ini @@ -1,4 +1,4 @@ -version = "2.4.0.0" +version = "2.4.0.2" action_name = "banner_view_main_init" edit_action_name="banner_view_edit_list" block_add_action = "banner_action_edit_initialize" @@ -24,3 +24,4 @@ category_id = block_id = core.block_id room_id = core.page_id upload_id = core.upload_id +banner.image_path = text.upload_id \ No newline at end of file diff --git a/banner/templates/default/banner_view_edit_category_list.html b/banner/templates/default/banner_view_edit_category_list.html index b4ff45b..514f467 100644 --- a/banner/templates/default/banner_view_edit_category_list.html +++ b/banner/templates/default/banner_view_edit_category_list.html @@ -41,46 +41,48 @@ <{include file = "../banner_script.html"}> - + + dropZone = null; + dragArea = null; + dragDrop = null; + rows = null; + +<{/if}> <{/strip}> \ No newline at end of file diff --git a/banner/validator/Validator_UrlRequired.class.php b/banner/validator/Validator_UrlRequired.class.php old mode 100644 new mode 100755 index ba304ad..6f0841e --- a/banner/validator/Validator_UrlRequired.class.php +++ b/banner/validator/Validator_UrlRequired.class.php @@ -27,19 +27,65 @@ function validate($attributes, $errStr, $params) { if (array_key_exists('link_url', $attributes) && $attributes['banner_type'] != BANNER_TYPE_SOURCE_VALUE - && (empty($attributes['link_url']) - || $attributes['link_url'] == BANNER_DEFAULT_URL)) { - return $errStr; + ) { + if (empty($attributes['link_url']) + || $attributes['link_url'] == BANNER_DEFAULT_URL + ) { + return $errStr; + } + if (!$this->_validateProtocol($attributes['link_url'])) { + $container =& DIContainerFactory::getContainer(); + $filterChain =& $container->getComponent("FilterChain"); + $smartyAssign =& $filterChain->getFilterByName("SmartyAssign"); + return sprintf(_FORMAT_WRONG_ERROR, $smartyAssign->getLang('banner_link_url')); + } } if (array_key_exists('image_url', $attributes) && $attributes['banner_type'] == BANNER_TYPE_URL_VALUE - && (empty($attributes['image_url']) - || $attributes['image_url'] == BANNER_DEFAULT_URL)) { - return $errStr; + ) { + if (empty($attributes['image_url']) + || $attributes['image_url'] == BANNER_DEFAULT_URL + ) { + return $errStr; + } + if (!$this->_validateProtocol($attributes['image_url'])) { + $container =& DIContainerFactory::getContainer(); + $filterChain =& $container->getComponent("FilterChain"); + $smartyAssign =& $filterChain->getFilterByName("SmartyAssign"); + return sprintf(_FORMAT_WRONG_ERROR, $smartyAssign->getLang('banner_image_url')); + } } return; } + + /** + * プロトコルチェック + * + * @param string $url + * @return boolean + * @access private + */ + function _validateProtocol($url) + { + $container =& DIContainerFactory::getContainer(); + $db =& $container->getComponent("DbObject"); + $sql = "SELECT protocol FROM {textarea_protocol}"; + $protocolArr = $db->execute($sql); + if ($protocolArr === false) { + return false; + } + + if (preg_match("/^\.\//", $url) || preg_match("/^\.\.\//", $url)) { + return true; + } + foreach ($protocolArr as $i=>$protocol) { + if (preg_match("/^" . $protocol["protocol"] . "/", $url)) { + return true; + } + } + return false; + } } ?> \ No newline at end of file diff --git a/blogparts/CHANGES.txt b/blogparts/CHANGES.txt old mode 100644 new mode 100755 index a3b43ef..921e9da --- a/blogparts/CHANGES.txt +++ b/blogparts/CHANGES.txt @@ -1,6 +1,17 @@ - NetComomns2-blogparts Changelog + NetCommons2-blogparts Changelog =============================== +2015/03/19: Version 2.4.2.1 +- 脆弱性に関する修正 + + +2013/05/20: Version 2.4.0.1 +=============================== +- ブログパーツ一覧の幅を固定値に修正 + + + +=============================== 2011/06/06: Version 2.3.1.1 =============================== - MySQL5.5への対応(SQL文のTYPE=MYISAMをENGINE=MYISAMに修正) diff --git a/blogparts/components/View.class.php b/blogparts/components/View.class.php index 6321348..a654ea3 100644 --- a/blogparts/components/View.class.php +++ b/blogparts/components/View.class.php @@ -121,7 +121,7 @@ function &getBlogpartsList() $sql = "SELECT parts_id, parts_name, insert_time, insert_user_id, insert_user_name ". "FROM {blogparts_parts} ". - $this->_db->getOrderSQL($orderParams); + $this->_db->getOrderSQL($orderParams, array('parts_id', 'parts_name', 'insert_user_name', 'insert_time')); $blogpartsList = $this->_db->execute($sql); if ($blogpartsList === false) { $this->_db->addError(); diff --git a/blogparts/install.ini b/blogparts/install.ini old mode 100644 new mode 100755 index 545674b..e5bae72 --- a/blogparts/install.ini +++ b/blogparts/install.ini @@ -1,4 +1,4 @@ -version = "2.3.1.1" +version = "2.4.0.2" ; //main時の表示画面 ; //blogparts/view/main/init/Init.class.phpとmaple.iniを指定 diff --git a/blogparts/view/maple.ini b/blogparts/view/maple.ini index 5257ef1..b251d74 100644 --- a/blogparts/view/maple.ini +++ b/blogparts/view/maple.ini @@ -1,6 +1,9 @@ [DIContainer] filename = "/modules/blogparts/view/dicon.ini" +[HeaderInc] +blogparts_css = "blogparts:{$temp_name}/style.css" + [View] ; //テーマを使用するかどうかを指定 define:theme = 1 diff --git a/faq/CHANGES.txt b/faq/CHANGES.txt old mode 100644 new mode 100755 index 0d81117..9ec967b --- a/faq/CHANGES.txt +++ b/faq/CHANGES.txt @@ -1,6 +1,17 @@ - NetComomns2-faq Changelog + NetCommons2-faq Changelog =============================== +2015/03/19: Version 2.4.2.1 +- 脆弱性に関する修正 + + +2013/05/20: Version 2.4.0.1 +=============================== +- 携帯対応 +- 言語定義にプレフィックスを追加 + + + 2012/03/26: Version 2.4.0.0 =============================== - 質問の編集をすると表示件数プルダウンが1件となるバグの修正 diff --git a/faq/action/main/delete/maple.ini b/faq/action/main/delete/maple.ini index 0633a4d..69bf3a8 100644 --- a/faq/action/main/delete/maple.ini +++ b/faq/action/main/delete/maple.ini @@ -1,7 +1,3 @@ -[Mobile] -p_id = post_id -c_id = comment_id - [TokenExtra] mode = "check" action = "faq_view_main_post" @@ -11,14 +7,13 @@ key:room_id,block_id,faq_id.faq.faqExists:g = "1:lang._invalid_input" key:block_id,faq_id.faq.faqView:g = "1:lang._invalid_input" key:question_id.faq.questionEditAuth:g = "1:lang._invalid_auth" -[Action] -request = "ref:Request" -session = "ref:Session" -;whatsnewAction = "ref:whatsnewAction" - [View] main = "action:faq_view_main_init" error = "main:error.html" [MobileView] -success = "location:{location_action}&block_id={block_id}&p_id={post_id}&comment_flag={comment_flag}{session_param}" \ No newline at end of file +main = "action:faq_view_main_init" + +[Action] +request = "ref:Request" +session = "ref:Session" \ No newline at end of file diff --git a/faq/action/main/post/Post.class.php b/faq/action/main/post/Post.class.php index f58c24e..c7ebda0 100644 --- a/faq/action/main/post/Post.class.php +++ b/faq/action/main/post/Post.class.php @@ -3,7 +3,7 @@ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */ /** - * [[機能説明]] + * 質問登録アクションクラス * * @package NetCommons * @author Noriko Arai,Ryuji Masukawa @@ -28,15 +28,11 @@ class Faq_Action_Main_Post extends Action // 使用コンポーネントを受け取るため var $faqView = null; var $db = null; - //var $whatsnewAction = null; var $request = null; var $session = null; - var $configView = null; - - // 値をセットするため /** - * [[機能説明]] + * 質問登録アクション * * @access public */ @@ -84,6 +80,7 @@ function execute() return "error"; } + $this->request->setParameter('question_id', $question_id); $this->question_id = $question_id; } diff --git a/faq/action/main/post/maple.ini b/faq/action/main/post/maple.ini index 470df8b..64ade4e 100644 --- a/faq/action/main/post/maple.ini +++ b/faq/action/main/post/maple.ini @@ -1,18 +1,12 @@ [SmartyAssign] config = main.ini -[Mobile] -;j_id = journal_id -;p_id = post_id -;cat_id = category_id -;input_date:month,day,year = journal_date - [TokenExtra] mode = "check" action = "faq_view_main_post" [MobileConvert] -content = +content = [Convert] question_name.EscapeText = @@ -22,23 +16,20 @@ question_answer.EscapeTextarea = key:room_id,block_id,faq_id.faq.faqExists:g = "1:lang._invalid_input" key:block_id,faq_id.faq.faqView:g = "1:lang._invalid_input" key:question_id.faq.questionEditAuth:g = "1:lang._invalid_auth" -question_name.required = "1:lang._required,lang.question_title" -question_name.maxlength = "1,_VALIDATOR_TEXTAREA_LEN:lang._maxlength_error,lang.question_title,_VALIDATOR_TEXTAREA_LEN" -question_answer.required = "1:lang._required,lang.question_answer" -question_answer.maxlength = "1,_VALIDATOR_TEXTAREA_LEN:lang._maxlength_error,lang.question_answer,_VALIDATOR_TEXTAREA_LEN" +question_name.required = "1:lang._required,lang.faq_question_title" +question_name.maxlength = "1,_VALIDATOR_TEXTAREA_LEN:lang._maxlength_error,lang.faq_question_title,_VALIDATOR_TEXTAREA_LEN" +question_answer.required = "1:lang._required,lang.faq_question_answer" +question_answer.maxlength = "1,_VALIDATOR_TEXTAREA_LEN:lang._maxlength_error,lang.faq_question_answer,_VALIDATOR_TEXTAREA_LEN" [Action] faqView = "ref:faqView" -;faqAction = "ref:faqAction" -;whatsnewAction = "ref:whatsnewAction" request = "ref:Request" session = "ref:Session" -configView = "ref:configView" [View] success = "action:faq_view_main_init" error = "main:error.html" [MobileView] -;mail = "action:journal_action_main_mail" -;success = "location:journal_view_main_detail&block_id={block_id}&p_id={post_id}{session_param}" +success = "action:faq_view_mobile_detail" +error = "main:mobile_error.html" \ No newline at end of file diff --git a/faq/action/mobile/post/Post.class.php b/faq/action/mobile/post/Post.class.php new file mode 100644 index 0000000..d959143 --- /dev/null +++ b/faq/action/mobile/post/Post.class.php @@ -0,0 +1,35 @@ +regist)) { + return 'regist'; + } else { + return 'cancel'; + } + } +} +?> \ No newline at end of file diff --git a/faq/action/mobile/post/maple.ini b/faq/action/mobile/post/maple.ini new file mode 100644 index 0000000..550c63e --- /dev/null +++ b/faq/action/mobile/post/maple.ini @@ -0,0 +1,3 @@ +[MobileView] +regist = "action:faq_action_main_post" +cancel = "action:faq_view_main_init" \ No newline at end of file diff --git a/faq/components/View.class.php b/faq/components/View.class.php index 72be925..24e49db 100644 --- a/faq/components/View.class.php +++ b/faq/components/View.class.php @@ -105,7 +105,7 @@ function &getFaqs() { $sql = "SELECT faq_id, faq_name, insert_time, insert_user_id, insert_user_name ". "FROM {faq} ". "WHERE room_id = ? ". - $this->_db->getOrderSQL($orderParams); + $this->_db->getOrderSQL($orderParams, array('faq_id', 'faq_name', 'insert_user_name', 'insert_time')); $result = $this->_db->execute($sql, $params, $limit, $offset); if ($result === false) { $this->_db->addError(); diff --git a/faq/install.ini b/faq/install.ini old mode 100644 new mode 100755 index 8ea319d..ab0f123 --- a/faq/install.ini +++ b/faq/install.ini @@ -1,4 +1,4 @@ -version = "2.4.0.0" +version = "2.4.0.2" action_name = "faq_view_main_init" edit_action_name = "faq_view_edit_list" block_add_action = "faq_view_edit_create" @@ -15,6 +15,9 @@ visible_item = "10" faq_list_row_count = "10" faq_authority = "_AUTH_CHIEF" +[Mobile] +mobile_action_name = "faq_view_main_init" + [Operation] select_sql = "SELECT {faq}.faq_id,{faq}.faq_name FROM {faq_block},{faq} WHERE {faq_block}.faq_id = {faq}.faq_id AND {faq_block}.block_id = ?" select_args = "block_id" diff --git a/faq/language/chinese/main.ini b/faq/language/chinese/main.ini index 8db93e8..30fb677 100644 --- a/faq/language/chinese/main.ini +++ b/faq/language/chinese/main.ini @@ -21,7 +21,7 @@ faq_catlist = "显示分类选择列表" faq_show_catlist = "显示" faq_no_show_catlist = "不显示" faq_none_exist = "暂无可显示的常见问题." -noneexists_category = "暂无常见问题" +faq_noneexists_category = "暂无常见问题" define:FAQ_NAME = "常见问题集" define:FAQ_NOCATEGORY = "尚未指定" faq_nocategory = FAQ_NOCATEGORY @@ -31,17 +31,17 @@ faq_display_item_all = "全部显示" faq_display_item = "" faq_post_category = "类别" -question_none_post = "暂无可显示的常见问题." -question_nocategory = "尚未指定" -question_change_seq = "改变显示顺序" -question_change_seq_end = "结束修改" -question_delete_confirm = "您确定要删除此问题吗?" -question_new_title = "添加新问题" -question_category_select = "选择分类" -question_back = "上一页" -question_next = "下一页" -question_title = "问题" -question_answer = "回答" -question_edit = "编辑" -question_del = "删除" -question_hide = "隐藏" +faq_question_none_post = "暂无可显示的常见问题." +faq_question_nocategory = "尚未指定" +faq_question_change_seq = "改变显示顺序" +faq_question_change_seq_end = "结束修改" +faq_question_delete_confirm = "您确定要删除此问题吗?" +faq_question_new_title = "添加新问题" +faq_question_category_select = "选择分类" +faq_question_back = "上一页" +faq_question_next = "下一页" +faq_question_title = "问题" +faq_question_answer = "回答" +faq_question_edit = "编辑" +faq_question_del = "删除" +faq_question_hide = "隐藏" diff --git a/faq/language/english/main.ini b/faq/language/english/main.ini index 9da5a1d..43e1599 100644 --- a/faq/language/english/main.ini +++ b/faq/language/english/main.ini @@ -21,7 +21,7 @@ faq_catlist = "Category selector" faq_show_catlist = "Visible" faq_no_show_catlist = "Invisible" faq_none_exist = "No FAQ to display" -noneexists_category = "No FAQ found" +faq_noneexists_category = "No FAQ found" define:FAQ_NAME = "FAQ" define:FAQ_NOCATEGORY = "Not specified" faq_nocategory = FAQ_NOCATEGORY @@ -31,17 +31,17 @@ faq_display_item_all = "All" faq_display_item = "" faq_post_category = "Category" -question_none_post = "No question found." -question_nocategory = "Not specified" -question_change_seq = "Change order" -question_change_seq_end = "Display order changed" -question_delete_confirm = "Deleting this question.\n Are you sure?" -question_new_title = "New question" -question_category_select = "Category" -question_back = "Prev" -question_next = "Next" -question_title = "Question" -question_answer = "Answer" -question_edit = "Edit" -question_del = "Delete" -question_hide = "Hide" +faq_question_none_post = "No question found." +faq_question_nocategory = "Not specified" +faq_question_change_seq = "Change order" +faq_question_change_seq_end = "Display order changed" +faq_question_delete_confirm = "Deleting this question.\n Are you sure?" +faq_question_new_title = "New question" +faq_question_category_select = "Category" +faq_question_back = "Prev" +faq_question_next = "Next" +faq_question_title = "Question" +faq_question_answer = "Answer" +faq_question_edit = "Edit" +faq_question_del = "Delete" +faq_question_hide = "Hide" diff --git a/faq/language/japanese/main.ini b/faq/language/japanese/main.ini index 96e061b..02ec784 100644 --- a/faq/language/japanese/main.ini +++ b/faq/language/japanese/main.ini @@ -21,7 +21,7 @@ faq_catlist = "カテゴリの表示" faq_show_catlist = "表示する" faq_no_show_catlist = "表示しない" faq_none_exist = "現在作成されているFAQはありません。" -noneexists_category = "一件も該当カテゴリはありません。" +faq_noneexists_category = "一件も該当カテゴリはありません。" define:FAQ_NAME = "FAQ" define:FAQ_NOCATEGORY = "カテゴリを指定しない" faq_nocategory = FAQ_NOCATEGORY @@ -31,17 +31,17 @@ faq_display_item_all = "全て" faq_display_item = "件" faq_post_category = "カテゴリ" -question_none_post = "一件も該当質問はありません。" -question_nocategory = "カテゴリを指定しない" -question_change_seq = "表示順変更" -question_change_seq_end = "表示順変更終了" -question_delete_confirm = "決定するとこの質問が削除されます。\nよろしいですか?" -question_new_title = "項目を作成する" -question_category_select = "カテゴリ選択" -question_back = "前" -question_next = "次" -question_title = "質問" -question_answer = "答え" -question_edit = "編集" -question_del = "削除" -question_hide = "閉じる" +faq_question_none_post = "一件も該当質問はありません。" +faq_question_nocategory = "カテゴリを指定しない" +faq_question_change_seq = "表示順変更" +faq_question_change_seq_end = "表示順変更終了" +faq_question_delete_confirm = "決定するとこの質問が削除されます。\nよろしいですか?" +faq_question_new_title = "項目を作成する" +faq_question_category_select = "カテゴリ選択" +faq_question_back = "前" +faq_question_next = "次" +faq_question_title = "質問" +faq_question_answer = "答え" +faq_question_edit = "編集" +faq_question_del = "削除" +faq_question_hide = "閉じる" diff --git a/faq/templates/default/faq_mobile_init_control.html b/faq/templates/default/faq_mobile_init_control.html new file mode 100644 index 0000000..99556dd --- /dev/null +++ b/faq/templates/default/faq_mobile_init_control.html @@ -0,0 +1,34 @@ +<{strip}> +<{* カテゴリ、表示件数切り替え *}> +
+
+
+ + + + + + <{if ($action.show_cate_list==true)}> + + <{/if}> + + + + + <{$session_form|smarty:nodefaults}> +
+
+
+<{/strip}> diff --git a/faq/templates/default/faq_mobile_init_page.html b/faq/templates/default/faq_mobile_init_page.html new file mode 100644 index 0000000..244b1fb --- /dev/null +++ b/faq/templates/default/faq_mobile_init_page.html @@ -0,0 +1,35 @@ +<{strip}> +<{* ページ切り替え *}> +<{if $action.total_page > 1 }> + +
+ <{$lang._mobile_page|smarty:nodefaults}> + + <{if $action.prev_link}> + + "/> + <{$lang.faq_question_back|smarty:nodefaults}> + + <{/if}> + <{section name=cnt loop=$action.link_array}> +   + <{if $action.now_page==$action.link_array[cnt]}> + <{$action.link_array[cnt]}> + <{else}> + + <{$action.link_array[cnt]}> + + <{/if}> + <{/section}> + <{if $action.next_link}> +   + + <{$lang.faq_question_next|smarty:nodefaults}> + "/> + + <{/if}> +
+ +<{/if}> + +<{/strip}> diff --git a/faq/templates/default/faq_mobile_post.html b/faq/templates/default/faq_mobile_post.html new file mode 100644 index 0000000..05f527b --- /dev/null +++ b/faq/templates/default/faq_mobile_post.html @@ -0,0 +1,23 @@ +<{strip}> +<{* FAQ投稿画面 *}> +
+ + + + + + <{$token_form|smarty:nodefaults}> + <{$session_form|smarty:nodefaults}> + + <{if ($smarty.session._smartphone_flag == _ON) }> + <{include file="faq_mobile_post_smart.html"}> + <{else}> + <{include file="faq_mobile_post_feature.html"}> + <{/if}> + +
+ + +
+
+<{/strip}> diff --git a/faq/templates/default/faq_mobile_post_feature.html b/faq/templates/default/faq_mobile_post_feature.html new file mode 100644 index 0000000..0d2f8fb --- /dev/null +++ b/faq/templates/default/faq_mobile_post_feature.html @@ -0,0 +1,30 @@ +<{strip}> +<{* FAQ投稿画面携帯用 *}> +<{if ($action.cate_can_select==false)}> + +<{else}> +
+ <{$lang.faq_post_category|smarty:nodefaults}> +
+
+ +
+<{/if}> + +
+ <{$lang.faq_question_title|smarty:nodefaults}> +
+
+ +
+ +
<{$lang.faq_question_answer|smarty:nodefaults}>
+
+ +
+<{/strip}> diff --git a/faq/templates/default/faq_mobile_post_smart.html b/faq/templates/default/faq_mobile_post_smart.html new file mode 100644 index 0000000..3045ec5 --- /dev/null +++ b/faq/templates/default/faq_mobile_post_smart.html @@ -0,0 +1,26 @@ +<{strip}> +<{* FAQ投稿画面スマホ用 *}> +<{if ($action.cate_can_select==false)}> + +<{else}> +
+ + +
+<{/if}> + +
+ + +
+ +
+ + +
+<{/strip}> diff --git a/faq/templates/default/faq_mobile_view_detail.html b/faq/templates/default/faq_mobile_view_detail.html new file mode 100644 index 0000000..f25584c --- /dev/null +++ b/faq/templates/default/faq_mobile_view_detail.html @@ -0,0 +1,31 @@ +<{strip}> +<{* FAQ携帯・スマホ詳細表示画面 *}> +

+ Q"/> + <{$action.question.question_name|smarty:nodefaults}> +

+

+ A"/> + <{$action.question.question_answer|smarty:nodefaults|img_style_rgb_to_hex|wysiwig_convert_url}> +

+ +<{if $action.question.has_edit_auth}> +
+ + <{$lang._edit|smarty:nodefaults}> + + <{if ($smarty.session._smartphone_flag != _ON) }> + <{$lang._separator|smarty:nodefaults}> + <{/if}> + + <{$lang._delete|smarty:nodefaults}> + +
+<{/if}> +
+
+ + <{$lang._btn_prev_arrow|smarty:nodefaults}> + +
+<{/strip}> diff --git a/faq/templates/default/faq_mobile_view_main_init.html b/faq/templates/default/faq_mobile_view_main_init.html new file mode 100644 index 0000000..bfc4823 --- /dev/null +++ b/faq/templates/default/faq_mobile_view_main_init.html @@ -0,0 +1,42 @@ +<{strip}> +<{* FAQ携帯スマホ一覧表示画面 *}> +<{* タイトル *}> +

<{$action.faq_obj.faq_name}>

+ +<{include file="faq_mobile_init_control.html"}> +<{include file="faq_mobile_init_page.html"}> + +

+ <{if $action.question_count == 0}> + <{$lang.faq_noneexists_category|smarty:nodefaults}> + <{else}> +

+ <{/if}> +

+
+ +<{if $action.faq_obj.has_post_auth}> + + " style="vertical-align:middle;" /> + <{$lang.faq_question_new_title|smarty:nodefaults}> + +<{/if}> +
+
+ <{if ($action.block_num == 1 ) }> + + <{else}> + + <{/if}> + <{$lang._btn_prev_arrow|smarty:nodefaults}> + +
+<{/strip}> \ No newline at end of file diff --git a/faq/templates/default/faq_view_edit_category.html b/faq/templates/default/faq_view_edit_category.html index 0c1f1a2..a4aea14 100644 --- a/faq/templates/default/faq_view_edit_category.html +++ b/faq/templates/default/faq_view_edit_category.html @@ -1,4 +1,5 @@ <{strip}> +<{* カテゴリー編集画面用テンプレート *}>
<{$action.faq_obj.faq_name}> @@ -17,7 +18,7 @@ <{ include file="faq_view_edit_category_comp.html" }>
<{if $action.category_count == 0}> - <{$lang.noneexists_category|smarty:nodefaults}> + <{$lang.faq_noneexists_category|smarty:nodefaults}> <{else}>
<{foreach item=cat from=$action.categories}> diff --git a/faq/templates/default/faq_view_main_init.html b/faq/templates/default/faq_view_main_init.html index dcd2030..4c7643c 100644 --- a/faq/templates/default/faq_view_main_init.html +++ b/faq/templates/default/faq_view_main_init.html @@ -1,4 +1,5 @@ <{strip}> +<{* 質問一覧画面用テンプレート *}>
<{* タイトル *}> <{* @@ -10,14 +11,14 @@ <{if $action.faq_obj.has_post_auth}> - + "/> - <{$lang.question_new_title|smarty:nodefaults}> + <{$lang.faq_question_new_title|smarty:nodefaults}> <{if $smarty.session._auth_id >= $smarty.const._AUTH_CHIEF}> <{$lang._separator|smarty:nodefaults}> - - <{$lang.question_change_seq|smarty:nodefaults}> + + <{$lang.faq_question_change_seq|smarty:nodefaults}> <{/if}> <{/if}> @@ -31,7 +32,7 @@ <{if $action.question_count == 0}> - <{$lang.question_none_post|smarty:nodefaults}> + <{$lang.faq_question_none_post|smarty:nodefaults}> <{else}>
@@ -58,16 +59,16 @@
<{if $post.has_edit_auth}> - + <{$lang._edit|smarty:nodefaults}> <{$lang._separator|smarty:nodefaults}> - + <{$lang._delete|smarty:nodefaults}> <{$lang._separator|smarty:nodefaults}> <{/if}> - <{$lang.question_hide|smarty:nodefaults}> + <{$lang.faq_question_hide|smarty:nodefaults}>
diff --git a/faq/templates/default/faq_view_main_init_control.html b/faq/templates/default/faq_view_main_init_control.html index fa933c7..3a9d090 100644 --- a/faq/templates/default/faq_view_main_init_control.html +++ b/faq/templates/default/faq_view_main_init_control.html @@ -1,14 +1,14 @@ <{strip}> +<{* 質問一覧画面ヘッダー部用テンプレート *}> - - + - <{/if}> + <{if ($action.cate_can_select==false)}> + + <{/if}> - - <{$lang.question_title|smarty:nodefaults}> - - - - - - <{$lang.question_answer|smarty:nodefaults}> - - - - + + <{$lang.faq_question_title|smarty:nodefaults}> + + + + + + <{$lang.faq_question_answer|smarty:nodefaults}> + + + +
diff --git a/faq/templates/default/faq_view_main_seq.html b/faq/templates/default/faq_view_main_seq.html index cea5bd2..d386b3c 100644 --- a/faq/templates/default/faq_view_main_seq.html +++ b/faq/templates/default/faq_view_main_seq.html @@ -1,30 +1,30 @@ <{strip}> -<{* タスク表示順変更用テンプレート *}> +<{* 質問表示順変更用テンプレート *}> <{if $action.question_count == 0}> - <{$lang.question_none_post|smarty:nodefaults}> + <{$lang.faq_question_none_post|smarty:nodefaults}> <{else}> - - <{foreach from=$action.questions item=question}> - - - - - <{/foreach}> -
- - <{$question.question_name|regex_replace:"/\n/":"
"}> -
+ + <{foreach from=$action.questions item=question}> + + + + + <{/foreach}> +
+ + <{$question.question_name|regex_replace:"/\n/":"
"}> +
<{/if}> <{include file = "../faq_script.html"}> +<{if $action.question_count > 0}> +<{/if}> <{/strip}> \ No newline at end of file diff --git a/faq/templates/faq_script.html b/faq/templates/faq_script.html index 3690fa2..6475018 100644 --- a/faq/templates/faq_script.html +++ b/faq/templates/faq_script.html @@ -9,7 +9,9 @@ <{/if}> <{if $action_name == "faq_view_main_init" && !empty($action.question_id|smarty:nodefaults)}> - commonCls.displayVisible($('_faq_answer_<{$action.question_id}>')); + if ($('_faq_answer_<{$action.question_id}>')) { + commonCls.displayVisible($('_faq_answer_<{$action.question_id}>')); + } <{/if}> <{/strip}> \ No newline at end of file diff --git a/faq/validator/Validator_QuestionView.class.php b/faq/validator/Validator_QuestionView.class.php new file mode 100644 index 0000000..cf669f3 --- /dev/null +++ b/faq/validator/Validator_QuestionView.class.php @@ -0,0 +1,47 @@ +getComponent('faqView'); + + $question = $faqView->getQuestion($attributes['question_id']); + if (empty($question)) { + return $errStr; + } + + $question = $question[0]; + if ($question['faq_id'] != $attributes['faq_id']) { + return $errStr; + } + + $request =& $container->getComponent('Request'); + $request->setParameter('question', $question); + + return; + } +} +?> \ No newline at end of file diff --git a/faq/view/main/init/Init.class.php b/faq/view/main/init/Init.class.php index 255d14d..99e2443 100644 --- a/faq/view/main/init/Init.class.php +++ b/faq/view/main/init/Init.class.php @@ -3,7 +3,7 @@ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */ /** - * [[機能説明]] + * 質問一覧画面表示アクションクラス * * @package NetCommons * @author Ka @@ -19,20 +19,23 @@ class Faq_View_Main_Init extends Action var $category_id = null; var $display_row = null; var $question_id = null; - + var $block_id = null; + // バリデートによりセット var $faq_obj = null; // 使用コンポーネントを受け取るため var $faqView = null; var $session = null; - + var $mobileView = null; + // 値をセットするため var $categories = null; var $question_count = null; var $question_list = null; var $show_cate_list = true; - + var $block_num = null; + //ページ var $data_cnt = 0; var $now_page = null; @@ -42,13 +45,18 @@ class Faq_View_Main_Init extends Action var $disp_begin = 0; var $disp_end = 0; var $link_array = NULL; - /** - * [[機能説明]] - * - * @access public - */ - function execute() - { + + /** + * 質問一覧画面表示アクション + * + * @access public + */ + function execute() + { + if ($this->session->getParameter('_mobile_flag') == true) { + $this->block_num = $this->mobileView->getCountForBlockInPageWithBlock($this->block_id); + } + if(empty($this->faq_id)) { $this->faq_id = $this->faq_obj['faq_id']; } diff --git a/faq/view/main/init/maple.ini b/faq/view/main/init/maple.ini index 9e060dd..5291b53 100644 --- a/faq/view/main/init/maple.ini +++ b/faq/view/main/init/maple.ini @@ -1,7 +1,15 @@ +[TokenExtra] +mode = "build" +action = "faq_view_main_post" + [View] success = "faq_view_main_init.html" error = "main:error.html" -[TokenExtra] -mode = "build" -action = "faq_view_main_post" \ No newline at end of file +[MobileView] +define:theme = 1 +success = "faq_mobile_view_main_init.html" +error = "main:mobile_error.html" + +[Action] +mobileView = "ref:mobileView" \ No newline at end of file diff --git a/faq/view/mobile/delete/Delete.class.php b/faq/view/mobile/delete/Delete.class.php new file mode 100644 index 0000000..721fbbe --- /dev/null +++ b/faq/view/mobile/delete/Delete.class.php @@ -0,0 +1,33 @@ + diff --git a/faq/view/mobile/delete/maple.ini b/faq/view/mobile/delete/maple.ini new file mode 100644 index 0000000..191bb59 --- /dev/null +++ b/faq/view/mobile/delete/maple.ini @@ -0,0 +1,12 @@ +[TokenExtra] +mode = "build" +action = "faq_view_main_post" + +[ValidateDef] +block_id.required = "1:lang._invalid_input" + +[MobileView] +success = "main:mobile_dialog.html" +regist_action = "faq_action_main_delete" +cancel_action = "faq_view_mobile_detail" +message = "lang.faq_question_delete_confirm" \ No newline at end of file diff --git a/faq/view/mobile/detail/Detail.class.php b/faq/view/mobile/detail/Detail.class.php new file mode 100644 index 0000000..5c64c2e --- /dev/null +++ b/faq/view/mobile/detail/Detail.class.php @@ -0,0 +1,32 @@ + diff --git a/faq/view/mobile/detail/maple.ini b/faq/view/mobile/detail/maple.ini new file mode 100644 index 0000000..683e1ec --- /dev/null +++ b/faq/view/mobile/detail/maple.ini @@ -0,0 +1,8 @@ +[ValidateDef] +key:room_id,block_id,faq_id.faq.faqExists:g = "1:lang.faq_none_exist" +key:block_id,faq_id.faq.faqView:g = "1:lang.faq_none_exist" +key:faq_id,question_id.faq.questionView:g = "1:lang._invalid_input" + +[MobileView] +define:theme = 1 +success = "faq_mobile_view_detail.html" \ No newline at end of file diff --git a/multimedia/CHANGES.txt b/multimedia/CHANGES.txt old mode 100644 new mode 100755 index 0dd04c9..1f3d451 --- a/multimedia/CHANGES.txt +++ b/multimedia/CHANGES.txt @@ -1,6 +1,27 @@ - NetComomns2-multimedia Changelog + NetCommons2-multimedia Changelog =============================== +2019/03/30: Version 2.4.3.0 +=============================== +- 動画再生をjplayerから