ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 4206


Ignore:
Timestamp:
Sep 29, 2007, 6:29:49 PM (13 years ago)
Author:
ebihara
Message:

#1129:管理画面から「携帯個体識別番号の登録」を「必須にしない」として送られた招待の場合、携帯個体識別番号を任意に取得するようにした

Location:
OpenPNE/branches/work/ebihara/prj_regist_ktai_uid
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/setup/sql/mysql40/update/update17-for2.10alpha2-alter_c_member_pre.sql

    r4204 r4206  
    11ALTER TABLE `c_member_pre` ADD COLUMN `ktai_session` varchar(255) NOT NULL default '';
    22ALTER TABLE `c_member_pre` ADD COLUMN `is_disabled_regist_easy_access_id` tinyint(1) NOT NULL default '0';
     3
     4ALTER TABLE `c_member_ktai_pre` ADD COLUMN `is_disabled_regist_easy_access_id` tinyint(1) NOT NULL default '0';
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/setup/sql/mysql41/update/update17-for2.10alpha2-alter_c_member_pre.sql

    r4204 r4206  
    33ALTER TABLE `c_member_pre` ADD COLUMN `ktai_session` varchar(255) NOT NULL default '';
    44ALTER TABLE `c_member_pre` ADD COLUMN `is_disabled_regist_easy_access_id` tinyint(1) NOT NULL default '0';
     5
     6ALTER TABLE `c_member_ktai_pre` ADD COLUMN `is_disabled_regist_easy_access_id` tinyint(1) NOT NULL default '0';
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/lib/db/member.php

    r4204 r4206  
    14161416 * 招待メール送信
    14171417 */
    1418 function db_member_insert_c_invite($c_member_id_invite, $pc_address, $message, $session)
     1418function db_member_insert_c_invite($c_member_id_invite, $pc_address, $message, $session, $is_disabled_regist_easy_access_id = false)
    14191419{
    14201420    $data = array(
     
    14281428        'ktai_address' => '',
    14291429        'easy_access_id' => '',
     1430        'is_disabled_regist_easy_access_id' => $is_disabled_regist_easy_access_id,
    14301431        'c_password_query_answer' => '',
    14311432    );
     
    14361437 * 招待メール送信
    14371438 */
    1438 function db_member_update_c_invite($c_member_id_invite, $pc_address, $message, $session)
     1439function db_member_update_c_invite($c_member_id_invite, $pc_address, $message, $session, $is_disabled_regist_easy_access_id = false)
    14391440{
    14401441    $sql = 'SELECT c_member_pre_id,ktai_session FROM c_member_pre WHERE pc_address = ?';
     
    14451446        'session' => $session,
    14461447        'regist_address' => $pc_address,
     1448        'is_disabled_regist_easy_access_id' => $is_disabled_regist_easy_access_id,
    14471449        'r_date' => db_now(),
    14481450    );
     
    15291531 * c_member_ktai_preを更新
    15301532 */
    1531 function db_member_update_c_member_ktai_pre($session, $ktai_address, $c_member_id_invite)
     1533function db_member_update_c_member_ktai_pre($session, $ktai_address, $c_member_id_invite, $is_disabled_regist_easy_access_id = false)
    15321534{
    15331535    $data = array(
     
    15351537        'r_datetime' => db_now(),
    15361538        'c_member_id_invite' => intval($c_member_id_invite),
     1539        'is_disabled_regist_easy_access_id' => $is_disabled_regist_easy_access_id,
    15371540    );
    15381541    $where = array('ktai_address' => $ktai_address);
     
    15471550}
    15481551
    1549 function db_member_insert_c_member_ktai_pre($session, $ktai_address, $c_member_id_invite)
     1552function db_member_insert_c_member_ktai_pre($session, $ktai_address, $c_member_id_invite, $is_disabled_regist_easy_access_id = false)
    15501553{
    15511554    $data = array(
     
    15541557        'c_member_id_invite' => intval($c_member_id_invite),
    15551558        'r_datetime' => db_now(),
     1559        'is_disabled_regist_easy_access_id' => $is_disabled_regist_easy_access_id,
    15561560    );
    15571561    return db_insert('c_member_ktai_pre', $data);
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/admin/do/send_invites.php

    r2913 r4206  
    2121        $mails = str_replace("\r", "\n", $mails);
    2222        $mail_list = explode("\n", $mails);
     23
     24        $is_disable_regist_easy_access_id = $requests['is_disable_regist_easy_access_id'];
    2325
    2426        // filtering
     
    6668                    // c_member_ktai_pre に追加
    6769                    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);
    6971                    } 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);
    7173                    }
    7274
     
    8486                    // c_member_pre に追加
    8587                    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);
    8789                    } 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);
    8991                    }
    9092
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/admin/templates/send_invites.tpl

    r3202 r4206  
    3131<dt class="message"><strong>招待文</strong></dt>
    3232<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})
    3342</dl>
    3443<p class="textBtn"><input type="submit" value="確認画面"></p>
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/admin/templates/send_invites_confirm.tpl

    r2657 r4206  
    1616({else})
    1717<dl class="invitesAdd">
    18         <dt><strong>【PCアドレス】</strong></dt>
     18        <dt><strong>【PCメールアドレス】</strong></dt>
    1919({/if})
    2020<dd>({foreach from=$requests.pc_mails item=item name=pm})<strong>({$item})</strong>({if !$smarty.foreach.pm.last})&nbsp;/&nbsp;({/if})({/foreach})</dd>
     
    2727({else})
    2828<dl class="invitesAdd">
    29         <dt><strong>【携帯アドレス】</strong></dt>
     29        <dt><strong>【携帯メールアドレス】</strong></dt>
    3030({/if})
    3131        <dd>({foreach from=$requests.ktai_mails item=item name=km})<strong>({$item})</strong>({if !$smarty.foreach.km.last})&nbsp;/&nbsp;({/if})({/foreach})</dd>
    3232</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})
    3346({/if})
    3447({if $requests.error_mails})
     
    4861<input type="hidden" name="mails" value="({$requests.mails})" />
    4962<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})" />
    5064({if !$cannot_send})<p class="textBtn"><input name="complete" type="submit" value="送信する"></p>({/if})<p class="textBtn"><input name="input" type="submit" value="修正する"></p>
    5165</form>
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/admin/validate/do/send_invites.ini

    r2 r4206  
    1010[message]
    1111type = "string"
     12
     13
     14[is_disable_regist_easy_access_id]
     15type = "int"
     16min = 0
     17max = 1
     18default = 0
     19required = 0
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/admin/validate/page/send_invites_confirm.ini

    r2657 r4206  
    2020[message]
    2121type = "string"
     22
     23[is_disable_regist_easy_access_id]
     24type = "int"
     25min = 0
     26max = 1
     27default = 1
     28required = 0
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/ktai/do/o_insert_c_member.php

    r4205 r4206  
    8585        if (IS_GET_EASY_ACCESS_ID != 0) {
    8686            $easy_access_id = OpenPNE_KtaiID::getID();
    87             if (!$easy_access_id && (IS_GET_EASY_ACCESS_ID == 2 || IS_GET_EASY_ACCESS_ID == 3)) {
     87            if (!$easy_access_id && (IS_GET_EASY_ACCESS_ID == 2 || IS_GET_EASY_ACCESS_ID == 3) && (!$pre['is_disabled_regist_easy_access_id'])) {
    8888                $errors[] = '携帯の個体識別番号を取得できませんでした';
    8989            }
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/ktai/do/o_regist_ktai_id.php

    r4204 r4206  
    5252            openpne_redirect('ktai', 'page_o_login2', $p);
    5353        }
    54        
    55         if (!$easy_access_id = OpenPNE_KtaiID::getID()) {
     54
     55        if ((!$easy_access_id = OpenPNE_KtaiID::getID()) && (!$pre['is_disabled_regist_easy_access_id'])) {
    5656            if (!empty($c_member_id)) {
    5757                $p = array('ses' => $ses, 'id' => $c_member_id);
     
    6363       
    6464        $id = db_member_c_member_id4easy_access_id($easy_access_id);
    65         if (!empty($c_member_id) && $id && $c_member_id != $id) {
    66             $p = array('msg' => 39, 'ses' => $ses, 'id' => $c_member_id);
    67             openpne_redirect('ktai', 'page_o_regist_ktai_id', $p);
    68         } elseif (!empty($c_member_pre_id) && !empty($id)) {
    69             $p = array('msg' => 39, 'ses' => $ses, 'pre_id' => $c_member_pre_id);
    70             openpne_redirect('ktai', 'page_o_regist_ktai_id', $p);
     65        if (!$pre['is_disabled_regist_easy_access_id']) {
     66            if (!empty($c_member_id) && $id && $c_member_id != $id) {
     67                $p = array('msg' => 39, 'ses' => $ses, 'id' => $c_member_id);
     68                openpne_redirect('ktai', 'page_o_regist_ktai_id', $p);
     69            } elseif (!empty($c_member_pre_id) && !empty($id)) {
     70                $p = array('msg' => 39, 'ses' => $ses, 'pre_id' => $c_member_pre_id);
     71                openpne_redirect('ktai', 'page_o_regist_ktai_id', $p);
     72            }
    7173        }
    72        
     74
    7375        if (db_member_easy_access_id_is_blacklist(md5($easy_access_id))) {
    7476            if (!empty($c_member_id)) {
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/ktai/do/o_update_ktai_address.php

    r4096 r4206  
    4141        }
    4242
    43         if (IS_GET_EASY_ACCESS_ID == 2) {
     43        if (IS_GET_EASY_ACCESS_ID == 2 || IS_GET_EASY_ACCESS_ID == 3) {
    4444
    4545        // 携帯の個体識別番号の取得が必須
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/ktai/templates/o_regist_ktai_uid_err.tpl

    r4190 r4206  
    55</td></tr></table>
    66
    7 個体識別番号の取得に失敗しました。<br>
    8 携帯電話の設定で個体識別番号の送信許可がオフにされている場合は、オンに変更して再度登録を行ってください。<br>
    9 <br>
    10 端末によっては個体識別番号を取得できない端末があります。<br>
    11 管理者にお問い合わせください。<br>
    12 <a href="({t_url m=ktai a=page_o_regist_ktai_uid_inquiry})&amp;ses=({$ses})&amp;({if $c_member_id})id=({$c_member_id})({else $c_member_pre_id})pre_id=({$c_member_pre_id})({/if})">お問い合わせフォームへ</a><br>
    13 <br>
    14 ({$smarty.const.SNS_NAME})を退会する<br>
    15 <a href="({t_url m=ktai a=page_o_taikai})">退会確認ページへ</a>
     7携帯個体識別番号の取得に失敗しました。<br>
     8携帯電話の設定で携帯個体識別番号の送信許可がオフにされている場合は、オンに変更して再度登録を行ってください。<br>
    169
    1710({$inc_ktai_footer|smarty:nodefaults})
  • OpenPNE/branches/work/ebihara/prj_regist_ktai_uid/webapp/modules/pc/do/o_regist_prof.php

    r4205 r4206  
    128128            setcookie(session_name(), '', time() - 3600, ini_get('session.cookie_path'));
    129129
    130             if (IS_GET_EASY_ACCESS_ID != 3) {
     130            if ((IS_GET_EASY_ACCESS_ID != 3) || $pre['is_disabled_regist_easy_access_id']) {
    131131                // メンバー登録時の携帯個体識別番号取得設定が「PC・携帯登録時に個体識別番号を必須にする」でない場合、メンバー登録処理をおこなう
    132132                $c_member = $prof;
Note: See TracChangeset for help on using the changeset viewer.