Completed
Pull Request — master (#26)
by Lars
10:03
created
src/Intraface/modules/product/Controller/BatchEdit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
         $product->getDBQuery()->storeResult("use_stored", "products", "toplevel");
19 19
         $products = $product->getList();
20 20
 
21
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/batchedit');
21
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/batchedit');
22 22
         return $tpl->render($this, array('products' => $products, 'product' => $product));
23 23
     }
24 24
 
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/Show.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             return new k_SeeOther($this->url());
82 82
         }
83 83
 
84
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/show');
84
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/show');
85 85
         return $smarty->render($this, $data);
86 86
     }
87 87
 
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         if ($this->body('choose_file') && $this->getKernel()->user->hasModuleAccess('filemanager')) {
122 122
             $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
123 123
             $module_filemanager = $this->getKernel()->useModule('filemanager');
124
-            $url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('filehandler/selectfile', array('images'=>1, 'multiple_choice' => 1)), NET_SCHEME . NET_HOST . $this->url());
124
+            $url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('filehandler/selectfile', array('images'=>1, 'multiple_choice' => 1)), NET_SCHEME.NET_HOST.$this->url());
125 125
             $redirect->setIdentifier('product');
126 126
             $redirect->askParameter('file_handler_id', 'multiple');
127 127
 
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
             'product' => $this->getProductDoctrine(),
140 140
         );
141 141
 
142
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/edit');
142
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/edit');
143 143
         return $smarty->render($this, $data);
144 144
     }
145 145
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
     {
209 209
         $this->getKernel()->module('product');
210 210
         if ($id = $this->getProduct()->copy()) {
211
-            return new k_SeeOther($this->url('../' . $id));
211
+            return new k_SeeOther($this->url('../'.$id));
212 212
         }
213 213
         return $this->render();
214 214
     }
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/Index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     {
31 31
         $module = $this->getKernel()->module('product');
32 32
 
33
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/index');
33
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/index');
34 34
         return $smarty->render($this);
35 35
     }
36 36
 
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
             $data['product'] = $this->product_doctrine;
77 77
         }
78 78
 
79
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/edit');
79
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/edit');
80 80
         return $smarty->render($this, $data);
81 81
     }
82 82
 
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/Related.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
     {
13 13
         $kernel = $this->context->getKernel();
14 14
         $kernel->module('product');
15
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/related');
15
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/related');
16 16
         return $smarty->render($this);
17 17
     }
18 18
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         }
60 60
 
61 61
         $product->getDBQuery()->defineCharacter("character", "detail_translation.name");
62
-        $product->getDBQuery()->setCondition("product.id != " . $this->context->name());
62
+        $product->getDBQuery()->setCondition("product.id != ".$this->context->name());
63 63
         $product->getDBQuery()->setExtraUri("&id=".(int)$this->context->name());
64 64
         $product->getDBQuery()->usePaging("paging");
65 65
         $product->getDBQuery()->storeResult("use_stored", "related_products", "sublevel");
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
         }
119 119
 
120 120
         $product->getDBQuery()->defineCharacter("character", "detail_translation.name");
121
-        $product->getDBQuery()->setCondition("product.id != " . $this->context->name());
121
+        $product->getDBQuery()->setCondition("product.id != ".$this->context->name());
122 122
         $product->getDBQuery()->setExtraUri("&id=".(int)$this->context->name());
123 123
         $product->getDBQuery()->usePaging("paging");
124 124
         $product->getDBQuery()->storeResult("use_stored", "related_products", "sublevel");
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/Variation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
             'kernel' => $this->getKernel()
54 54
         );
55 55
 
56
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/variation');
56
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/variation');
57 57
         return $tpl->render($this, $data);
58 58
     }
59 59
 
Please login to merge, or discard this patch.
src/Intraface/modules/modulepackage/Controller/Index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
         $packages = $modulepackagemanager->getList();
51 51
 
52 52
         $data = array('packages' => $packages, 'modulepackagemanager' => $modulepackagemanager);
53
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/index');
53
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/index');
54 54
         return $tpl->render($this, $data);
55 55
     }
56 56
 
Please login to merge, or discard this patch.
src/Intraface/modules/modulepackage/Controller/Payment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
             'payment_prepare' => $payment_prepare,
68 68
             'form_action' => $form_action);
69 69
 
70
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/payment');
70
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/payment');
71 71
         return $tpl->render($this, $data);
72 72
     }
73 73
 
Please login to merge, or discard this patch.
src/Intraface/modules/modulepackage/Controller/Process.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
         }
48 48
 
49 49
         // TODO: we need to find a better solution for this
50
-        $response = new k_TextResponse('Failure: ' . $action->error->view());
50
+        $response = new k_TextResponse('Failure: '.$action->error->view());
51 51
         $response->setStatus(400);
52 52
         return $response;
53 53
     }
Please login to merge, or discard this patch.
src/Intraface/modules/cms/element/Twitter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
     {
15 15
         $this->value['search'] = $this->parameter->get('search');
16 16
         $this->value['number'] = $this->parameter->get('number');
17
-        $twitterSearch  = new Zend_Service_Twitter_Search('json');
17
+        $twitterSearch = new Zend_Service_Twitter_Search('json');
18 18
         $this->value['results'] = serialize($twitterSearch->search($this->parameter->get('search'), array('rpp' => $this->parameter->get('number'))));
19 19
     }
20 20
 
Please login to merge, or discard this patch.