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

Changeset 6630


Ignore:
Timestamp:
Apr 18, 2008, 7:29:03 PM (13 years ago)
Author:
ogawa
Message:

#2266:deprecated_libで定義されている旧関数を使わないようにする

Location:
OpenPNE/trunk
Files:
98 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/trunk/bin/tool_rss_cache.php

    r4933 r6630  
    7272    foreach ($items as $item) {
    7373        // DBに存在するデータが見つかったら以降は比較、取得は行わない
    74         if (db_is_duplicated_rss_cache($c_member_id, $item['date'], $item['link'])) {
     74        if (db_rss_is_duplicated_rss_cache($c_member_id, $item['date'], $item['link'])) {
    7575            break;
    7676        }
    7777
    78         if (!db_is_future_rss_item($item['date'])) {
    79             if ($id = db_is_updated_rss_cache($c_member_id, $item['link'])) {
     78        if (!db_rss_is_future_rss_item($item['date'])) {
     79            if ($id = db_rss_is_updated_rss_cache($c_member_id, $item['link'])) {
    8080                // update
    81                 db_update_c_rss_cache($id,
     81                db_rss_update_c_rss_cache($id,
    8282                    $item['title'], $item['body'], $item['date'], $item['link']);
    8383            } else {
  • OpenPNE/trunk/webapp/lib/db/album.php

    r6629 r6630  
    302302    $list = db_get_all_page($sql, $page, $page_size, $params);
    303303    foreach($list as $key => $value) {
    304         $list[$key]['c_member'] = db_common_c_member_with_profile($value['c_member_id']);
     304        $list[$key]['c_member'] = db_member_c_member_with_profile($value['c_member_id']);
    305305    }
    306306
     
    347347
    348348    foreach ($lst as $key=>$value) {
    349         $lst[$key]['c_member'] = db_common_c_member4c_member_id($value['c_member_id']);
     349        $lst[$key]['c_member'] = db_member_c_member4c_member_id($value['c_member_id']);
    350350    }
    351351
     
    395395
    396396    foreach ($c_album_friend_list as $key => $value) {
    397         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     397        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    398398        $c_album_friend_list[$key]['nickname'] = $c_member['nickname'];
    399399    }
     
    606606        }
    607607    } else {
    608         $c_tmp_image = c_tmp_image4filename($tmpfile);
     608        $c_tmp_image = db_image_c_tmp_image4filename($tmpfile);
    609609
    610610        $params = array(
  • OpenPNE/trunk/webapp/lib/db/ashiato.php

    r6527 r6630  
    3535
    3636    foreach ($result as $key => $value) {
    37         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     37        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    3838        $result[$key]['nickname'] = $c_member['nickname'];
    3939    }
     
    107107    }
    108108
    109     if ($ashiato_mail_num = p_h_ashiato_ashiato_mail_num4c_member_id($c_member_id_to)) {
     109    if ($ashiato_mail_num = db_ashiato_ashiato_mail_num4c_member_id($c_member_id_to)) {
    110110        //総足あと数を取得
    111         $ashiato_num = p_h_ashiato_c_ashiato_num4c_member_id($c_member_id_to);
     111        $ashiato_num = db_ashiato_c_ashiato_num4c_member_id($c_member_id_to);
    112112
    113113        //あしあとお知らせメールを送る
     
    131131
    132132    foreach ($c_member_id_list as $c_member_id) {
    133         $disp = p_h_ashiato_c_ashiato_list4c_member_id($c_member_id, $limit);
     133        $disp = db_ashiato_c_ashiato_list4c_member_id($c_member_id, $limit);
    134134        if (!$disp) continue;
    135135        $oldest_row = array_pop($disp);
  • OpenPNE/trunk/webapp/lib/db/bookmark.php

    r6527 r6630  
    1616
    1717    foreach ($lst as $key => $value) {
    18         $lst[$key]['profile'] = db_common_c_member_profile_list4c_member_id($value['c_member_id']);
     18        $lst[$key]['profile'] = db_member_c_member_profile_list4c_member_id($value['c_member_id']);
    1919        $lst[$key]['last_login'] = p_f_home_last_login4access_date($value['access_date']);
    2020    }
     
    7979
    8080    foreach ($diary_list as $key => $value) {
    81         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     81        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    8282        $diary_list[$key]['nickname'] = $c_member['nickname'];
    8383        $diary_list[$key]['count_comments'] = db_diary_count_c_diary_comment4c_diary_id($value['c_diary_id']);
     
    101101
    102102    foreach ($blog_list as $key => $value) {
    103         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     103        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    104104        $blog_list[$key]['nickname'] = $c_member['nickname'];
    105105    }
     
    122122    $diary_list = db_get_all_page($sql, intval($page), intval($page_size));
    123123    foreach ($diary_list as $key => $value) {
    124         $diary_list[$key]['c_member'] = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     124        $diary_list[$key]['c_member'] = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    125125        $diary_list[$key]['count_comments'] = db_diary_count_c_diary_comment4c_diary_id($value['c_diary_id']);
    126126    }
     
    171171
    172172    foreach ($result as $key => $value) {
    173         $result[$key] = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     173        $result[$key] = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    174174        $result[$key]['friend_count'] = db_friend_count_friends($value['c_member_id']);
    175175    }
  • OpenPNE/trunk/webapp/lib/db/commu.php

    r6533 r6630  
    2222        db_commu_get_c_commu_category4id($c_commu['c_commu_category_id']);
    2323    $c_commu['c_member_admin'] =
    24         db_common_c_member4c_member_id($c_commu['c_member_id_admin']);
     24        db_member_c_member4c_member_id($c_commu['c_member_id_admin']);
    2525
    2626    return $c_commu;
     
    4242    $is_recurred = false;
    4343
    44     if ($c_commu = _db_c_commu4c_commu_id($c_commu_id)) {
    45         $c_commu['member_count'] = _db_count_c_commu_member_list4c_commu_id($c_commu_id);
     44    if ($c_commu = db_commu_c_commu4c_commu_id($c_commu_id)) {
     45        $c_commu['member_count'] = db_commu_count_c_commu_member_list4c_commu_id($c_commu_id);
    4646    }
    4747    return $c_commu;
     
    6363    $is_recurred = false;
    6464
    65     if ($c_commu = _db_c_commu4c_commu_id($c_commu_id)) {
    66         $c_commu['count_member'] = _db_count_c_commu_member_list4c_commu_id($c_commu_id);
     65    if ($c_commu = db_commu_c_commu4c_commu_id($c_commu_id)) {
     66        $c_commu['count_member'] = db_commu_count_c_commu_member_list4c_commu_id($c_commu_id);
    6767    }
    6868    return $c_commu;
     
    207207{
    208208    $ret = false;
    209     $c_commu = _db_c_commu4c_commu_id($c_commu_id);
    210 
    211     $is_c_commu_member = _db_is_c_commu_member($c_commu_id, $c_member_id);
     209    $c_commu = db_commu_c_commu4c_commu_id($c_commu_id);
     210
     211    $is_c_commu_member = db_commu_is_c_commu_member($c_commu_id, $c_member_id);
    212212
    213213    switch($c_commu['public_flag']) {
     
    279279    $ktai_list = array();
    280280    foreach ($list as $c_member_id) {
    281         $sec = db_common_c_member_secure4c_member_id($c_member_id);
     281        $sec = db_member_c_member_secure4c_member_id($c_member_id);
    282282        if ($sec['ktai_address']) {
    283283            $ktai_list[$c_member_id] = $sec['ktai_address'];
     
    353353    foreach ($c_commu_list as $key => $value) {
    354354        $c_commu_list[$key]['count_members'] =
    355             _db_count_c_commu_member_list4c_commu_id($value['c_commu_id']);
     355            db_commu_count_c_commu_member_list4c_commu_id($value['c_commu_id']);
    356356    }
    357357
    358358    $pager = array(
    359         "total_num" => p_common_count_c_commu4c_member_id($c_member_id),
     359        "total_num" => db_commu_count_c_commu4c_member_id($c_member_id),
    360360        "disp_num"  => count($c_commu_list),
    361361        "start_num" => 0,
     
    398398function db_commu_c_member_list4c_commu_id($c_commu_id, $page_size, $page)
    399399{
    400     $c_commu = _db_c_commu4c_commu_id($c_commu_id);
     400    $c_commu = db_commu_c_commu4c_commu_id($c_commu_id);
    401401
    402402    $sql =  "SELECT c_member.c_member_id,".
     
    454454
    455455    foreach ($list as $key => $c_member) {
    456         $list[$key]['is_c_commu_admin'] = _db_is_c_commu_admin($c_commu_id, $list[$key]['c_member_id']);
     456        $list[$key]['is_c_commu_admin'] = db_commu_is_c_commu_admin($c_commu_id, $list[$key]['c_member_id']);
    457457        $list[$key]['is_c_commu_sub_admin'] = db_commu_is_c_commu_sub_admin($c_commu_id, $list[$key]['c_member_id']);
    458458    }
    459459
    460     $total_num = _db_count_c_commu_member_list4c_commu_id($c_commu_id);
     460    $total_num = db_commu_count_c_commu_member_list4c_commu_id($c_commu_id);
    461461    if ($total_num != 0) {
    462462        $total_page_num = ceil($total_num / $page_size);
     
    585585    $list = array();
    586586    foreach ($id_list as $key => $value) {
    587         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     587        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    588588        $c_member['friend_count'] = db_friend_count_friends($value['c_member_id']);
    589589        $list[] = $c_member;
     
    660660
    661661    foreach ($c_commu_member_confirm_list as $key => $value) {
    662         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     662        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    663663        $c_commu_member_confirm_list[$key]['nickname'] = $c_member['nickname'];
    664664        $c_commu_member_confirm_list[$key]['image_filename'] = $c_member['image_filename'];
     
    687687
    688688    foreach ($c_commu_member_confirm_list as $key => $value) {
    689         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_admin']);
     689        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_admin']);
    690690        $c_commu_member_confirm_list[$key]['nickname'] = $c_member['nickname'];
    691691        $c_commu_member_confirm_list[$key]['image_filename'] = $c_member['image_filename'];
     
    715715
    716716    foreach ($c_commu_admin_confirm_list as $key => $value) {
    717         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_admin']);
     717        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_admin']);
    718718        $c_commu_admin_confirm_list[$key]['nickname'] = $c_member['nickname'];
    719719        $c_commu_admin_confirm_list[$key]['image_filename'] = $c_member['image_filename'];
     
    741741
    742742    foreach ($c_commu_admin_confirm_list as $key => $value) {
    743         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     743        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    744744        $c_commu_admin_confirm_list[$key]['nickname'] = $c_member['nickname'];
    745745        $c_commu_admin_confirm_list[$key]['image_filename'] = $c_member['image_filename'];
     
    770770
    771771    foreach ($c_commu_sub_admin_confirm_list as $key => $value) {
    772         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_admin']);
     772        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_admin']);
    773773        $c_commu_sub_admin_confirm_list[$key]['nickname'] = $c_member['nickname'];
    774774        $c_commu_sub_admin_confirm_list[$key]['image_filename'] = $c_member['image_filename'];
     
    796796
    797797    foreach ($c_commu_sub_admin_confirm_list as $key => $value) {
    798         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     798        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    799799        $c_commu_sub_admin_confirm_list[$key]['nickname'] = $c_member['nickname'];
    800800        $c_commu_sub_admin_confirm_list[$key]['image_filename'] = $c_member['image_filename'];
     
    850850
    851851    foreach ($c_commu_topic_list as $key => $value) {
    852         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     852        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    853853        $c_commu_topic_list[$key]['nickname'] = $c_member['nickname'];
    854854
     
    913913
    914914    foreach ($c_commu_topic_list as $key => $value) {
    915         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     915        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    916916        $c_commu_topic_list[$key]['nickname'] = $c_member['nickname'];
    917917
     
    992992
    993993    foreach ($lst as $key => $value) {
    994         $lst[$key]['is_c_event_member'] = _db_is_c_event_member($value['c_commu_topic_id'], $c_member_id);
    995         $lst[$key]['is_c_topic_admin'] = _db_is_c_topic_admin($value['c_commu_topic_id'], $c_member_id);
     994        $lst[$key]['is_c_event_member'] = db_commu_is_c_event_member($value['c_commu_topic_id'], $c_member_id);
     995        $lst[$key]['is_c_topic_admin'] = db_commu_is_c_topic_admin($value['c_commu_topic_id'], $c_member_id);
    996996        $lst[$key]['write_num'] = db_commu_get_max_number4topic($value['c_commu_topic_id']);
    997997    }
     
    10631063{
    10641064    $ret = array(
    1065         'c_commu' => _db_c_commu4c_commu_id($target_c_commu_id),
     1065        'c_commu' => db_commu_c_commu4c_commu_id($target_c_commu_id),
    10661066        'is_bbs_view'     => false,
    10671067        'is_commu_member' => false,
     
    10721072    );
    10731073
    1074     if (_db_is_c_commu_member($target_c_commu_id, $u)) {
     1074    if (db_commu_is_c_commu_member($target_c_commu_id, $u)) {
    10751075        $ret['is_commu_member'] = true;
    10761076
    1077         $c_commu_member = _db_c_commu_member4c_member_id($u, $target_c_commu_id);
     1077        $c_commu_member = db_commu_c_commu_member4c_member_id($u, $target_c_commu_id);
    10781078        if ($c_commu_member['is_receive_mail']) {
    10791079            $ret['is_receive_mail'] = true;
     
    10911091        }
    10921092    } else {
    1093         if (_db_is_c_commu_member_confirm($u, $target_c_commu_id)) {
     1093        if (db_commu_is_c_commu_member_confirm($u, $target_c_commu_id)) {
    10941094            $ret['is_commu_member_confirm'] = true;
    10951095        }
     
    11651165function db_commu_get_c_join_status($c_member_id,$c_commu_id)
    11661166{
    1167     $is_c_commu_member = _db_is_c_commu_member($c_commu_id, $c_member_id);
    1168     $is_wait = do_common_is_c_commu_join_wait($c_commu_id, $c_member_id);
    1169     $c_commu = _db_c_commu4c_commu_id($c_commu_id);
     1167    $is_c_commu_member = db_commu_is_c_commu_member($c_commu_id, $c_member_id);
     1168    $is_wait = db_commu_is_c_commu_join_wait($c_commu_id, $c_member_id);
     1169    $c_commu = db_commu_c_commu4c_commu_id($c_commu_id);
    11701170    $is_join_request_free = false;
    11711171    if ($c_commu['public_flag'] == "public") {
     
    12601260    $c_commu_list = array();
    12611261    foreach ($comments as $comment) {
    1262         $c_commu = _db_c_commu4c_commu_id($comment['c_commu_id']);
     1262        $c_commu = db_commu_c_commu4c_commu_id($comment['c_commu_id']);
    12631263        $c_commu['updatetime'] = $comment['updatetime'];
    12641264        $c_commu_list[] = $c_commu;
     
    13351335function db_commu_is_admin4c_member_id_c_commu_topic_id($c_member_id, $c_commu_topic_id)
    13361336{
    1337     $c_commu = k_p_c_bbs_c_commu4c_commu_topic_id($c_commu_topic_id);
     1337    $c_commu = db_commu_c_commu4c_commu_topic_id($c_commu_topic_id);
    13381338    $c_commu_id = $c_commu['c_commu_id'];
    13391339
     
    13461346function db_commu_c_member_admin4c_commu_topic_id($c_commu_topic_id)
    13471347{
    1348     $c_commu = k_p_c_bbs_c_commu4c_commu_topic_id($c_commu_topic_id);
     1348    $c_commu = db_commu_c_commu4c_commu_topic_id($c_commu_topic_id);
    13491349    $c_commu_id = $c_commu['c_commu_id'];
    13501350
     
    13771377    }
    13781378
    1379     $total_num = p_common_count_c_commu4c_member_id($c_member_id);
     1379    $total_num = db_commu_count_c_commu4c_member_id($c_member_id);
    13801380    if ($total_num != 0) {
    13811381        $total_page_num =  ceil($total_num / $page_size);
     
    15931593
    15941594    foreach ($c_commu_member_confirm_list as $key => $value) {
    1595         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     1595        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    15961596        $c_commu_member_confirm_list[$key]['nickname'] = $c_member['nickname'];
    15971597    }
     
    16201620
    16211621    foreach ($c_commu_member_confirm_list as $key => $value) {
    1622         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_admin']);
     1622        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_admin']);
    16231623        $c_commu_member_confirm_list[$key]['nickname'] = $c_member['nickname'];
    16241624    }
     
    16571657function db_commu_c_commu_category_list4null()
    16581658{
    1659     $list = _db_c_commu_category4null();
     1659    $list = db_commu_c_commu_category4null();
    16601660
    16611661    // カテゴリごとのコミュニティ数を取得
     
    19941994    foreach ($list as $c_member_id) {
    19951995        if ($c_member_id != $excepted_id) {
    1996             $result[] = db_common_c_member4c_member_id_LIGHT($c_member_id);
     1996            $result[] = db_member_c_member4c_member_id_LIGHT($c_member_id);
    19971997        }
    19981998    }
     
    20452045
    20462046    foreach ($list as $key => $item) {
    2047         $list[$key]['is_join'] = p_common_is_c_event_member($item['c_commu_topic_id'], $c_member_id);
     2047        $list[$key]['is_join'] = db_commu_is_c_event_member_2($item['c_commu_topic_id'], $c_member_id);
    20482048    }
    20492049    return $list;
     
    20582058    $list[0] = db_get_all_page($sql, $page, $page_size, $params);
    20592059
    2060     $total_c_event_member = k_p_count_c_event_member_list4c_commu_topic_id($c_commu_topic_id);
     2060    $total_c_event_member = db_commu_count_c_event_member_list4c_commu_topic_id_2($c_commu_topic_id);
    20612061    $start_num = ($page-1) * $page_size + 1;
    20622062    $end_num   = $page * $page_size;
     
    22692269function db_commu_insert_c_commu_member($c_commu_member_confirm_id)
    22702270{
    2271     $confirm = _do_c_commu_member_confirm4c_commu_member_confirm_id($c_commu_member_confirm_id);
     2271    $confirm = db_commu_c_commu_member_confirm4c_commu_member_confirm_id($c_commu_member_confirm_id);
    22722272    $data = array(
    22732273        'c_commu_id' => intval($confirm['c_commu_id']),
     
    23892389    $topic_comment_list = db_get_all($sql, $params);
    23902390    foreach ($topic_comment_list as $topic_comment) {
    2391         image_data_delete($topic_comment['image_filename1']);
    2392         image_data_delete($topic_comment['image_filename2']);
    2393         image_data_delete($topic_comment['image_filename3']);
     2391        db_image_data_delete($topic_comment['image_filename1']);
     2392        db_image_data_delete($topic_comment['image_filename2']);
     2393        db_image_data_delete($topic_comment['image_filename3']);
    23942394        db_file_delete_c_file($topic_comment['filename']);
    23952395    }
     
    24202420    cache_drop_c_commu_list4c_member_id($c_member_id);
    24212421
    2422     $number = _do_c_commu_topic_comment_number4c_commu_topic_id($c_commu_topic_id);
     2422    $number = db_commu_c_commu_topic_comment_number4c_commu_topic_id($c_commu_topic_id);
    24232423
    24242424    $data = array(
     
    24432443function db_commu_insert_c_commu_topic_comment_2($c_member_id,$target_c_commu_topic_id,$body)
    24442444{
    2445     $c_commu_topic = _do_c_bbs_c_commu_topic4c_commu_topic_id($target_c_commu_topic_id);
     2445    $c_commu_topic = db_commu_c_commu_topic4c_commu_topic_id($target_c_commu_topic_id);
    24462446
    24472447    $target_c_commu_topic_id = $c_commu_topic['c_commu_topic_id'];
     
    24952495    $params = array(intval($c_commu_topic_comment_id));
    24962496    $topic_comment = db_get_row($sql, $params);
    2497     image_data_delete($topic_comment['image_filename1']);
    2498     image_data_delete($topic_comment['image_filename2']);
    2499     image_data_delete($topic_comment['image_filename3']);
     2497    db_image_data_delete($topic_comment['image_filename1']);
     2498    db_image_data_delete($topic_comment['image_filename2']);
     2499    db_image_data_delete($topic_comment['image_filename3']);
    25002500    db_file_delete_c_file($topic_comment['filename']);
    25012501
  • OpenPNE/trunk/webapp/lib/db/diary.php

    r6527 r6630  
    329329    $c_diary_comment_list = db_get_all_page($sql, $page, $page_size);
    330330    foreach ($c_diary_comment_list as $key => $value) {
    331         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     331        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    332332        $c_diary_comment_list[$key]['nickname'] = $c_member['nickname'];
    333333    }
     
    431431    foreach ($lst as $key=>$value) {
    432432        $lst[$key]['count_comments'] = db_diary_count_c_diary_comment4c_diary_id($value['c_diary_id']);
    433         $lst[$key]['c_member'] = db_common_c_member4c_member_id($value['c_member_id']);
     433        $lst[$key]['c_member'] = db_member_c_member4c_member_id($value['c_member_id']);
    434434    }
    435435
     
    518518
    519519    foreach ($c_diary_friend_list as $key => $value) {
    520         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     520        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    521521        $c_diary_friend_list[$key]['nickname'] = $c_member['nickname'];
    522522        $c_diary_friend_list[$key]['count_comments'] = db_diary_count_c_diary_comment4c_diary_id($value['c_diary_id']);
     
    577577            continue;
    578578        }
    579         $item += db_common_c_member4c_member_id_LIGHT($item['c_member_id']);
     579        $item += db_member_c_member4c_member_id_LIGHT($item['c_member_id']);
    580580        $item['r_datetime'] = $r_datetime;
    581581        $item['num_comment'] = db_diary_count_c_diary_comment4c_diary_id($c_diary_id);
     
    647647
    648648    foreach ($list as $key => $value) {
    649         $list[$key] += db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     649        $list[$key] += db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    650650    }
    651651
     
    823823    $list = db_get_all_page($sql, $page, $page_size, $params);
    824824    foreach ($list as $key => $value) {
    825         $list[$key]['c_member'] = db_common_c_member_with_profile($value['c_member_id']);
     825        $list[$key]['c_member'] = db_member_c_member_with_profile($value['c_member_id']);
    826826        $list[$key]['num_comment'] = db_diary_count_c_diary_comment4c_diary_id($value['c_diary_id']);
    827827    }
     
    965965
    966966    foreach ($c_diary_comment_list as $key => $value) {
    967         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     967        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    968968        $c_diary_comment_list[$key]['nickname'] = $c_member['nickname'];
    969969    }
     
    10181018    foreach ($lst as $key=>$value) {
    10191019        $lst[$key]['count_comments'] = db_diary_count_c_diary_comment4c_diary_id($value['c_diary_id']);
    1020         $lst[$key]['c_member'] = db_common_c_member4c_member_id($value['c_member_id']);
     1020        $lst[$key]['c_member'] = db_member_c_member4c_member_id($value['c_member_id']);
    10211021    }
    10221022
     
    11071107
    11081108   // 画像
    1109     image_data_delete($c_diary['image_filename_1']);
    1110     image_data_delete($c_diary['image_filename_2']);
    1111     image_data_delete($c_diary['image_filename_3']);
     1109    db_image_data_delete($c_diary['image_filename_1']);
     1110    db_image_data_delete($c_diary['image_filename_2']);
     1111    db_image_data_delete($c_diary['image_filename_3']);
    11121112
    11131113    // コメント
     
    11201120
    11211121    foreach ($comment_images as $value) {
    1122         image_data_delete($value['image_filename_1']);
    1123         image_data_delete($value['image_filename_2']);
    1124         image_data_delete($value['image_filename_3']);
     1122        db_image_data_delete($value['image_filename_1']);
     1123        db_image_data_delete($value['image_filename_2']);
     1124        db_image_data_delete($value['image_filename_3']);
    11251125    }
    11261126
     
    12271227    }
    12281228
    1229     image_data_delete($dc['image_filename_1']);
    1230     image_data_delete($dc['image_filename_2']);
    1231     image_data_delete($dc['image_filename_3']);
     1229    db_image_data_delete($dc['image_filename_1']);
     1230    db_image_data_delete($dc['image_filename_2']);
     1231    db_image_data_delete($dc['image_filename_3']);
    12321232
    12331233    $sql = 'DELETE FROM c_diary_comment WHERE c_diary_comment_id = ?';
  • OpenPNE/trunk/webapp/lib/db/etc.php

    r6527 r6630  
    505505    $c_diary_list = db_get_all($sql, $single, 'main');
    506506    foreach ($c_diary_list as $c_diary) {
    507         image_data_delete($c_diary['image_filename_1']);
    508         image_data_delete($c_diary['image_filename_2']);
    509         image_data_delete($c_diary['image_filename_3']);
     507        db_image_data_delete($c_diary['image_filename_1']);
     508        db_image_data_delete($c_diary['image_filename_2']);
     509        db_image_data_delete($c_diary['image_filename_3']);
    510510
    511511        // c_diary_comment
     
    514514        $c_diary_comment_list = db_get_all($sql, $params, 'main');
    515515        foreach ($c_diary_comment_list as $c_diary_comment) {
    516             image_data_delete($c_diary_comment['image_filename_1']);
    517             image_data_delete($c_diary_comment['image_filename_2']);
    518             image_data_delete($c_diary_comment['image_filename_3']);
     516            db_image_data_delete($c_diary_comment['image_filename_1']);
     517            db_image_data_delete($c_diary_comment['image_filename_2']);
     518            db_image_data_delete($c_diary_comment['image_filename_3']);
    519519        }
    520520
     
    551551        ' FROM c_member WHERE c_member_id = ?';
    552552    $c_member = db_get_row($sql, $single, 'main');
    553     image_data_delete($c_member['image_filename_1']);
    554     image_data_delete($c_member['image_filename_2']);
    555     image_data_delete($c_member['image_filename_3']);
     553    db_image_data_delete($c_member['image_filename_1']);
     554    db_image_data_delete($c_member['image_filename_2']);
     555    db_image_data_delete($c_member['image_filename_3']);
    556556
    557557    $sql = 'DELETE FROM c_member WHERE c_member_id = ?';
     
    579579
    580580    // 画像削除
    581     image_data_delete($c_commu['image_filename']);
     581    db_image_data_delete($c_commu['image_filename']);
    582582
    583583    // c_commu_admin_confirm
     
    608608        $topic_comment_list = db_get_all($sql, $params);
    609609        foreach ($topic_comment_list as $topic_comment) {
    610             image_data_delete($topic_comment['image_filename1']);
    611             image_data_delete($topic_comment['image_filename2']);
    612             image_data_delete($topic_comment['image_filename3']);
     610            db_image_data_delete($topic_comment['image_filename1']);
     611            db_image_data_delete($topic_comment['image_filename2']);
     612            db_image_data_delete($topic_comment['image_filename3']);
    613613            db_file_delete_c_file($topic_comment['filename']);
    614614        }
     
    715715    $params = array(strval($skinname));
    716716    if ($skin_filename = db_get_row($sql, $params)) {
    717         image_data_delete($skin_filename['filename']);
     717        db_image_data_delete($skin_filename['filename']);
    718718        $sql = 'DELETE FROM c_skin_filename WHERE skinname = ?';
    719719        return db_query($sql, $params);
  • OpenPNE/trunk/webapp/lib/db/friend.php

    r6527 r6630  
    8787    $result_id  = $result_list[$result_key];
    8888
    89     return db_common_c_member4c_member_id($result_id);
     89    return db_member_c_member4c_member_id($result_id);
    9090}
    9191
     
    108108    $list = array();
    109109    foreach ($result as $value) {
    110         $list[] = db_common_c_member4c_member_id_LIGHT($value);
     110        $list[] = db_member_c_member4c_member_id_LIGHT($value);
    111111    }
    112112    return $list;
     
    166166    $list = db_get_all($sql, $params);
    167167    foreach ($list as $key => $value) {
    168         $list[$key] += db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     168        $list[$key] += db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    169169    }
    170170    return $list;
     
    173173function db_friend_intro_list_with_my_intro4c_member_id($c_member_id)
    174174{
    175     $list = p_fh_intro_intro_list4c_member_id($c_member_id);
     175    $list = db_friend_intro_list4c_member_id($c_member_id);
    176176
    177177    $sql = 'SELECT intro FROM c_friend WHERE c_member_id_from = ? AND c_member_id_to = ?';
     
    205205    $list = db_get_all_limit($sql, 0, $limit, $params);
    206206    foreach ($list as $key => $value) {
    207         $list[$key] += db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     207        $list[$key] += db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    208208    }
    209209    return $list;
     
    236236
    237237    foreach ($result as $key => $value) {
    238         $result[$key] = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     238        $result[$key] = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    239239        $result[$key]['friend_count'] = db_friend_count_friends($value['c_member_id']);
    240240    }
     
    295295
    296296    foreach ($c_friend_confirm_list as $key => $value) {
    297         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     297        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    298298        $c_friend_confirm_list[$key]['nickname'] = $c_member['nickname'];
    299299        $c_friend_confirm_list[$key]['image_filename'] = $c_member['image_filename'];
     
    320320
    321321    foreach ($c_friend_confirm_list as $key => $value) {
    322         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     322        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    323323        $c_friend_confirm_list[$key]['nickname'] = $c_member['nickname'];
    324324        $c_friend_confirm_list[$key]['image_filename'] = $c_member['image_filename'];
     
    345345
    346346    foreach ($list as $key => $value) {
    347         $list[$key] += db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     347        $list[$key] += db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    348348    }
    349349    return $list;
     
    367367
    368368    foreach ($c_friend_list as $key => $value) {
    369         $c_friend = p_common_c_friend4c_member_id_from4c_member_id_to($value['c_member_id_to'], $value['c_member_id_from']);
     369        $c_friend = db_friend_c_friend4c_member_id_from4c_member_id_to($value['c_member_id_to'], $value['c_member_id_from']);
    370370        $c_friend_list[$key]['intro'] = $c_friend['intro'];
    371371
     
    393393{
    394394    $ret = array(
    395         'c_member'      => db_common_c_member4c_member_id($target_c_member_id),
     395        'c_member'      => db_member_c_member4c_member_id($target_c_member_id),
    396396        'is_friend'     => false,
    397397        'is_friend_confirm' => false,
     
    399399
    400400    $ret['is_friend'] = db_friend_is_friend($u, $target_c_member_id);
    401     $ret['is_friend_confirm'] = do_common_is_friend_link_wait($u, $target_c_member_id);
     401    $ret['is_friend_confirm'] = db_friend_is_friend_link_wait($u, $target_c_member_id);
    402402
    403403    return $ret;
     
    529529
    530530    foreach ($c_friend_list as $key => $value) {
    531         $c_member = db_common_c_member4c_member_id($value['c_member_id_to']);
     531        $c_member = db_member_c_member4c_member_id($value['c_member_id_to']);
    532532
    533533        $c_friend_list[$key]['image_filename'] = $c_member['image_filename'];
     
    575575
    576576    foreach ($c_friend_confirm_list as $key => $value) {
    577         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     577        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    578578        $c_friend_confirm_list[$key]['nickname'] = $c_member['nickname'];
    579579    }
     
    598598
    599599    foreach ($c_friend_confirm_list as $key => $value) {
    600         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     600        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    601601        $c_friend_confirm_list[$key]['nickname'] = $c_member['nickname'];
    602602    }
     
    677677function db_friend_insert_c_friend4confirm($c_friend_confirm_id, $u)
    678678{
    679     $confirm = _do_c_friend_confirm4c_friend_confirm_id($c_friend_confirm_id);
     679    $confirm = db_friend_c_friend_confirm4c_friend_confirm_id($c_friend_confirm_id);
    680680    if ($confirm['c_member_id_to'] != $u) {
    681681        return false;
  • OpenPNE/trunk/webapp/lib/db/member.php

    r6617 r6630  
    173173function db_member_c_member_id4pc_address($pc_address)
    174174{
    175     return _db_c_member_id4pc_address_encrypted(t_encrypt($pc_address));
     175    return db_member_c_member_id4pc_address_encrypted(t_encrypt($pc_address));
    176176}
    177177
     
    10491049    $params = array(intval($c_member_id), $prof_my_news_id);
    10501050    db_query($sql, $params);
    1051     do_config_prof_insert_c_member_profile($c_member_id, $prof_my_news_id, '', $prof_my_news, 'private');
     1051    db_member_insert_c_member_profile($c_member_id, $prof_my_news_id, '', $prof_my_news, 'private');
    10521052
    10531053    $sql = 'DELETE FROM c_member_profile' .
     
    10551055    $params = array(intval($c_member_id), $my_news_datetime_id);
    10561056    db_query($sql, $params);
    1057     do_config_prof_insert_c_member_profile($c_member_id, $my_news_datetime_id, '', $my_news_datetime, 'private');
     1057    db_member_insert_c_member_profile($c_member_id, $my_news_datetime_id, '', $my_news_datetime, 'private');
    10581058}
    10591059
     
    16501650            if (is_array($item['value'])) {
    16511651                foreach ($item['value'] as $key => $value) {
    1652                     do_config_prof_insert_c_member_profile($c_member_id, $item['c_profile_id'], $key, $value, $item['public_flag']);
     1652                    db_member_insert_c_member_profile($c_member_id, $item['c_profile_id'], $key, $value, $item['public_flag']);
    16531653                }
    16541654            } else {
    1655                 do_config_prof_insert_c_member_profile($c_member_id, $item['c_profile_id'], $item['c_profile_option_id'], $item['value'], $item['public_flag']);
     1655                db_member_insert_c_member_profile($c_member_id, $item['c_profile_id'], $item['c_profile_option_id'], $item['value'], $item['public_flag']);
    16561656            }
    16571657        }
  • OpenPNE/trunk/webapp/lib/db/message.php

    r6536 r6630  
    1414    $c_message = db_get_row($sql, $params);
    1515
    16     $c_member_from = db_common_c_member4c_member_id_LIGHT($c_message['c_member_id_from']);
    17     $c_member_to = db_common_c_member4c_member_id_LIGHT($c_message['c_member_id_to']);
     16    $c_member_from = db_member_c_member4c_member_id_LIGHT($c_message['c_member_id_from']);
     17    $c_member_to = db_member_c_member4c_member_id_LIGHT($c_message['c_member_id_to']);
    1818
    1919    $c_message['c_member_image_filename_from'] = $c_member_from['image_filename'];
     
    100100
    101101    foreach ($c_message_list as $key => $value) {
    102         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     102        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    103103        $c_message_list[$key]['nickname'] = $c_member['nickname'];
    104104        $c_message_list[$key]['image_filename'] = $c_member['image_filename'];
     
    156156
    157157    foreach ($c_message_list as $key => $value) {
    158         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     158        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    159159        $c_message_list[$key]['nickname'] = $c_member['nickname'];
    160160        $c_message_list[$key]['image_filename'] = $c_member['image_filename'];
     
    196196
    197197    foreach ($c_message_list as $key => $value) {
    198         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     198        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    199199        $c_message_list[$key]['nickname'] = $c_member['nickname'];
    200200        $c_message_list[$key]['image_filename'] = $c_member['image_filename'];
     
    271271    foreach ($c_message_list as $key => $value) {
    272272        if ($value['c_member_id_to'] == $c_member_id) {
    273             $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    274         } else {
    275             $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     273            $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     274        } else {
     275            $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    276276        }
    277277        $c_message_list[$key]['nickname'] = $c_member['nickname'];
     
    307307
    308308    foreach ($c_message_list as $key => $value) {
    309         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     309        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    310310        $c_message_list[$key]['nickname'] = $c_member['nickname'];
    311311    }
     
    345345
    346346    foreach ($c_message_list as $key => $value) {
    347         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     347        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    348348        $c_message_list[$key]['nickname'] = $c_member['nickname'];
    349349    }
     
    774774    foreach ($c_message_list as $key => $value) {
    775775        if ($box == 'inbox' || !$box) {
    776             $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    777         } else {
    778             $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     776            $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     777        } else {
     778            $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    779779        }
    780780        $c_message_list[$key]['nickname'] = $c_member['nickname'];
     
    830830
    831831    foreach ($c_message_list as $key => $value) {
    832         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     832        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    833833        $c_message_list[$key]['nickname'] = $c_member['nickname'];
    834834    }
     
    865865
    866866    foreach ($c_message_list as $key => $value) {
    867         $c_member = db_common_c_member4c_member_id_LIGHT($value['c_member_id_to']);
     867        $c_member = db_member_c_member4c_member_id_LIGHT($value['c_member_id_to']);
    868868        $c_message_list[$key]['nickname'] = $c_member['nickname'];
    869869    }
  • OpenPNE/trunk/webapp/lib/db/review.php

    r6466 r6630  
    2727    $list = db_get_all_limit($sql, 0, $limit);
    2828    foreach ($list as $key => $value) {
    29         $list[$key] += db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     29        $list[$key] += db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    3030    }
    3131    return $list;
     
    284284    $list = db_get_all_page($sql, $page, $page_size, $params);
    285285
    286     $total_num = do_common_count_c_review_comment4c_review_id($c_review_id);
     286    $total_num = db_review_count_c_review_comment4c_review_id($c_review_id);
    287287    if ($total_num != 0) {
    288288        $total_page_num =  ceil($total_num / $page_size);
     
    317317
    318318    foreach ($list as $key => $value) {
    319         $list[$key]['write_num'] = do_common_count_c_review_comment4c_review_id($value['c_review_id']);
     319        $list[$key]['write_num'] = db_review_count_c_review_comment4c_review_id($value['c_review_id']);
    320320    }
    321321
     
    364364
    365365    //カテゴリの表示名を取得
    366     $category_disp = p_h_review_add_category_disp();
     366    $category_disp = do_review_review_add_category_disp();
    367367
    368368    //$lstに書き込み数 + カテゴリ名 を追加
    369369    foreach ($list as $key => $value) {
    370         $list[$key]['write_num'] = do_common_count_c_review_comment4c_review_id($value['c_review_id']);
     370        $list[$key]['write_num'] = db_review_count_c_review_comment4c_review_id($value['c_review_id']);
    371371        $list[$key]['category_disp'] = $category_disp[$value['c_review_category_id']];
    372372    }
  • OpenPNE/trunk/webapp/lib/db/rss.php

    r4933 r6630  
    2323
    2424    foreach ($lst as $key => $value) {
    25         $lst[$key]['c_member'] = db_common_c_member4c_member_id($value['c_member_id']);
     25        $lst[$key]['c_member'] = db_member_c_member4c_member_id($value['c_member_id']);
    2626    }
    2727    return $lst;
     
    4343
    4444    foreach ($list as $key => $value) {
    45         $list[$key]['c_member'] = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     45        $list[$key]['c_member'] = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    4646    }
    4747    return $list;
     
    5555
    5656    foreach ($lst as $key => $value) {
    57         $lst[$key]['c_member'] = db_common_c_member4c_member_id($value['c_member_id']);
     57        $lst[$key]['c_member'] = db_member_c_member4c_member_id($value['c_member_id']);
    5858    }
    5959    return $lst;
     
    7777
    7878    foreach ($lst as $key => $value) {
    79         $lst[$key]['c_member'] = db_common_c_member4c_member_id($value['c_member_id']);
     79        $lst[$key]['c_member'] = db_member_c_member4c_member_id($value['c_member_id']);
    8080    }
    8181    return $lst;
     
    164164    foreach ($items as $item) {
    165165        // 最新のものと比較
    166         if (!db_is_duplicated_rss_cache($c_member_id, $item['date'], $item['link']) &&
    167             !db_is_future_rss_item($item['date'])) {
     166        if (!db_rss_is_duplicated_rss_cache($c_member_id, $item['date'], $item['link']) &&
     167            !db_rss_is_future_rss_item($item['date'])) {
    168168
    169             if ($id = db_is_updated_rss_cache($c_member_id, $item['link'])) {
     169            if ($id = db_rss_is_updated_rss_cache($c_member_id, $item['link'])) {
    170170                // update
    171                 db_update_c_rss_cache($id,
     171                db_rss_update_c_rss_cache($id,
    172172                    $item['title'], $item['body'], $item['date'], $item['link']);
    173173            } else {
    174174                // insert
    175                 db_insert_c_rss_cache($c_member_id,
     175                db_rss_insert_c_rss_cache($c_member_id,
    176176                    $item['title'], $item['body'], $item['date'], $item['link']);
    177177            }
  • OpenPNE/trunk/webapp/lib/db/schedule.php

    r6617 r6630  
    6767    $res = array();
    6868    foreach ($list as $item) {
    69         $item['is_join'] = p_common_is_c_event_member($item['c_commu_topic_id'], $c_member_id);
     69        $item['is_join'] = db_commu_is_c_event_member_2($item['c_commu_topic_id'], $c_member_id);
    7070
    7171        $day = date('j', strtotime($item['open_date']));
  • OpenPNE/trunk/webapp/lib/mail/sns.php

    r6527 r6630  
    1919        $this->to = $decoder->get_to();
    2020
    21         $this->c_member_id = do_common_c_member_id4ktai_address($this->from);
     21        $this->c_member_id = db_member_c_member_id4ktai_address2($this->from);
    2222
    2323        // メンバーIDが見つからない場合は、ローカルパートに二重引用符を付加してリトライ
    2424        if (!$this->c_member_id) {
    2525            list($local, $domain) = explode('@', $this->from, 2);
    26             $this->c_member_id = do_common_c_member_id4ktai_address('"' . $local . '"' . '@' . $domain);
     26            $this->c_member_id = db_member_c_member_id4ktai_address2('"' . $local . '"' . '@' . $domain);
    2727        }
    2828    }
     
    271271        // _pre に追加
    272272        $session = create_hash();
    273         mail_insert_c_member_ktai_pre($session, $this->from, $c_member_id_invite);
     273        db_member_insert_c_member_ktai_pre($session, $this->from, $c_member_id_invite);
    274274
    275275        do_common_send_mail_regist_get($session, $this->from, $aff_id);
     
    291291    function add_commu_topic_comment($c_commu_topic_id)
    292292    {
    293         if (!$topic = mail_c_commu_topic4c_commu_topic_id($c_commu_topic_id)) {
     293        if (!$topic = db_commu_c_commu_topic4c_commu_topic_id_3($c_commu_topic_id)) {
    294294            return false;
    295295        }
    296296
    297297        $c_commu_id = $topic['c_commu_id'];
    298         if (!_db_is_c_commu_member($c_commu_id, $this->c_member_id)) {
     298        if (!db_commu_is_c_commu_member($c_commu_id, $this->c_member_id)) {
    299299            $this->error_mail(WORD_COMMUNITY . 'に参加していないため投稿できませんでした。');
    300300            m_debug_log('mail_sns::add_commu_topic_comment() not a member');
     
    321321
    322322            db_image_insert_c_image($filename, $image_data);
    323             mail_update_c_commu_topic_comment_image($ins_id, $filename, $image_num);
     323            db_commu_update_c_commu_topic_comment_image($ins_id, $filename, $image_num);
    324324            $image_num++;
    325325            if ($image_num > 3) {
     
    359359        }
    360360
    361         $c_member = db_common_c_member4c_member_id($this->c_member_id);
     361        $c_member = db_member_c_member4c_member_id($this->c_member_id);
    362362        if (!$ins_id = db_diary_insert_c_diary($this->c_member_id, $subject, $body, $c_member['public_flag_diary'])) {
    363363            return false;
     
    475475    function add_member_image()
    476476    {
    477         $c_member = db_common_c_member4c_member_id($this->c_member_id);
     477        $c_member = db_member_c_member4c_member_id($this->c_member_id);
    478478
    479479        // 登録する写真番号(1-3)を決める
     
    503503
    504504            db_image_insert_c_image($filename, $image_data);
    505             mail_update_c_member_image($this->c_member_id, $filename, $target_number);
     505            db_member_update_c_member_image($this->c_member_id, $filename, $target_number);
    506506            return true;
    507507        } else {
  • OpenPNE/trunk/webapp/lib/util/cache.php

    r6527 r6630  
    133133    }
    134134
    135     $c_commu_member_total_num = _db_count_c_commu_member_list4c_commu_id($c_commu_id);
     135    $c_commu_member_total_num = db_commu_count_c_commu_member_list4c_commu_id($c_commu_id);
    136136    $c_commu_member_list = db_commu_c_member_list4c_commu_id($c_commu_id, 1, $c_commu_member_total_num);
    137137    foreach ($c_commu_member_list[0] as $c_member) {
  • OpenPNE/trunk/webapp/lib/util/image.php

    r6527 r6630  
    233233        }
    234234    } else {
    235         t_image_clear_tmp_db($uid);
     235        db_image_clear_tmp_db($uid);
    236236    }
    237237}
     
    256256        $filepath = $img_tmp_dir_path . basename($tmpfile);
    257257
    258         if (_do_insert_c_image($filename, $filepath)) {
     258        if (db_image_insert_c_image2($filename, $filepath)) {
    259259            return $filename;
    260260        }
    261261    } else {
    262         $c_tmp_image = c_tmp_image4filename($tmpfile);
     262        $c_tmp_image = db_image_c_tmp_image4filename($tmpfile);
    263263
    264264        $params = array(
     
    286286    $filename = $filename . '_' . time() . '.' . $ext;
    287287
    288     if (!_do_insert_c_image($filename, $filepath)) {
     288    if (!db_image_insert_c_image2($filename, $filepath)) {
    289289        return false;
    290290    }
     
    300300    $filepath = $upfile_obj['tmp_name'];
    301301
    302     $result = _do_insert_c_tmp_image($filename, $filepath);
     302    $result = db_image_insert_c_tmp_image($filename, $filepath);
    303303    if (!$result) {
    304304        return false;
  • OpenPNE/trunk/webapp/lib/util/ktai.php

    r6527 r6630  
    9090}
    9191
    92 /** 関数
    93  * k_p_c_bbs_c_member_admin4c_commu_topic_id($c_commu_topic_id)
    94  *
    95  *
    96  */
    9792function k_p_h_message_ktai_url4url($str, $tail)
    9893{
     
    173168function t_get_user_hash($c_member_id, $length = 12)
    174169{
    175     $hashed_password = k_common_hashed_password4c_member_id($c_member_id);
     170    $hashed_password = db_member_hashed_password4c_member_id($c_member_id);
    176171    $seed = strval($c_member_id) . $hashed_password;
    177172
  • OpenPNE/trunk/webapp/lib/util/mail_send.php

    r6527 r6630  
    175175function do_regist_prof_do_regist2_mail_send($c_member_id)
    176176{
    177     $c_member = db_common_c_member4c_member_id($c_member_id, true);
     177    $c_member = db_member_c_member4c_member_id($c_member_id, true);
    178178    $pc_address = $c_member['secure']['pc_address'];
    179179    $params = array(
     
    187187{
    188188    $params = array(
    189         "c_member" => db_common_c_member4c_member_id($c_member_id_invite),
     189        "c_member" => db_member_c_member4c_member_id($c_member_id_invite),
    190190        "sid" => $session,
    191191        "invite_message"=> $message,
     
    198198{
    199199    $params = array(
    200         "c_member"   => db_common_c_member4c_member_id($c_member_id),
     200        "c_member"   => db_member_c_member4c_member_id($c_member_id),
    201201        "pc_address" => $pc_address,
    202202        "password"   => $new_password,
     
    211211function db_mail_send_m_ktai_password_query($c_member_id, $new_password)
    212212{
    213     $c_member = db_common_c_member4c_member_id($c_member_id, true);
     213    $c_member = db_member_c_member4c_member_id($c_member_id, true);
    214214    $ktai_address = $c_member['secure']['ktai_address'];
    215215
     
    230230function send_bbs_info_mail($c_commu_topic_comment_id, $c_member_id)
    231231{
    232     $comment = _db_common_c_commu_topic_comment4c_commu_topic_comment_id($c_commu_topic_comment_id);
    233     $c_member = db_common_c_member4c_member_id_LIGHT($c_member_id);
     232    $comment = db_commu_c_commu_topic_comment4c_commu_topic_comment_id($c_commu_topic_comment_id);
     233    $c_member = db_member_c_member4c_member_id_LIGHT($c_member_id);
    234234
    235235    $c_commu_id       = $comment['c_commu_id'];
     
    277277function send_bbs_info_mail_pc($c_commu_topic_comment_id, $c_member_id)
    278278{
    279     $comment = _db_common_c_commu_topic_comment4c_commu_topic_comment_id($c_commu_topic_comment_id);
    280     $c_member = db_common_c_member4c_member_id_LIGHT($c_member_id);
     279    $comment = db_commu_c_commu_topic_comment4c_commu_topic_comment_id($c_commu_topic_comment_id);
     280    $c_member = db_member_c_member4c_member_id_LIGHT($c_member_id);
    281281
    282282    $c_commu_id       = $comment['c_commu_id'];
     
    332332    }
    333333
    334     $list = do_common_c_member_list4daily_news();
     334    $list = db_member_c_member_list4daily_news();
    335335    $count_receive_daily_news = db_member_count_c_member_is_receive_daily_news();
    336336    $count_daily_news_day = count(explode(',', DAILY_NEWS_DAY));
     
    361361            print $c_member_id."\t" . $i++ ."\t". date("Y-m-d H:i:s") . $sep;
    362362
    363             $c_member_secure = db_common_c_member_secure4c_member_id($c_member_id);
     363            $c_member_secure = db_member_c_member_secure4c_member_id($c_member_id);
    364364            $pc_address = $c_member_secure['pc_address'];
    365365
    366366            $params = array(
    367                 'c_member' => db_common_c_member4c_member_id($c_member_id),
     367                'c_member' => db_member_c_member4c_member_id($c_member_id),
    368368                'date'     => $date,
    369                 'ashiato_num' => p_h_ashiato_c_ashiato_num4c_member_id($c_member_id),
     369                'ashiato_num' => db_ashiato_c_ashiato_num4c_member_id($c_member_id),
    370370                'diary_friend_list' => p_h_home_c_diary_friend_list4c_member_id($c_member_id, 5),
    371371                'c_commu_topic_comment_list'
    372                                     => p_h_home_c_commu_topic_comment_list4c_member_id($c_member_id, 5),
     372                                    => db_commu_c_commu_topic_comment_list4c_member_id($c_member_id, 5),
    373373                'daily_news_head' => $daily_news_head,
    374374                'daily_news_foot' => $daily_news_foot,
     
    382382function do_common_send_birthday_mail()
    383383{
    384     $birth_list = do_common_c_member_list4birthday_mail();
     384    $birth_list = db_member_c_member_list4birthday_mail();
    385385
    386386    foreach ($birth_list as $birth_member) {
    387         $friend_list = do_common_c_friend_list4c_member_id($birth_member['c_member_id']);
     387        $friend_list = db_friend_c_friend_list4c_member_id2($birth_member['c_member_id']);
    388388
    389389        foreach ($friend_list as $friend) {
    390390            if ($friend['is_receive_mail']) {
    391391
    392                 $c_member_secure = db_common_c_member_secure4c_member_id($friend['c_member_id']);
     392                $c_member_secure = db_member_c_member_secure4c_member_id($friend['c_member_id']);
    393393                $pc_address = $c_member_secure['pc_address'];
    394394
     
    415415
    416416    foreach ($send_list as $key => $value) {
    417         $c_member_secure = db_common_c_member_secure4c_member_id($key);
     417        $c_member_secure = db_member_c_member_secure4c_member_id($key);
    418418        $pc_address = $c_member_secure['pc_address'];
    419419
    420420        $params = array(
    421             "c_member" => db_common_c_member4c_member_id_LIGHT($key),
     421            "c_member" => db_member_c_member4c_member_id_LIGHT($key),
    422422            "c_schedule_list" => $value,
    423423        );
     
    429429function do_f_intro_edit_update_c_friend_send_mail($c_member_id, $target_c_member_id)
    430430{
    431     $c_member_to = db_common_c_member4c_member_id($target_c_member_id, true);
     431    $c_member_to = db_member_c_member4c_member_id($target_c_member_id, true);
    432432    $pc_address = $c_member_to['secure']['pc_address'];
    433433    $is_receive_mail = $c_member_to['is_receive_mail'];
    434434
    435435    $params = array(
    436         "c_member_to"   => db_common_c_member4c_member_id_LIGHT($target_c_member_id),
    437         "c_member_from" => db_common_c_member4c_member_id_LIGHT($c_member_id),
     436        "c_member_to"   => db_member_c_member4c_member_id_LIGHT($target_c_member_id),
     437        "c_member_from" => db_member_c_member4c_member_id_LIGHT($c_member_id),
    438438    );
    439439    return fetch_send_mail($pc_address, 'm_pc_friend_intro', $params, $is_receive_mail);
     
    443443function do_inc_join_c_commu_send_mail($c_commu_id, $c_member_id_join)
    444444{
    445     $c_commu = _db_c_commu4c_commu_id($c_commu_id);
    446     $c_member_admin = db_common_c_member4c_member_id($c_commu['c_member_id_admin'], true);
     445    $c_commu = db_commu_c_commu4c_commu_id($c_commu_id);
     446    $c_member_admin = db_member_c_member4c_member_id($c_commu['c_member_id_admin'], true);
    447447
    448448    $pc_address = $c_member_admin['secure']['pc_address'];
     
    451451    $params = array(
    452452        'c_commu' => $c_commu,
    453         'c_member_admin' => db_common_c_member4c_member_id_LIGHT($c_commu['c_member_id_admin']),
    454         'c_member_join'  => db_common_c_member4c_member_id_LIGHT($c_member_id_join),
     453        'c_member_admin' => db_member_c_member4c_member_id_LIGHT($c_commu['c_member_id_admin']),
     454        'c_member_join'  => db_member_c_member4c_member_id_LIGHT($c_member_id_join),
    455455    );
    456456    return fetch_send_mail($pc_address, 'm_pc_join_commu', $params, $is_receive_mail);
     
    460460function do_h_confirm_list_insert_c_friend_mail_send($c_member_id_from, $u)
    461461{
    462     $c_member_from = db_common_c_member4c_member_id($c_member_id_from, true);
     462    $c_member_from = db_member_c_member4c_member_id($c_member_id_from, true);
    463463    $pc_address = $c_member_from['secure']['pc_address'];
    464464    $is_receive_mail = $c_member_from['is_receive_mail'];
    465465
    466466    $params = array(
    467         "c_member_to"   => db_common_c_member4c_member_id($c_member_id_from),
    468         "c_member_from" => db_common_c_member4c_member_id($u),
     467        "c_member_to"   => db_member_c_member4c_member_id($c_member_id_from),
     468        "c_member_from" => db_member_c_member4c_member_id($u),
    469469    );
    470470    return fetch_send_mail($pc_address, 'm_pc_syounin_friend', $params, $is_receive_mail);
     
    475475{
    476476    $params = array(
    477         "c_member" => db_common_c_member4c_member_id($target_c_member_id),
     477        "c_member" => db_member_c_member4c_member_id($target_c_member_id),
    478478        "sid"      => $session,
    479479    );
     
    485485{
    486486    $params = array(
    487         "c_member" => db_common_c_member4c_member_id($target_c_member_id),
     487        "c_member" => db_member_c_member4c_member_id($target_c_member_id),
    488488        "sid"      => $session,
    489489    );
     
    494494function do_common_send_ashiato_mail($c_member_to, $c_member_from)
    495495{
    496     $c_member_to = db_common_c_member4c_member_id($c_member_to, true);
    497     $c_member_from = db_common_c_member4c_member_id($c_member_from);
     496    $c_member_to = db_member_c_member4c_member_id($c_member_to, true);
     497    $c_member_from = db_member_c_member4c_member_id($c_member_from);
    498498
    499499    $pc_address = $c_member_to['secure']['pc_address'];
     
    517517function do_common_send_message_mail_send($c_member_id_to, $c_member_id_from)
    518518{
    519     $c_member_to = db_common_c_member4c_member_id($c_member_id_to, true);
     519    $c_member_to = db_member_c_member4c_member_id($c_member_id_to, true);
    520520    $pc_address = $c_member_to['secure']['pc_address'];
    521521    $is_receive_mail = $c_member_to['is_receive_mail'];
    522522
    523523    $params = array(
    524         "c_member_to"   => db_common_c_member4c_member_id($c_member_id_to),
    525         "c_member_from" => db_common_c_member4c_member_id($c_member_id_from),
     524        "c_member_to"   => db_member_c_member4c_member_id($c_member_id_to),
     525        "c_member_from" => db_member_c_member4c_member_id($c_member_id_from),
    526526    );
    527527    return fetch_send_mail($pc_address, 'm_pc_message_zyushin', $params, $is_receive_mail);
     
    531531function do_common_send_message_syoudaku_mail_send($c_member_id_to, $c_member_id_from)
    532532{
    533     $c_member_to = db_common_c_member4c_member_id($c_member_id_to, true);
     533    $c_member_to = db_member_c_member4c_member_id($c_member_id_to, true);
    534534    $pc_address = $c_member_to['secure']['pc_address'];
    535535    $is_receive_mail = $c_member_to['is_receive_mail'];
    536536
    537537    $params = array(
    538         "c_member_to"   => db_common_c_member4c_member_id($c_member_id_to),
    539         "c_member_from" => db_common_c_member4c_member_id($c_member_id_from),
     538        "c_member_to"   => db_member_c_member4c_member_id($c_member_id_to),
     539        "c_member_from" => db_member_c_member4c_member_id($c_member_id_from),
    540540    );
    541541    return fetch_send_mail($pc_address, 'm_pc_message_syounin', $params, $is_receive_mail);
     
    545545function do_insert_c_member_mail_send($c_member_id, $password, $ktai_address)
    546546{
    547     $c_member_secure = db_common_c_member_secure4c_member_id($c_member_id);
     547    $c_member_secure = db_member_c_member_secure4c_member_id($c_member_id);
    548548    $p = array('kad' => t_encrypt(db_member_username4c_member_id($c_member_id, true)));
    549549    $params['url'] = openpne_gen_url('ktai', 'page_o_login', $p);
     
    557557    $p = array('ses' => $session);
    558558    $params['url'] = openpne_gen_url('ktai', 'page_o_regist_pre', $p);
    559     $params['c_member'] = db_common_c_member4c_member_id($c_member_id_invite);
     559    $params['c_member'] = db_member_c_member4c_member_id($c_member_id_invite);
    560560    $params['message'] = $message;
    561561    return fetch_send_mail($mail, 'm_ktai_regist_invite', $params);
     
    575575function do_mail_sns_login_get_mail_send($c_member_id, $sender)
    576576{
    577     $c_member_secure = db_common_c_member_secure4c_member_id($c_member_id);
     577    $c_member_secure = db_member_c_member_secure4c_member_id($c_member_id);
    578578    $p = array('kad' => t_encrypt(db_member_username4c_member_id($c_member_id, true)));
    579579    $params['url'] = openpne_gen_url('ktai', 'page_o_login', $p);
     
    585585{
    586586    //メール
    587     $c_member_to = db_common_c_member4c_member_id($c_member_id_to, true);
     587    $c_member_to = db_member_c_member4c_member_id($c_member_id_to, true);
    588588    $pc_address = $c_member_to['secure']['pc_address'];
    589589    $is_receive_mail = $c_member_to['is_receive_mail'];
    590590
    591591    $params = array(
    592         "c_member_to"   =>db_common_c_member4c_member_id($c_member_id_to),
    593         "c_member_from" =>db_common_c_member4c_member_id($c_member_id_from),
     592        "c_member_to"   => db_member_c_member4c_member_id($c_member_id_to),
     593        "c_member_from" => db_member_c_member4c_member_id($c_member_id_from),
    594594    );
    595595    return fetch_send_mail($pc_address, 'm_pc_message_syoukai_commu', $params, $is_receive_mail);
     
    600600{
    601601    //メール
    602     $c_member_to = db_common_c_member4c_member_id($c_member_id_to, true);
     602    $c_member_to = db_member_c_member4c_member_id($c_member_id_to, true);
    603603    $c_commu = db_commu_c_commu4c_commu_id($c_commu_id);
    604604    $pc_address = $c_member_to['secure']['pc_address'];
     
    606606
    607607    $params = array(
    608         'c_member_to'   => db_common_c_member4c_member_id($c_member_id_to),
    609         'c_member_from' => db_common_c_member4c_member_id($c_member_id_from),
     608        'c_member_to'   => db_member_c_member4c_member_id($c_member_id_to),
     609        'c_member_from' => db_member_c_member4c_member_id($c_member_id_from),
    610610        'c_commu'       => $c_commu,
    611611    );
     
    617617{
    618618    //メール
    619     $c_member_to = db_common_c_member4c_member_id($c_member_id_to, true);
     619    $c_member_to = db_member_c_member4c_member_id($c_member_id_to, true);
    620620    $pc_address = $c_member_to['secure']['pc_address'];
    621621    $is_receive_mail = $c_member_to['is_receive_mail'];
    622622
    623623    $params = array(
    624         "c_member_to"   => db_common_c_member4c_member_id($c_member_id_to),
    625         "c_member_from" => db_common_c_member4c_member_id($c_member_id_from),
     624        "c_member_to"   => db_member_c_member4c_member_id($c_member_id_to),
     625        "c_member_from" => db_member_c_member4c_member_id($c_member_id_from),
    626626    );
    627627    return fetch_send_mail($pc_address, 'm_pc_message_syoukai_member', $params, $is_receive_mail);
     
    632632{
    633633    //メール
    634     $c_member_to = db_common_c_member4c_member_id($c_member_id_to, true);
     634    $c_member_to = db_member_c_member4c_member_id($c_member_id_to, true);
    635635    $pc_address = $c_member_to['secure']['pc_address'];
    636636    $is_receive_mail = $c_member_to['is_receive_mail'];
    637637
    638638    $params = array(
    639         "c_member_to"   => db_common_c_member4c_member_id($c_member_id_to),
    640         "c_member_from" => db_common_c_member4c_member_id($c_member_id_from),
     639        "c_member_to"   => db_member_c_member4c_member_id($c_member_id_to),
     640        "c_member_from" => db_member_c_member4c_member_id($c_member_id_from),
    641641    );
    642642    return fetch_send_mail($pc_address, 'm_pc_message_event_invite', $params, $is_receive_mail);
     
    647647{
    648648    //メール
    649     $c_member_to = db_common_c_member4c_member_id($c_member_id_to, true);
     649    $c_member_to = db_member_c_member4c_member_id($c_member_id_to, true);
    650650    $pc_address = $c_member_to['secure']['pc_address'];
    651651    $is_receive_mail = $c_member_to['is_receive_mail'];
    652652
    653653    $params = array(
    654         "c_member_to"   => db_common_c_member4c_member_id($c_member_id_to),
    655         "c_member_from" => db_common_c_member4c_member_id($c_member_id_from),
     654        "c_member_to"   => db_member_c_member4c_member_id($c_member_id_to),
     655        "c_member_from" => db_member_c_member4c_member_id($c_member_id_from),
    656656    );
    657657    return fetch_send_mail($pc_address, 'm_pc_message_event_message', $params, $is_receive_mail);
     
    672672function do_common_send_mail_taikai4admin($c_member_id, $reason)
    673673{
    674     $p_list = db_common_c_profile_list4null();
     674    $p_list = db_member_c_profile_list4null();
    675675    $c_profile_list = array();
    676676    foreach ($p_list as $key => $value) {
     
    678678    }
    679679
    680     $c_member = db_common_c_member4c_member_id($c_member_id, true, true, 'private');
    681     $c_member['c_member_invite'] = db_common_c_member4c_member_id_LIGHT($c_member['c_member_id_invite']);
     680    $c_member = db_member_c_member4c_member_id($c_member_id, true, true, 'private');
     681    $c_member['c_member_invite'] = db_member_c_member4c_member_id_LIGHT($c_member['c_member_id_invite']);
    682682    if (OPENPNE_USE_POINT_RANK) {
    683683        $c_member['point'] = db_point_get_point($c_member_id);
     
    696696function do_common_send_mail_taikai_end_pc($c_member_id)
    697697{
    698     $c_member = db_common_c_member4c_member_id($c_member_id, true);
     698    $c_member = db_member_c_member4c_member_id($c_member_id, true);
    699699    $pc_address = $c_member['secure']['pc_address'];
    700700    $params = array(
     
    707707function do_common_send_mail_taikai_end_ktai($c_member_id)
    708708{
    709     $c_member = db_common_c_member4c_member_id($c_member_id, true);
     709    $c_member = db_member_c_member4c_member_id($c_member_id, true);
    710710    $ktai_address = $c_member['secure']['ktai_address'];
    711711    $params = array(
     
    718718function do_common_send_message_mail_send_ktai($c_member_id_to, $c_member_id_from)
    719719{
    720     $c_member_to = db_common_c_member4c_member_id($c_member_id_to, true);
     720    $c_member_to = db_member_c_member4c_member_id($c_member_id_to, true);
    721721    $ktai_address = $c_member_to['secure']['ktai_address'];
    722722    $is_receive_ktai_mail = $c_member_to['is_receive_ktai_mail'];
     
    725725
    726726    $params = array(
    727         'c_member_to'   => db_common_c_member4c_member_id($c_member_id_to),
    728         'c_member_from' => db_common_c_member4c_member_id($c_member_id_from),
     727        'c_member_to'   => db_member_c_member4c_member_id($c_member_id_to),
     728        'c_member_from' => db_member_c_member4c_member_id($c_member_id_from),
    729729        'login_url' => $login_url,
    730730    );
     
    893893    }
    894894
    895     $c_member = db_common_c_member4c_member_id_LIGHT($c_member_id);
    896     $target_c_member = db_common_c_member_secure4c_member_id($target_c_member_id);
     895    $c_member = db_member_c_member4c_member_id_LIGHT($c_member_id);
     896    $target_c_member = db_member_c_member_secure4c_member_id($target_c_member_id);
    897897    $c_diary_id = $comment['c_diary_id'];
    898898    $c_diary = db_diary_get_c_diary4id($c_diary_id);
  • OpenPNE/trunk/webapp/lib/util/message.php

    r6410 r6630  
    99    $msg_subject = 'メンバー紹介メッセージ';
    1010
    11     $c_member = db_common_c_member4c_member_id_LIGHT($u);
     11    $c_member = db_member_c_member4c_member_id_LIGHT($u);
    1212    $p = array('target_c_member_id' => $target_c_member_id);
    1313    $url = openpne_gen_url('pc', 'page_f_home', $p);
     
    2929    $msg_subject = WORD_COMMUNITY . '紹介メッセージ';
    3030
    31     $c_member = db_common_c_member4c_member_id_LIGHT($u);
    32     $c_commu = _db_c_commu4c_commu_id($c_commu_id);
     31    $c_member = db_member_c_member4c_member_id_LIGHT($u);
     32    $c_commu = db_commu_c_commu4c_commu_id($c_commu_id);
    3333    $p = array('target_c_commu_id' => $c_commu_id);
    3434    $url = openpne_gen_url('pc', 'page_c_home', $p);
     
    5454    $msg_subject = 'イベント紹介メッセージ';
    5555
    56     $c_member = db_common_c_member4c_member_id_LIGHT($u);
    57     $c_commu_topic = _do_c_bbs_c_commu_topic4c_commu_topic_id($c_commu_topic_id);
     56    $c_member = db_member_c_member4c_member_id_LIGHT($u);
     57    $c_commu_topic = db_commu_c_commu_topic4c_commu_topic_id($c_commu_topic_id);
    5858    $p = array('target_c_commu_topic_id' => $c_commu_topic_id);
    5959    $url = openpne_gen_url('pc', 'page_c_event_detail', $p);
     
    7878    $msg_subject = 'イベントのお知らせ';
    7979
    80     $c_member = db_common_c_member4c_member_id_LIGHT($u);
     80    $c_member = db_member_c_member4c_member_id_LIGHT($u);
    8181
    8282    $p = array('target_c_commu_topic_id' => $c_commu_topic_id);
     
    9999    $msg_subject = WORD_COMMUNITY . '管理者交代要請メッセージ';
    100100
    101     $c_member = db_common_c_member4c_member_id_LIGHT($u);
     101    $c_member = db_member_c_member4c_member_id_LIGHT($u);
    102102    $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
    103103    $WORD_COMMUNITY = WORD_COMMUNITY;
     
    118118    $msg_subject = WORD_COMMUNITY . '副管理者要請メッセージ';
    119119
    120     $c_member = db_common_c_member4c_member_id_LIGHT($u);
     120    $c_member = db_member_c_member4c_member_id_LIGHT($u);
    121121    $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
    122122    $WORD_COMMUNITY = WORD_COMMUNITY;
     
    137137    $msg_subject = WORD_COMMUNITY . '参加要請メッセージ';
    138138
    139     $c_member = db_common_c_member4c_member_id_LIGHT($u);
     139    $c_member = db_member_c_member4c_member_id_LIGHT($u);
    140140    $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
    141141
     
    156156
    157157    $c_member_id_from = $u;
    158     $c_member = db_common_c_member4c_member_id_LIGHT($u);
     158    $c_member = db_member_c_member4c_member_id_LIGHT($u);
    159159    $WORD_FRIEND = WORD_FRIEND;
    160160
  • OpenPNE/trunk/webapp/modules/admin/do/delete_c_image.php

    r4933 r6630  
    1414        }
    1515
    16         image_data_delete($requests['filename']);
     16        db_image_data_delete($requests['filename']);
    1717        db_admin_delete_c_image_link4image_filename($requests['filename']);
    1818
  • OpenPNE/trunk/webapp/modules/admin/do/delete_c_image4c_image_id.php

    r4933 r6630  
    1616        }
    1717
    18         image_data_delete($c_image['filename']);
     18        db_image_data_delete($c_image['filename']);
    1919        db_admin_delete_c_image_link4image_filename($c_image['filename']);
    2020
  • OpenPNE/trunk/webapp/modules/admin/do/delete_c_rank.php

    r4933 r6630  
    1616        //以前のイメージを削除
    1717        $c_rank = db_admin_get_c_rank_one($requests['c_rank_id']);
    18         image_data_delete($c_rank['image_filename']);
     18        db_image_data_delete($c_rank['image_filename']);
    1919
    2020        db_admin_delete_c_rank($requests['c_rank_id']);
  • OpenPNE/trunk/webapp/modules/admin/do/insert_c_image.php

    r6527 r6630  
    2525        }
    2626
    27         image_data_delete($requests['filename']);
     27        db_image_data_delete($requests['filename']);
    2828        if (!admin_insert_c_image($_FILES['upfile'], $requests['filename'])) {
    2929            admin_client_redirect('edit_c_image', '画像が登録できませんでした');
  • OpenPNE/trunk/webapp/modules/admin/do/send_messages_id_list.php

    r6527 r6630  
    4646            case 'mail_address':
    4747                if (!is_ktai_mail_address($each_id)) {
    48                     $each_c_member_id = _db_c_member_id4pc_address($each_id);
     48                    $each_c_member_id = db_member_c_member_id4pc_address($each_id);
    4949                } else {
    50                     $each_c_member_id = do_common_c_member_id4ktai_address($each_id);
     50                    $each_c_member_id = db_member_c_member_id4ktai_address2($each_id);
    5151                }
    5252                if (!$each_c_member_id) {
     
    6464                $this->handleError($error_msg);
    6565            }
    66             if (!p_common_is_active_c_member_id($each_c_member_id)) {
     66            if (!db_member_is_active_c_member_id($each_c_member_id)) {
    6767                $error_msg = '無効なIDが含まれています: ' . $each_c_member_id;
    6868                $this->handleError($error_msg);
  • OpenPNE/trunk/webapp/modules/admin/do/update_c_rank.php

    r6044 r6630  
    3232
    3333            //以前のイメージを削除
    34             image_data_delete($image_filename);
     34            db_image_data_delete($image_filename);
    3535
    3636            //新しいイメージを作成
  • OpenPNE/trunk/webapp/modules/admin/do/update_skin_image.php

    r4933 r6630  
    1717        if ($fn = image_insert_c_image($_FILES['upfile'], $prefix)) {
    1818            if ($old_fn = db_get_c_skin_filename4skinname($requests['skinname'])) {
    19                 image_data_delete($old_fn);
     19                db_image_data_delete($old_fn);
    2020            }
    2121
  • OpenPNE/trunk/webapp/modules/admin/lib/db_admin.php

    r6559 r6630  
    157157    $params = array(intval($c_banner_id));
    158158    $image_filename = db_get_one($sql, $params);
    159     image_data_delete($image_filename);
     159    db_image_data_delete($image_filename);
    160160}
    161161
     
    13321332    foreach ($list as $key => $value) {
    13331333        if ($value['target_c_commu_topic_id']) {
    1334             if ($c_commu_topic = c_topic_detail_c_topic4c_commu_topic_id($value['target_c_commu_topic_id'])) {
     1334            if ($c_commu_topic = db_commu_c_topic4c_commu_topic_id($value['target_c_commu_topic_id'])) {
    13351335                $c_commu_topic['topic_name'] = $c_commu_topic['name'];
    13361336                $c_commu = db_commu_c_commu4c_commu_id($c_commu_topic['c_commu_id']);
     
    24492449
    24502450    foreach ($list as $key => $value) {
    2451         $list[$key]['c_member'] = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     2451        $list[$key]['c_member'] = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    24522452        $list[$key]['c_review'] = db_review_list_product_c_review4c_review_id($value['c_review_id']);
    24532453    }
     
    24822482
    24832483    foreach ($list as $key => $value) {
    2484         $list[$key]['c_member'] = db_common_c_member4c_member_id_LIGHT($value['c_member_id']);
     2484        $list[$key]['c_member'] = db_member_c_member4c_member_id_LIGHT($value['c_member_id']);
    24852485        $list[$key]['c_review'] = db_review_list_product_c_review4c_review_id($value['c_review_id']);
    24862486    }
  • OpenPNE/trunk/webapp/modules/admin/lib/smarty_plugins/function.t_assign_sns_message.php

    r4933 r6630  
    2323    $list = db_get_all_limit($sql, 0, 5, array(1));
    2424    foreach ($list as $key => $value) {
    25         $list[$key]['c_member'] = db_common_c_member4c_member_id_LIGHT($value['c_member_id_from']);
     25        $list[$key]['c_member'] = db_member_c_member4c_member_id_LIGHT($value['c_member_id_from']);
    2626    }
    2727    return $list;
  • OpenPNE/trunk/webapp/modules/admin/lib/smarty_plugins/function.t_assign_sns_new_member.php

    r4933 r6630  
    2121    $list = db_get_all_limit($sql, 0, 5);
    2222    foreach ($list as $key => $value) {
    23         $list[$key]['c_member_invite'] = db_common_c_member4c_member_id_LIGHT($value['c_member_id_invite']);
     23        $list[$key]['c_member_invite'] = db_member_c_member4c_member_id_LIGHT($value['c_member_id_invite']);
    2424    }
    2525    return $list;
  • OpenPNE/trunk/webapp/modules/admin/lib/smarty_plugins/function.t_assign_sns_ranking.php

    r4933 r6630  
    4545    case "ashiato":
    4646    default:
    47         $list = pne_cache_call(3600, 'p_h_ranking_c_ashiato_ranking', $limit);
     47        $list = pne_cache_call(3600, 'db_ranking_c_ashiato_ranking', $limit);
    4848        foreach ($list as $key => $value) {
    4949            $list[$key]['c_member'] = db_member_c_member_with_profile($value['c_member_id']);
  • OpenPNE/trunk/webapp/modules/admin/page/edit_point.php

    r6527 r6630  
    1818        }
    1919
    20         $lite = db_common_c_member4c_member_id_LIGHT($requests['target_c_member_id']);
    21         $prof = db_common_c_member_profile_list4c_member_id($requests['target_c_member_id'],"private");
     20        $lite = db_member_c_member4c_member_id_LIGHT($requests['target_c_member_id']);
     21        $prof = db_member_c_member_profile_list4c_member_id($requests['target_c_member_id'],"private");
    2222        $point = intval($prof['PNE_POINT']['value']);
    2323
  • OpenPNE/trunk/webapp/modules/ktai/do/c_bbs_delete_c_commu_topic.php

    r4933 r6630  
    2020        //コミュニティ管理者 or トピック作成者
    2121
    22         $c_commu_topic = _do_c_bbs_c_commu_topic4c_commu_topic_id($target_c_commu_topic_id);
     22        $c_commu_topic = db_commu_c_commu_topic4c_commu_topic_id($target_c_commu_topic_id);
    2323
    2424        $c_commu_id = $c_commu_topic['c_commu_id'];
  • OpenPNE/trunk/webapp/modules/ktai/do/c_bbs_delete_c_commu_topic_comment.php

    r4933 r6630  
    1919        $target_c_commu_topic_comment_id = $requests['target_c_commu_topic_comment_id'];
    2020        // ----------
    21         $c_commu_topic_comment = do_c_bbs_c_commu_topic_comment4c_commu_topic_comment_id($target_c_commu_topic_comment_id);
     21        $c_commu_topic_comment = db_commu_c_commu_topic_comment4c_commu_topic_comment_id_2($target_c_commu_topic_comment_id);
    2222
    2323        //--- 権限チェック
    2424        //コミュニティ管理者 or コメント作成者
    2525
    26         $c_commu_topic = _do_c_bbs_c_commu_topic4c_commu_topic_id($c_commu_topic_comment['c_commu_topic_id']);
     26        $c_commu_topic = db_commu_c_commu_topic4c_commu_topic_id($c_commu_topic_comment['c_commu_topic_id']);
    2727        $c_commu_id = $c_commu_topic['c_commu_id'];
    2828
  • OpenPNE/trunk/webapp/modules/ktai/do/c_bbs_insert_c_commu_topic_comment.php

    r4933 r6630  
    2323        //コミュニティ参加者
    2424
    25         $c_commu_topic = _do_c_bbs_c_commu_topic4c_commu_topic_id($target_c_commu_topic_id);
     25        $c_commu_topic = db_commu_c_commu_topic4c_commu_topic_id($target_c_commu_topic_id);
    2626        if ($c_commu_topic['event_flag']) {
    2727            $c_event_member_count = db_commu_count_c_event_member_list4c_commu_topic_id($target_c_commu_topic_id);
     
    6060                openpne_redirect('ktai', 'page_c_bbs', $p);
    6161            } else {
    62                 do_c_event_add_insert_c_event_member($target_c_commu_topic_id, $u);
     62                db_commu_insert_c_event_member($target_c_commu_topic_id, $u);
    6363            }
    6464        } elseif ($requests['cancel_event']) {
  • OpenPNE/trunk/webapp/modules/ktai/do/c_edit_image_delete_c_commu_image.php

    r5901 r6630  
    3131        }
    3232
    33         image_data_delete($c_commu['image_filename']);
     33        db_image_data_delete($c_commu['image_filename']);
    3434
    3535        db_commu_delete_c_commu_image_filename($target_c_commu_id);
  • OpenPNE/trunk/webapp/modules/ktai/do/c_topic_delete_image.php

    r4933 r6630  
    2020        // ----------
    2121
    22         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     22        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    2323        $c_commu_id = $c_topic['c_commu_id'];
    2424
     
    5050        }
    5151
    52         image_data_delete($target_image_filename);
     52        db_image_data_delete($target_image_filename);
    5353        db_commu_delete_c_commu_topic_comment_image($c_commu_topic_id, $img_num);
    5454
  • OpenPNE/trunk/webapp/modules/ktai/do/c_topic_edit_update_c_commu_topic.php

    r4933 r6630  
    2626        //トピック作成者 or コミュニティ管理者
    2727
    28         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     28        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    2929        $c_commu_id = $c_topic['c_commu_id'];
    3030
  • OpenPNE/trunk/webapp/modules/ktai/do/h_config_image_delete_image.php

    r4933 r6630  
    2525        }
    2626
    27         image_data_delete($c_member['image_filename_'.$img_num]);
     27        db_image_data_delete($c_member['image_filename_'.$img_num]);
    2828        db_member_delete_c_member_image_new($u, $img_num);
    2929
  • OpenPNE/trunk/webapp/modules/ktai/do/h_confirm_list_delete_c_commu_member_confirm.php

    r4933 r6630  
    2222         //コミュ参加承認を受けている or 送った人
    2323
    24         $cmc = _do_c_commu_member_confirm4c_commu_member_confirm_id($target_c_commu_member_confirm_id);
     24        $cmc = db_commu_c_commu_member_confirm4c_commu_member_confirm_id($target_c_commu_member_confirm_id);
    2525
    2626        if ($cmc['c_member_id'] != $u
  • OpenPNE/trunk/webapp/modules/ktai/do/h_confirm_list_insert_c_commu_member.php

    r4933 r6630  
    2222        //コミュ参加承認を受けている人
    2323
    24         $cmc = _do_c_commu_member_confirm4c_commu_member_confirm_id($target_c_commu_member_confirm_id);
     24        $cmc = db_commu_c_commu_member_confirm4c_commu_member_confirm_id($target_c_commu_member_confirm_id);
    2525
    2626        if ($cmc['c_member_id_admin'] != $u && $cmc['c_member_id_sub_admin'] != $u) {
  • OpenPNE/trunk/webapp/modules/ktai/do/h_diary_delete_image.php

    r4933 r6630  
    4646        }
    4747
    48         image_data_delete($target_image_filename);
     48        db_image_data_delete($target_image_filename);
    4949        db_diary_delete_c_diary_image($target_c_diary_id, $img_num);
    5050
  • OpenPNE/trunk/webapp/modules/ktai/do/inc_join_c_commu.php

    r4933 r6630  
    1919        // ----------
    2020
    21         $status = do_common_get_c_join_status($u, $target_c_commu_id);
     21        $status = db_commu_get_c_join_status($u, $target_c_commu_id);
    2222        $p = array('target_c_commu_id' => $target_c_commu_id);
    2323
  • OpenPNE/trunk/webapp/modules/ktai/page/c_bbs.php

    r4933 r6630  
    4242
    4343        //トピック名
    44         $this->set("c_commu_topic_name", k_p_c_bbs_c_commu_topic_name4c_commu_topic_id($target_c_commu_topic_id));
     44        $this->set("c_commu_topic_name", db_commu_c_commu_topic_name4c_commu_topic_id($target_c_commu_topic_id));
    4545        //トピックID,トピック
    4646        $this->set("c_commu_topic_id", $target_c_commu_topic_id);
     
    4848
    4949        //コミュニティ
    50         $c_commu = k_p_c_bbs_c_commu4c_commu_topic_id($target_c_commu_topic_id);
     50        $c_commu = db_commu_c_commu4c_commu_topic_id($target_c_commu_topic_id);
    5151        $c_commu_id = $c_commu['c_commu_id'];
    5252        $this->set("c_commu", $c_commu);
     
    7171
    7272        //メンバーがコミュニティ管理者かどうか
    73         $this->set("is_admin", k_p_c_bbs_is_admin4c_member_id_c_commu_topic_id($u, $target_c_commu_topic_id));
     73        $this->set("is_admin", db_commu_is_admin4c_member_id_c_commu_topic_id($u, $target_c_commu_topic_id));
    7474        //コミュニティ管理者
    75         $this->set("c_member_admin", k_p_c_bbs_c_member_admin4c_commu_topic_id($target_c_commu_topic_id));
     75        $this->set("c_member_admin", db_commu_c_member_admin4c_commu_topic_id($target_c_commu_topic_id));
    7676
    7777        if (MAIL_ADDRESS_HASHED) {
  • OpenPNE/trunk/webapp/modules/ktai/page/c_bbs_delete_c_commu_topic_comment_confirm.php

    r4933 r6630  
    1616        // ----------
    1717
    18         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($target_c_commu_topic_id);
     18        $c_topic = db_commu_c_topic4c_commu_topic_id($target_c_commu_topic_id);
    1919        $c_commu_id = $c_topic['c_commu_id'];
    20         $c_commu_topic_comment = do_c_bbs_c_commu_topic_comment4c_commu_topic_comment_id($c_commu_topic_comment_id);
     20        $c_commu_topic_comment = db_commu_c_commu_topic_comment4c_commu_topic_comment_id_2($c_commu_topic_comment_id);
    2121
    2222        //--- 権限チェック
  • OpenPNE/trunk/webapp/modules/ktai/page/c_edit.php

    r6410 r6630  
    3535        $this->set('c_commu_category_list', db_commu_c_commu_category4null());
    3636
    37         $this->set('is_topic', p_c_edit_is_topic4c_commu_id($target_c_commu_id));
     37        $this->set('is_topic', db_commu_is_topic4c_commu_id($target_c_commu_id));
    3838
    3939        $this->set('c_commu', $c_commu);
  • OpenPNE/trunk/webapp/modules/ktai/page/c_event_invite.php

    r4933 r6630  
    1515        // ----------
    1616
    17         $c_commu = k_p_c_bbs_c_commu4c_commu_topic_id($target_c_commu_topic_id);
     17        $c_commu = db_commu_c_commu4c_commu_topic_id($target_c_commu_topic_id);
    1818        $c_commu_id = $c_commu['c_commu_id'];
    1919        if (!db_commu_is_c_commu_view4c_commu_idAc_member_id($c_commu_id, $u)) {
  • OpenPNE/trunk/webapp/modules/ktai/page/c_event_list.php

    r4933 r6630  
    2929
    3030        list($result, $is_prev, $is_next, $total_num, $start_num, $end_num)
    31             = p_c_topic_list_c_topic_list4target_c_commu_id($c_commu_id, $u, $page, $page_size, 1, 1);
     31            = db_commu_c_topic_list4target_c_commu_id($c_commu_id, $u, $page, $page_size, 1, 1);
    3232
    3333        $this->set("c_topic_list", $result);
  • OpenPNE/trunk/webapp/modules/ktai/page/c_home.php

    r4933 r6630  
    4545        //コミュニティメンバーリスト
    4646        $this->set("c_commu_member_list",
    47             k_p_c_home_c_commu_member_list_random4c_commu_id($target_c_commu_id, 5));
     47            db_commu_c_commu_member_list_random4c_commu_id($target_c_commu_id, 5));
    4848
    4949        //参加コミュニティの新着トピック書き込み
     
    5454        //自分($u)とこのコミュとの関係
    5555        $this->set("relation_c_member_and_c_commu",
    56             k_p_c_home_relationship_between_member_commu($target_c_commu_id, $u));
     56            db_commu_relationship_between_member_commu($target_c_commu_id, $u));
    5757
    5858        //コミュニティメール(ktai)受信設定
  • OpenPNE/trunk/webapp/modules/ktai/page/c_member_list.php

    r4933 r6630  
    2424
    2525        //メンバーリスト
    26         $list = k_p_c_member_list_c_members_disp4c_commu_id($target_c_commu_id, $page_size, $page);
     26        $list = db_commu_c_members_disp4c_commu_id($target_c_commu_id, $page_size, $page);
    2727        if (empty($list[0])) {
    2828            handle_kengen_error();
  • OpenPNE/trunk/webapp/modules/ktai/page/c_receive_mail.php

    r4933 r6630  
    2323
    2424        $is_c_commu_member = db_commu_is_c_commu_member($target_c_commu_id, $u);
    25         $relation_c_member_and_c_commu = k_p_c_home_relationship_between_member_commu($target_c_commu_id, $u);
     25        $relation_c_member_and_c_commu = db_commu_relationship_between_member_commu($target_c_commu_id, $u);
    2626        $is_unused_pc_bbs = util_is_unused_mail('m_pc_bbs_info');
    2727        $is_unused_ktai_bbs = util_is_unused_mail('m_ktai_bbs_info');
  • OpenPNE/trunk/webapp/modules/ktai/page/c_topic_delete_confirm.php

    r4933 r6630  
    1616        // ----------
    1717
    18         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     18        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    1919        $c_commu_id = $c_topic['c_commu_id'];
    2020
  • OpenPNE/trunk/webapp/modules/ktai/page/c_topic_delete_image_confirm.php

    r4933 r6630  
    1717        // ----------
    1818
    19         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     19        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    2020        $c_commu_id = $c_topic['c_commu_id'];
    2121
  • OpenPNE/trunk/webapp/modules/ktai/page/c_topic_edit.php

    r4933 r6630  
    1919        // ----------
    2020
    21         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     21        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    2222        $c_commu_id = $c_topic['c_commu_id'];
    2323
  • OpenPNE/trunk/webapp/modules/ktai/page/c_topic_edit_image.php

    r4933 r6630  
    1616        // ----------
    1717
    18         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     18        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    1919        $c_commu_id = $c_topic['c_commu_id'];
    2020
  • OpenPNE/trunk/webapp/modules/ktai/page/c_topic_list.php

    r4933 r6630  
    2929
    3030        list($result, $is_prev, $is_next, $total_num, $start_num, $end_num)
    31             = p_c_topic_list_c_topic_list4target_c_commu_id($c_commu_id, $u, $page, $page_size, 0, 1);
     31            = db_commu_c_topic_list4target_c_commu_id($c_commu_id, $u, $page, $page_size, 0, 1);
    3232        $this->set("c_topic_list", $result);
    3333        $this->set("is_prev", $is_prev);
  • OpenPNE/trunk/webapp/modules/ktai/page/f_home.php

    r4933 r6630  
    4747
    4848        //参加コミュニティ最新書き込み5件
    49         $this->set("c_commu_list", k_p_h_home_c_commu_list_lastupdate4c_member_id($target_c_member_id, 5));
     49        $this->set("c_commu_list", db_commu_c_commu_list_lastupdate4c_member_id($target_c_member_id, 5));
    5050
    5151        //共通コミュニティ
  • OpenPNE/trunk/webapp/modules/ktai/page/fh_profile_detail.php

    r6617 r6630  
    5151
    5252        //参加コミュニティ最新書き込み5件
    53         $this->set("c_commu_list", k_p_h_home_c_commu_list_lastupdate4c_member_id($target_c_member_id, 5));
     53        $this->set("c_commu_list", db_commu_c_commu_list_lastupdate4c_member_id($target_c_member_id, 5));
    5454
    5555        //共通コミュニティ
  • OpenPNE/trunk/webapp/modules/ktai/page/h_com_find_all.php

    r4933 r6630  
    1212
    1313        //最新書き込みコミュニティ5件
    14         $this->set("c_commu_list_lastupdated", k_p_h_com_find_all_c_commu_list_lastupdated(5));
     14        $this->set("c_commu_list_lastupdated", db_commu_c_commu_list_lastupdated(5));
    1515
    1616        //子カテゴリのリスト
  • OpenPNE/trunk/webapp/modules/ktai/page/h_confirm_list.php

    r4933 r6630  
    1919        // あなたにコミュニティ管理者交代を希望しているメンバー
    2020        $this->set("anatani_c_commu_admin_confirm_list",
    21             p_h_confirm_list_anatani_c_commu_admin_confirm_list4c_member_id($u));
     21            db_commu_anatani_c_commu_admin_confirm_list4c_member_id($u));
    2222
    2323        // あなたにコミュニティ副管理者を希望しているメンバー
     
    3333        // あなたがコミュニティ管理者交代を要請しているメンバー
    3434        $this->set("anataga_c_commu_admin_confirm_list",
    35             p_h_confirm_list_anataga_c_commu_admin_confirm_list4c_member_id($u));
     35            db_commu_anataga_c_commu_admin_confirm_list4c_member_id($u));
    3636
    3737        // あなたがコミュニティ副管理者を要請しているメンバー
  • OpenPNE/trunk/webapp/modules/ktai/page/h_home.php

    r6527 r6630  
    2424        $this->set('c_diary_friend_list', p_h_home_c_diary_friend_list4c_member_id($u, 5));
    2525        //参加コミュニティリスト
    26         $this->set('c_commu_list', k_p_h_home_c_commu_list_lastupdate4c_member_id($u, 5));
     26        $this->set('c_commu_list', db_commu_c_commu_list_lastupdate4c_member_id($u, 5));
    2727        //参加コミュニティの数
    2828        $this->set('fh_com_count_user',db_commu_count_c_commu4c_member_id($u));
     
    3333
    3434        //参加コミュニティの新着書き込み
    35         $this->set('c_commu_topic_list', p_h_home_c_commu_topic_comment_list4c_member_id($u, 5));
     35        $this->set('c_commu_topic_list', db_commu_c_commu_topic_comment_list4c_member_id($u, 5));
    3636
    3737        $this->set('SNS_NAME', SNS_NAME);
     
    6060
    6161        // あなたにコミュニティ管理者交代を希望しているメンバー
    62         $anatani_c_commu_admin_confirm_list = p_h_confirm_list_anatani_c_commu_admin_confirm_list4c_member_id($u);
     62        $anatani_c_commu_admin_confirm_list = db_commu_anatani_c_commu_admin_confirm_list4c_member_id($u);
    6363        $this->set("anatani_c_commu_admin_confirm_list", $anatani_c_commu_admin_confirm_list);
    6464        //そのメンバーの人数
  • OpenPNE/trunk/webapp/modules/ktai/page/h_prof.php

    r4933 r6630  
    3434
    3535        //参加コミュニティ最新書き込み5件
    36         $this->set("c_commu_list", k_p_h_home_c_commu_list_lastupdate4c_member_id($target_c_member_id, 5));
     36        $this->set("c_commu_list", db_commu_c_commu_list_lastupdate4c_member_id($target_c_member_id, 5));
    3737
    3838        //共通コミュニティ
  • OpenPNE/trunk/webapp/modules/ktai/page/h_ranking.php

    r5079 r6630  
    4343        case "ashiato":
    4444        default:
    45             $list = pne_cache_call(3600, 'p_h_ranking_c_ashiato_ranking', $limit);
     45            $list = pne_cache_call(3600, 'db_ranking_c_ashiato_ranking', $limit);
    4646            foreach ($list as $key => $value) {
    4747                $list[$key]['c_member'] = db_member_c_member_with_profile($value['c_member_id']);
  • OpenPNE/trunk/webapp/modules/pc/do/c_bbs_delete_c_commu_topic.php

    r4933 r6630  
    1919        //コミュニティ管理者 or トピック作成者
    2020
    21         $c_commu_topic = _do_c_bbs_c_commu_topic4c_commu_topic_id($target_c_commu_topic_id);
     21        $c_commu_topic = db_commu_c_commu_topic4c_commu_topic_id($target_c_commu_topic_id);
    2222
    2323        $c_commu_id = $c_commu_topic['c_commu_id'];
  • OpenPNE/trunk/webapp/modules/pc/do/c_bbs_delete_c_commu_topic_comment.php

    r4933 r6630  
    1919        //コミュニティ管理者 or コミュニティ参加者
    2020
    21         $c_commu_topic_comment = do_c_bbs_c_commu_topic_comment4c_commu_topic_comment_id($target_c_commu_topic_comment_id);
     21        $c_commu_topic_comment = db_commu_c_commu_topic_comment4c_commu_topic_comment_id_2($target_c_commu_topic_comment_id);
    2222
    23         $c_commu_topic = _do_c_bbs_c_commu_topic4c_commu_topic_id($c_commu_topic_comment['c_commu_topic_id']);
     23        $c_commu_topic = db_commu_c_commu_topic4c_commu_topic_id($c_commu_topic_comment['c_commu_topic_id']);
    2424        $c_commu_id = $c_commu_topic['c_commu_id'];
    2525
  • OpenPNE/trunk/webapp/modules/pc/do/c_edit_image_delete_c_commu_image.php

    r4933 r6630  
    2929
    3030        $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
    31         image_data_delete($c_commu['image_filename']);
     31        db_image_data_delete($c_commu['image_filename']);
    3232
    3333        db_commu_delete_c_commu_image_filename($target_c_commu_id);
  • OpenPNE/trunk/webapp/modules/pc/do/c_edit_update_c_commu.php

    r6410 r6630  
    6868            //画像削除
    6969            $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
    70             image_data_delete($c_commu['image_filename']);
     70            db_image_data_delete($c_commu['image_filename']);
    7171        }
    7272
  • OpenPNE/trunk/webapp/modules/pc/do/c_event_edit_delete_c_commu_topic_comment_image.php

    r4933 r6630  
    3333
    3434
    35         image_data_delete($c_topic['image_filename'.$pic_delete]);
     35        db_image_data_delete($c_topic['image_filename'.$pic_delete]);
    3636
    3737        db_commu_delete_c_commu_topic_comment_image($c_commu_topic_id, $pic_delete);
  • OpenPNE/trunk/webapp/modules/pc/do/c_event_edit_update_c_commu_topic.php

    r5335 r6630  
    134134        if ($filename1) {
    135135            $update_c_commu_topic_comment["image_filename1"] = $filename1;
    136             image_data_delete($c_topic['image_filename1']);
     136            db_image_data_delete($c_topic['image_filename1']);
    137137        }
    138138        if ($filename2) {
    139139            $update_c_commu_topic_comment["image_filename2"] = $filename2;
    140             image_data_delete($c_topic['image_filename2']);
     140            db_image_data_delete($c_topic['image_filename2']);
    141141        }
    142142        if ($filename3) {
    143143            $update_c_commu_topic_comment["image_filename3"] = $filename3;
    144             image_data_delete($c_topic['image_filename3']);
     144            db_image_data_delete($c_topic['image_filename3']);
    145145        }
    146146        db_commu_update_c_commu_topic_comment($c_commu_topic_id, $update_c_commu_topic_comment);
  • OpenPNE/trunk/webapp/modules/pc/do/c_event_write_insert_c_commu_topic_comment.php

    r4933 r6630  
    4747        //イベントのメンバーに追加
    4848        if ($add_event_member == 1) {
    49             do_c_event_add_insert_c_event_member($c_commu_topic_id, $u);
     49            db_commu_insert_c_event_member($c_commu_topic_id, $u);
    5050        } elseif ($add_event_member == -1) {
    5151            db_commu_delete_c_event_member($c_commu_topic_id, $u);
  • OpenPNE/trunk/webapp/modules/pc/do/c_file_download.php

    r6531 r6630  
    3333            $filename = $c_topic_comment['filename'];
    3434        } else {
    35             $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     35            $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    3636            $c_commu_id = $c_topic['c_commu_id'];
    3737            $filename = $c_topic['filename'];
  • OpenPNE/trunk/webapp/modules/pc/do/c_topic_edit_delete_c_commu_topic_comment_file.php

    r4933 r6630  
    1515        // ----------
    1616
    17         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     17        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    1818
    1919        //--- 権限チェック
  • OpenPNE/trunk/webapp/modules/pc/do/c_topic_edit_delete_c_commu_topic_comment_image.php

    r4933 r6630  
    1616        // ----------
    1717
    18         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     18        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    1919
    2020        //--- 権限チェック
     
    3232        //---
    3333
    34         image_data_delete($c_topic['image_filename'.$pic_delete]);
     34        db_image_data_delete($c_topic['image_filename'.$pic_delete]);
    3535
    3636        db_commu_delete_c_commu_topic_comment_image($c_commu_topic_id, $pic_delete);
  • OpenPNE/trunk/webapp/modules/pc/do/c_topic_edit_update_c_commu_topic.php

    r5880 r6630  
    2424        //トピック作成者 or コミュニティ管理者
    2525
    26         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     26        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    2727        $c_commu_id = $c_topic['c_commu_id'];
    2828
     
    121121        if ($filename1) {
    122122            $update_c_commu_topic_comment["image_filename1"] = $filename1;
    123             image_data_delete($c_topic['image_filename1']);
     123            db_image_data_delete($c_topic['image_filename1']);
    124124        }
    125125        if ($filename2) {
    126126            $update_c_commu_topic_comment["image_filename2"] = $filename2;
    127             image_data_delete($c_topic['image_filename2']);
     127            db_image_data_delete($c_topic['image_filename2']);
    128128        }
    129129        if ($filename3) {
    130130            $update_c_commu_topic_comment["image_filename3"] = $filename3;
    131             image_data_delete($c_topic['image_filename3']);
     131            db_image_data_delete($c_topic['image_filename3']);
    132132        }
    133133        if ($filename4) {
  • OpenPNE/trunk/webapp/modules/pc/do/c_topic_write_insert_c_commu_topic_comment.php

    r6531 r6630  
    3838        //コミュニティ参加者
    3939
    40         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     40        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    4141        $c_commu_id = $c_topic['c_commu_id'];
    4242
  • OpenPNE/trunk/webapp/modules/pc/do/f_link_request.php

    r4933 r6630  
    1717
    1818        $is_friend = db_friend_is_friend($u, $target_c_member_id);
    19         $is_link_wait = do_common_is_friend_link_wait($u, $target_c_member_id);
     19        $is_link_wait = db_friend_is_friend_link_wait($u, $target_c_member_id);
    2020
    2121        $p = array('target_c_member_id' => $target_c_member_id);
  • OpenPNE/trunk/webapp/modules/pc/do/h_config_image_delete_c_member_image.php

    r4933 r6630  
    2525
    2626        $c_member = db_member_c_member4c_member_id($u);
    27         image_data_delete($c_member['image_filename_'.$img_num]);
     27        db_image_data_delete($c_member['image_filename_'.$img_num]);
    2828        db_member_delete_c_member_image_new($u, $img_num);
    2929
  • OpenPNE/trunk/webapp/modules/pc/do/h_confirm_list_delete_c_commu_member_confirm.php

    r4933 r6630  
    2222        //コミュニティ参加承認を受けた人 or 送った人
    2323
    24         $cmc = _do_c_commu_member_confirm4c_commu_member_confirm_id($target_c_commu_member_confirm_id);
     24        $cmc = db_commu_c_commu_member_confirm4c_commu_member_confirm_id($target_c_commu_member_confirm_id);
    2525
    2626        if ($cmc['c_member_id'] != $u
  • OpenPNE/trunk/webapp/modules/pc/do/h_confirm_list_insert_c_commu_member.php

    r6410 r6630  
    2121        //コミュニティ参加承認を受けた人
    2222
    23         $cmc = _do_c_commu_member_confirm4c_commu_member_confirm_id($target_c_commu_member_confirm_id);
     23        $cmc = db_commu_c_commu_member_confirm4c_commu_member_confirm_id($target_c_commu_member_confirm_id);
    2424
    2525        if ($cmc['c_member_id_admin'] != $u && $cmc['c_member_id_sub_admin'] != $u) {
     
    2828        // -----
    2929
    30         $status = do_common_get_c_join_status($cmc['c_member_id'], $cmc['c_commu_id']);
     30        $status = db_commu_get_c_join_status($cmc['c_member_id'], $cmc['c_commu_id']);
    3131
    3232        if ($status != STATUS_C_JOIN_ALREADY) {
  • OpenPNE/trunk/webapp/modules/pc/do/h_diary_edit_delete_image.php

    r4933 r6630  
    2626        //---
    2727
    28         image_data_delete($c_diary['image_filename_'. $del_img]);
     28        db_image_data_delete($c_diary['image_filename_'. $del_img]);
    2929        db_diary_delete_c_diary_image($c_diary_id, $del_img);
    3030
  • OpenPNE/trunk/webapp/modules/pc/do/h_diary_edit_insert_c_diary.php

    r4933 r6630  
    7373
    7474        if ($tmpfile_1) {
    75             image_data_delete($c_diary['image_filename_1']);
     75            db_image_data_delete($c_diary['image_filename_1']);
    7676            $filename_1 = image_insert_c_image4tmp("d_{$target_c_diary_id}_1", $tmpfile_1);
    7777        }
    7878        if ($tmpfile_2) {
    79             image_data_delete($c_diary['image_filename_2']);
     79            db_image_data_delete($c_diary['image_filename_2']);
    8080            $filename_2 = image_insert_c_image4tmp("d_{$target_c_diary_id}_2", $tmpfile_2);
    8181        }
    8282        if ($tmpfile_3) {
    83             image_data_delete($c_diary['image_filename_3']);
     83            db_image_data_delete($c_diary['image_filename_3']);
    8484            $filename_3 = image_insert_c_image4tmp("d_{$target_c_diary_id}_3", $tmpfile_3);
    8585        }
  • OpenPNE/trunk/webapp/modules/pc/do/inc_join_c_commu.php

    r4933 r6630  
    1616        $target_c_commu_id = $requests['target_c_commu_id'];
    1717
    18         $status = do_common_get_c_join_status($u, $target_c_commu_id);
     18        $status = db_commu_get_c_join_status($u, $target_c_commu_id);
    1919
    2020        //非公開コミュニティに管理者から招待されている場合は強制的に承認を回避
  • OpenPNE/trunk/webapp/modules/pc/page/c_edit.php

    r6410 r6630  
    6666        );
    6767        $this->set('topic_authority_list', $topic_authority_list);
    68         $this->set('is_topic', p_c_edit_is_topic4c_commu_id($target_c_commu_id));
     68        $this->set('is_topic', db_commu_is_topic4c_commu_id($target_c_commu_id));
    6969        $this->set('err_msg', $err_msg);
    7070
  • OpenPNE/trunk/webapp/modules/pc/page/c_edit_member.php

    r4933 r6630  
    3939
    4040        //コミュニティメンバーリスト
    41         $list = p_c_edit_member_c_member_list4c_commu_id($target_c_commu_id, $page_size, $page);
     41        $list = db_commu_c_member_list4c_commu_id($target_c_commu_id, $page_size, $page);
    4242        $this->set("c_member_list", $list[0]);
    4343        $this->set("is_prev", $list[1]);
  • OpenPNE/trunk/webapp/modules/pc/page/c_event_list.php

    r4933 r6630  
    3232        $this->set("c_commu", $c_commu);
    3333        list($result, $is_prev, $is_next, $total_num, $start_num, $end_num)
    34             = p_c_topic_list_c_topic_list4target_c_commu_id($c_commu_id, $u, $page, $page_size, 1, 1);
     34            = db_commu_c_topic_list4target_c_commu_id($c_commu_id, $u, $page, $page_size, 1, 1);
    3535        $this->set("c_topic_list", $result);
    3636        $this->set("is_prev", $is_prev);
  • OpenPNE/trunk/webapp/modules/pc/page/c_join_commu.php

    r4933 r6630  
    1717        $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
    1818
    19         $status = do_common_get_c_join_status($u, $target_c_commu_id);
     19        $status = db_commu_get_c_join_status($u, $target_c_commu_id);
    2020
    2121        //非公開コミュニティに管理者から招待されている場合は強制的に承認を回避
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_delete_confirm.php

    r4933 r6630  
    1515        // ----------
    1616
    17         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     17        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    1818        $c_commu_id = $c_topic['c_commu_id'];
    1919
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_detail.php

    r6531 r6630  
    2020        // ----------
    2121
    22         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     22        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    2323        $c_commu_id = $c_topic['c_commu_id'];
    2424
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_edit.php

    r4933 r6630  
    1818        // ----------
    1919
    20         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     20        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    2121        $c_commu_id = $c_topic['c_commu_id'];
    2222
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_list.php

    r4933 r6630  
    3232        $this->set("c_commu", $c_commu);
    3333        list($result, $is_prev, $is_next, $total_num, $start_num, $end_num)
    34             = p_c_topic_list_c_topic_list4target_c_commu_id($c_commu_id, $u, $page, $page_size, 0, 1);
     34            = db_commu_c_topic_list4target_c_commu_id($c_commu_id, $u, $page, $page_size, 0, 1);
    3535        $this->set("c_topic_list", $result);
    3636        $this->set("is_prev", $is_prev);
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_write_confirm.php

    r6531 r6630  
    7272        //-----
    7373
    74         $c_topic = c_topic_detail_c_topic4c_commu_topic_id($c_commu_topic_id);
     74        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    7575        $c_commu_id = $c_topic['c_commu_id'];
    7676
  • OpenPNE/trunk/webapp/modules/pc/page/h_confirm_list.php

    r4978 r6630  
    2424        // あなたにコミュニティ管理者交代を希望しているメンバー
    2525        $this->set("anatani_c_commu_admin_confirm_list",
    26                 p_h_confirm_list_anatani_c_commu_admin_confirm_list4c_member_id($u));
     26                db_commu_anatani_c_commu_admin_confirm_list4c_member_id($u));
    2727
    2828        // あなたにコミュニティ副管理者を希望しているメンバー
  • OpenPNE/trunk/webapp/modules/pc/page/h_message_box.php

    r4933 r6630  
    7676                list($s_list,$is_s_prev,$is_s_next, $total_num) = db_message_c_message_sent_list4c_member_id4range($u, $s_page, $page_size, $year, $month, $day);
    7777            } else {
    78                 list($s_list,$is_s_prev,$is_s_next, $total_num) = p_h_message_box_c_message_sent_list4c_member_id4range($u, $s_page, $page_size);
     78                list($s_list,$is_s_prev,$is_s_next, $total_num) = db_message_c_message_sent_list4c_member_id4range($u, $s_page, $page_size);
    7979            }
    8080
  • OpenPNE/trunk/webapp/modules/pc/page/h_ranking.php

    r5079 r6630  
    4747        case "ashiato":
    4848        default:
    49             $list = pne_cache_call(3600, 'p_h_ranking_c_ashiato_ranking', $limit);
     49            $list = pne_cache_call(3600, 'db_ranking_c_ashiato_ranking', $limit);
    5050            foreach ($list as $key => $value) {
    5151                $list[$key]['c_member'] = db_member_c_member_with_profile($value['c_member_id']);
  • OpenPNE/trunk/webapp/modules/portal/do/delete_portal_image.php

    r5856 r6630  
    1313        }
    1414
    15         image_data_delete($filename);
     15        db_image_data_delete($filename);
    1616        db_portal_delete_portal_image($filename);
    1717
  • OpenPNE/trunk/webapp/modules/portal/do/edit_portal_image.php

    r6527 r6630  
    2424
    2525        $filename = sprintf('module_portal_%d.%s', time(), $file_info['format']);
    26         image_data_delete($filename);
     26        db_image_data_delete($filename);
    2727        db_portal_delete_portal_image($filename);
    2828        if (!admin_insert_c_image($_FILES['upfile'], $filename)) {
  • OpenPNE/trunk/webapp/modules/portal/page/preview.php

    r6527 r6630  
    237237        case "ashiato":
    238238        default:
    239             $list = pne_cache_call(3600, 'p_h_ranking_c_ashiato_ranking', $limit);
     239            $list = pne_cache_call(3600, 'db_ranking_c_ashiato_ranking', $limit);
    240240            foreach ($list as $key => $value) {
    241241                $list[$key]['c_member'] = db_member_c_member_with_profile($value['c_member_id']);
  • OpenPNE/trunk/webapp/modules/portal/page/user_top.php

    r6527 r6630  
    248248        case "ashiato":
    249249        default:
    250             $list = pne_cache_call(3600, 'p_h_ranking_c_ashiato_ranking', $limit);
     250            $list = pne_cache_call(3600, 'db_ranking_c_ashiato_ranking', $limit);
    251251            foreach ($list as $key => $value) {
    252252                $list[$key]['c_member'] = db_member_c_member_with_profile($value['c_member_id']);
  • OpenPNE/trunk/webapp_biz/modules/pc/page/h_home.php

    r6625 r6630  
    6464        $this->set('c_friend_count', db_friend_count_friends($u));
    6565        // 参加コミュニティ
    66         $this->set('c_commu_user_list', p_h_home_c_commu_list4c_member_id($u, 9));
     66        $this->set('c_commu_user_list', db_commu_c_commu_list4c_member_id_2($u, 9));
    6767        $this->set('fh_com_count_user',db_commu_count_c_commu4c_member_id($u));
    6868
     
    7676        $this->set('c_diary_my_comment_list', p_h_home_c_diary_my_comment_list4c_member_id($u, 5));
    7777        // 参加コミュニティの新着書き込み
    78         $this->set('c_commu_topic_comment_list', p_h_home_c_commu_topic_comment_list4c_member_id($u, 5));
     78        $this->set('c_commu_topic_comment_list', db_commu_c_commu_topic_comment_list4c_member_id($u, 5));
    7979        // レビュー
    8080        $this->set('c_friend_review_list', db_review_c_friend_review_list4c_member_id($u, 5));
Note: See TracChangeset for help on using the changeset viewer.