Completed
Pull Request — master (#24)
by Lars
12:05
created
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/ElementGateway.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
     function findBySectionAndType($section, $type)
15 15
     {
16
-        $class = $this->class_prefix . ucfirst($type);
16
+        $class = $this->class_prefix.ucfirst($type);
17 17
 
18 18
         if (!class_exists($class)) {
19 19
             throw new Exception('Class does not exist');
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
         $cms_module = $this->kernel->getModule('cms');
27 27
         $element_types = $cms_module->getSetting('element_types');
28 28
 
29
-        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = " . $id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
29
+        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = ".$id." AND intranet_id = ".$this->kernel->intranet->get('id'));
30 30
         if (!$this->db->nextRecord()) {
31 31
             return false;
32 32
         }
33
-        $class = $this->class_prefix . ucfirst($element_types[$this->db->f('type_key')]);
33
+        $class = $this->class_prefix.ucfirst($element_types[$this->db->f('type_key')]);
34 34
         if (!class_exists($class)) {
35 35
             return false;
36 36
         }
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
         $cms_module = $kernel->getModule('cms');
43 43
         $element_types = $cms_module->getSetting('element_types');
44 44
 
45
-        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = " . $id . " AND intranet_id = " . $kernel->intranet->get('id'));
45
+        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = ".$id." AND intranet_id = ".$kernel->intranet->get('id'));
46 46
         if (!$this->db->nextRecord()) {
47 47
             return false;
48 48
         }
49
-        $class = $this->class_prefix . ucfirst($element_types[$this->db->f('type_key')]);
49
+        $class = $this->class_prefix.ucfirst($element_types[$this->db->f('type_key')]);
50 50
         if (!class_exists($class)) {
51 51
             return false;
52 52
         }
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
61 61
         $cms_module = $section->kernel->getModule('cms');
62 62
         $element_types = $cms_module->getSetting('element_types');
63 63
 
64
-        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = " . $id . " AND intranet_id = " . $section->kernel->intranet->get('id'));
64
+        $this->db->query("SELECT id, section_id, type_key FROM cms_element WHERE id = ".$id." AND intranet_id = ".$section->kernel->intranet->get('id'));
65 65
         if (!$this->db->nextRecord()) {
66 66
             return false;
67 67
         }
68 68
 
69
-        $class = $this->class_prefix . ucfirst($element_types[$this->db->f('type_key')]);
69
+        $class = $this->class_prefix.ucfirst($element_types[$this->db->f('type_key')]);
70 70
         if (!class_exists($class)) {
71 71
             return false;
72 72
         }
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.
src/Intraface/modules/cms/SiteGateway.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 
23 23
     function getAll()
24 24
     {
25
-        $this->db->query("SELECT id, name FROM cms_site WHERE intranet_id = " . $this->kernel->intranet->get('id'). " AND active = 1");
25
+        $this->db->query("SELECT id, name FROM cms_site WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1");
26 26
         $i = 0;
27 27
         $sites = array();
28 28
         while ($this->db->nextRecord()) {
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/Elements.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             'translation' => $this->getKernel()->getTranslation('cms')
56 56
         );
57 57
 
58
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/section-html-edit');
58
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/section-html-edit');
59 59
         return $tpl->render($this, $data);
60 60
     }
61 61
 
@@ -72,11 +72,11 @@  discard block
 block discarded – undo
72 72
                 $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
73 73
                 $module_filemanager = $this->getKernel()->useModule('filemanager');
74 74
                 if ($element->get('type') == 'picture') {
75
-                    return new k_SeeOther($this->url($element->get('id') . '/filehandler/selectfile', array('images' => 1)));
75
+                    return new k_SeeOther($this->url($element->get('id').'/filehandler/selectfile', array('images' => 1)));
76 76
                 } elseif ($element->get('type') == 'gallery') {
77
-                    return new k_SeeOther($this->url($element->get('id') . '/filehandler/selectfile', array('images' => 1, 'multiple_choice' => 'true')));
77
+                    return new k_SeeOther($this->url($element->get('id').'/filehandler/selectfile', array('images' => 1, 'multiple_choice' => 'true')));
78 78
                 } elseif ($element->get('type') == 'filelist') {
79
-                    return new k_SeeOther($this->url($element->get('id') . '/filehandler/selectfile', array('images' => 0, 'multiple_choice' => 'true')));
79
+                    return new k_SeeOther($this->url($element->get('id').'/filehandler/selectfile', array('images' => 0, 'multiple_choice' => 'true')));
80 80
                 } else {
81 81
                     throw new Exception("Det er ikke en gyldig elementtype til at lave redirect fra");
82 82
                 }
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/Element.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
             'translation' => $this->getKernel()->getTranslation('cms')
102 102
         );
103 103
 
104
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/section-html-edit');
104
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/section-html-edit');
105 105
         return $tpl->render($this, $data);
106 106
 
107 107
     }
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
             } elseif (!empty($_POST['close'])) {
132 132
                 return new k_SeeOther($this->url('../../'));
133 133
             } else {
134
-                return new k_SeeOther($this->url('../../element/' . $element->get('id')));
134
+                return new k_SeeOther($this->url('../../element/'.$element->get('id')));
135 135
             }
136 136
         } else {
137 137
             $value = $_POST;
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Controller/Sections.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
             'kernel' => $this->getKernel(),
53 53
             'error' => $this->error
54 54
         );
55
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/page');
55
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/page');
56 56
         return $tpl->render($this, $data);
57 57
     }
58 58
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
                 }
98 98
                 */
99 99
                 if (!$section->save($value)) {
100
-                    $this->error[$section->get('id')] = $this->t('error in section') . ' ' . strtolower(implode($section->error->message, ', '));
100
+                    $this->error[$section->get('id')] = $this->t('error in section').' '.strtolower(implode($section->error->message, ', '));
101 101
                 }
102 102
             }
103 103
         }
@@ -119,14 +119,14 @@  discard block
 block discarded – undo
119 119
 
120 120
                 return new k_SeeOther($url);
121 121
                 */
122
-                return new k_SeeOther($this->url($section_id . '/filehandler/selectfile'));
122
+                return new k_SeeOther($this->url($section_id.'/filehandler/selectfile'));
123 123
             } elseif ($this->body('edit_html')) {
124 124
                 $keys = array_keys($_POST['edit_html']);
125 125
                 return new k_SeeOther($this->url($keys[0]));
126 126
             } elseif ($this->body('close')) {
127 127
                 return new k_SeeOther($this->url('../../', array('type' => $this->context->getModel()->get('type'), 'id' => $this->context->getModel()->cmssite->get('id'))));
128 128
             } else {
129
-                return new k_SeeOther($this->url('../../' . $this->context->getModel()->get('id')));
129
+                return new k_SeeOther($this->url('../../'.$this->context->getModel()->get('id')));
130 130
             }
131 131
         } else {
132 132
             $cmspage = $section->cmspage;
Please login to merge, or discard this patch.