Merge branch 'dev-4' into dev-#1596

app/webroot/theme/admin-third/Installations/admin/step2.php

@@ -19,6 +19,7 @@
 <script type="text/javascript">
 	$(function () {
 		$("#btnnext,#btncheckagain").click(function () {
+			$.bcUtil.showLoader();
 			switch (this.id) {
 				case 'btnnext':
 					$("#clicked").val('next');

app/webroot/theme/admin-third/Installations/admin/step3.php

@@ -36,7 +36,7 @@
 
 		/* イベント登録 */
 		$('#checkdb,#btnnext,#btnback').click(function array() {
-
+			$.bcUtil.showLoader();
 			if (this.id == 'btnnext') {
 				$("#buttonclicked").val('createdb');
 			} else if (this.id == 'btnback') {
@@ -45,37 +45,45 @@
 				$("#buttonclicked").val('checkdb');
 			}
 
+			var result = true;
 			if (this.id != 'btnback' &&
-				$('#InstallationDbType').val() != 'csv' &&
-				$('#InstallationDbType').val() != 'sqlite') {
+					$('#InstallationDbType').val() != 'csv' &&
+					$('#InstallationDbType').val() != 'sqlite') {
+
 				if ($("#InstallationDbHost").val() == "") {
 					alert(bcI18n.message1);
-					return false;
+					result = false;
 				} else if ($("#InstallationDbUsername").val() == "") {
 					alert(bcI18n.message2);
-					return false;
+					result = false;
 				} else if ($("#InstallationDbName").val() == "") {
 					alert(bcI18n.message3);
-					return false;
+					result = false;
 				} else if ($("#InstallationDbPrefix").val() == "") {
 					alert(bcI18n.message4);
-					return false;
+					result = false;
 				} else if (!$("#InstallationDbPrefix").val().match(/[_]$/)) {
 					alert(bcI18n.message5);
-					return false;
+					result = false;
 				} else if (!$("#InstallationDbPrefix").val().match(/^[a-zA-z0-9_]+_$/)) {
 					alert(bcI18n.message6);
-					return false;
+					result = false;
 				} else if ($("#InstallationDbName").val().match(/^.*\..*$/)) {
 					alert(bcI18n.message7);
-					return false;
+					result = false;
 				} else if ($("#InstallationDbPort").val() == "") {
 					alert(bcI18n.message8);
-					return false;
+					result = false;
 				}
+
 			}
 
-			$('#dbsettings').submit();
+			if (result) {
+				$('#dbsettings').submit();
+			} else {
+				$.bcUtil.hideLoader();
+				return false;
+			}
 
 		});
 

app/webroot/theme/admin-third/Installations/admin/step4.php

@@ -29,31 +29,40 @@
 <script type="text/javascript">
 	$(document).ready(function () {
 		$('#btnfinish,#btnback').click(function () {
+			$.bcUtil.showLoader();
+			var result = true;
 			if (this.id == 'btnfinish') {
 				$("#InstallationClicked").val('finish');
 				if ($("#InstallationAdminEmail").val() == "") {
 					alert(bcI18n.message1);
-					return false;
+					result = false;
 				} else if ($("#InstallationAdminUsername").val() == "") {
 					alert(bcI18n.message2);
-					return false;
+					result = false;
 				} else if (!$("#InstallationAdminUsername").val().match(/^[a-zA-Z0-9\-_]+$/)) {
 					alert(bcI18n.message3);
-					return false;
+					result = false;
 				} else if ($("#InstallationAdminPassword").val().length < 6) {
 					alert(bcI18n.message4);
-					return false;
+					result = false;
 				} else if ($("#InstallationAdminPassword").val() != $("#InstallationAdminConfirmpassword").val()) {
 					alert(bcI18n.message5);
-					return false;
+					result = false;
 				} else if (!$("#InstallationAdminPassword").val().match(/^[a-zA-Z0-9\-_ \.:\/\(\)#,@\[\]\+=&;\{\}!\$\*]+$/)) {
 					alert(bcI18n.message6);
-					return false;
+					result = false;
 				}
 			} else if (this.id == 'btnback') {
 				$("#InstallationClicked").val('back');
 			}
-			$('#adminSettings').submit();
+
+			if(result) {
+				$('#adminSettings').submit();
+			} else {
+				$.bcUtil.hideLoader();
+				return false;
+			}
+
 		});
 	});
 </script>

docker/dockerfile/Dockerfile-php7.4

@@ -55,9 +55,12 @@ RUN echo 'sendmail_path = "/usr/bin/msmtp -t"' > /usr/local/etc/php/conf.d/mail.
 	&& echo "date.timezone = Asia/Tokyo" >> /usr/local/etc/php/php.ini \
 	&& yes | pecl install xdebug mcrypt-1.0.3 \
 	&& echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
-	&& echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
-	&& echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini \
-	&& echo "xdebug.remote_host=10.0.2.2" >> /usr/local/etc/php/conf.d/xdebug.ini \
+	&& echo "xdebug.discover_client_host=1" >> /usr/local/etc/php/conf.d/xdebug.ini \
+	&& echo "xdebug.idekey=BASERCMS" >> /usr/local/etc/php/conf.d/xdebug.ini \
+	&& echo "xdebug.client_host=10.0.2.2" >> /usr/local/etc/php/conf.d/xdebug.ini \
+	&& echo "xdebug.client_port=9000" >> /usr/local/etc/php/conf.d/xdebug.ini \
+	&& echo "xdebug.start_with_request=yes" >> /usr/local/etc/php/conf.d/xdebug.ini \
+	&& echo "xdebug.mode=debug,develop" >> /usr/local/etc/php/conf.d/xdebug.ini \
 	&& echo "extension=mcrypt.so" >> /usr/local/etc/php/conf.d/mcrypt.ini
 
 # msmtp

lib/Baser/View/Elements/crumbs.php

@@ -51,10 +51,7 @@
 <?php else: ?>
 	<ul itemscope itemtype="http://schema.org/BreadcrumbList">
 		<?php if ($this->BcBaser->isHome()): ?>
-			<li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
-				<span itemprop="name"><?php echo $home ?></span>
-				<meta itemprop="position" content="1"/>
-			</li>
+			<li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><span itemprop="name"><?php echo $home ?></span><meta itemprop="position" content="1"/></li>
 		<?php else: ?>
 			<?php $this->BcBaser->crumbs($separator, $home, true) ?>
 		<?php endif ?>

lib/Baser/View/Helper/BcBaserHelper.php

@@ -1557,10 +1557,7 @@ public function crumbs($separator = '»', $startText = false, $onSchema = f
 					$crumb = '<span itemprop="name">' . $crumb[0] . '</span>';
 				}
 				$out[] = <<< EOD
-<li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
-	{$crumb}
-	<meta itemprop="position" content="{$counter}" />
-</li>
+<li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">{$crumb}<meta itemprop="position" content="{$counter}" /></li>
 EOD;
 				$counter++;
 			}