ChangeLog_develop: OpenPNE_2_5_0_to_2_5_1.patch

webapp_biz/modules/biz/do/fh_biz_schedule_edit.php

@@ -122 +122 @@
-            biz_editSchedule($requests['sc_title'], $u, $begin_date, $finish_date, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, 0, $requests['sc_j_mem'], $requests['sc_j_plc'], $requests['schedule_id']);
-            $schedule_id = $requests['schedule_id'];
-        } else {
-            $schedule_id = $requests['schedule_id'];
-            biz_deleteSchedule($schedule_id);
-
-            //終了日の決定
-
-
+
-            //繰り返しルールの決定
-            foreach ($requests['sc_rwk'] as $value) {
-                $rp_rule += 1 << $value;
-            }
-
-            //繰り返し予定
-$begin_date
+strtotime($begin_date)
-
-            if ($requests['iskeep']) {
-                //繰り返し予定グループの維持（同予定から派生した繰り返し予定を一斉に編集）
@@ -146 +142 @@
-
-            $first_id = biz_getScheduleMax() + 1;  //登録される予定のプライマリキー
-
-date("Ymd", strtotime($tmp)) < date("Ymd", strtotime($finish_date)); $i++) {
+$tmp < strtotime($finish_date); $i++) { 
-                //終了日に達するまで新規予定追加を繰り返す
-requests['sc_b_year'].'-'.$requests['sc_b_month'].'-'.($requests['sc_b_date']+$i));
-date("Ymd", $nowday)
-
+begin_date . ' +'.$i.'days'); 
+$nowday
+
-                if ($rp_rule & (1 << date("w", $nowday))) {
-$tmp, $tmp, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, $first_id, $requests['sc_j_mem']);
+date("Y-m-d", $tmp), date("Y-m-d", $tmp), $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, $first_id, $requests['sc_j_mem']); 
-                }
-            }
-
@@ -160 +156 @@
-        }
-        $week = date("W", abs(strtotime($begin_date) - strtotime(date("Y-m-d")))) - 1;
-
-
+
+
+
+
+
+
+
-        openpne_redirect('biz', 'page_fh_biz_schedule_view', $p);
-    }
-}

webapp_biz/modules/biz/validate/do/fh_biz_schedule_edit.ini

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

webapp_biz/modules/biz/page/fh_biz_schedule_view.php

@@ -62 +62 @@
-            }
-        }
-
-
-
-
+
+
-        $list['begin_time'] = substr($list['begin_time'], 0, 5);
-        $list['finish_time'] = substr($list['finish_time'], 0, 5);
-
-        $jmembers = biz_getJoinMemberSchedule($requests['id']);
-        if (array_search($target_member['nickname'], $jmembers)) {
-            $jmembers[$target_member['c_member_id']] = $target_member['nickname'];
-            $jmembers = array_unique($jmembers);
-        }
-        $jshisetsu = biz_getJoinShisetsuSchedule($requests['id']);
-
@@ -90 +88 @@
-            $repeat_finish = biz_getRepeatFinish($requests['id']);
-            $repeat_term = strtotime($repeat_finish) - strtotime($repeat_begin);
-
-
-
+
+
+
+
-            $this->set('repeat_begin_date', $repeat_begin);
-            $this->set('repeat_term', intval($daycount));
-        }

webapp_biz/modules/biz/templates/fh_biz_schedule_edit.tpl

@@ -323 +323 @@
-
-<div style="padding:4px 3px;">
-
-
+class="submit" 
-
-</div>
-

webapp_biz/modules/biz/templates/h_biz_schedule_edit.tpl

@@ -321 +321 @@
-
-<div style="padding:4px 3px;">
-
-
+class="submit" 
-
-</div>
-

webapp_biz/modules/biz/templates/inc_biz_new_schedule.tpl

@@ -24 +24 @@
-({foreach key=i item=value from=$newlist})
-<tr>
-<td class="bg_02 border_01 padding_ss" style="width:60px;border-right:none;border-top:none;">({$value.begin_date|date_format:"%m月%d日"})</td>
-
+&amp;target_id=({$target_id})
-</tr>
-({****})
-({/foreach})

webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl

@@ -222 +222 @@
-({/if})
-({ext_include file="inc_biz_schedule_week_time.tpl"})
-<div class="padding_s" style="padding-top:0;">
-
-
+({if $cmd=='f'})&amp;target_id=({$member_info.c_member_id})({/if})
+ 
-        ({else})
-({assign var="begin_time_H" value=$item_schedule.begin_time|date_format:"%H"})
-({assign var="begin_time_M" value=$item_schedule.begin_time|date_format:"%M"})
@@ -233 +233 @@
-({/if})
-({ext_include file="inc_biz_schedule_week_time.tpl"})
-<div class="padding_s" style="padding-top:0;">
-
+({if $cmd=='f'})&amp;target_id=({$member_info.c_member_id})({/if})
-</div>
-        ({/if})
-({/foreach})

webapp_biz/modules/biz/templates/fh_biz_schedule_view.tpl

@@ -290 +290 @@
-<td class="padding_ss" align="left">
-
-({t_form _method=get m=pc a=page_h_home})
-ページ
+ホーム
-</form>
-
-</td>
@@ -338 +338 @@
-<td class="padding_ss" align="right">
-
-({t_form m=biz a=page_fh_biz_schedule_add})
-続けて
+
-</form>
-
-</td>
@@ -346 +346 @@
-
-({t_form m=biz a=page_s_list})
-<input type="hidden" name="w" value="({$w})">
-続けて
+
-</form>
-
-</td>
-<td class="padding_ss" align="left">
-
-({t_form _method=get m=pc a=page_h_home})
-ページ
+ホーム
-</form>
-
-</td>

webapp/lib/db/bookmark.php

@@ -179 +179 @@
- */
-function db_bookmark_insert_c_bookmark($c_member_id_from, $c_member_id_to)
-{
+    //function cacheの削除
+    pne_cache_drop('db_bookmark_member_list', $c_member_id_from, 9);
+
-    $data = array(
-        'c_member_id_from' => intval($c_member_id_from),
-        'c_member_id_to' => intval($c_member_id_to),
@@ -192 +195 @@
- */
-function db_bookmark_delete_c_bookmark($c_member_id_from, $c_member_id_to)
-{
+    //function cacheの削除
+    pne_cache_drop('db_bookmark_member_list', $c_member_id_from, 9);
+
-    $sql = 'DELETE FROM c_bookmark' .
-            ' WHERE c_member_id_from = ? AND c_member_id_to = ?';
-    $params = array(intval($c_member_id_from), intval($c_member_id_to));

webapp/lib/db/member.php

@@ -784 +784 @@
- */
-function db_member_config_prof_new($c_member_id, $prof_list)
-{
+    //function cacheの削除
+    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
+
-    $data = array(
-        'nickname' => $prof_list['nickname'],
-        'birth_year'  => intval($prof_list['birth_year']),
@@ -812 +817 @@
- */
-function db_member_config_image_new($c_member_id, $image_filename, $img_num)
-{
+    //function cacheの削除
+    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
+
-    $data = array('image_filename_'.intval($img_num) => $image_filename);
-    $where = array('c_member_id' => intval($c_member_id));
-    return db_update('c_member', $data, $where);
@@ -822 +832 @@
- */
-function db_member_delete_c_member_image_new($c_member_id, $img_num)
-{
+    //function cacheの削除
+    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
+
-    $sql = 'UPDATE c_member SET';
-    if ($img_num == 1) {
-        $sql .= ' image_filename_1 = image_filename_2,';
@@ -840 +855 @@
- */
-function db_member_change_c_member_main_image($c_member_id, $img_num)
-{
+    //function cacheの削除
+    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
+
-    $sql = 'UPDATE c_member SET image_filename = image_filename_'.intval($img_num).
-        ' WHERE c_member_id = ?';
-    $params = array(intval($c_member_id));
@@ -851 +871 @@
- */
-function db_member_update_c_member_image($c_member_id, $image_filename, $img_num)
-{
+    //function cacheの削除
+    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
+
-    $data = array(
-        'image_filename' => $image_filename,
-        'image_filename_'.intval($img_num) => $image_filename,
@@ -878 +903 @@
-    );
-    $c_member_id = db_insert('c_member', $data);
-
+    //function cacheの削除
+    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
+    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
+
-    $data = array(
-        'c_member_id' => intval($c_member_id),
-        'hashed_password' => md5($c_member_secure['password']),
@@ -1189 +1219 @@
-
-function db_member_update_c_member_profile($c_member_id, $c_member_profile_list)
-{
+    //function cache削除
+    pne_cache_drop('db_common_c_profile_list');
+
-    foreach ($c_member_profile_list as $item) {
-        $sql = 'DELETE FROM c_member_profile' .
-                ' WHERE c_member_id = ? AND c_profile_id = ?';
@@ -1209 +1242 @@
-
-function db_member_insert_c_member_profile($c_member_id, $c_profile_id, $c_profile_option_id, $value, $public_flag)
-{
+    //function cache削除
+    pne_cache_drop('db_common_c_profile_list');
+
-    $data = array(
-        'c_member_id' => intval($c_member_id),
-        'c_profile_id' => intval($c_profile_id),

webapp/lib/db/friend.php

@@ -593 +593 @@
- */
-function db_friend_insert_c_friend($c_member_id_from, $c_member_id_to)
-{
+    //function cache削除
+    cache_drop_c_member($c_member_id_from);
+    cache_drop_c_member($c_member_id_to);
+
-    if (($c_member_id_from < 1) || ($c_member_id_to < 1))
-        return false;
-
@@ -642 +646 @@
- */
-function db_friend_delete_c_friend($c_member_id_from, $c_member_id_to)
-{
+    //function cache削除
+    cache_drop_c_member($c_member_id_from);
+    cache_drop_c_member($c_member_id_to);
+
-    $sql = 'DELETE FROM c_friend' .
-            ' WHERE (c_member_id_from = ? AND c_member_id_to = ?)' .
-               ' OR (c_member_id_to = ? AND c_member_id_from = ?)';
@@ -656 +664 @@
- */
-function db_friend_update_c_friend_intro($c_member_id_from, $c_member_id_to, $intro)
-{
+    //function cacheを削除
+    pne_cache_drop('p_h_home_c_friend_intro_list4c_member_id', $c_member_id_to, 5);
+    pne_cache_drop('p_f_home_c_friend_comment4c_member_id', $c_member_id_to);
+
-    $data = array(
-        'intro' => $intro,
-        'r_datetime_intro' => db_now(),

webapp/lib/db/diary.php

@@ -747 +747 @@
- */
-function db_diary_insert_c_diary($c_member_id, $subject, $body, $public_flag)
-{
+    //function cacheの削除
+    pne_cache_drop('db_diary_get_c_diary_list4c_member_id', $c_member_id, 5);
+
-    $data = array(
-        'c_member_id' => intval($c_member_id),
-        'subject' => $subject,
@@ -765 +768 @@
-function db_diary_update_c_diary($c_diary_id, $subject, $body, $public_flag,
-    $image_filename_1 = '', $image_filename_2 = '', $image_filename_3 = '')
-{
+    //function cacheの削除
+    $c_diary = db_diary_get_c_diary4id($c_diary_id);
+    pne_cache_drop('db_diary_get_c_diary_list4c_member_id', $c_diary['c_member_id'], 5);
+
-    $data = array(
-        'subject' => $subject,
-        'body' => $body,
@@ -788 +795 @@
- */
-function db_diary_delete_c_diary($c_diary_id)
-{
-// 画像
+ //function cacheの削除
-    $c_diary = db_diary_get_c_diary4id($c_diary_id);
+    pne_cache_drop('db_diary_get_c_diary_list4c_member_id', $c_diary['c_member_id'], 5);
+
+   // 画像
-    image_data_delete($c_diary['image_filename_1']);
-    image_data_delete($c_diary['image_filename_2']);
-    image_data_delete($c_diary['image_filename_3']);
@@ -862 +872 @@
- */
-function db_diary_insert_c_diary_comment($c_member_id, $c_diary_id, $body)
-{
+    //function cache削除
+    pne_cache_drop('p_h_home_c_diary_my_comment_list4c_member_id', $c_member_id, 5);
+
-    $data = array(
-        'c_member_id' => intval($c_member_id),
-        'c_diary_id' => intval($c_diary_id),

webapp/lib/db/etc.php

@@ -259 +259 @@
- */
-function db_common_delete_c_member($c_member_id)
-{
+    //function cache削除
+    cache_drop_c_member($c_member_id);
+
-    //// --- 双方向パターン
-    $double = array(intval($c_member_id), intval($c_member_id));
-
@@ -424 +427 @@
- */
-function db_common_delete_c_commu($c_commu_id)
-{
+    //function cacheの削除
+    pne_cache_drop('p_c_home_c_commu4c_commu_id', $c_commu_id);
+
-    $single = array(intval($c_commu_id));
-
-    $sql = 'SELECT * FROM c_commu WHERE c_commu_id = ?';

webapp/lib/db/commu.php

@@ -1879 +1879 @@
-    $image_filename = '', $is_send_join_mail = 1,
-    $is_display_map = null, $map_latitude = null, $map_longitude = null, $map_zoom = null)
-{
+    //function cacheの削除
+    cache_drop_c_commu($c_commu_id);
+
-    $data = array(
-        'name' => $name,
-        'info' => $info,
@@ -1905 +1908 @@
- */
-function db_commu_update_c_commu_image_filename($c_commu_id, $image_filename)
-{
+    //function cacheの削除
+    cache_drop_c_commu($c_commu_id);
+
-    $data = array('image_filename' => $image_filename);
-    $where = array('c_commu_id' => intval($c_commu_id));
-    return db_update('c_commu', $data, $where);
@@ -1915 +1921 @@
- */
-function db_commu_delete_c_commu_image_filename($c_commu_id)
-{
+    //function cacheの削除
+    cache_drop_c_commu($c_commu_id);
+
-    $data = array('image_filename' => '');
-    $where = array('c_commu_id' => intval($c_commu_id));
-    return db_update('c_commu', $data, $where);
@@ -2032 +2041 @@
- */
-function db_commu_delete_c_commu_topic($c_commu_topic_id)
-{
+    //function cacheの削除
+    cache_drop_c_commu_topic($c_commu_topic_id);
+
-    // c_commu_topic_comment(画像)
-    $sql = 'SELECT image_filename1, image_filename2, image_filename3' .
-            ' FROM c_commu_topic_comment WHERE c_commu_topic_id = ?';
@@ -2106 +2118 @@
-}
-
-/**
-
+(メールからの投稿)
- */
-function db_commu_update_c_commu_topic_comment_image($c_commu_topic_comment_id, $image_filename, $image_num)
-{
@@ -2193 +2205 @@
-
-function db_commu_insert_c_commu_topic($topic)
-{
+    //function cacheの削除
+    cache_drop_c_commu_topic($topic['c_commu_id']);
+
-    $data = array(
-        'c_commu_id'  => intval($topic['c_commu_id']),
-        'c_member_id' => intval($topic['c_member_id']),
@@ -2283 +2298 @@
- */
-function db_commu_join_c_commu($c_commu_id, $c_member_id)
-{
+    //function cache削除
+    cache_drop_c_commu($c_commu_id);
+    cache_drop_c_commu_list4c_member_id($c_member_id);
+
-    $data = array(
-        'c_commu_id'  => intval($c_commu_id),
-        'c_member_id' => intval($c_member_id),
@@ -2296 +2315 @@
- */
-function db_commu_delete_c_commu_member($c_commu_id, $c_member_id)
-{
+    //function cache削除
+    cache_drop_c_commu($c_commu_id);
+    cache_drop_c_commu_list4c_member_id($c_member_id);
+
-    $sql = 'DELETE FROM c_commu_review' .
-           ' WHERE c_commu_id = ? AND c_member_id = ?';
-    $params = array(intval($c_commu_id), intval($c_member_id));

webapp/lib/db/message.php

@@ -180 +180 @@
- */
-function db_message_c_message_trash_list4c_member_id4range($c_member_id, $page, $page_size)
-{
-
-
+
-            " AND is_deleted_from = 1" .
-
-
-
+
+
+
+
+
+
+
+
+
-            " AND is_deleted_to = 1" .
-
-
+
-
-
-
-
+
+
+
+
-
-
-
+
-
+    foreach ($c_message_list as $key => $row) {
+       $c_message_id[$key] = intval($row['c_message_id']);
+    }
+    array_multisort($c_message_id, SORT_DESC, $c_message_list);
+    $c_message_list = array_slice($c_message_list, ($page_size * ($page - 1) + 1), $page_size);
+
+    $total_num = $c_message_num_from + $c_message_num_to;
+
-    if ($total_num != 0) {
-        $total_page_num =  ceil($total_num / $page_size);
-        if ($page >= $total_page_num) {

webapp/lib/db/deprecated_temporary2.php

@@ -544 +544 @@
-        return db_commu_insert_c_commu_topic_comment_2($c_member_id,$target_c_commu_topic_id,$body);
-}
-
-/*
-
-function db_commu_update_c_commu_topic_comment_images($c_commu_topic_comment_id, $image_filename1, $image_filename2, $image_filename3)
-{
-        return db_commu_update_c_commu_topic_comment_images($c_commu_topic_comment_id, $image_filename1, $image_filename2, $image_filename3);
-}
-
-*/
-
-function mail_update_c_commu_topic_comment_image($c_commu_topic_comment_id, $image_filename, $image_num)
-{
-        return db_commu_update_c_commu_topic_comment_image($c_commu_topic_comment_id, $image_filename, $image_num);
@@ -560 +552 @@
-
-function do_c_bbs_delete_c_commu_topic_comment($c_commu_topic_comment_id)
-{
-update_c_commu_topic
+delete_c_commu_topic_comment
-}
-
-function do_c_event_edit_update_c_commu_topic($c_commu_topic_id, $topic)
-{
-_comment
+
-}
-
-

webapp/lib/db/deprecated_temporary4.php

@@ -146 +146 @@
-
-function db_admin_c_image_list($page, $page_size, &$pager)
-{
-&
+
-}
-
-function c_tmp_image4filename($filename)

webapp/lib/util.inc.php

@@ -12 +12 @@
-require_once dirname(__FILE__) . '/util/api.php';
-require_once dirname(__FILE__) . '/util/message.php';
-require_once dirname(__FILE__) . '/util/emoji.php';
+require_once dirname(__FILE__) . '/util/cache.php';
-
-?>

webapp/lib/util/util.php

@@ -396 +396 @@
-
-//---
-
-function &get_cache_lite_function()
-{
-    static $instance;
-    if (empty($instance)) {
-        include_once 'Cache/Lite/Function.php';
-        $options = array(
-            'cacheDir' => OPENPNE_VAR_DIR . '/function_cache/',
-            'hashedDirectoryLevel' => 2,
-            'hashedDirectoryUmask' => 0777,
-        );
-        $instance = new Cache_Lite_Function($options);
-    }
-    return $instance;
-}
-
-/**
- * call function cache
- */
-function pne_cache_call()
-{
-    $arg_list = func_get_args();
-    $lifetime = array_shift($arg_list);
-
-    if (OPENPNE_USE_FUNCTION_CACHE) {
-        $cache =& get_cache_lite_function();
-        $cache->setOption('lifetime', intval($lifetime));
-        return call_user_func_array(array(&$cache, 'call'), $arg_list);
-    } else {
-        $function = array_shift($arg_list);
-        return call_user_func_array($function, $arg_list);
-    }
-}
-
-/**
- * drop function cache
- */
-function pne_cache_drop()
-{
-    $arg_list = func_get_args();
-
-    if (OPENPNE_USE_FUNCITON_CACHE) {
-        $cache =& get_cache_lite_funcion();
-        return call_user_func_array(array(&$cache, 'drop'), $arg_list);
-    } else {
-        return true;
-    }
-}
-
-//---
-
-/**
- * Check c_diary.public_flag
- * 
- * @param int $c_diary_id

webapp/lib/util/cache.php

@@ +1 @@
+<?php
+/**
+ * @copyright 2005-2006 OpenPNE Project
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ */
+
+function &get_cache_lite_function()
+{
+    static $instance;
+    if (empty($instance)) {
+        include_once 'Cache/Lite/Function.php';
+        $options = array(
+            'cacheDir' => OPENPNE_VAR_DIR . '/function_cache/',
+            'hashedDirectoryLevel' => 2,
+            'hashedDirectoryUmask' => 0777,
+        );
+        $instance = new Cache_Lite_Function($options);
+    }
+    return $instance;
+}
+
+/**
+ * call function cache
+ */
+function pne_cache_call()
+{
+    $arg_list = func_get_args();
+    $lifetime = array_shift($arg_list);
+
+    if (OPENPNE_USE_FUNCTION_CACHE) {
+        $cache =& get_cache_lite_function();
+        $cache->setOption('lifetime', intval($lifetime));
+        return call_user_func_array(array(&$cache, 'call'), $arg_list);
+    } else {
+        $function = array_shift($arg_list);
+        return call_user_func_array($function, $arg_list);
+    }
+}
+
+/**
+ * drop function cache
+ */
+function pne_cache_drop()
+{
+    $arg_list = func_get_args();
+
+    if (OPENPNE_USE_FUNCITON_CACHE) {
+        $cache =& get_cache_lite_function();
+        return call_user_func_array(array(&$cache, 'drop'), $arg_list);
+    } else {
+        return true;
+    }
+}
+
+//---
+
+/**
+ * メンバー情報取得関連のfunction cacheを削除する
+ */
+function cache_drop_c_member($c_member_id)
+{
+    pne_cache_drop('p_f_home_c_friend_list4c_member_id', $c_member_id, 9);
+    pne_cache_drop('p_h_home_c_diary_friend_list4c_member_id', $c_member_id, 5);
+
+    include_once 'Calendar/Week.php';
+
+    $Week = new Calendar_Week(date('Y'), date('m'), date('d'), 0);
+    $Week->build();
+    while ($Day = $Week->fetch()) {
+        $m = $Day->thisMonth();
+        $d = $Day->thisDay();
+        pne_cache_drop('p_h_home_birth4c_member_id', $m, $d, $c_member_id);
+    }
+}
+
+
+/**
+ * コミュニティ情報取得関連のfunction cacheを削除する
+ */
+function cache_drop_c_commu($c_commu_id)
+{
+    pne_cache_drop('p_c_home_c_commu_member_list4c_commu_id', $c_commu_id, 9);
+    pne_cache_drop('p_c_home_c_commu4c_commu_id', $c_commu_id);
+
+    $c_commu_topic_list = p_c_home_new_topic_comment4c_commu_id($c_commu_id, 7);
+    $c_commu_event_list = p_c_home_new_topic_comment4c_commu_id($c_commu_id, 7, 1);
+    $c_commu_bbs_list = array_merge($c_commu_topic_list, $c_commu_event_list);
+
+    foreach ($c_commu_bbs_list as $c_commu_topic_id)
+    {
+        cache_drop_c_commu_topic($c_commu_topic_id);
+    }
+}
+
+/**
+ * コミュニティトピック情報取得関連のfunction cacheを削除する
+ */
+function cache_drop_c_commu_topic($c_commu_topic_id)
+{
+    pne_cache_drop('p_c_home_new_topic_comment4c_commu_id', $c_commu_topic_id, 7);
+    pne_cache_drop('p_c_home_new_topic_comment4c_commu_id', $c_commu_topic_id, 7, 1);
+}
+
+/**
+ * c_memberに関連したコミュニティ情報取得関連のfunction cacheを削除する
+ */
+function cache_drop_c_commu_list4c_member_id($c_member_id)
+{
+    pne_cache_drop('p_h_home_c_commu_list4c_member_id', $c_member_id, 9);
+    pne_cache_drop('p_f_home_c_commu_list4c_member_id', $c_member_id, 9);
+}
+
+?>

webapp/modules/pc/page/h_home.php

@@ -15 +15 @@
-    {
-        $u = $GLOBALS['AUTH']->uid();
-
-
+
+
-
-        /// infomation ///
-
@@ -48 +49 @@
-        /// 左側 ///
-
-        // メンバ情報
-
+
+
-        // フレンドリスト
-
+
+
-        $this->set('c_friend_count', db_friend_count_friends($u));
-        // 参加コミュニティ
-
+
+
-        $this->set('fh_com_count_user', p_common_count_c_commu4c_member_id($u));
-
-        /// 最新情報 ///
-
-        // フレンド最新日記
-
+
+
-        // フレンド最新blog
-        $this->set('c_rss_cache_list', p_h_diary_list_friend_c_rss_cache_list($u, 5));
-        // 日記コメント記入履歴
-
+
+
-        // 参加コミュニティの新着書き込み
-        $this->set('c_commu_topic_comment_list', p_h_home_c_commu_topic_comment_list4c_member_id($u, 5));
-        // レビュー
@@ -72 +78 @@
-        /// 自分の情報 ///
-
-        // 日記
-
+
+
-        // 外部blog
-        $this->set('c_blog_list', p_h_home_h_blog_list_friend4c_member_id($u, 5, 1));
-        // レビュー
@@ -81 +88 @@
-        /// その他 ///
-
-        // 紹介文
-
+
+
-
-        // 今日の日付、曜日
-        $this->set('r_datetime', date('m/d'));
@@ -105 +113 @@
-            $this->set('bookmark_blog_list', db_bookmark_blog_list($u, 5));
-
-            //お気に入りのメンバ
-
+
+
-            $this->set('bookmark_count', db_bookmark_count($u));
-        }
-
@@ -133 +142 @@
-            $y = $Day->thisYear();
-            $m = $Day->thisMonth();
-            $d = $Day->thisDay();
+            $birth = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_birth4c_member_id', $m, $d, $u);
-            $item = array(
-                'year'=> $y,
-                'month'=>$m,
-                'day' => $d,
-                'dayofweek'=>$dayofweek[$i++],
-                'now' => false,
-p_h_home_birth4c_member_id($m, $d, $u)
+$birth
-                'event' => p_h_home_event4c_member_id($y, $m, $d, $u),
-                'schedule' => p_h_calendar_c_schedule_list4date($y, $m, $d, $u),
-            );

webapp/modules/pc/page/c_home.php

@@ -11 +11 @@
-        $u = $GLOBALS['AUTH']->uid();
-        $c_commu_id = $requests['target_c_commu_id'];
-
-_c_home_c_commu4c_commu_id(
+ne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_c_home_c_commu4c_commu_id', 
-        //コミュニティの存在の有無
-        if (!$c_commu) {
-            openpne_redirect('pc', 'page_h_err_c_home');
-        }
-
-
+
+
-
-        $this->set('c_commu', $c_commu);
-
@@ -29 +30 @@
-        $this->set('is_receive_message', db_commu_is_receive_message($c_commu_id, $u));
-
-        //コミュニティメンバー
-
+
+
-
-        //非公開コミュニティに管理者から招待されたかどうか
-        $this->set('admin_invite', db_c_commu4c_admin_invite_id($c_commu_id, $u));
-
-        //参加コミュニティの新着トピック書き込み
-
+
+
-        //参加コミュニティの新着イベント書き込み
-
+
+
-        //参加コミュニティの新着おすすめレビュー
-        $this->set('new_commu_review', p_c_home_new_commu_review4c_commu_id($c_commu_id, 7));
-

webapp/modules/pc/page/f_home.php

@@ -33 +33 @@
-        db_ashiato_insert_c_ashiato($target_c_member_id, $u);
-
-        $this->set('is_h_prof', 0);
-
+
+
-
-        $is_friend = db_friend_is_friend($u, $target_c_member_id);
-        if ($is_friend) {
-db_common_c_member_with_profile(
+pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member_with_profile', 
-            // 自分が書いた紹介文
-            $this->set('my_friend_intro', p_f_home_c_friend_intro($u, $target_c_member_id));
-        } else {
-db_common_c_member_with_profile(
+pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member_with_profile', 
-            // 友達の友達
-            $this->set('friend_path', p_f_home_friend_path4c_member_ids($u, $target_c_member_id));
-        }
-
-        $this->set('is_friend', $is_friend);
-
-
+
+
+
+
-
-        // --- f_home, h_prof 共通処理
-
@@ -61 +64 @@
-
-        $this->set('c_rss_cache_list', p_f_home_c_rss_cache_list4c_member_id($target_c_member_id, 5));
-
-
-
+
+
+
+
-        $this->set('c_friend_count', db_friend_count_friends($target_c_member_id));
-        $this->set('user_count', p_common_count_c_commu4c_member_id($target_c_member_id));
-
+
+
-        $this->set('c_review_list', db_review_c_review_list4member($target_c_member_id, 5));
-
-
+
+
-
-        // 誕生日まであと何日？
-        $this->set('days_birthday', db_common_count_days_birthday4c_member_id($target_c_member_id));

webapp/modules/pc/templates/h_config_image.tpl

@@ -134 +134 @@
-<img src="./skin/dummy.gif" class="v_spacer_l">
-
-<input type="submit" class="submit" name="submit" value="写真をアップロードする">
-
+
-</td>
-<td style="width:1em;" align="right" valign="top">・</td>
-<td style="width:auto;" align="left" valign="top">

webapp/modules/admin/do/update_c_navi.php

@@ -13 +13 @@
-            $requests['sort_order'],
-            $requests['url'],
-            $requests['caption']);
+
+        pne_cache_drop('fetch_inc_navi', $requests['navi_type']);
+
-        admin_client_redirect('edit_c_navi', '変更しました');
-    }
-}

webapp/init.inc

@@ -121 +121 @@
-
-ini_set('arg_separator.output', '&');
-
+// ファンクションキャッシュ有効期限用定数
+define('OPENPNE_FUNCTION_CACHE_LIFETIME_SHORT' , 1200);
+define('OPENPNE_FUNCTION_CACHE_LIFETIME_LONG' , 3600);
+
+
-?>