Changeset 7233

Timestamp:

May 15, 2008, 8:14:17 PM (11 years ago)

Author:

ebihara

Message:

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

Location:

OpenPNE/trunk

Files:

• webapp/modules/admin/templates/commu_list.tpl (modified) (1 diff)
• webapp/modules/admin/templates/delete_commu.tpl (modified) (1 diff)
• webapp/modules/admin/templates/delete_diary.tpl (modified) (1 diff)
• webapp/modules/admin/templates/delete_diary_comment.tpl (modified) (1 diff)
• webapp/modules/admin/templates/delete_topic.tpl (modified) (1 diff)
• webapp/modules/admin/templates/delete_topic_comment.tpl (modified) (1 diff)
• webapp/modules/admin/templates/diary_comment_list.tpl (modified) (1 diff)
• webapp/modules/admin/templates/topic_comment_list.tpl (modified) (1 diff)
• webapp/modules/admin/templates/topic_list.tpl (modified) (1 diff)
• webapp/modules/pc/init.inc (modified) (1 diff)
• webapp/modules/pc/page/c_edit.php (modified) (1 diff)
• webapp/modules/pc/page/c_edit_member.php (modified) (1 diff)
• webapp/modules/pc/page/c_member_review.php (modified) (1 diff)
• webapp/modules/pc/page/f_show_image.php (modified) (1 diff)
• webapp/modules/pc/page/h_message_box.php (modified) (1 diff)
• webapp/modules/pc/templates/c_event_add_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/c_event_detail.tpl (modified) (2 diffs)
• webapp/modules/pc/templates/c_event_mail_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/c_event_write_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/c_event_write_delete_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/c_home.tpl (modified) (1 diff)
• webapp/modules/pc/templates/c_topic_add_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/c_topic_detail.tpl (modified) (2 diffs)
• webapp/modules/pc/templates/c_topic_write_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/c_topic_write_delete_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/f_message_send_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/fh_delete_comment.tpl (modified) (1 diff)
• webapp/modules/pc/templates/fh_diary.tpl (modified) (1 diff)
• webapp/modules/pc/templates/fh_diary_comment_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/h_com_add_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/h_config_prof_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/h_message.tpl (modified) (1 diff)
• webapp/modules/pc/templates/h_regist_prof_confirm.tpl (modified) (1 diff)
• webapp/modules/pc/templates/inc_f_home_h_prof.tpl (modified) (1 diff)
• webapp_biz/modules/pc/templates/inc_f_home_h_prof.tpl (modified) (1 diff)

OpenPNE/trunk/webapp/modules/admin/templates/commu_list.tpl

@@ -94 +94 @@
 ({/if})
 ({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
-({$item.info|nl2br|t_url2cmd:'community'|t_cmd:'community'})
+({$item.info|nl2br|t_url2cmd:'community':$item.c_member_id_admin|t_cmd:'community'})
 ({else})
 ({$item.info|nl2br})

OpenPNE/trunk/webapp/modules/admin/templates/delete_commu.tpl

@@ -56 +56 @@
 ({/if})
 ({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
-({$commu.info|nl2br|t_url2cmd:'community'|t_cmd:'community'})
+({$commu.info|nl2br|t_url2cmd:'community':$commu.c_member_id_admin|t_cmd:'community'})
 ({else})
 ({$commu.info|nl2br})

OpenPNE/trunk/webapp/modules/admin/templates/delete_diary.tpl

@@ -58 +58 @@
 ({/if})
 ({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
-({$diary.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})
+({$diary.body|nl2br|t_url2cmd:'diary':$diary.c_member_id|t_cmd:'diary'})
 ({else})
 ({$diary.body|nl2br})

OpenPNE/trunk/webapp/modules/admin/templates/delete_diary_comment.tpl

@@ -58 +58 @@
 ({/if})
 ({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
-({$diary_comment.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})
+({$diary_comment.body|nl2br|t_url2cmd:'diary':$diary_comment.$c_member_id|t_cmd:'diary'})
 ({else})
 ({$diary_comment.body|nl2br})

OpenPNE/trunk/webapp/modules/admin/templates/delete_topic.tpl

@@ -66 +66 @@
 ({/if})
 ({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
-({$topic.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
+({$topic.body|nl2br|t_url2cmd:'community':$topic.c_member_id|t_cmd:'community'})
 ({else})
 ({$topic.body|nl2br})

OpenPNE/trunk/webapp/modules/admin/templates/delete_topic_comment.tpl

@@ -66 +66 @@
 ({/if})
 ({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
-({$topic_comment.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
+({$topic_comment.body|nl2br|t_url2cmd:'community':$topic_comment.c_member_id|t_cmd:'community'})
 ({else})
 ({$topic_comment.body|nl2br})

OpenPNE/trunk/webapp/modules/admin/templates/diary_comment_list.tpl

@@ -104 +104 @@
 ({/if})
 ({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
-({$item.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})
+({$item.body|nl2br|t_url2cmd:'diary':$item.c_member_id|t_cmd:'diary'})
 ({else})
 ({$item.body|nl2br})

OpenPNE/trunk/webapp/modules/admin/templates/topic_comment_list.tpl

@@ -106 +106 @@
 ({/if})
 ({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
-({$item.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
+({$item.body|nl2br|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})
 ({else})
 ({$item.body|nl2br})

OpenPNE/trunk/webapp/modules/admin/templates/topic_list.tpl

@@ -106 +106 @@
 ({/if})
 ({if $smarty.const.OPENPNE_ADMIN_CONVERT_URL})
-({$item.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
+({$item.body|nl2br|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})
 ({else})
 ({$item.body|nl2br})

OpenPNE/trunk/webapp/modules/pc/init.inc

@@ -70 +70 @@
         $u = $GLOBALS['AUTH']->uid();
         $smarty->assign('C_MEMBER_CONFIG', util_get_c_member_config($u));
+        $smarty->assign('u', $u);
     }
 

OpenPNE/trunk/webapp/modules/pc/page/c_edit.php

@@ -70 +70 @@
 
         $this->set('is_unused_join_commu', util_is_unused_mail('m_pc_join_commu'));
-        $this->set('u', $u);
 
         return 'success';

OpenPNE/trunk/webapp/modules/pc/page/c_edit_member.php

@@ -42 +42 @@
         $this->set("page", $page);
 
-        $this->set("u", $u);
-
         return 'success';
     }

OpenPNE/trunk/webapp/modules/pc/page/c_member_review.php

@@ -31 +31 @@
         $this->set('c_commu', $c_commu);
         $this->set("is_c_commu_member", db_commu_is_c_commu_member($c_commu_id, $u));
-        $this->set('u', $u);
 
         return 'success';

OpenPNE/trunk/webapp/modules/pc/page/f_show_image.php

@@ -20 +20 @@
 
         $this->set('inc_navi', fetch_inc_navi("f", $target_c_member_id));
-        $this->set("u", $u);
 
         //メンバー情報

OpenPNE/trunk/webapp/modules/pc/page/h_message_box.php

@@ -25 +25 @@
 
         $this->set('inc_navi', fetch_inc_navi("h"));
-
-        $this->set('u', $u);
 
         // 1ページ当たりに表示するメッセージ数

OpenPNE/trunk/webapp/modules/pc/templates/c_event_add_confirm.tpl

@@ -12 +12 @@
 <tr><th>開催日時</th><td>({$event.open_date_year})年({$event.open_date_month})月({$event.open_date_day})日 ({$event.open_date_comment})</td></tr>
 <tr><th>開催場所</th><td>({$event.open_pref_value}) ({$event.open_pref_comment})</td></tr>
-<tr><th>詳細</th><td>({$event.detail|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
+<tr><th>詳細</th><td>({$event.detail|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
 <tr><th>募集期限</th><td>
 ({if $event.invite_period_year&&$event.invite_period_month&&$event.invite_period_day})

OpenPNE/trunk/webapp/modules/pc/templates/c_event_detail.tpl

@@ -46 +46 @@
 </tr><tr>
 <th>詳細</th>
-<td>({$c_topic.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td>
+<td>({$c_topic.body|nl2br|t_url2cmd:'community':$c_topic.c_member_id|t_cmd:'community'})</td>
 </tr><tr>
 <th>募集期限</th>
@@ -139 +139 @@
 </ul>
 ({/if})
-<p class="text">({$item.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</p>
+<p class="text">({$item.body|nl2br|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})</p>
 </div>
 </dd>

OpenPNE/trunk/webapp/modules/pc/templates/c_event_mail_confirm.tpl

@@ -17 +17 @@
 </div>
 </td></tr>
-<tr><th>メッセージ</th><td>({$body|nl2br|t_url2cmd:'message'|t_cmd:'message'})</td></tr>
+<tr><th>メッセージ</th><td>({$body|nl2br|t_url2cmd:'message':$u|t_cmd:'message'})</td></tr>
 </table>
 <div class="operation">

OpenPNE/trunk/webapp/modules/pc/templates/c_event_write_confirm.tpl

@@ -9 +9 @@
 </div>
 <table>
-<tr><th>本文</th><td>({$event_write.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
+<tr><th>本文</th><td>({$event_write.body|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
 ({if $event_write.image_filename1})
 <tr><th>写真1</th><td>({$event_write.image_filename1})</td></tr>

OpenPNE/trunk/webapp/modules/pc/templates/c_event_write_delete_confirm.tpl

@@ -7 +7 @@
 
 <table>
-<tr><th></th><td>({$c_commu_topic_comment.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
+<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>
 </table>
 

OpenPNE/trunk/webapp/modules/pc/templates/c_home.tpl

@@ -133 +133 @@
 ({/if})
 </td></tr>
-<tr><th>({$WORD_COMMUNITY})<br />説明文</th><td>({$c_commu.info|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
+<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>
 ({if $is_c_commu_member || $c_commu.public_flag != "auth_commu_member"})
 ({if $new_topic_comment})

OpenPNE/trunk/webapp/modules/pc/templates/c_topic_add_confirm.tpl

@@ -10 +10 @@
 <table>
 <tr><th>タイトル</th><td>({$c_topic.title})</td></tr>
-<tr><th>本文</th><td>({$c_topic.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
+<tr><th>本文</th><td>({$c_topic.body|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
 ({if $c_topic.image_filename1})
 <tr><th>写真1</th><td>({$c_topic.image_filename1})</td></tr>

OpenPNE/trunk/webapp/modules/pc/templates/c_topic_detail.tpl

@@ -27 +27 @@
 ({/if})
 <p class="text">
-({$c_topic.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
+({$c_topic.body|nl2br|t_url2cmd:'community':$c_topic.c_member_id|t_cmd:'community'})
 </p>
 </div>
@@ -105 +105 @@
 </ul>
 ({/if})
-<p class="text">({$item.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</p>
+<p class="text">({$item.body|nl2br|t_url2cmd:'community':$item.c_member_id|t_cmd:'community'})</p>
 </div>
 ({if $item.filename && $smarty.const.OPENPNE_USE_FILEUPLOAD})

OpenPNE/trunk/webapp/modules/pc/templates/c_topic_write_confirm.tpl

@@ -9 +9 @@
 </div>
 <table>
-<tr><th>本文</th><td>({$topic_write.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
+<tr><th>本文</th><td>({$topic_write.body|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
 ({if $topic_write.image_filename1})
 <tr><th>写真1</th><td>({$topic_write.image_filename1})</td></tr>

OpenPNE/trunk/webapp/modules/pc/templates/c_topic_write_delete_confirm.tpl

@@ -13 +13 @@
 ({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})
 <br />({/if})<br />
-({$c_commu_topic_comment.body|nl2br|t_url2cmd:'community'|t_cmd:'community'})
+({$c_commu_topic_comment.body|nl2br|t_url2cmd:'community':$c_member.c_member_id|t_cmd:'community'})
 </td></tr>
 ({if $smarty.const.OPENPNE_USE_FILEUPLOAD})

OpenPNE/trunk/webapp/modules/pc/templates/f_message_send_confirm.tpl

@@ -23 +23 @@
 <tr>
 <th>メッセージ</th>
-<td>({$form_val.body|nl2br|t_url2cmd:'message'|t_cmd:'message'})</td>
+<td>({$form_val.body|nl2br|t_url2cmd:'message':$u|t_cmd:'message'})</td>
 </tr>
 ({if $form_val.upfile_1.name})

OpenPNE/trunk/webapp/modules/pc/templates/fh_delete_comment.tpl

@@ -12 +12 @@
 <div class="title">
 <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 />
-({$target_diary_comment.body|nl2br|default:"&nbsp;"|t_url2cmd:'diary'|t_cmd:'diary'})<br /></p>
+({$target_diary_comment.body|nl2br|default:"&nbsp;"|t_url2cmd:'diary':$target_diary_comment.c_member_id|t_cmd:'diary'})<br /></p>
 </div>
 </dd>

OpenPNE/trunk/webapp/modules/pc/templates/fh_diary.tpl

@@ -190 +190 @@
 </ul>
 ({/if})
-<p class="text">({$item.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})</p>
+<p class="text">({$item.body|nl2br|t_url2cmd:'diary':$item.c_member_id|t_cmd:'diary'})</p>
 </div>
 </dd>

OpenPNE/trunk/webapp/modules/pc/templates/fh_diary_comment_confirm.tpl

@@ -9 +9 @@
 </div>
 <table>
-<tr><th>本文</th><td>({$form_val.body|nl2br|t_url2cmd:'diary'|t_cmd:'diary'})</td></tr>
+<tr><th>本文</th><td>({$form_val.body|nl2br|t_url2cmd:'diary':$u|t_cmd:'diary'})</td></tr>
 ({if $form_val.upfile_1.name})
 <tr><th>写真1</th><td>({$form_val.upfile_1.name})</td></tr>

OpenPNE/trunk/webapp/modules/pc/templates/h_com_add_confirm.tpl

@@ -10 +10 @@
 <tr><th>カテゴリ</th><td>({$c_commu_category_value})<br /></td></tr>
 <tr><th>参加条件と<br />公開範囲</th><td>({$public_flag_value})<br /></td></tr>
-<tr><th>({$WORD_COMMUNITY})説明文</th><td>({$form_val.info|nl2br|t_url2cmd:'community'|t_cmd:'community'})</td></tr>
+<tr><th>({$WORD_COMMUNITY})説明文</th><td>({$form_val.info|nl2br|t_url2cmd:'community':$u|t_cmd:'community'})</td></tr>
 <tr><th>写真</th><td>({$form_val.image_filename})<br /></td></tr>
 </table>

OpenPNE/trunk/webapp/modules/pc/templates/h_config_prof_confirm.tpl

@@ -68 +68 @@
 
 ({if $profile.form_type == 'textarea'})
-    ({$prof.profile[$profile.name].value|nl2br|t_url2cmd:'profile'|t_cmd:'profile'})
+    ({$prof.profile[$profile.name].value|nl2br|t_url2cmd:'profile':$u|t_cmd:'profile'})
 ({elseif $profile.form_type == 'checkbox'})
     ({$prof.profile[$profile.name].value|@t_implode:", "})

OpenPNE/trunk/webapp/modules/pc/templates/h_message.tpl

@@ -61 +61 @@
 </ul>
 ({/if})
-<p class="text">({$c_message.body|nl2br|t_url2cmd:'message'|t_cmd:'message'})</p>
+<p class="text">({$c_message.body|nl2br|t_url2cmd:'message':$c_message.c_member_id_from|t_cmd:'message'})</p>
 </div>
 

OpenPNE/trunk/webapp/modules/pc/templates/h_regist_prof_confirm.tpl

@@ -63 +63 @@
 
 ({if $profile.form_type == 'textarea'})
-    ({$prof.profile[$profile.name].value|nl2br|t_url2cmd:'profile'|t_cmd:'profile'})
+    ({$prof.profile[$profile.name].value|nl2br|t_url2cmd:'profile':$u|t_cmd:'profile'})
 ({elseif $profile.form_type == 'checkbox'})
     ({$prof.profile[$profile.name].value|@t_implode:", "})

OpenPNE/trunk/webapp/modules/pc/templates/inc_f_home_h_prof.tpl

@@ -274 +274 @@
 <tr><th>({$item.caption})</th><td>
 ({if $item.form_type == 'textarea'})
-    ({$item.value|nl2br|t_url2cmd:'profile'|t_cmd:'profile'})
+    ({$item.value|nl2br|t_url2cmd:'profile':$target_c_member_id|t_cmd:'profile'})
 ({elseif $item.form_type == 'checkbox'})
     ({$item.value|@t_implode:", "})

OpenPNE/trunk/webapp_biz/modules/pc/templates/inc_f_home_h_prof.tpl

@@ -260 +260 @@
 <tr><th>({$item.caption})</th><td>
 ({if $item.form_type == 'textarea'})
-    ({$item.value|nl2br|t_url2cmd:'profile'|t_cmd:'profile'})
+    ({$item.value|nl2br|t_url2cmd:'profile':$target_c_member_id|t_cmd:'profile'})
 ({elseif $item.form_type == 'checkbox'})
     ({$item.value|@t_implode:", "})