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

Changeset 11410


Ignore:
Timestamp:
Apr 22, 2009, 7:40:34 PM (13 years ago)
Author:
urabe
Message:

#3784 修正内容を一旦整理のため戻します。

Location:
OpenPNE/trunk/webapp/modules
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/trunk/webapp/modules/ktai/page/h_album_edit.php

    r11406 r11410  
    1818        // ----------
    1919
     20        $c_album = array();
    2021        if ($target_c_album_id) {
    2122            $c_album = db_album_get_c_album4c_album_id($target_c_album_id);
     
    3132            }
    3233
     34            $this->set('target_c_album', $c_album);
    3335        } else {
    3436            $c_album['subject'] = $subject;
    3537            $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);
    3740        }
    38         $this->set('target_c_album', $c_album);
    3941
    4042        if (MAIL_ADDRESS_HASHED) {
  • OpenPNE/trunk/webapp/modules/ktai/page/h_diary_edit.php

    r11406 r11410  
    1818        // ----------
    1919
     20        $c_member = array();
     21        $c_diary  = array();
    2022        $c_member = db_member_c_member4c_member_id($u);
    2123        if ($target_c_diary_id) {
     
    2931                $c_diary['subject'] = $subject;
    3032                $c_diary['body'] = $body;
     33                $c_diary['public_flag'] = $public_flag;
    3134            }
    3235
     36            $this->set('target_c_diary', $c_diary);
    3337        } else {
    3438            $c_diary['is_comment_input'] = 1;
     
    3640            $c_diary['subject'] = $subject;
    3741            $c_diary['body'] = $body;
     42            $this->set('target_c_diary', $c_diary);
    3843        }
    39         $this->set('target_c_diary', $c_diary);
    4044
    4145        if (MAIL_ADDRESS_HASHED) {
  • OpenPNE/trunk/webapp/modules/ktai/page/h_message_send.php

    r11406 r11410  
    1414        $this->set('c_friend_list', db_friend_ktai_c_friend_list_random4c_member_id($u));
    1515
     16        $form_val = array();
    1617        // --- リクエスト変数
    1718        $form_val['target_c_message_id'] = $requests['target_c_message_id'];
     
    2122        // ----------
    2223
     24        $c_message = array();
    2325        //メッセージIDから情報を取り出す
    2426        if (isset($form_val['target_c_message_id'])) {
     
    4850            );
    4951
     52            $this->set('form_val', $form_val);
    5053        } else {
    5154            $form_val['subject'] = $subject;
    5255            $form_val['body'] = $body;
     56            $this->set('form_val', $form_val);
    5357        }
    54         $this->set('form_val', $form_val);
    5558
    5659        return 'success';
  • OpenPNE/trunk/webapp/modules/ktai/validate/page/h_diary_edit.ini

    r11406 r11410  
    1111[public_flag]
    1212type = "string"
    13 default = "public"
    1413
  • OpenPNE/trunk/webapp/modules/pc/do/c_edit_update_c_commu.php

    r11363 r11410  
    3131        //コミュニティ管理者
    3232
     33        $status = array();
    3334        $status = db_common_commu_status($u, $target_c_commu_id);
    3435        if (!$status['is_commu_admin']) {
  • OpenPNE/trunk/webapp/modules/pc/page/c_edit.php

    r11351 r11410  
    3333        $this->set('inc_navi', fetch_inc_navi('c', $target_c_commu_id));
    3434        //コミュニティデータ取得
     35        $c_commu = array();
    3536        $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
    3637        $c_commu_category_id_now = $c_commu['c_commu_category_id'];
     
    5859
    5960        // カテゴリリスト
     61        $c_commu_category_list = array();
    6062        $c_commu_category_list = db_commu_c_commu_category4is_create_commu();
    6163
  • OpenPNE/trunk/webapp/modules/pc/page/c_event_add.php

    r11351 r11410  
    1818
    1919        //--- 権限チェック
     20        $c_commu = array();
    2021        $c_commu = db_commu_c_commu4c_commu_id2($c_commu_id);
    2122   
  • OpenPNE/trunk/webapp/modules/pc/page/c_event_add_confirm.php

    r11363 r11410  
    1616
    1717        //--- 権限チェック
     18        $c_commu = array();
    1819        $c_commu = db_commu_c_commu4c_commu_id2($target_c_commu_id);
    1920
  • OpenPNE/trunk/webapp/modules/pc/page/c_event_delete_confirm.php

    r11351 r11410  
    1515        // ----------
    1616
     17        $c_topic = array();
     18        $c_commu = array();
    1719        $c_topic = db_commu_c_topic4c_commu_topic_id_2($c_commu_topic_id);
    1820        $c_commu_id = $c_topic['c_commu_id'];
  • OpenPNE/trunk/webapp/modules/pc/page/c_event_edit.php

    r11351 r11410  
    1616        // ----------
    1717
     18        $c_topic = array();
     19        $c_commu = array();
    1820        $c_topic = db_commu_c_topic4c_commu_topic_id_2($c_commu_topic_id);
    1921        $c_commu_id = $c_topic['c_commu_id'];
  • OpenPNE/trunk/webapp/modules/pc/page/c_event_write_confirm.php

    r11363 r11410  
    2323        $upfile_obj4 = $_FILES['uploadfile'];
    2424
     25        $c_topic = array();
    2526        $c_topic = db_commu_c_topic4c_commu_topic_id_2($c_commu_topic_id);
    2627        $c_commu_id = $c_topic['c_commu_id'];
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_add.php

    r11351 r11410  
    2525
    2626        //--- 権限チェック
     27        $c_commu = array();
    2728        $c_commu = db_commu_c_commu4c_commu_id2($c_commu_id);
    2829
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_add_confirm.php

    r11363 r11410  
    2525
    2626        //--- 権限チェック
     27        $c_commu = array();
    2728        $c_commu = db_commu_c_commu4c_commu_id2($c_commu_id);
    2829       
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_delete_confirm.php

    r11351 r11410  
    1515        // ----------
    1616
     17        $c_topic = array();
     18        $c_commu = array();
    1719        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    1820        $c_commu_id = $c_topic['c_commu_id'];
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_edit.php

    r11351 r11410  
    1818        // ----------
    1919
     20        $c_topic = array();
    2021        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    2122        $c_commu_id = $c_topic['c_commu_id'];
  • OpenPNE/trunk/webapp/modules/pc/page/c_topic_write_confirm.php

    r11363 r11410  
    8787        //-----
    8888
     89        $c_topic = array();
    8990        $c_topic = db_commu_c_topic4c_commu_topic_id($c_commu_topic_id);
    9091        $c_commu_id = $c_topic['c_commu_id'];
  • OpenPNE/trunk/webapp/modules/pc/page/f_message_send.php

    r11406 r11410  
    1010    {
    1111        $u = $GLOBALS['AUTH']->uid();
     12        $form_val = array();
    1213
    1314        // --- リクエスト変数
     
    2627        }
    2728
    28         $c_message = db_message_c_message4c_message_id($form_val['target_c_message_id']);
    2929        if ($form_val['target_c_message_id']) {
     30            $c_message = db_message_c_message4c_message_id($form_val['target_c_message_id']);
    3031            if ($c_message['c_member_id_from'] != $u) {
    3132                if ($c_message['c_member_id_to'] != $u || !$c_message['is_send']) {
     
    4445
    4546        //メッセージ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'];
    5155            }
    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'];
    5459            }
    5560        } 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'];
    6067            }
    6168        }
     
    6673        }
    6774
    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));
    6976
    7077        //ターゲット情報
    71         $this->set('target_member', $target_member);
     78        $this->set("target_member", $target_member);
    7279
    7380        //ターゲットのid
    74         $this->set('target_c_member_id', $target_c_member_id);
     81        $this->set("target_c_member_id", $target_c_member_id);
    7582        //ターゲットの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']);
    7784
    78         $this->set('form_val', $form_val);
    79         $this->set('box', $box);
     85        $this->set("form_val", $form_val);
     86        $this->set("box", $box);
    8087
    8188        // 許可されている拡張子のリスト
  • OpenPNE/trunk/webapp/modules/pc/page/f_message_send_confirm.php

    r11363 r11410  
    2020
    2121        // --- リクエスト変数
     22        $form_val = array();
    2223        $form_val['target_c_member_id'] = $requests['target_c_member_id'];
    2324        $form_val['subject'] = $requests['subject'];
  • OpenPNE/trunk/webapp/modules/pc/page/fh_diary_comment_confirm.php

    r11363 r11410  
    2323        // ----------
    2424
     25        $target_diary = array();
    2526        $target_diary = db_diary_get_c_diary4id($target_c_diary_id);
    2627        $target_c_member_id = $target_diary['c_member_id'];
  • OpenPNE/trunk/webapp/modules/pc/page/h_album_cover_edit.php

    r11366 r11410  
    2828
    2929        //--- 権限チェック
     30        $album = array();
    3031        $album = db_album_get_c_album4c_album_id($target_c_album_id);
    3132        if($album['c_member_id'] != $u){
  • OpenPNE/trunk/webapp/modules/pc/page/h_album_cover_edit_confirm.php

    r11363 r11410  
    3030
    3131        //--- 権限チェック
     32        $c_album = array();
    3233        $c_album = db_album_get_c_album4c_album_id($target_c_album_id);
    3334        if ($c_album['c_member_id'] != $u) {
  • OpenPNE/trunk/webapp/modules/pc/page/h_album_image_add_confirm.php

    r11363 r11410  
    3232        // ----------
    3333
     34        $c_album = array();
    3435        $c_album = db_album_get_c_album4c_album_id($target_c_album_id);
    3536        if ($c_album['c_member_id'] != $u) {
  • OpenPNE/trunk/webapp/modules/pc/page/h_album_image_edit_confirm.php

    r11363 r11410  
    3131
    3232        // アルバムの写真データ取得
     33        $c_album_image = array();
    3334        $c_album_image = db_album_image_get_c_album_image4id($target_c_album_image_id);
    3435        $target_c_album_id = $c_album_image['c_album_id'];
    3536
    3637        //アルバムデータ取得
     38        $c_album = array();
    3739        $c_album = db_album_get_c_album4c_album_id($target_c_album_id);
    3840        //--- 権限チェック
  • OpenPNE/trunk/webapp/modules/pc/page/h_diary_add.php

    r11406 r11410  
    1111        $u = $GLOBALS['AUTH']->uid();
    1212
     13        $form_val = array();
     14        $c_member = array();
    1315        // --- リクエスト変数
    1416        $form_val['subject'] = $requests['subject'];
     
    2931            $form_val['public_flag'] = $c_member['public_flag_diary'];
    3032        }
    31         $form_val['public_flag'] = util_cast_public_flag_diary($form_val['public_flag']);
    32 
    3333        $this->set("target_member", $c_member);
    3434        $this->set("form_val", $form_val);
     
    4747
    4848        //日記のカレンダー
     49        $calendar = array();
    4950        $calendar = db_common_diary_monthly_calendar($year, $month, $u);
    5051
  • OpenPNE/trunk/webapp/modules/pc/page/h_diary_edit.php

    r11366 r11410  
    2020        // ----------
    2121
     22        $c_diary = array();
    2223        $c_diary = db_diary_get_c_diary4id($target_c_diary_id);
    2324
     
    6566
    6667        //日記のカレンダー
     68        $calendar = array();
    6769        $calendar = db_common_diary_monthly_calendar($year, $month, $u);
    6870
  • OpenPNE/trunk/webapp/modules/pc/page/h_diary_edit_confirm.php

    r11363 r11410  
    7070
    7171        // 画像アップロード可能サイズチェック
     72        $c_diary = array();
    7273        $c_diary = db_diary_get_c_diary4id($target_c_diary_id);
    7374        $del_file = array();
  • OpenPNE/trunk/webapp/modules/pc/page/h_home.php

    r11363 r11410  
    5757
    5858        // メンバー情報
     59        $c_member = array();
    5960        $c_member = db_member_c_member_with_profile($u, 'private');
    6061        $this->set('c_member', $c_member);
Note: See TracChangeset for help on using the changeset viewer.