Completed
Push — develop ( 6ff0d7...b03fd3 )
by Kenji
01:58
created
application/models/shop/Shop_model.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 			$item['price']  = number_format($item['price']);
29 29
 			$item['amount'] = number_format($item['amount']);
30 30
 		}
31
-		$data['items']  = $cart['items'];
31
+		$data['items'] = $cart['items'];
32 32
 		$data['line']  = $cart['line'];
33 33
 		$data['total'] = number_format($cart['total']);
34 34
 
Please login to merge, or discard this patch.
application/views/bbs_confirm.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3 3
 <head>
4 4
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
-<link rel="stylesheet" href="<?=base_url('css/bbs.css');?>" type="text/css" />
5
+<link rel="stylesheet" href="<?=base_url('css/bbs.css'); ?>" type="text/css" />
6 6
 <title>掲示板: 投稿確認</title>
7 7
 </head>
8 8
 
@@ -13,55 +13,55 @@  discard block
 block discarded – undo
13 13
 <!-- main -->
14 14
 <div id="main">
15 15
 <div class="title_banner">
16
-<img src="<?=base_url('images/icons/bbs_titile.jpg');?>" alt="掲示板" width="580" height="70" />
16
+<img src="<?=base_url('images/icons/bbs_titile.jpg'); ?>" alt="掲示板" width="580" height="70" />
17 17
 </div>
18 18
 
19 19
 <div class="bbs_new_post_icon">
20
-<img src="<?=base_url('images/icons/bbs_new.jpg');?>" alt="新規投稿" name="toukou" width="150" height="50" border="0" id="toukou" onmouseover="MM_swapImage('toukou','','<?=base_url('images/icons/bbs_new_on.jpg');?>',1)" onmouseout="MM_swapImgRestore()" />
20
+<img src="<?=base_url('images/icons/bbs_new.jpg'); ?>" alt="新規投稿" name="toukou" width="150" height="50" border="0" id="toukou" onmouseover="MM_swapImage('toukou','','<?=base_url('images/icons/bbs_new_on.jpg'); ?>',1)" onmouseout="MM_swapImgRestore()" />
21 21
 </div>
22 22
 
23 23
 <p class="center">投稿確認</p>
24 24
 
25 25
 <div class="outer_frame">
26
-<?=validation_errors();?>
26
+<?=validation_errors(); ?>
27 27
 
28 28
 <div class="confirm">
29 29
 
30 30
 <div class="field">名前: </div>
31
-<?=html_escape($name);?>
31
+<?=html_escape($name); ?>
32 32
 
33 33
 <div class="field">メールアドレス: </div>
34 34
 <?php if ($email == '') { echo '(なし)'; } else { echo html_escape($email); } ?>
35 35
 
36 36
 <div class="field">件名: </div>
37
-<?=html_escape($subject);?>
37
+<?=html_escape($subject); ?>
38 38
 
39 39
 <div class="field">内容: </div>
40
-<?=nl2br(html_escape($body));?>
40
+<?=nl2br(html_escape($body)); ?>
41 41
 
42 42
 <div class="field">削除パスワード: </div>
43 43
 <?php if ($password == '') { echo '(なし)'; } else { echo html_escape($password); } ?>
44 44
 </div>
45 45
 
46
-<?=form_open('bbs/post');?>
47
-<?=form_hidden('name',     $name);?>
48
-<?=form_hidden('email',    $email);?>
49
-<?=form_hidden('subject',  $subject);?>
50
-<?=form_hidden('body',     $body);?>
51
-<?=form_hidden('password', $password);?>
46
+<?=form_open('bbs/post'); ?>
47
+<?=form_hidden('name', $name); ?>
48
+<?=form_hidden('email', $email); ?>
49
+<?=form_hidden('subject', $subject); ?>
50
+<?=form_hidden('body', $body); ?>
51
+<?=form_hidden('password', $password); ?>
52 52
 <input type="submit" value="修正" />
53
-<?=form_close();?>
53
+<?=form_close(); ?>
54 54
 
55
-<?=form_open('bbs/insert');?>
56
-<?=form_hidden('name',     $name);?>
57
-<?=form_hidden('email',    $email);?>
58
-<?=form_hidden('subject',  $subject);?>
59
-<?=form_hidden('body',     $body);?>
60
-<?=form_hidden('password', $password);?>
61
-<?=form_hidden('key',      $key);?>
62
-<?=form_hidden('captcha',  $captcha);?>
55
+<?=form_open('bbs/insert'); ?>
56
+<?=form_hidden('name', $name); ?>
57
+<?=form_hidden('email', $email); ?>
58
+<?=form_hidden('subject', $subject); ?>
59
+<?=form_hidden('body', $body); ?>
60
+<?=form_hidden('password', $password); ?>
61
+<?=form_hidden('key', $key); ?>
62
+<?=form_hidden('captcha', $captcha); ?>
63 63
 <input type="submit" value="送信" />
64
-<?=form_close();?>
64
+<?=form_close(); ?>
65 65
 
66 66
 </div>
67 67
 </div>
Please login to merge, or discard this patch.
application/views/bbs_delete_confirm.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3 3
 <head>
4 4
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
-<link rel="stylesheet" href="<?=base_url('css/bbs.css');?>" type="text/css" />
5
+<link rel="stylesheet" href="<?=base_url('css/bbs.css'); ?>" type="text/css" />
6 6
 <title>掲示板: 削除の確認</title>
7 7
 </head>
8 8
 
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 <!-- main -->
14 14
 <div id="main">
15 15
 <div class="title_banner">
16
-<img src="<?=base_url('images/icons/bbs_titile.jpg');?>" alt="掲示板" width="580" height="70" />
16
+<img src="<?=base_url('images/icons/bbs_titile.jpg'); ?>" alt="掲示板" width="580" height="70" />
17 17
 </div>
18 18
 <p class="center">削除の確認</p>
19 19
 <div class="outer_frame">
@@ -21,26 +21,26 @@  discard block
 block discarded – undo
21 21
 以下の記事を削除しますか?
22 22
 </p>
23 23
 <div class="confirm_delete">
24
-<h2><a name="<?=html_escape($id);?>">[<?=html_escape($id);?>]</a> <?=html_escape($subject);?></h2>
25
-<div><?=html_escape($name);?>&nbsp;
26
-<?=html_escape($datetime);?>&nbsp;
24
+<h2><a name="<?=html_escape($id); ?>">[<?=html_escape($id); ?>]</a> <?=html_escape($subject); ?></h2>
25
+<div><?=html_escape($name); ?>&nbsp;
26
+<?=html_escape($datetime); ?>&nbsp;
27 27
 </div>
28
-<div><?=nl2br(html_escape($body));?></div>
28
+<div><?=nl2br(html_escape($body)); ?></div>
29 29
 </div>
30 30
 
31
-<?=form_open('bbs');?>
31
+<?=form_open('bbs'); ?>
32 32
 <input type="submit" value="いいえ" />
33
-<?=form_close();?>
33
+<?=form_close(); ?>
34 34
 
35
-<?=form_open('bbs/delete/'. $id);?>
36
-<?=form_hidden('delete', '1');?>
37
-<?=form_hidden('password', $password);?>
35
+<?=form_open('bbs/delete/'.$id); ?>
36
+<?=form_hidden('delete', '1'); ?>
37
+<?=form_hidden('password', $password); ?>
38 38
 <input type="submit" value="はい" />
39
-<?=form_close();?>
39
+<?=form_close(); ?>
40 40
 
41 41
 <p>
42 42
 <span class="button">
43
-<?=anchor('bbs', 'トップに戻る');?>
43
+<?=anchor('bbs', 'トップに戻る'); ?>
44 44
 </span>
45 45
 </p>
46 46
 </div>
Please login to merge, or discard this patch.
application/views/bbs_delete_error.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3 3
 <head>
4 4
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
-<link rel="stylesheet" href="<?=base_url('css/bbs.css');?>" type="text/css" />
5
+<link rel="stylesheet" href="<?=base_url('css/bbs.css'); ?>" type="text/css" />
6 6
 <title>掲示板: エラー</title>
7 7
 </head>
8 8
 
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 <!-- main -->
14 14
 <div id="main">
15 15
 <div class="title_banner">
16
-<img src="<?=base_url('images/icons/bbs_titile.jpg');?>" alt="掲示板" width="580" height="70" />
16
+<img src="<?=base_url('images/icons/bbs_titile.jpg'); ?>" alt="掲示板" width="580" height="70" />
17 17
 </div>
18 18
 
19 19
 <p class="center">エラー</p>
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 <p>
27 27
 <span class="button">
28
-<?=anchor('bbs', 'トップに戻る');?>
28
+<?=anchor('bbs', 'トップに戻る'); ?>
29 29
 </span>
30 30
 </p>
31 31
 </div>
Please login to merge, or discard this patch.
application/views/bbs_delete_error_mobile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 </table>
28 28
 
29 29
 <hr>
30
-<?=anchor('bbs', 'トップに戻る');?>
30
+<?=anchor('bbs', 'トップに戻る'); ?>
31 31
 
32 32
 </body>
33 33
 </html>
Please login to merge, or discard this patch.
application/views/bbs_delete_finished.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3 3
 <head>
4 4
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
-<link rel="stylesheet" href="<?=base_url('css/bbs.css');?>" type="text/css" />
5
+<link rel="stylesheet" href="<?=base_url('css/bbs.css'); ?>" type="text/css" />
6 6
 <title>掲示板: 記事の削除完了</title>
7 7
 </head>
8 8
 
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 <!-- main -->
14 14
 <div id="main">
15 15
 <div class="title_banner">
16
-<img src="<?=base_url('images/icons/bbs_titile.jpg');?>" alt="掲示板" width="580" height="70" />
16
+<img src="<?=base_url('images/icons/bbs_titile.jpg'); ?>" alt="掲示板" width="580" height="70" />
17 17
 </div>
18 18
 
19 19
 <p class="center">記事の削除完了</p>
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 <p>
27 27
 <span class="button">
28
-<?=anchor('bbs', 'トップに戻る');?>
28
+<?=anchor('bbs', 'トップに戻る'); ?>
29 29
 </span>
30 30
 </p>
31 31
 </div>
Please login to merge, or discard this patch.
application/views/bbs_header.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@
 block discarded – undo
2 2
 	<div class="top_title"></div>
3 3
 	<div class="navi">
4 4
 		<ul class="sitenavi">
5
-			<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-2.jpg');?>" alt="bbs" /></li>
6
-			<li class="menu_2"><a href="<?=$this->config->site_url('bbs');?>">CI掲示板</a></li>
7
-			<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-4.jpg');?>" alt="home" /></li>
8
-			<li class="menu_2"><a href="<?=base_url();?>">HOME</a></li>
5
+			<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-2.jpg'); ?>" alt="bbs" /></li>
6
+			<li class="menu_2"><a href="<?=$this->config->site_url('bbs'); ?>">CI掲示板</a></li>
7
+			<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-4.jpg'); ?>" alt="home" /></li>
8
+			<li class="menu_2"><a href="<?=base_url(); ?>">HOME</a></li>
9 9
 		</ul>
10 10
 	</div>
11 11
 	<div class="top_kage"></div>
Please login to merge, or discard this patch.
application/views/bbs_post.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3 3
 <head>
4 4
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
-<link rel="stylesheet" href="<?=base_url('css/bbs.css');?>" type="text/css" />
6
-<script type="text/javascript" src="<?=base_url('js/bbs.js');?>"></script>
5
+<link rel="stylesheet" href="<?=base_url('css/bbs.css'); ?>" type="text/css" />
6
+<script type="text/javascript" src="<?=base_url('js/bbs.js'); ?>"></script>
7 7
 <title>掲示板: 新規投稿</title>
8 8
 </head>
9 9
 
@@ -14,37 +14,37 @@  discard block
 block discarded – undo
14 14
 <!-- main -->
15 15
 <div id="main">
16 16
 <div class="title_banner">
17
-<img src="<?=base_url('images/icons/bbs_titile.jpg');?>" alt="掲示板" width="580" height="70" />
17
+<img src="<?=base_url('images/icons/bbs_titile.jpg'); ?>" alt="掲示板" width="580" height="70" />
18 18
 </div>
19 19
 <div class="bbs_new_post_icon">
20
-<img src="<?=base_url('images/icons/bbs_new.jpg');?>" alt="新規投稿" name="toukou" width="150" height="50" border="0" id="toukou" />
20
+<img src="<?=base_url('images/icons/bbs_new.jpg'); ?>" alt="新規投稿" name="toukou" width="150" height="50" border="0" id="toukou" />
21 21
 </div>
22 22
 <div class="outer_frame">
23
-<?=validation_errors();?>
24
-<?=form_open('bbs/confirm');?>
23
+<?=validation_errors(); ?>
24
+<?=form_open('bbs/confirm'); ?>
25 25
 <p>
26 26
 <label for="name">名前: </label>
27
-<input type="text" name="name" size="50" value="<?=html_escape($name);?>"/>
27
+<input type="text" name="name" size="50" value="<?=html_escape($name); ?>"/>
28 28
 <br />
29 29
 <label for="email">メールアドレス: </label>
30
-<input type="text" name="email" size="50" value="<?=html_escape($email);?>"/>
30
+<input type="text" name="email" size="50" value="<?=html_escape($email); ?>"/>
31 31
 <br />
32 32
 <label for="subject">件名: </label>
33
-<input type="text" name="subject" size="50" value="<?=html_escape($subject);?>"/>
33
+<input type="text" name="subject" size="50" value="<?=html_escape($subject); ?>"/>
34 34
 <br />
35 35
 <label for="body">内容: </label>
36
-<textarea name="body" rows="10" cols="50"><?=html_escape($body);?></textarea>
36
+<textarea name="body" rows="10" cols="50"><?=html_escape($body); ?></textarea>
37 37
 <br />
38 38
 <label for="password">削除パスワード: </label>
39
-<input type="text" name="password" size="20" value="<?=html_escape($password);?>"/>
39
+<input type="text" name="password" size="20" value="<?=html_escape($password); ?>"/>
40 40
 <br />
41 41
 <label for="captcha">画像認証コード: </label>
42 42
 <input type="text" name="captcha" value="" />
43 43
 <?=$image?> 
44
-<?=form_hidden('key', $key);?>
44
+<?=form_hidden('key', $key); ?>
45 45
 <input type="submit" value="送信" />
46 46
 </p>
47
-<?=form_close();?>
47
+<?=form_close(); ?>
48 48
 </div>
49 49
 </div>
50 50
 
Please login to merge, or discard this patch.
application/views/bbs_show.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -2,24 +2,24 @@  discard block
 block discarded – undo
2 2
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
3 3
 <head>
4 4
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
-<link rel="stylesheet" href="<?=base_url('css/bbs.css');?>" type="text/css" />
6
-<script type="text/javascript" src="<?=base_url('js/bbs.js');?>"></script>
5
+<link rel="stylesheet" href="<?=base_url('css/bbs.css'); ?>" type="text/css" />
6
+<script type="text/javascript" src="<?=base_url('js/bbs.js'); ?>"></script>
7 7
 <title>掲示板</title>
8 8
 </head>
9 9
 
10
-<body onload="MM_preloadImages('<?=base_url('images/icons/bbs_new_on.jpg');?>')">
10
+<body onload="MM_preloadImages('<?=base_url('images/icons/bbs_new_on.jpg'); ?>')">
11 11
 <!-- header -->
12 12
 <?php $this->load->view('bbs_header'); ?>
13 13
 
14 14
 <!-- main -->
15 15
 <div id="main">
16 16
 <div class="title_banner">
17
-<img src="<?=base_url('images/icons/bbs_titile.jpg');?>" alt="掲示板" width="580" height="70" />
17
+<img src="<?=base_url('images/icons/bbs_titile.jpg'); ?>" alt="掲示板" width="580" height="70" />
18 18
 </div>
19 19
 
20 20
 <div class="bbs_new_post_button">
21
-<a href="<?=$this->config->site_url();?>bbs/post">
22
-<img src="<?=base_url('images/icons/bbs_new_off.jpg');?>" alt="新規投稿" name="toukou" width="150" height="50" border="0" id="toukou" onmouseover="MM_swapImage('toukou','','<?=base_url('images/icons/bbs_new_on.jpg');?>',1)" onmouseout="MM_swapImgRestore()" />
21
+<a href="<?=$this->config->site_url(); ?>bbs/post">
22
+<img src="<?=base_url('images/icons/bbs_new_off.jpg'); ?>" alt="新規投稿" name="toukou" width="150" height="50" border="0" id="toukou" onmouseover="MM_swapImage('toukou','','<?=base_url('images/icons/bbs_new_on.jpg'); ?>',1)" onmouseout="MM_swapImgRestore()" />
23 23
 </a>
24 24
 </div>
25 25
 
@@ -27,19 +27,19 @@  discard block
 block discarded – undo
27 27
 <?=$pagination?>
28 28
 
29 29
 <!-- ここから、php endforeachまで、記事を表示するループです。 -->
30
-<?php foreach($query->result() as $row): ?>
30
+<?php foreach ($query->result() as $row): ?>
31 31
 <div class="article">
32
-<h1 class="f_bbs_titile"><a id="id<?=html_escape($row->id);?>" name="id<?=html_escape($row->id);?>">[<?=html_escape($row->id);?>]</a>
33
-<?=html_escape($row->subject);?></h1>
34
-<div class="f_bbs_coment"><?=html_escape($row->name);?>&nbsp;
35
-<?=html_escape($row->datetime);?>&nbsp;</div>
36
-<div class="f_bbs_coment"><?=nl2br(html_escape($row->body));?></div>
32
+<h1 class="f_bbs_titile"><a id="id<?=html_escape($row->id); ?>" name="id<?=html_escape($row->id); ?>">[<?=html_escape($row->id); ?>]</a>
33
+<?=html_escape($row->subject); ?></h1>
34
+<div class="f_bbs_coment"><?=html_escape($row->name); ?>&nbsp;
35
+<?=html_escape($row->datetime); ?>&nbsp;</div>
36
+<div class="f_bbs_coment"><?=nl2br(html_escape($row->body)); ?></div>
37 37
 <!-- 記事を削除するためのフォームを表示します。 -->
38 38
 <div class="f_bbs_delete">
39
-<?=form_open('bbs/delete/'. $row->id);?>
39
+<?=form_open('bbs/delete/'.$row->id); ?>
40 40
 削除パスワード: <input type="text" name="password" size="12" value="" />
41 41
 <input type="submit" value="削除" />
42
-<?=form_close();?>
42
+<?=form_close(); ?>
43 43
 </div><!-- end of f_bbs_delete -->
44 44
 </div><!-- end of article -->
45 45
 <?php endforeach; ?>
Please login to merge, or discard this patch.