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

Changeset 6963


Ignore:
Timestamp:
May 5, 2008, 5:12:30 PM (12 years ago)
Author:
ogawa
Message:

merged stable-2.12.x

Location:
OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth
Files:
26 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/lib/OpenPNE/Auth.php

    r6527 r6963  
    256256                return;
    257257            }
     258        }
     259
     260        if (!is_null($sess_storage)) {
    258261            session_set_save_handler(array(&$sess_storage, 'open'),
    259262                                 array(&$sess_storage, 'close'),
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/lib/OpenPNE/KtaiMail.php

    r6527 r6963  
    181181            // multipart
    182182            foreach ($mail->parts as $part) {
    183                 $images = array_merge($images, $this->_get_images($part));
     183                $item = $this->_get_images($part);
     184                if ($item === false) {
     185                    return false;
     186                }
     187
     188                $images = array_merge($images, $item);
    184189            }
    185190        } elseif (strtolower($mail->ctype_primary) === 'image' &&
     
    193198                $image_data = base64_decode($image_data);
    194199                if (!@imagecreatefromstring($image_data)) {
    195                     return array();
     200                    return false;
    196201                }
    197202            }
     
    207212            if ($this->img_max_filesize && filesize($tmpfname) > $this->img_max_filesize) {
    208213                unlink($tmpfname);
    209                 return array();
     214                return false;
    210215            }
    211216
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/lib/db/message.php

    r6799 r6963  
    691691        return null;
    692692    } else if ($box == 'outbox'){   //送信箱
    693         $where = " WHERE c_member_id_from = ?";
     693        $where = " WHERE c_member_id_from = ? AND is_deleted_from = 0";
    694694    } else {                        //受信箱
    695         $where = " WHERE c_member_id_to = ?";
     695        $where = " WHERE c_member_id_to = ? AND is_deleted_to = 0";
    696696    }
    697697
    698698    $sql =  "SELECT c_message_id FROM c_message" .
    699699            $where.
    700             " AND is_deleted_to = 0" .
    701700            " AND is_send = 1" .
    702701            " AND c_message_id > ?" .
     
    716715        return null;
    717716    } else if ($box == 'outbox'){   //送信箱
    718         $where = " WHERE c_member_id_from = ?";
     717        $where = " WHERE c_member_id_from = ? AND is_deleted_from = 0";
    719718    } else {                        //受信箱
    720         $where = " WHERE c_member_id_to = ?";
     719        $where = " WHERE c_member_id_to = ? AND is_deleted_to = 0";
    721720    }
    722721
    723722    $sql =  "SELECT c_message_id FROM c_message" .
    724723            $where.
    725             " AND is_deleted_to = 0" .
    726724            " AND is_send = 1" .
    727725            " AND c_message_id < ?" .
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/lib/mail/sns.php

    r6642 r6963  
    302302        }
    303303
     304        $images = $this->decoder->get_images();
     305        if ($images === false) {
     306            $this->error_mail('画像は' . IMAGE_MAX_FILESIZE . 'KB以内のGIF・JPEG・PNGにしてください。');
     307            return false;
     308        }
     309
    304310        $body = $this->decoder->get_text_body();
    305311        if ($body === '') {
     
    313319
    314320        // 写真登録
    315         $images = $this->decoder->get_images();
    316321        $image_num = 1;
    317322        foreach ($images as $image) {
     
    359364        }
    360365
    361         $c_member = db_member_c_member4c_member_id($this->c_member_id);
     366        $images = $this->decoder->get_images();
     367        if ($images === false) {
     368            $this->error_mail('画像は' . IMAGE_MAX_FILESIZE . 'KB以内のGIF・JPEG・PNGにしてください。');
     369            return false;
     370        }
     371
     372        $c_member = db_common_c_member4c_member_id($this->c_member_id);
    362373        if (!$ins_id = db_diary_insert_c_diary($this->c_member_id, $subject, $body, $c_member['public_flag_diary'])) {
    363374            return false;
     
    365376
    366377        // 写真登録
    367         $images = $this->decoder->get_images();
    368378        $image_num = 1;
    369379        foreach ($images as $image) {
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/lib/smarty_plugins/outputfilter.pne_display_emoji.php

    r6660 r6963  
    1313
    1414    if (empty($GLOBALS['__Framework']['carrier'])) {
    15         // input, textarea, option, img を退避
     15        // input, textarea, option, img, head を退避
    1616        $patterns = array(
    1717            '/<input[^>]+>/is',
     
    1919            '/<option.*?<\/option>/is',
    2020            '/<img[^>]+>/is',
     21            '/<head.*?<\/head>/is',
    2122        );
    2223
     
    2829
    2930    if (empty($GLOBALS['__Framework']['carrier'])) {
    30         // input, textarea を元に戻す
     31        // input, textarea, option, img, head を元に戻す
    3132        $tpl_output = str_replace(array_keys($list), array_values($list), $tpl_output);
    3233    }
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/do/insert_c_banner.php

    r4933 r6963  
    1010    function execute($requests)
    1111    {
    12         //c_banner insert
     12        $upfile_obj = $_FILES['upfile'];
     13        if (empty($upfile_obj) || $upfile_obj['error'] === UPLOAD_ERR_NO_FILE) {
     14            admin_client_redirect('insert_c_banner', '画像は必ず指定してください');
     15        }
     16
     17        if (!($image = t_check_image($upfile_obj))) {
     18            admin_client_redirect('insert_c_banner', '画像は' . IMAGE_MAX_FILESIZE . 'KB以内のGIF・JPEG・PNGにしてください');
     19        }
     20
    1321        $c_banner_id = db_admin_insert_c_banner($requests['a_href'], $requests['type'], $requests['nickname']);
    14         //c_banner insert
    1522
    16         //c_image delete && insert
    17         $ext = t_check_image_format($_FILES['upfile']);
    18         $c_banner['image_filename'] = "b_{$c_banner_id}_".time().".{$ext}";
    19         admin_insert_c_image($_FILES['upfile'], $c_banner['image_filename']);
    20         //c_image delete && insert
    21 
    22         //c_banner update
     23        $ext = t_check_image_format($upfile_obj);
     24        $c_banner['image_filename'] = sprintf('b_%d_%d.%s', $c_banner_id, time(), $ext);
     25        admin_insert_c_image($upfile_obj, $c_banner['image_filename']);
    2326        db_admin_update_c_banner($c_banner_id, $c_banner);
    24         //c_banner update
    2527
    2628        admin_client_redirect('edit_c_banner', 'バナーを追加しました');
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/do/update_c_api.php

    r4933 r6963  
    1010    function execute($requests)
    1111    {
     12        if (!OPENPNE_USE_API) {
     13            admin_client_redirect('top', '指定されたページにはアクセスできません');
     14        }
     15
    1216        foreach ($requests['ip'] as $ip) {
    1317            if (!admin_api_is_ip($ip)){
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/do/update_c_banner.php

    r4933 r6963  
    1212        $c_banner_id = $requests['c_banner_id'];
    1313
    14         //c_image delete && insert
    15         if ($_FILES['upfile']['name']) {
     14        $upfile_obj = $_FILES['upfile'];
     15        if (!empty($upfile_obj) && $upfile_obj['error'] !== UPLOAD_ERR_NO_FILE) {
     16            if (!($image = t_check_image($upfile_obj))) {
     17                $tail = '&c_banner_id=' . $c_banner_id;
     18                admin_client_redirect('update_c_banner', '画像は' . IMAGE_MAX_FILESIZE . 'KB以内のGIF・JPEG・PNGにしてください', $tail);
     19            }
     20
    1621            db_admin_delete_c_image4c_banner_id($c_banner_id);
    1722
    18             $ext = t_check_image_format($_FILES['upfile']);
    19             $c_banner['image_filename'] = "b_{$c_banner_id}_".time().".{$ext}";
    20             admin_insert_c_image($_FILES['upfile'], $c_banner['image_filename']);
     23            $ext = t_check_image_format($upfile_obj);
     24            $c_banner['image_filename'] = sprintf('b_%d_%d.%s', $c_banner_id, time(), $ext);
     25            admin_insert_c_image($upfile_obj, $c_banner['image_filename']);
    2126        }
    22         //c_image delete && insert
    2327
    2428        $c_banner['a_href'] = $requests['a_href'];
     
    2832        $c_banner['is_hidden_after'] = $requests['is_hidden_after'];
    2933
    30         //c_banner update
    3134        db_admin_update_c_banner($c_banner_id, $c_banner);
    32         //c_banner update
    3335
    3436        admin_client_redirect('edit_c_banner', 'バナーを変更しました');
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/do/update_c_rank.php

    r6630 r6963  
    2222        $c_rank = db_admin_get_c_rank_one($c_rank_id);
    2323        $image_filename = $c_rank['image_filename'];
     24
     25        if (db_point_is_rank4point($requests['point']) && ($c_rank['point'] != $requests['point'])) {
     26            admin_client_redirect('list_c_rank', '同一の到達ポイントのランクが既に存在します');
     27        }
    2428
    2529        $upfile_obj = $_FILES['image_upfile'];
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/lib/db_admin.php

    r6799 r6963  
    295295        $params[] = $type;
    296296    }
     297    $sql .= ' ORDER BY c_banner_id';
    297298    return db_get_all($sql, $params);
    298299}
     
    443444function db_admin_delete_c_image_link4image_filename($image_filename)
    444445{
    445     // c_banner (削除)
    446     $sql = 'DELETE FROM c_banner WHERE image_filename = ?';
    447     $params = array($image_filename);
    448     db_query($sql, $params);
    449 
    450     // c_commu
    451     $tbl = 'c_commu';
    452     _db_admin_empty_filename($tbl, $image_filename);
    453 
    454     // c_commu_topic_comment
    455     $tbl = 'c_commu_topic_comment';
    456     _db_admin_empty_filename($tbl, $image_filename, 'image_filename1');
    457     _db_admin_empty_filename($tbl, $image_filename, 'image_filename2');
    458     _db_admin_empty_filename($tbl, $image_filename, 'image_filename3');
    459 
    460     // c_diary
    461     $tbl = 'c_diary';
    462     _db_admin_empty_filename($tbl, $image_filename, 'image_filename_1');
    463     _db_admin_empty_filename($tbl, $image_filename, 'image_filename_2');
    464     _db_admin_empty_filename($tbl, $image_filename, 'image_filename_3');
    465 
    466     // c_diary_comment
    467     $tbl = 'c_diary_comment';
    468     _db_admin_empty_filename($tbl, $image_filename, 'image_filename_1');
    469     _db_admin_empty_filename($tbl, $image_filename, 'image_filename_2');
    470     _db_admin_empty_filename($tbl, $image_filename, 'image_filename_3');
    471 
    472     // c_member
    473     $tbl = 'c_member';
    474     _db_admin_empty_filename($tbl, $image_filename);
    475     _db_admin_empty_filename($tbl, $image_filename, 'image_filename_1');
    476     _db_admin_empty_filename($tbl, $image_filename, 'image_filename_2');
    477     _db_admin_empty_filename($tbl, $image_filename, 'image_filename_3');
     446    $_pos = strpos($image_filename, '_');
     447    $prefix = substr($image_filename, 0, $_pos);
     448
     449    if ($prefix == 'b') {
     450        $sql = 'DELETE FROM c_banner WHERE image_filename = ?';
     451        $params = array($image_filename);
     452        db_query($sql, $params);
     453    }
     454
     455    if ($prefix == 'c') {
     456        $tbl = 'c_commu';
     457        _db_admin_empty_image_filename($tbl, $image_filename);
     458    }
     459
     460    if ($prefix == 't' || $prefix == 'tc') {
     461        $tbl = 'c_commu_topic_comment';
     462        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename1');
     463        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename2');
     464        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename3');
     465    }
     466
     467    if ($prefix == 'd') {
     468        $tbl = 'c_diary';
     469        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_1');
     470        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_2');
     471        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_3');
     472    }
     473
     474    if ($prefix == 'dc') {
     475        $tbl = 'c_diary_comment';
     476        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_1');
     477        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_2');
     478        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_3');
     479    }
     480
     481    if ($prefix == 'm') {
     482        $tbl = 'c_member';
     483        _db_admin_empty_image_filename($tbl, $image_filename);
     484        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_1');
     485        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_2');
     486        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_3');
     487    }
     488
     489    if ($prefix == 'ms') {
     490        $tbl = 'c_message';
     491        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_1');
     492        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_2');
     493        _db_admin_empty_image_filename($tbl, $image_filename, 'image_filename_3');
     494    }
    478495}
    479496
     
    683700    // 終了ポイント
    684701    if (!empty($cond_list['e_point'])) {
    685         $sql .= ' AND value <= ?';
     702        $sql .= ' AND value < ?';
    686703        $params[] = $cond_list['e_point'];
    687704    }
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/page/list_c_api.php

    r4933 r6963  
    1010    function execute($requests)
    1111    {
     12        if (!OPENPNE_USE_API) {
     13            admin_client_redirect('top', '指定されたページにはアクセスできません');
     14        }
     15
    1216        $pager = array();
    1317        $c_api_list = db_admin_get_c_api_all($requests['page'], $requests['page_size'], $pager);
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/templates/delete_c_free_page_confirm.tpl

    r5859 r6963  
    1919
    2020
    21 ---<br>
    22 ({$c_free_page.body|smarty:nodefaults|nl2br})<br>
    23 ---<br>
     21本当に削除してもよろしいですか?
    2422
    25 本当に削除してもよろしいですか?<br>
    26 <br>
     23<table class="basicType2">
     24<tbody>
     25<tr>
     26<th>ページタイトル</th>
     27<td>
     28({$c_free_page.title})
     29</td>
     30</tr>
     31<tr>
     32<th>ページ内容</th>
     33<td>
     34({$c_free_page.body|smarty:nodefaults|nl2br})
     35</td>
     36</tr>
     37<tr>
     38<th>SNS認証</th>
     39<td>
     40({if $auth})
     41あり
     42({else})
     43なし
     44({/if})
     45</td>
     46</tr>
     47<tr>
     48<th>対象ブラウザ</th>
     49<td>
     50({if $type == 'pc'})
     51PC
     52({else if $type == 'ktai'})
     53携帯
     54({/if})
     55</td>
     56</tr>
     57</tbody>
     58</table>
     59
    2760<form action="./" method="post">
    2861<input type="hidden" name="m" value="({$module_name})">
     
    3063<input type="hidden" name="sessid" value="({$PHPSESSID})">
    3164<input type="hidden" name="c_free_page_id" value="({$c_free_page.c_free_page_id})">
    32 <p class="textBtn"><input type="submit" class="submit" value=" は い "></p>
     65<p class="textBtn"><input type="submit" class="submit" value="削除する"></p>
    3366</form>
    34 <br>
    3567
    36 <a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('list_c_free_page')})">戻る</a>
    3768({$inc_footer|smarty:nodefaults})
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/templates/inc_header.tpl

    r6706 r6963  
    136136<li><a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('list_c_cmd')})">CMD設定</a></li>
    137137<li><a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('list_c_cmd_caster')})">CMDキャスター設定</a></li>
     138({if $smarty.const.OPENPNE_USE_API})
    138139<li><a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('list_c_api')})">API設定</a></li>
     140({/if})
    139141({if $smarty.const.OPENPNE_USE_DECORATION})
    140142<li><a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('edit_deco')})">文字装飾設定</a></li>
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/templates/inc_subnavi_adminSNSConfig.tpl

    r6706 r6963  
    1515<a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('list_c_cmd')})">CMD設定</a>&nbsp;|&nbsp;
    1616<a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('list_c_cmd_caster')})">CMDキャスター設定</a>&nbsp;|&nbsp;
     17({if $smarty.const.OPENPNE_USE_API})
    1718<a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('list_c_api')})">API設定</a>&nbsp;|&nbsp;
     19({/if})
    1820({if $smarty.const.OPENPNE_USE_DECORATION})
    1921<a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('edit_deco')})">文字装飾設定</a>&nbsp;|&nbsp;
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/templates/insert_c_banner.tpl

    r1487 r6963  
    1111({*ここまで:navi*})
    1212
     13({if $msg})<p class="actionMsg">({$msg})</p>({/if})
    1314<h2>バナー追加</h2>
    1415<div class="contents">
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/templates/list_c_member.tpl

    r6613 r6963  
    125125                        ({foreach from=$rank_data item=item})
    126126                        ({if $pre_name})<option({if $cond_list.e_point == $item.point}) selected({/if}) value="({$item.point})">({$pre_name})</option>({/if})
    127                         ({assign var=pre_name value=$item.name})
     127                        ({assign var=pre_name value=$item.name|smarty:nodefaults})
    128128                        ({/foreach})
    129129                        ({if $pre_name})<option({if $cond_list.e_point === 0}) selected({/if}) value="0">({$pre_name})</option>({/if})
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/admin/templates/update_c_banner.tpl

    r2803 r6963  
    11({$inc_header|smarty:nodefaults})
    22({ext_include file="inc_subnavi_adminDesign.tpl"})
    3 ({assign var="page_name" value="バナー設定 > バナー変更"})
     3
     4({assign var="parent_page_name" value="バナー設定"})
     5({capture name=parent_page_url})?m=({$module_name})&amp;a=page_({$hash_tbl->hash('edit_c_banner')})({/capture})
     6
     7({assign var="page_name" value="バナー変更"})
    48({ext_include file="inc_tree_adminDesign.tpl"})
    59</div>
     
    711({*ここまで:navi*})
    812
     13({if $msg})<p class="actionMsg">({$msg})</p>({/if})
    914<h2>バナー変更</h2>
    1015<div class="contents">
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/ktai/do/o_easy_login.php

    r6527 r6963  
    6262        db_member_do_access($c_member_id);
    6363
     64        // ログイン後のリダイレクト先を決定する
     65        $a = '';
     66        $m = 'ktai';
    6467        $p = array();
     68
     69        if ($GLOBALS['__Framework']['default_page']) {
     70            $a = 'page_' . $GLOBALS['__Framework']['default_page'];
     71        }
     72
    6573        if ($requests['login_params']) {
    6674            parse_str($requests['login_params'], $p);
    6775        }
    68         $p['ksid'] = session_id();
     76
    6977        if (!empty($p['a']) && $p['a'] != 'page_o_login') {
    7078            $a = $p['a'];
    71             unset($p['a']);
    72         } else {
    73             $a = 'page_h_home';
    7479        }
    75         openpne_redirect('ktai', $a, $p);
     80        if (!empty($p['m'])) {
     81            $m = $p['m'];
     82        }
     83
     84        $_SESSION['c_member_id'] = $c_member_id;
     85        $p['ksid'] = session_id();
     86
     87        openpne_redirect($m, $a, $p);
    7688    }
    7789}
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp/modules/ktai/do/o_login.php

    r6527 r6963  
    6666        db_member_do_access($c_member_id);
    6767
     68        // ログイン後のリダイレクト先を決定する
     69        $a = '';
     70        $m = 'ktai';
    6871        $p = array();
     72
     73        if ($GLOBALS['__Framework']['default_page']) {
     74            $a = 'page_' . $GLOBALS['__Framework']['default_page'];
     75        }
     76
    6977        if ($requests['login_params']) {
    7078            parse_str($requests['login_params'], $p);
    7179        }
    72         $p['ksid'] = session_id();
     80
    7381        if (!empty($p['a']) && $p['a'] != 'page_o_login') {
    7482            $a = $p['a'];
    75             unset($p['a']);
    76         } else {
    77             $a = 'page_h_home';
    7883        }
    79         openpne_redirect('ktai', $a, $p);
     84        if (!empty($p['m'])) {
     85            $m = $p['m'];
     86        }
     87
     88        $_SESSION['c_member_id'] = $c_member_id;
     89        $p['ksid'] = session_id();
     90
     91        openpne_redirect($m, $a, $p);
    8092    }
    8193}
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp_biz/modules/biz/do/f_home_check_biz_todo.php

    r4933 r6963  
    2222        biz_checkTodo($chid, $is_check);
    2323
    24         $p = array('target_c_member_id' => $id);
     24        $todo = biz_getTodo($id);
     25
     26        $p = array('target_c_member_id' => $todo['c_member_id']);
    2527        openpne_redirect('pc', 'page_f_home', $p);
    2628    }
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp_biz/modules/biz/do/f_home_delete_biz_todo.php

    r4933 r6963  
    2121        biz_deleteTodo($delid);
    2222
    23         $p = array('target_c_member_id' => $id);
     23        $todo = biz_getTodo($id);
     24
     25        $p = array('target_c_member_id' => $todo['c_member_id']);
    2426        openpne_redirect('pc', 'page_f_home', $p);
    2527    }
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp_biz/modules/biz/do/f_home_edit_biz_todo.php

    r4933 r6963  
    4949            $is_done, $due_datetime, $priority, $biz_group_id, $public_flag);
    5050
    51         $p = array('target_c_member_id' => $requests['target_id']);
     51        $p = array('target_c_member_id' => $todo_info['c_member_id']);
    5252        openpne_redirect('pc', 'page_f_home', $p);
    5353
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp_biz/modules/biz/do/h_biz_group_add.php

    r4933 r6963  
    2626            if (!$filename) {
    2727                $filename = $requests['image_filename'];
    28                 $p = array('msg' => '画像は300KB以内のGIF・JPEG・PNGにしてください。', 'id' => $id);
     28                $p = array('msg' => '画像は' . IMAGE_MAX_FILESIZE . 'KB以内のGIF・JPEG・PNGにしてください。', 'id' => $id);
    2929                openpne_redirect('biz', 'page_h_biz_group_add', $p);
    3030                exit();
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp_biz/modules/biz/do/h_biz_group_edit.php

    r4933 r6963  
    2727            if (!$filename) {
    2828                $filename = $requests['image_filename'];
    29                 $p = array('msg' => '画像は300KB以内のGIF・JPEG・PNGにしてください。', 'target_id' => $id);
     29                $p = array('msg' => '画像は' . IMAGE_MAX_FILESIZE . 'KB以内のGIF・JPEG・PNGにしてください。', 'target_id' => $id);
    3030                openpne_redirect('biz', 'page_h_biz_group_edit', $p);
    3131                exit();
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp_biz/modules/biz/do/s_add_shisetsu.php

    r4933 r6963  
    2222
    2323            if (!$filename) {
    24                 $p = array('msg' => '画像は300KB以内のGIF・JPEG・PNGにしてください。');
     24                $p = array('msg' => '画像は' . IMAGE_MAX_FILESIZE . 'KB以内のGIF・JPEG・PNGにしてください。');
    2525                openpne_redirect('biz', 'page_s_add_shisetsu', $p);
    2626            }
  • OpenPNE/branches/work/ogawa/renew_OpenPNE_Auth/webapp_biz/modules/biz/do/s_edit_shisetsu.php

    r4933 r6963  
    2828
    2929            if (!$filename) {
    30                 $p = array('msg' => '画像は300KB以内のGIF・JPEG・PNGにしてください。',
     30                $p = array('msg' => '画像は' . IMAGE_MAX_FILESIZE . 'KB以内のGIF・JPEG・PNGにしてください。',
    3131                       'id'  => $id);
    3232                openpne_redirect('biz', 'page_s_edit_shisetsu', $p);
Note: See TracChangeset for help on using the changeset viewer.