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

Changeset 11346


Ignore:
Timestamp:
Apr 17, 2009, 1:45:52 PM (12 years ago)
Author:
nagasawa
Message:

#3784:2.12にマージ

Location:
OpenPNE/branches/stable-2.12.x/webapp/modules
Files:
9 edited
1 copied

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/do/h_diary_edit_insert_c_diary.php

    r4933 r11346  
    2323
    2424        if (is_null($subject) || $subject === '') {
    25             $p = array('target_c_diary_id' => $target_c_diary_id, 'msg' => 2);
    26             openpne_redirect('ktai', 'page_h_diary_edit', $p);
     25            $_REQUEST['msg'] = 2;
     26            openpne_forward('ktai', 'page', 'h_diary_edit');
     27            exit;
    2728        }
    2829
    2930        if (is_null($body) || $body === '') {
    30             $p = array('target_c_diary_id' => $target_c_diary_id, 'msg' => 1);
    31             openpne_redirect('ktai', 'page_h_diary_edit', $p);
     31            $_REQUEST['msg'] = 1;
     32            openpne_forward('ktai', 'page', 'h_diary_edit');
     33            exit;
    3234        }
    3335
  • OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/do/h_message_send_insert_message.php

    r4933 r11346  
    1919
    2020        if (is_null($subject) || $subject === '') {
    21             $p = array('msg' => 2);
    22             openpne_redirect('ktai', 'page_h_message_send', $p);
     21            $_REQUEST['msg'] = 2;
     22            openpne_forward('ktai', 'page', 'h_message_send');
     23            exit;
    2324        }
    2425
    2526        if (is_null($body) || $body === '') {
    26             $p = array('msg' => 1);
    27             openpne_redirect('ktai', 'page_h_message_send', $p);
     27            $_REQUEST['msg'] = 1;
     28            openpne_forward('ktai', 'page', 'h_message_send');
     29            exit;
    2830        }
    2931
  • OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/page/h_diary_edit.php

    r4933 r11346  
    1313        // --- リクエスト変数
    1414        $target_c_diary_id = $requests['target_c_diary_id'];
     15        $public_flag = $requests['public_flag'];
    1516        // ----------
    1617
     
    1819        if ($target_c_diary_id) {
    1920            $c_diary = db_diary_get_c_diary4id($target_c_diary_id);
    20             $this->set('target_c_diary', $c_diary);
    2121
    2222            if ($c_diary['c_member_id'] != $u) {
    2323                handle_kengen_error();
    2424            }
     25            if (array_key_exists('subject', $requests)) {
     26                $c_diary['subject'] = $subject;
     27            }
     28            if (array_key_exists('body', $requests)) {
     29                $c_diary['body'] = $body;
     30            }
     31            if ($public_flag) {
     32                $c_diary['pulic_flag'] = $public_flag;
     33            }
     34            $this->set('target_c_diary', $c_diary);
    2535        } else {
    26             $c_diary['public_flag'] = $c_member['public_flag_diary'];
     36            $c_diary['public_flag'] = $public_flag ? $public_flag : $c_member['public_flag_diary'];
    2737            $this->set('target_c_diary', $c_diary);
    2838        }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/page/h_message_send.php

    r4933 r11346  
    1414        $this->set("c_friend_list", db_friend_ktai_c_friend_list_random4c_member_id($u));
    1515
     16        // --- リクエスト変数
     17        $subject = $requests['subject'];
     18        $body = $requests['body'];
     19        // ----------
     20
     21        $form_val = array();
     22        $form_val['subject'] = $subject;
     23        $form_val['body'] = $body;
     24        $this->set("form_val", $form_val);
     25
    1626        return 'success';
    1727    }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/templates/h_message_send.tpl

    r4222 r11346  
    2020<br>
    2121<font color="#({$ktai_color_config.font_06})">件名:</font><br>
    22 <input type="text" name="subject"><br>
     22<input type="text" name="subject" value="({form_val.subject})"><br>
    2323<br>
    2424<font color="#({$ktai_color_config.font_06})">本文:</font><br>
    25 <textarea name="body" rows="6"></textarea><br>
     25<textarea name="body" rows="6">({form_val.body})</textarea><br>
    2626<center>
    2727<input type="submit" value="メッセージを送る">
  • OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/validate/page/h_diary_edit.ini

    r2 r11346  
    22type = "int"
    33default = 0
     4
     5[public_flag]
     6type = "string"
  • OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/validate/page/h_message_send.ini

    r11345 r11346  
    1 [target_c_message_id]
    2 type = "int"
    3 
    41[subject]
    52type = "string"
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/f_message_send.php

    r6536 r11346  
    4646        if ($box == "savebox" && $form_val['target_c_message_id']) {
    4747            $tmplist = db_message_c_message4c_message_id($form_val['target_c_message_id']);
    48             $form_val['body'] = $tmplist['body'];
    49             $form_val['subject'] = $tmplist['subject'];
     48            if (!array_key_exists('subject', $requests)) {
     49                $form_val['subject'] = $tmplist['subject'];
     50            }
     51            if (!array_key_exists('body', $requests)) {
     52                $form_val['body'] = $tmplist['body'];
     53            }
    5054            $form_val['target_c_message_id'] = $tmplist['c_message_id'];
    5155            if ($tmplist['c_member_id_to']) {
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_cover_edit.php

    r8374 r11346  
    3333        }
    3434
    35         if (!(is_null($subject) || is_null($description)||is_null($public_flag))) {
    36             $album['subject'] = $subject;
    37             $album['description'] = $description;
    38             $album['public_flag'] = $public_flag;
    39         }
     35        $album['subject'] = $subject;
     36        $album['description'] = $description;
     37        $album['public_flag'] = $public_flag;
    4038
    4139        $this->set('inc_navi', fetch_inc_navi('h'));
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_diary_edit.php

    r4933 r11346  
    9191        }
    9292
    93         if (!(is_null($subject) || is_null($body))) {
    94             $c_diary['subject'] = $subject;
    95             $c_diary['body'] = $body;
    96         }
     93        $c_diary['subject'] = $subject;
     94        $c_diary['body'] = $body;
    9795        if ($public_flag) {
    9896            $c_diary['public_flag'] = util_cast_public_flag_diary($public_flag);
Note: See TracChangeset for help on using the changeset viewer.