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

Changeset 8374


Ignore:
Timestamp:
Sep 17, 2008, 10:54:42 PM (11 years ago)
Author:
ebihara
Message:

行末の空白文字を削除

Location:
OpenPNE/branches/stable-2.12.x/webapp
Files:
34 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/stable-2.12.x/webapp/lib/db/commu.php

    r8309 r8374  
    27122712           ' WHERE c_commu_id = ? AND c_member_id_to = ?';
    27132713    db_query($sql, $params);
    2714    
     2714
    27152715    //参加イベント情報削除
    27162716    $sql = 'SELECT ct.c_commu_topic_id'
     
    30323032}
    30333033
    3034 /** 
     3034/**
    30353035 * トピック検索簡易版(キーワード無し)
    30363036 */
  • OpenPNE/branches/stable-2.12.x/webapp/lib/db/diary.php

    r8294 r8374  
    11931193 * SNS全体の最新日記リスト取得
    11941194 * 日記公開範囲を考慮
    1195  * 
     1195 *
    11961196 * @param   int $limit
    11971197 * @return  array_of_array  (c_diary.*, nickname)
     
    12561256 * @param  int    $c_diary_id
    12571257 * 該当c_diary_idへのコメント数が0なら、日記コメント記入履歴も削除する。
    1258  * 
     1258 *
    12591259 */
    12601260function db_diary_delete_c_diary_comment_log($c_member_id, $c_diary_id)
  • OpenPNE/branches/stable-2.12.x/webapp/lib/db/member.php

    r7609 r8374  
    6666        break;
    6767    }
    68  
     68
    6969    if (OPENPNE_AUTH_MODE != 'email' && $is_secure) {
    7070        $c_member['username'] = db_member_username4c_member_id($c_member_id);
     
    19661966{
    19671967    $c_member = db_member_c_member4c_member_id($c_member_id, false, false, 'private');
    1968    
     1968
    19691969    if (($c_member['nickname'] === '')
    19701970     || !$c_member['birth_year']
  • OpenPNE/branches/stable-2.12.x/webapp/lib/util/mail_send.php

    r8214 r8374  
    870870
    871871function do_common_send_mail_biz_group_admin_change($biz_group_id_to, $biz_group_id)
    872 {       
     872{
    873873    require_once OPENPNE_MODULES_BIZ_DIR . '/biz/lib/mysql_functions.php';
    874        
     874
    875875    $biz_group_member_to = db_member_c_member4c_member_id($biz_group_id_to, true);
    876876    $biz_group = biz_getGroupData($biz_group_id);
     
    878878        'biz_group_member_to' => $biz_group_member_to,
    879879        'biz_group' => $biz_group,
    880     ); 
     880    );
    881881    $to_address = $biz_group_member_to['secure']['pc_address'];
    882882    return fetch_send_mail($to_address, 'm_pc_group_admin_change', $params);
  • OpenPNE/branches/stable-2.12.x/webapp/lib/util/util.php

    r7509 r8374  
    850850function util_send_header_internal_server_error()
    851851{
    852     header('HTTP/1.0 500 Internal Server Error'); 
     852    header('HTTP/1.0 500 Internal Server Error');
    853853    exit;
    854854}
  • OpenPNE/branches/stable-2.12.x/webapp/modules/admin/do/csv_member.php

    r8337 r8374  
    3636
    3737        $member_key_string = $this->get_key_list();
    38         $c_member_list = $this->db_get_c_member_list($start_id, $end_id); 
    39         if (!$c_member_list) { 
    40             $this->handleError(array('該当するメンバーの情報がありません。')); 
     38        $c_member_list = $this->db_get_c_member_list($start_id, $end_id);
     39        if (!$c_member_list) {
     40            $this->handleError(array('該当するメンバーの情報がありません。'));
    4141        }
    4242
  • OpenPNE/branches/stable-2.12.x/webapp/modules/admin/templates/access_analysis_target_topic.tpl

    r7723 r8374  
    2525({if $target_topic})
    2626({if $is_prev})
    27 <a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('access_analysis_target_topic')})&amp;ktai_flag=({$ktai_flag})&amp;ymd=({$ymd})&amp;month_flag=({$month_flag})&amp;page_name=({$requests.page_name})&amp;orderby=({$orderby})&amp;page=({$page-1})"><前を表示</a> 
     27<a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('access_analysis_target_topic')})&amp;ktai_flag=({$ktai_flag})&amp;ymd=({$ymd})&amp;month_flag=({$month_flag})&amp;page_name=({$requests.page_name})&amp;orderby=({$orderby})&amp;page=({$page-1})"><前を表示</a>
    2828({/if})
    2929&nbsp;&nbsp;({$start_num})件~({$end_num})件を表示&nbsp;&nbsp;
  • OpenPNE/branches/stable-2.12.x/webapp/modules/admin/templates/edit_category.tpl

    r8142 r8374  
    2121<th>並び順<br />(昇順))</th>
    2222<th colspan="2">操作</th>
    23 <th>小カテゴリ</th> 
     23<th>小カテゴリ</th>
    2424</tr>
    2525</thead>
     
    7474<th>項目名</th>
    7575<th>並び順</th>
    76 <th colspan="2">操作</th> 
     76<th colspan="2">操作</th>
    7777</tr>
    7878</thead>
  • OpenPNE/branches/stable-2.12.x/webapp/modules/admin/templates/user_analysis_date_month.tpl

    r3593 r8374  
    3333<tr>
    3434        ({if $key == "合計"})
    35         <th>({$key})</th>       
     35        <th>({$key})</th>
    3636        ({else})
    37         <td><a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('user_analysis_date_day')})&date=({$key})">({$key})</a></td>     
     37        <td><a href="?m=({$module_name})&amp;a=page_({$hash_tbl->hash('user_analysis_date_day')})&date=({$key})">({$key})</a></td>
    3838        ({/if})
    3939        <td>({$item})人</td>
  • OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/page/fh_album_image_show.php

    r7995 r8374  
    3838
    3939        $target_c_album = db_album_get_c_album4c_album_id($target_c_album_id);
    40         $target_c_member_id = $target_c_album['c_member_id']; 
     40        $target_c_member_id = $target_c_album['c_member_id'];
    4141        $target_c_member = db_member_c_member4c_member_id($target_c_member_id);
    4242
  • OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/templates/h_config_image_delete_image_confirm.tpl

    r4371 r8374  
    99この写真を本当に削除しますか?<br>
    1010
    11 <hr color="#({$ktai_color_config.border_01})"> 
     11<hr color="#({$ktai_color_config.border_01})">
    1212<center>
    1313({if $img_num == 1})
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/do/c_topic_write_insert_c_commu_topic_comment.php

    r7215 r8374  
    2323            $filename4_tmpfile = $requests['filename4_tmpfile'];
    2424            $filename4_original_filename = $requests['filename4_original_filename'];
    25            
     25
    2626            if ($filename4_tmpfile) {
    2727                // 拡張子制限
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/do/f_message_send_insert_c_message.php

    r7093 r8374  
    2828            $tmpfile_4 = $requests['tmpfile_4'];
    2929            $tmpfile_4_original_filename = $requests['tmpfile_4_original_filename'];
    30            
     30
    3131            if ($tmpfile_4) {
    3232                // 拡張子制限
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/do/h_album_add_insert_c_album.php

    r7759 r8374  
    3131        $tmpfile = $requests['tmpfile'];
    3232        // ----------
    33        
     33
    3434        $c_member_id = $u;
    3535        $c_album_id = db_album_insert_c_album($c_member_id, $subject, $description, $public_flag);
    36        
     36
    3737        if ($tmpfile) {
    3838            $filename = image_insert_c_image4tmp("a_{$c_album_id}_1", $tmpfile);
     
    4040            $sessid = session_id();
    4141            t_image_clear_tmp($sessid);
    42    
     42
    4343            //アルバムの表紙に写真ファイル名を登録
    4444            db_album_update_c_album_album_cover_image($c_album_id,$filename);
    4545        }
    46        
     46
    4747        $p = array('target_c_album_id' => $c_album_id);
    4848        openpne_redirect('pc', 'page_h_album_image_add', $p);
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/do/h_album_cover_edit_insert_c_album.php

    r7759 r8374  
    4747            $filename_1 = image_insert_c_image4tmp("a_{$target_c_album_id}_1", $tmpfile_1);
    4848        }
    49        
     49
    5050        $sessid = session_id();
    5151        t_image_clear_tmp($sessid);
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/do/h_album_image_edit_insert_c_album_image.php

    r8075 r8374  
    7575        // c_albumの更新時間UPDATE
    7676        db_album_update_c_album_u_datetime($target_c_album_id);
    77        
     77
    7878        $p = array('target_c_album_id' => $target_c_album_id);
    7979        openpne_redirect('pc', 'page_fh_album', $p);
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/fh_album_image_show.php

    r8004 r8374  
    1414
    1515        $u = $GLOBALS['AUTH']->uid();
    16        
     16
    1717        // --- リクエスト変数
    1818        $target_c_album_image_id = $requests['target_c_album_image_id'];
    1919        // ----------
    20        
     20
    2121        //targetが指定されていない
    2222        if (!$target_c_album_image_id) {
     
    2828            openpne_redirect('pc', 'page_h_err_fh_album');
    2929        }
    30        
     30
    3131        $target_c_album_image = db_album_image_get_c_album_image4id($target_c_album_image_id);
    3232        $target_c_album_id = $target_c_album_image['c_album_id'];
    33        
     33
    3434        //targetのアルバムが存在しない
    3535        if (!p_common_is_active_c_album_id($target_c_album_id)) {
     
    3838
    3939        $target_c_album = db_album_get_c_album4c_album_id($target_c_album_id);
    40         $target_c_member_id = $target_c_album['c_member_id']; 
     40        $target_c_member_id = $target_c_album['c_member_id'];
    4141
    4242        if ($target_c_member_id == $u) {
     
    6262            db_ashiato_insert_c_ashiato($target_c_member_id, $u);
    6363        }
    64        
     64
    6565        $this->set('type', $type);
    6666        $this->set('inc_navi', fetch_inc_navi($type, $target_c_member_id));
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/fh_album_list.php

    r7993 r8374  
    4242                openpne_redirect('pc', 'page_h_access_block');
    4343            }
    44            
     44
    4545            //あしあとをつける
    4646            db_ashiato_insert_c_ashiato($target_c_member_id, $u);
     
    5454        $this->set('target_member', $target_member);
    5555        $this->set('c_member_id',$u);
    56        
     56
    5757        //年月日で一覧表示、アルバム数に制限なし
    58        
     58
    5959        //検索する場合
    6060        if ($keyword) {
     
    6363            $list_set = p_fh_album_list_fh_my_album_list4c_member_id($target_c_member_id, $page_size, $page, $u);
    6464        }
    65        
     65
    6666        $this->set('target_album_list', $list_set[0]);
    67        
     67
    6868        //アルバムサブジェクト一覧取得
    6969        $album_subject_list =  db_album_get_c_album_subject_list4c_member_id($target_c_member_id, 10, $u);
    7070        $this->set('target_album_subject_list', $album_subject_list);
    71        
     71
    7272        $this->set('page', $page);
    7373        $this->set('page_size', $page_size);
     
    8080        $this->set('keyword', $keyword);
    8181        $this->set("url_keyword", urlencode($keyword));
    82        
     82
    8383        return 'success';
    8484    }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_add.php

    r6677 r8374  
    2828        $this->set("form_val", $form_val);
    2929        $this->set('err_msg', $err_msg);
    30        
     30
    3131        return 'success';
    3232    }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_add_confirm.php

    r6677 r8374  
    3535            }
    3636        }
    37        
     37
    3838        if ($err_msg) {
    3939            $_REQUEST['err_msg'] = $err_msg;
     
    5959        );
    6060        $this->set("form_val", $form_val);
    61        
     61
    6262        return 'success';
    6363    }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_cover_edit.php

    r6677 r8374  
    3232            handle_kengen_error();
    3333        }
    34        
     34
    3535        if (!(is_null($subject) || is_null($description)||is_null($public_flag))) {
    3636            $album['subject'] = $subject;
     
    3838            $album['public_flag'] = $public_flag;
    3939        }
    40        
     40
    4141        $this->set('inc_navi', fetch_inc_navi('h'));
    4242        $this->set('target_c_album_id',$target_c_album_id);
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_cover_edit_confirm.php

    r7487 r8374  
    2828        $public_flag = $requests['public_flag'];
    2929        // ----------
    30        
     30
    3131        //--- 権限チェック
    3232        $c_album = db_album_get_c_album4c_album_id($target_c_album_id);
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_image_add.php

    r6677 r8374  
    2222        $form_val['image_description5'] = $requests['image_description5'];
    2323        $target_c_album_id = $requests['target_c_album_id'];
    24        
     24
    2525        //--- 権限チェック
    2626        $album = db_album_get_c_album4c_album_id($target_c_album_id);
     
    3636        $this->set('target_c_album_id',$target_c_album_id);
    3737        $this->set("form_val", $form_val);
    38        
     38
    3939        //写真データ一時ファイル削除
    4040        $sessid = session_id();
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_image_add_confirm.php

    r7473 r8374  
    5454            '',
    5555        );
    56        
     56
    5757        $is_set_file = false;
    5858        foreach ($upfiles as $key => $upfile) {
     
    113113            "tmpfile_5" => $tmpfiles[5],
    114114        );
    115        
     115
    116116        //ファイル写真を指定しているものだけ説明文を設定
    117117        foreach ($tmpfiles as $key => $tmpfile) {
    118118            $name = "image_description{$key}";
    119119            if($tmpfile){
    120                 $form_val["$name"] = $$name;   
     120                $form_val["$name"] = $$name;
    121121            }
    122122        }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_image_delete_confirm.php

    r6762 r8374  
    3333
    3434        // target の写真が存在しない
    35         if (!p_common_is_active_c_album_image_id($target_c_album_image_id)) { 
     35        if (!p_common_is_active_c_album_image_id($target_c_album_image_id)) {
    3636            openpne_redirect('pc', 'page_h_err_fh_album');
    3737        }
     
    4040
    4141        $this->set('target_c_album_image',$target_c_album_image);
    42        
     42
    4343        $form_val = array(
    4444            "target_c_album_id" => $target_c_album_id,
     
    4646        );
    4747        $this->set("form_val",$form_val);
    48        
     48
    4949        return 'success';
    5050    }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_image_edit.php

    r6762 r8374  
    3535            handle_kengen_error();
    3636        }
    37        
     37
    3838        // target の写真が存在しない
    3939        if(!$c_album_image){
    4040            openpne_redirect('pc', 'page_h_err_fh_album');
    4141        }
    42        
     42
    4343        if (!(is_null($image_description))) {
    4444            $c_album_image['image_description'] = $image_description;
    4545        }
    46        
     46
    4747        $this->set('inc_navi', fetch_inc_navi('h'));
    4848        $this->set('c_album_image', $c_album_image);
    4949        $this->set('target_c_album_id', $target_c_album_id);
    5050        $this->set('target_c_album_image_id', $target_c_album_image_id);
    51        
     51
    5252        return 'success';
    5353    }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_image_edit_confirm.php

    r8062 r8374  
    8383
    8484        $this->set("form_val", $form_val);
    85        
     85
    8686        return 'success';
    8787    }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_album_insert_dialog.php

    r6775 r8374  
    2222        $this->set('target_member', $target_member);
    2323        $this->set('c_member_id', $u);
    24        
     24
    2525        $list_set = p_fh_album_list_fh_my_album_list4c_member_id($u, $page_size, $page, $u);
    2626        $this->set('target_album_list', $list_set[0]);
    27        
     27
    2828        $this->set('page', $page);
    2929        $this->set('page_size', $page_size);
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/page/h_delete_album.php

    r6762 r8374  
    2323            handle_kengen_error();
    2424        }
    25        
     25
    2626        $this->set('inc_navi', fetch_inc_navi('h'));
    2727        $this->set('target_c_album_id', $target_c_album_id);
    28        
     28
    2929        return 'success';
    3030    }
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/templates/c_edit_member.tpl

    r6618 r8374  
    2929({foreach from=$c_member_list item=c_member})
    3030<tr>
    31 <td>({$c_member.r_datetime|date_format:"%Y年%m月%d日 %H:%M"})</td> 
    32 <td><a href="({t_url m=pc a=page_f_home})&amp;target_c_member_id=({$c_member.c_member_id})">({$c_member.nickname})</a></td> 
     31<td>({$c_member.r_datetime|date_format:"%Y年%m月%d日 %H:%M"})</td>
     32<td><a href="({t_url m=pc a=page_f_home})&amp;target_c_member_id=({$c_member.c_member_id})">({$c_member.nickname})</a></td>
    3333<td>
    3434({if !$c_member.is_c_commu_admin})
    3535<a href="({t_url m=pc a=page_c_edit_member_delete_c_commu_member})&amp;target_c_commu_id=({$c_commu.c_commu_id})&amp;target_c_member_id=({$c_member.c_member_id})">({$WORD_COMMUNITY})から退会させる</a>
    3636({/if})
    37 </td> 
     37</td>
    3838<td>
    3939({if !$c_member.is_c_commu_admin
     
    4747<a href="({t_url m=pc a=page_c_sub_admin_delete})&amp;target_c_commu_id=({$c_commu.c_commu_id})&amp;target_c_member_id=({$c_member.c_member_id})">副管理者から降格</a>
    4848({/if})
    49 </td> 
     49</td>
    5050<td>
    5151({if !($c_member.is_c_commu_admin && !$c_member.is_c_commu_sub_admin)
     
    5656<a href="({t_url m=pc a=page_c_admin_request})&amp;target_c_commu_id=({$c_commu.c_commu_id})&amp;target_c_member_id=({$c_member.c_member_id})">管理権を渡す</a>
    5757({/if})
    58 </td> 
     58</td>
    5959</tr>
    6060({/foreach})
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/templates/fh_diary.tpl

    r8142 r8374  
    172172({if $pager.page_next})<p class="next"><a href="({t_url m=pc a=page_fh_diary})&amp;target_c_diary_id=({$target_diary.c_diary_id})&amp;page=({$pager.page_next})({if $requests.page_size == 100})&amp;page_size=100({/if})({if $requests.order == 'asc'})&amp;order=asc({/if})#commentList">次を表示</a></p>({/if})
    173173</div>
    174 ({/strip})({/capture}) 
     174({/strip})({/capture})
    175175({$smarty.capture.pager|smarty:nodefaults})
    176176
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/templates/h_album_cover_edit.tpl

    r6661 r8374  
    4040</td>
    4141</tr>
    42 </table> 
     42</table>
    4343<div class="operation">
    4444<ul class="moreInfo button">
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/templates/h_album_image_add.tpl

    r7427 r8374  
    6969
    7070({* {{{ linkLine *})
    71 <div class="parts linkLine"><ul class="moreInfo"> 
     71<div class="parts linkLine"><ul class="moreInfo">
    7272<li><a href="({t_url m=pc a=page_fh_album})&amp;target_c_album_id=({$target_c_album_id})">アルバムページへ戻る</a></li>
    7373</ul></div>
  • OpenPNE/branches/stable-2.12.x/webapp/modules/pc/templates/h_album_image_edit.tpl

    r7484 r8374  
    2222</td>
    2323</tr>
    24 </table> 
     24</table>
    2525<div class="operation">
    2626<ul class="moreInfo button">
Note: See TracChangeset for help on using the changeset viewer.