Completed
Pull Request — develop (#6)
by Kenji
01:41
created
application/views/errors/cli/error_php.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -4,10 +4,10 @@  discard block
 block discarded – undo
4 4
 
5 5
 A PHP Error was encountered
6 6
 
7
-Severity: <?php echo $severity;?>
8
-Message:  <?php echo $message;?>
9
-Filename: <?php echo $filepath;?>
10
-Line Number: <?php echo $line;?>
7
+Severity: <?php echo $severity; ?>
8
+Message:  <?php echo $message; ?>
9
+Filename: <?php echo $filepath; ?>
10
+Line Number: <?php echo $line; ?>
11 11
 
12 12
 <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
13 13
 
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
 	<?php foreach (debug_backtrace() as $error): ?>
16 16
 		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
17 17
 
18
-	File: <?php echo $error['file'];?>
19
-	Line: <?php echo $error['line'];?>
20
-	Function: <?php echo $error['function'];?>
18
+	File: <?php echo $error['file']; ?>
19
+	Line: <?php echo $error['line']; ?>
20
+	Function: <?php echo $error['function']; ?>
21 21
 
22 22
 		<?php endif ?>
23 23
 
Please login to merge, or discard this patch.
application/views/form.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5 5
 <!-- URLヘルパーのbase_url()メソッドは、メイン設定ファイルで設定した
6 6
 base_urlを返します。 -->
7
-<link rel="stylesheet" href="<?=base_url('css/form.css');?>" type="text/css" />
7
+<link rel="stylesheet" href="<?=base_url('css/form.css'); ?>" type="text/css" />
8 8
 <title>コンタクトフォーム</title>
9 9
 </head>
10 10
 
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
 <!-- メイン部分です。 -->
16 16
 <div id="main">
17 17
 <div class="title_banner">
18
-<img src="<?=base_url('images/icons/form_titile.jpg');?>" alt="お問い合わせ" width="580" height="70" />
18
+<img src="<?=base_url('images/icons/form_titile.jpg'); ?>" alt="お問い合わせ" width="580" height="70" />
19 19
 </div>
20 20
 
21 21
 <div class="outer_frame">
22 22
 <!-- Formヘルパーのform_open()メソッドで<form>タグを生成します。 -->
23
-<?=form_open('form/confirm');?>
23
+<?=form_open('form/confirm'); ?>
24 24
 <table>
25 25
 <tr><th>名前</th>
26 26
 <td>
@@ -30,20 +30,20 @@  discard block
 block discarded – undo
30 30
 知れませんが、これは、検証でエラーの場合、この同じビューファイルを使って
31 31
 フォームを表示するためです。このようにビューを使えば、最初のフォームの表示
32 32
 とエラー時のフォームの再表示を、ひとつのビューで済ますことができます。 -->
33
-	<input type="text" name="name" value="<?=set_value('name');?>" size="30" />
33
+	<input type="text" name="name" value="<?=set_value('name'); ?>" size="30" />
34 34
 <!-- form_error('name')は、nameフィールドの検証で
35 35
 エラーがあった場合に、表示するエラーメッセージを返します。 -->
36
-	<?=form_error('name');?>
36
+	<?=form_error('name'); ?>
37 37
 </td></tr>
38 38
 <tr><th>メールアドレス</th>
39 39
 <td>
40
-	<input type="text" name="email" value="<?=set_value('email');?>" size="30" />
41
-	<?=form_error('email');?>
40
+	<input type="text" name="email" value="<?=set_value('email'); ?>" size="30" />
41
+	<?=form_error('email'); ?>
42 42
 </td></tr>
43 43
 <tr><th>コメント</th>
44 44
 <td>
45
-	<textarea name="comment" rows="4" cols="30"><?=set_value('comment');?></textarea>
46
-	<?=form_error('comment');?>
45
+	<textarea name="comment" rows="4" cols="30"><?=set_value('comment'); ?></textarea>
46
+	<?=form_error('comment'); ?>
47 47
 </td></tr>
48 48
 <tr><td></td>
49 49
 <td class="center">
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 <!-- Formヘルパーのform_close()メソッドで</form>タグを生成します。
54 54
 form_open()メソッドを使った場合は、このメソッドを使うことでHTML文法
55 55
 チェッカのエラーを回避できます。 -->
56
-<?=form_close();?>
56
+<?=form_close(); ?>
57 57
 </div>
58 58
 </div>
59 59
 
Please login to merge, or discard this patch.
application/views/form_confirm.php 1 patch
Spacing   +15 added lines, -15 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/form.css');?>" type="text/css" />
5
+<link rel="stylesheet" href="<?=base_url('css/form.css'); ?>" type="text/css" />
6 6
 <title>コンタクトフォーム(確認)</title>
7 7
 </head>
8 8
 
@@ -13,41 +13,41 @@  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/form_titile.jpg');?>" alt="お問い合わせ" width="580" height="70" />
16
+<img src="<?=base_url('images/icons/form_titile.jpg'); ?>" alt="お問い合わせ" width="580" height="70" />
17 17
 </div>
18 18
 
19 19
 <div class="outer_frame">
20 20
 <p class="center">お問い合わせ内容の確認</p>
21 21
 <table>
22 22
 <tr><th>名前</th>
23
-	<td><?=set_value('name');?></td>
23
+	<td><?=set_value('name'); ?></td>
24 24
 </tr>
25 25
 <tr><th>メールアドレス</th>
26
-	<td><?=set_value('email');?></td>
26
+	<td><?=set_value('email'); ?></td>
27 27
 </tr>
28 28
 <tr><th>コメント</th>
29
-	<td><pre><?=set_value('comment');?></pre></td>
29
+	<td><pre><?=set_value('comment'); ?></pre></td>
30 30
 </tr>
31 31
 <tr><td></td>
32 32
 	<td class="center">
33 33
 <!-- 入力を修正するための、隠しフィールドに入力値を仕込んだ
34 34
 フォームを表示します。Formヘルパーで値を表示する場合、自動的に文字参照に
35 35
 置換されます。 -->
36
-	<?=form_open('form');?>
37
-	<?=form_hidden('name',    $this->input->post('name'));?>
38
-	<?=form_hidden('email',   $this->input->post('email'));?>
39
-	<?=form_hidden('comment', $this->input->post('comment'));?>
36
+	<?=form_open('form'); ?>
37
+	<?=form_hidden('name', $this->input->post('name')); ?>
38
+	<?=form_hidden('email', $this->input->post('email')); ?>
39
+	<?=form_hidden('comment', $this->input->post('comment')); ?>
40 40
 	<input class="button" type="submit" value="修正" />
41
-	<?=form_close();?>
41
+	<?=form_close(); ?>
42 42
 <!-- 入力がOKの場合に、次の完了ページへ進むためのフォームを表示します。
43 43
 ここでも、同様に、隠しフィールドに入力値を仕込み、次のページに渡します。
44 44
 ワンタイムチケットを忘れないようにしましょう。 -->
45
-	<?=form_open('form/send');?>
46
-	<?=form_hidden('name',    $this->input->post('name'));?>
47
-	<?=form_hidden('email',   $this->input->post('email'));?>
48
-	<?=form_hidden('comment', $this->input->post('comment'));?>
45
+	<?=form_open('form/send'); ?>
46
+	<?=form_hidden('name', $this->input->post('name')); ?>
47
+	<?=form_hidden('email', $this->input->post('email')); ?>
48
+	<?=form_hidden('comment', $this->input->post('comment')); ?>
49 49
 	<input class="button" type="submit" value="送信" />
50
-	<?=form_close();?>
50
+	<?=form_close(); ?>
51 51
 	</td>
52 52
 </tr>
53 53
 </table>
Please login to merge, or discard this patch.
application/views/form_end.php 1 patch
Spacing   +2 added lines, -2 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/form.css');?>" type="text/css" />
5
+<link rel="stylesheet" href="<?=base_url('css/form.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/form_titile.jpg');?>" alt="お問い合わせ" width="580" height="70" />
16
+<img src="<?=base_url('images/icons/form_titile.jpg'); ?>" alt="お問い合わせ" width="580" height="70" />
17 17
 </div>
18 18
 
19 19
 <div class="outer_frame">
Please login to merge, or discard this patch.
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.