Skip to content

C
check
Commit cf2c0a2c by Kang Donghun
Options

Merge branch 'feature/1.0_check_web_dev_kdh' into feature/1.0_check_web_dev_kangdh 

# Conflicts:
#	abvw/common/css/web/footer.css
#	abvw/css/login/limit_access.css
#	abvw/css/setting/accordion.css
#	abvw/css/setting/backup.css
#	abvw/css/setting/restore.css
#	abvw/home.html
parents 365ea7ea 9bc63ab9
Showing with 113 additions and 880 deletions
abvw/common/js/web/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
{
"sysErrorCallApi01":"System error.<br/>Please close this window and contact administrator.",
"sysErrorCallApi02":"I am terribly sorry to cause you inconvenience.<br />A certification error occurred.<br />return to a login screen.",
"sysInfoScrLock01":"Click to unlock.",
"sysInfoWithoutLogout":"Are you sure to close this window without logout?\nIncorrect logout will cause login problem next time.",
"txtUsrCap":"User Infomation",
"txtLastLoginTime":"Last login date:",
"txtOpt":"Option",
"txtOpt001":"Initial Screen",
"txtHondana":"Bookshelf",
"txtList":"List",
"txtOpt002":"Repeat movie and audio",
"txtOpt003":"Show marking when opening contents.",
"dspOptReset":"Reset",
"txtBkResCap":"Backup / Restore",
"txtOptBkCfm":"Confirm backup at every logout.",
"dspOptBk":"Backup",
"dspOptRes":"Restore",
"dspSave":"Apply",
"txtBkMsg":"Backup to server?",
"txtResMsg":"Restore from Server?",
"msgPwdEmpty":"Password is required.",
"msgPwdOldWrong":"Current Password mismatch.",
"msgPwdNotMatch":"New Password doesn't match.",
"msgLoginErrWrong":"LoginId or Password wrong: {0}",
"dspPubDt2":"Distributed Date:",
"txtPage":"Page:",
"dspDelete":"Delete",
"dspShioriDelConf":"Are you sure to delete bookmark?",
"dspRegDt":"Registered Date",
"dspLogin":"Login",
"dspSkip":"Skip",
"dspPwdUpd":"Apply",
......@@ -40,124 +21,18 @@
"txtPwdNew":"New Password",
"txtPwdNewRe":"Again",
"txtPwdRemind":"This message won't be shown during 30days if skip selected.",
"txtSearch":"Search",
"dspShiori":"Bookmark",
"dspSetting":"Setting",
"dspLogout":"Logout",
"txtRead":"Open",
"txtSort":"Sort",
"dspTitleNm":"Title",
"dspTitleNmKn":"Title（alias）",
"txtPubDt":"Released Date",
"txtRecordNum":" ",
"txtRecordTotal":" ",
"dspViewMore":">> Next {0} contents",
"txtGen":"Genre",
"txtGr":"Group",
"txtViewDt":"Accessed Date",
"txtDetailPage":"Detail",
"txtCtnNm":"Content Name",
"txtTag":"Tag",
"txtContTxt":"Body Text",
"txtLogoutBkMsg":"Backup before logout?",
"txtLogoutOptBkCfm":"Remember this operation",
"dspBkOK":"Backup and Logout",
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(v1.9.0)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
"txtMkgM":"M",
"txtMkgB":"L",
"txtMkgSB":"LL",
"dspOK":"OK",
"dspCancel":"Cancel",
"txtMkToolBar":"Marking Toolbar",
"dspPgClear":"Clear this page",
"txtColor":"Color",
"txtIndex":"Index",
"txtShioriCtnLs":"Bookmark list",
"txtTextCopy":"Copy Body Text",
"txtNoTextCopy":"No Text",
"txtNoSearchResult":"No Result",
"msgShioriNotExists":"no Bookmark",
"msgPwdChangeOK":"Success.",
"msgPwdChangeNG":"Failed.<br/>Password requires at least both of character and numeric.",
"msgSearchNotExist":"No content",
"txtTooltipBack":"Back",
"txtTooltipBookmark":"Add/Delete Bookmark",
"txtTooltipShowMemo":"Show/Hide memo",
"txtTooltipAddMemo":"Add memo",
"txtTooltipShowMarking":"Show/Hide Marking",
"txtTooltipShowMarkingTool":"Show/Hide Marking Panel",
"msgShioriDeleted":"Page was deleted.",
"dspViewHistory":"History",
"msgLoginEmpty":"Please fill empty field.",
"msgSaveOk":"Saved",
"msgPlaceHolder":"Keyword",
"txtOpt004":"Show when content will be opened.",
"txtRestoreTitle":"Restore confirmation",
"txtBackupTitle":"Backup confirmation",
"txtResMsgNotice":"This operation will override current data and all of your data will be lost.",
"dspChange":"Change",
"msgNoIndex":"No index.",
"msgBackupSuccess":"Backup success.",
"msgBackupFailed":"Backup failed.",
"msgRestoreSuccess":"Restore success.",
"msgRestoreFailed":"Restore failed.",
"txtDeleteConfirmTitle":"Delete confirmation",
"msgHistoryNotExist":"No history",
"msgChangePassword":"Change Password",
"txtMemoEdit":"Edit memo",
"txtMemoCopy":"Copy",
"msgPageImgErr":"Unable to show contents. Maybe it was deleted at server. Back home and choose another content.",
"sysAppTitle":"Viewer for Web",
"sysLockScrPwdInput":"Input password",
"txtOpt005":"Show alert when press F5.close tab.broswer.",
"txtMemoMenu":"Edit memo",
"txtMemoNew":"New",
"txtMemoPaste":"Paste",
"txtMemoClear":"Clear",
"txtMemo":"Memo",
"msgBGMPlayConfirm":"Content BGM will be played automatically.",
"msgPWDNeedChange":"Change password is required. Please back Setting view.",
"msgBGMPagePlayConfirm":"Page BGM will be played automatically.",
"txtBkSelectData":"Please select data to backup.",
"txtBkMarking":"Marking",
"txtBkMemo":"Memo",
"txtBkShiori":"Bookmark",
"txtResSelect":"Please select data to restore.",
"txtBkDefault":"Backup default:",
"txtOptPageTrans":"Animation type in View",
"txtOptPageTransSlide":"Slide",
"txtOptPageTransFade":"Fade",
"txtOptPageTransRev":"EN_リヴェール＆ムーブイン",
"txtOptPageTransPeriod":"Animation period",
"msgPushAlert":"Has new message(s) !",
"txtPushAlert":"Alert",
"txtNext":"Next >",
"txtPrevious":"< Previous",
"msgAnonymousLoginErr":"Can not login. (Error code: {0})",
"msgAnonymousLoginErr2":"Can not login. ",
"txtEnqueteTitle":"Form",
"txtExamTitle":"Exam",
"txtQuizTitle":"Quiz",
"txtTransparent":"Transparent",
"txtSemiTransparent":"Translucent",
"txtNoTransparent":"Opacity",
"txtContentPWTitle":"Password Confirm",
"txtContentPWMsg":"Please input password to view this content.",
"txtContentWarning":"Waring",
"txtMediaAutoPlayWarning":"Media will be played automatically.",
"txtPreventLink": "This function is not available in the preview.",
"msgContentNotExist": "Content does not exist.",
"txtShare": "share",
"txtDashMark": "-",
"txtUrlValidDate": "validated period",
"txtMaxDownloadCount": "number of max dl",
"msgShareUrlPassword": "When you set a password, please input below.",
"msgStreamingOpenError": "It is the contents that I cannot read in the streaming.",
"msgContentLinkNotOpen": "This content cannot open on WebViewer."
}
"msgAnonymousLoginErr2":"Can not login. "
}
\ No newline at end of file
abvw/common/json/lang/lang-ja.json
{
"sysErrorCallApi01":"ご迷惑をおかけし申し訳ございません。<br />システムエラーが発生しました。<br />アプリケーションを終了し、管理者に連絡してください。",
"sysErrorCallApi02":"ご迷惑をおかけし申し訳ございません。<br />認証エラーが発生しました。<br />ログイン画面に戻ります。",
"sysInfoScrLock01":"長時間操作されなかったため、画面をロックしています。<br />画面をクリックしてロックを解除してください。",
"sysInfoWithoutLogout":"ログアウトしていませんが、このまま終了してもよろしいですか？\n※【注意】ログアウトしないと次回ログインできない場合がございます。",
"txtUsrCap":"ユーザ情報",
"txtLastLoginTime":"最終ログイン時間:",
"txtOpt":"オプション",
"txtOpt001":"初期表示",
"txtHondana":"本棚",
"txtList":"リスト",
"txtOpt002":"動画・音楽を繰り返し再生する",
"txtOpt003":"マーキング",
"dspOptReset":"初期設定に戻る",
"txtBkResCap":"サーバにバックアップ/リストア",
"txtOptBkCfm":"ログアウトの時、バックアップするかどうか確認する",
"dspOptBk":"バックアップ",
"dspOptRes":"リストア",
"dspSave":"保存",
"txtBkMsg":"サーバにデータをバックアップしますか？",
"txtResMsg":"サーバからデータをリストアしますか？",
"msgPwdEmpty":"パスワードを入力してください",
"msgPwdOldWrong":"現在のパスワードに誤りがあります",
"msgPwdNotMatch":"変更パスワードが一致していません。",
"msgLoginErrWrong":"ログインできません。入力情報を確認してください。(エラーコード：{0})",
"dspPubDt2":"発行日：",
"txtPage":"ページ:",
"dspDelete":"削除",
"dspShioriDelConf":"選択されているしおりを削除しますか？",
"dspRegDt":"登録日",
"dspLogin":"ログイン",
"dspSkip":"スキップ",
"dspPwdUpd":"パスワード変更",
......@@ -40,124 +21,18 @@
"txtPwdNew":"変更パスワード",
"txtPwdNewRe":"(再)変更パスワード",
"txtPwdRemind":"※スキップを選択すると、30日経過するまでこのメッセージが表示されません。",
"txtSearch":"検索",
"dspShiori":"しおり",
"dspSetting":"設定変更",
"dspLogout":"ログアウト",
"txtRead":"開く",
"txtSort":"並べ替え",
"dspTitleNm":"タイトル",
"dspTitleNmKn":"タイトル（カナ）",
"txtPubDt":"公開日",
"txtRecordNum":"件",
"txtRecordTotal":"件 表示",
"dspViewMore":"次の{0}件を表示する >>",
"txtGen":"ジャンル",
"txtGr":"グループ",
"txtViewDt":"閲覧日",
"txtDetailPage":"詳細画面",
"txtCtnNm":"コンテンツ名",
"txtTag":"タグ",
"txtContTxt":"本文",
"txtLogoutBkMsg":"ログアウトする前にバックアップしますか？",
"txtLogoutOptBkCfm":"今回の行動を記憶する。",
"dspBkOK":"バックアップしてログアウト",
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(v1.9.0)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
"txtMkgM":"中",
"txtMkgB":"大",
"txtMkgSB":"特大",
"dspOK":"OK",
"dspCancel":"キャンセル",
"txtMkToolBar":"マーキング",
"dspPgClear":"このページクリア",
"txtColor":"色",
"txtIndex":"インデックス",
"txtShioriCtnLs":"しおり一覧",
"txtTextCopy":"テキストコピー",
"txtNoTextCopy":"テキストがありません。",
"txtNoSearchResult":"検索結果がありません。",
"msgShioriNotExists":"しおりがありません",
"msgPwdChangeOK":"パスワードを変更しました。",
"msgPwdChangeNG":"パスワード変更に失敗しました。再入力してください。※注意：新規パスワードには英字および数字両方を含める必要があります。",
"msgSearchNotExist":"条件に該当するコンテンツがありません。",
"txtTooltipBack":"戻る",
"txtTooltipBookmark":"しおり追加・削除",
"txtTooltipShowMemo":"メモ表示・非表示",
"txtTooltipAddMemo":"メモ追加",
"txtTooltipShowMarking":"マーキング表示・非表示",
"txtTooltipShowMarkingTool":"マーキングツールバーを表示・非表示",
"msgShioriDeleted":"ページが削除されました。",
"dspViewHistory":"閲覧履歴",
"msgLoginEmpty":"ログイン情報を入力してください",
"msgSaveOk":"保存しました",
"msgPlaceHolder":"キーワードを入力してください",
"txtOpt004":"※コンテンツを開いた時に表示する",
"txtRestoreTitle":"リストア確認",
"txtBackupTitle":"バックアップ確認",
"txtResMsgNotice":"※リストアすると、現時点のローカルのデータでサーバのバックアップデータを上書きします。リストア後、元の状態に復元できませんので、ご注意ください",
"dspChange":"変更",
"msgNoIndex":"インデックスがありません",
"msgBackupSuccess":"のバックアップに成功しました",
"msgBackupFailed":"のバックアップに失敗しました",
"msgRestoreSuccess":"のリストアに成功しました",
"msgRestoreFailed":"のリストアに失敗しました",
"txtDeleteConfirmTitle":"しおり削除確認",
"msgHistoryNotExist":"閲覧履歴はありません。",
"msgChangePassword":"パスワード変更",
"txtMemoEdit":"編集",
"txtMemoCopy":"コピー",
"msgPageImgErr":"コンテンツを表示することができません。コンテンツが削除された可能性があります。ホーム画面に戻り、異なるコンテンツを選択してください。",
"sysAppTitle":"閲覧ウェブ版",
"sysLockScrPwdInput":"パスワードを入力してください",
"txtOpt005":"タブ・ブラウザ終了・F5時のアラートが表示する",
"txtMemoMenu":"メモ編集",
"txtMemoNew":"新規",
"txtMemoPaste":"貼り付け",
"txtMemoClear":"クリア",
"txtMemo":"メモ",
"msgBGMPlayConfirm":"コンテンツBGMが自動再生されます。",
"msgPWDNeedChange":"パスワードの変更が必要です。設定変更画面に戻って変更してください。",
"msgBGMPagePlayConfirm":"ページBGMが自動再生されます。",
"txtBkSelectData":"バックアップするデータを選択してください。",
"txtBkMarking":"マーキング",
"txtBkMemo":"メモ",
"txtBkShiori":"しおり",
"txtResSelect":"リストアするデータを選択してください。",
"txtBkDefault":"バックアップのデフォルト：",
"txtOptPageTrans":"ビューのアニメーション種類",
"txtOptPageTransSlide":"スライド",
"txtOptPageTransFade":"フェード",
"txtOptPageTransRev":"リヴェール＆ムーブイン",
"txtOptPageTransPeriod":"アニメーション時間(Sec)",
"msgPushAlert":"新着メッセージがあります！！！",
"txtPushAlert":"通知",
"txtNext":"次＞",
"txtPrevious":"＜前",
"msgAnonymousLoginErr":"ログインできません。(エラーコード：{0})",
"msgAnonymousLoginErr2":"ログインできません。",
"txtEnqueteTitle":"フォーム",
"txtExamTitle":"試験",
"txtQuizTitle":"クイズ",
"txtTransparent":"透明",
"txtSemiTransparent":"半透明",
"txtNoTransparent":"不透明",
"txtContentPWTitle":"パスワードの確認",
"txtContentPWMsg":"閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"警告",
"txtMediaAutoPlayWarning":"メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません。",
"msgContentNotExist": "該当するコンテンツは存在しません。",
"txtShare": "共有",
"txtDashMark": "～",
"txtUrlValidDate": "URL有効期間",
"txtMaxDownloadCount": "最大DL回数",
"msgShareUrlPassword": "パスワードを設定する場合、以下に入力して下さい。",
"msgStreamingOpenError": "ストリーミングでは閲覧出来ないコンテンツです。",
"msgContentLinkNotOpen":"このコンテンツはWeb版で開けません。"
}
"msgAnonymousLoginErr2":"ログインできません。"
}
\ No newline at end of file
abvw/common/json/lang/lang-ko.json
{
"sysErrorCallApi01":"시스템 에러가 발생했습니다. 이용에 불편을 드려 죄송합니다.",
"sysErrorCallApi02":"죄송합니다. <br/> 인증 오류가 발생하였습니다. <br/> 로그인 화면으로 돌아갑니다.",
"sysInfoScrLock01":"장시간 조작이 없었으므로, 화면이 잠겼습니다.<br/>잠김을 해제하려면 화면을 클릭하십시오.",
"sysInfoWithoutLogout":"로그아웃하지 않은 상태로 창을 닫으면, 다음에 로그인되지 않는 경우도 있습니다. 이대로 창을 닫으시겠습니까?\n(이 메세지는 브라우저를 '새로 고침' 할 때에도 표시됩니다.)",
"txtUsrCap":"사용자 정보",
"txtLastLoginTime":"최종 로그인 시간:",
"txtOpt":"옵션",
"txtOpt001":"기본 화면 선택",
"txtHondana":"그리드",
"txtList":"리스트",
"txtOpt002":"동영상, 음악 반복 재생",
"txtOpt003":"마킹",
"dspOptReset":"설정 리셋",
"txtBkResCap":"서버 백업/복원",
"txtOptBkCfm":"로그아웃할 때 백업을 할지 항상 확인",
"dspOptBk":"백업",
"dspOptRes":"복원",
"dspSave":"저장",
"txtBkMsg":"서버에 백업하시겠습니까?",
"txtResMsg":"기존에 서버에 백업한 데이터를 복원하시겠습니까?",
"msgPwdEmpty":"패스워드를 입력해 주십시오.",
"msgPwdOldWrong":"기존 패스워드를 바르게 입력해 주십시오.",
"msgPwdNotMatch":"신규 패스워드와 신규 패스워드 확인이 일치하지 않습니다.",
"msgLoginErrWrong":"로그인ID 또는 패스워드를 잘못 입력하셨습니다.(Error Code：{0})",
"dspPubDt2":"발행일:",
"txtPage":"페이지:",
"dspDelete":"삭제",
"dspShioriDelConf":"선택한 북마크를 삭제하시겠습니까?",
"dspRegDt":"등록일",
"dspLogin":"로그인",
"dspSkip":"스킵",
"dspPwdUpd":"패스워드 변경",
......@@ -40,122 +21,18 @@
"txtPwdNew":"신규 패스워드",
"txtPwdNewRe":"신규 패스워드 확인",
"txtPwdRemind":"스킵을 선택하면 30일 이내에는 이 메세지를 표시하지 않습니다.",
"txtSearch":"검색",
"dspShiori":"북마크",
"dspSetting":"환경설정",
"dspLogout":"로그아웃",
"txtRead":"열기",
"txtSort":"정렬",
"dspTitleNm":"제목",
"dspTitleNmKn":"제목(별명)",
"txtPubDt":"공개일",
"txtRecordNum":"건",
"txtRecordTotal":"건 표시",
"dspViewMore":">> 다음 {0}건 표시",
"txtGen":"분류",
"txtGr":"그룹",
"txtViewDt":"열람일",
"txtDetailPage":"상세화면",
"txtCtnNm":"제목",
"txtTag":"태그",
"txtContTxt":"본문",
"txtLogoutBkMsg":"로그아웃하기 전에 백업하시겠습니까?",
"txtLogoutOptBkCfm":"지금 선택한 내용을 다음부터 자동으로 실행",
"dspBkOK":"백업 후 로그아웃",
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(v1.9.0)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
"txtMkgM":"중",
"txtMkgB":"대",
"txtMkgSB":"특대",
"dspOK":"확인",
"dspCancel":"취소",
"txtMkToolBar":"마킹 툴바",
"dspPgClear":"이 페이지 클리어",
"txtColor":"색",
"txtIndex":"목차",
"txtShioriCtnLs":"북마크 일람",
"txtTextCopy":"본문 복사",
"txtNoTextCopy":"이 페이지에는 텍스트가 없습니다.",
"txtNoSearchResult":"검색 결과가 없습니다.",
"msgShioriNotExists":"북마크가 없습니다.",
"msgPwdChangeOK":"패스워드가 변경되었습니다.",
"msgPwdChangeNG":"패스워드를 변경하지 못했습니다. 다시 시도하시기 바랍니다.<br/>※주의 : 패스워드에는 영/숫자를 1개 이상씩 사용해야 합니다.",
"msgSearchNotExist":"조건에 맞는 컨텐츠가 없습니다.",
"txtTooltipBack":"뒤로 가기",
"txtTooltipBookmark":"북마크 추가/삭제",
"txtTooltipShowMemo":"메모 표시/비표시",
"txtTooltipAddMemo":"메모 추가",
"txtTooltipShowMarking":"마킹 표시/비표시",
"txtTooltipShowMarkingTool":"마킹 툴바 표시/비표시",
"msgShioriDeleted":"북마크한 페이지가 삭제되었습니다.",
"dspViewHistory":"열람 이력",
"msgLoginEmpty":"로그인 정보를 입력해 주십시오.",
"msgSaveOk":"저장했습니다.",
"msgPlaceHolder":"키워드를 입력해 주십시오.",
"txtOpt004":"컨텐츠를 열 때 표시",
"txtRestoreTitle":"복원 확인",
"txtBackupTitle":"백업 확인",
"txtResMsgNotice":"※복원하면, 사용자 디바이스(PC, 태블릿 등)에 저장된 데이터를 마지막으로 백업한 데이터로 덮어씁니다. 복원 후 취소할 수 없습니다.",
"dspChange":"변경",
"msgNoIndex":"목차가 없습니다.",
"msgBackupSuccess":"백업했습니다.",
"msgBackupFailed":"백업을 실패했습니다.",
"msgRestoreSuccess":"복원했습니다.",
"msgRestoreFailed":"복원을 실패했습니다.",
"txtDeleteConfirmTitle":"북마크 삭제 확인",
"msgHistoryNotExist":"열람 이력이 없습니다.",
"msgChangePassword":"패스워드 변경를 변경해 주십시오.",
"txtMemoEdit":"편집",
"txtMemoCopy":"복사",
"msgPageImgErr":"컨텐츠를 표시할 수 없습니다. 이 컨텐츠는 삭제되었을 가능성이 있습니다.",
"sysAppTitle":"멀티미디어 컨텐츠 플랫폼",
"sysLockScrPwdInput":"패스워드를 입력해 주십시오.",
"txtOpt005":"새로고침을 하거나, 탭/창을 닫을 때 경고 표시",
"txtMemoMenu":"편집",
"txtMemoNew":"신규",
"txtMemoPaste":"붙여넣기",
"txtMemoClear":"클리어",
"txtMemo":"메모",
"msgBGMPlayConfirm":"이 컨텐츠는 BGM을 포함하고 있습니다. 재생을 시작합니다.",
"msgPWDNeedChange":"패스워드를 변경해야 합니다. 환경설정에서 패스워드를 변경해 주십시오.",
"msgBGMPagePlayConfirm":"이 페이지는 BGM을 포함하고 있습니다. 재생을 시작합니다.",
"txtBkSelectData":"백업할 데이터를 선택해 주십시오.",
"txtBkMarking":"마킹",
"txtBkMemo":"메모",
"txtBkShiori":"북마크",
"txtResSelect":"복원할 데이터를 선택해 주십시오.",
"txtBkDefault":"백업할 기본 대상:",
"txtOptPageTrans":"컨텐츠 열람 시 애니메이션",
"txtOptPageTransSlide":"Slide",
"txtOptPageTransFade":"Fade",
"txtOptPageTransRev":"Reveal & Move In",
"txtOptPageTransPeriod":"애니메이션 시간",
"msgPushAlert":"새로운 메시지가 있습니다!",
"txtPushAlert":"알림",
"txtNext":"다음 >",
"txtPrevious":"< 이전",
"msgAnonymousLoginErr":"로그인할 수 없습니다. (에러코드 : {0})",
"msgAnonymousLoginErr2":"로그인할 수 없습니다.",
"txtEnqueteTitle":"폼",
"txtTransparent":"투명",
"txtSemiTransparent":"반투명",
"txtNoTransparent":"불투명",
"txtContentPWTitle":"패스워드 확인",
"txtContentPWMsg":"열람하시려면 패스워드를 입력해 주십시오.",
"txtContentWarning":"경고",
"txtMediaAutoPlayWarning":"음악/동영상은 자동으로 재생됩니다.",
"txtPreventLink": "미리 보기에서 사용하실 수 없는 기능입니다.",
"msgContentNotExist": "컨텐츠가 존재하지 않습니다.",
"txtShare": "Share",
"txtDashMark": "-",
"txtUrlValidDate": "URL유효기간",
"txtMaxDownloadCount": "최대DL횟수",
"msgShareUrlPassword": "암호를 설정할경우 다음의 입력란에 입력하십시오.",
"msgStreamingOpenError": "스트리밍에서는 열람 할 수 없는 컨텐츠입니다.",
"msgContentLinkNotOpen": "이 컨텐츠는 Web판에서 열 수 없습니다."
}
"msgAnonymousLoginErr2":"로그인할 수 없습니다."
}
\ No newline at end of file
abvw/html/login.html
......@@ -12,21 +12,26 @@
<title></title>
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery.toastmessage.css?__UPDATEID__" />
<!-- <link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.css?__UPDATEID__" /> -->
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.min.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.structure.min.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.theme.min.css?__UPDATEID__" />
<!-- <link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery.toastmessage.css?__UPDATEID__" /> -->
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login_validation.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/limit_access.css?__UPDATEID__" />
<!-- <link rel="stylesheet" type="text/css" href="./abvw/css/layout/limit_access.css?__UPDATEID__" /> -->
<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-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-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> -->
<script type="text/javascript" src="./abvw/common/js/thickbox.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>
<script type="text/javascript" src="./abvw/common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/js/Limit_Access_Content.js?__UPDATEID__"></script>
<!-- <script type="text/javascript" src="./abvw/js/Limit_Access_Content.js?__UPDATEID__"></script> -->
<script type="text/javascript" src="./abvw/js/login.js?__UPDATEID__"></script>
<!--[if gte IE 9]>
......@@ -85,7 +90,7 @@
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT &copy; 2014 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
COPYRIGHT &copy; 2022 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
......
abvw/js/login/login.js
......@@ -8,12 +8,8 @@ LOGIN.optionList = [];
LOGIN.force_pw_change_on_login;
LOGIN.force_pw_change_periodically;
LOGIN.user_data_backup;
LOGIN.marking;
LOGIN.login_error_flag = false;
LOGIN.force_login_periodically;
LOGIN.login_errorMessage = "";
LOGIN.avwUserEnvObj = new UserEnvironment();
LOGIN.timeWaitSplashScreen = 2000;// wait splash screen 2 second
......@@ -58,7 +54,6 @@ LOGIN.saveLoginInfo = function() {
ClientData.userInfo_accountPath_session(accountPath);
ClientData.userInfo_loginId_session(loginId);
ClientData.userInfo_userName(LOGIN.userInfo_userName);
if (chkRemember == 'checked') {
ClientData.userInfo_rememberLogin(true);
} else {
......@@ -166,18 +161,11 @@ LOGIN.processLogin = function() {
};
// 引数パラメータがあれば取得
var paramContentID = COMMON.getUrlParam('cid', '');
// var paramContentID = COMMON.getUrlParam('cid', '');
// Set sid for login, this will be checked authoring 2 sessions
if (ClientData.userInfo_sid_local()) {
params.previousSid = ClientData.userInfo_sid_local();
} else {
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
if (ClientData.userInfo_sid_local_bak()) {
params.previousSid = ClientData.userInfo_sid_local_bak();
}
}
}
// Get url to login
......@@ -191,7 +179,6 @@ LOGIN.processLogin = function() {
LOGIN.getServiceOptionList();
if (data.result == 'success') {
// Save retrieved info
LOGIN.saveLoginInfo();
// set number new push message to 0
......@@ -210,17 +197,8 @@ LOGIN.processLogin = function() {
if (data.requirePasswordChange == 0) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
// ホームへ移動
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
} else if (data.requirePasswordChange == 1) {
......@@ -248,17 +226,8 @@ LOGIN.processLogin = function() {
if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
// ホームへ移動
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
} else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog();
$('#btnSkip').show();
......@@ -268,18 +237,8 @@ LOGIN.processLogin = function() {
} else { // no need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
// ホームへ移動
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
}
} else if (data.requirePasswordChange == 2) {
......@@ -301,17 +260,8 @@ LOGIN.processLogin = function() {
if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
// ホームへ移動
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
} else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog();
......@@ -328,18 +278,8 @@ LOGIN.processLogin = function() {
$("#txtPwdRemind").css('visibility', 'hidden');
} else { // No need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
// ホームへ移動
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
}
}
} else {
......@@ -386,9 +326,11 @@ LOGIN.changePasswordProcess = function() {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
$('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
$('#main-error-message').show();
}
} else {
......@@ -458,9 +400,11 @@ LOGIN.skipPassFunction = function() {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
$('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
$('#main-error-message').show();
}
};
......@@ -475,7 +419,7 @@ LOGIN.OpenChangePasswordDialog = function() {
// Close Chnage Password Dialog
LOGIN.CloseChangePasswordDialog = function() {
$("#main-password-change").dialog('close');
$("#main-password-change").hide();
};
// Save Service Option
......@@ -487,40 +431,12 @@ LOGIN.saveServiceUserOption = function() {
ClientData.serviceOpt_force_pw_change_periodically(option.value);
} else if (option.serviceOptionId == 21) {
ClientData.serviceOpt_force_pw_change_on_login(option.value);
} else if (option.serviceOptionId == 33) {
ClientData.serviceOpt_marking(option.value);
} else if (option.serviceOptionId == 28) {
ClientData.serviceOpt_user_data_backup(option.value);
} else if (option.serviceOptionId == 42) {
ClientData.serviceOpt_copy_text(option.value);
} else if (option.serviceOptionId == 60) {
ClientData.serviceOpt_web_screen_lock(option.value);
} else if (option.serviceOptionId == 61) {
ClientData.serviceOpt_web_screen_lock_wait(option.value);
} else if (option.serviceOptionId == 70) {
ClientData.serviceOpt_catalog_edition(option.value);
} else if (option.serviceOptionId == 77) {
ClientData.serviceOpt_hibiyakadan_catalog(option.value);
} else if (option.serviceOptionId == 71) {
ClientData.serviceOpt_usable_readinglog_gps(option.value);
} else if (option.serviceOptionId == 72) {
ClientData.serviceOpt_usable_readinglog_object(option.value);
} else if (option.serviceOptionId == 83) {
ClientData.serviceOpt_reader_usable_readinglog_gps(option.value);
} else if (option.serviceOptionId == 84) {
ClientData.serviceOpt_reader_readinglog_object(option.value);
} else if (option.serviceOptionId == 87) {
ClientData.serviceOpt_daihatsu(option.value);
} else if (option.serviceOptionId == 78) {
ClientData.serviceOpt_content_share(option.value);
} else if (option.serviceOptionId == 12) {
ClientData.serviceOpt_apns(option.value);
} else if (option.serviceOptionId == 49) {
ClientData.serviceOpt_usable_push_message(option.value);
} else if (option.serviceOptionId == 126) {
ClientData.serviceOpt_encryption(option.value);
} else if (option.serviceOptionId == 137) {
ClientData.serviceOpt_html_custom_log(option.value);
} else if (option.serviceOptionId == 161) {
ClientData.serviceOpt_abook_check(option.value);
}
......@@ -536,12 +452,6 @@ LOGIN.getServiceOptionList = function() {
LOGIN.force_pw_change_periodically = option.value;
} else if (option.serviceOptionId == 21) {
LOGIN.force_pw_change_on_login = option.value;
} else if (option.serviceOptionId == 23) {
LOGIN.force_login_periodically = option.value;
} else if (option.serviceOptionId == 33) {
LOGIN.marking = option.value;
} else if (option.serviceOptionId == 28) {
LOGIN.user_data_backup = option.value;
}
});
......@@ -577,342 +487,6 @@ LOGIN.initLoginNormalUser = function() {
$('#txtPassword').keydown(LOGIN.loginWhenClickEnter);
};
// init login for anonymous user
LOGIN.initLoginAnonymousUser = function() {
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
var sysSettings = AVWEB.avwSysSetting(); // get info in conf.json
var loginId = sysSettings.anonymousLoginId;
var urlPath = sysSettings.anonymousLoginPath;
if (loginId == "") {
loginId = "nologin";
}
if (urlPath == "") {
// URLからパース
urlPath = LOGIN.getUrlPath();
if (urlPath == null) {
urlPath = "dmy";
}
}
var params = {
previousSid : null,
loginId : loginId,
urlpath : urlPath
};
AVWEB.avwCmsApiWithUrl(ClientData.conf_apiLoginUrl(), null, 'webClientAnonymousLogin', 'post', params, function(data) {
if (data.result == 'success') {
// clear session of old anonymous user
// SessionStorageUtils.clear();
// 警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み
I18N.initi18n();
// set info user anonymous login
ClientData.userInfo_accountPath(urlPath);
ClientData.userInfo_accountPath_session(urlPath);
ClientData.userInfo_loginId(loginId);
ClientData.userInfo_loginId_session(loginId);
ClientData.userInfo_userName(data.userName);
ClientData.userInfo_sid(data.sid);
ClientData.userInfo_sid_local(data.sid);
// clear all local storage data of old anonymous
LocalStorageUtils.clear();
// set number new push message to 0
ClientData.pushInfo_newMsgNumber(0);
// get service option list
LOGIN.optionList = data.serviceOptionList;
// save service user option
LOGIN.saveServiceUserOption();
// hide splash screen then move to home page
$('#anonymous').fadeOut('slow', 'swing', function() {
// カタログエディション対応判定
if (ClientData.serviceOpt_catalog_edition() == 'Y') {
// 引数パラメータがあれば取得
var paramContentID = COMMON.getUrlParam('cid', '');
// カタログ対応
if (paramContentID != '') {
// OpenUrlでコンテンツ開く
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
// ホームへ移動
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
} else {
// ホームへ移動
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
});
} else {
if (data.errorMessage != null && data.errorMessage != undefined) {
LOGIN.showMessageErrorLoginAnonymous(AVWEB.format(I18N.i18nText('msgAnonymousLoginErr'), data.errorMessage).toString());
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
}
}, function(xhr, statusText, errorThrown) {
if (xhr.responseText && xhr.status != 0) {
var errorMessage = JSON.parse(xhr.responseText).errorMessage;
if (errorMessage) {
LOGIN.showMessageErrorLoginAnonymous(AVWEB.format(I18N.i18nText('msgAnonymousLoginErr'), errorMessage).toString());
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
});
};
// init login for getits user
LOGIN.initLoginGetitsUser = function() {
// console.log("LOGIN.initLoginGetitsUser");
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
var params = {
urlpath : ClientData.userInfo_accountPath()
};
I18N.initi18n();
AVWEB.avwCmsApiWithUrl(ClientData.conf_apiLoginUrl(), ClientData.userInfo_accountPath(), 'webClientGetitsLogin', 'post', params, function(data) {
if (data.result == 'success') {
// clear session of old anonymous user
// SessionStorageUtils.clear();
// 警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み
// I18N.initi18n();
ClientData.userInfo_userName(data.userName);
ClientData.userInfo_sid(data.sid);
ClientData.userInfo_sid_local(data.sid);
// clear all local storage data of old anonymous
LocalStorageUtils.clear();
// set number new push message to 0
ClientData.pushInfo_newMsgNumber(0);
// get service option list
LOGIN.optionList = data.serviceOptionList;
// save service user option
LOGIN.saveServiceUserOption();
// hide splash screen then move to home page
$('#anonymous').fadeOut('slow', 'swing', function() {
// 引数パラメータがあれば取得
var paramContentID = COMMON.getUrlParam('cid', '');
// カタログ対応
if (paramContentID != '') {
// OpenUrlでコンテンツ開く
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
// ホームへ移動
// AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
}
});
} else {
if (data.errorMessage != null && data.errorMessage != undefined) {
LOGIN.showMessageErrorLoginAnonymous(AVWEB.format(I18N.i18nText('msgAnonymousLoginErr'), data.errorMessage).toString());
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
}
}, function(xhr, statusText, errorThrown) {
if (xhr.responseText && xhr.status != 0) {
var errorMessage = JSON.parse(xhr.responseText).errorMessage;
if (errorMessage) {
LOGIN.showMessageErrorLoginAnonymous(AVWEB.format(I18N.i18nText('msgAnonymousLoginErr'), errorMessage).toString());
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
});
};
LOGIN.showMessageErrorLoginAnonymous = function(errorMessage) {
$().toastmessage({
position : 'middle-center'
});
$().toastmessage('showToast', {
type : 'error',
sticky : true,
text : errorMessage
});
$('.toast-position-middle-center').css('width', '400px');
};
// OpenUriで開いた場合の直接コンテンツ表示
LOGIN.showContentViewByOpenUrl = function(strContentId) {
var contentType = '';
var result = [];
var params = {
sid : ClientData.userInfo_sid(),
getType : '1',
contentId : strContentId
};
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params, function(data) {
// コンテンツIDセット
ClientData.contentInfo_contentId(strContentId);
// コンテツタイプ判定
contentType = data.contentData.contentType;
if (contentType == COMMON.ContentTypeKeys.Type_Others) {
// Download content
COMMON.downloadResourceById(strContentId);
} else {
// Go to Conten view page
if(ClientData.isGetitsMode()){
if(contentType == COMMON.ContentTypeKeys.Type_Html ||
contentType == COMMON.ContentTypeKeys.Type_Link ||
contentType == COMMON.ContentTypeKeys.Type_PanoImage ||
contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
var htmlUrl = LOGIN.htmlLinkById(strContentId, contentType);
if(htmlUrl){
//TODO 閲覧ログ送信
if(contentType == COMMON.ContentTypeKeys.Type_Html){
location.href=htmlUrl + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl + "&cid=" + strContentId;
}else{
location.href = htmlUrl;
}
}
return;
}
}
// アラート表示組み込めるか
LIMIT_ACCESS_CONTENT.messageLevel[data.contentData.contentId] = {
alertMessageLevel : data.contentData.alertMessageLevel,
alertMessage : data.contentData.alertMessage
};
// check limit of content
LIMIT_ACCESS_CONTENT.checkLimitContent(data.contentData.contentId, function() {
LOGIN.alertMessageOkFunction_callback();
}, function() {
LOGIN.alertMessageCancelFunction_callback();
});
}
}, function(xmlHttpRequest, txtStatus, errorThrown) {
// 見つからないかエラーなのでホームに移動
if (ClientData.isGetitsMode() == true) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else {
// アラートメッセージ表示
if (ClientData.serviceOpt_abook_check() == 'Y') {
LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'), "abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'), "abvw/" + COMMON.ScreenIds.Home);
}
}
});
};
// 警告表示時のOK処理
LOGIN.alertMessageOkFunction_callback = function() {
if (LOGIN.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewGetits);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewOpenUri);
}
};
// 警告表示時のキャンセル処理
LOGIN.alertMessageCancelFunction_callback = function() {
if (ClientData.isGetitsMode() == true) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else {
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
};
// Get resource Id of content
LOGIN.htmlLinkById = function(contentId,contentType) {
var params = {
sid : ClientData.userInfo_sid(),
contentId : contentId,
getType : '2',
isStreaming : ClientData.isStreamingMode()
};
var resourceUrl = "";
if(contentType == COMMON.ContentTypeKeys.Type_PanoImage){
resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/vtour/play/" + contentId;
}else if(contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/panorama/play/" + contentId;
}else if(contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
resourceUrl = ClientData.siteUrl() + ClientData.userInfo_accountPath() + "/open/objectvr/play/" + contentId;
}else{
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
function(data) {
if(contentType == COMMON.ContentTypeKeys.Type_Html){
resourceUrl = data.contentDataSub[0].resourceUrl;
} else if(contentType == COMMON.ContentTypeKeys.Type_Link){
resourceUrl = data.contentData.content.url;
}
}
);
}
if( !resourceUrl ){
resourceUrl = "";
}
return resourceUrl;
};
// Get urlPath String
LOGIN.getUrlPath = function() {
// URL文字列から事業者ID部分を抽出
var regex = new RegExp("/webad/([^&#]*)/");
var results = regex.exec(window.location.href);
if (results == null) {
return "";
} else {
return results[1];
}
};
/* display alert screen */
LOGIN.showAlertScreen = function(errMes, scrMove) {
......@@ -974,7 +548,7 @@ LOGIN.ready = function() {
// getitsモード有効
ClientData.isGetitsMode(true);
ClientData.siteUrl(siteUrl);
// api接続先設定
ClientData.conf_apiUrl(siteUrl + "{0}/abvapi");
......@@ -997,44 +571,25 @@ LOGIN.ready = function() {
ClientData.conf_apiResourceDlUrl(sysSettings.apiResourceDlUrl);
}
if (ClientData.isGetitsMode() == true) {
// 念のため前回までの閲覧ログは削除
ClientData.ContentLogData([]);
// 引数でアカウントパスを受け取ったらセットする
$('#anonymous').show();
setTimeout(function() {
LOGIN.initLoginGetitsUser();
$('#normalUser').show();
$('#formlogin').hide();
$('#logologin').animate({
"margin-top" : 0
}, LOGIN.timeWaitSplashScreen, function() {
$('#formlogin').show();
$('#menu-language').animate({
opacity : 1
}, LOGIN.timeWaitSplashScreen);
} else if (COMMON.isAnonymousLogin()) {
$('#anonymous').show();
setTimeout(function() {
LOGIN.initLoginAnonymousUser();
$('#formlogin').animate({
opacity : 1
}, LOGIN.timeWaitSplashScreen);
} else {
// 引数でアカウントパスを受け取ったらセットする
$('#normalUser').show();
$('#formlogin').hide();
$('#logologin').animate({
"margin-top" : 0
}, LOGIN.timeWaitSplashScreen, function() {
$('#formlogin').show();
$('#menu-language').animate({
opacity : 1
}, LOGIN.timeWaitSplashScreen);
$('#formlogin').animate({
opacity : 1
}, LOGIN.timeWaitSplashScreen);
$('.cnt_footer').animate({
opacity : 1
}, LOGIN.timeWaitSplashScreen);
});
LOGIN.initLoginNormalUser();
}
$('.cnt_footer').animate({
opacity : 1
}, LOGIN.timeWaitSplashScreen);
});
LOGIN.initLoginNormalUser();
};
// });
abvw/js/setting/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() + "";
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment