Completed
Pull Request — develop (#7)
by Kenji
01:27
created
application/controllers/Shop.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
  */
13 13
 class Shop extends MY_Controller {
14 14
 
15
-	public $limit;	// 1ページに表示する商品の数
16
-	public $admin;	// 管理者のメールアドレス
15
+	public $limit; // 1ページに表示する商品の数
16
+	public $admin; // 管理者のメールアドレス
17 17
 
18 18
 	public function __construct()
19 19
 	{
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
 # モデルよりそのカテゴリの商品数を取得し、ページネーションを生成します。
69 69
 		$this->load->library('generate_pagination');
70
-		$path  = '/shop/index/' . $cat_id;
70
+		$path  = '/shop/index/'.$cat_id;
71 71
 		$total = $this->inventory_model->get_product_count($cat_id);
72 72
 		$data['pagination'] = $this->generate_pagination->get_links($path, $total, 4);
73 73
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 		);
150 150
 
151 151
 # 検索キーワードをクエリ文字列から取得します。
152
-		$q = (string) $this->input->get('q');
152
+		$q = (string)$this->input->get('q');
153 153
 # 全角スペースを半角スペースに変換します。
154 154
 		$q = trim(mb_convert_kana($q, 's'));
155 155
 # 検索キーワードを検証します。
@@ -168,13 +168,13 @@  discard block
 block discarded – undo
168 168
 
169 169
 # ページネーションを生成します。
170 170
 		$this->load->library('generate_pagination');
171
-		$path  = '/shop/search';
171
+		$path = '/shop/search';
172 172
 		$data['pagination'] = $this->generate_pagination->get_links($path, $total, 3);
173 173
 
174 174
 		$data['q'] = $q;
175 175
 		$data['total'] = $total;
176 176
 
177
-		$data['main']   = 'shop_search';
177
+		$data['main'] = 'shop_search';
178 178
 		$data['item_count'] = $this->cart_model->count();
179 179
 		$this->twig->display('shop_tmpl_shop', $data);
180 180
 	}
Please login to merge, or discard this patch.
application/hooks/Convert_encoding.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		}
26 26
 
27 27
 # 携帯端末からのアクセスを判定するためユーザエージェントクラスをロードします。
28
-		$agent =& load_class('User_agent');
28
+		$agent = & load_class('User_agent');
29 29
 
30 30
 # 携帯端末からの入力文字エンコードを変換します。
31 31
 		if (count($_POST) > 1 && $agent->is_mobile())
@@ -41,13 +41,13 @@  discard block
 block discarded – undo
41 41
 			return;
42 42
 		}
43 43
 
44
-		if (! $this->check_route()) {
44
+		if ( ! $this->check_route()) {
45 45
 			return;
46 46
 		}
47 47
 
48 48
 		// load_class()でuser_agentをロードしたため、$this->user_agentとして
49 49
 		// して代入されているので、それを$this->agentに変更する
50
-		$CI =& get_instance();
50
+		$CI = & get_instance();
51 51
 		$CI->agent = $CI->user_agent;
52 52
 		unset($CI->user_agent);
53 53
 	}
Please login to merge, or discard this patch.
application/libraries/Generate_pagination.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 	public function get_links($path, $total, $uri_segment)
9 9
 	{
10 10
 # ページネーションクラスをロードします。
11
-		$this->CI =& get_instance();
11
+		$this->CI = & get_instance();
12 12
 		$this->CI->load->library('pagination');
13 13
 
14 14
 		$config = [];
Please login to merge, or discard this patch.
application/libraries/Seeder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 
17 17
 	public function __construct()
18 18
 	{
19
-		$this->CI =& get_instance();
19
+		$this->CI = & get_instance();
20 20
 		$this->CI->load->database();
21 21
 		$this->CI->load->dbforge();
22 22
 		$this->db = $this->CI->db;
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function call($seeder)
32 32
 	{
33
-		$file = APPPATH . 'database/seeds/' . $seeder . '.php';
33
+		$file = APPPATH.'database/seeds/'.$seeder.'.php';
34 34
 		require_once $file;
35 35
 		$obj = new $seeder;
36 36
 		$obj->run();
Please login to merge, or discard this patch.
application/libraries/validation/Custom_validation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 
7 7
 	public function __construct()
8 8
 	{
9
-		$this->CI =& get_instance();
9
+		$this->CI = & get_instance();
10 10
 		$this->CI->load->library('form_validation');
11 11
 
12 12
 		$this->set_validation_rules();
Please login to merge, or discard this patch.
application/libraries/validation/Field_validation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 
7 7
 	public function __construct()
8 8
 	{
9
-		$this->CI =& get_instance();
9
+		$this->CI = & get_instance();
10 10
 		$this->CI->load->library('form_validation');
11 11
 	}
12 12
 
Please login to merge, or discard this patch.
application/models/shop/Cart_model.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,13 +25,13 @@  discard block
 block discarded – undo
25 25
 # unset_userdata()メソッドで、セッションデータからその商品を削除します。
26 26
 		if ($qty <= 0)
27 27
 		{
28
-			$this->session->unset_userdata('item' . $id);
28
+			$this->session->unset_userdata('item'.$id);
29 29
 		}
30 30
 # 指定の数量が1以上の場合は、その商品が存在するかチェックした後に、商品と数量を
31 31
 # セッションデータに追加します。セッションの項目名は「item+商品ID」とします。
32 32
 		elseif ($this->inventory_model->is_available_product_item($id))
33 33
 		{
34
-			$this->session->set_userdata('item' . $id, $qty);
34
+			$this->session->set_userdata('item'.$id, $qty);
35 35
 		}
36 36
 	}
37 37
 
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 	 */
43 43
 	public function get_all()
44 44
 	{
45
-		$items = [];	// 商品情報の配列
46
-		$total = 0;		// 合計金額
47
-		$line  = 0;		// 行数
45
+		$items = []; // 商品情報の配列
46
+		$total = 0; // 合計金額
47
+		$line  = 0; // 行数
48 48
 
49 49
 # セッションクラスのuserdata()メソッドですべてのセッションデータを取得し、
50 50
 # ループで回して必要な情報を取り出します。
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 			{
56 56
 				$line++;
57 57
 # 配列のキーから商品IDを取り出します。
58
-				$id     = (int) substr($key, 4);
58
+				$id     = (int)substr($key, 4);
59 59
 # get_product_item()メソッドを使い、商品データを取得します。
60 60
 				$item   = $this->inventory_model->get_product_item($id);
61 61
 # 単価に数量を掛けて金額を計算します。
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 		}
75 75
 
76 76
 		$cart = [];
77
-		$cart['items'] = $items;	// 商品情報の配列
78
-		$cart['line']  = $line;		// 商品アイテム数
79
-		$cart['total'] = $total;	// 合計金額
77
+		$cart['items'] = $items; // 商品情報の配列
78
+		$cart['line']  = $line; // 商品アイテム数
79
+		$cart['total'] = $total; // 合計金額
80 80
 
81 81
 		return $cart;
82 82
 	}
Please login to merge, or discard this patch.
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.