Completed
Push — develop ( 6ff0d7...b03fd3 )
by Kenji
01:58
created
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 2 patches
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.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -10,6 +10,9 @@
 block discarded – undo
10 10
 		$this->CI->load->library('form_validation');
11 11
 	}
12 12
 
13
+	/**
14
+	 * @param string $rules
15
+	 */
13 16
 	public function validate($value, $rules, $errors = [])
14 17
 	{
15 18
 		$this->CI->form_validation->reset_validation();
Please login to merge, or discard this patch.
application/models/shop/Inventory_model.php 2 patches
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.
Doc Comments   +22 added lines patch added patch discarded remove patch
@@ -18,6 +18,9 @@  discard block
 block discarded – undo
18 18
 		return $query->result();
19 19
 	}
20 20
 
21
+	/**
22
+	 * @param string $id
23
+	 */
21 24
 	public function get_category_name($id)
22 25
 	{
23 26
 		$this->db->select('name');
@@ -27,6 +30,11 @@  discard block
 block discarded – undo
27 30
 		return $row->name;
28 31
 	}
29 32
 
33
+	/**
34
+	 * @param string $cat_id
35
+	 * @param string|null $limit
36
+	 * @param string $offset
37
+	 */
30 38
 	public function get_product_list($cat_id, $limit, $offset)
31 39
 	{
32 40
 		$this->db->where('category_id', $cat_id);
@@ -35,6 +43,9 @@  discard block
 block discarded – undo
35 43
 		return $query->result();
36 44
 	}
37 45
 
46
+	/**
47
+	 * @param string $cat_id
48
+	 */
38 49
 	public function get_product_count($cat_id)
39 50
 	{
40 51
 		$this->db->where('category_id', $cat_id);
@@ -49,6 +60,9 @@  discard block
 block discarded – undo
49 60
 		return $query->row();
50 61
 	}
51 62
 
63
+	/**
64
+	 * @param integer $id
65
+	 */
52 66
 	public function is_available_product_item($id)
53 67
 	{
54 68
 		$this->db->where('id', $id);
@@ -63,6 +77,11 @@  discard block
 block discarded – undo
63 77
 		}
64 78
 	}
65 79
 
80
+	/**
81
+	 * @param string $q
82
+	 * @param string|null $limit
83
+	 * @param string $offset
84
+	 */
66 85
 	public function get_product_by_search($q, $limit, $offset)
67 86
 	{
68 87
 # 検索キーワードをスペースで分割し、like()メソッドでLIKE句を指定します。
@@ -78,6 +97,9 @@  discard block
 block discarded – undo
78 97
 		return $query->result();
79 98
 	}
80 99
 
100
+	/**
101
+	 * @param string $q
102
+	 */
81 103
 	public function get_count_by_search($q)
82 104
 	{
83 105
 		$this->db->select('name');
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/controllers/Bbs.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -311,6 +311,9 @@
 block discarded – undo
311 311
 	}
312 312
 
313 313
 # 携帯端末かどうかを判定し、ビューをロードするプライベートメソッドです。
314
+	/**
315
+	 * @param string $file
316
+	 */
314 317
 	private function _load_view($file, $data = '')
315 318
 	{
316 319
 # 携帯端末の場合は、「_mobile」がファイル名に付くビューファイルをロードします。
Please login to merge, or discard this patch.
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -61,8 +61,7 @@  discard block
 block discarded – undo
61 61
 		{
62 62
 			$config['full_tag_open']  = '<tr><td bgcolor="#EEEEEE">';
63 63
 			$config['full_tag_close'] = '</td></tr>';
64
-		}
65
-		else
64
+		} else
66 65
 		{
67 66
 			$config['full_tag_open']  = '<p class="pagination">';
68 67
 			$config['full_tag_close'] = '</p>';
@@ -98,8 +97,7 @@  discard block
 block discarded – undo
98 97
 			$this->_delete_captcha_data();
99 98
 
100 99
 			$this->_show_post_page();
101
-		}
102
-		else
100
+		} else
103 101
 		{
104 102
 			$data = [];
105 103
 			$data['name']       = $this->input->post('name');
@@ -169,8 +167,7 @@  discard block
 block discarded – undo
169 167
 		if ($password == '')
170 168
 		{
171 169
 			$this->_load_view('bbs_delete_error');
172
-		}
173
-		else
170
+		} else
174 171
 		{
175 172
 # 記事IDと削除パスワードを条件として、bbsテーブルを検索します。
176 173
 			$this->db->where('id', $id);
@@ -223,8 +220,7 @@  discard block
 block discarded – undo
223 220
 		if ($this->agent->is_mobile())
224 221
 		{
225 222
 			$this->form_validation->set_error_delimiters('<div>', '</div>');
226
-		}
227
-		else
223
+		} else
228 224
 		{
229 225
 			$this->form_validation->set_error_delimiters('<div class="error">', '</div>');
230 226
 		}
@@ -268,8 +264,7 @@  discard block
 block discarded – undo
268 264
 			$this->_delete_captcha_data();
269 265
 
270 266
 			$this->_show_post_page();
271
-		}
272
-		else
267
+		} else
273 268
 		{
274 269
 # 検証にパスした場合は、送られたデータとIPアドレスをbbsテーブルに登録します。
275 270
 			$data = [];
@@ -337,8 +332,7 @@  discard block
 block discarded – undo
337 332
 		if ($this->agent->is_mobile())
338 333
 		{
339 334
 			$this->load->view($file . '_mobile', $data);
340
-		}
341
-		else
335
+		} else
342 336
 		{
343 337
 			$this->load->view($file, $data);
344 338
 		}
Please login to merge, or discard this patch.
application/libraries/Generate_pagination.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -5,6 +5,12 @@
 block discarded – undo
5 5
 	private $CI;
6 6
 
7 7
 	// ページネーションの生成
8
+
9
+	/**
10
+	 * @param string $path
11
+	 * @param integer $total
12
+	 * @param integer $uri_segment
13
+	 */
8 14
 	public function get_links($path, $total, $uri_segment)
9 15
 	{
10 16
 # ページネーションクラスをロードします。
Please login to merge, or discard this patch.
application/libraries/validation/Custom_validation.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -20,6 +20,9 @@
 block discarded – undo
20 20
 		$this->CI->form_validation->set_error_delimiters($prefix, $suffix);
21 21
 	}
22 22
 
23
+	/**
24
+	 * @param string $field
25
+	 */
23 26
 	protected function set_rules(
24 27
 		$field, $label = '', $rules = array(), $errors = array()
25 28
 	)
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.