Changeset 4214
- Timestamp:
- Sep 29, 2007, 8:03:17 PM (15 years ago)
- Location:
- OpenPNE/trunk
- Files:
-
- 20 edited
- 25 copied
Legend:
- Unmodified
- Added
- Removed
-
OpenPNE/trunk/webapp/lib/db/member.php
r4160 r4214 644 644 * @param string $mail_address 645 645 * @param int $c_member_id チェックから除外するメンバーID 646 */ 647 function db_member_is_sns_join4mail_address($mail_address, $c_member_id = 0) 646 * @param bool $is_check_pre c_member_pre をチェックするかどうか 647 */ 648 function db_member_is_sns_join4mail_address($mail_address, $c_member_id = 0, $is_check_pre = false) 648 649 { 649 650 $params = array(t_encrypt($mail_address), intval($c_member_id)); … … 655 656 $k_array = db_get_row($sql, $params); 656 657 658 if ($is_check_pre) { 659 $sql = 'SELECT c_member_pre_id FROM c_member_pre WHERE ktai_address = ?'; 660 $params = array($mail_address); 661 $p_array = db_get_row($sql, $params); 662 } else { 663 $p_array = array(); 664 } 665 657 666 //対象のアドレスが登録済み 658 if ($array['c_member_id'] || $k_array['c_member_id'] ) {667 if ($array['c_member_id'] || $k_array['c_member_id'] || $p_array['c_member_pre_id']) { 659 668 return true; 660 669 } else { … … 749 758 { 750 759 $sql = 'SELECT * FROM c_member_ktai_pre WHERE session = ?'; 760 $params = array($session); 761 return db_get_row($sql, $params); 762 } 763 764 function db_member_c_member_pre4session($session) 765 { 766 $sql = 'SELECT * FROM c_member_pre WHERE ktai_session = ?'; 751 767 $params = array($session); 752 768 return db_get_row($sql, $params); … … 1032 1048 return false; 1033 1049 } 1050 1034 1051 if ($c_member_secure['ktai_address'] && !util_is_regist_mail_address($c_member_secure['ktai_address'])) { 1035 1052 return false; 1036 1053 } 1054 1037 1055 if (!util_is_regist_mail_address($c_member_secure['regist_address'])) { 1038 1056 return false; … … 1065 1083 $data = array( 1066 1084 'c_member_id' => intval($c_member_id), 1067 'hashed_password' => md5($c_member_secure['password']),1068 'hashed_password_query_answer' => md5($c_member_secure['password_query_answer']),1085 'hashed_password' => $c_member_secure['password'], 1086 'hashed_password_query_answer' => $c_member_secure['password_query_answer'], 1069 1087 'pc_address' => t_encrypt($c_member_secure['pc_address']), 1070 1088 'ktai_address' => t_encrypt($c_member_secure['ktai_address']), … … 1113 1131 1114 1132 return $c_member_id_new; 1133 } 1134 1135 function db_member_update_c_member_pre_secure($c_member_pre_id, $c_member_pre_secure, $is_encrypted_password = false) 1136 { 1137 $data = array( 1138 'session' => $c_member_pre_secure['session'], 1139 'nickname' => $c_member_pre_secure['nickname'], 1140 'birth_year' => $c_member_pre_secure['birth_year'], 1141 'birth_month' => $c_member_pre_secure['birth_month'], 1142 'birth_day' => $c_member_pre_secure['birth_day'], 1143 'public_flag_birth_year' => $c_member_pre_secure['public_flag_birth_year'], 1144 'c_password_query_id' => intval($c_member_pre_secure['c_password_query_id']), 1145 'password' => md5($c_member_pre_secure['password']), 1146 'c_password_query_answer' => md5($c_member_pre_secure['password_query_answer']), 1147 'pc_address' => $c_member_pre_secure['pc_address'], 1148 'ktai_address' => $c_member_pre_secure['ktai_address'], 1149 'regist_address' => $c_member_pre_secure['regist_address'], 1150 'ktai_session' => $c_member_pre_secure['ktai_session'], 1151 ); 1152 1153 if ($is_encrypted_password) { 1154 $data['password'] = $c_member_pre_secure['password']; 1155 $data['c_password_query_answer'] = $c_member_pre_secure['password_query_answer']; 1156 } 1157 1158 return db_update('c_member_pre', $data, array('c_member_pre_id' => $c_member_pre_id)); 1115 1159 } 1116 1160 … … 1372 1416 * 招待メール送信 1373 1417 */ 1374 function db_member_insert_c_invite($c_member_id_invite, $pc_address, $message, $session )1418 function db_member_insert_c_invite($c_member_id_invite, $pc_address, $message, $session, $is_disabled_regist_easy_access_id = false) 1375 1419 { 1376 1420 $data = array( … … 1384 1428 'ktai_address' => '', 1385 1429 'easy_access_id' => '', 1430 'is_disabled_regist_easy_access_id' => $is_disabled_regist_easy_access_id, 1386 1431 'c_password_query_answer' => '', 1387 1432 ); … … 1392 1437 * 招待メール送信 1393 1438 */ 1394 function db_member_update_c_invite($c_member_id_invite, $pc_address, $message, $session) 1395 { 1439 function db_member_update_c_invite($c_member_id_invite, $pc_address, $message, $session, $is_disabled_regist_easy_access_id = false) 1440 { 1441 $sql = 'SELECT c_member_pre_id,ktai_session FROM c_member_pre WHERE pc_address = ?'; 1442 $pre = db_get_row($sql, array($pc_address)); 1443 1396 1444 $data = array( 1397 1445 'c_member_id_invite' => intval($c_member_id_invite), 1398 1446 'session' => $session, 1399 1447 'regist_address' => $pc_address, 1448 'is_disabled_regist_easy_access_id' => $is_disabled_regist_easy_access_id, 1400 1449 'r_date' => db_now(), 1401 1450 ); 1451 1452 // プロフィール項目登録済みで携帯版未登録の場合(個体識別番号必須制) 1453 if (!empty($pre['ktai_session'])) { 1454 // プロフィール情報を削除 1455 db_member_delete_c_member_pre_profile4c_member_pre_id($pre['c_member_pre_id']); 1456 $tmp = array( 1457 'nickname' => '', 1458 'birth_year' => 0, 1459 'birth_month' => 0, 1460 'birth_day' => 0, 1461 'ktai_address' => '', 1462 'password' => '', 1463 'c_password_query_id' => 0, 1464 'c_password_query_answer' => '', 1465 'ktai_session' => '', 1466 ); 1467 $data = array_merge($data, $tmp); 1468 } 1469 1402 1470 $where = array('pc_address' => $pc_address); 1403 1471 return db_update('c_member_pre', $data, $where); … … 1424 1492 } 1425 1493 1494 function db_member_delete_c_member_pre4ktai_session($ktai_session) 1495 { 1496 $sql = 'DELETE FROM c_member_pre WHERE ktai_session = ?'; 1497 $params = array($ktai_session); 1498 return db_query($sql, $params); 1499 } 1500 1501 function db_member_delete_c_member_pre_profile4c_member_pre_id($c_member_pre_id) 1502 { 1503 $sql = 'DELETE FROM c_member_pre_profile WHERE c_member_pre_id = ?'; 1504 $params = array($c_member_pre_id); 1505 return db_query($sql, $params); 1506 } 1507 1426 1508 //--- c_member_ktai_pre 1427 1509 … … 1449 1531 * c_member_ktai_preを更新 1450 1532 */ 1451 function db_member_update_c_member_ktai_pre($session, $ktai_address, $c_member_id_invite )1533 function db_member_update_c_member_ktai_pre($session, $ktai_address, $c_member_id_invite, $is_disabled_regist_easy_access_id = false) 1452 1534 { 1453 1535 $data = array( … … 1455 1537 'r_datetime' => db_now(), 1456 1538 'c_member_id_invite' => intval($c_member_id_invite), 1539 'is_disabled_regist_easy_access_id' => $is_disabled_regist_easy_access_id, 1457 1540 ); 1458 1541 $where = array('ktai_address' => $ktai_address); … … 1467 1550 } 1468 1551 1469 function db_member_insert_c_member_ktai_pre($session, $ktai_address, $c_member_id_invite )1552 function db_member_insert_c_member_ktai_pre($session, $ktai_address, $c_member_id_invite, $is_disabled_regist_easy_access_id = false) 1470 1553 { 1471 1554 $data = array( … … 1474 1557 'c_member_id_invite' => intval($c_member_id_invite), 1475 1558 'r_datetime' => db_now(), 1559 'is_disabled_regist_easy_access_id' => $is_disabled_regist_easy_access_id, 1476 1560 ); 1477 1561 return db_insert('c_member_ktai_pre', $data); … … 1522 1606 ); 1523 1607 return db_insert('c_member_profile', $data); 1608 } 1609 1610 /*** 1611 * 一時的に c_member_pre_profile にプロフィール情報をインサートする 1612 * 1613 * 個体識別番号登録必須制が「必須にする」である場合など、c_member ではなく c_member_pre を使うのが望ましい場面で使用する。 1614 * 1615 * @param int $c_member_pre_id 1616 * @param int $c_profile_id 1617 * @param int $c_profile_option_id 1618 * @param int $value 1619 * @param string $public_flag 1620 * @return mixed 1621 */ 1622 function db_member_insert_c_member_pre_profile($c_member_pre_id, $c_profile_id, $c_profile_option_id, $value, $public_flag) 1623 { 1624 $data = array( 1625 'c_member_pre_id' => intval($c_member_pre_id), 1626 'c_profile_id' => intval($c_profile_id), 1627 'c_profile_option_id' => intval($c_profile_option_id), 1628 'value' => $value, 1629 'public_flag' => $public_flag, 1630 ); 1631 return db_insert('c_member_pre_profile', $data); 1632 } 1633 1634 /*** 1635 * c_member_pre_profile のプロフィール情報を更新する 1636 * 1637 * @param int $c_member_pre_id 1638 * @param array $c_member_profile_list 1639 * @return mixed 1640 */ 1641 function db_member_update_c_member_pre_profile($c_member_pre_id, $c_member_profile_list) 1642 { 1643 foreach ($c_member_profile_list as $item) { 1644 $sql = 'DELETE FROM c_member_pre_profile' . 1645 ' WHERE c_member_pre_id = ? AND c_profile_id = ?'; 1646 $params = array(intval($c_member_pre_id), intval($item['c_profile_id'])); 1647 db_query($sql, $params); 1648 1649 if (!(is_null($item['value']) || $item['value'] === '')) { 1650 if (is_array($item['value'])) { 1651 foreach ($item['value'] as $key => $value) { 1652 db_member_insert_c_member_pre_profile($c_member_pre_id, $item['c_profile_id'], $key, $value, $item['public_flag']); 1653 } 1654 } else { 1655 db_member_insert_c_member_pre_profile($c_member_pre_id, $item['c_profile_id'], $item['c_profile_option_id'], $item['value'], $item['public_flag']); 1656 } 1657 } 1658 } 1659 } 1660 1661 /*** 1662 * c_member_pre_profile のプロフィール情報を取得する 1663 * 1664 * @param int $c_member_pre_id 1665 * @return array 1666 */ 1667 function db_member_c_member_pre_profile4c_member_pre_id($c_member_pre_id) 1668 { 1669 $sql = 'SELECT * FROM c_member_pre_profile WHERE c_member_pre_id = ?'; 1670 $params = array(intval($c_member_pre_id)); 1671 return db_get_all($sql, $params); 1524 1672 } 1525 1673 … … 1722 1870 } 1723 1871 1872 function db_member_is_ktai_id_registed($c_member_id) 1873 { 1874 $sql = 'SELECT easy_access_id FROM c_member_secure WHERE c_member_id = ?'; 1875 $params = array(intval($c_member_id)); 1876 return (db_get_one($sql, $params) != ''); 1877 } 1878 1724 1879 function db_member_is_blacklist($c_member_id) 1725 1880 { -
OpenPNE/trunk/webapp/lib/util/ktai.php
r4096 r4214 41 41 25 => "パスワード再発行できませんでした", 42 42 26 => "新しいパスワードをメールで送信しました", 43 27 => "携帯 の個体識別番号を取得できませんでした",43 27 => "携帯個体識別番号を取得できませんでした", 44 44 28 => "かんたんログイン設定を完了しました", 45 45 29 => "かんたんログイン設定を解除しました", … … 53 53 37 => "このアドレスでは登録できません", 54 54 38 => "退会理由を入力して下さい", 55 39 => "この 個体識別番号はすでに登録されています",55 39 => "この携帯個体識別番号はすでに登録されています", 56 56 40 => "日記の公開範囲を一括変更しました", 57 57 41 => "無効なメンバーIDが含まれています", 58 58 42 => "登録できませんでした", 59 44 => "この 個体識別番号は登録することができません",59 44 => "この携帯個体識別番号は登録することができません", 60 60 45 => "イベントの参加者数制限を超えています", 61 61 ); -
OpenPNE/trunk/webapp/lib/util/mail_send.php
r4164 r4214 849 849 } 850 850 } 851 852 //携帯個体識別番号を登録する必要がある場合に送られるメール 853 function do_mail_sns_regist_ktai_id_mail_send($c_member_id, $session, $ktai_address) 854 { 855 $params['SNS_NAME'] = SNS_NAME; 856 $p = array('id' => $c_member_id, 'ses' => $session); 857 $params['url'] = openpne_gen_url('ktai', 'page_o_regist_ktai', $p); 858 return fetch_send_mail($ktai_address, 'm_ktai_regist_ktai_id', $params); 859 } 860 //携帯個体識別番号を登録する必要がある場合に送られるメール(新規登録用) 861 function do_mail_sns_regist_ktai_id_mail_send_pre($c_member_pre_id, $session, $ktai_address) 862 { 863 $params['SNS_NAME'] = SNS_NAME; 864 $p = array('pre_id' => $c_member_pre_id, 'ses' => $session); 865 $params['url'] = openpne_gen_url('ktai', 'page_o_regist_ktai', $p); 866 return fetch_send_mail($ktai_address, 'm_ktai_regist_ktai_id', $params); 867 } 851 868 ?> -
OpenPNE/trunk/webapp/modules/admin/do/send_invites.php
r2913 r4214 21 21 $mails = str_replace("\r", "\n", $mails); 22 22 $mail_list = explode("\n", $mails); 23 24 $is_disable_regist_easy_access_id = $requests['is_disable_regist_easy_access_id']; 23 25 24 26 // filtering … … 66 68 // c_member_ktai_pre に追加 67 69 if (db_member_c_member_ktai_pre4ktai_address($mail)) { 68 db_member_update_c_member_ktai_pre($session, $mail, $c_member_id_invite );70 db_member_update_c_member_ktai_pre($session, $mail, $c_member_id_invite, $is_disable_regist_easy_access_id); 69 71 } else { 70 db_member_insert_c_member_ktai_pre($session, $mail, $c_member_id_invite );72 db_member_insert_c_member_ktai_pre($session, $mail, $c_member_id_invite, $is_disable_regist_easy_access_id); 71 73 } 72 74 … … 84 86 // c_member_pre に追加 85 87 if (db_member_c_member_pre4pc_address($mail)) { 86 db_member_update_c_invite($c_member_id_invite, $mail, $requests['message'], $session );88 db_member_update_c_invite($c_member_id_invite, $mail, $requests['message'], $session, $is_disable_regist_easy_access_id); 87 89 } else { 88 db_member_insert_c_invite($c_member_id_invite, $mail, $requests['message'], $session );90 db_member_insert_c_invite($c_member_id_invite, $mail, $requests['message'], $session, $is_disable_regist_easy_access_id); 89 91 } 90 92 -
OpenPNE/trunk/webapp/modules/admin/do/update_c_admin_config.php
r4032 r4214 16 16 $config =& OpenPNE_Config::getInstance(); 17 17 18 if (!$requests['OPENPNE_ENABLE_KTAI'] && ($requests['IS_GET_EASY_ACCESS_ID'] == 3)) { 19 admin_client_redirect('edit_c_admin_config', '「PC・携帯登録時に携帯個体識別番号の登録を必須にする」を選択した場合、携帯版使用設定は「使用可にする」に設定する必要があります'); 20 } 18 21 foreach ($requests as $name => $value) { 19 22 if (!$config->is_allowed($name)) continue; -
OpenPNE/trunk/webapp/modules/admin/templates/edit_c_admin_config.tpl
r4032 r4214 70 70 <span class="caution">※使用不可にすると携帯で表示できなくなります</span> 71 71 </td> 72 </tr>73 72 <tr class="cell08"> 74 73 <th colspan="2">登録の可否</th> … … 81 80 </tr> 82 81 <tr class="cell27"> 83 <th colspan="2">個体識別番号の取得設定</th> 84 <td> 85 <input class="basicRadio" name="IS_GET_EASY_ACCESS_ID" id="IS_GET_EASY_ACCESS_ID_2" type="radio" value="2"({if $smarty.const.IS_GET_EASY_ACCESS_ID == 2}) checked="checked"({/if}) /><label for="IS_GET_EASY_ACCESS_ID_2">携帯登録時に個体識別番号を取得する(必須)</label><br /> 82 <th colspan="2">メンバー登録時の<br />携帯個体識別番号取得設定</th> 83 <td> 84 <input class="basicRadio" name="IS_GET_EASY_ACCESS_ID" id="IS_GET_EASY_ACCESS_ID_3" type="radio" value="3"({if $smarty.const.IS_GET_EASY_ACCESS_ID == 3}) checked="checked"({/if}) /><label for="IS_GET_EASY_ACCESS_ID_3">PC・携帯登録時に個体識別番号を必須にする</label><br /> 85 <input class="basicRadio" name="IS_GET_EASY_ACCESS_ID" id="IS_GET_EASY_ACCESS_ID_2" type="radio" value="2"({if $smarty.const.IS_GET_EASY_ACCESS_ID == 2}) checked="checked"({/if}) /><label for="IS_GET_EASY_ACCESS_ID_2">携帯登録時に携帯個体識別番号の登録を必須にする</label><br /> 86 86 <input class="basicRadio" name="IS_GET_EASY_ACCESS_ID" id="IS_GET_EASY_ACCESS_ID_1" type="radio" value="1"({if $smarty.const.IS_GET_EASY_ACCESS_ID == 1}) checked="checked"({/if}) /><label for="IS_GET_EASY_ACCESS_ID_1">携帯登録時に個体識別番号を取得する(任意)</label><br /> 87 <input class="basicRadio" name="IS_GET_EASY_ACCESS_ID" id="IS_GET_EASY_ACCESS_ID_0" type="radio" value="0"({if $smarty.const.IS_GET_EASY_ACCESS_ID == 0}) checked="checked"({/if}) /><label for="IS_GET_EASY_ACCESS_ID_0">携帯登録時に個体識別番号を取得しない</label> 87 <input class="basicRadio" name="IS_GET_EASY_ACCESS_ID" id="IS_GET_EASY_ACCESS_ID_0" type="radio" value="0"({if $smarty.const.IS_GET_EASY_ACCESS_ID == 0}) checked="checked"({/if}) /><label for="IS_GET_EASY_ACCESS_ID_0">携帯登録時には個体識別番号を取得しない</label><br /> 88 <span class="caution">※携帯個体識別番号の登録を必須にした場合、携帯個体識別番号が取得可能な携帯端末を持っていないメンバーが登録できなくなってしまう可能性があります</span><br /> 89 <span class="caution">※すでに登録済みのメンバーに対しては、携帯個体識別番号の登録は強制されません</span><br /> 90 <span class="caution">※「PC・携帯登録時に携帯個体識別番号の登録を必須にする」を選択した場合、携帯版使用設定は「使用可にする」に設定する必要があります</span><br /> 88 91 </td> 89 92 </tr> -
OpenPNE/trunk/webapp/modules/admin/templates/send_invites.tpl
r3202 r4214 31 31 <dt class="message"><strong>招待文</strong></dt> 32 32 <dd class="message"><textarea cols="60" rows="5" name="message">({$requests.message})</textarea></dd> 33 ({if $smarty.const.IS_GET_EASY_ACCESS_ID == 2 || $smarty.const.IS_GET_EASY_ACCESS_ID == 3}) 34 <dt><strong>携帯個体識別番号の登録</strong></dt> 35 <dd> 36 <input type="radio" name="is_disable_regist_easy_access_id" value="0" />必須にする<br /> 37 <input type="radio" name="is_disable_regist_easy_access_id" value="1" checked="checked" />必須にしない<br /> 38 </dd> 39 <dd class="caution" id="c02">※「必須にしない」を選択して招待したメンバーは、携帯個体識別番号を登録しなくてもメンバー登録することができます。 40 ({if $smarty.const.IS_GET_EASY_ACCESS_ID == 2})<br />※携帯メールアドレスへの招待のみ適用されます。({/if})</dd> 41 ({/if}) 33 42 </dl> 34 43 <p class="textBtn"><input type="submit" value="確認画面"></p> -
OpenPNE/trunk/webapp/modules/admin/templates/send_invites_confirm.tpl
r2657 r4214 16 16 ({else}) 17 17 <dl class="invitesAdd"> 18 <dt><strong>【PC アドレス】</strong></dt>18 <dt><strong>【PCメールアドレス】</strong></dt> 19 19 ({/if}) 20 20 <dd>({foreach from=$requests.pc_mails item=item name=pm})<strong>({$item})</strong>({if !$smarty.foreach.pm.last}) / ({/if})({/foreach})</dd> … … 27 27 ({else}) 28 28 <dl class="invitesAdd"> 29 <dt><strong>【携帯 アドレス】</strong></dt>29 <dt><strong>【携帯メールアドレス】</strong></dt> 30 30 ({/if}) 31 31 <dd>({foreach from=$requests.ktai_mails item=item name=km})<strong>({$item})</strong>({if !$smarty.foreach.km.last}) / ({/if})({/foreach})</dd> 32 32 </dl> 33 ({/if}) 34 ({if $smarty.const.IS_GET_EASY_ACCESS_ID == 2 || $smarty.const.IS_GET_EASY_ACCESS_ID == 3}) 35 <dl class="invitesAdd"> 36 <dt><strong>【携帯個体識別番号の登録】</strong></dt> 37 ({if $requests.is_disable_regist_easy_access_id}) 38 <dd><strong>必須にしない</strong></dd> 39 ({else}) 40 <dd><strong>必須にする</strong></dd> 41 ({/if}) 42 </dl> 43 ({if $smarty.const.IS_GET_EASY_ACCESS_ID == 2}) 44 <div class="caution">※携帯メールアドレスへの招待のみ適用されます。</div> 45 ({/if}) 33 46 ({/if}) 34 47 ({if $requests.error_mails}) … … 48 61 <input type="hidden" name="mails" value="({$requests.mails})" /> 49 62 <input type="hidden" name="message" value="({$requests.message})" /> 63 <input type="hidden" name="is_disable_regist_easy_access_id" value="({$requests.is_disable_regist_easy_access_id})" /> 50 64 ({if !$cannot_send})<p class="textBtn"><input name="complete" type="submit" value="送信する"></p>({/if})<p class="textBtn"><input name="input" type="submit" value="修正する"></p> 51 65 </form> -
OpenPNE/trunk/webapp/modules/admin/validate/do/send_invites.ini
r2 r4214 10 10 [message] 11 11 type = "string" 12 13 14 [is_disable_regist_easy_access_id] 15 type = "int" 16 min = 0 17 max = 1 18 default = 0 19 required = 0 -
OpenPNE/trunk/webapp/modules/admin/validate/page/send_invites_confirm.ini
r2657 r4214 20 20 [message] 21 21 type = "string" 22 23 [is_disable_regist_easy_access_id] 24 type = "int" 25 min = 0 26 max = 1 27 default = 1 28 required = 0 -
OpenPNE/trunk/webapp/modules/ktai/do/o_insert_c_member.php
r4096 r4214 85 85 if (IS_GET_EASY_ACCESS_ID != 0) { 86 86 $easy_access_id = OpenPNE_KtaiID::getID(); 87 if (!$easy_access_id && (IS_GET_EASY_ACCESS_ID == 2 )) {88 $errors[] = '携帯の個体識別番号を取得できませんでした';87 if (!$easy_access_id && (IS_GET_EASY_ACCESS_ID == 2 || IS_GET_EASY_ACCESS_ID == 3) && (!$pre['is_disabled_regist_easy_access_id'])) { 88 openpne_redirect('ktai', 'page_o_regist_ktai_uid_err'); 89 89 } 90 90 if (db_member_c_member_id4easy_access_id($easy_access_id)) { 91 $errors[] = 'この 個体識別番号はすでに登録されています';91 $errors[] = 'この携帯個体識別番号はすでに登録されています'; 92 92 } 93 93 if (db_member_easy_access_id_is_blacklist(md5($easy_access_id))) { -
OpenPNE/trunk/webapp/modules/ktai/do/o_update_ktai_address.php
r4096 r4214 41 41 } 42 42 43 if (IS_GET_EASY_ACCESS_ID == 2 ) {43 if (IS_GET_EASY_ACCESS_ID == 2 || IS_GET_EASY_ACCESS_ID == 3) { 44 44 45 45 // 携帯の個体識別番号の取得が必須 -
OpenPNE/trunk/webapp/modules/pc/do/h_delete_ktai.php
r3918 r4214 11 11 $u = $GLOBALS['AUTH']->uid(); 12 12 13 if (IS_GET_EASY_ACCESS_ID == 3 || IS_GET_EASY_ACCESS_ID == 2) { 14 handle_kengen_error(); 15 } 16 13 17 db_member_update_ktai_address($u, ''); 14 18 openpne_redirect('pc', 'page_h_ktai_delete_end'); -
OpenPNE/trunk/webapp/modules/pc/do/o_regist_prof.php
r4056 r4214 26 26 } 27 27 28 // メールアドレスが登録できるかどうか29 28 $pre = db_member_c_member_pre4sid($sid); 30 if (!util_is_regist_mail_address($pre['pc_address'])) {31 $p = array('msg_code' => 'invalid_url');32 openpne_redirect('pc', 'page_o_tologin', $p);33 }34 29 35 30 $mode = $requests['mode']; … … 129 124 exit; 130 125 case 'register': 131 // delete cookie 126 $pre = db_member_c_member_pre4sid($sid); 127 // delete cookie 132 128 setcookie(session_name(), '', time() - 3600, ini_get('session.cookie_path')); 133 129 134 $pre = db_member_c_member_pre4sid($sid); 135 136 // c_member, c_member_secure 137 $c_member = $prof; 138 $c_member['c_member_id_invite'] = $pre['c_member_id_invite']; 139 $c_member['is_receive_mail'] = 1; 140 $c_member['is_receive_ktai_mail'] = 1; 141 $c_member['is_receive_daily_news'] = 1; 142 $c_member_secure = array( 143 'password' => $prof['password'], 144 'password_query_answer' => $prof['c_password_query_answer'], 145 'pc_address' => $pre['pc_address'], 146 'ktai_address' => '', 147 'regist_address' => $pre['pc_address'], 148 ); 149 $u = db_member_insert_c_member($c_member, $c_member_secure); 150 151 if (OPENPNE_USE_POINT_RANK) { 152 //入会者にポイント加算 153 $point = db_action_get_point4c_action_id(1); 154 db_point_add_point($u, $point); 155 156 //メンバー招待をした人にポイント付与 157 $point = db_action_get_point4c_action_id(7); 158 db_point_add_point($pre['c_member_id_invite'], $point); 130 if ((IS_GET_EASY_ACCESS_ID != 3) || $pre['is_disabled_regist_easy_access_id']) { 131 // メンバー登録時の携帯個体識別番号取得設定が「PC・携帯登録時に個体識別番号を必須にする」でない場合、メンバー登録処理をおこなう 132 $c_member = $prof; 133 $c_member['c_member_id_invite'] = $pre['c_member_id_invite']; 134 $c_member['is_receive_mail'] = 1; 135 $c_member['is_receive_ktai_mail'] = 1; 136 $c_member['is_receive_daily_news'] = 1; 137 $c_member_secure = array( 138 'password' => $prof['password'], 139 'password_query_answer' => $prof['c_password_query_answer'], 140 'pc_address' => $pre['pc_address'], 141 'ktai_address' => '', 142 'regist_address' => $pre['pc_address'], 143 ); 144 $u = db_member_insert_c_member($c_member, $c_member_secure); 145 146 if (OPENPNE_USE_POINT_RANK) { 147 //入会者にポイント加算 148 $point = db_action_get_point4c_action_id(1); 149 db_point_add_point($u, $point); 150 151 //メンバー招待をした人にポイント付与 152 $point = db_action_get_point4c_action_id(7); 153 db_point_add_point($pre['c_member_id_invite'], $point); 154 } 155 156 // c_member_profile 157 db_member_update_c_member_profile($u, $c_member_profile_list); 158 159 // 招待者とフレンドリンク 160 db_friend_insert_c_friend($u, $pre['c_member_id_invite']); 161 162 //管理画面で指定したコミュニティに強制参加 163 $c_commu_id_list = db_commu_regist_join_list(); 164 foreach ($c_commu_id_list as $c_commu_id) { 165 db_commu_join_c_commu($c_commu_id, $u); 166 } 167 168 // pre の内容を削除 169 db_member_delete_c_member_pre4sid($sid); 170 171 // 登録完了メール送信 172 do_regist_prof_do_regist2_mail_send($u); 173 174 openpne_redirect('pc', 'page_o_regist_end', array('c_member_id' => $u)); 175 } else { 176 // メンバー登録時の携帯個体識別番号取得設定が「PC・携帯登録時に個体識別番号を必須にする」である場合、 177 // ここでのメンバー登録はすべてスキップする。入力した項目は c_member_pre とc_member_pre_profile に 178 // 保持しておき、携帯の登録が完了した場合に、メンバー登録も完了する 179 180 // c_member_pre_profile にデータ挿入 181 db_member_update_c_member_pre_profile($pre['c_member_pre_id'], $c_member_profile_list); 182 183 // c_member_pre にデータ挿入 184 $c_member_pre_secure = array( 185 'session' => $pre['session'], 186 'nickname' => $prof['nickname'], 187 'birth_year' => $prof['birth_year'], 188 'birth_month' => $prof['birth_month'], 189 'birth_day' => $prof['birth_day'], 190 'public_flag_birth_year' => $prof['public_flag_birth_year'], 191 'password' => $prof['password'], 192 'public_flag_birth_year' => $prof['public_flag_birth_year'], 193 'c_password_query_id' => $prof['c_password_query_id'], 194 'password_query_answer' => $prof['c_password_query_answer'], 195 'pc_address' => $pre['pc_address'], 196 'regist_address' => $pre['pc_address'], 197 ); 198 199 db_member_update_c_member_pre_secure($pre['c_member_pre_id'], $c_member_pre_secure); 200 201 openpne_redirect('pc', 'page_o_regist_ktai_address', array('sid' => $pre['session'])); 159 202 } 160 161 // c_member_profile162 db_member_update_c_member_profile($u, $c_member_profile_list);163 164 // 招待者とフレンドリンク165 db_friend_insert_c_friend($u, $pre['c_member_id_invite']);166 167 //管理画面で指定したコミュニティに強制参加168 $c_commu_id_list = db_commu_regist_join_list();169 foreach ($c_commu_id_list as $c_commu_id) {170 db_commu_join_c_commu($c_commu_id, $u);171 }172 173 // pre の内容を削除174 db_member_delete_c_member_pre4sid($sid);175 176 // 登録完了メール送信177 do_regist_prof_do_regist2_mail_send($u);178 179 openpne_redirect('pc', 'page_o_regist_end', array('c_member_id' => $u));180 203 } 181 204 } -
OpenPNE/trunk/webapp/modules/pc/page/h_delete_ktai.php
r3918 r4214 11 11 $u = $GLOBALS['AUTH']->uid(); 12 12 13 if (IS_GET_EASY_ACCESS_ID == 3 || IS_GET_EASY_ACCESS_ID == 2) { 14 handle_kengen_error(); 15 } 16 13 17 $this->set('inc_navi',fetch_inc_navi("h")); 14 18 -
OpenPNE/trunk/webapp/modules/pc/page/o_regist_prof.php
r2913 r4214 30 30 } 31 31 32 // メールアドレスが登録できるかどうか33 32 $pre = db_member_c_member_pre4sid($sid); 34 if (!util_is_regist_mail_address($pre['pc_address'])) {35 $p = array('msg_code' => 'invalid_url');36 openpne_redirect('pc', 'page_o_tologin', $p);37 }38 33 39 34 $this->set('err_msg', $err_msg); -
OpenPNE/trunk/webapp/modules/pc/page/o_regist_prof_confirm.php
r2913 r4214 29 29 } 30 30 31 // メールアドレスが登録できるかどうか32 31 $pre = db_member_c_member_pre4sid($sid); 33 if (!util_is_regist_mail_address($pre['pc_address'])) {34 $p = array('msg_code' => 'invalid_url');35 openpne_redirect('pc', 'page_o_tologin', $p);36 }37 32 38 33 $this->set('inc_page_header', fetch_inc_page_header('regist')); -
OpenPNE/trunk/webapp/modules/pc/templates/h_config_ktai.tpl
r4117 r4214 137 137 <!-- ******************************************** --> 138 138 139 ({if $ktai })139 ({if $ktai && ($smarty.const.IS_GET_EASY_ACCESS_ID != 3 && $smarty.const.IS_GET_EASY_ACCESS_ID != 2)}) 140 140 141 141 <table border="0" cellspacing="0" cellpadding="0" style="width:580px;" class="border_07"> -
OpenPNE/trunk/webapp/modules/pc/templates/o_regist_end.tpl
r4117 r4214 25 25 <tr> 26 26 <td style="width:36px;" class="bg_06"><img src="({t_img_url_skin filename=content_header_1})" style="width:30px;height:20px;" class="dummy"></td> 27 <td style="width:528px;padding:2px 0px;" class="bg_06"><span class="b_b c_00">登録完了</span></td> 27 <td style="width:528px;padding:2px 0px;" class="bg_06"><span class="b_b c_00"> 28 登録完了 29 </span></td> 28 30 </tr> 29 31 </table> … … 93 95 <img src="./skin/dummy.gif" alt="" class="v_spacer_l"> 94 96 95 <!-- ************************************** -->96 <!-- ******ここから:ウィンドウを閉じる****** -->97 <div align="center">98 99 <img src="./skin/dummy.gif" alt="" class="icon arrow_1"> <a href="javascript:void(0);" onclick="window.close()">ウィンドウを閉じる</a>100 101 </div>102 <!-- ******ここまで:ウィンドウを閉じる****** -->103 <!-- ************************************** -->104 105 <img src="./skin/dummy.gif" alt="" class="v_spacer_l">106 107 <img src="./skin/dummy.gif" alt="" class="v_spacer_l">108 109 <img src="./skin/dummy.gif" alt="" class="v_spacer_l">110 111 97 ({*ここから:アフィリエイトタグ*}) 112 98 ({$aftag|smarty:nodefaults}) -
OpenPNE/trunk/webapp/modules/pc/templates/o_regist_prof.tpl
r4117 r4214 328 328 <td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" alt="dot" class="dot"></td> 329 329 </tr> 330 ({*********})331 330 <tr> 332 331 <td class="bg_01" align="center"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
Note: See TracChangeset
for help on using the changeset viewer.