#49577 loginJs対応

abvw/common/js/common.js

@@ -1754,7 +1754,7 @@ var ClientData = {
             return SessionStorageUtils.get(COMMON.Keys.storeUrl);
         }
     },
-    
+
     siteUrl : function(data) {
         if (arguments.length > 0) {
             SessionStorageUtils.set(COMMON.Keys.siteUrl, data);
@@ -2203,6 +2203,41 @@ var ValidationUtil = {
     IsPasswordAlphabetOrNumerOrSymbol : function(value) {
         var reg = new RegExp("\u005b\u005e\u0061\u002d\u007a\u0041\u002d\u005a\u0030\u002d\u0039\u0027\u0023\u0027\u002b\u005c\u002d\u0027\u002e\u0027\u002f\u0027\u003a\u0027\u005f\u005d");
         return !reg.test(value);
+    },
+
+    HasSeqChar : function(value, num) {
+    	var count = 0;
+    	var prev = 0;
+
+    	for (var i = 0; i < str.length(); i++) {
+			var c = str.charAt(i);
+			if (i > 0 && prev == c) {
+				count++;
+				if (count == num - 1) {
+					return true;
+				}
+			}
+			else {
+				count = 0;
+			}
+			prev = c;
+		}
+
+		return false;
+    },
+
+    ContainSameSeqChar : function(str1, str2, num) {
+    	if (str2.length < num || str1.length < num) {
+			return false;
+		}
+
+		for (var i = 0; i <= str2.length - num; i++) {
+			var target = str2.substring(i, i + num);
+			if (str1.contains(target)) {
+				return true;
+			}
+		}
+		return false;
     }
 };
 
@@ -2449,8 +2484,8 @@ COMMON.SetStartLog = function(strContentId) {
         log.longitude = ClientData.longitude();
 
         // PageLog 1ページ目セット（１レコードは必須）
-        if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF || 
-        		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile || 
+        if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF ||
+        		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile ||
         		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
         	var pageLog = new PageLogEntity();
             pageLog.contentid = strContentId;
@@ -2507,7 +2542,7 @@ COMMON.SetEndLog = function(strContentId) {
 
 // １ページ分のページ閲覧ログを作成
 COMMON.SetPageLog = function(strContentId, strPageNo) {
-	
+
     var arrContentLogs = ClientData.ContentLogData();
 
     for ( var nIndex = 0; nIndex < arrContentLogs.length; nIndex++) {
@@ -2516,13 +2551,13 @@ COMMON.SetPageLog = function(strContentId, strPageNo) {
             // PageLog追加
             var pageLog = new PageLogEntity();
             pageLog.contentid = strContentId;
-            if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage || 
-            		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || 
+            if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage ||
+            		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
             		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
             	pageLog.pageNo = strPageNo;
             }else{
             	pageLog.pageNo = strPageNo + 1; // 0始まりのページ番号
-            }            
+            }
             arrContentLogs[nIndex].pageLogArray.push(pageLog);
 
         }

abvw/common/json/lang/lang-en.json

@@ -34,5 +34,5 @@
 "sysLockScrPwdInput":"Input password",
 "msgPWDNeedChange":"Change password is required. Please back Setting view.",
 "msgAnonymousLoginErr":"Can not login. (Error code: {0})",
-"msgAnonymousLoginErr2":"Can not login. ",
+"msgAnonymousLoginErr2":"Can not login. "
 }
\ No newline at end of file

abvw/common/json/lang/lang-ko.json

@@ -34,5 +34,5 @@
 "sysLockScrPwdInput":"패스워드를 입력해 주십시오.",
 "msgPWDNeedChange":"패스워드를 변경해야 합니다. 환경설정에서 패스워드를 변경해 주십시오.",
 "msgAnonymousLoginErr":"로그인할 수 없습니다. (에러코드 : {0})",
-"msgAnonymousLoginErr2":"로그인할 수 없습니다.",
+"msgAnonymousLoginErr2":"로그인할 수 없습니다."
 }
\ No newline at end of file

abvw/css/layout/common.css

+@charset "utf-8";
+
+/* Latest Update
+   2012.11.5 write           */
+
+body{
+    margin: 0;
+    padding: 0;
+}
+
+.wrapper {
+}
+
+form, ul{ margin:0; padding:0;}
+li{ list-style-type:none;}
+img{ display:block; border:none;}
+
+#main-ws{
+    width: 960px;
+    padding-top: 20px;
+    overflow: hidden;
+    margin-top: 0;
+    margin-right: auto;
+    margin-left: auto;
+}
+
+p.go_top{
+    clear:both;
+    height:115px;
+    width:90px;
+    position: fixed;
+    bottom: -45px;
+    right: 20px;
+}
+
+.focus{ }
+#user_change footer .border .cnt_footer img { display: inline;}
+
+/*2013*/
+.PageTop {
+    float: right;
+    width: 100px;
+}
+
+/*CLEARFIX*/
+.clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.clearfix { display: inline-block; }
+/*\*/
+* html .clearfix { height: 1%; }
+.clearfix { display: block; }
+/**/
+
+.clearboth { clear: both;}
+br.clear { clear: both; margin: 0; padding: 0; font-size: 0; line-height: 0; }
+
+.floatL { float: left;}
+.floatR { float: right;}
+
+@charset "utf-8";
+
+/* Latest Update
+   2012.11.5 write           */
+
+body{
+    background: #f4f4f4;
+    font-family: "メイリオ", "Meiryo", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS P Gothic", "Osaka", Verdana, Arial, Helvetica, sans-serif;
+}
+.wrapper {
+    background-color: #EDF2F2;
+}
+
+form, ul{ }
+li{ }
+img{ }
+
+#main-ws{
+
+}
+
+p.go_top{
+
+}
+
+.focus{ color: #969696;}
+#user_change footer .border .cnt_footer img { }
+
+/*2013*/
+.PageTop {
+
+}
+
+/*CLEARFIX*/
+.clearfix:after {  }
+.clearfix {  }
+/*\*/
+* html .clearfix { }
+.clearfix { }
+/**/
+
+.clearboth {}
+br.clear { }
+
+.floatL { }
+.floatR { }
+
+#avw-auth-error
+{
+    color: #fff;
+	background: #ccc;
+}
+

abvw/js/settings.js

@@ -784,6 +784,14 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
         if (!ValidationUtil.IsAlphabetOrNumberOrSymbol(SETTINGS.getNewPasswordRe())) {
             isOK = false;
         }
+        // 連続3文字以上チェック
+        if (!ValidationUtil.HasSeqChar(SETTINGS.getNewPassword())) {
+        	isOK = false;
+        }
+        // 前回と4文字連続一致
+        if (!ValidationUtil.ContainSameSeqChar(SETTINGS.getCurrentPassword(), SETTINGS.getNewPassword(), 4)) {
+        	isOK = false;
+        }
         var str = SETTINGS.getCurrentPassword() + "";
 
     }

login.html

@@ -23,7 +23,7 @@
 
     <script type="text/javascript" src="./abvw/common/js/jquery-3.6.0.min.js?__UPDATEID__"></script>
     <script type="text/javascript" src="./abvw/common/js/jquery-ui.min.js?__UPDATEID__"></script>
-    <!-- <script type="text/javascript" src="./abvw/common/js/jquery-1.8.1.min.js?__UPDATEID__"></script> -->
+    <!-- <script type="text/javascript" src="./abvw/common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
     <!-- <script type="text/javascript" src="./abvw/common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script> -->
     <!-- <script type="text/javascript" src="./abvw/common/js/jquery.toastmessage.js?__UPDATEID__"></script> -->
     <!-- <script type="text/javascript" src="./abvw/common/js/screenLock.js?__UPDATEID__" ></script> -->