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

ChangeLog_develop: OpenPNE_2_5_0_to_2_5_1.patch

File OpenPNE_2_5_0_to_2_5_1.patch, 46.0 KB (added by takanashi, 11 years ago)
  • webapp_biz/modules/biz/do/fh_biz_schedule_edit.php

     
    122122            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']);
    123123            $schedule_id = $requests['schedule_id'];
    124124        } else {
    125             $schedule_id = $requests['schedule_id'];
    126             biz_deleteSchedule($schedule_id);
    127 
    128125            //終了日の決定
    129             $finish_date = date("Y-m-d", strtotime($requests['sc_b_year'].'-'.$requests['sc_b_month'].'-'.($requests['sc_b_date']+($requests['sc_rcount'])*7)));
    130 
     126            $finish_date = date("Y-m-d", strtotime($begindate . ' +' . (7 * $requests['sc_rcount']) . 'days'));
    131127            //繰り返しルールの決定
    132128            foreach ($requests['sc_rwk'] as $value) {
    133129                $rp_rule += 1 << $value;
    134130            }
    135131
    136132            //繰り返し予定
    137             $tmp = $begin_date;  //処理中の日付
     133            $tmp = strtotime($begin_date);  //処理中の日付
    138134
    139135            if ($requests['iskeep']) {
    140136                //繰り返し予定グループの維持(同予定から派生した繰り返し予定を一斉に編集)
     
    146142
    147143            $first_id = biz_getScheduleMax() + 1;  //登録される予定のプライマリキー
    148144
    149             for ($i = 0; date("Ymd", strtotime($tmp)) < date("Ymd", strtotime($finish_date)); $i++) {
     145            for ($i = 0; $tmp < strtotime($finish_date); $i++) {
    150146                //終了日に達するまで新規予定追加を繰り返す
    151                 $nowday = strtotime($requests['sc_b_year'].'-'.$requests['sc_b_month'].'-'.($requests['sc_b_date']+$i));
    152                 $tmp = date("Ymd", $nowday);
    153 
     147                $nowday = strtotime($begin_date . ' +'.$i.'days');
     148                $tmp = $nowday;
     149               
    154150                if ($rp_rule & (1 << date("w", $nowday))) {
    155                     biz_insertSchedule($requests['sc_title'], $u, $tmp, $tmp, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, $first_id, $requests['sc_j_mem']);
     151                    biz_insertSchedule($requests['sc_title'], $u, 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']);
    156152                }
    157153            }
    158154
     
    160156        }
    161157        $week = date("W", abs(strtotime($begin_date) - strtotime(date("Y-m-d")))) - 1;
    162158
    163         $p = array('w' => $week, 'msg' => '予定を編集しました。', 'id' => $schedule_id);
     159        if (in_array($u,$requests['sc_j_mem'])) {
     160            $target_id = $u;
     161        } else {
     162            $target_id = $requests['sc_j_mem'][0];
     163        }
     164        $p = array('w' => $week, 'msg' => '予定を編集しました。',
     165                   'id' => $schedule_id, 'target_id'  => $target_id);
    164166        openpne_redirect('biz', 'page_fh_biz_schedule_view', $p);
    165167    }
    166168}
  • webapp_biz/modules/biz/validate/do/fh_biz_schedule_edit.ini

     
    1 [sc_b_year]
    2 type = "int"
    3 required = 0
    4 caption = "開始年"
    5 
    6 [sc_b_month]
    7 type = "string"
    8 required = 0
    9 caption = "開始月"
    10 
    11 [sc_b_date]
    12 type = "string"
    13 required = 0
    14 caption = "開始日"
    15 
    16 [sc_b_hour]
    17 type = "string"
    18 required = 0
    19 caption = "開始時"
    20 
    21 [sc_b_minute]
    22 type = "string"
    23 required = 0
    24 caption = "開始分"
    25 
    26 [sc_f_year]
    27 type = "string"
    28 required = 0
    29 caption = "終了年"
    30 
    31 [sc_f_month]
    32 type = "string"
    33 required = 0
    34 caption = "終了月"
    35 
    36 [sc_f_date]
    37 type = "string"
    38 required = 0
    39 caption = "終了日"
    40 
    41 [sc_f_hour]
    42 type = "string"
    43 required = 0
    44 caption = "終了時"
    45 
    46 [sc_f_minute]
    47 type = "string"
    48 required = 0
    49 caption = "終了分"
    50 
    51 [sc_rp]
    52 type= "string"
    53 required = 0
    54 capiton = "繰り返しタイプ"
    55 
    56 [sc_title]
    57 type= "string"
    58 required = 0
    59 capiton = "タイトル"
    60 
    61 [sc_memo]
    62 type= "string"
    63 required = 0
    64 capiton = "メモ"
    65 
    66 [sc_j_mem]
    67 type= "string"
    68 is_array = 1
    69 required = 0
    70 capiton = "メンバー"
    71 
    72 [sc_j_plc]
    73 type= "string"
    74 is_array = 1
    75 required = 0
    76 capiton = "施設"
    77 
    78 [sc_rwk]
    79 type= "string"
    80 is_array = 1
    81 required = 0
    82 capiton = "曜日"
    83 
    84 [sc_rcount]
    85 type= "string"
    86 required = 0
    87 capiton = "繰り返し回数"
    88 
    89 [sc_bn]
    90 type="string"
    91 required = 0
    92 caption = 'バナー予定かどうか'
    93 
    94 [schedule_id]
    95 type="int"
    96 required=1
    97 
    98 [iskeep]
    99 type="int"
    100 default=1
     1[sc_b_year]
     2type = "int"
     3required = 0
     4caption = "開始年"
     5
     6[sc_b_month]
     7type = "string"
     8required = 0
     9caption = "開始月"
     10
     11[sc_b_date]
     12type = "string"
     13required = 0
     14caption = "開始日"
     15
     16[sc_b_hour]
     17type = "string"
     18required = 0
     19caption = "開始時"
     20
     21[sc_b_minute]
     22type = "string"
     23required = 0
     24caption = "開始分"
     25
     26[sc_f_year]
     27type = "string"
     28required = 0
     29caption = "終了年"
     30
     31[sc_f_month]
     32type = "string"
     33required = 0
     34caption = "終了月"
     35
     36[sc_f_date]
     37type = "string"
     38required = 0
     39caption = "終了日"
     40
     41[sc_f_hour]
     42type = "string"
     43required = 0
     44caption = "終了時"
     45
     46[sc_f_minute]
     47type = "string"
     48required = 0
     49caption = "終了分"
     50
     51[sc_rp]
     52type= "string"
     53required = 0
     54capiton = "繰り返しタイプ"
     55
     56[sc_title]
     57type= "string"
     58required = 0
     59capiton = "タイトル"
     60
     61[sc_memo]
     62type= "string"
     63required = 0
     64capiton = "メモ"
     65
     66[sc_j_mem]
     67type= "string"
     68is_array = 1
     69required = 0
     70capiton = "メンバー"
     71
     72[sc_j_plc]
     73type= "string"
     74is_array = 1
     75required = 0
     76capiton = "施設"
     77
     78[sc_rwk]
     79type= "string"
     80is_array = 1
     81required = 0
     82capiton = "曜日"
     83
     84[sc_rcount]
     85type= "string"
     86required = 0
     87capiton = "繰り返し回数"
     88
     89[sc_bn]
     90type="string"
     91required = 0
     92caption = 'バナー予定かどうか'
     93
     94[schedule_id]
     95type="int"
     96required=1
     97
     98[iskeep]
     99type="int"
     100default=1
     101
     102[target_id]
     103type="int"
  • webapp_biz/modules/biz/page/fh_biz_schedule_view.php

     
    6262            }
    6363        }
    6464
    65         $list += array('rep_type_loc' => $tmp);
    66         $list += array('writer_name' => biz_getMemberNickname($list['c_member_id']));
    67 
     65        $list['rep_type_loc'] = $tmp;
     66        $list['writer_name'] = biz_getMemberNickname($list['c_member_id']);
    6867        $list['begin_time'] = substr($list['begin_time'], 0, 5);
    6968        $list['finish_time'] = substr($list['finish_time'], 0, 5);
    7069
    7170        $jmembers = biz_getJoinMemberSchedule($requests['id']);
    7271        if (array_search($target_member['nickname'], $jmembers)) {
    7372            $jmembers[$target_member['c_member_id']] = $target_member['nickname'];
    74             $jmembers = array_unique($jmembers);
    7573        }
    7674        $jshisetsu = biz_getJoinShisetsuSchedule($requests['id']);
    7775
     
    9088            $repeat_finish = biz_getRepeatFinish($requests['id']);
    9189            $repeat_term = strtotime($repeat_finish) - strtotime($repeat_begin);
    9290
    93             $daycount = $repeat_term / (24 * 60 * 60) / 7;
    94 
     91            $daycount = ceil($repeat_term / (24 * 60 * 60) / 7);
     92            if ($repeat_finish == $repeat_begin) {
     93                $daycount = 1;
     94            }
    9595            $this->set('repeat_begin_date', $repeat_begin);
    9696            $this->set('repeat_term', intval($daycount));
    9797        }
  • webapp_biz/modules/biz/templates/fh_biz_schedule_edit.tpl

     
    323323
    324324<div style="padding:4px 3px;">
    325325
    326 <input type='submit' name='entry' value='登録する'>
     326<input type='submit' class="submit" name='entry' value='登録する'>
    327327
    328328</div>
    329329
  • webapp_biz/modules/biz/templates/h_biz_schedule_edit.tpl

     
    321321
    322322<div style="padding:4px 3px;">
    323323
    324 <input type='submit' name='entry' value='登録する'>
     324<input type='submit' class="submit" name='entry' value='登録する'>
    325325
    326326</div>
    327327
  • webapp_biz/modules/biz/templates/inc_biz_new_schedule.tpl

     
    2424({foreach key=i item=value from=$newlist})
    2525<tr>
    2626<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>
    27 <td class="bg_02 border_01 padding_ss" style="width:168px;border-top:none;"><a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$value.biz_schedule_id})">({$value.title})</a></td>
     27<td class="bg_02 border_01 padding_ss" style="width:168px;border-top:none;"><a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$value.biz_schedule_id})&amp;target_id=({$target_id})">({$value.title})</a></td>
    2828</tr>
    2929({****})
    3030({/foreach})
  • webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl

     
    222222({/if})
    223223({ext_include file="inc_biz_schedule_week_time.tpl"})
    224224<div class="padding_s" style="padding-top:0;">
    225 <a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$item_schedule.biz_schedule_id})">({$item_schedule.title})</a>
    226 </div>
     225<a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$item_schedule.biz_schedule_id})({if $cmd=='f'})&amp;target_id=({$member_info.c_member_id})({/if})">({$item_schedule.title})</a>
     226 </div>
    227227        ({else})
    228228({assign var="begin_time_H" value=$item_schedule.begin_time|date_format:"%H"})
    229229({assign var="begin_time_M" value=$item_schedule.begin_time|date_format:"%M"})
     
    233233({/if})
    234234({ext_include file="inc_biz_schedule_week_time.tpl"})
    235235<div class="padding_s" style="padding-top:0;">
    236 <a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$item_schedule.biz_schedule_id})">({$item_schedule.title})</a>
     236<a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$item_schedule.biz_schedule_id})({if $cmd=='f'})&amp;target_id=({$member_info.c_member_id})({/if})">({$item_schedule.title})</a>
    237237</div>
    238238        ({/if})
    239239({/foreach})
  • webapp_biz/modules/biz/templates/fh_biz_schedule_view.tpl

     
    290290<td class="padding_ss" align="left">
    291291
    292292({t_form _method=get m=pc a=page_h_home})
    293 <input value="マイページに戻る" type="submit" class="submit">
     293<input value="マイホームに戻る" type="submit" class="submit">
    294294</form>
    295295
    296296</td>
     
    338338<td class="padding_ss" align="right">
    339339
    340340({t_form m=biz a=page_fh_biz_schedule_add})
    341 <input value="続けて新規の予定登録をする" type="submit" class="submit">
     341<input value="新規の予定登録をする" type="submit" class="submit">
    342342</form>
    343343
    344344</td>
     
    346346
    347347({t_form m=biz a=page_s_list})
    348348<input type="hidden" name="w" value="({$w})">
    349 <input value="続けて施設予約をする" type="submit" class="submit">
     349<input value="施設予約をする" type="submit" class="submit">
    350350</form>
    351351
    352352</td>
    353353<td class="padding_ss" align="left">
    354354
    355355({t_form _method=get m=pc a=page_h_home})
    356 <input value="マイページに戻る" type="submit" class="submit">
     356<input value="マイホームに戻る" type="submit" class="submit">
    357357</form>
    358358
    359359</td>
  • webapp/lib/db/bookmark.php

     
    179179 */
    180180function db_bookmark_insert_c_bookmark($c_member_id_from, $c_member_id_to)
    181181{
     182    //function cacheの削除
     183    pne_cache_drop('db_bookmark_member_list', $c_member_id_from, 9);
     184
    182185    $data = array(
    183186        'c_member_id_from' => intval($c_member_id_from),
    184187        'c_member_id_to' => intval($c_member_id_to),
     
    192195 */
    193196function db_bookmark_delete_c_bookmark($c_member_id_from, $c_member_id_to)
    194197{
     198    //function cacheの削除
     199    pne_cache_drop('db_bookmark_member_list', $c_member_id_from, 9);
     200
    195201    $sql = 'DELETE FROM c_bookmark' .
    196202            ' WHERE c_member_id_from = ? AND c_member_id_to = ?';
    197203    $params = array(intval($c_member_id_from), intval($c_member_id_to));
  • webapp/lib/db/member.php

     
    784784 */
    785785function db_member_config_prof_new($c_member_id, $prof_list)
    786786{
     787    //function cacheの削除
     788    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
     789    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
     790    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
     791
    787792    $data = array(
    788793        'nickname' => $prof_list['nickname'],
    789794        'birth_year'  => intval($prof_list['birth_year']),
     
    812817 */
    813818function db_member_config_image_new($c_member_id, $image_filename, $img_num)
    814819{
     820    //function cacheの削除
     821    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
     822    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
     823    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
     824
    815825    $data = array('image_filename_'.intval($img_num) => $image_filename);
    816826    $where = array('c_member_id' => intval($c_member_id));
    817827    return db_update('c_member', $data, $where);
     
    822832 */
    823833function db_member_delete_c_member_image_new($c_member_id, $img_num)
    824834{
     835    //function cacheの削除
     836    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
     837    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
     838    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
     839
    825840    $sql = 'UPDATE c_member SET';
    826841    if ($img_num == 1) {
    827842        $sql .= ' image_filename_1 = image_filename_2,';
     
    840855 */
    841856function db_member_change_c_member_main_image($c_member_id, $img_num)
    842857{
     858    //function cacheの削除
     859    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
     860    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
     861    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
     862
    843863    $sql = 'UPDATE c_member SET image_filename = image_filename_'.intval($img_num).
    844864        ' WHERE c_member_id = ?';
    845865    $params = array(intval($c_member_id));
     
    851871 */
    852872function db_member_update_c_member_image($c_member_id, $image_filename, $img_num)
    853873{
     874    //function cacheの削除
     875    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
     876    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
     877    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
     878
    854879    $data = array(
    855880        'image_filename' => $image_filename,
    856881        'image_filename_'.intval($img_num) => $image_filename,
     
    878903    );
    879904    $c_member_id = db_insert('c_member', $data);
    880905
     906    //function cacheの削除
     907    pne_cache_drop('db_common_c_member4c_member_id', $c_member_id);
     908    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'friend');
     909    pne_cache_drop('db_common_c_member_with_profile', $c_member_id, 'public');
     910
    881911    $data = array(
    882912        'c_member_id' => intval($c_member_id),
    883913        'hashed_password' => md5($c_member_secure['password']),
     
    11891219
    11901220function db_member_update_c_member_profile($c_member_id, $c_member_profile_list)
    11911221{
     1222    //function cache削除
     1223    pne_cache_drop('db_common_c_profile_list');
     1224
    11921225    foreach ($c_member_profile_list as $item) {
    11931226        $sql = 'DELETE FROM c_member_profile' .
    11941227                ' WHERE c_member_id = ? AND c_profile_id = ?';
     
    12091242
    12101243function db_member_insert_c_member_profile($c_member_id, $c_profile_id, $c_profile_option_id, $value, $public_flag)
    12111244{
     1245    //function cache削除
     1246    pne_cache_drop('db_common_c_profile_list');
     1247
    12121248    $data = array(
    12131249        'c_member_id' => intval($c_member_id),
    12141250        'c_profile_id' => intval($c_profile_id),
  • webapp/lib/db/friend.php

     
    593593 */
    594594function db_friend_insert_c_friend($c_member_id_from, $c_member_id_to)
    595595{
     596    //function cache削除
     597    cache_drop_c_member($c_member_id_from);
     598    cache_drop_c_member($c_member_id_to);
     599
    596600    if (($c_member_id_from < 1) || ($c_member_id_to < 1))
    597601        return false;
    598602
     
    642646 */
    643647function db_friend_delete_c_friend($c_member_id_from, $c_member_id_to)
    644648{
     649    //function cache削除
     650    cache_drop_c_member($c_member_id_from);
     651    cache_drop_c_member($c_member_id_to);
     652
    645653    $sql = 'DELETE FROM c_friend' .
    646654            ' WHERE (c_member_id_from = ? AND c_member_id_to = ?)' .
    647655               ' OR (c_member_id_to = ? AND c_member_id_from = ?)';
     
    656664 */
    657665function db_friend_update_c_friend_intro($c_member_id_from, $c_member_id_to, $intro)
    658666{
     667    //function cacheを削除
     668    pne_cache_drop('p_h_home_c_friend_intro_list4c_member_id', $c_member_id_to, 5);
     669    pne_cache_drop('p_f_home_c_friend_comment4c_member_id', $c_member_id_to);
     670
    659671    $data = array(
    660672        'intro' => $intro,
    661673        'r_datetime_intro' => db_now(),
  • webapp/lib/db/diary.php

     
    747747 */
    748748function db_diary_insert_c_diary($c_member_id, $subject, $body, $public_flag)
    749749{
     750    //function cacheの削除
     751    pne_cache_drop('db_diary_get_c_diary_list4c_member_id', $c_member_id, 5);
     752
    750753    $data = array(
    751754        'c_member_id' => intval($c_member_id),
    752755        'subject' => $subject,
     
    765768function db_diary_update_c_diary($c_diary_id, $subject, $body, $public_flag,
    766769    $image_filename_1 = '', $image_filename_2 = '', $image_filename_3 = '')
    767770{
     771    //function cacheの削除
     772    $c_diary = db_diary_get_c_diary4id($c_diary_id);
     773    pne_cache_drop('db_diary_get_c_diary_list4c_member_id', $c_diary['c_member_id'], 5);
     774
    768775    $data = array(
    769776        'subject' => $subject,
    770777        'body' => $body,
     
    788795 */
    789796function db_diary_delete_c_diary($c_diary_id)
    790797{
    791     // 画像
     798     //function cacheの削除
    792799    $c_diary = db_diary_get_c_diary4id($c_diary_id);
     800    pne_cache_drop('db_diary_get_c_diary_list4c_member_id', $c_diary['c_member_id'], 5);
     801
     802   // 画像
    793803    image_data_delete($c_diary['image_filename_1']);
    794804    image_data_delete($c_diary['image_filename_2']);
    795805    image_data_delete($c_diary['image_filename_3']);
     
    862872 */
    863873function db_diary_insert_c_diary_comment($c_member_id, $c_diary_id, $body)
    864874{
     875    //function cache削除
     876    pne_cache_drop('p_h_home_c_diary_my_comment_list4c_member_id', $c_member_id, 5);
     877
    865878    $data = array(
    866879        'c_member_id' => intval($c_member_id),
    867880        'c_diary_id' => intval($c_diary_id),
  • webapp/lib/db/etc.php

     
    259259 */
    260260function db_common_delete_c_member($c_member_id)
    261261{
     262    //function cache削除
     263    cache_drop_c_member($c_member_id);
     264
    262265    //// --- 双方向パターン
    263266    $double = array(intval($c_member_id), intval($c_member_id));
    264267
     
    424427 */
    425428function db_common_delete_c_commu($c_commu_id)
    426429{
     430    //function cacheの削除
     431    pne_cache_drop('p_c_home_c_commu4c_commu_id', $c_commu_id);
     432
    427433    $single = array(intval($c_commu_id));
    428434
    429435    $sql = 'SELECT * FROM c_commu WHERE c_commu_id = ?';
  • webapp/lib/db/commu.php

     
    18791879    $image_filename = '', $is_send_join_mail = 1,
    18801880    $is_display_map = null, $map_latitude = null, $map_longitude = null, $map_zoom = null)
    18811881{
     1882    //function cacheの削除
     1883    cache_drop_c_commu($c_commu_id);
     1884
    18821885    $data = array(
    18831886        'name' => $name,
    18841887        'info' => $info,
     
    19051908 */
    19061909function db_commu_update_c_commu_image_filename($c_commu_id, $image_filename)
    19071910{
     1911    //function cacheの削除
     1912    cache_drop_c_commu($c_commu_id);
     1913
    19081914    $data = array('image_filename' => $image_filename);
    19091915    $where = array('c_commu_id' => intval($c_commu_id));
    19101916    return db_update('c_commu', $data, $where);
     
    19151921 */
    19161922function db_commu_delete_c_commu_image_filename($c_commu_id)
    19171923{
     1924    //function cacheの削除
     1925    cache_drop_c_commu($c_commu_id);
     1926
    19181927    $data = array('image_filename' => '');
    19191928    $where = array('c_commu_id' => intval($c_commu_id));
    19201929    return db_update('c_commu', $data, $where);
     
    20322041 */
    20332042function db_commu_delete_c_commu_topic($c_commu_topic_id)
    20342043{
     2044    //function cacheの削除
     2045    cache_drop_c_commu_topic($c_commu_topic_id);
     2046
    20352047    // c_commu_topic_comment(画像)
    20362048    $sql = 'SELECT image_filename1, image_filename2, image_filename3' .
    20372049            ' FROM c_commu_topic_comment WHERE c_commu_topic_id = ?';
     
    21062118}
    21072119
    21082120/**
    2109  * 掲示板書き込みに画像を追加する
     2121 * 掲示板書き込みに画像を追加する(メールからの投稿)
    21102122 */
    21112123function db_commu_update_c_commu_topic_comment_image($c_commu_topic_comment_id, $image_filename, $image_num)
    21122124{
     
    21932205
    21942206function db_commu_insert_c_commu_topic($topic)
    21952207{
     2208    //function cacheの削除
     2209    cache_drop_c_commu_topic($topic['c_commu_id']);
     2210
    21962211    $data = array(
    21972212        'c_commu_id'  => intval($topic['c_commu_id']),
    21982213        'c_member_id' => intval($topic['c_member_id']),
     
    22832298 */
    22842299function db_commu_join_c_commu($c_commu_id, $c_member_id)
    22852300{
     2301    //function cache削除
     2302    cache_drop_c_commu($c_commu_id);
     2303    cache_drop_c_commu_list4c_member_id($c_member_id);
     2304
    22862305    $data = array(
    22872306        'c_commu_id'  => intval($c_commu_id),
    22882307        'c_member_id' => intval($c_member_id),
     
    22962315 */
    22972316function db_commu_delete_c_commu_member($c_commu_id, $c_member_id)
    22982317{
     2318    //function cache削除
     2319    cache_drop_c_commu($c_commu_id);
     2320    cache_drop_c_commu_list4c_member_id($c_member_id);
     2321
    22992322    $sql = 'DELETE FROM c_commu_review' .
    23002323           ' WHERE c_commu_id = ? AND c_member_id = ?';
    23012324    $params = array(intval($c_commu_id), intval($c_member_id));
  • webapp/lib/db/message.php

     
    180180 */
    181181function db_message_c_message_trash_list4c_member_id4range($c_member_id, $page, $page_size)
    182182{
    183     $where = "(" .
    184             "c_member_id_from = ?" .
     183    $where_from = "c_member_id_from = ?" .
    185184            " AND is_deleted_from = 1" .
    186             " AND is_kanzen_sakujo_from = 0" .
    187         ") OR (" .
    188             "c_member_id_to = ?" .
     185            " AND is_kanzen_sakujo_from = 0";
     186
     187    $sql = 'SELECT * FROM c_message WHERE '. $where_from . ' ORDER BY r_datetime DESC';
     188    $sql_num = 'SELECT COUNT(*) FROM c_message WHERE '. $where_from;
     189    $params = array(intval($c_member_id));
     190    $c_message_list_from = db_get_all_page($sql, 1, ($page_size * ($page + 1)), $params);
     191    $c_message_num_from = db_get_one($sql_num, $params);
     192
     193    $where_to = "c_member_id_to = ?" .
    189194            " AND is_deleted_to = 1" .
    190             " AND is_kanzen_sakujo_to = 0" .
    191         ")";
     195            " AND is_kanzen_sakujo_to = 0";
    192196
    193     $sql = 'SELECT * FROM c_message WHERE '. $where . ' ORDER BY r_datetime DESC';
    194     $params = array(intval($c_member_id), intval($c_member_id));
    195     $c_message_list = db_get_all_page($sql, $page, $page_size, $params);
     197    $sql = 'SELECT * FROM c_message WHERE '. $where_to . ' ORDER BY r_datetime DESC';
     198    $sql_num = 'SELECT COUNT(*) FROM c_message WHERE '. $where_to;
     199    $c_message_list_to = db_get_all_page($sql, 1, ($page_size * ($page + 1)), $params);
     200    $c_message_num_to = db_get_one($sql_num, $params);
    196201
    197     $sql = 'SELECT COUNT(*) FROM c_message WHERE ' . $where;
    198     $total_num = db_get_one($sql, $params);
     202    $c_message_list = array_merge($c_message_list_from, $c_message_list_to);
    199203
     204    foreach ($c_message_list as $key => $row) {
     205       $c_message_id[$key] = intval($row['c_message_id']);
     206    }
     207    array_multisort($c_message_id, SORT_DESC, $c_message_list);
     208    $c_message_list = array_slice($c_message_list, ($page_size * ($page - 1) + 1), $page_size);
     209
     210    $total_num = $c_message_num_from + $c_message_num_to;
     211
    200212    if ($total_num != 0) {
    201213        $total_page_num =  ceil($total_num / $page_size);
    202214        if ($page >= $total_page_num) {
  • webapp/lib/db/deprecated_temporary2.php

     
    544544        return db_commu_insert_c_commu_topic_comment_2($c_member_id,$target_c_commu_topic_id,$body);
    545545}
    546546
    547 /*
    548547
    549 function db_commu_update_c_commu_topic_comment_images($c_commu_topic_comment_id, $image_filename1, $image_filename2, $image_filename3)
    550 {
    551         return db_commu_update_c_commu_topic_comment_images($c_commu_topic_comment_id, $image_filename1, $image_filename2, $image_filename3);
    552 }
    553 
    554 */
    555 
    556548function mail_update_c_commu_topic_comment_image($c_commu_topic_comment_id, $image_filename, $image_num)
    557549{
    558550        return db_commu_update_c_commu_topic_comment_image($c_commu_topic_comment_id, $image_filename, $image_num);
     
    560552
    561553function do_c_bbs_delete_c_commu_topic_comment($c_commu_topic_comment_id)
    562554{
    563         return db_commu_update_c_commu_topic($c_commu_topic_comment_id);
     555        return db_commu_delete_c_commu_topic_comment($c_commu_topic_comment_id);
    564556}
    565557
    566558function do_c_event_edit_update_c_commu_topic($c_commu_topic_id, $topic)
    567559{
    568         return db_commu_update_c_commu_topic_comment($c_commu_topic_id, $topic);
     560        return db_commu_update_c_commu_topic($c_commu_topic_id, $topic);
    569561}
    570562
    571563
  • webapp/lib/db/deprecated_temporary4.php

     
    146146
    147147function db_admin_c_image_list($page, $page_size, &$pager)
    148148{
    149     return db_image_c_image_list($page, $page_size, &$pager);
     149    return db_image_c_image_list($page, $page_size, $pager);
    150150}
    151151
    152152function c_tmp_image4filename($filename)
  • webapp/lib/util.inc.php

     
    1212require_once dirname(__FILE__) . '/util/api.php';
    1313require_once dirname(__FILE__) . '/util/message.php';
    1414require_once dirname(__FILE__) . '/util/emoji.php';
     15require_once dirname(__FILE__) . '/util/cache.php';
    1516
    1617?>
  • webapp/lib/util/util.php

     
    396396
    397397//---
    398398
    399 function &get_cache_lite_function()
    400 {
    401     static $instance;
    402     if (empty($instance)) {
    403         include_once 'Cache/Lite/Function.php';
    404         $options = array(
    405             'cacheDir' => OPENPNE_VAR_DIR . '/function_cache/',
    406             'hashedDirectoryLevel' => 2,
    407             'hashedDirectoryUmask' => 0777,
    408         );
    409         $instance = new Cache_Lite_Function($options);
    410     }
    411     return $instance;
    412 }
    413 
    414399/**
    415  * call function cache
    416  */
    417 function pne_cache_call()
    418 {
    419     $arg_list = func_get_args();
    420     $lifetime = array_shift($arg_list);
    421 
    422     if (OPENPNE_USE_FUNCTION_CACHE) {
    423         $cache =& get_cache_lite_function();
    424         $cache->setOption('lifetime', intval($lifetime));
    425         return call_user_func_array(array(&$cache, 'call'), $arg_list);
    426     } else {
    427         $function = array_shift($arg_list);
    428         return call_user_func_array($function, $arg_list);
    429     }
    430 }
    431 
    432 /**
    433  * drop function cache
    434  */
    435 function pne_cache_drop()
    436 {
    437     $arg_list = func_get_args();
    438 
    439     if (OPENPNE_USE_FUNCITON_CACHE) {
    440         $cache =& get_cache_lite_funcion();
    441         return call_user_func_array(array(&$cache, 'drop'), $arg_list);
    442     } else {
    443         return true;
    444     }
    445 }
    446 
    447 //---
    448 
    449 /**
    450400 * Check c_diary.public_flag
    451401 *
    452402 * @param int $c_diary_id
  • webapp/lib/util/cache.php

     
     1<?php
     2/**
     3 * @copyright 2005-2006 OpenPNE Project
     4 * @license   http://www.php.net/license/3_01.txt PHP License 3.01
     5 */
     6
     7function &get_cache_lite_function()
     8{
     9    static $instance;
     10    if (empty($instance)) {
     11        include_once 'Cache/Lite/Function.php';
     12        $options = array(
     13            'cacheDir' => OPENPNE_VAR_DIR . '/function_cache/',
     14            'hashedDirectoryLevel' => 2,
     15            'hashedDirectoryUmask' => 0777,
     16        );
     17        $instance = new Cache_Lite_Function($options);
     18    }
     19    return $instance;
     20}
     21
     22/**
     23 * call function cache
     24 */
     25function pne_cache_call()
     26{
     27    $arg_list = func_get_args();
     28    $lifetime = array_shift($arg_list);
     29
     30    if (OPENPNE_USE_FUNCTION_CACHE) {
     31        $cache =& get_cache_lite_function();
     32        $cache->setOption('lifetime', intval($lifetime));
     33        return call_user_func_array(array(&$cache, 'call'), $arg_list);
     34    } else {
     35        $function = array_shift($arg_list);
     36        return call_user_func_array($function, $arg_list);
     37    }
     38}
     39
     40/**
     41 * drop function cache
     42 */
     43function pne_cache_drop()
     44{
     45    $arg_list = func_get_args();
     46
     47    if (OPENPNE_USE_FUNCITON_CACHE) {
     48        $cache =& get_cache_lite_function();
     49        return call_user_func_array(array(&$cache, 'drop'), $arg_list);
     50    } else {
     51        return true;
     52    }
     53}
     54
     55//---
     56
     57/**
     58 * メンバー情報取得関連のfunction cacheを削除する
     59 */
     60function cache_drop_c_member($c_member_id)
     61{
     62    pne_cache_drop('p_f_home_c_friend_list4c_member_id', $c_member_id, 9);
     63    pne_cache_drop('p_h_home_c_diary_friend_list4c_member_id', $c_member_id, 5);
     64
     65    include_once 'Calendar/Week.php';
     66
     67    $Week = new Calendar_Week(date('Y'), date('m'), date('d'), 0);
     68    $Week->build();
     69    while ($Day = $Week->fetch()) {
     70        $m = $Day->thisMonth();
     71        $d = $Day->thisDay();
     72        pne_cache_drop('p_h_home_birth4c_member_id', $m, $d, $c_member_id);
     73    }
     74}
     75
     76
     77/**
     78 * コミュニティ情報取得関連のfunction cacheを削除する
     79 */
     80function cache_drop_c_commu($c_commu_id)
     81{
     82    pne_cache_drop('p_c_home_c_commu_member_list4c_commu_id', $c_commu_id, 9);
     83    pne_cache_drop('p_c_home_c_commu4c_commu_id', $c_commu_id);
     84
     85    $c_commu_topic_list = p_c_home_new_topic_comment4c_commu_id($c_commu_id, 7);
     86    $c_commu_event_list = p_c_home_new_topic_comment4c_commu_id($c_commu_id, 7, 1);
     87    $c_commu_bbs_list = array_merge($c_commu_topic_list, $c_commu_event_list);
     88
     89    foreach ($c_commu_bbs_list as $c_commu_topic_id)
     90    {
     91        cache_drop_c_commu_topic($c_commu_topic_id);
     92    }
     93}
     94
     95/**
     96 * コミュニティトピック情報取得関連のfunction cacheを削除する
     97 */
     98function cache_drop_c_commu_topic($c_commu_topic_id)
     99{
     100    pne_cache_drop('p_c_home_new_topic_comment4c_commu_id', $c_commu_topic_id, 7);
     101    pne_cache_drop('p_c_home_new_topic_comment4c_commu_id', $c_commu_topic_id, 7, 1);
     102}
     103
     104/**
     105 * c_memberに関連したコミュニティ情報取得関連のfunction cacheを削除する
     106 */
     107function cache_drop_c_commu_list4c_member_id($c_member_id)
     108{
     109    pne_cache_drop('p_h_home_c_commu_list4c_member_id', $c_member_id, 9);
     110    pne_cache_drop('p_f_home_c_commu_list4c_member_id', $c_member_id, 9);
     111}
     112
     113?>
  • webapp/modules/pc/page/h_home.php

     
    1515    {
    1616        $u = $GLOBALS['AUTH']->uid();
    1717
    18         $this->set('inc_navi', fetch_inc_navi('h'));
     18        $inc_navi = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'fetch_inc_navi', 'h');
     19        $this->set('inc_navi', $inc_navi);
    1920
    2021        /// infomation ///
    2122
     
    4849        /// 左側 ///
    4950
    5051        // メンバ情報
    51         $this->set('c_member', db_common_c_member4c_member_id($u));
     52        $c_member = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member4c_member_id', $u);
     53        $this->set('c_member', $c_member);
    5254        // フレンドリスト
    53         $this->set('c_friend_list', p_f_home_c_friend_list4c_member_id($u, 9));
     55        $c_friend_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_f_home_c_friend_list4c_member_id', $u, 9);
     56        $this->set('c_friend_list', $c_friend_list);
    5457        $this->set('c_friend_count', db_friend_count_friends($u));
    5558        // 参加コミュニティ
    56         $this->set('c_commu_user_list', p_h_home_c_commu_list4c_member_id($u, 9));
     59        $c_commu_user_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_c_commu_list4c_member_id', $u, 9);
     60        $this->set('c_commu_user_list', $c_commu_user_list);
    5761        $this->set('fh_com_count_user', p_common_count_c_commu4c_member_id($u));
    5862
    5963        /// 最新情報 ///
    6064
    6165        // フレンド最新日記
    62         $this->set('c_diary_friend_list', p_h_home_c_diary_friend_list4c_member_id($u, 5));
     66        $c_diary_friend_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_c_diary_friend_list4c_member_id', $u, 5);
     67        $this->set('c_diary_friend_list', $c_diary_friend_list);
    6368        // フレンド最新blog
    6469        $this->set('c_rss_cache_list', p_h_diary_list_friend_c_rss_cache_list($u, 5));
    6570        // 日記コメント記入履歴
    66         $this->set('c_diary_my_comment_list', p_h_home_c_diary_my_comment_list4c_member_id($u, 5));
     71        $c_diary_my_comment_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_c_diary_my_comment_list4c_member_id', $u, 5);
     72        $this->set('c_diary_my_comment_list', $c_diary_my_comment_list);
    6773        // 参加コミュニティの新着書き込み
    6874        $this->set('c_commu_topic_comment_list', p_h_home_c_commu_topic_comment_list4c_member_id($u, 5));
    6975        // レビュー
     
    7278        /// 自分の情報 ///
    7379
    7480        // 日記
    75         $this->set('c_diary_list', db_diary_get_c_diary_list4c_member_id($u, 5));
     81        $c_diary_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_diary_get_c_diary_list4c_member_id', $u, 5);
     82        $this->set('c_diary_list', $c_diary_list);
    7683        // 外部blog
    7784        $this->set('c_blog_list', p_h_home_h_blog_list_friend4c_member_id($u, 5, 1));
    7885        // レビュー
     
    8188        /// その他 ///
    8289
    8390        // 紹介文
    84         $this->set('c_friend_intro_list', p_h_home_c_friend_intro_list4c_member_id($u, 5));
     91        $c_friend_intro_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_c_friend_intro_list4c_member_id', $u, 5);
     92        $this->set('c_friend_intro_list', $c_friend_intro_list);
    8593
    8694        // 今日の日付、曜日
    8795        $this->set('r_datetime', date('m/d'));
     
    105113            $this->set('bookmark_blog_list', db_bookmark_blog_list($u, 5));
    106114
    107115            //お気に入りのメンバ
    108             $this->set('bookmark_member_list', db_bookmark_member_list($u, 9));
     116            $bookmark_member_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_bookmark_member_list', $u, 9);
     117            $this->set('bookmark_member_list', $bookmark_member_list);
    109118            $this->set('bookmark_count', db_bookmark_count($u));
    110119        }
    111120
     
    133142            $y = $Day->thisYear();
    134143            $m = $Day->thisMonth();
    135144            $d = $Day->thisDay();
     145            $birth = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_birth4c_member_id', $m, $d, $u);
    136146            $item = array(
    137147                'year'=> $y,
    138148                'month'=>$m,
    139149                'day' => $d,
    140150                'dayofweek'=>$dayofweek[$i++],
    141151                'now' => false,
    142                 'birth' => p_h_home_birth4c_member_id($m, $d, $u),
     152                'birth' => $birth,
    143153                'event' => p_h_home_event4c_member_id($y, $m, $d, $u),
    144154                'schedule' => p_h_calendar_c_schedule_list4date($y, $m, $d, $u),
    145155            );
  • webapp/modules/pc/page/c_home.php

     
    1111        $u = $GLOBALS['AUTH']->uid();
    1212        $c_commu_id = $requests['target_c_commu_id'];
    1313
    14         $c_commu = p_c_home_c_commu4c_commu_id($c_commu_id);
     14        $c_commu = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_c_home_c_commu4c_commu_id', $c_commu_id);
    1515        //コミュニティの存在の有無
    1616        if (!$c_commu) {
    1717            openpne_redirect('pc', 'page_h_err_c_home');
    1818        }
    1919
    20         $this->set('inc_navi', fetch_inc_navi('c', $c_commu_id));
     20        $inc_navi = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'fetch_inc_navi', 'c', $c_commu_id);
     21        $this->set('inc_navi', $inc_navi);
    2122
    2223        $this->set('c_commu', $c_commu);
    2324
     
    2930        $this->set('is_receive_message', db_commu_is_receive_message($c_commu_id, $u));
    3031
    3132        //コミュニティメンバー
    32         $this->set('c_commu_member_list', p_c_home_c_commu_member_list4c_commu_id($c_commu_id, 9));
     33        $c_commu_member_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_c_home_c_commu_member_list4c_commu_id', $c_commu_id, 9);
     34        $this->set('c_commu_member_list', $c_commu_member_list);
    3335
    3436        //非公開コミュニティに管理者から招待されたかどうか
    3537        $this->set('admin_invite', db_c_commu4c_admin_invite_id($c_commu_id, $u));
    3638
    3739        //参加コミュニティの新着トピック書き込み
    38         $this->set('new_topic_comment', p_c_home_new_topic_comment4c_commu_id($c_commu_id, 7));
     40        $new_topic_comment = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_c_home_new_topic_comment4c_commu_id', $c_commu_id, 7);
     41        $this->set('new_topic_comment', $new_topic_comment);
    3942        //参加コミュニティの新着イベント書き込み
    40         $this->set('new_topic_comment_event', p_c_home_new_topic_comment4c_commu_id($c_commu_id, 7, 1));
     43        $new_topic_comment_event = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_c_home_new_topic_comment4c_commu_id', $c_commu_id, 7, 1);
     44        $this->set('new_topic_comment_event', $new_topic_comment_event);
    4145        //参加コミュニティの新着おすすめレビュー
    4246        $this->set('new_commu_review', p_c_home_new_commu_review4c_commu_id($c_commu_id, 7));
    4347
  • webapp/modules/pc/page/f_home.php

     
    3333        db_ashiato_insert_c_ashiato($target_c_member_id, $u);
    3434
    3535        $this->set('is_h_prof', 0);
    36         $this->set('inc_navi', fetch_inc_navi('f', $target_c_member_id));
     36        $inc_navi = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'fetch_inc_navi', 'f', $target_c_member_id);
     37        $this->set('inc_navi', $inc_navi);
    3738
    3839        $is_friend = db_friend_is_friend($u, $target_c_member_id);
    3940        if ($is_friend) {
    40             $target_c_member = db_common_c_member_with_profile($target_c_member_id, 'friend');
     41            $target_c_member = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member_with_profile', $target_c_member_id, 'friend');
    4142            // 自分が書いた紹介文
    4243            $this->set('my_friend_intro', p_f_home_c_friend_intro($u, $target_c_member_id));
    4344        } else {
    44             $target_c_member = db_common_c_member_with_profile($target_c_member_id, 'public');
     45            $target_c_member = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member_with_profile', $target_c_member_id, 'public');
    4546            // 友達の友達
    4647            $this->set('friend_path', p_f_home_friend_path4c_member_ids($u, $target_c_member_id));
    4748        }
    4849
    4950        $this->set('is_friend', $is_friend);
    50         $this->set('c_member', db_common_c_member4c_member_id($u));
    51         $this->set('c_diary_list', db_diary_get_c_diary_list4c_member_id($target_c_member_id, 5, $u));
     51        $c_member = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member4c_member_id', $u);
     52        $this->set('c_member', $c_member);
     53        $c_diary_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_diary_get_c_diary_list4c_member_id', $target_c_member_id, 5, $u);
     54        $this->set('c_diary_list', $c_diary_list);
    5255
    5356        // --- f_home, h_prof 共通処理
    5457
     
    6164
    6265        $this->set('c_rss_cache_list', p_f_home_c_rss_cache_list4c_member_id($target_c_member_id, 5));
    6366
    64         $this->set('c_friend_comment_list', p_f_home_c_friend_comment4c_member_id($target_c_member_id));
    65         $this->set('c_friend_list', p_f_home_c_friend_list4c_member_id($target_c_member_id, 9));
     67        $c_friend_comment_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_f_home_c_friend_comment4c_member_id', $target_c_member_id);
     68        $this->set('c_friend_comment_list', $c_friend_comment_list);
     69        $c_friend_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_f_home_c_friend_list4c_member_id', $target_c_member_id, 9);
     70        $this->set('c_friend_list', $c_friend_list);
    6671        $this->set('c_friend_count', db_friend_count_friends($target_c_member_id));
    6772        $this->set('user_count', p_common_count_c_commu4c_member_id($target_c_member_id));
    68         $this->set('c_commu_list', p_f_home_c_commu_list4c_member_id($target_c_member_id, 9));
     73        $c_commu_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_f_home_c_commu_list4c_member_id', $target_c_member_id, 9);
     74        $this->set('c_commu_list', $c_commu_list);
    6975        $this->set('c_review_list', db_review_c_review_list4member($target_c_member_id, 5));
    7076
    71         $this->set('profile_list', db_common_c_profile_list());
     77        $profile_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_profile_list');
     78        $this->set('profile_list', $profile_list);
    7279
    7380        // 誕生日まであと何日?
    7481        $this->set('days_birthday', db_common_count_days_birthday4c_member_id($target_c_member_id));
  • webapp/modules/pc/templates/h_config_image.tpl

     
    134134<img src="./skin/dummy.gif" class="v_spacer_l">
    135135
    136136<input type="submit" class="submit" name="submit" value="写真をアップロードする">
    137 
     137</form>
    138138</td>
    139139<td style="width:1em;" align="right" valign="top">・</td>
    140140<td style="width:auto;" align="left" valign="top">
  • webapp/modules/admin/do/update_c_navi.php

     
    1313            $requests['sort_order'],
    1414            $requests['url'],
    1515            $requests['caption']);
     16
     17        pne_cache_drop('fetch_inc_navi', $requests['navi_type']);
     18
    1619        admin_client_redirect('edit_c_navi', '変更しました');
    1720    }
    1821}
  • webapp/init.inc

     
    121121
    122122ini_set('arg_separator.output', '&');
    123123
     124// ファンクションキャッシュ有効期限用定数
     125define('OPENPNE_FUNCTION_CACHE_LIFETIME_SHORT' , 1200);
     126define('OPENPNE_FUNCTION_CACHE_LIFETIME_LONG' , 3600);
     127
     128
    124129?>
  • webapp/version.php

     
    1 <?php define('OPENPNE_VERSION', '2.5.0'); ?>
     1<?php define('OPENPNE_VERSION', '2.5.1'); ?>