Completed
Pull Request — develop (#6)
by Kenji
01:41
created
application/controllers/Bbs.php 1 patch
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -53,8 +53,7 @@  discard block
 block discarded – undo
53 53
 		{
54 54
 			$config['full_tag_open']  = '<tr><td bgcolor="#EEEEEE">';
55 55
 			$config['full_tag_close'] = '</td></tr>';
56
-		}
57
-		else
56
+		} else
58 57
 		{
59 58
 			$config['full_tag_open']  = '<p class="pagination">';
60 59
 			$config['full_tag_close'] = '</p>';
@@ -87,8 +86,7 @@  discard block
 block discarded – undo
87 86
 		if ($this->form_validation->run() == FALSE)
88 87
 		{
89 88
 			$this->_show_post_page();
90
-		}
91
-		else
89
+		} else
92 90
 		{
93 91
 			$data = [];
94 92
 			$data['name']       = $this->input->post('name');
@@ -152,8 +150,7 @@  discard block
 block discarded – undo
152 150
 		if ($password == '')
153 151
 		{
154 152
 			$this->_load_view('bbs_delete_error');
155
-		}
156
-		else
153
+		} else
157 154
 		{
158 155
 # 記事IDと削除パスワードを条件として、bbsテーブルを検索します。
159 156
 			$this->db->where('id', $id);
@@ -206,8 +203,7 @@  discard block
 block discarded – undo
206 203
 		if ($this->agent->is_mobile())
207 204
 		{
208 205
 			$this->form_validation->set_error_delimiters('<div>', '</div>');
209
-		}
210
-		else
206
+		} else
211 207
 		{
212 208
 			$this->form_validation->set_error_delimiters('<div class="error">', '</div>');
213 209
 		}
@@ -248,8 +244,7 @@  discard block
 block discarded – undo
248 244
 		if ($this->form_validation->run() == FALSE)
249 245
 		{
250 246
 			$this->_show_post_page();
251
-		}
252
-		else
247
+		} else
253 248
 		{
254 249
 # 検証にパスした場合は、送られたデータとIPアドレスをbbsテーブルに登録します。
255 250
 			$data = [];
@@ -314,8 +309,7 @@  discard block
 block discarded – undo
314 309
 		if ($this->agent->is_mobile())
315 310
 		{
316 311
 			$this->load->view($file . '_mobile', $data);
317
-		}
318
-		else
312
+		} else
319 313
 		{
320 314
 			$this->load->view($file, $data);
321 315
 		}
Please login to merge, or discard this patch.
application/controllers/Form.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,8 +122,7 @@
 block discarded – undo
122 122
 		if ($this->email->send())
123 123
 		{
124 124
 			return TRUE;
125
-		}
126
-		else
125
+		} else
127 126
 		{
128 127
 //			echo $this->email->print_debugger();
129 128
 			return FALSE;
Please login to merge, or discard this patch.
application/controllers/Shop.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -216,8 +216,7 @@  discard block
 block discarded – undo
216 216
 
217 217
 			$data['action'] = '注文内容の確認';
218 218
 			$data['main']   = 'shop_confirm';
219
-		}
220
-		else
219
+		} else
221 220
 		{
222 221
 			$data = [
223 222
 				'action' => 'お客様情報の入力',
@@ -245,8 +244,7 @@  discard block
 block discarded – undo
245 244
 			$this->twig->display('shop_tmpl_checkout', $data);
246 245
 # 注文が完了したので、セッションを破棄します。
247 246
 			$this->session->sess_destroy();
248
-		}
249
-		else
247
+		} else
250 248
 		{
251 249
 			echo 'システムエラー';
252 250
 		}
Please login to merge, or discard this patch.
application/libraries/validation/Field_validation.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,7 @@
 block discarded – undo
24 24
 		if ($this->CI->form_validation->run() === FALSE)
25 25
 		{
26 26
 			show_error('不正な入力です。');
27
-		}
28
-		else
27
+		} else
29 28
 		{
30 29
 			return TRUE;
31 30
 		}
Please login to merge, or discard this patch.
application/models/shop/Inventory_model.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,8 +56,7 @@
 block discarded – undo
56 56
 		if ($query->num_rows() == 1)
57 57
 		{
58 58
 			return TRUE;
59
-		}
60
-		else
59
+		} else
61 60
 		{
62 61
 			return FALSE;
63 62
 		}
Please login to merge, or discard this patch.
application/models/shop/Mail_model.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,8 +36,7 @@
 block discarded – undo
36 36
 		if ($this->email->send())
37 37
 		{
38 38
 			return TRUE;
39
-		}
40
-		else
39
+		} else
41 40
 		{
42 41
 			return FALSE;
43 42
 		}
Please login to merge, or discard this patch.
application/libraries/Twig.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,8 +83,7 @@
 block discarded – undo
83 83
         {
84 84
             $this->paths = $params['paths'];
85 85
             unset($params['paths']);
86
-        }
87
-        else
86
+        } else
88 87
         {
89 88
             $this->paths = [VIEWPATH];
90 89
         }
Please login to merge, or discard this patch.