ChangeLog_develop: OpenPNE_2_5_1_to_2_5_2.patch

File OpenPNE_2_5_1_to_2_5_2.patch, 66.1 kB (added by takanashi, 10 years ago)
  • webapp_biz/modules/biz/do/h_biz_shisetsu_delete.php

    old new  
    1010    { 
    1111        $u = $GLOBALS['AUTH']->uid(); 
    1212        $sessid = session_id(); 
    13         biz_deleteShisetsuIhige($requests['id'], $requests['filenihe']); 
     13        biz_deleteShisetsuIhige($requests['id'], $requests['filename']); 
    1414 
    1515        $p = array('id' => $requests['id']); 
    1616        openpne_redirect('biz', 'page_s_edit_shisetsu', $p); 
  • webapp_biz/modules/biz/do/s_add_schedule.php

    old new  
    1111        $u = $GLOBALS['AUTH']->uid(); 
    1212        $sessid = session_id(); 
    1313 
     14 
     15        // start_timeが指定されていない場合 
    1416        if (empty($requests['start_time'])) { 
    15             $begin_time = date("H:00:00"); 
     17            $begin_time_str = date("H:00:00"); 
    1618        } else { 
    17             $begin_time = $requests['start_time'].':00:00'; 
     19        // start_timeが指定されている場合 
     20            $begin_time_str = $requests['start_time'].':00:00'; 
    1821        } 
    1922 
    20         $term = date("i", $begin_time) + $requests['finish_time']
    21         $finish_time = date("H:i:00", strtotime(date("Ymd H:".$term.":s", strtotime($begin_time)))); 
     23        $begin_time = strtotime($begin_time_str)
     24        $begin_time_english = date("H:i d M Y", $begin_time); 
    2225 
     26        $finish_time = strtotime($begin_time_english . " +" . $requests['finish_time'] . " minute"); 
     27        $finish_time_str = date("H:i:00", $finish_time); 
     28 
    2329        //終了時間と開始時間が変 
    24         if (strtotime($finish_time) < strtotime($begin_time)) { 
     30        if (date("H", $finish_time) < date("H", $begin_time)) { 
    2531            $p = array('msg' => '日をまたがる施設予約はできません'); 
    2632            openpne_redirect('biz', 'page_s_list', $p); 
    2733        } 
     
    3238        $m = date("m", strtotime($start_date)); 
    3339        $d = date("d", strtotime($start_date)); 
    3440 
    35         if (!biz_isBatting($requests['shisetsu_id'], $y, $m, $d, $begin_time, $finish_time)) { 
     41        if (!biz_isBatting($requests['shisetsu_id'], $y, $m, $d, $begin_time_str, $finish_time_str)) { 
    3642            $p = array('msg' => '施設予約がバッティングしたため、登録ができませんでした'); 
    3743            openpne_redirect('biz', 'page_s_list', $p); 
    38  
    3944        } 
    4045 
    4146        //($shisetsu_id, $member_id, $date, $begin_time, $finish_time) 
    42         biz_addShisetsuSchedule($requests['shisetsu_id'], $u, $requests['start_date'], $begin_time, $finish_time); 
     47        biz_addShisetsuSchedule($requests['shisetsu_id'], $u, $requests['start_date'], $begin_time_str, $finish_time_str); 
    4348 
    4449        $p = array( 
    4550            'msg' => '施設予定を追加しました', 
  • webapp_biz/modules/biz/lib/mysql_functions.php

    old new  
    993993        'is_check' => 0, 
    994994        'writer_id' => $writer_id, 
    995995        'sort_order' => $sort_order, 
    996         'r_datetime' => date("Y-m-d H:m"), 
     996        'r_datetime' => date("Y-m-d H:i"), 
    997997    ); 
    998998    return db_insert('biz_todo', $data); 
    999999} 
     
    10141014        intval($member_id), 
    10151015        $memo, 
    10161016        intval($writer_id), 
    1017         date("Y-m-d H:m"), 
     1017        date("Y-m-d H:i"), 
    10181018        $target, 
    10191019    ); 
    10201020 
  • webapp/lib/db/bookmark.php

    old new  
    140140 */ 
    141141function db_bookmark_member_list($c_member_id, $limit = 0) 
    142142{ 
     143    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     144 
     145    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     146        $is_recurred = true; 
     147        $funcargs = func_get_args(); 
     148        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     149    } 
     150 
     151    $is_recurred = false; 
     152 
    143153    $sql = 'SELECT c_member_id_to AS c_member_id FROM c_bookmark' . 
    144154            ' WHERE c_member_id_from = ? ORDER BY RAND()'; 
    145155    $params = array(intval($c_member_id)); 
     
    180190function db_bookmark_insert_c_bookmark($c_member_id_from, $c_member_id_to) 
    181191{ 
    182192    //function cacheの削除 
    183     pne_cache_drop('db_bookmark_member_list', $c_member_id_from, 9); 
     193    cache_drop_c_bookmark($c_member_id_from); 
    184194 
    185195    $data = array( 
    186196        'c_member_id_from' => intval($c_member_id_from), 
     
    196206function db_bookmark_delete_c_bookmark($c_member_id_from, $c_member_id_to) 
    197207{ 
    198208    //function cacheの削除 
    199     pne_cache_drop('db_bookmark_member_list', $c_member_id_from, 9); 
     209    cache_drop_c_bookmark($c_member_from); 
    200210 
    201211    $sql = 'DELETE FROM c_bookmark' . 
    202212            ' WHERE c_member_id_from = ? AND c_member_id_to = ?'; 
  • webapp/lib/db/member.php

    old new  
    1515 */ 
    1616function db_member_c_member4c_member_id($c_member_id, $is_secure = false, $with_profile = false, $public_flag = 'public') 
    1717{ 
     18    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     19 
     20    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     21        $is_recurred = true; 
     22        $funcargs = func_get_args(); 
     23        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     24    } 
     25 
     26    $is_recurred = false; 
     27 
    1828    $sql = 'SELECT * FROM c_member WHERE c_member_id = ?'; 
    1929    $params = array(intval($c_member_id)); 
    2030    if (!$c_member = db_get_row($sql, $params)) 
     
    411421 
    412422function db_member_birth4c_member_id($month, $day, $c_member_id) 
    413423{ 
     424    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     425 
     426    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     427        $is_recurred = true; 
     428        $funcargs = func_get_args(); 
     429        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     430    } 
     431 
     432    $is_recurred = false; 
     433 
     434 
    414435    $sql = "SELECT c_member_id_to FROM c_friend WHERE c_member_id_from = ?"; 
    415436    $params = array(intval($c_member_id)); 
    416437    $ids = db_get_col($sql, $params); 
     
    453474 
    454475function db_member_c_profile_list() 
    455476{ 
     477    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     478 
     479    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     480        $is_recurred = true; 
     481        $funcargs = func_get_args(); 
     482        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     483    } 
     484 
     485    $is_recurred = false; 
     486 
    456487    $list = db_member_c_profile_list4null(); 
    457488 
    458489    $profile_list = array(); 
     
    785816function db_member_config_prof_new($c_member_id, $prof_list) 
    786817{ 
    787818    //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'); 
     819    cache_drop_c_member_profile($c_member_id); 
    791820 
    792821    $data = array( 
    793822        'nickname' => $prof_list['nickname'], 
     
    818847function db_member_config_image_new($c_member_id, $image_filename, $img_num) 
    819848{ 
    820849    //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'); 
     850    cache_drop_c_member_profile($c_member_id); 
    824851 
    825852    $data = array('image_filename_'.intval($img_num) => $image_filename); 
    826853    $where = array('c_member_id' => intval($c_member_id)); 
     
    833860function db_member_delete_c_member_image_new($c_member_id, $img_num) 
    834861{ 
    835862    //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'); 
     863    cache_drop_c_member_profile($c_member_id); 
    839864 
    840865    $sql = 'UPDATE c_member SET'; 
    841866    if ($img_num == 1) { 
     
    856881function db_member_change_c_member_main_image($c_member_id, $img_num) 
    857882{ 
    858883    //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'); 
     884    cache_drop_c_member_profile($c_member_id); 
    862885 
    863886    $sql = 'UPDATE c_member SET image_filename = image_filename_'.intval($img_num). 
    864887        ' WHERE c_member_id = ?'; 
     
    872895function db_member_update_c_member_image($c_member_id, $image_filename, $img_num) 
    873896{ 
    874897    //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'); 
     898    cache_drop_c_member_profile($c_member_id); 
    878899 
    879900    $data = array( 
    880901        'image_filename' => $image_filename, 
     
    904925    $c_member_id = db_insert('c_member', $data); 
    905926 
    906927    //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'); 
     928    cache_drop_c_member_profile($c_member_id); 
    910929 
    911930    $data = array( 
    912931        'c_member_id' => intval($c_member_id), 
     
    12201239function db_member_update_c_member_profile($c_member_id, $c_member_profile_list) 
    12211240{ 
    12221241    //function cache削除 
    1223     pne_cache_drop('db_common_c_profile_list'); 
     1242    cache_drop_c_member_profile($c_member_id); 
    12241243 
    12251244    foreach ($c_member_profile_list as $item) { 
    12261245        $sql = 'DELETE FROM c_member_profile' . 
     
    12431262function db_member_insert_c_member_profile($c_member_id, $c_profile_id, $c_profile_option_id, $value, $public_flag) 
    12441263{ 
    12451264    //function cache削除 
    1246     pne_cache_drop('db_common_c_profile_list'); 
     1265    cache_drop_c_member_profile($c_member_id); 
    12471266 
    12481267    $data = array( 
    12491268        'c_member_id' => intval($c_member_id), 
  • webapp/lib/db/friend.php

    old new  
    187187 */ 
    188188function db_friend_c_friend_comment4c_member_id($c_member_id, $limit = 5) 
    189189{ 
     190    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     191 
     192    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     193        $is_recurred = true; 
     194        $funcargs = func_get_args(); 
     195        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     196    } 
     197 
     198    $is_recurred = false; 
     199 
    190200    $sql = "SELECT c_member_id_from AS c_member_id, intro FROM c_friend" . 
    191201            " WHERE c_member_id_to = ? AND intro <> ''" . 
    192202            " ORDER BY r_datetime_intro DESC"; 
     
    222232 */ 
    223233function db_friend_c_friend_list4c_member_id($c_member_id, $limit = 0) 
    224234{ 
     235    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     236 
     237    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     238        $is_recurred = true; 
     239        $funcargs = func_get_args(); 
     240        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     241    } 
     242 
     243    $is_recurred = false; 
     244 
    225245    $sql = 'SELECT c_member_id_to AS c_member_id FROM c_friend' . 
    226246            ' WHERE c_member_id_from = ? ORDER BY RAND()'; 
    227247    $params = array(intval($c_member_id)); 
     
    298318 
    299319function db_friend_c_friend_intro_list4c_member_id($c_member_id, $limit) 
    300320{ 
     321    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     322 
     323    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     324        $is_recurred = true; 
     325        $funcargs = func_get_args(); 
     326        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     327    } 
     328 
     329    $is_recurred = false; 
     330 
    301331    $sql = 'SELECT * FROM c_friend' . 
    302332            ' WHERE c_member_id_to = ? AND intro <> \'\' ORDER BY RAND()'; 
    303333    $params = array(intval($c_member_id)); 
     
    417447 */ 
    418448function db_friend_c_friend_list_random4c_member_id($c_member_id, $limit) 
    419449{ 
     450    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     451 
     452    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     453        $is_recurred = true; 
     454        $funcargs = func_get_args(); 
     455        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     456    } 
     457 
     458    $is_recurred = false; 
     459 
    420460    $sql = "SELECT cf.* , cm.nickname"; 
    421461    $sql .= " FROM c_friend AS cf, c_member AS cm"; 
    422462    $sql .= " WHERE cf.c_member_id_from = ?" . 
     
    665705function db_friend_update_c_friend_intro($c_member_id_from, $c_member_id_to, $intro) 
    666706{ 
    667707    //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); 
     708    cache_drop_c_friend_intro($c_member_id_to); 
    670709 
    671710    $data = array( 
    672711        'intro' => $intro, 
  • webapp/lib/db/diary.php

    old new  
    5959 */ 
    6060function db_diary_get_c_diary_list4c_member_id($target_c_member_id, $count = 10, $u = null, $force = null) 
    6161{ 
     62    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     63 
     64    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     65        $is_recurred = true; 
     66        $funcargs = func_get_args(); 
     67        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     68    } 
     69 
     70    $is_recurred = false; 
     71 
    6272    $pf_cond = db_diary_public_flag_condition($target_c_member_id, $u, $force); 
    6373    $sql = 'SELECT * FROM c_diary WHERE c_member_id = ?' . $pf_cond . 
    6474           ' ORDER BY r_datetime DESC'; 
     
    281291 */ 
    282292function p_h_home_c_diary_friend_list4c_member_id($c_member_id, $limit) 
    283293{ 
     294    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     295 
     296    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     297        $is_recurred = true; 
     298        $funcargs = func_get_args(); 
     299        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     300    } 
     301 
     302    $is_recurred = false; 
     303 
    284304    $friends = db_friend_c_member_id_list($c_member_id, true); 
    285305    $ids = implode(',', array_map('intval', $friends)); 
    286306 
     
    309329 */ 
    310330function p_h_home_c_diary_my_comment_list4c_member_id($c_member_id, $limit) 
    311331{ 
     332    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     333 
     334    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     335        $is_recurred = true; 
     336        $funcargs = func_get_args(); 
     337        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     338    } 
     339 
     340    $is_recurred = false; 
     341 
    312342    $date = date('Y-m-d 00:00:00', strtotime('-15 days')); 
    313343 
    314344    $blocked = db_member_access_block_list4c_member_id_to($c_member_id); 
     
    382412        $list[$key] += db_common_c_member4c_member_id_LIGHT($value['c_member_id']); 
    383413    } 
    384414 
    385     $sql = 'SELECT COUNT(*)' . 
     415    $sql = 'SELECT COUNT(DISTINCT d.c_diary_id)' . 
    386416        ' FROM c_diary AS d' . 
    387417            ' INNER JOIN c_diary_comment AS dc USING (c_diary_id)' . 
    388418            ', c_diary_comment AS mydc' . 
  • webapp/lib/db/etc.php

    old new  
    428428function db_common_delete_c_commu($c_commu_id) 
    429429{ 
    430430    //function cacheの削除 
    431     pne_cache_drop('p_c_home_c_commu4c_commu_id', $c_commu_id); 
     431    cache_drop_c_commu($c_commu_id); 
    432432 
    433433    $single = array(intval($c_commu_id)); 
    434434 
  • webapp/lib/db/commu.php

    old new  
    3131 */ 
    3232function db_commu_c_commu4c_commu_id2($c_commu_id) 
    3333{ 
     34    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     35 
     36    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     37        $is_recurred = true; 
     38        $funcargs = func_get_args(); 
     39        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     40    } 
     41 
     42    $is_recurred = false; 
     43 
    3444    if ($c_commu = _db_c_commu4c_commu_id($c_commu_id)) { 
    3545        $c_commu['member_count'] = _db_count_c_commu_member_list4c_commu_id($c_commu_id); 
    3646    } 
     
    4252 */ 
    4353function db_commu_c_commu4c_commu_id_k($c_commu_id) 
    4454{ 
     55    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     56 
     57    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     58        $is_recurred = true; 
     59        $funcargs = func_get_args(); 
     60        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     61    } 
     62 
     63    $is_recurred = false; 
     64 
    4565    if ($c_commu = _db_c_commu4c_commu_id($c_commu_id)) { 
    4666        $c_commu['count_member'] = _db_count_c_commu_member_list4c_commu_id($c_commu_id); 
    4767    } 
     
    411431 */ 
    412432function db_commu_c_commu_member_list4c_commu_id($c_commu_id ,$limit = 9) 
    413433{ 
     434    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     435 
     436    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     437        $is_recurred = true; 
     438        $funcargs = func_get_args(); 
     439        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     440    } 
     441 
     442    $is_recurred = false; 
    414443    $sql = 'SELECT c_member.* FROM c_member, c_commu_member' . 
    415444            ' WHERE c_member.c_member_id = c_commu_member.c_member_id' . 
    416445            ' AND c_commu_id = ? ORDER BY RAND()'; 
     
    425454 
    426455function db_commu_new_topic_comment4c_commu_id($c_commu_id, $limit, $event_flag = 0) 
    427456{ 
     457    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     458 
     459    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     460        $is_recurred = true; 
     461        $funcargs = func_get_args(); 
     462        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     463    } 
     464 
     465    $is_recurred = false; 
     466 
    428467    $sql = "SELECT cct.c_commu_topic_id , cct.name, MAX(cctc.r_datetime) as r_datetime , cct.c_commu_id " . 
    429468            " , cctc.image_filename1, cctc.image_filename2, cctc.image_filename3 " . 
    430469            " FROM c_commu_topic_comment as cctc , c_commu_topic as cct" . 
     
    515554 
    516555function db_commu_c_commu_list4c_member_id_2($c_member_id, $limit = 9) 
    517556{ 
     557    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     558 
     559    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     560        $is_recurred = true; 
     561        $funcargs = func_get_args(); 
     562        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     563    } 
     564 
     565    $is_recurred = false; 
     566 
    518567    $sql = "SELECT c_commu.c_commu_id, c_commu.image_filename, c_commu.name" . 
    519568        " FROM c_commu ,c_commu_member " . 
    520569        " WHERE c_commu_member.c_member_id = ?". 
     
    746795 */ 
    747796function db_commu_c_commu_list4c_member_id_3($c_member_id, $limit) 
    748797{ 
     798    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     799 
     800    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     801        $is_recurred = true; 
     802        $funcargs = func_get_args(); 
     803        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     804    } 
     805 
     806    $is_recurred = false; 
     807 
    749808    $sql = "SELECT c.* FROM c_commu_member AS cm, c_commu AS c"; 
    750809    $sql .= " WHERE cm.c_member_id=?"; 
    751810    $sql .= " AND c.c_commu_id=cm.c_commu_id"; 
     
    10051064 
    10061065function db_commu_c_commu_list_lastupdate4c_member_id($c_member_id, $limit) 
    10071066{ 
     1067    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     1068 
     1069    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     1070        $is_recurred = true; 
     1071        $funcargs = func_get_args(); 
     1072        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     1073    } 
     1074 
     1075    $is_recurred = false; 
     1076 
    10081077    $sql = 'SELECT DISTINCT c.* FROM c_commu_member AS cm, c_commu AS c' . 
    10091078            ' WHERE cm.c_member_id = ? AND c.c_commu_id = cm.c_commu_id' . 
    10101079            ' ORDER BY RAND()'; 
     
    12141283 */ 
    12151284function db_commu_c_commu_member_list_random4c_commu_id($c_commu_id, $limit) 
    12161285{ 
     1286    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     1287 
     1288    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     1289        $is_recurred = true; 
     1290        $funcargs = func_get_args(); 
     1291        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     1292    } 
     1293 
     1294    $is_recurred = false; 
     1295 
    12171296    $sql = "SELECT cm.c_member_id, cm.nickname "; 
    12181297    $sql .= "FROM c_member AS cm , c_commu_member AS ccm "; 
    12191298    $sql .= "WHERE ccm.c_commu_id = ?" . 
  • webapp/lib/db/deprecated_temporary2.php

    old new  
    131131 
    132132function p_c_member_list_c_members4c_commu_id($c_commu_id, $page_size, $page) 
    133133{ 
    134         return db_commu_c_members4c_commu_id($c_member_id, $c_commu_id); 
     134        return db_commu_c_members4c_commu_id($c_commu_id, $page_size,$page); 
    135135} 
    136136 
    137137function p_f_home_c_commu_list4c_member_id($c_member_id, $limit = 9) 
     
    164164        return db_commu_c_commu_topic_comment_list4c_member_id($c_member_id, $limit); 
    165165} 
    166166 
    167 function p_h_com_comment_list_c_commu_topic_comment_list4c_member_id($c_member_id, $limit,$page) 
     167function p_h_com_comment_list_c_commu_topic_comment_list4c_member_id($c_member_id, $limit, $page) 
    168168{ 
    169169        return db_commu_c_commu_topic_comment_list4c_member_id_2($c_member_id, $limit,$page); 
    170170} 
     
    194194        return db_commu_c_commu_topic_comment4c_commu_topic_comment_id($c_commu_topic_comment_id); 
    195195} 
    196196 
    197 /* 
    198 function db_common_commu_status($u, $target_c_commu_id) 
    199 { 
    200         return db_common_commu_status($u, $target_c_commu_id); 
    201 } 
    202 */ 
    203197function _db_is_c_commu_member_confirm($c_member_id, $c_commu_id) 
    204198{ 
    205199        return db_commu_is_c_commu_member_confirm($c_member_id, $c_commu_id); 
     
    294288        return db_commu_c_friend_list_random4c_member_id4c_commu_id($c_member_id, $c_commu_id, $limit); 
    295289} 
    296290 
    297  
    298291function k_p_h_home_c_commu_topic_comment_list4c_member_id($c_member_id, $page_size, $page) 
    299292{ 
    300293        return db_commu_c_commu_topic_comment_list4c_member_id_3($c_member_id, $page_size, $page); 
  • webapp/lib/util/page.php

    old new  
    1717 */ 
    1818function fetch_inc_navi($type, $target_id = null) 
    1919{ 
     20    static $is_recurred = false;  //再帰処理中かどうかの判定フラグ 
     21 
     22    if (!$is_recurred) {  //function cacheのために再帰処理を行う 
     23        $is_recurred = true; 
     24        $funcargs = func_get_args(); 
     25        return pne_cache_recursive_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, __FUNCTION__, $funcargs); 
     26    } 
     27 
     28    $is_recurred = false; 
     29 
    2030    $inc_smarty = new OpenPNE_Smarty($GLOBALS['SMARTY']); 
    2131    $inc_smarty->templates_dir = 'pc/templates'; 
    2232    $inc_smarty->assign('PHPSESSID', md5(session_id())); 
  • webapp/lib/util/cache.php

    old new  
    5252    } 
    5353} 
    5454 
     55/*** 
     56 * 再帰的に関数をコールする pne_cache_call 
     57 */ 
     58function pne_cache_recursive_call($lifetime, $function, $funcarg) 
     59{ 
     60    $backtrace = debug_backtrace(); 
     61 
     62    if (OPENPNE_USE_FUNCTION_CACHE) { 
     63        array_unshift($funcarg, $function); 
     64        $cache =& get_cache_lite_function(); 
     65        $cache->setOption('lifetime', intval($lifetime)); 
     66        return call_user_func_array(array(&$cache, 'call'), $funcarg); 
     67    } else { 
     68        return call_user_func_array($function, $funcarg); 
     69    } 
     70} 
     71 
    5572//--- 
    5673 
    5774/** 
     
    5976 */ 
    6077function cache_drop_c_member($c_member_id) 
    6178{ 
    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); 
     79    pne_cache_drop('db_friend_c_friend_list4c_member_id', $c_member_id, 9);  //フレンドリスト 
     80        pne_cache_drop('db_friend_c_friend_list_random4c_member_id', $c_member_id, 5); 
     81    pne_cache_drop('p_h_home_c_diary_friend_list4c_member_id', $c_member_id, 5);  //最新日記フィード 
    6482 
     83    //誕生日フィード 
    6584    include_once 'Calendar/Week.php'; 
    6685 
    6786    $Week = new Calendar_Week(date('Y'), date('m'), date('d'), 0); 
     
    6988    while ($Day = $Week->fetch()) { 
    7089        $m = $Day->thisMonth(); 
    7190        $d = $Day->thisDay(); 
    72         pne_cache_drop('p_h_home_birth4c_member_id', $m, $d, $c_member_id); 
     91        pne_cache_drop('db_member_birth4c_member_id', $m, $d, $c_member_id); 
    7392    } 
     93 
     94    cache_drop_c_friend_intro($c_member_id);  //紹介文 
    7495} 
    7596 
    76  
    7797/** 
    7898 * コミュニティ情報取得関連のfunction cacheを削除する 
    7999 */ 
    80100function cache_drop_c_commu($c_commu_id) 
    81101{ 
    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); 
     102    pne_cache_drop('db_commu_c_commu4c_commu_id_k',$c_commu_id); 
     103    pne_cache_drop('db_commu_c_commu_member_list_random4c_commu_id', $c_commu_id, 5); 
     104    pne_cache_drop('db_commu_c_commu_member_list4c_commu_id', $c_commu_id, 9); 
     105    pne_cache_drop('db_commu_c_commu4c_commu_id2', $c_commu_id); 
    84106 
    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); 
     107    $c_commu_topic_list = db_commu_new_topic_comment4c_commu_id($c_commu_id, 7); 
     108    $c_commu_event_list = db_commu_new_topic_comment4c_commu_id($c_commu_id, 7, 1); 
    87109    $c_commu_bbs_list = array_merge($c_commu_topic_list, $c_commu_event_list); 
    88110 
    89111    foreach ($c_commu_bbs_list as $c_commu_topic_id) 
     
    106128 */ 
    107129function cache_drop_c_commu_list4c_member_id($c_member_id) 
    108130{ 
    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); 
     131    pne_cache_drop('db_commu_c_commu_list_lastupdate4c_member_id', $c_member_id, 5); 
     132    pne_cache_drop('db_commu_c_commu_list4c_member_id_3', $c_member_id, 9); 
     133    pne_cache_drop('db_commu_c_commu_list4c_member_id_2', $c_member_id, 9); 
    111134} 
    112135 
     136 
     137/** 
     138 * 紹介文取得のfunction cacheを削除する 
     139 */ 
     140function cache_drop_c_friend_intro($c_member_id) 
     141{ 
     142    pne_cache_drop('db_friend_c_friend_intro_list4c_member_id', $c_member_id, 5); 
     143    pne_cache_drop('db_friend_c_friend_comment4c_member_id', $c_member_id); 
     144} 
     145 
     146/** 
     147 * プロフィール取得のfunction cacheを削除する 
     148 */ 
     149function cache_drop_c_member_profile($c_member_id) 
     150{ 
     151    pne_cache_drop(db_member_c_member4c_member_id, $c_member_id); 
     152    pne_cache_drop('db_member_c_profile_list'); 
     153} 
     154 
     155/** 
     156 * お気に入り関連のfunction cacheを削除する 
     157 */ 
     158function cache_drop_c_bookmark($c_member_id) 
     159{ 
     160    pne_cache_drop('db_bookmark_member_list', $c_member_id, 9); 
     161} 
    113162?> 
  • webapp/modules/pc/do/o_regist_prof.php

    old new  
    3838            $validator->addRequests($_REQUEST); 
    3939        } 
    4040        $validator->addRules($this->_getValidateRules()); 
    41         if ($validator->validate()) { 
     41        if (!$validator->validate()) { 
    4242            $errors = $validator->getErrors(); 
    4343        } 
    4444 
  • webapp/modules/pc/page/h_home.php

    old new  
    1515    { 
    1616        $u = $GLOBALS['AUTH']->uid(); 
    1717 
    18         $inc_navi = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'fetch_inc_navi', 'h'); 
     18        $inc_navi = fetch_inc_navi('h'); 
    1919        $this->set('inc_navi', $inc_navi); 
    2020 
    2121        /// infomation /// 
     
    4949        /// 左側 /// 
    5050 
    5151        // メンバ情報 
    52         $c_member = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member4c_member_id', $u); 
     52        $c_member = db_common_c_member4c_member_id($u); 
    5353        $this->set('c_member', $c_member); 
    5454        // フレンドリスト 
    55         $c_friend_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_f_home_c_friend_list4c_member_id', $u, 9); 
     55        $c_friend_list = p_f_home_c_friend_list4c_member_id($u, 9); 
    5656        $this->set('c_friend_list', $c_friend_list); 
    5757        $this->set('c_friend_count', db_friend_count_friends($u)); 
    5858        // 参加コミュニティ 
    59         $c_commu_user_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_c_commu_list4c_member_id', $u, 9); 
     59        $c_commu_user_list = p_h_home_c_commu_list4c_member_id($u, 9); 
    6060        $this->set('c_commu_user_list', $c_commu_user_list); 
    6161        $this->set('fh_com_count_user', p_common_count_c_commu4c_member_id($u)); 
    6262 
    6363        /// 最新情報 /// 
    6464 
    6565        // フレンド最新日記 
    66         $c_diary_friend_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_c_diary_friend_list4c_member_id', $u, 5); 
     66        $c_diary_friend_list = p_h_home_c_diary_friend_list4c_member_id($u, 5); 
    6767        $this->set('c_diary_friend_list', $c_diary_friend_list); 
    6868        // フレンド最新blog 
    6969        $this->set('c_rss_cache_list', p_h_diary_list_friend_c_rss_cache_list($u, 5)); 
    7070        // 日記コメント記入履歴 
    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); 
     71        $c_diary_my_comment_list = p_h_home_c_diary_my_comment_list4c_member_id($u, 5); 
    7272        $this->set('c_diary_my_comment_list', $c_diary_my_comment_list); 
    7373        // 参加コミュニティの新着書き込み 
    7474        $this->set('c_commu_topic_comment_list', p_h_home_c_commu_topic_comment_list4c_member_id($u, 5)); 
     
    7878        /// 自分の情報 /// 
    7979 
    8080        // 日記 
    81         $c_diary_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_diary_get_c_diary_list4c_member_id', $u, 5); 
     81        $c_diary_list = db_diary_get_c_diary_list4c_member_id($u, 5); 
    8282        $this->set('c_diary_list', $c_diary_list); 
    8383        // 外部blog 
    8484        $this->set('c_blog_list', p_h_home_h_blog_list_friend4c_member_id($u, 5, 1)); 
     
    8888        /// その他 /// 
    8989 
    9090        // 紹介文 
    91         $c_friend_intro_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_c_friend_intro_list4c_member_id', $u, 5); 
     91        $c_friend_intro_list = p_h_home_c_friend_intro_list4c_member_id($u, 5); 
    9292        $this->set('c_friend_intro_list', $c_friend_intro_list); 
    9393 
    9494        // 今日の日付、曜日 
     
    113113            $this->set('bookmark_blog_list', db_bookmark_blog_list($u, 5)); 
    114114 
    115115            //お気に入りのメンバ 
    116             $bookmark_member_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_bookmark_member_list', $u, 9); 
     116            $bookmark_member_list = db_bookmark_member_list($u, 9); 
    117117            $this->set('bookmark_member_list', $bookmark_member_list); 
    118118            $this->set('bookmark_count', db_bookmark_count($u)); 
    119119        } 
     
    142142            $y = $Day->thisYear(); 
    143143            $m = $Day->thisMonth(); 
    144144            $d = $Day->thisDay(); 
    145             $birth = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_h_home_birth4c_member_id', $m, $d, $u); 
     145            $birth = p_h_home_birth4c_member_id($m, $d, $u); 
    146146            $item = array( 
    147147                'year'=> $y, 
    148148                'month'=>$m, 
  • webapp/modules/pc/page/c_home.php

    old new  
    1111        $u = $GLOBALS['AUTH']->uid(); 
    1212        $c_commu_id = $requests['target_c_commu_id']; 
    1313 
    14         $c_commu = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_c_home_c_commu4c_commu_id', $c_commu_id); 
     14        $c_commu = 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         $inc_navi = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'fetch_inc_navi', 'c', $c_commu_id); 
     20        $inc_navi = fetch_inc_navi('c', $c_commu_id); 
    2121        $this->set('inc_navi', $inc_navi); 
    2222 
    2323        $this->set('c_commu', $c_commu); 
     
    3030        $this->set('is_receive_message', db_commu_is_receive_message($c_commu_id, $u)); 
    3131 
    3232        //コミュニティメンバー 
    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); 
     33        $c_commu_member_list = p_c_home_c_commu_member_list4c_commu_id($c_commu_id, 9); 
    3434        $this->set('c_commu_member_list', $c_commu_member_list); 
    3535 
    3636        //非公開コミュニティに管理者から招待されたかどうか 
    3737        $this->set('admin_invite', db_c_commu4c_admin_invite_id($c_commu_id, $u)); 
    3838 
    3939        //参加コミュニティの新着トピック書き込み 
    40         $new_topic_comment = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'p_c_home_new_topic_comment4c_commu_id', $c_commu_id, 7); 
     40        $new_topic_comment = p_c_home_new_topic_comment4c_commu_id($c_commu_id, 7); 
    4141        $this->set('new_topic_comment', $new_topic_comment); 
    4242        //参加コミュニティの新着イベント書き込み 
    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); 
     43        $new_topic_comment_event = p_c_home_new_topic_comment4c_commu_id($c_commu_id, 7, 1); 
    4444        $this->set('new_topic_comment_event', $new_topic_comment_event); 
    4545        //参加コミュニティの新着おすすめレビュー 
    4646        $this->set('new_commu_review', p_c_home_new_commu_review4c_commu_id($c_commu_id, 7)); 
  • webapp/modules/pc/page/f_home.php

    old new  
    3333        db_ashiato_insert_c_ashiato($target_c_member_id, $u); 
    3434 
    3535        $this->set('is_h_prof', 0); 
    36         $inc_navi = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'fetch_inc_navi', 'f', $target_c_member_id); 
     36        $inc_navi = fetch_inc_navi('f', $target_c_member_id); 
    3737        $this->set('inc_navi', $inc_navi); 
    3838 
    3939        $is_friend = db_friend_is_friend($u, $target_c_member_id); 
    4040        if ($is_friend) { 
    41             $target_c_member = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member_with_profile', $target_c_member_id, 'friend'); 
     41            $target_c_member = db_common_c_member_with_profile($target_c_member_id, 'friend'); 
    4242            // 自分が書いた紹介文 
    4343            $this->set('my_friend_intro', p_f_home_c_friend_intro($u, $target_c_member_id)); 
    4444        } else { 
    45             $target_c_member = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member_with_profile', $target_c_member_id, 'public'); 
     45            $target_c_member = db_common_c_member_with_profile($target_c_member_id, 'public'); 
    4646            // 友達の友達 
    4747            $this->set('friend_path', p_f_home_friend_path4c_member_ids($u, $target_c_member_id)); 
    4848        } 
    4949 
    5050        $this->set('is_friend', $is_friend); 
    51         $c_member = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_member4c_member_id', $u); 
     51        $c_member = db_common_c_member4c_member_id($u); 
    5252        $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); 
     53        $c_diary_list = db_diary_get_c_diary_list4c_member_id($target_c_member_id, 5, $u); 
    5454        $this->set('c_diary_list', $c_diary_list); 
    5555 
    5656        // --- f_home, h_prof 共通処理 
     
    6464 
    6565        $this->set('c_rss_cache_list', p_f_home_c_rss_cache_list4c_member_id($target_c_member_id, 5)); 
    6666 
    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); 
     67        $c_friend_comment_list = p_f_home_c_friend_comment4c_member_id($target_c_member_id); 
    6868        $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); 
     69        $c_friend_list = p_f_home_c_friend_list4c_member_id($target_c_member_id, 9); 
    7070        $this->set('c_friend_list', $c_friend_list); 
    7171        $this->set('c_friend_count', db_friend_count_friends($target_c_member_id)); 
    7272        $this->set('user_count', p_common_count_c_commu4c_member_id($target_c_member_id)); 
    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); 
     73        $c_commu_list = p_f_home_c_commu_list4c_member_id($target_c_member_id, 9); 
    7474        $this->set('c_commu_list', $c_commu_list); 
    7575        $this->set('c_review_list', db_review_c_review_list4member($target_c_member_id, 5)); 
    7676 
    77         $profile_list = pne_cache_call(OPENPNE_FUNCTION_CACHE_LIFETIME_LONG, 'db_common_c_profile_list'); 
     77        $profile_list = db_common_c_profile_list(); 
    7878        $this->set('profile_list', $profile_list); 
    7979 
    8080        // 誕生日まであと何日? 
  • webapp/modules/pc/templates/h_message.tpl

    old new  
    237237({*********}) 
    238238<tr> 
    239239<td align="left" valign="top" colspan="6" class="bg_02"> 
     240 
    240241<div class="padding_w_m"> 
    241242 
    242 ({if $c_message.image_filename_1}) 
    243 <a href="({t_img_url filename=$c_message.image_filename_1})" target="_blank"> 
    244 <img src="({t_img_url filename=$c_message.image_filename_1 w=120 h=120})"></a> 
    245 ({/if}) 
    246  
    247 ({if $c_message.image_filename_2}) 
    248 <a href="({t_img_url filename=$c_message.image_filename_2})" target="_blank"> 
    249 <img src="({t_img_url filename=$c_message.image_filename_2 w=120 h=120})"></a> 
    250 ({/if}) 
    251  
    252 ({if $c_message.image_filename_3}) 
    253 <a href="({t_img_url filename=$c_message.image_filename_3})" target="_blank"> 
    254 <img src="({t_img_url filename=$c_message.image_filename_3 w=120 h=120})"></a> 
    255 ({/if}) 
    256243({if $c_message.image_filename_1||$c_message.image_filename_2||$c_message.image_filename_3}) 
     244({if $c_message.image_filename_1})<span class="padding_s"><a href="({t_img_url filename=$c_message.image_filename_1})" target="_blank"><img src="({t_img_url filename=$c_message.image_filename_1 w=120 h=120})"></a></span>({/if}) 
     245({if $c_message.image_filename_2})<span class="padding_s"><a href="({t_img_url filename=$c_message.image_filename_2})" target="_blank"><img src="({t_img_url filename=$c_message.image_filename_2 w=120 h=120})"></a></span>({/if}) 
     246({if $c_message.image_filename_3})<span class="padding_s"><a href="({t_img_url filename=$c_message.image_filename_3})" target="_blank"><img src="({t_img_url filename=$c_message.image_filename_3 w=120 h=120})"></a></span>({/if}) 
    257247<br><br> 
    258248({/if}) 
    259249 
  • webapp/modules/pc/templates/c_topic_detail.tpl

    old new  
    109109<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    110110<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    111111<td style="width:531px;height:50px;" class="bg_02" align="left" valign="middle"> 
    112 <div class="padding_s lh_120"> 
     112 
    113113({if $c_topic.image_filename1||$c_topic.image_filename2||$c_topic.image_filename3}) 
    114 ({if $c_topic.image_filename1})<a href="({t_img_url filename=$c_topic.image_filename1})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename1 w=120 h=120})"></a>({/if}) 
    115 ({if $c_topic.image_filename2})<a href="({t_img_url filename=$c_topic.image_filename2})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename2 w=120 h=120})"></a>({/if}) 
    116 ({if $c_topic.image_filename3})<a href="({t_img_url filename=$c_topic.image_filename3})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename3 w=120 h=120})"></a>({/if}) 
    117 <br> 
     114<div class="padding_s"> 
     115({if $c_topic.image_filename1})<span class="padding_s"><a href="({t_img_url filename=$c_topic.image_filename1})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename1 w=120 h=120})"></a></span>({/if}) 
     116({if $c_topic.image_filename2})<span class="padding_s"><a href="({t_img_url filename=$c_topic.image_filename2})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename2 w=120 h=120})"></a></span>({/if}) 
     117({if $c_topic.image_filename3})<span class="padding_s"><a href="({t_img_url filename=$c_topic.image_filename3})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename3 w=120 h=120})"></a></span>({/if}) 
     118</div> 
    118119({/if}) 
     120 
     121<div class="padding_s lh_120"> 
    119122({$c_topic.body|nl2br|t_url2cmd|t_cmd}) 
     123</div> 
    120124 
    121 </div> 
    122125</td> 
    123126<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    124127</tr> 
     
    245248<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    246249<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    247250<td class="bg_02" align="left" valign="middle"> 
    248 <div class="padding_s lh_120"> 
    249251 
    250 ({if $item.image_filename1||$item.image_filename2||$item.image_filename3}) 
    251 ({if $item.image_filename1})<a href="({t_img_url filename=$item.image_filename1})" target="_blank"><img src="({t_img_url filename=$item.image_filename1 w=120 h=120})"></a>({/if}) 
    252 ({if $item.image_filename2})<a href="({t_img_url filename=$item.image_filename2})" target="_blank"><img src="({t_img_url filename=$item.image_filename2 w=120 h=120})"></a>({/if}) 
    253 ({if $item.image_filename3})<a href="({t_img_url filename=$item.image_filename3})" target="_blank"><img src="({t_img_url filename=$item.image_filename3 w=120 h=120})"></a>({/if}) 
    254 <br> 
     252({if $item.image_filename1 || $item.image_filename2 || $item.image_filename3}) 
     253<div class="padding_s"> 
     254({if $item.image_filename1})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename1})" target="_blank"><img src="({t_img_url filename=$item.image_filename1 w=120 h=120})"></a></span>({/if}) 
     255({if $item.image_filename2})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename2})" target="_blank"><img src="({t_img_url filename=$item.image_filename2 w=120 h=120})"></a></span>({/if}) 
     256({if $item.image_filename3})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename3})" target="_blank"><img src="({t_img_url filename=$item.image_filename3 w=120 h=120})"></a></span>({/if}) 
     257</div> 
    255258({/if}) 
     259 
     260<div class="padding_s lh_120"> 
    256261({$item.body|nl2br|t_url2cmd|t_cmd}) 
     262</div> 
    257263 
    258 </div> 
    259264</td> 
    260265<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    261266</tr> 
  • webapp/modules/pc/templates/c_topic_list.tpl

    old new  
    248248<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    249249<td style="width:521px;" class="bg_02" align="left" valign="middle"> 
    250250 
     251({if $item.image_filename1 || $item.image_filename2 || $item.image_filename3}) 
     252<div class="padding_s"> 
     253({if $item.image_filename1})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename1})" target="_blank"><img src="({t_img_url filename=$item.image_filename1 w=120 h=120})"></a></span>({/if}) 
     254({if $item.image_filename2})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename2})" target="_blank"><img src="({t_img_url filename=$item.image_filename2 w=120 h=120})"></a></span>({/if}) 
     255({if $item.image_filename3})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename3})" target="_blank"><img src="({t_img_url filename=$item.image_filename3 w=120 h=120})"></a></span>({/if}) 
     256</div> 
     257({/if}) 
     258 
    251259<div class="padding_s lh_120"> 
    252  
    253 ({if $item.image_filename1})<a href="({t_img_url filename=$item.image_filename1})" target="_blank"><img src="({t_img_url filename=$item.image_filename1 w=120 h=120})"></a>({/if}) 
    254 ({if $item.image_filename2})<a href="({t_img_url filename=$item.image_filename2})" target="_blank"><img src="({t_img_url filename=$item.image_filename2 w=120 h=120})"></a>({/if}) 
    255 ({if $item.image_filename3})<a href="({t_img_url filename=$item.image_filename3})" target="_blank"><img src="({t_img_url filename=$item.image_filename3 w=120 h=120})"></a>({/if}) 
    256 <br> 
    257260({$item.body|nl2br}) 
    258261 
    259262</div> 
  • webapp/modules/pc/templates/c_topic_write_delete_confirm.tpl

    old new  
    6969</td> 
    7070<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    7171<td style="width:468px;" class="bg_02" align="left" valign="middle"> 
    72 <div style="padding:10px;"> 
    7372 
     73<div class="padding_s lh_120"> 
     74 
    7475<a href="({t_url m=pc a=page_f_home})&amp;target_c_member_id=({$c_member.c_member_id})">({$c_member.nickname})</a><br> 
    75 ({if $c_commu_topic_comment.image_filename1})<img src="({t_img_url filename=$c_commu_topic_comment.image_filename1 w=120 h=120})">({/if}) 
    76 ({if $c_commu_topic_comment.image_filename2})<img src="({t_img_url filename=$c_commu_topic_comment.image_filename2 w=120 h=120})">({/if}) 
    77 ({if $c_commu_topic_comment.image_filename3})<img src="({t_img_url filename=$c_commu_topic_comment.image_filename3 w=120 h=120})">({/if}) 
    78 <br> 
    79 ({$c_commu_topic_comment.body|nl2br})<br> 
    8076 
    8177</div> 
     78 
     79({if $c_commu_topic_comment.image_filename1 || $c_commu_topic_comment.image_filename2 || $c_commu_topic_comment.image_filename3 }) 
     80<div class="padding_s"> 
     81({if $c_commu_topic_comment.image_filename1})<span class="padding_s"><img src="({t_img_url filename=$c_commu_topic_comment.image_filename1 w=120 h=120})"></span>({/if}) 
     82({if $c_commu_topic_comment.image_filename2})<span class="padding_s"><img src="({t_img_url filename=$c_commu_topic_comment.image_filename2 w=120 h=120})"></span>({/if}) 
     83({if $c_commu_topic_comment.image_filename3})<span class="padding_s"><img src="({t_img_url filename=$c_commu_topic_comment.image_filename3 w=120 h=120})"></span>({/if}) 
     84</div> 
     85({/if}) 
     86 
     87<div class="padding_s lh_120"> 
     88 
     89({$c_commu_topic_comment.body|nl2br}) 
     90 
     91</div> 
     92 
    8293</td> 
    8394<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    8495</tr> 
  • webapp/modules/pc/templates/c_event_detail.tpl

    old new  
    8585({if $c_topic.image_filename1||$c_topic.image_filename2||$c_topic.image_filename3}) 
    8686<tr> 
    8787<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    88 <td style="width:110px;" class="bg_03" align="center" valign="top" rowspan="({if $is_c_event_admin})21({else})19({/if})"> 
     88<td style="width:110px;" class="bg_03" align="center" valign="top" rowspan="({if $is_c_event_admin})19({else})17({/if})"> 
    8989 
    9090<div class="padding_s"> 
    9191 
     
    9797<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    9898<td class="bg_02" align="left" valign="middle" colspan="3"> 
    9999 
    100 <div style="padding:8px;"> 
     100<div class="padding_s"> 
    101101 
    102 ({if $c_topic.image_filename1})<a href="({t_img_url filename=$c_topic.image_filename1})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename1 w=120 h=120})"></a>({/if}) 
    103 ({if $c_topic.image_filename2})<a href="({t_img_url filename=$c_topic.image_filename2})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename2 w=120 h=120})"></a>({/if}) 
    104 ({if $c_topic.image_filename3})<a href="({t_img_url filename=$c_topic.image_filename3})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename3 w=120 h=120})"></a>({/if}) 
     102({if $c_topic.image_filename1})<span class="padding_s"><a href="({t_img_url filename=$c_topic.image_filename1})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename1 w=120 h=120})"></a></span>({/if}) 
     103({if $c_topic.image_filename2})<span class="padding_s"><a href="({t_img_url filename=$c_topic.image_filename2})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename2 w=120 h=120})"></a></span>({/if}) 
     104({if $c_topic.image_filename3})<span class="padding_s"><a href="({t_img_url filename=$c_topic.image_filename3})" target="_blank"><img src="({t_img_url filename=$c_topic.image_filename3 w=120 h=120})"></a></span>({/if}) 
    105105 
    106106</div> 
    107107 
     
    407407<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    408408</tr> 
    409409({*********}) 
     410({if $is_c_event_admin}) 
    410411<tr> 
    411412<td style="height:1px;" class="bg_01"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    412413<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    413414</tr> 
    414415({*********}) 
    415 ({if $is_c_event_admin}) 
    416416<tr> 
    417417<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    418418<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
     
    474474<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    475475</tr> 
    476476({*********}) 
    477 ({/if}) 
    478477<tr> 
    479478<td style="height:1px;" class="bg_01" colspan="7"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    480479</tr> 
    481480({*********}) 
     481({else}) 
     482<tr> 
     483<td style="height:1px;" class="bg_01" colspan="7"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
     484</tr> 
     485({*********}) 
     486({/if}) 
    482487</table> 
    483488<!-- ここまで:主内容 --> 
    484489({*ここまで:body*}) 
     
    598603<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    599604<td class="bg_02" align="left" valign="middle"> 
    600605 
     606({if $item.image_filename1 || $item.image_filename2 || $item.image_filename3}) 
    601607<div class="padding_s lh_120"> 
     608({if $item.image_filename1})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename1})" target="_blank"><img src="({t_img_url filename=$item.image_filename1 w=120 h=120})"></a></span>({/if}) 
     609({if $item.image_filename2})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename2})" target="_blank"><img src="({t_img_url filename=$item.image_filename2 w=120 h=120})"></a></span>({/if}) 
     610({if $item.image_filename3})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename3})" target="_blank"><img src="({t_img_url filename=$item.image_filename3 w=120 h=120})"></a></span>({/if}) 
     611</div> 
     612({/if}) 
    602613 
    603 ({if $item.image_filename1 || $item.image_filename2 || $item.image_filename3}) 
    604 ({if $item.image_filename1})<a href="({t_img_url filename=$item.image_filename1})" target="_blank"><img src="({t_img_url filename=$item.image_filename1 w=120 h=120})"></a>({/if}) 
    605 ({if $item.image_filename2})<a href="({t_img_url filename=$item.image_filename2})" target="_blank"><img src="({t_img_url filename=$item.image_filename2 w=120 h=120})"></a>({/if}) 
    606 ({if $item.image_filename3})<a href="({t_img_url filename=$item.image_filename3})" target="_blank"><img src="({t_img_url filename=$item.image_filename3 w=120 h=120})"></a>({/if}) 
    607 <br> 
    608 ({/if}) 
     614<div class="padding_s lh_120"> 
    609615({$item.body|nl2br|t_url2cmd|t_cmd}) 
    610  
    611616</div> 
    612617 
    613618</td> 
  • webapp/modules/pc/templates/fh_diary_list.tpl

    old new  
    351351<!-- ここから:主内容 --> 
    352352({if $diary_list_count >= $page_size }) 
    353353<!-- ここから:主内容>>件数表示終わり --> 
    354 <table border="0" cellspacing="0" cellpadding="0" style="width:526px;" class="border_01"> 
     354<table border="0" cellspacing="0" cellpadding="0" style="width:524px;" class="border_01"> 
    355355({*********}) 
    356356<tr> 
    357357<td style="width:524px;height:1px;" class="bg_01" colspan="3"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
     
    452452<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    453453<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    454454<td class="bg_02" align="left" valign="middle"> 
    455 <div style="padding:4px 3px;"> 
    456455 
    457 ({if $item.image_filename_1}) 
    458 <a href="({t_img_url filename=$item.image_filename_1})" target="_blank"> 
    459 <img src="({t_img_url filename=$item.image_filename_1 w=120 h=120})"></a> 
    460 ({/if}) 
    461 ({if $item.image_filename_2}) 
    462 <a href="({t_img_url filename=$item.image_filename_2})" target="_blank"> 
    463 <img src="({t_img_url filename=$item.image_filename_2 w=120 h=120})"></a> 
    464 ({/if}) 
    465 ({if $item.image_filename_3}) 
    466 <a href="({t_img_url filename=$item.image_filename_3})" target="_blank"> 
    467 <img src="({t_img_url filename=$item.image_filename_3 w=120 h=120})"></a> 
    468 ({/if}) 
     456<div style="padding:4px 3px;" class="lh_120"> 
     457 
    469458({if $item.image_filename_1||$item.image_filename_2||$item.image_filename_3}) 
    470 <br> 
     459<div> 
     460({if $item.image_filename_1})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename_1})" target="_blank"><img src="({t_img_url filename=$item.image_filename_1 w=120 h=120})"></a></span>({/if}) 
     461({if $item.image_filename_2})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename_2})" target="_blank"><img src="({t_img_url filename=$item.image_filename_2 w=120 h=120})"></a></span>({/if}) 
     462({if $item.image_filename_3})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename_3})" target="_blank"><img src="({t_img_url filename=$item.image_filename_3 w=120 h=120})"></a></span>({/if}) 
     463</div> 
    471464({/if}) 
    472465 
    473466({$item.body|t_truncate:"120"}) 
    474467 
    475468</div> 
     469 
    476470</td> 
    477471<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    478472</tr> 
     
    511505<!-- ここまで:主内容>>日記表示 --> 
    512506({if $diary_list_count >= $page_size }) 
    513507<!-- ここから:主内容>>件数表示終わり --> 
    514 <table border="0" cellspacing="0" cellpadding="0" style="width:526px;" class="border_01"> 
     508<table border="0" cellspacing="0" cellpadding="0" style="width:524px;" class="border_01"> 
    515509({*********}) 
    516510<tr> 
    517 <td style="width:524px;height:1px;" class="bg_01" colspan="3"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
     511<td style="width:522px;height:1px;" class="bg_01" colspan="3"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    518512</tr> 
    519513({*********}) 
    520514<tr> 
    521515<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    522 <td style="width:522px;" class="bg_06" align="right" valign="middle"> 
     516<td style="width:520px;" class="bg_06" align="right" valign="middle"> 
    523517<div style="padding:4px 3px;"> 
    524518 
    525519({if $is_prev}) 
     
    542536</tr> 
    543537({*********}) 
    544538<tr> 
    545 <td style="width:524px;height:1px;" class="bg_01" colspan="3"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
     539<td style="width:522px;height:1px;" class="bg_01" colspan="3"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    546540</tr> 
    547541({*********}) 
    548542</table> 
     
    584578<!-- *ここから:Blog一覧>内容* --> 
    585579({*ここから:header*}) 
    586580<!-- ここから:小タイトル --> 
    587 <table border="0" cellspacing="0" cellpadding="0" style="width:526px;" class="border_01"> 
     581<table border="0" cellspacing="0" cellpadding="0" style="width:524px;" class="border_01"> 
    588582<tr> 
    589583<td style="width:36px;" class="bg_06"><img src="({t_img_url_skin filename=content_header_1})" style="width:30px;height:20px;" class="dummy"></td> 
    590 <td style="width:488px;padding:2px 0px;" class="bg_06"><span class="b_b c_00"> 
     584<td style="width:486px;padding:2px 0px;" class="bg_06"><span class="b_b c_00"> 
    591585<a name="blog"> 
    592586({if !$all}) 
    593587({$target_member.nickname})({if $type == "f"})さん({/if})({$date_val.year})年({$date_val.month})月({if $date_val.day})({$date_val.day})日({/if})のBlog 
  • webapp/modules/pc/templates/fh_diary.tpl

    old new  
    400400<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    401401<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    402402<td class="bg_02" align="left" valign="middle"> 
     403 
    403404<div style="padding:4px 3px;"> 
    404405 
    405 ({if $target_diary.image_filename_1}) 
    406 <a href="({t_img_url filename=$target_diary.image_filename_1})" target="_blank"> 
    407 <img src="({t_img_url filename=$target_diary.image_filename_1 w=120 h=120})"></a> 
     406({if $target_diary.image_filename_1 || $target_diary.image_filename_2 || $target_diary.image_filename_3}) 
     407<div> 
     408({if $target_diary.image_filename_1})<span class="padding_s"><a href="({t_img_url filename=$target_diary.image_filename_1})" target="_blank"><img src="({t_img_url filename=$target_diary.image_filename_1 w=120 h=120})"></a></span>({/if}) 
     409({if $target_diary.image_filename_2})<span class="padding_s"><a href="({t_img_url filename=$target_diary.image_filename_2})" target="_blank"><img src="({t_img_url filename=$target_diary.image_filename_2 w=120 h=120})"></a></span>({/if}) 
     410({if $target_diary.image_filename_3})<span class="padding_s"><a href="({t_img_url filename=$target_diary.image_filename_3})" target="_blank"><img src="({t_img_url filename=$target_diary.image_filename_3 w=120 h=120})"></a></span>({/if}) 
     411</div> 
    408412({/if}) 
    409413 
    410 ({if $target_diary.image_filename_2}) 
    411 <a href="({t_img_url filename=$target_diary.image_filename_2})" target="_blank"> 
    412 <img src="({t_img_url filename=$target_diary.image_filename_2 w=120 h=120})"></a> 
    413 ({/if}) 
    414  
    415 ({if $target_diary.image_filename_3}) 
    416 <a href="({t_img_url filename=$target_diary.image_filename_3})" target="_blank"> 
    417 <img src="({t_img_url filename=$target_diary.image_filename_3 w=120 h=120})"></a> 
    418 ({/if}) 
    419  
    420414<div class="lh_120" id="DOM_fh_diary_body"> 
    421415({$target_diary.body|nl2br|t_url2cmd|t_cmd}) 
    422416</div> 
     
    554548<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    555549<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    556550<td class="bg_02" align="left" valign="middle"> 
     551 
    557552<div style="padding:4px 3px;" class="lh_120 DOM_fh_diary_comment_body"> 
    558553 
    559 ({if $item.image_filename_1||$item.image_filename_2||$item.image_filename_3}) 
    560 ({if $item.image_filename_1})<a href="({t_img_url filename=$item.image_filename_1})" target="_blank"><img src="({t_img_url filename=$item.image_filename_1 w=120 h=120})"></a>({/if}) 
    561 ({if $item.image_filename_2})<a href="({t_img_url filename=$item.image_filename_2})" target="_blank"><img src="({t_img_url filename=$item.image_filename_2 w=120 h=120})"></a>({/if}) 
    562 ({if $item.image_filename_3})<a href="({t_img_url filename=$item.image_filename_3})" target="_blank"><img src="({t_img_url filename=$item.image_filename_3 w=120 h=120})"></a>({/if}) 
     554({if $item.image_filename_1 || $item.image_filename_2 || $item.image_filename_3}) 
     555 
     556({if $item.image_filename_1})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename_1})" target="_blank"><img src="({t_img_url filename=$item.image_filename_1 w=120 h=120})"></a></span>({/if}) 
     557({if $item.image_filename_2})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename_2})" target="_blank"><img src="({t_img_url filename=$item.image_filename_2 w=120 h=120})"></a></span>({/if}) 
     558({if $item.image_filename_3})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename_3})" target="_blank"><img src="({t_img_url filename=$item.image_filename_3 w=120 h=120})"></a></span>({/if}) 
    563559<br> 
    564560({/if}) 
    565561 
    566562({$item.body|nl2br|t_url2cmd|t_cmd}) 
    567563 
    568564</div> 
     565 
    569566</td> 
    570567<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    571568</tr> 
     
    582579({*ここから:footer*}) 
    583580({if $type == "h"}) 
    584581<!-- ここから:削除 --> 
    585 <table border="0" cellspacing="0" cellpadding="0" style="width:526px;" class="border_01"> 
     582<table border="0" cellspacing="0" cellpadding="0" style="width:524px;" class="border_01"> 
    586583({*********}) 
    587584<tr> 
    588585<td style="height:1px;" class="bg_01" colspan="3"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
  • webapp/modules/pc/templates/f_message_send.tpl

    old new  
    281281<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    282282<td class="bg_03" align="center" valign="middle" colspan="3"> 
    283283 
    284 <div class="padding_w_m"
     284<div class="padding_w_m" align="center"
    285285 
    286 <div align="center" style="text-align:center;"> 
     286<table border="0" cellspacing="0" cellpadding="0"> 
     287<tr> 
     288<td align="right" style="padding-right:6px;"> 
    287289<input type="submit" class="submit" value=" 確認画面 "> 
     290</td> 
     291<td align="left" style="padding-left:6px;"> 
    288292<input name="save" type="submit" class="submit" value=" 下書き保存 "> 
    289 </div> 
     293</td> 
     294</table> 
    290295 
    291296</div> 
    292297 
  • webapp/modules/pc/templates/c_event_list.tpl

    old new  
    248248<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td> 
    249249<td style="width:521px;" class="bg_02" align="left" valign="middle"> 
    250250 
     251({if $item.image_filename1 || $item.image_filename2 || $item.image_filename3}) 
     252<div class="padding_s"> 
     253({if $item.image_filename1})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename1})" target="_blank"><img src="({t_img_url filename=$item.image_filename1 w=120 h=120})"></a></span>({/if}) 
     254({if $item.image_filename2})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename2})" target="_blank"><img src="({t_img_url filename=$item.image_filename2 w=120 h=120})"></a></span>({/if}) 
     255({if $item.image_filename3})<span class="padding_s"><a href="({t_img_url filename=$item.image_filename3})" target="_blank"><img src="({t_img_url filename=$item.image_filename3 w=120 h=120})"></a></span>({/if}) 
     256</div> 
     257({/if}) 
     258 
    251259<div class="padding_s lh_120"> 
    252260 
    253 ({if $item.image_filename1})<a href="({t_img_url filename=$item.image_filename1})" target="_blank"><img src="({t_img_url filename=$item.image_filename1 w=120 h=120})"></a>({/if}) 
    254 ({if $item.image_filename2})<a href="({t_img_url filename=$item.image_filename2})" target="_blank"><img src="({t_img_url filename=$item.image_filename2 w=120 h=120})"></a>({/if}) 
    255 ({if $item.image_filename3})<a href="({t_img_url filename=$item.image_filename3})" target="_blank"><img src="({t_img_url filename=$item.image_filename3 w=120 h=120})"></a>({/if}) 
    256 <br> 
    257261({$item.body|nl2br}) 
    258262 
    259263</div> 
  • webapp/version.php

    old new