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

Changeset 8560


Ignore:
Timestamp:
Oct 4, 2008, 7:59:44 PM (12 years ago)
Author:
shingo
Message:

カスタムSVNをコミット

Location:
OpenPNE/branches/work/yamada/212_custom
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/work/yamada/212_custom/webapp/lib/db/commu.php

    r8528 r8560  
    31903190{
    31913191    $c_commu_id_list = db_commu_c_commu_list_all4c_member_id($c_member_id);
     3192    if (!$c_commu_id_list) {
     3193        return false;
     3194    }
     3195
    31923196    $where_phrase = '';
    31933197    foreach ($c_commu_id_list as $c_commu_id) {
     
    33193323
    33203324    $c_commu_id_list = db_commu_c_commu_list_all4c_member_id($c_member_id);
     3325    if (!$c_commu_id_list) {
     3326        return false;
     3327    }
    33213328    $where_phrase = '';
    33223329    foreach ($c_commu_id_list as $c_commu_id) {
     
    33283335    }
    33293336
    3330     $sql = 'SELECT ctc.*, c_commu.name, c_commu.image_filename, c_commu.c_member_id_admin, c_commu.c_member_id_sub_admin,'
     3337    $sql = 'SELECT ctc.*, c_commu.name, c_commu.image_filename,'
     3338         . ' c_commu.c_member_id_admin, c_commu.c_member_id_sub_admin,'
    33313339         . ' c_member.nickname, c_member.image_filename as member_image_filename'
    33323340         . ' FROM c_commu_echo AS ctc'
    33333341         . ' LEFT JOIN c_commu USING (c_commu_id)'
    33343342         . ' LEFT JOIN c_member USING (c_member_id) '
    3335          . $where_phrase . ' ORDER BY ctc.r_datetime';
     3343         . $where_phrase . ' ORDER BY ctc.r_datetime DESC';
    33363344    $params = array(intval($c_commu_id));
    33373345    $lst = db_get_all_limit($sql, 0, $limit);
  • OpenPNE/branches/work/yamada/212_custom/webapp/modules/pc/do/c_echo_write_delete.php

    r8528 r8560  
    1515
    1616        $target_c_commu_echo_id = $requests['target_c_commu_echo_id'];
    17 print 'OK';
    18 exit;
    1917
    2018        //--- 権限チェック
     
    3331        db_commu_delete_c_commu_echo($target_c_commu_echo_id);
    3432
    35         if ($c_commu_topic['event_flag']) {
    36             $action = 'page_c_event_detail';
    37         } else {
    38             $action = 'page_c_topic_detail';
    39         }
     33        $action = 'page_c_echo';
    4034        $p = array('target_c_commu_id' => $c_commu_id);
    4135        openpne_redirect('pc', $action, $p);
  • OpenPNE/branches/work/yamada/212_custom/webapp/modules/pc/templates/c_echo.tpl

    r8528 r8560  
    7272<table class="echo">
    7373({foreach from=$c_echo_write item=item})
    74 
    75 ({t_form_block m=pc a=do_c_echo_write_delete})
    76 <input type="hidden" name="target_c_commu_echo_id" value="({$item.c_commu_echo_id})" />
    7774<tr>
    7875<td style="padding:5px;width:100px;text-align:center;">
     
    9188({$item.body|nl2br|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})&nbsp;&nbsp;
    9289<span class="({$item.css_pass_time})">({$item.view_pass_time})</span>
    93 ({if $c_member_id == $item.c_member_id || $c_member_id == $c_commu.c_member_id_admin || $c_member_id == $c_commu.c_member_id_sub_admin}) <a href="javascript:if(confirm('削除しますか?')){location='({t_url m=pc a=do_c_echo_write_delete})&amp;target_c_commu_echo_id=({$item.c_commu_echo_id})'}">削除</a>({/if})</p>
     90({if $c_member_id == $item.c_member_id || $c_member_id == $c_commu.c_member_id_admin || $c_member_id == $c_commu.c_member_id_sub_admin}) <a href="javascript:if(confirm('削除しますか?')){location='({t_url m=pc a=do_c_echo_write_delete})&amp;target_c_commu_echo_id=({$item.c_commu_echo_id})&amp;sessid=({$PHPSESSID})'}">削除</a>({/if})</p>
    9491</div>
    9592({if $item.filename && $smarty.const.OPENPNE_USE_FILEUPLOAD})
     
    10097</td>
    10198</tr>
    102 ({/t_form_block})
    10399
    104100({/foreach})
    105101</table>
    106 
    107 
    108 
    109 
    110102
    111103({$smarty.capture.pager|smarty:nodefaults})
     
    113105</div></div>
    114106({* }}} *})
     107
     108({else})
     109({* {{{ simpleBox *})
     110<div class="dparts simpleBox"><div class="parts">
     111<div class="partsHeading"><h3>({$WORD_COMMUNITY})エコー・書き込み一覧</h3></div>
     112<div class="block">
     113<p>({$WORD_COMMUNITY})エコーの書き込みはありません。</p>
     114</div>
     115</div></div>
     116({* }}} *})
    115117({/if})
    116 
    117118
    118119</div><!-- Center -->
  • OpenPNE/branches/work/yamada/212_custom/webapp/modules/pc/templates/c_home.tpl

    r8528 r8560  
    110110({if $inc_entry_point[6]})({$inc_entry_point[6]|smarty:nodefaults|t_url2cmd:'entry_point'|t_cmd:'entry_point'})({/if})
    111111
    112 ({if $is_c_commu_member || $c_commu.public_flag != "auth_commu_member"})
     112({if $is_c_commu_member || ($c_commu.public_flag != "auth_commu_member" && $new_echo)})
    113113({* {{{ homeMainTable *})
    114114<div class="dparts homeMainTable"><div class="parts">
     
    120120<td>
    121121<a href="({t_url m=pc a=page_f_home})&amp;target_c_member_id=({$item.c_member_id})">({$item.nickname})</a><img src="./skin/default/img/icon_arrow_2.gif" style="vertical-align: -0.2em;">
    122 ({$item.body|nl2br|mb_strimwidth:0:95:"...":'UTF-8'|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})&nbsp;&nbsp;<span class="({$item.css_pass_time})">({$item.view_pass_time})</span>({if $c_member_id == $item.c_member_id || $c_member_id == $c_commu.c_member_id_admin || $c_member_id == $c_commu.c_member_id_sub_admin}) <a href="({t_url m=pc a=page_c_echo_write_delete_confirm})&amp;target_c_commu_echo_comment_id=({$item.c_commu_echo_comment_id})">削除</a>({/if})
     122({$item.body|nl2br|mb_strimwidth:0:70:"...":'UTF-8'|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})&nbsp;&nbsp;<span class="({$item.css_pass_time})">({$item.view_pass_time})</span>({if $c_member_id == $item.c_member_id || $c_member_id == $c_commu.c_member_id_admin || $c_member_id == $c_commu.c_member_id_sub_admin}) <a href="({t_url m=pc a=page_c_echo_write_delete_confirm})&amp;target_c_commu_echo_comment_id=({$item.c_commu_echo_comment_id})">削除</a>({/if})
    123123</td>
    124124</tr>
     
    127127</div>
    128128<ul class="moreInfo" style="height:17px; margin-top:3px;">
     129({if $new_echo})
    129130<li style="width:90px; height:30px; float:right;"><a href="({t_url m=pc a=page_c_echo})&amp;target_c_commu_id=({$c_commu.c_commu_id})">もっと読む({if $is_c_commu_member})・書く({/if})</a></li>
     131({else})
     132<li style="width:160px; height:30px; float:right;"><a href="({t_url m=pc a=page_c_echo})&amp;target_c_commu_id=({$c_commu.c_commu_id})">({$WORD_COMMUNITY})エコーを書き込む</a></li>
     133({/if})
    130134</ul>
    131135</div>
  • OpenPNE/branches/work/yamada/212_custom/webapp/modules/pc/templates/h_echo.tpl

    r8528 r8560  
    9191</div></div>
    9292({* }}} *})
     93({else})
     94({* {{{ simpleBox *})
     95<div class="dparts simpleBox"><div class="parts">
     96<div class="partsHeading"><h3>({$WORD_COMMUNITY})エコー・書き込み一覧</h3></div>
     97<div class="block">
     98<p>({$WORD_COMMUNITY})エコーの書き込みはありません。</p>
     99</div>
     100</div></div>
     101({* }}} *})
    93102({/if})
    94103
  • OpenPNE/branches/work/yamada/212_custom/webapp/modules/pc/templates/h_home.tpl

    r8528 r8560  
    375375({if $inc_entry_point[9]})({$inc_entry_point[9]|smarty:nodefaults|t_url2cmd:'entry_point'|t_cmd:'entry_point'})({/if})
    376376
     377({if $c_commu_user_list &&  $new_echo})
    377378({* {{{ homeMainTable *})
    378379<div class="dparts homeMainTable"><div class="parts">
     
    381382({foreach from=$new_echo item=item})
    382383<tr>
    383 <th style="width:55px;text-align:center;"><a href="({t_url m=pc a=page_f_home})&amp;target_c_member_id=({$item.c_member_id})"><img src="({t_img_url filename=$item.image_filename w=45 h=45 noimg=no_image})" alt="({$c_member.nickname})" /></a></th>
    384384<td>
    385 <a href="({t_url m=pc a=page_f_home})&amp;target_c_member_id=({$item.c_member_id})">({$item.nickname})</a><img src="./skin/default/img/icon_arrow_2.gif" style="vertical-align: -0.2em;">
    386 ({$item.body|nl2br|mb_strimwidth:0:95:"...":'UTF-8'|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})&nbsp;&nbsp;<span class="({$item.css_pass_time})">({$item.view_pass_time})</span>({if $c_member_id == $item.c_member_id || $c_member_id == $c_commu.c_member_id_admin || $c_member_id == $c_commu.c_member_id_sub_admin}) <a href="({t_url m=pc a=page_c_echo_write_delete_confirm})&amp;target_c_commu_echo_comment_id=({$item.c_commu_echo_comment_id})">削除</a>({/if})
     385<a href="({t_url m=pc a=page_f_home})&amp;target_c_member_id=({$item.c_member_id})">({$item.nickname|mb_strimwidth:0:30:"...":'UTF-8'})</a><img src="./skin/default/img/icon_arrow_2.gif" style="vertical-align: -0.2em;">
     386({$item.body|nl2br|mb_strimwidth:0:60:"...":'UTF-8'|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})
     387&nbsp;(<a href="({t_url m=pc a=page_c_echo})&amp;target_c_commu_id=({$item.c_commu_id})">({$item.name|mb_strimwidth:0:20:"...":'UTF-8'})</a>)
     388&nbsp;&nbsp;<span class="({$item.css_pass_time})">({$item.view_pass_time})</span>
    387389</td>
     390<td style="width:55px;text-align:center;"><a href="({t_url m=pc a=page_c_echo})&amp;target_c_commu_id=({$item.c_commu_id})"><img src="({t_img_url filename=$item.image_filename w=45 h=45 noimg=no_image})" alt="({$c_member.name})" /></a></td>
    388391</tr>
    389392({/foreach})
     
    395398</div>
    396399({* }}} *})
     400({/if})
    397401
    398402({if $c_diary_friend_list || $c_rss_cache_list || $c_diary_my_comment_list || $c_commu_topic_comment_list || $c_friend_review_list || $c_friend_album_list})
Note: See TracChangeset for help on using the changeset viewer.