Merge branch 'master' into '011_tokudome'

Masterから差分を取得

See merge request !26

@@ -8,7 +8,7 @@ images
 php5.6-back
 php5.6-back
 configuration.php
 configuration.php
 
 
-.htpasswd
+.ht*
 
 
 # TODO 環境整備後削除
 # TODO 環境整備後削除
 god-hand
 god-hand

-# AddHandler x-httpd-php5619 .php
-
-
-Options +SymLinksIfOwnerMatch
-
-Options -Indexes
-
-RewriteEngine on
-
-
-## Begin - Rewrite rules to block out some common exploits.
-# If you experience problems on your site then comment out the operations listed 
-# below by adding a # to the beginning of the line.
-# This attempts to block the most common type of exploit `attempts` on Joomla!
-#
-# Block any script trying to base64_encode data within the URL.
-RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
-# Block any script that includes a <script> tag in URL.
-RewriteCond %{QUERY_STRING} (<|%3C)([^s]*s)+cript.*(>|%3E) [NC,OR]
-# Block any script trying to set a PHP GLOBALS variable via URL.
-RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
-# Block any script trying to modify a _REQUEST variable via URL.
-RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
-# Return 403 Forbidden header and show the content of the root home page
-RewriteRule .* index.php [F]
-#
-## End - Rewrite rules to block out some common exploits.
-
-## Begin - Custom redirects
-#
-# If you need to redirect some pages, or set a canonical non-www to
-# www redirect (or vice versa), place that code here. Ensure those
-# redirects use the correct RewriteRule syntax and the [R=301,L] flags.
-#
-## End - Custom redirects
-
-##
-# Uncomment the following line if your webserver's URL
-# is not directly related to physical file paths.
-# Update Your Joomla! Directory (just / for root).
-##
-
-# RewriteBase /
-
-## Begin - Joomla! core SEF Section.
-#
-RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-#
-# If the requested path and file is not /index.php and the request
-# has not already been internally rewritten to the index.php script
-RewriteCond %{REQUEST_URI} !^/index\.php
-# and the requested path and file doesn't directly match a physical file
-RewriteCond %{REQUEST_FILENAME} !-f
-# and the requested path and file doesn't directly match a physical folder
-RewriteCond %{REQUEST_FILENAME} !-d
-# internally rewrite the request to the index.php script
-RewriteRule .* index.php [L]
-#
-## End - Joomla! core SEF Section.
-
-
-RewriteEngine On
-# RewriteCond %{HTTPS} off
-# RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R,L]
-
-#20200122 - IPアクセスリダイレクトnozaki
-RewriteBase /
-RewriteCond %{HTTP_HOST} ^18\.178\.92\.128$ [NC]
-RewriteRule .* https://www.nifs-k.ac.jp%{REQUEST_URI} [R=302,L]
-
-# 20200809 gitignore アクセス禁止
-RedirectMatch 404 /\.git
-
-<IfModule mod_siteguard.c>
-  SiteGuard_User_ExcludeSig ip(202.95.45.168)
-  SiteGuard_User_ExcludeSig ip(202.24.160.0/21)
-  SiteGuard_User_ExcludeSig ip(210.137.6.192/26)
-  SiteGuard_User_ExcludeSig ip(210.237.39.72)
-  SiteGuard_User_ExcludeSig ip(210.237.36.185)
-  SiteGuard_User_ExcludeSig ip(18.178.92.128)
-</IfModule>

+# AddHandler x-httpd-php5619 .php
+
+
+Options +SymLinksIfOwnerMatch
+
+Options -Indexes
+
+RewriteEngine on
+
+
+## Begin - Rewrite rules to block out some common exploits.
+# If you experience problems on your site then comment out the operations listed 
+# below by adding a # to the beginning of the line.
+# This attempts to block the most common type of exploit `attempts` on Joomla!
+#
+# Block any script trying to base64_encode data within the URL.
+RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
+# Block any script that includes a <script> tag in URL.
+RewriteCond %{QUERY_STRING} (<|%3C)([^s]*s)+cript.*(>|%3E) [NC,OR]
+# Block any script trying to set a PHP GLOBALS variable via URL.
+RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
+# Block any script trying to modify a _REQUEST variable via URL.
+RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
+# Return 403 Forbidden header and show the content of the root home page
+RewriteRule .* index.php [F]
+#
+## End - Rewrite rules to block out some common exploits.
+
+## Begin - Custom redirects
+#
+# If you need to redirect some pages, or set a canonical non-www to
+# www redirect (or vice versa), place that code here. Ensure those
+# redirects use the correct RewriteRule syntax and the [R=301,L] flags.
+#
+## End - Custom redirects
+
+##
+# Uncomment the following line if your webserver's URL
+# is not directly related to physical file paths.
+# Update Your Joomla! Directory (just / for root).
+##
+
+# RewriteBase /
+
+## Begin - Joomla! core SEF Section.
+#
+RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+#
+# If the requested path and file is not /index.php and the request
+# has not already been internally rewritten to the index.php script
+RewriteCond %{REQUEST_URI} !^/index\.php
+# and the requested path and file doesn't directly match a physical file
+RewriteCond %{REQUEST_FILENAME} !-f
+# and the requested path and file doesn't directly match a physical folder
+RewriteCond %{REQUEST_FILENAME} !-d
+# internally rewrite the request to the index.php script
+RewriteRule .* index.php [L]
+#
+## End - Joomla! core SEF Section.
+
+
+RewriteEngine On
+# RewriteCond %{HTTPS} off
+# RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R,L]
+
+#20200122 - IPアクセスリダイレクトnozaki
+RewriteBase /
+RewriteCond %{HTTP_HOST} ^18\.178\.92\.128$ [NC]
+RewriteRule .* https://www.nifs-k.ac.jp%{REQUEST_URI} [R=302,L]
+
+# 20200809 gitignore アクセス禁止
+RedirectMatch 404 /\.git
+
+<IfModule mod_siteguard.c>
+  SiteGuard_User_ExcludeSig ip(202.95.45.168)
+  SiteGuard_User_ExcludeSig ip(202.24.160.0/21)
+  SiteGuard_User_ExcludeSig ip(210.137.6.192/26)
+  SiteGuard_User_ExcludeSig ip(210.237.39.72)
+  SiteGuard_User_ExcludeSig ip(210.237.36.185)
+  SiteGuard_User_ExcludeSig ip(18.178.92.128)
+</IfModule>

-; Joomla! Project
-; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-MOD_ARTICLES_ARCHIVE_CUSTOM="Articles - Archived - custom"
-MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL="# of Months"
-MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC="The number of months to display (the default is 10)."
-MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="Display a list of calendar months, including published articles. This list is automatically generated when you create a published article."
-MOD_ARTICLES_ARCHIVE_CUSTOM_DATE="%1$s, %2$s"
\ No newline at end of file

-; Joomla! Project
-; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-MOD_ARTICLES_ARCHIVE_CUSTOM="Articles - Archived - custom"
-MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="Display a list of calendar months, including published articles. This list is automatically generated when you create a published article."
-MOD_ARTICLES_ARCHIVE_CUSTOM_LAYOUT_DEFAULT="Default"
\ No newline at end of file

+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM="InformationArticles - Archived - custom"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL="# of Months"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC="The number of months to display (the default is 10)."
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="Display a list of calendar months, including published articles. This list is automatically generated when you create a published article."
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_DATE="%1$s, %2$s"
\ No newline at end of file

+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM="InformationArticles - Archived - custom"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="Display a list of calendar months, including published articles. This list is automatically generated when you create a published article."
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_LAYOUT_DEFAULT="Default"
\ No newline at end of file

-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-MOD_ARTICLES_ARCHIVE_CUSTOM="カスタムアーカイブ(モジュール)"
-MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL="表示月数"
-MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC="表示する月数（標準は10）です。"
-MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="公開状態になっている記事を含むカレンダー月の一覧を表示します。公開状態になっている記事を作成すると、この一覧は自動的に生成されます。"
-MOD_ARTICLES_ARCHIVE_CUSTOM_DATE="%1$s, %2$s"
\ No newline at end of file

-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-MOD_ARTICLES_ARCHIVE_CUSTOM="カスタムアーカイブ(モジュール)"
-MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="公開状態になっている記事を含むカレンダー月の一覧を表示します。公開状態になっている記事を作成すると、この一覧は自動的に生成されます。"
-MOD_ARTICLES_ARCHIVE_CUSTOM_LAYOUT_DEFAULT="標準"
\ No newline at end of file

+; Joomla! Project
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM="カスタムインフォメーションアーカイブ(モジュール)"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL="表示月数"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC="表示する月数（標準は10）です。"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="公開状態になっている記事を含むカレンダー月の一覧を表示します。公開状態になっている記事を作成すると、この一覧は自動的に生成されます。"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_DATE="%1$s, %2$s"
\ No newline at end of file

+; Joomla! Project
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM="カスタムインフォメーションアーカイブ(モジュール)"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="公開状態になっている記事を含むカレンダー月の一覧を表示します。公開状態になっている記事を作成すると、この一覧は自動的に生成されます。"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_LAYOUT_DEFAULT="標準"
\ No newline at end of file

 <?php
 <?php
 /**
 /**
  * @package     Joomla.Site
  * @package     Joomla.Site
- * @subpackage  mod_articles_archive
+ * @subpackage  mod_information_articles_archive_custom
  *
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 defined('_JEXEC') or die;
 
 
 /**
 /**
- * Helper for mod_articles_archive
+ * Helper for mod_information_articles_archive_custom
  *
  *
  * @since  1.5
  * @since  1.5
  */
  */
@@ -78,8 +78,8 @@ class ModArchiveHelper
 
 
 			$lists[$i] = new stdClass;
 			$lists[$i] = new stdClass;
 
 
-			# $lists[$i]->link = JRoute::_('index.php?option=com_content_custom&view=archive&year=' . $createdYear . '&month=' . $createdMonth . $itemid);
 			$link = JRoute::_('index.php?option=com_content_custom&view=archive&year=' . $createdYear . '&month=' . $createdMonth . $itemid);
 			$link = JRoute::_('index.php?option=com_content_custom&view=archive&year=' . $createdYear . '&month=' . $createdMonth . $itemid);
+			// アーカイブコンポーネント以外でモジュールを表示した場合に以下の様にリンクを書き換える。
 			$link = str_replace("/component/content_custom/", "/information/info-archive.html", $link);
 			$link = str_replace("/component/content_custom/", "/information/info-archive.html", $link);
 
 
 			$lists[$i]->link = $link;
 			$lists[$i]->link = $link;
@@ -90,4 +90,4 @@ class ModArchiveHelper
 
 
 		return $lists;
 		return $lists;
 	}
 	}
-}
+}
\ No newline at end of file

@@ -16,4 +16,4 @@ $params->def('count', 10);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 $list            = ModArchiveHelper::getList($params);
 $list            = ModArchiveHelper::getList($params);
 
 
-require JModuleHelper::getLayoutPath('mod_articles_archive_custom', $params->get('layout', 'default'));
\ No newline at end of file
+require JModuleHelper::getLayoutPath('mod_information_articles_archive_custom', $params->get('layout', 'default'));
\ No newline at end of file

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="module" version="3.1" client="site" method="upgrade">
 <extension type="module" version="3.1" client="site" method="upgrade">
-	<name>MOD_ARTICLES_ARCHIVE_CUSTOM</name>
+	<name>MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM</name>
 	<author>T.Tokudome</author>
 	<author>T.Tokudome</author>
 	<creationDate>June 2020</creationDate>
 	<creationDate>June 2020</creationDate>
 	<copyright></copyright>
 	<copyright></copyright>
@@ -8,17 +8,17 @@
 	<authorEmail>tokudome@lilli.co.jp</authorEmail>
 	<authorEmail>tokudome@lilli.co.jp</authorEmail>
 	<authorUrl></authorUrl>
 	<authorUrl></authorUrl>
 	<version>0.0.1</version>
 	<version>0.0.1</version>
-	<description>MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION</description>
+	<description>MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION</description>
 	<files>
 	<files>
-		<filename module="mod_articles_archive_custom">mod_articles_archive_custom.php</filename>
+		<filename module="mod_information_articles_archive_custom">mod_information_articles_archive_custom.php</filename>
 		<folder>tmpl</folder>
 		<folder>tmpl</folder>
 		<filename>helper.php</filename>
 		<filename>helper.php</filename>
 	</files>
 	</files>
 	<languages>
 	<languages>
-		<language tag="en-GB">en-GB.mod_articles_archive_custom.ini</language>
-		<language tag="en-GB">en-GB.mod_articles_archive_custom.sys.ini</language>
-		<language tag="ja-JP">ja-JP.mod_articles_archive_custom.ini</language>
-		<language tag="ja-JP">ja-JP.mod_articles_archive_custom.sys.ini</language>
+		<language tag="en-GB">en-GB.mod_information_articles_archive_custom.ini</language>
+		<language tag="en-GB">en-GB.mod_information_articles_archive_custom.sys.ini</language>
+		<language tag="ja-JP">ja-JP.mod_information_articles_archive_custom.ini</language>
+		<language tag="ja-JP">ja-JP.mod_information_articles_archive_custom.sys.ini</language>
 	</languages>
 	</languages>
 	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE" />
 	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE" />
 	<config>
 	<config>
@@ -27,8 +27,8 @@
 				<field
 				<field
 					name="count"
 					name="count"
 					type="number"
 					type="number"
-					label="MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL"
-					description="MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC"
+					label="MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL"
+					description="MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC"
 					default="120"
 					default="120"
 					filter="integer"
 					filter="integer"
 				/>
 				/>

 <?php
 <?php
 /**
 /**
  * @package     Joomla.Site
  * @package     Joomla.Site
- * @subpackage  mod_articles_archive
+ * @subpackage  mod_information_articles_archive_custom
  *
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

@@ -3,6 +3,9 @@
 .covid-19-news .mod-articles-category-category {
 .covid-19-news .mod-articles-category-category {
 	display: none;
 	display: none;
 }
 }
+.covid-19-sub-menu.category-list {
+	display: none;
+}
 
 
 /* 共通 ------------------------------------------------------*/
 /* 共通 ------------------------------------------------------*/
 .over {
 .over {

@@ -204,6 +204,8 @@ if ($this->params->get('logoFile')) {
 
 
     <script>
     <script>
         window.onload = function() {
         window.onload = function() {
+            covid19RedicretTarget = document.querySelector('.covid-19-sub-menu.category-list');
+            if (covid19RedicretTarget) window.location.href = '/covid-19.html';
             jQuery(function($) {
             jQuery(function($) {
                 var obj = $("#aside");
                 var obj = $("#aside");
                 var sW = window.innerWidth;
                 var sW = window.innerWidth;
@@ -872,7 +874,7 @@ if ($this->params->get('logoFile')) {
                                                             <li><a href="/campus-life/activities/trainer.html">アスレティックトレーナー部</a></li>
                                                             <li><a href="/campus-life/activities/trainer.html">アスレティックトレーナー部</a></li>
                                                             <li><a href="/campus-life/activities/golf.html">ゴルフ部</a></li>
                                                             <li><a href="/campus-life/activities/golf.html">ゴルフ部</a></li>
                                                             <li><a href="/campus-life/activities/dance.html">ダンス部</a></li>
                                                             <li><a href="/campus-life/activities/dance.html">ダンス部</a></li>
-                                                            <li><a href="/campus-life/activities/culture.html">伝統文化・スポーツ研究会</a></li>
+                                                            <li><a href="/campus-life/activities/esports.html">eスポーツ競技・研究会</a></li>
                                                         </ul>
                                                         </ul>
                                                     </li>
                                                     </li>
                                                     <li><a href="/campus-life/activities/activities-apply.html" title="申請書様式(在学生向け)">申請書様式(在学生向け)</a></li>
                                                     <li><a href="/campus-life/activities/activities-apply.html" title="申請書様式(在学生向け)">申請書様式(在学生向け)</a></li>
@@ -1464,6 +1466,7 @@ if ($this->params->get('logoFile')) {
                     JRequest::getInt('Itemid') == 799 ||
                     JRequest::getInt('Itemid') == 799 ||
                     JRequest::getInt('Itemid') == 575 ||
                     JRequest::getInt('Itemid') == 575 ||
                     JRequest::getInt('Itemid') == 803 ||
                     JRequest::getInt('Itemid') == 803 ||
+                    JRequest::getInt('Itemid') == 893 ||
                     $itemid == 871 ||
                     $itemid == 871 ||
                     JRequest::getInt('catid') == 142
                     JRequest::getInt('catid') == 142
                 ) : ?>
                 ) : ?>