Completed
Pull Request — develop (#9)
by
unknown
32s
created
application/views/form_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-3.jpg');?>" alt="from" /></li>
6
-			<li class="menu_2"><a href="<?=$this->config->site_url('form');?>">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-3.jpg'); ?>" alt="from" /></li>
6
+			<li class="menu_2"><a href="<?=$this->config->site_url('form'); ?>">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/index.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -3,23 +3,23 @@  discard block
 block discarded – undo
3 3
 <head>
4 4
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5 5
 <title>CodeIgniterへようこそ!</title>
6
-<link href="<?=base_url('css/top.css');?>" rel="stylesheet" type="text/css" />
7
-<script type="text/javascript" src="<?=base_url('js/bbs.js');?>"></script>
6
+<link href="<?=base_url('css/top.css'); ?>" rel="stylesheet" type="text/css" />
7
+<script type="text/javascript" src="<?=base_url('js/bbs.js'); ?>"></script>
8 8
 </head>
9 9
 
10
-<body onload="MM_preloadImages('<?=base_url('images/icons/top_link_1on.jpg');?>','<?=base_url('images/icons/top_link_2on.jpg');?>','<?=base_url('images/icons/top_link_3on.jpg');?>')">
10
+<body onload="MM_preloadImages('<?=base_url('images/icons/top_link_1on.jpg'); ?>','<?=base_url('images/icons/top_link_2on.jpg'); ?>','<?=base_url('images/icons/top_link_3on.jpg'); ?>')">
11 11
 <div id="header">
12 12
 	<div class="top_title"></div>
13 13
 	<div class="navi">
14 14
 		<ul class="sitenavi">
15
-		<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-3.jpg');?>" alt="from" /></li>
16
-		<li class="menu_2"><a href="<?=$this->config->site_url('form');?>">CIコンタクトフォーム</a></li>
17
-		<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-2.jpg');?>" alt="bbs" /></li>
18
-		<li class="menu_2"><a href="<?=$this->config->site_url('bbs');?>">CI掲示板</a></li>
19
-		<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-1.jpg');?>" alt="shop" /></li>
20
-		<li class="menu_2"><a href="<?=$this->config->site_url('shops');?>">CIショッピング</a></li>
21
-		<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-4.jpg');?>" alt="home" /></li>
22
-		<li class="menu_2"><a href="<?=$this->config->site_url();?>">HOME</a></li>
15
+		<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-3.jpg'); ?>" alt="from" /></li>
16
+		<li class="menu_2"><a href="<?=$this->config->site_url('form'); ?>">CIコンタクトフォーム</a></li>
17
+		<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-2.jpg'); ?>" alt="bbs" /></li>
18
+		<li class="menu_2"><a href="<?=$this->config->site_url('bbs'); ?>">CI掲示板</a></li>
19
+		<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-1.jpg'); ?>" alt="shop" /></li>
20
+		<li class="menu_2"><a href="<?=$this->config->site_url('shops'); ?>">CIショッピング</a></li>
21
+		<li class="menu_1"><img src="<?=base_url('images/icons/navi_icon-4.jpg'); ?>" alt="home" /></li>
22
+		<li class="menu_2"><a href="<?=$this->config->site_url(); ?>">HOME</a></li>
23 23
 		</ul>
24 24
 	</div>	
25 25
 	<div class="top_kage"></div>
@@ -28,16 +28,16 @@  discard block
 block discarded – undo
28 28
 <div id="main">
29 29
 	<div class="top_navi">
30 30
 		<div class="top_sitenavi">
31
-		<a href="<?=$this->config->site_url();?>form" target="_top">
32
-		<img src="<?=base_url('images/icons/top_link_3off.jpg');?>" alt="CIコンタクトフォーム" name="navi3" width="220" height="220" border="0" id="navi3" onmouseover="MM_swapImage('navi3','','<?=base_url('images/icons/top_link_3on.jpg');?>',1)" onmouseout="MM_swapImgRestore()" /></a>
31
+		<a href="<?=$this->config->site_url(); ?>form" target="_top">
32
+		<img src="<?=base_url('images/icons/top_link_3off.jpg'); ?>" alt="CIコンタクトフォーム" name="navi3" width="220" height="220" border="0" id="navi3" onmouseover="MM_swapImage('navi3','','<?=base_url('images/icons/top_link_3on.jpg'); ?>',1)" onmouseout="MM_swapImgRestore()" /></a>
33 33
 		</div>
34 34
 		<div class="top_sitenavi">
35
-		<a href="<?=$this->config->site_url();?>bbs" target="_top">
36
-		<img src="<?=base_url('images/icons/top_link_2off.jpg');?>" alt="CI掲示板" name="navi2" width="220" height="220" border="0" id="navi2" onmouseover="MM_swapImage('navi2','','<?=base_url('images/icons/top_link_2on.jpg');?>',1)" onmouseout="MM_swapImgRestore()" /></a>
35
+		<a href="<?=$this->config->site_url(); ?>bbs" target="_top">
36
+		<img src="<?=base_url('images/icons/top_link_2off.jpg'); ?>" alt="CI掲示板" name="navi2" width="220" height="220" border="0" id="navi2" onmouseover="MM_swapImage('navi2','','<?=base_url('images/icons/top_link_2on.jpg'); ?>',1)" onmouseout="MM_swapImgRestore()" /></a>
37 37
 		</div>
38 38
 		<div class="top_sitenavi">
39
-		<a href="<?=$this->config->site_url();?>shop" target="_top">
40
-		<img src="<?=base_url('images/icons/top_link_1off.jpg');?>" alt="CIショッピング" name="navi1" width="220" height="220" border="0" id="navi1" onmouseover="MM_swapImage('navi1','','<?=base_url('images/icons/top_link_1on.jpg');?>',1)" onmouseout="MM_swapImgRestore()" /></a>
39
+		<a href="<?=$this->config->site_url(); ?>shop" target="_top">
40
+		<img src="<?=base_url('images/icons/top_link_1off.jpg'); ?>" alt="CIショッピング" name="navi1" width="220" height="220" border="0" id="navi1" onmouseover="MM_swapImage('navi1','','<?=base_url('images/icons/top_link_1on.jpg'); ?>',1)" onmouseout="MM_swapImgRestore()" /></a>
41 41
 		</div>
42 42
 	</div>
43 43
 </div>
Please login to merge, or discard this patch.
application/views/welcome_message.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
 		<p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="user_guide/">User Guide</a>.</p>
83 83
 	</div>
84 84
 
85
-	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
85
+	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ? 'CodeIgniter Version <strong>'.CI_VERSION.'</strong>' : '' ?></p>
86 86
 </div>
87 87
 
88 88
 </body>
Please login to merge, or discard this patch.
application/views/bbs_delete_finished_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/libraries/Twig.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
         // default Twig config
93 93
         $this->config = [
94
-            'cache'      => APPPATH . 'cache/twig',
94
+            'cache'      => APPPATH.'cache/twig',
95 95
             'debug'      => ENVIRONMENT !== 'production',
96 96
             'autoescape' => 'html',
97 97
         ];
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
      */
154 154
     public function display($view, $params = [])
155 155
     {
156
-        $CI =& get_instance();
156
+        $CI = & get_instance();
157 157
         $CI->output->set_output($this->render($view, $params));
158 158
     }
159 159
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         // after loading CodeIgniter functions in a controller.
172 172
         $this->addFunctions();
173 173
 
174
-        $view = $view . '.twig';
174
+        $view = $view.'.twig';
175 175
         return $this->twig->render($view, $params);
176 176
     }
177 177
 
Please login to merge, or discard this patch.
application/controllers/Bbs.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 # 引数から$offsetに値が渡されます。これは、3番目のURIセグメントの値です。
33 33
 # ユーザが変更可能なデータですので、int型へ変換し、必ず整数値にします。
34
-		$offset = (int) $offset;
34
+		$offset = (int)$offset;
35 35
 
36 36
 # 新しい記事ID順に、limit値とoffset値を指定し、bbsテーブルから記事データ
37 37
 # (オブジェクト)を取得し、$data['query']に代入します。order_by()メソッドは、
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
 # メソッドを使い、ランダムな4桁の数字を取得します。
122 122
 		$vals = [
123 123
 					'word'      => random_string('numeric', 4),
124
-					'img_path'  => FCPATH . 'captcha/',
125
-					'img_url'   => base_url() . 'captcha/'
124
+					'img_path'  => FCPATH.'captcha/',
125
+					'img_url'   => base_url().'captcha/'
126 126
 				];
127 127
 		$cap = create_captcha($vals);
128 128
 		$data = [
@@ -149,12 +149,12 @@  discard block
 block discarded – undo
149 149
 	public function delete($id = '')
150 150
 	{
151 151
 # 第1引数、つまり、3番目のURIセグメントのデータをint型に変換します。
152
-		$id = (int) $id;
152
+		$id = (int)$id;
153 153
 # POSTされたpasswordフィールドの値を$passwordに代入します。
154 154
 		$password = $this->input->post('password');
155 155
 # POSTされたdeleteフィールドの値を$deleteに代入します。この値が
156 156
 # 1の場合は、削除を実行します。1以外は、削除の確認ページを表示します。
157
-		$delete = (int) $this->input->post('delete');
157
+		$delete = (int)$this->input->post('delete');
158 158
 
159 159
 # 削除パスワードが入力されていない場合は、エラーページを表示します。
160 160
 		if ($password == '')
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 # 有効期限を2時間に設定し、それ以前に生成されたキャプチャをデータベースから
287 287
 # 削除します。delete()メソッドの第2引数では、「captcha_time <」を配列のキーに
288 288
 # していますが、このように記述することで、WHERE句の条件の演算子を指定できます。
289
-		$expiration = time() - 7200;	// 有効期限 2時間
289
+		$expiration = time() - 7200; // 有効期限 2時間
290 290
 		$this->db->delete('captcha', ['captcha_time <' => $expiration]);
291 291
 
292 292
 # バリデーション(検証)クラスより引数$strに渡された、ユーザからの入力値がデータ
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 # 携帯端末の場合は、「_mobile」がファイル名に付くビューファイルをロードします。
325 325
 		if ($this->agent->is_mobile())
326 326
 		{
327
-			$this->load->view($file . '_mobile', $data);
327
+			$this->load->view($file.'_mobile', $data);
328 328
 		}
329 329
 		else
330 330
 		{
Please login to merge, or discard this patch.
application/views/bbs_show_mobile.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,26 +10,26 @@
 block discarded – undo
10 10
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
11 11
 <tr><td bgcolor="#9999FF"><a name="top">モバイル掲示板</a></td></tr>
12 12
 <tr><td>&nbsp;</td></tr>
13
-<tr><td bgcolor="#EEEEEE"><?=anchor('bbs/post', '&gt;&gt;新規投稿');?></td></tr>
13
+<tr><td bgcolor="#EEEEEE"><?=anchor('bbs/post', '&gt;&gt;新規投稿'); ?></td></tr>
14 14
 <tr><td>&nbsp;</td></tr>
15 15
 <!-- ページネーションを表示します。 -->
16 16
 <?=$pagination?>
17 17
 </table>
18 18
 <!-- ここから、php endforeachまで、記事を表示するループです。 -->
19
-<?php foreach($query->result() as $row): ?>
19
+<?php foreach ($query->result() as $row): ?>
20 20
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
21
-<tr><td bgcolor="#BBBBFF"><a name="id<?=html_escape($row->id);?>">[<?=html_escape($row->id);?>]</a>
22
-<?=html_escape($row->subject);?></td></tr>
21
+<tr><td bgcolor="#BBBBFF"><a name="id<?=html_escape($row->id); ?>">[<?=html_escape($row->id); ?>]</a>
22
+<?=html_escape($row->subject); ?></td></tr>
23 23
 <tr>
24
-<td><?=html_escape($row->name);?>&nbsp;<?=html_escape($row->datetime);?></td>
24
+<td><?=html_escape($row->name); ?>&nbsp;<?=html_escape($row->datetime); ?></td>
25 25
 </tr>
26
-<tr><td bgcolor="#EEEEEE"><?=nl2br(html_escape($row->body));?></td></tr>
26
+<tr><td bgcolor="#EEEEEE"><?=nl2br(html_escape($row->body)); ?></td></tr>
27 27
 <!-- 記事を削除するためのフォームを表示します。 -->
28
-<tr><td><?=form_open('bbs/delete/'. $row->id, ['accept-charset' => 'Shift_JIS']);?>
28
+<tr><td><?=form_open('bbs/delete/'.$row->id, ['accept-charset' => 'Shift_JIS']); ?>
29 29
 削除パスワード:<br>
30 30
 <input type="text" name="password" value="">
31 31
 <input type="submit" value="削除">
32
-<?=form_close();?></td></tr>
32
+<?=form_close(); ?></td></tr>
33 33
 <tr><td>&nbsp;</td></tr>
34 34
 <?=$pagination?>
35 35
 </table>
Please login to merge, or discard this patch.
application/views/bbs_post_mobile.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -19,43 +19,43 @@
 block discarded – undo
19 19
 <td>&nbsp;</td>
20 20
 </tr>
21 21
 <tr>
22
-<td bgcolor="#FFCCFF"><?=validation_errors();?></td>
22
+<td bgcolor="#FFCCFF"><?=validation_errors(); ?></td>
23 23
 </tr>
24 24
 <tr>
25 25
 <td>&nbsp;</td>
26 26
 </tr>
27 27
 </table>
28 28
 
29
-<?=form_open('bbs/confirm', ['accept-charset' => 'Shift_JIS']);?>
29
+<?=form_open('bbs/confirm', ['accept-charset' => 'Shift_JIS']); ?>
30 30
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
31 31
 <tr>
32
-<td bgcolor="#EEEEEe">名前<br><input type="text" name="name" value="<?=html_escape($name);?>"></td>
32
+<td bgcolor="#EEEEEe">名前<br><input type="text" name="name" value="<?=html_escape($name); ?>"></td>
33 33
 </tr>
34 34
 <tr>
35
-<td>メールアドレス<br><input type="text" name="email" value="<?=html_escape($email);?>"></td>
35
+<td>メールアドレス<br><input type="text" name="email" value="<?=html_escape($email); ?>"></td>
36 36
 </tr>
37 37
 <tr>
38
-<td bgcolor="#EEEEEE">件名<br><input type="text" name="subject" value="<?=html_escape($subject);?>"></td>
38
+<td bgcolor="#EEEEEE">件名<br><input type="text" name="subject" value="<?=html_escape($subject); ?>"></td>
39 39
 </tr>
40 40
 <tr>
41
-<td>内容<br><textarea name="body" rows="3"><?=html_escape($body);?></textarea></td>
41
+<td>内容<br><textarea name="body" rows="3"><?=html_escape($body); ?></textarea></td>
42 42
 </tr>
43 43
 <tr>
44
-<td bgcolor="#EEEEEE">削除パスワード<br><input type="text" name="password" value="<?=html_escape($password);?>"></td>
44
+<td bgcolor="#EEEEEE">削除パスワード<br><input type="text" name="password" value="<?=html_escape($password); ?>"></td>
45 45
 </tr>
46 46
 <tr>
47 47
 <td>画像認証コード<br><?=$image?>
48 48
 <br>
49 49
 <input type="text" name="captcha" value="" />
50
-<?=form_hidden('key', $key);?>
50
+<?=form_hidden('key', $key); ?>
51 51
 <br>
52 52
 <input type="submit" value="確認画面に進む"></td>
53 53
 </tr>
54 54
 </table>
55
-<?=form_close();?>
55
+<?=form_close(); ?>
56 56
 
57 57
 <hr>
58
-<?=anchor('bbs', 'トップに戻る');?>
58
+<?=anchor('bbs', 'トップに戻る'); ?>
59 59
 
60 60
 </body>
61 61
 </html>
Please login to merge, or discard this patch.
application/views/bbs_delete_confirm_mobile.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,25 +22,25 @@  discard block
 block discarded – undo
22 22
 
23 23
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
24 24
 <tr>
25
-<td bgcolor="#EEEEEE"><a name="<?=html_escape($id);?>">[<?=html_escape($id);?>]</a> <?=html_escape($subject);?></td>
25
+<td bgcolor="#EEEEEE"><a name="<?=html_escape($id); ?>">[<?=html_escape($id); ?>]</a> <?=html_escape($subject); ?></td>
26 26
 </tr>
27 27
 <tr>
28
-<td><?=html_escape($name);?>&nbsp;<?=html_escape($datetime);?>&nbsp;</td>
28
+<td><?=html_escape($name); ?>&nbsp;<?=html_escape($datetime); ?>&nbsp;</td>
29 29
 </tr>
30 30
 <tr>
31
-<td bgcolor="#EEEEEE"><?=nl2br(html_escape($body));?></td>
31
+<td bgcolor="#EEEEEE"><?=nl2br(html_escape($body)); ?></td>
32 32
 </tr>
33 33
 <tr>
34 34
 <td>
35
-<?=form_open('bbs', ['accept-charset' => 'Shift_JIS']);?>
35
+<?=form_open('bbs', ['accept-charset' => 'Shift_JIS']); ?>
36 36
 <input type="submit" value="いいえ" />
37
-<?=form_close();?>
37
+<?=form_close(); ?>
38 38
 
39
-<?=form_open('bbs/delete/'. $id, ['accept-charset' => 'Shift_JIS']);?>
40
-<?=form_hidden('delete', '1');?>
41
-<?=form_hidden('password', $password);?>
39
+<?=form_open('bbs/delete/'.$id, ['accept-charset' => 'Shift_JIS']); ?>
40
+<?=form_hidden('delete', '1'); ?>
41
+<?=form_hidden('password', $password); ?>
42 42
 <input type="submit" value="はい" />
43
-<?=form_close();?>
43
+<?=form_close(); ?>
44 44
 </td>
45 45
 </tr>
46 46
 <tr>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 </table>
50 50
 
51 51
 <hr>
52
-<?=anchor('bbs', 'トップに戻る');?>
52
+<?=anchor('bbs', 'トップに戻る'); ?>
53 53
 
54 54
 </body>
55 55
 </html>
Please login to merge, or discard this patch.