diff --git a/BO/Views/user/ur.cshtml b/BO/Views/user/ur.cshtml index 2ac5d1d..a1e3371 100644 --- a/BO/Views/user/ur.cshtml +++ b/BO/Views/user/ur.cshtml @@ -62,6 +62,10 @@
@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:예;0:아니오" }, { "checked", Model.User.ischkatt }, { "name", "User.ischkatt" } })
+
+ +
@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:예;0:아니오" }, { "checked", Model.User.playbar }, { "name", "User.playbar" } })
+
}
@@ -596,7 +600,7 @@ else if (check("User_username", null, "이름을 입력해주세요.")) { } else if (('@Model.viewname' == 'user') && check("User_email",null,"이메일을 입력해주세요")) { } //else if (('@Model.viewname' == 'user') && check("User_mobile", null, "핸드폰 번호를 입력해주세요")) { } - else if (!isnulloremt(val("User_email")) && !isemail(val("User_email"))) { focus("User_email"); msg("이메일주소를 올바르게 입력해주세요."); } + else if (!isnulloremt(val("User_email")) && !isemail(val("User_email")) && !isemail2(val("User_email"))) { focus("User_email"); msg("이메일주소를 올바르게 입력해주세요."); } //else if (!isnulloremt(val("User_mobile")) && (!ismobile(val("User_mobile")) )) { focus("User_mobile"); msg("핸드폰번호를 올바르게 입력해주세요."); } //else if ((val("User_usertype") == "1" || val("User_usertype") == "81") && val("User_asno") == "") { msg("소속을 등록해주세요.");} else if (confirm(txt)) { diff --git a/BO/js/site.js b/BO/js/site.js index 3ee8c4c..5920269 100644 --- a/BO/js/site.js +++ b/BO/js/site.js @@ -1198,6 +1198,14 @@ function isemail(v) { } return false; } +function isemail2(v) { + //이메일 검사 + var regExp = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/; + if (regExp.test(v)) { + return true; + } + return false; +} function checkid(v) { var idReg = /^[a-z]+[a-z0-9]{5,15}$/g; if (!idReg.test(v)) { diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs index 895ad61..00ee601 100644 --- a/Base/Controller/FOCommon.cs +++ b/Base/Controller/FOCommon.cs @@ -411,6 +411,7 @@ namespace NP.Base.Controllers return JsonOK(0); } [HttpPost] + /// 반환값이 100일때 플레이바 및 다음페이지이동 허용 public JsonResult PRGRS(Int64 lectno, Int64 cmino) { if (SUserInfo.UserNo > 0) diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index d4bddf0..b90020e 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -280,11 +280,13 @@ order by a.iseq