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

Changeset 11009


Ignore:
Timestamp:
Mar 12, 2009, 4:45:44 PM (10 years ago)
Author:
kiwa
Message:

#3674: r10961の修正を取り込み

Location:
OpenPNE/trunk/webapp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/trunk/webapp/lib/util/mail_send.php

    r10993 r11009  
    180180        "c_member" => $c_member,
    181181    );
     182    if (OPENPNE_AUTH_MODE == 'pneid' || OPENPNE_AUTH_MODE == 'slavepne') {
     183        $params['login_id'] = db_member_username4c_member_id($c_member_id);
     184    }
    182185    return fetch_send_mail($pc_address, 'm_pc_invite_end', $params);
    183186}
     
    202205        "password"   => $new_password,
    203206    );
    204     if (OPENPNE_AUTH_MODE == 'pneid') {
     207    if (OPENPNE_AUTH_MODE == 'pneid' || OPENPNE_AUTH_MODE == 'slavepne') {
    205208        $params['login_id'] = db_member_username4c_member_id($c_member_id);
    206209    }
     
    221224        'login_url' => $login_url,
    222225    );
    223     if (OPENPNE_AUTH_MODE == 'pneid') {
     226    if (OPENPNE_AUTH_MODE == 'pneid' || OPENPNE_AUTH_MODE == 'slavepne') {
    224227        $params['login_id'] = db_member_username4c_member_id($c_member_id);
    225228    }
     
    478481        "sid"      => $session,
    479482    );
     483    if (OPENPNE_AUTH_MODE == 'pneid' || OPENPNE_AUTH_MODE == 'slavepne') {
     484        $params['login_id'] = db_member_username4c_member_id($target_c_member_id);
     485    }
    480486    return fetch_send_mail($pc_address, 'm_pc_change_mail', $params);
    481487}
     
    691697        "c_profile_list" => $c_profile_list,
    692698    );
     699    if (OPENPNE_AUTH_MODE == 'pneid' || OPENPNE_AUTH_MODE == 'slavepne') {
     700        $params['login_id'] = db_member_username4c_member_id($c_member_id);
     701    }
    693702    return fetch_send_mail(ADMIN_EMAIL, 'm_admin_regist', $params);
    694703}
     
    715724        "reason" => $reason,
    716725    );
     726    if (OPENPNE_AUTH_MODE == 'pneid' || OPENPNE_AUTH_MODE == 'slavepne') {
     727        $params['login_id'] = db_member_username4c_member_id($c_member_id);
     728    }
    717729    return fetch_send_mail(ADMIN_EMAIL, 'm_admin_taikai', $params);
    718730}
     
    726738        "c_member" => $c_member,
    727739    );
     740    if (OPENPNE_AUTH_MODE == 'pneid' || OPENPNE_AUTH_MODE == 'slavepne') {
     741        $params['login_id'] = db_member_username4c_member_id($c_member_id);
     742    }
    728743    return fetch_send_mail($pc_address, 'm_pc_taikai_end', $params);
    729744}
     
    737752        "c_member" => $c_member,
    738753    );
     754    if (OPENPNE_AUTH_MODE == 'pneid' || OPENPNE_AUTH_MODE == 'slavepne') {
     755        $params['login_id'] = db_member_username4c_member_id($c_member_id);
     756    }
    739757    return fetch_send_mail($ktai_address, 'm_ktai_taikai_end', $params);
    740758}
  • OpenPNE/trunk/webapp/templates/mail/m_admin_regist.tpl

    r10788 r11009  
    55
    66メンバーID : ({$c_member.c_member_id})
     7({if $login_id})ログインID:({$login_id})
     8({/if})
    79({$WORD_NICKNAME}) : ({$c_member.nickname})
    810登録日 : ({$c_member.r_date})
  • OpenPNE/trunk/webapp/templates/mail/m_admin_taikai.tpl

    r6397 r11009  
    44
    55メンバーID : ({$c_member.c_member_id})
     6({if $login_id})ログインID:({$login_id})
     7({/if})
    68({$WORD_NICKNAME}) : ({$c_member.nickname})
    79({if $smarty.const.OPENPNE_USE_POINT_RANK})
Note: See TracChangeset for help on using the changeset viewer.