Changeset 11410
- Timestamp:
- Apr 22, 2009, 7:40:34 PM (13 years ago)
- Location:
- OpenPNE/trunk/webapp/modules
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
OpenPNE/trunk/webapp/modules/ktai/page/h_album_edit.php
r11406 r11410 18 18 // ---------- 19 19 20 $c_album = array(); 20 21 if ($target_c_album_id) { 21 22 $c_album = db_album_get_c_album4c_album_id($target_c_album_id); … … 31 32 } 32 33 34 $this->set('target_c_album', $c_album); 33 35 } else { 34 36 $c_album['subject'] = $subject; 35 37 $c_album['description'] = $description; 36 $c_album['public_flag'] = $public_flag ? $public_flag : 'public'; 38 $c_album['public_flag'] = $public_flag ? $public_flag : "public"; 39 $this->set('target_c_album', $c_album); 37 40 } 38 $this->set('target_c_album', $c_album);39 41 40 42 if (MAIL_ADDRESS_HASHED) { -
OpenPNE/trunk/webapp/modules/ktai/page/h_diary_edit.php
r11406 r11410 18 18 // ---------- 19 19 20 $c_member = array(); 21 $c_diary = array(); 20 22 $c_member = db_member_c_member4c_member_id($u); 21 23 if ($target_c_diary_id) { … … 29 31 $c_diary['subject'] = $subject; 30 32 $c_diary['body'] = $body; 33 $c_diary['public_flag'] = $public_flag; 31 34 } 32 35 36 $this->set('target_c_diary', $c_diary); 33 37 } else { 34 38 $c_diary['is_comment_input'] = 1; … … 36 40 $c_diary['subject'] = $subject; 37 41 $c_diary['body'] = $body; 42 $this->set('target_c_diary', $c_diary); 38 43 } 39 $this->set('target_c_diary', $c_diary);40 44 41 45 if (MAIL_ADDRESS_HASHED) { -
OpenPNE/trunk/webapp/modules/ktai/page/h_message_send.php
r11406 r11410 14 14 $this->set('c_friend_list', db_friend_ktai_c_friend_list_random4c_member_id($u)); 15 15 16 $form_val = array(); 16 17 // --- リクエスト変数 17 18 $form_val['target_c_message_id'] = $requests['target_c_message_id']; … … 21 22 // ---------- 22 23 24 $c_message = array(); 23 25 //メッセージIDから情報を取り出す 24 26 if (isset($form_val['target_c_message_id'])) { … … 48 50 ); 49 51 52 $this->set('form_val', $form_val); 50 53 } else { 51 54 $form_val['subject'] = $subject; 52 55 $form_val['body'] = $body; 56 $this->set('form_val', $form_val); 53 57 } 54 $this->set('form_val', $form_val);55 58 56 59 return 'success'; -
OpenPNE/trunk/webapp/modules/ktai/validate/page/h_diary_edit.ini
r11406 r11410 11 11 [public_flag] 12 12 type = "string" 13 default = "public"14 13 -
OpenPNE/trunk/webapp/modules/pc/do/c_edit_update_c_commu.php
r11363 r11410 31 31 //コミュニティ管理者 32 32 33 $status = array(); 33 34 $status = db_common_commu_status($u, $target_c_commu_id); 34 35 if (!$status['is_commu_admin']) { -
OpenPNE/trunk/webapp/modules/pc/page/c_edit.php
r11351 r11410 33 33 $this->set('inc_navi', fetch_inc_navi('c', $target_c_commu_id)); 34 34 //コミュニティデータ取得 35 $c_commu = array(); 35 36 $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id); 36 37 $c_commu_category_id_now = $c_commu['c_commu_category_id']; … … 58 59 59 60 // カテゴリリスト 61 $c_commu_category_list = array(); 60 62 $c_commu_category_list = db_commu_c_commu_category4is_create_commu(); 61 63 -
OpenPNE/trunk/webapp/modules/pc/page/c_event_add.php
r11351 r11410 18 18 19 19 //--- 権限チェック 20 $c_commu = array(); 20 21 $c_commu = db_commu_c_commu4c_commu_id2($c_commu_id); 21 22 -
OpenPNE/trunk/webapp/modules/pc/page/c_event_add_confirm.php
r11363 r11410 16 16 17 17 //--- 権限チェック 18 $c_commu = array(); 18 19 $c_commu = db_commu_c_commu4c_commu_id2($target_c_commu_id); 19 20 -
OpenPNE/trunk/webapp/modules/pc/page/c_event_delete_confirm.php
r11351 r11410 15 15 // ---------- 16 16 17 $c_topic = array(); 18 $c_commu = array(); 17 19 $c_topic = db_commu_c_topic4c_commu_topic_id_2($c_commu_topic_id); 18 20 $c_commu_id = $c_topic['c_commu_id']; -
OpenPNE/trunk/webapp/modules/pc/page/c_event_edit.php
r11351 r11410 16 16 // ---------- 17 17 18 $c_topic = array(); 19 $c_commu = array(); 18 20 $c_topic = db_commu_c_topic4c_commu_topic_id_2($c_commu_topic_id); 19 21 $c_commu_id = $c_topic['c_commu_id']; -
OpenPNE/trunk/webapp/modules/pc/page/c_event_write_confirm.php
r11363 r11410 23 23 $upfile_obj4 = $_FILES['uploadfile']; 24 24 25 $c_topic = array(); 25 26 $c_topic = db_commu_c_topic4c_commu_topic_id_2($c_commu_topic_id); 26 27 $c_commu_id = $c_topic['c_commu_id']; -
OpenPNE/trunk/webapp/modules/pc/page/c_topic_add.php
r11351 r11410 25 25 26 26 //--- 権限チェック 27 $c_commu = array(); 27 28 $c_commu = db_commu_c_commu4c_commu_id2($c_commu_id); 28 29 -
OpenPNE/trunk/webapp/modules/pc/page/c_topic_add_confirm.php
r11363 r11410 25 25 26 26 //--- 権限チェック 27 $c_commu = array(); 27 28 $c_commu = db_commu_c_commu4c_commu_id2($c_commu_id); 28 29 -
OpenPNE/trunk/webapp/modules/pc/page/c_topic_delete_confirm.php
r11351 r11410 15 15 // ---------- 16 16 17 $c_topic = array(); 18 $c_commu = array(); 17 19 $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id); 18 20 $c_commu_id = $c_topic['c_commu_id']; -
OpenPNE/trunk/webapp/modules/pc/page/c_topic_edit.php
r11351 r11410 18 18 // ---------- 19 19 20 $c_topic = array(); 20 21 $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id); 21 22 $c_commu_id = $c_topic['c_commu_id']; -
OpenPNE/trunk/webapp/modules/pc/page/c_topic_write_confirm.php
r11363 r11410 87 87 //----- 88 88 89 $c_topic = array(); 89 90 $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id); 90 91 $c_commu_id = $c_topic['c_commu_id']; -
OpenPNE/trunk/webapp/modules/pc/page/f_message_send.php
r11406 r11410 10 10 { 11 11 $u = $GLOBALS['AUTH']->uid(); 12 $form_val = array(); 12 13 13 14 // --- リクエスト変数 … … 26 27 } 27 28 28 $c_message = db_message_c_message4c_message_id($form_val['target_c_message_id']);29 29 if ($form_val['target_c_message_id']) { 30 $c_message = db_message_c_message4c_message_id($form_val['target_c_message_id']); 30 31 if ($c_message['c_member_id_from'] != $u) { 31 32 if ($c_message['c_member_id_to'] != $u || !$c_message['is_send']) { … … 44 45 45 46 //メッセージIDから情報を取り出す 46 $form_val['target_c_message_id'] = $c_message['c_message_id']; 47 if ($box == 'savebox' && $form_val['target_c_message_id']) { 48 if (!$requests['msg1'] && !$requests['msg2']) { 49 $form_val['subject'] = $c_message['subject']; 50 $form_val['body'] = $c_message['body']; 47 if ($box == "savebox" && $form_val['target_c_message_id']) { 48 $tmplist = db_message_c_message4c_message_id($form_val['target_c_message_id']); 49 if ($requests['msg1'] || $requests['msg2']) { 50 $form_val['subject'] = $form_val['subject']; 51 $form_val['body'] = $form_val['body']; 52 } else { 53 $form_val['subject'] = $tmplist['subject']; 54 $form_val['body'] = $tmplist['body']; 51 55 } 52 if ($c_message['c_member_id_to']) { 53 $target_c_member_id = $c_message['c_member_id_to']; 56 $form_val['target_c_message_id'] = $tmplist['c_message_id']; 57 if ($tmplist['c_member_id_to']) { 58 $target_c_member_id = $tmplist['c_member_id_to']; 54 59 } 55 60 } elseif (!$syusei && $form_val['target_c_message_id']) { 56 $form_val['body'] = message_body2inyou($c_message['body']); 57 $form_val['subject'] = "Re:".$c_message['subject']; 58 if ($c_message['c_member_id_from']) { 59 $target_c_member_id = $c_message['c_member_id_from']; 61 $tmplist = db_message_c_message4c_message_id($form_val['target_c_message_id']); 62 $form_val['body'] = message_body2inyou($tmplist['body']); 63 $form_val['subject'] = "Re:".$tmplist['subject']; 64 $form_val['target_c_message_id'] = $tmplist['c_message_id']; 65 if ($tmplist['c_member_id_from']) { 66 $target_c_member_id = $tmplist['c_member_id_from']; 60 67 } 61 68 } … … 66 73 } 67 74 68 $this->set('inc_navi', fetch_inc_navi( 'f', $target_c_member_id));75 $this->set('inc_navi', fetch_inc_navi("f", $target_c_member_id)); 69 76 70 77 //ターゲット情報 71 $this->set( 'target_member', $target_member);78 $this->set("target_member", $target_member); 72 79 73 80 //ターゲットのid 74 $this->set( 'target_c_member_id', $target_c_member_id);81 $this->set("target_c_member_id", $target_c_member_id); 75 82 //ターゲットのid 76 $this->set( 'target_c_message_id', $form_val['target_c_message_id']);83 $this->set("target_c_message_id", $form_val['target_c_message_id']); 77 84 78 $this->set( 'form_val', $form_val);79 $this->set( 'box', $box);85 $this->set("form_val", $form_val); 86 $this->set("box", $box); 80 87 81 88 // 許可されている拡張子のリスト -
OpenPNE/trunk/webapp/modules/pc/page/f_message_send_confirm.php
r11363 r11410 20 20 21 21 // --- リクエスト変数 22 $form_val = array(); 22 23 $form_val['target_c_member_id'] = $requests['target_c_member_id']; 23 24 $form_val['subject'] = $requests['subject']; -
OpenPNE/trunk/webapp/modules/pc/page/fh_diary_comment_confirm.php
r11363 r11410 23 23 // ---------- 24 24 25 $target_diary = array(); 25 26 $target_diary = db_diary_get_c_diary4id($target_c_diary_id); 26 27 $target_c_member_id = $target_diary['c_member_id']; -
OpenPNE/trunk/webapp/modules/pc/page/h_album_cover_edit.php
r11366 r11410 28 28 29 29 //--- 権限チェック 30 $album = array(); 30 31 $album = db_album_get_c_album4c_album_id($target_c_album_id); 31 32 if($album['c_member_id'] != $u){ -
OpenPNE/trunk/webapp/modules/pc/page/h_album_cover_edit_confirm.php
r11363 r11410 30 30 31 31 //--- 権限チェック 32 $c_album = array(); 32 33 $c_album = db_album_get_c_album4c_album_id($target_c_album_id); 33 34 if ($c_album['c_member_id'] != $u) { -
OpenPNE/trunk/webapp/modules/pc/page/h_album_image_add_confirm.php
r11363 r11410 32 32 // ---------- 33 33 34 $c_album = array(); 34 35 $c_album = db_album_get_c_album4c_album_id($target_c_album_id); 35 36 if ($c_album['c_member_id'] != $u) { -
OpenPNE/trunk/webapp/modules/pc/page/h_album_image_edit_confirm.php
r11363 r11410 31 31 32 32 // アルバムの写真データ取得 33 $c_album_image = array(); 33 34 $c_album_image = db_album_image_get_c_album_image4id($target_c_album_image_id); 34 35 $target_c_album_id = $c_album_image['c_album_id']; 35 36 36 37 //アルバムデータ取得 38 $c_album = array(); 37 39 $c_album = db_album_get_c_album4c_album_id($target_c_album_id); 38 40 //--- 権限チェック -
OpenPNE/trunk/webapp/modules/pc/page/h_diary_add.php
r11406 r11410 11 11 $u = $GLOBALS['AUTH']->uid(); 12 12 13 $form_val = array(); 14 $c_member = array(); 13 15 // --- リクエスト変数 14 16 $form_val['subject'] = $requests['subject']; … … 29 31 $form_val['public_flag'] = $c_member['public_flag_diary']; 30 32 } 31 $form_val['public_flag'] = util_cast_public_flag_diary($form_val['public_flag']);32 33 33 $this->set("target_member", $c_member); 34 34 $this->set("form_val", $form_val); … … 47 47 48 48 //日記のカレンダー 49 $calendar = array(); 49 50 $calendar = db_common_diary_monthly_calendar($year, $month, $u); 50 51 -
OpenPNE/trunk/webapp/modules/pc/page/h_diary_edit.php
r11366 r11410 20 20 // ---------- 21 21 22 $c_diary = array(); 22 23 $c_diary = db_diary_get_c_diary4id($target_c_diary_id); 23 24 … … 65 66 66 67 //日記のカレンダー 68 $calendar = array(); 67 69 $calendar = db_common_diary_monthly_calendar($year, $month, $u); 68 70 -
OpenPNE/trunk/webapp/modules/pc/page/h_diary_edit_confirm.php
r11363 r11410 70 70 71 71 // 画像アップロード可能サイズチェック 72 $c_diary = array(); 72 73 $c_diary = db_diary_get_c_diary4id($target_c_diary_id); 73 74 $del_file = array(); -
OpenPNE/trunk/webapp/modules/pc/page/h_home.php
r11363 r11410 57 57 58 58 // メンバー情報 59 $c_member = array(); 59 60 $c_member = db_member_c_member_with_profile($u, 'private'); 60 61 $this->set('c_member', $c_member);
Note: See TracChangeset
for help on using the changeset viewer.