Completed
Branch master (6ed6e7)
by Lars
07:57
created
src/Intraface/modules/shop/Controller/Categories/Show.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     {
22 22
         $this->document->setTitle($this->getModel()->getName());
23 23
 
24
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/category');
24
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/category');
25 25
         return $tpl->render($this);
26 26
     }
27 27
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
             'category_object' => $this->getModel(),
35 35
             'regret_link' => $redirect->getRedirect($this->url('../'))
36 36
         );
37
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/categories-edit');
37
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/categories-edit');
38 38
         return $tpl->render($this, $data);
39 39
     }
40 40
 
Please login to merge, or discard this patch.
src/Intraface/modules/shop/Controller/Categories/Create.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
             'category_object' => $this->getModel(),
42 42
             'regret_link' => $redirect->getRedirect($this->url('../'))
43 43
         );
44
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/categories-edit');
44
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/categories-edit');
45 45
         return $tpl->render($this, $data);
46 46
     }
47 47
 
Please login to merge, or discard this patch.
src/Intraface/modules/shop/Controller/Show.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -33,11 +33,11 @@
 block discarded – undo
33 33
         $this->document->setTitle($shop->name);
34 34
 
35 35
         $this->document->options = array($this->url('../') => 'Close',
36
-                                         $this->url(null, array('edit')) => 'Edit',
37
-                                         $this->url('featuredproducts') => 'Choose featured products',
38
-                                         $this->url('categories') => 'Product categories',
39
-                                         $this->url('basketevaluation') => 'Basket evaluation',
40
-                                         $this->url('paymentmethods') => 'Payment methods');
36
+                                            $this->url(null, array('edit')) => 'Edit',
37
+                                            $this->url('featuredproducts') => 'Choose featured products',
38
+                                            $this->url('categories') => 'Product categories',
39
+                                            $this->url('basketevaluation') => 'Basket evaluation',
40
+                                            $this->url('paymentmethods') => 'Payment methods');
41 41
 
42 42
         $basketevaluation = new Intraface_modules_shop_BasketEvaluation($this->mdb2, $this->getKernel()->intranet, $shop);
43 43
         $evaluations = $basketevaluation->getList();
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
         $data = array('shop' => $shop, 'evaluations' => $evaluations);
46 46
 
47
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/show');
47
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/show');
48 48
         return $tpl->render($this, $data);
49 49
     }
50 50
 
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
             'settings' => $settings,
86 86
             'currencies' => $currencies,
87 87
             'languages' => $langs);
88
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/edit');
89
-        return $this->getError()->view() . $tpl->render($this, $data);
88
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/edit');
89
+        return $this->getError()->view().$tpl->render($this, $data);
90 90
     }
91 91
 
92 92
     function postForm()
Please login to merge, or discard this patch.
src/Intraface/modules/shop/Controller/Index.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,8 @@
 block discarded – undo
77 77
 
78 78
     function __construct(k_TemplateFactory $template, Doctrine_Connection_Common $doctrine)
79 79
     {
80
-         $this->template = $template;
81
-         $this->doctrine = $doctrine;
80
+            $this->template = $template;
81
+            $this->doctrine = $doctrine;
82 82
     }
83 83
 
84 84
     function map($name)
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
         if (!is_null($options)) {
28 28
             $config = HTMLPurifier_Config::createDefault();
29 29
                 foreach ($options as $option) {
30
-                    $config->set($option[0] . '.' . $option[1], $option[2]);
30
+                    $config->set($option[0].'.'.$option[1], $option[2]);
31 31
                 }
32 32
         }
33 33
         $this->_htmlPurifier = new HTMLPurifier($config);
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
     {
47 47
         $options = array(
48 48
             array('Cache', 'SerializerPath',
49
-                PATH_CACHE . '/htmlpurifier'
49
+                PATH_CACHE.'/htmlpurifier'
50 50
             ),
51 51
             //array('HTML', 'Doctype', 'XHTML 1.0 Strict'),
52 52
             array('HTML', 'Allowed',
@@ -151,12 +151,12 @@  discard block
 block discarded – undo
151 151
         $shops = Doctrine::getTable('Intraface_modules_shop_Shop')->findByIntranetId($this->getKernel()->intranet->getId());
152 152
 
153 153
         if (count($shops) == 0) {
154
-            $tpl = $this->template->create(dirname(__FILE__) . '/tpl/empty-table');
154
+            $tpl = $this->template->create(dirname(__FILE__).'/tpl/empty-table');
155 155
             return $tpl->render($this, array('message' => 'No shops has been created yet.'));
156 156
         }
157 157
 
158 158
         $data = array('shops' => $shops);
159
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/shops');
159
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/shops');
160 160
         return $tpl->render($this, $data);
161 161
     }
162 162
 
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
         if (!$this->isValid()) {
170 170
             $data = $this->body();
171 171
         } else {
172
-            $data['receipt'] = $this->getKernel()->setting->get('intranet','webshop.webshop_receipt');
172
+            $data['receipt'] = $this->getKernel()->setting->get('intranet', 'webshop.webshop_receipt');
173 173
         }
174 174
 
175 175
         if ($this->getKernel()->intranet->hasModuleAccess('currency')) {
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
             'settings' => $settings,
195 195
             'currencies' => $currencies,
196 196
             'languages' => $langs);
197
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/edit');
197
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/edit');
198 198
         return $tpl->render($this, $data);
199 199
     }
200 200
 
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 
245 245
     function wrapHtml($content)
246 246
     {
247
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/content');
247
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/content');
248 248
         return $tpl->render($this, array('content' => $content));
249 249
     }
250 250
 
Please login to merge, or discard this patch.
src/Intraface/modules/shop/Controller/FeaturedProducts.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
             'kernel' => $this->getKernel(),
43 43
             'keywords' => $keywords);
44 44
 
45
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/featuredproducts');
45
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/featuredproducts');
46 46
         return $tpl->render($this, $data);
47 47
     }
48 48
 
Please login to merge, or discard this patch.
src/Intraface/modules/shop/Controller/PaymentMethods/Index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
     {
13 13
         $shop = Doctrine::getTable('Intraface_modules_shop_Shop')->find($this->getShopId());
14 14
 
15
-        $this->document->setTitle('Payment methods for') . ' ' . $shop->name;
15
+        $this->document->setTitle('Payment methods for').' '.$shop->name;
16 16
 
17 17
         $this->document->options = array($this->url('../') => 'Close');
18 18
 
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         $chosen = $this->getPaymentMethodsForShop();
23 23
 
24 24
         $data = array('shop' => $shop, 'methods' => $methods, 'chosen' => $chosen);
25
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/paymentmethods-index');
25
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/paymentmethods-index');
26 26
         return $tpl->render($this, $data);
27 27
     }
28 28
 
Please login to merge, or discard this patch.
src/Intraface/modules/product/Attribute.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
         );
31 31
         
32 32
         $this->hasOne('Intraface_modules_product_Variation_X_Attribute as variation_x_attribute', 
33
-            array( 'local' => 'id','foreign' => 'product_attribute_id')
33
+            array('local' => 'id', 'foreign' => 'product_attribute_id')
34 34
         );
35 35
     }
36 36
 
Please login to merge, or discard this patch.
src/Intraface/modules/product/Variation/X/Attribute.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,10 +19,10 @@
 block discarded – undo
19 19
         //$this->loadTemplate('Intraface_Doctrine_Template_Intranet');
20 20
         $this->actAs('Intraface_Doctrine_Template_Intranet');
21 21
         
22
-        $this->hasOne('Intraface_modules_product_Attribute as attribute', array('local' => 'product_attribute_id','foreign' => 'id'));
22
+        $this->hasOne('Intraface_modules_product_Attribute as attribute', array('local' => 'product_attribute_id', 'foreign' => 'id'));
23 23
         // Notice that Variation/OneAttributeGroup and TwoAttributeGroup extends Variation, which means we do not get
24 24
         // all functionality in the relation specified below here. 
25
-        $this->hasOne('Intraface_modules_product_Variation as variation', array('local' => 'product_variation_id','foreign' => 'id'));
25
+        $this->hasOne('Intraface_modules_product_Variation as variation', array('local' => 'product_variation_id', 'foreign' => 'id'));
26 26
         
27 27
     }
28 28
     
Please login to merge, or discard this patch.
src/Intraface/modules/product/Product/X/Attribute/Group.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
         $this->actAs('Intraface_Doctrine_Template_Intranet');
24 24
         
25 25
         $this->hasOne('Intraface_modules_product_Attribute_Group as attribute_group', 
26
-            array('local' => 'product_attribute_group_id','foreign' => 'id'));
26
+            array('local' => 'product_attribute_group_id', 'foreign' => 'id'));
27 27
     }
28 28
     
29 29
 }
30 30
\ No newline at end of file
Please login to merge, or discard this patch.