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

Changeset 7233


Ignore:
Timestamp:
May 15, 2008, 8:14:17 PM (11 years ago)
Author:
ebihara
Message:

#2399:日記以外の場所でも自分のアルバム小窓・アルバム画像小窓であればURLを変換するようにした

Location:
OpenPNE/trunk
Files:
35 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/trunk/webapp/modules/admin/templates/commu_list.tpl

    r6410 r7233  
    9494({/if})
    9595({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
    96 ({$item.info|nl2br|t_url2cmd:'community'|t_cmd:'community'})
     96({$item.info|nl2br|t_url2cmd:'community':$item.c_member_id_admin|t_cmd:'community'})
    9797({else})
    9898({$item.info|nl2br})
  • OpenPNE/trunk/webapp/modules/admin/templates/delete_commu.tpl

    r6410 r7233  
    5656({/if})
    5757({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
    58 ({$commu.info|nl2br|t_url2cmd:'community'|t_cmd:'community'})
     58({$commu.info|nl2br|t_url2cmd:'community':$commu.c_member_id_admin|t_cmd:'community'})
    5959({else})
    6060({$commu.info|nl2br})
  • OpenPNE/trunk/webapp/modules/admin/templates/delete_diary.tpl

    r6402 r7233  
    5858({/if})
    5959({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
    60 ({$diary.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})
     60({$diary.body|nl2br|t_url2cmd:'diary':$diary.c_member_id|t_cmd:'diary'})
    6161({else})
    6262({$diary.body|nl2br})
  • OpenPNE/trunk/webapp/modules/admin/templates/delete_diary_comment.tpl

    r6402 r7233  
    5858({/if})
    5959({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
    60 ({$diary_comment.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})
     60({$diary_comment.body|nl2br|t_url2cmd:'diary':$diary_comment.$c_member_id|t_cmd:'diary'})
    6161({else})
    6262({$diary_comment.body|nl2br})
  • OpenPNE/trunk/webapp/modules/admin/templates/delete_topic.tpl

    r6410 r7233  
    6666({/if})
    6767({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
    68 ({$topic.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
     68({$topic.body|nl2br|t_url2cmd:'community':$topic.c_member_id|t_cmd:'community'})
    6969({else})
    7070({$topic.body|nl2br})
  • OpenPNE/trunk/webapp/modules/admin/templates/delete_topic_comment.tpl

    r6534 r7233  
    6666({/if})
    6767({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
    68 ({$topic_comment.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
     68({$topic_comment.body|nl2br|t_url2cmd:'community':$topic_comment.c_member_id|t_cmd:'community'})
    6969({else})
    7070({$topic_comment.body|nl2br})
  • OpenPNE/trunk/webapp/modules/admin/templates/diary_comment_list.tpl

    r6527 r7233  
    104104({/if})
    105105({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
    106 ({$item.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})
     106({$item.body|nl2br|t_url2cmd:'diary':$item.c_member_id|t_cmd:'diary'})
    107107({else})
    108108({$item.body|nl2br})
  • OpenPNE/trunk/webapp/modules/admin/templates/topic_comment_list.tpl

    r6534 r7233  
    106106({/if})
    107107({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
    108 ({$item.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
     108({$item.body|nl2br|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})
    109109({else})
    110110({$item.body|nl2br})
  • OpenPNE/trunk/webapp/modules/admin/templates/topic_list.tpl

    r6527 r7233  
    106106({/if})
    107107({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
    108 ({$item.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
     108({$item.body|nl2br|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})
    109109({else})
    110110({$item.body|nl2br})
  • OpenPNE/trunk/webapp/modules/pc/init.inc

    r7206 r7233  
    7070        $u = $GLOBALS['AUTH']->uid();
    7171        $smarty->assign('C_MEMBER_CONFIG', util_get_c_member_config($u));
     72        $smarty->assign('u', $u);
    7273    }
    7374
  • OpenPNE/trunk/webapp/modules/pc/page/c_edit.php

    r6630 r7233  
    7070
    7171        $this->set('is_unused_join_commu', util_is_unused_mail('m_pc_join_commu'));
    72         $this->set('u', $u);
    7372
    7473        return 'success';
  • OpenPNE/trunk/webapp/modules/pc/page/c_edit_member.php

    r6775 r7233  
    4242        $this->set("page", $page);
    4343
    44         $this->set("u", $u);
    45 
    4644        return 'success';
    4745    }
  • OpenPNE/trunk/webapp/modules/pc/page/c_member_review.php

    r6775 r7233  
    3131        $this->set('c_commu', $c_commu);
    3232        $this->set("is_c_commu_member", db_commu_is_c_commu_member($c_commu_id, $u));
    33         $this->set('u', $u);
    3433
    3534        return 'success';
  • OpenPNE/trunk/webapp/modules/pc/page/f_show_image.php

    r4933 r7233  
    2020
    2121        $this->set('inc_navi', fetch_inc_navi("f", $target_c_member_id));
    22         $this->set("u", $u);
    2322
    2423        //メンバー情報
  • OpenPNE/trunk/webapp/modules/pc/page/h_message_box.php

    r6630 r7233  
    2525
    2626        $this->set('inc_navi', fetch_inc_navi("h"));
    27 
    28         $this->set('u', $u);
    2927
    3028        // 1ページ当たりに表示するメッセージ数
  • OpenPNE/trunk/webapp/modules/pc/templates/c_event_add_confirm.tpl

    r6014 r7233  
    1212<tr><th>開催日時</th><td>({$event.open_date_year})年({$event.open_date_month})月({$event.open_date_day})日 ({$event.open_date_comment})</td></tr>
    1313<tr><th>開催場所</th><td>({$event.open_pref_value}) ({$event.open_pref_comment})</td></tr>
    14 <tr><th>詳細</th><td>({$event.detail|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
     14<tr><th>詳細</th><td>({$event.detail|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
    1515<tr><th>募集期限</th><td>
    1616({if $event.invite_period_year&&$event.invite_period_month&&$event.invite_period_day})
  • OpenPNE/trunk/webapp/modules/pc/templates/c_event_detail.tpl

    r7224 r7233  
    4646</tr><tr>
    4747<th>詳細</th>
    48 <td>({$c_topic.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td>
     48<td>({$c_topic.body|nl2br|t_url2cmd:'community':$c_topic.c_member_id|t_cmd:'community'})</td>
    4949</tr><tr>
    5050<th>募集期限</th>
     
    139139</ul>
    140140({/if})
    141 <p class="text">({$item.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</p>
     141<p class="text">({$item.body|nl2br|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})</p>
    142142</div>
    143143</dd>
  • OpenPNE/trunk/webapp/modules/pc/templates/c_event_mail_confirm.tpl

    r6316 r7233  
    1717</div>
    1818</td></tr>
    19 <tr><th>メッセージ</th><td>({$body|nl2br|t_url2cmd:'message'|t_cmd:'message'})</td></tr>
     19<tr><th>メッセージ</th><td>({$body|nl2br|t_url2cmd:'message':$u|t_cmd:'message'})</td></tr>
    2020</table>
    2121<div class="operation">
  • OpenPNE/trunk/webapp/modules/pc/templates/c_event_write_confirm.tpl

    r6014 r7233  
    99</div>
    1010<table>
    11 <tr><th>本文</th><td>({$event_write.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
     11<tr><th>本文</th><td>({$event_write.body|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
    1212({if $event_write.image_filename1})
    1313<tr><th>写真1</th><td>({$event_write.image_filename1})</td></tr>
  • OpenPNE/trunk/webapp/modules/pc/templates/c_event_write_delete_confirm.tpl

    r6130 r7233  
    77
    88<table>
    9 <tr><th></th><td>({$c_commu_topic_comment.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
     9<tr><th></th><td>({$c_commu_topic_comment.body|nl2br|t_url2cmd:'community':$c_commu_topic_comment.c_member_id|t_cmd:'community'})</td></tr>
    1010</table>
    1111
  • OpenPNE/trunk/webapp/modules/pc/templates/c_home.tpl

    r7154 r7233  
    133133({/if})
    134134</td></tr>
    135 <tr><th>({$WORD_COMMUNITY})<br />説明文</th><td>({$c_commu.info|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
     135<tr><th>({$WORD_COMMUNITY})<br />説明文</th><td>({$c_commu.info|nl2br|t_url2cmd:'community':$c_commu.c_member_id_admin|t_cmd:'community'})</td></tr>
    136136({if $is_c_commu_member || $c_commu.public_flag != "auth_commu_member"})
    137137({if $new_topic_comment})
  • OpenPNE/trunk/webapp/modules/pc/templates/c_topic_add_confirm.tpl

    r6014 r7233  
    1010<table>
    1111<tr><th>タイトル</th><td>({$c_topic.title})</td></tr>
    12 <tr><th>本文</th><td>({$c_topic.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
     12<tr><th>本文</th><td>({$c_topic.body|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
    1313({if $c_topic.image_filename1})
    1414<tr><th>写真1</th><td>({$c_topic.image_filename1})</td></tr>
  • OpenPNE/trunk/webapp/modules/pc/templates/c_topic_detail.tpl

    r7224 r7233  
    2727({/if})
    2828<p class="text">
    29 ({$c_topic.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
     29({$c_topic.body|nl2br|t_url2cmd:'community':$c_topic.c_member_id|t_cmd:'community'})
    3030</p>
    3131</div>
     
    105105</ul>
    106106({/if})
    107 <p class="text">({$item.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</p>
     107<p class="text">({$item.body|nl2br|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})</p>
    108108</div>
    109109({if $item.filename && $smarty.const.OPENPNE_USE_FILEUPLOAD})
  • OpenPNE/trunk/webapp/modules/pc/templates/c_topic_write_confirm.tpl

    r6531 r7233  
    99</div>
    1010<table>
    11 <tr><th>本文</th><td>({$topic_write.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
     11<tr><th>本文</th><td>({$topic_write.body|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
    1212({if $topic_write.image_filename1})
    1313<tr><th>写真1</th><td>({$topic_write.image_filename1})</td></tr>
  • OpenPNE/trunk/webapp/modules/pc/templates/c_topic_write_delete_confirm.tpl

    r6532 r7233  
    1313({if $c_commu_topic_comment.image_filename3})<img src="({t_img_url filename=$c_commu_topic_comment.image_filename3 w=120 h=120})" alt="" />({/if})
    1414<br />({/if})<br />
    15 ({$c_commu_topic_comment.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
     15({$c_commu_topic_comment.body|nl2br|t_url2cmd:'community':$c_member.c_member_id|t_cmd:'community'})
    1616</td></tr>
    1717({if $smarty.const.OPENPNE_USE_FILEUPLOAD})
  • OpenPNE/trunk/webapp/modules/pc/templates/f_message_send_confirm.tpl

    r6536 r7233  
    2323<tr>
    2424<th>メッセージ</th>
    25 <td>({$form_val.body|nl2br|t_url2cmd:'message'|t_cmd:'message'})</td>
     25<td>({$form_val.body|nl2br|t_url2cmd:'message':$u|t_cmd:'message'})</td>
    2626</tr>
    2727({if $form_val.upfile_1.name})
  • OpenPNE/trunk/webapp/modules/pc/templates/fh_delete_comment.tpl

    r6189 r7233  
    1212<div class="title">
    1313<p class="heading"><strong>({$target_diary_comment.number})</strong>: <a href="({t_url m=pc a=page_f_home})&amp;target_c_member_id=({$target_diary_comment.c_member_id})">({$target_diary_comment.nickname|default:""})</a><br />
    14 ({$target_diary_comment.body|nl2br|default:"&nbsp;"|t_url2cmd:'diary'|t_cmd:'diary'})<br /></p>
     14({$target_diary_comment.body|nl2br|default:"&nbsp;"|t_url2cmd:'diary':$target_diary_comment.c_member_id|t_cmd:'diary'})<br /></p>
    1515</div>
    1616</dd>
  • OpenPNE/trunk/webapp/modules/pc/templates/fh_diary.tpl

    r7224 r7233  
    190190</ul>
    191191({/if})
    192 <p class="text">({$item.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})</p>
     192<p class="text">({$item.body|nl2br|t_url2cmd:'diary':$item.c_member_id|t_cmd:'diary'})</p>
    193193</div>
    194194</dd>
  • OpenPNE/trunk/webapp/modules/pc/templates/fh_diary_comment_confirm.tpl

    r6402 r7233  
    99</div>
    1010<table>
    11 <tr><th>本文</th><td>({$form_val.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})</td></tr>
     11<tr><th>本文</th><td>({$form_val.body|nl2br|t_url2cmd:'diary':$u|t_cmd:'diary'})</td></tr>
    1212({if $form_val.upfile_1.name})
    1313<tr><th>写真1</th><td>({$form_val.upfile_1.name})</td></tr>
  • OpenPNE/trunk/webapp/modules/pc/templates/h_com_add_confirm.tpl

    r6410 r7233  
    1010<tr><th>カテゴリ</th><td>({$c_commu_category_value})<br /></td></tr>
    1111<tr><th>参加条件と<br />公開範囲</th><td>({$public_flag_value})<br /></td></tr>
    12 <tr><th>({$WORD_COMMUNITY})説明文</th><td>({$form_val.info|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
     12<tr><th>({$WORD_COMMUNITY})説明文</th><td>({$form_val.info|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
    1313<tr><th>写真</th><td>({$form_val.image_filename})<br /></td></tr>
    1414</table>
  • OpenPNE/trunk/webapp/modules/pc/templates/h_config_prof_confirm.tpl

    r6617 r7233  
    6868
    6969({if $profile.form_type == 'textarea'})
    70     ({$prof.profile[$profile.name].value|nl2br|t_url2cmd:'profile'|t_cmd:'profile'})
     70    ({$prof.profile[$profile.name].value|nl2br|t_url2cmd:'profile':$u|t_cmd:'profile'})
    7171({elseif $profile.form_type == 'checkbox'})
    7272    ({$prof.profile[$profile.name].value|@t_implode:", "})
  • OpenPNE/trunk/webapp/modules/pc/templates/h_message.tpl

    r6536 r7233  
    6161</ul>
    6262({/if})
    63 <p class="text">({$c_message.body|nl2br|t_url2cmd:'message'|t_cmd:'message'})</p>
     63<p class="text">({$c_message.body|nl2br|t_url2cmd:'message':$c_message.c_member_id_from|t_cmd:'message'})</p>
    6464</div>
    6565
  • OpenPNE/trunk/webapp/modules/pc/templates/h_regist_prof_confirm.tpl

    r6617 r7233  
    6363
    6464({if $profile.form_type == 'textarea'})
    65     ({$prof.profile[$profile.name].value|nl2br|t_url2cmd:'profile'|t_cmd:'profile'})
     65    ({$prof.profile[$profile.name].value|nl2br|t_url2cmd:'profile':$u|t_cmd:'profile'})
    6666({elseif $profile.form_type == 'checkbox'})
    6767    ({$prof.profile[$profile.name].value|@t_implode:", "})
  • OpenPNE/trunk/webapp/modules/pc/templates/inc_f_home_h_prof.tpl

    r7154 r7233  
    274274<tr><th>({$item.caption})</th><td>
    275275({if $item.form_type == 'textarea'})
    276     ({$item.value|nl2br|t_url2cmd:'profile'|t_cmd:'profile'})
     276    ({$item.value|nl2br|t_url2cmd:'profile':$target_c_member_id|t_cmd:'profile'})
    277277({elseif $item.form_type == 'checkbox'})
    278278    ({$item.value|@t_implode:", "})
  • OpenPNE/trunk/webapp_biz/modules/pc/templates/inc_f_home_h_prof.tpl

    r7154 r7233  
    260260<tr><th>({$item.caption})</th><td>
    261261({if $item.form_type == 'textarea'})
    262     ({$item.value|nl2br|t_url2cmd:'profile'|t_cmd:'profile'})
     262    ({$item.value|nl2br|t_url2cmd:'profile':$target_c_member_id|t_cmd:'profile'})
    263263({elseif $item.form_type == 'checkbox'})
    264264    ({$item.value|@t_implode:", "})
Note: See TracChangeset for help on using the changeset viewer.